Add Local Incidence Card to Statistics (EXPOSUREAPP-7446)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/common/Districts.kt

@@ -15,8 +15,7 @@ class Districts @Inject constructor(
  @AppContext private val context: Context,
  @BaseGson private val gson: Gson
 ) {
-
- suspend fun loadDistricts(): List<District> {
+ fun loadDistricts(): List<District> {
  return try {
  val rawDistricts = context.assets.open(ASSET_NAME).bufferedReader().use { it.readText() }
  gson.fromJson(rawDistricts)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/StatsItem.kt

@@ -1,7 +1,7 @@
 package de.rki.coronawarnapp.statistics
 
 import de.rki.coronawarnapp.server.protocols.internal.stats.KeyFigureCardOuterClass.KeyFigure
-import de.rki.coronawarnapp.server.protocols.internal.stats.LocalStatisticsOuterClass
+import de.rki.coronawarnapp.statistics.local.storage.SelectedDistrict
 import org.joda.time.Instant
 import timber.log.Timber
 
@@ -22,6 +22,20 @@ data class StatisticsData(
  }
 }
 
+data class LocalStatisticsData(
+ val items: List<LocalIncidenceStats> = emptyList()
+) {
+ val isDataAvailable: Boolean = items.isNotEmpty()
+
+ override fun toString(): String {
+ return "StatisticsData(cards=${
+ items.map {
+ it.cardType.name + " " + it.updatedAt
+ }
+ })"
+ }
+}
+
 sealed class GenericStatsItem
 
 data class AddStatsItem(val isEnabled: Boolean) : GenericStatsItem()
@@ -91,7 +105,7 @@ data class IncidenceStats(
 data class LocalIncidenceStats(
  override val updatedAt: Instant,
  override val keyFigures: List<KeyFigure>,
- val federalState: LocalStatisticsOuterClass.FederalStateData.FederalState
+ val selectedDistrict: SelectedDistrict?,
 ) : StatsItem(cardType = Type.LOCAL_INCIDENCE) {
 
  val sevenDayIncidence: KeyFigure

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/local/FederalStateToPackageId.kt

@@ -16,5 +16,10 @@ enum class FederalStateToPackageId(val packageId: Int) {
  SN(6),
  ST(6),
  SH(4),
- TH(6)
+ TH(6);
+
+ companion object {
+ fun getForName(name: String): FederalStateToPackageId? =
+ values().firstOrNull { it.name == name }
+ }
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/local/source/LocalStatisticsParser.kt

@@ -4,47 +4,38 @@ import dagger.Reusable
 import de.rki.coronawarnapp.server.protocols.internal.stats.KeyFigureCardOuterClass
 import de.rki.coronawarnapp.server.protocols.internal.stats.LocalStatisticsOuterClass
 import de.rki.coronawarnapp.statistics.LocalIncidenceStats
-import de.rki.coronawarnapp.statistics.StatisticsData
+import de.rki.coronawarnapp.statistics.LocalStatisticsData
+import de.rki.coronawarnapp.statistics.local.storage.LocalStatisticsConfigStorage
 import org.joda.time.Instant
 import timber.log.Timber
 import javax.inject.Inject
 
 @Reusable
-class LocalStatisticsParser @Inject constructor() {
-
- fun parse(rawData: ByteArray): StatisticsData {
+class LocalStatisticsParser @Inject constructor(
+ private val localStatisticsConfigStorage: LocalStatisticsConfigStorage,
+) {
+ fun parse(rawData: ByteArray): LocalStatisticsData {
  val parsed = LocalStatisticsOuterClass.LocalStatistics.parseFrom(rawData)
 
- val mappedFederalStates = parsed.federalStateDataList.mapNotNull { rawState ->
- try {
- val updatedAt = Instant.ofEpochSecond(rawState.updatedAt)
- val stateIncidenceKeyFigure = rawState.sevenDayIncidence.toKeyFigure()
-
- LocalIncidenceStats(
- updatedAt = updatedAt,
- keyFigures = listOf(stateIncidenceKeyFigure),
- federalState = rawState.federalState
- ).also {
- Timber.tag(TAG).v("Parsed %s", it.toString().replace("\n", ", "))
- it.requireValidity()
- }
- } catch (e: Exception) {
- Timber.tag(TAG).e("Failed to parse raw federal state: %s", rawState)
- null
- }
- }
-
  val mappedAdministrativeUnit = parsed.administrativeUnitDataList.mapNotNull { rawState ->
  try {
  val updatedAt = Instant.ofEpochSecond(rawState.updatedAt)
  val administrativeUnitIncidenceKeyFigure = rawState.sevenDayIncidence.toKeyFigure()
 
- val federalStateId = rawState.administrativeUnitShortId.toString().dropLast(3).toInt()
+ val leftPaddedShortId = rawState.administrativeUnitShortId
+ .toString()
+ .padStart(5, '0')
+
+ val districtId = "110$leftPaddedShortId".toInt()
+
+ val selectedDistrict = localStatisticsConfigStorage.activeDistricts.value.firstOrNull {
+ it.district.districtId == districtId
+ }
 
  LocalIncidenceStats(
  updatedAt = updatedAt,
  keyFigures = listOf(administrativeUnitIncidenceKeyFigure),
- federalState = LocalStatisticsOuterClass.FederalStateData.FederalState.forNumber(federalStateId)
+ selectedDistrict = selectedDistrict
  ).also {
  Timber.tag(TAG).v("Parsed %s", it.toString().replace("\n", ", "))
  it.requireValidity()
@@ -55,9 +46,7 @@ class LocalStatisticsParser @Inject constructor() {
  }
  }
 
- val mappedItems = mappedFederalStates + mappedAdministrativeUnit
-
- return StatisticsData(items = mappedItems).also {
+ return LocalStatisticsData(items = mappedAdministrativeUnit).also {
  Timber.tag(TAG).d("Parsed local statistics data, %d cards.", it.items.size)
  }
  }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/local/source/LocalStatisticsProvider.kt

@@ -1,6 +1,6 @@
 package de.rki.coronawarnapp.statistics.local.source
 
-import de.rki.coronawarnapp.statistics.StatisticsData
+import de.rki.coronawarnapp.statistics.LocalStatisticsData
 import de.rki.coronawarnapp.statistics.local.FederalStateToPackageId
 import de.rki.coronawarnapp.statistics.local.storage.LocalStatisticsConfigStorage
 import de.rki.coronawarnapp.util.coroutine.AppScope
@@ -9,6 +9,8 @@ import de.rki.coronawarnapp.util.flow.HotDataFlow
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 import org.joda.time.Duration
 import timber.log.Timber
 import javax.inject.Inject
@@ -41,23 +43,35 @@ class LocalStatisticsProvider @Inject constructor(
  }
  }
 
- val current: Flow<List<StatisticsData>> = localStatisticsData.data
+ val current: Flow<LocalStatisticsData> = localStatisticsData.data.map {
+ val groupedStats = it.reduceOrNull { acc, localStatisticsData ->
+ LocalStatisticsData(acc.items + localStatisticsData.items)
+ } ?: LocalStatisticsData()
+
+ groupedStats.copy(
+ items = groupedStats.items.filter {
+ localStatisticsConfigStorage.activeDistricts.value.any { selected ->
+ selected.district.districtId == it.selectedDistrict?.district?.districtId
+ }
+ }.sortedBy { selected -> selected.selectedDistrict?.addedAt }.reversed()
+ )
+ }
 
- private fun fetchCacheFirst(): List<StatisticsData> {
+ private suspend fun fetchCacheFirst(): List<LocalStatisticsData> {
  Timber.tag(TAG).d("fromCache()")
 
- val targetedStates = localStatisticsConfigStorage.activeStates.value
+ val targetedStates = localStatisticsConfigStorage.activeStates.first()
 
  val cacheResults = targetedStates.map { fromCache(it) }
 
  if (cacheResults.contains(null)) {
  triggerUpdate()
  }
 
- return cacheResults.map { it ?: StatisticsData() }
+ return cacheResults.map { it ?: LocalStatisticsData() }
  }
 
- private fun fromCache(forState: FederalStateToPackageId): StatisticsData? = try {
+ private fun fromCache(forState: FederalStateToPackageId): LocalStatisticsData? = try {
  Timber.tag(TAG).d("fromCache(%s)", forState)
 
  localStatisticsCache.load(forState)?.let { localStatisticsParser.parse(it) }?.also {
@@ -68,15 +82,15 @@ class LocalStatisticsProvider @Inject constructor(
  null
  }
 
- private suspend fun fromServer(): List<StatisticsData> {
+ private suspend fun fromServer(): List<LocalStatisticsData> {
  Timber.tag(TAG).d("fromServer()")
 
- val targetedStates = localStatisticsConfigStorage.activeStates.value
+ val targetedStates = localStatisticsConfigStorage.activeStates.first()
 
  return targetedStates.map { fromServer(it) }
  }
 
- private suspend fun fromServer(forState: FederalStateToPackageId): StatisticsData {
+ private suspend fun fromServer(forState: FederalStateToPackageId): LocalStatisticsData {
  Timber.tag(TAG).d("fromServer(%s)", forState)
 
  val rawData = server.getRawLocalStatistics(forState)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/local/source/LocalStatisticsRetrievalScheduler.kt

@@ -6,7 +6,6 @@ import de.rki.coronawarnapp.util.coroutine.AppScope
 import de.rki.coronawarnapp.util.device.ForegroundState
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
@@ -24,7 +23,7 @@ class LocalStatisticsRetrievalScheduler @Inject constructor(
 
  private val updateStatsTrigger = combine(
  foregroundState.isInForeground,
- localStatisticsConfigStorage.activeStates.flow
+ localStatisticsConfigStorage.activeStates
  ) { isInForeground, activeStates ->
  val statsChanged = !lastActiveStates.containsAll(activeStates)
  lastActiveStates.clear()
@@ -36,7 +35,7 @@ class LocalStatisticsRetrievalScheduler @Inject constructor(
  statsChanged
  )
  isInForeground || statsChanged
- }.distinctUntilChanged()
+ }
 
  fun setup() {
  Timber.tag(TAG).i("setup()")

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/local/storage/LocalStatisticsConfigStorage.kt

@@ -1,23 +1,39 @@
 package de.rki.coronawarnapp.statistics.local.storage
 
 import android.content.Context
+import com.google.gson.Gson
 import de.rki.coronawarnapp.statistics.local.FederalStateToPackageId
 import de.rki.coronawarnapp.util.di.AppContext
+import de.rki.coronawarnapp.util.preferences.FlowPreference
 import de.rki.coronawarnapp.util.preferences.createFlowPreference
+import de.rki.coronawarnapp.util.serialization.BaseGson
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LocalStatisticsConfigStorage @Inject constructor(
- @AppContext val context: Context
+ @AppContext val context: Context,
+ @BaseGson private val gson: Gson,
 ) {
  private val prefs by lazy {
  context.getSharedPreferences("statistics_local_config", Context.MODE_PRIVATE)
  }
 
- val activeStates = prefs.createFlowPreference(PKEY_ACTIVE_STATES, emptyList<FederalStateToPackageId>())
+ val activeDistricts = prefs.createFlowPreference(
+ key = PKEY_ACTIVE_DISTRICTS,
+ reader = FlowPreference.gsonReader(gson, emptySet<SelectedDistrict>()),
+ writer = FlowPreference.gsonWriter(gson)
+ )
+
+ val activeStates = activeDistricts.flow
+ .map {
+ it.map { district -> district.district.federalStateShortName }
+ .mapNotNull { stateId -> FederalStateToPackageId.getForName(stateId) }
+ .distinct()
+ }
 
  companion object {
- private const val PKEY_ACTIVE_STATES = "statistics.local.states"
+ private const val PKEY_ACTIVE_DISTRICTS = "statistics.local.districts"
  }
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/local/storage/SelectedDistrict.kt

@@ -0,0 +1,9 @@
+package de.rki.coronawarnapp.statistics.local.storage
+
+import de.rki.coronawarnapp.datadonation.analytics.common.Districts
+import org.joda.time.Instant
+
+data class SelectedDistrict(
+ val district: Districts.District,
+ val addedAt: Instant,
+)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/ui/homecards/StatisticsCardAdapter.kt

@@ -8,6 +8,7 @@ import de.rki.coronawarnapp.statistics.AppliedVaccinationRatesStats
 import de.rki.coronawarnapp.statistics.IncidenceStats
 import de.rki.coronawarnapp.statistics.InfectionStats
 import de.rki.coronawarnapp.statistics.KeySubmissionsStats
+import de.rki.coronawarnapp.statistics.LocalIncidenceStats
 import de.rki.coronawarnapp.statistics.PersonsVaccinatedCompletelyStats
 import de.rki.coronawarnapp.statistics.PersonsVaccinatedOnceStats
 import de.rki.coronawarnapp.statistics.SevenDayRValue
@@ -17,6 +18,7 @@ import de.rki.coronawarnapp.statistics.ui.homecards.cards.AppliedVaccinationRate
 import de.rki.coronawarnapp.statistics.ui.homecards.cards.IncidenceCard
 import de.rki.coronawarnapp.statistics.ui.homecards.cards.InfectionsCard
 import de.rki.coronawarnapp.statistics.ui.homecards.cards.KeySubmissionsCard
+import de.rki.coronawarnapp.statistics.ui.homecards.cards.LocalIncidenceCard
 import de.rki.coronawarnapp.statistics.ui.homecards.cards.PersonsVaccinatedCompletelyCard
 import de.rki.coronawarnapp.statistics.ui.homecards.cards.PersonsVaccinatedOnceCard
 import de.rki.coronawarnapp.statistics.ui.homecards.cards.SevenDayRValueCard
@@ -41,6 +43,7 @@ class StatisticsCardAdapter :
  DataBinderMod<StatisticsCardItem, ItemVH<StatisticsCardItem, ViewBinding>>(data),
  TypedVHCreatorMod({ data[it].stats is InfectionStats }) { InfectionsCard(it) },
  TypedVHCreatorMod({ data[it].stats is IncidenceStats }) { IncidenceCard(it) },
+ TypedVHCreatorMod({ data[it].stats is LocalIncidenceStats }) { LocalIncidenceCard(it) },
  TypedVHCreatorMod({ data[it].stats is KeySubmissionsStats }) { KeySubmissionsCard(it) },
  TypedVHCreatorMod({ data[it].stats is SevenDayRValue }) { SevenDayRValueCard(it) },
  TypedVHCreatorMod({ data[it].stats is PersonsVaccinatedOnceStats }) { PersonsVaccinatedOnceCard(it) },

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/ui/homecards/StatisticsHomeCard.kt

@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.PagerSnapHelper
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.HomeStatisticsScrollcontainerBinding
 import de.rki.coronawarnapp.statistics.GenericStatsItem
+import de.rki.coronawarnapp.statistics.LocalIncidenceStats
 import de.rki.coronawarnapp.statistics.StatisticsData
 import de.rki.coronawarnapp.statistics.ui.homecards.cards.StatisticsCardItem
 import de.rki.coronawarnapp.ui.main.home.HomeAdapter
@@ -59,7 +60,7 @@ class StatisticsHomeCard(
  savedStateKey = "stats:${item.stableId}"
 
  item.data.items.map {
- StatisticsCardItem(it, item.onClickListener)
+ StatisticsCardItem(it, item.onClickListener, item.onRemoveListener)
  }.let {
  statisticsCardAdapter.update(it)
  }
@@ -81,7 +82,8 @@ class StatisticsHomeCard(
 
  data class Item(
  val data: StatisticsData,
- val onClickListener: (GenericStatsItem) -> Unit
+ val onClickListener: (GenericStatsItem) -> Unit,
+ val onRemoveListener: (LocalIncidenceStats) -> Unit = {},
  ) : HomeItem {
  override val stableId: Long = Item::class.java.name.hashCode().toLong()