Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ class PirWebInitialScanStatusMessageHandler @Inject constructor(
private suspend fun getResultsFound(): List<ScanResult> {
return stateProvider.getScanResults().map {
ScanResult(
id = it.extractedProfile.dbId,
dataBroker = DataBroker(
name = it.broker.name,
url = it.broker.url,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ class PirWebMaintenanceScanStatusMessageHandler @Inject constructor(
private suspend fun getCompletedOptOuts(): List<PirWebMessageResponse.ScanResult> {
return statusProvider.getRemovedOptOuts().map {
PirWebMessageResponse.ScanResult(
id = it.result.extractedProfile.dbId,
dataBroker = DataBroker(
name = it.result.broker.name,
url = it.result.broker.url,
Expand Down Expand Up @@ -131,6 +132,7 @@ class PirWebMaintenanceScanStatusMessageHandler @Inject constructor(
private suspend fun getInProgressOptOuts(): List<PirWebMessageResponse.ScanResult> {
return statusProvider.getInProgressOptOuts().map {
PirWebMessageResponse.ScanResult(
id = it.extractedProfile.dbId,
dataBroker = DataBroker(
name = it.broker.name,
url = it.broker.url,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ScanResultAddress>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
Loading