PIR: User Extract actionr response instead of meta (#6168)

Task/Issue URL:
https://app.asana.com/1/137249556945/project/488551667048375/task/1210386349388281?focus=true

### Description
See attached task description

### Steps to test this PR
https://app.asana.com/1/137249556945/task/1210437341069871?focus=true

Author: karlenDimla

pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/common/BrokerStepsParser.kt

@@ -105,11 +105,7 @@ class RealBrokerStepsParser @Inject constructor(
                 if (this is OptOutStep) {
                     this.copy(
                         brokerName = brokerName,
-                        profilesToOptOut = repository.getExtractProfileResultForBroker(brokerName)?.extractResults?.filter {
-                            it.result
-                        }?.map {
-                            it.scrapedData
-                        } ?: emptyList(),
+                        profilesToOptOut = repository.getExtractProfileResultForBroker(brokerName)?.extractResults ?: emptyList(),
                     )
                 } else {
                     (this as ScanStep).copy(brokerName = brokerName)

pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/common/actions/EmailReceivedEventHandler.kt

@@ -62,7 +62,7 @@ class EmailReceivedEventHandler @Inject constructor() : EventHandler {
                     extractedProfile = extractedProfileWithEmail.run {
                         ExtractedProfileParams(
                             name = this.name,
-                            profileUrl = this.profileUrl?.profileUrl,
+                            profileUrl = this.profileUrl,
                             fullName = state.profileQuery?.fullName,
                             email = this.email,
                         )

pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/common/actions/ExecuteNextBrokerActionEventHandler.kt

@@ -144,7 +144,7 @@ class ExecuteNextBrokerActionEventHandler @Inject constructor() : EventHandler {
                 extractedProfile = extractedProfile.run {
                     ExtractedProfileParams(
                         name = this.name,
-                        profileUrl = this.profileUrl?.profileUrl,
+                        profileUrl = this.profileUrl,
                         fullName = state.profileQuery?.fullName,
                         email = this.email,
                     )

pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/scripts/models/PirScriptProfile.kt

@@ -45,23 +45,17 @@ data class Address(
 data class ExtractedProfile(
     val id: Int? = null,
     val name: String? = null,
-    val alternativeNamesList: List<String>? = emptyList(),
-    val addressFull: List<AddressCityState>? = emptyList(),
-    val addressCityState: List<AddressCityState>? = emptyList(),
-    val phoneNumbers: List<String>? = null,
-    val relativesList: List<String>? = null,
-    val profileUrl: ProfileUrl? = null,
-    val reportId: String? = null,
+    val alternativeNames: List<String>? = emptyList(),
     val age: String? = null,
+    val addresses: List<AddressCityState>? = emptyList(),
+    val phoneNumbers: List<String>? = emptyList(),
+    val relatives: List<String>? = emptyList(),
+    val profileUrl: String? = null,
+    val identifier: String? = null,
+    val reportId: String? = null,
     val email: String? = null,
     val removedDate: String? = null,
     val fullName: String? = null,
-    val identifier: String? = null,
-)
-
-data class ProfileUrl(
-    val profileUrl: String,
-    val identifier: String,
 )
 
 data class AddressCityState(

pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/scripts/models/PirScriptResponseParams.kt

@@ -47,17 +47,11 @@ sealed class PirSuccessResponse(
     data class ExtractedResponse(
         override val actionID: String,
         override val actionType: String,
+        val response: List<ExtractedProfile>,
         val meta: AdditionalData? = null,
     ) : PirSuccessResponse(actionID, actionType) {
         data class AdditionalData(
             val userData: ProfileQuery,
-            val extractResults: List<ScrapedData>,
-        )
-        data class ScrapedData(
-            val scrapedData: ExtractedProfile,
-            val result: Boolean,
-            val score: Int,
-            val matchedFields: List<String>,
         )
     }
 
@@ -83,6 +77,7 @@ sealed class PirSuccessResponse(
         data class ResponseData(
             val callback: CallbackData,
         )
+
         data class CallbackData(
             val eval: String,
         )

pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/settings/PirDevScanActivity.kt

@@ -122,14 +122,12 @@ class PirDevScanActivity : DuckDuckGoActivity() {
     private fun render(results: List<ScanResult>) {
         val allExtracted = results.filterIsInstance<ExtractedProfileResult>()
         val brokersWithRecords = allExtracted.filter {
-            it.extractResults.isNotEmpty() && it.extractResults.any { result ->
-                result.result
-            }
+            it.extractResults.isNotEmpty()
         }
         val brokersWithRecordsCount = brokersWithRecords.size
 
         val totalRecordCount = brokersWithRecords.sumOf {
-            it.extractResults.filter { result -> result.result }.size
+            it.extractResults.size
         }
 
         with(binding) {
@@ -141,7 +139,7 @@ class PirDevScanActivity : DuckDuckGoActivity() {
 
             recordStringBuilder.append("\nRecords found:\n")
             brokersWithRecords.forEach { broker ->
-                val recordCount = broker.extractResults.filter { it.result }.size
+                val recordCount = broker.extractResults.size
                 recordStringBuilder.append("${broker.brokerName} - records: $recordCount\n")
             }
             this.records.text = recordStringBuilder.toString()

pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/settings/PirResultsActivity.kt

@@ -126,9 +126,7 @@ class PirResultsActivity : DuckDuckGoActivity() {
                         }
 
                         is ExtractedProfileResult -> {
-                            val records = it.extractResults.filter {
-                                it.result
-                            }.size
+                            val records = it.extractResults.size
                             stringBuilder.append("VALID RECORDS FOUND COUNT: $records\n")
                         }
 

pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/store/PirRepository.kt

@@ -21,7 +21,6 @@ import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.pir.internal.scripts.models.ExtractedProfile
 import com.duckduckgo.pir.internal.scripts.models.PirErrorReponse
 import com.duckduckgo.pir.internal.scripts.models.PirSuccessResponse.ExtractedResponse
-import com.duckduckgo.pir.internal.scripts.models.PirSuccessResponse.ExtractedResponse.ScrapedData
 import com.duckduckgo.pir.internal.scripts.models.PirSuccessResponse.NavigateResponse
 import com.duckduckgo.pir.internal.scripts.models.ProfileQuery
 import com.duckduckgo.pir.internal.service.DbpService
@@ -53,7 +52,6 @@ import com.duckduckgo.pir.internal.store.db.ScanResultsDao
 import com.duckduckgo.pir.internal.store.db.UserProfile
 import com.duckduckgo.pir.internal.store.db.UserProfileDao
 import com.squareup.moshi.Moshi
-import java.util.regex.Pattern
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
@@ -187,7 +185,7 @@ interface PirRepository {
             override val completionTimeInMillis: Long,
             override val actionType: String,
             val profileQuery: ProfileQuery?,
-            val extractResults: List<ScrapedData> = emptyList(),
+            val extractResults: List<ExtractedProfile> = emptyList(),
         ) : ScanResult(brokerName, completionTimeInMillis, actionType)
 
         data class ErrorResult(
@@ -219,9 +217,7 @@ class RealPirRepository(
     private val optOutResultsDao: OptOutResultsDao,
 ) : PirRepository {
     private val profileQueryAdapter by lazy { moshi.adapter(ProfileQuery::class.java) }
-    private val scrapedDataAdapter by lazy { moshi.adapter(ScrapedData::class.java) }
     private val extractedProfileAdapter by lazy { moshi.adapter(ExtractedProfile::class.java) }
-    private val validExtractedProfilePattern by lazy { Pattern.compile(".*\"result\"\\s*:\\s*true.*") }
 
     override suspend fun getCurrentMainEtag(): String? = pirDataStore.mainConfigEtag
 
@@ -308,9 +304,7 @@ class RealPirRepository(
 
     override suspend fun getBrokersForOptOut(formOptOutOnly: Boolean): List<String> = withContext(dispatcherProvider.io()) {
         scanResultsDao.getAllExtractProfileResult().filter {
-            it.extractResults.isNotEmpty() && it.extractResults.any { result ->
-                validExtractedProfilePattern.matcher(result).find()
-            }
+            it.extractResults.isNotEmpty()
         }.map {
             it.brokerName
         }.run {
@@ -370,9 +364,9 @@ class RealPirRepository(
                     actionType = response.actionType,
                     completionTimeInMillis = currentTimeProvider.currentTimeMillis(),
                     userData = profileQueryAdapter.toJson(response.meta?.userData),
-                    extractResults = response.meta?.extractResults?.map {
-                        scrapedDataAdapter.toJson(it)
-                    } ?: emptyList(),
+                    extractResults = response.response.map {
+                        extractedProfileAdapter.toJson(it)
+                    },
                 ),
             )
         }
@@ -385,7 +379,7 @@ class RealPirRepository(
                 completionTimeInMillis = this.completionTimeInMillis,
                 actionType = this.actionType,
                 extractResults = this.extractResults.mapNotNull {
-                    scrapedDataAdapter.fromJson(it)
+                    extractedProfileAdapter.fromJson(it)
                 },
                 profileQuery = null,
             )
@@ -421,7 +415,7 @@ class RealPirRepository(
                     actionType = it.actionType,
                     profileQuery = profileQueryAdapter.fromJson(it.userData),
                     extractResults = it.extractResults.mapNotNull { data ->
-                        scrapedDataAdapter.fromJson(data)
+                        extractedProfileAdapter.fromJson(data)
                     },
                 )
             }
@@ -520,7 +514,7 @@ class RealPirRepository(
             it.filter {
                 it.isSubmitSuccess
             }.map {
-                (extractedProfileAdapter.fromJson(it.extractedProfile)?.profileUrl?.identifier ?: "Unknown") to it.brokerName
+                (extractedProfileAdapter.fromJson(it.extractedProfile)?.identifier ?: "Unknown") to it.brokerName
             }.distinct().toMap()
         }
     }