Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

PPA Exposure Risk Metadata mostRecentDateAtRiskLevel not correct (EXPOSUREAPP-5202) #2390

Merged
merged 5 commits into from Feb 17, 2021
Merged

PPA Exposure Risk Metadata mostRecentDateAtRiskLevel not correct (EXPOSUREAPP-5202) #2390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0be3dc
Fixed an issue in ExposureRiskMetadataDonor where mostRecentDateAtRis…
kolyaopahle Feb 17, 2021
a071057
Updated ExposureRiskMetadataDonorTest to reflect new data
kolyaopahle Feb 17, 2021
7afed24
also updated low risk to same time in ExposureRiskMetadataDonorTest
kolyaopahle Feb 17, 2021
60b8b3f
also updated low risk to same time in ExposureRiskMetadataDonorTest
kolyaopahle Feb 17, 2021
a99cd57
Merge branch 'release/1.13.x' into fix/5202-wrong-value-used-in-date-…
harambasicluka Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...awarnapp/datadonation/analytics/modules/exposureriskmetadata/ExposureRiskMetadataDonor.kt
View file
Open in desktop
Expand Up @@ -27,13 +27,14 @@ class ExposureRiskMetadataDonor @Inject constructor(
.lastCalculated

val riskLevelForMetadata = lastRiskResult.toMetadataRiskLevel()
val mostRecentDateAtRiskLevel = lastRiskResult.lastRiskEncounterAt?.millis ?: -1

val newMetadata = PpaData.ExposureRiskMetadata.newBuilder()
.setRiskLevel(riskLevelForMetadata)
.setRiskLevelChangedComparedToPreviousSubmission(previousMetadata?.riskLevel != riskLevelForMetadata)
.setMostRecentDateAtRiskLevel(lastRiskResult.calculatedAt.millis)
.setMostRecentDateAtRiskLevel(mostRecentDateAtRiskLevel)
.setDateChangedComparedToPreviousSubmission(
previousMetadata?.mostRecentDateAtRiskLevel != lastRiskResult.calculatedAt.millis
previousMetadata?.mostRecentDateAtRiskLevel != mostRecentDateAtRiskLevel
)
.build()

Expand Down
22 changes: 11 additions & 11 deletions ...java/de/rki/coronawarnapp/datadonation/analytics/modules/ExposureRiskMetadataDonorTest.kt
View file
Open in desktop
Expand Up @@ -27,12 +27,16 @@ class ExposureRiskMetadataDonorTest : BaseTest() {
@MockK lateinit var highAggregatedRiskResult: AggregatedRiskResult
@MockK lateinit var lowAggregatedRiskResult: AggregatedRiskResult

private val baseDate: Instant = Instant.ofEpochMilli(101010)

@BeforeEach
fun setup() {
MockKAnnotations.init(this)

every { highAggregatedRiskResult.isIncreasedRisk() } returns true
every { highAggregatedRiskResult.mostRecentDateWithHighRisk } returns baseDate
every { lowAggregatedRiskResult.isIncreasedRisk() } returns false
every { lowAggregatedRiskResult.mostRecentDateWithHighRisk } returns baseDate
}

@AfterEach
Expand Down Expand Up @@ -60,11 +64,9 @@ class ExposureRiskMetadataDonorTest : BaseTest() {

@Test
fun `risk metadata is properly collected`() {
val recentDate = Instant.now()

val expectedMetadata = PpaData.ExposureRiskMetadata.newBuilder()
.setRiskLevel(PpaData.PPARiskLevel.RISK_LEVEL_HIGH)
.setMostRecentDateAtRiskLevel(recentDate.millis)
.setMostRecentDateAtRiskLevel(baseDate.millis)
.setRiskLevelChangedComparedToPreviousSubmission(true)
.setDateChangedComparedToPreviousSubmission(true)
.build()
Expand All @@ -75,12 +77,12 @@ class ExposureRiskMetadataDonorTest : BaseTest() {
createRiskLevelResult(
aggregatedRiskResult = highAggregatedRiskResult,
failureReason = null,
calculatedAt = recentDate
calculatedAt = baseDate
),
createRiskLevelResult(
aggregatedRiskResult = lowAggregatedRiskResult,
failureReason = RiskLevelResult.FailureReason.UNKNOWN,
calculatedAt = recentDate
calculatedAt = baseDate
)
)
)
Expand All @@ -100,18 +102,16 @@ class ExposureRiskMetadataDonorTest : BaseTest() {

@Test
fun `risk metadata change is properly collected`() {
val recentDate = Instant.now()

val initialMetadata = PpaData.ExposureRiskMetadata.newBuilder()
.setRiskLevel(PpaData.PPARiskLevel.RISK_LEVEL_HIGH)
.setMostRecentDateAtRiskLevel(recentDate.millis)
.setMostRecentDateAtRiskLevel(baseDate.millis)
.setRiskLevelChangedComparedToPreviousSubmission(true)
.setDateChangedComparedToPreviousSubmission(true)
.build()

val expectedMetadata = PpaData.ExposureRiskMetadata.newBuilder()
.setRiskLevel(PpaData.PPARiskLevel.RISK_LEVEL_HIGH)
.setMostRecentDateAtRiskLevel(recentDate.millis)
.setMostRecentDateAtRiskLevel(baseDate.millis)
.setRiskLevelChangedComparedToPreviousSubmission(false)
.setDateChangedComparedToPreviousSubmission(false)
.build()
Expand All @@ -123,12 +123,12 @@ class ExposureRiskMetadataDonorTest : BaseTest() {
createRiskLevelResult(
aggregatedRiskResult = highAggregatedRiskResult,
failureReason = null,
calculatedAt = recentDate
calculatedAt = baseDate
),
createRiskLevelResult(
aggregatedRiskResult = lowAggregatedRiskResult,
failureReason = RiskLevelResult.FailureReason.UNKNOWN,
calculatedAt = recentDate
calculatedAt = baseDate
)
)
)
Expand Down