Skip to content

Commit 71cac92

Browse files
authored
PIR: Enable remove from dashboard button (#7145)
Task/Issue URL: https://app.asana.com/1/137249556945/project/488551667048375/task/1211859301335910?focus=true ### Description Enables the "Remove from dashboard" button on the found results by sending the extracted profile id. ### Steps to test this PR See https://app.asana.com/1/137249556945/task/1211976365166924?focus=true ### UI changes No UI changes
1 parent 00ebeb8 commit 71cac92

File tree

5 files changed

+8
-1
lines changed

5 files changed

+8
-1
lines changed

pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebInitialScanStatusMessageHandler.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ class PirWebInitialScanStatusMessageHandler @Inject constructor(
9090
private suspend fun getResultsFound(): List<ScanResult> {
9191
return stateProvider.getScanResults().map {
9292
ScanResult(
93+
id = it.extractedProfile.dbId,
9394
dataBroker = DataBroker(
9495
name = it.broker.name,
9596
url = it.broker.url,

pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebMaintenanceScanStatusMessageHandler.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ class PirWebMaintenanceScanStatusMessageHandler @Inject constructor(
103103
private suspend fun getCompletedOptOuts(): List<PirWebMessageResponse.ScanResult> {
104104
return statusProvider.getRemovedOptOuts().map {
105105
PirWebMessageResponse.ScanResult(
106+
id = it.result.extractedProfile.dbId,
106107
dataBroker = DataBroker(
107108
name = it.result.broker.name,
108109
url = it.result.broker.url,
@@ -131,6 +132,7 @@ class PirWebMaintenanceScanStatusMessageHandler @Inject constructor(
131132
private suspend fun getInProgressOptOuts(): List<PirWebMessageResponse.ScanResult> {
132133
return statusProvider.getInProgressOptOuts().map {
133134
PirWebMessageResponse.ScanResult(
135+
id = it.extractedProfile.dbId,
134136
dataBroker = DataBroker(
135137
name = it.broker.name,
136138
url = it.broker.url,

pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/messaging/model/PirWebMessageResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ sealed interface PirWebMessageResponse {
9999
}
100100

101101
data class ScanResult(
102-
val id: Long? = 0L,
102+
val id: Long,
103103
val dataBroker: DataBroker,
104104
val name: String,
105105
val addresses: List<ScanResultAddress>,

pir/pir-impl/src/test/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebInitialScanStatusMessageHandlerTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ class PirWebInitialScanStatusMessageHandlerTest {
239239

240240
// Verify first result
241241
val result1 = response.resultsFound[0]
242+
assertEquals(1L, result1.id)
242243
assertEquals("John Doe", result1.name)
243244
assertEquals(listOf("J. Doe", "Johnny"), result1.alternativeNames)
244245
assertEquals(listOf("Jane Doe"), result1.relatives)
@@ -253,6 +254,7 @@ class PirWebInitialScanStatusMessageHandlerTest {
253254

254255
// Verify second result
255256
val result2 = response.resultsFound[1]
257+
assertEquals(1L, result2.id)
256258
assertEquals("Jane Smith", result2.name)
257259
assertEquals(listOf("J. Smith"), result2.alternativeNames)
258260
assertEquals(listOf("John Smith"), result2.relatives)

pir/pir-impl/src/test/java/com/duckduckgo/pir/impl/dashboard/messaging/handlers/PirWebMaintenanceScanStatusMessageHandlerTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ class PirWebMaintenanceScanStatusMessageHandlerTest {
254254
// Verify in-progress opt-out
255255
assertEquals(1, parsedResponse!!.inProgressOptOuts.size)
256256
val inProgressResult = parsedResponse.inProgressOptOuts[0]
257+
assertEquals(1L, inProgressResult.id)
257258
assertEquals("John Doe", inProgressResult.name)
258259
assertEquals(listOf("Johnny", "J. Doe"), inProgressResult.alternativeNames)
259260
assertEquals(listOf("Jane Doe"), inProgressResult.relatives)
@@ -271,6 +272,7 @@ class PirWebMaintenanceScanStatusMessageHandlerTest {
271272
// Verify completed opt-out
272273
assertEquals(1, parsedResponse.completedOptOuts.size)
273274
val completedResult = parsedResponse.completedOptOuts[0]
275+
assertEquals(1L, completedResult.id)
274276
assertEquals("John Doe", completedResult.name)
275277
assertEquals(TimeUnit.MILLISECONDS.toSeconds(1643673600000L), completedResult.removedDate)
276278
assertEquals(5, completedResult.matches)

0 commit comments

Comments
 (0)