diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/BaseRiskLevelStorage.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/BaseRiskLevelStorage.kt index 8b84f939545f110e36ca9d2d3efba290e490f432..556897b6f5353d277f4fcc4ab2b797ac2b2e03bd 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/BaseRiskLevelStorage.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/BaseRiskLevelStorage.kt @@ -2,6 +2,7 @@ package de.rki.coronawarnapp.risk.storage import de.rki.coronawarnapp.risk.RiskLevelResult import de.rki.coronawarnapp.risk.RiskLevelTaskResult +import de.rki.coronawarnapp.risk.TraceLocationCheckInRisk import de.rki.coronawarnapp.risk.result.AggregatedRiskPerDateResult import de.rki.coronawarnapp.risk.storage.internal.RiskResultDatabase import de.rki.coronawarnapp.risk.storage.internal.riskresults.PersistedRiskLevelResultDao @@ -13,6 +14,7 @@ import de.rki.coronawarnapp.util.flow.shareLatest import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import timber.log.Timber @@ -126,14 +128,16 @@ abstract class BaseRiskLevelStorage constructor( override val aggregatedRiskPerDateResults: Flow<List<AggregatedRiskPerDateResult>> by lazy { aggregatedRiskPerDateResultTables.allEntries() .map { - it.map { - persistedAggregatedRiskPerDateResult -> + it.map { persistedAggregatedRiskPerDateResult -> persistedAggregatedRiskPerDateResult.toAggregatedRiskPerDateResult() } } .shareLatest(tag = TAG, scope = scope) } + override val traceLocationCheckInRiskStates: Flow<List<TraceLocationCheckInRisk>> + get() = flowOf(emptyList<TraceLocationCheckInRisk>()) // TODO("Not yet implemented") + private suspend fun insertAggregatedRiskPerDateResults( aggregatedRiskPerDateResults: List<AggregatedRiskPerDateResult> ) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/RiskLevelStorage.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/RiskLevelStorage.kt index 5a7ce88567b188b066fc4c01448d6fa5474f8fad..1bc99e1f942dabbb98fd21ff9b103916774ff875 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/RiskLevelStorage.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/storage/RiskLevelStorage.kt @@ -1,6 +1,7 @@ package de.rki.coronawarnapp.risk.storage import de.rki.coronawarnapp.risk.RiskLevelResult +import de.rki.coronawarnapp.risk.TraceLocationCheckInRisk import de.rki.coronawarnapp.risk.result.AggregatedRiskPerDateResult import kotlinx.coroutines.flow.Flow @@ -36,6 +37,12 @@ interface RiskLevelStorage { */ val aggregatedRiskPerDateResults: Flow<List<AggregatedRiskPerDateResult>> + /** + * Risk level per date/day and checkIn + * Used by contact diary overview + */ + val traceLocationCheckInRiskStates: Flow<List<TraceLocationCheckInRisk>> + suspend fun deleteAggregatedRiskPerDateResults(results: List<AggregatedRiskPerDateResult>) suspend fun storeResult(result: RiskLevelResult)