Skip to content
Snippets Groups Projects
Unverified Commit 9662460c authored by Kolya Opahle's avatar Kolya Opahle Committed by GitHub
Browse files

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


* Fixed an issue in ExposureRiskMetadataDonor where mostRecentDateAtRiskLevel was set to the calculation timestamp instead of the encounter timestamp

Signed-off-by: default avatarKolya Opahle <k.opahle@sap.com>

* Updated ExposureRiskMetadataDonorTest to reflect new data

Signed-off-by: default avatarKolya Opahle <k.opahle@sap.com>

* also updated low risk to same time in ExposureRiskMetadataDonorTest

Signed-off-by: default avatarKolya Opahle <k.opahle@sap.com>

* also updated low risk to same time in ExposureRiskMetadataDonorTest

Signed-off-by: default avatarKolya Opahle <k.opahle@sap.com>

Co-authored-by: default avatarharambasicluka <64483219+harambasicluka@users.noreply.github.com>
parent fa6ba90f
No related branches found
No related tags found
No related merge requests found
......@@ -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()
......
......@@ -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
......@@ -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()
......@@ -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
)
)
)
......@@ -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()
......@@ -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
)
)
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment