diff --git a/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebInitialScanStatusMessageHandler.kt b/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebInitialScanStatusMessageHandler.kt index 2b274e95a78e..d32da3a4fe29 100644 --- a/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebInitialScanStatusMessageHandler.kt +++ b/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebInitialScanStatusMessageHandler.kt @@ -90,6 +90,7 @@ class PirWebInitialScanStatusMessageHandler @Inject constructor( private suspend fun getResultsFound(): List { return stateProvider.getScanResults().map { ScanResult( + id = it.extractedProfile.dbId, dataBroker = DataBroker( name = it.broker.name, url = it.broker.url, diff --git a/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebMaintenanceScanStatusMessageHandler.kt b/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebMaintenanceScanStatusMessageHandler.kt index 9f91db10365d..fb3f4bbd5504 100644 --- a/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebMaintenanceScanStatusMessageHandler.kt +++ b/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebMaintenanceScanStatusMessageHandler.kt @@ -103,6 +103,7 @@ class PirWebMaintenanceScanStatusMessageHandler @Inject constructor( private suspend fun getCompletedOptOuts(): List { return statusProvider.getRemovedOptOuts().map { PirWebMessageResponse.ScanResult( + id = it.result.extractedProfile.dbId, dataBroker = DataBroker( name = it.result.broker.name, url = it.result.broker.url, @@ -131,6 +132,7 @@ class PirWebMaintenanceScanStatusMessageHandler @Inject constructor( private suspend fun getInProgressOptOuts(): List { return statusProvider.getInProgressOptOuts().map { PirWebMessageResponse.ScanResult( + id = it.extractedProfile.dbId, dataBroker = DataBroker( name = it.broker.name, url = it.broker.url, diff --git a/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/model/PirWebMessageResponse.kt b/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/model/PirWebMessageResponse.kt index bc4199fe2d6b..12437960deef 100644 --- a/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/model/PirWebMessageResponse.kt +++ b/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/model/PirWebMessageResponse.kt @@ -99,7 +99,7 @@ sealed interface PirWebMessageResponse { } data class ScanResult( - val id: Long? = 0L, + val id: Long, val dataBroker: DataBroker, val name: String, val addresses: List, diff --git a/pir/pir-impl/src/test/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebInitialScanStatusMessageHandlerTest.kt b/pir/pir-impl/src/test/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebInitialScanStatusMessageHandlerTest.kt index 2303a8ebcd9e..242b7a6255c5 100644 --- a/pir/pir-impl/src/test/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebInitialScanStatusMessageHandlerTest.kt +++ b/pir/pir-impl/src/test/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebInitialScanStatusMessageHandlerTest.kt @@ -239,6 +239,7 @@ class PirWebInitialScanStatusMessageHandlerTest { // Verify first result val result1 = response.resultsFound[0] + assertEquals(1L, result1.id) assertEquals("John Doe", result1.name) assertEquals(listOf("J. Doe", "Johnny"), result1.alternativeNames) assertEquals(listOf("Jane Doe"), result1.relatives) @@ -253,6 +254,7 @@ class PirWebInitialScanStatusMessageHandlerTest { // Verify second result val result2 = response.resultsFound[1] + assertEquals(1L, result2.id) assertEquals("Jane Smith", result2.name) assertEquals(listOf("J. Smith"), result2.alternativeNames) assertEquals(listOf("John Smith"), result2.relatives) diff --git a/pir/pir-impl/src/test/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebMaintenanceScanStatusMessageHandlerTest.kt b/pir/pir-impl/src/test/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebMaintenanceScanStatusMessageHandlerTest.kt index 3168f7fbc0c8..3bdbdf6d0de2 100644 --- a/pir/pir-impl/src/test/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebMaintenanceScanStatusMessageHandlerTest.kt +++ b/pir/pir-impl/src/test/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebMaintenanceScanStatusMessageHandlerTest.kt @@ -254,6 +254,7 @@ class PirWebMaintenanceScanStatusMessageHandlerTest { // Verify in-progress opt-out assertEquals(1, parsedResponse!!.inProgressOptOuts.size) val inProgressResult = parsedResponse.inProgressOptOuts[0] + assertEquals(1L, inProgressResult.id) assertEquals("John Doe", inProgressResult.name) assertEquals(listOf("Johnny", "J. Doe"), inProgressResult.alternativeNames) assertEquals(listOf("Jane Doe"), inProgressResult.relatives) @@ -271,6 +272,7 @@ class PirWebMaintenanceScanStatusMessageHandlerTest { // Verify completed opt-out assertEquals(1, parsedResponse.completedOptOuts.size) val completedResult = parsedResponse.completedOptOuts[0] + assertEquals(1L, completedResult.id) assertEquals("John Doe", completedResult.name) assertEquals(TimeUnit.MILLISECONDS.toSeconds(1643673600000L), completedResult.removedDate) assertEquals(5, completedResult.matches)