Move side menu counts to a 'Counters' screen

Author: LZRS

android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/AppRegisterRepository.kt

@@ -18,6 +18,8 @@ package org.smartregister.fhircore.engine.data.local.register
 
 import com.google.android.fhir.FhirEngine
 import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.withContext
 import org.hl7.fhir.r4.model.Patient
 import org.hl7.fhir.r4.model.Resource
@@ -129,7 +131,6 @@ constructor(
   }
 
   override suspend fun countRegisterFiltered(
-    appFeatureName: String?,
     healthModule: HealthModule,
     filters: RegisterFilter,
   ): Long {
@@ -151,20 +152,18 @@ constructor(
         }
 
         registerDaoFactory.registerDaoMap[healthModule]?.countRegisterFiltered(
-          appFeatureName,
           filters,
         ) ?: 0
       }
     }
   }
 
   override suspend fun countRegisterData(
-    appFeatureName: String?,
     healthModule: HealthModule,
-  ): Long =
+  ): Flow<Long> =
     withContext(dispatcherProvider.io()) {
       tracer.traceSuspend("${healthModule.name.camelCase()}.countRegisterData") {
-        registerDaoFactory.registerDaoMap[healthModule]?.countRegisterData(appFeatureName) ?: 0
+        registerDaoFactory.registerDaoMap[healthModule]?.countRegisterData() ?: emptyFlow()
       }
     }
 

android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/AncPatientRegisterDao.kt

@@ -20,7 +20,6 @@ import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.get
 import com.google.android.fhir.search.Order
-import com.google.android.fhir.search.count
 import com.google.android.fhir.search.search
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -66,10 +65,9 @@ constructor(
         .search<Condition> {
           //         [].forEach { filterBy(it) }
           sort(Patient.NAME, Order.ASCENDING)
-          count =
-            if (loadAll) {
-              countRegisterData(appFeatureName).toInt()
-            } else PaginationConstant.DEFAULT_PAGE_SIZE + PaginationConstant.EXTRA_ITEM_COUNT
+          if (!loadAll) {
+            count = PaginationConstant.DEFAULT_PAGE_SIZE + PaginationConstant.EXTRA_ITEM_COUNT
+          }
           from = currentPage * PaginationConstant.DEFAULT_PAGE_SIZE
         }
         .map { it.resource }
@@ -143,7 +141,6 @@ constructor(
     )
   }
 
-  override suspend fun countRegisterData(appFeatureName: String?) = 0L
   //    fhirEngine.count<Condition> { getRegisterDataFilters().forEach { filterBy(it) } }
 
   private fun getVisitStatus(carePlans: List<CarePlan>): VisitStatus {

android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/AppointmentRegisterDao.kt

@@ -27,6 +27,8 @@ import java.util.Calendar
 import java.util.Date
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import org.hl7.fhir.r4.model.Appointment
 import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.DateTimeType
@@ -85,16 +87,35 @@ constructor(
   private fun applicationConfiguration(): ApplicationConfiguration =
     configurationRegistry.getAppConfigs()
 
-  override suspend fun countRegisterData(appFeatureName: String?): Long {
+  override suspend fun countRegisterData(): Flow<Long> {
+    var counter = 0L
+    var offset = 0
+    val pageCount = 100
     val dateOfAppointment = Calendar.getInstance().time
-    return fhirEngine
+    fhirEngine
       .search<Appointment> { genericFilter(dateOfAppointment) }
       .map { it.resource }
       .count { isAppointmentValid(it) }
       .toLong()
+
+    return flow {
+      do {
+        val appointments =
+          fhirEngine.search<Appointment> {
+            genericFilter(dateOfAppointment)
+            from = offset
+            count = pageCount
+          }
+        offset += appointments.size
+        val validAppointmentCount =
+          appointments.map { it.resource }.count { isAppointmentValid(it) }
+        counter += validAppointmentCount
+        emit(counter)
+      } while (appointments.isNotEmpty())
+    }
   }
 
-  override suspend fun countRegisterFiltered(appFeatureName: String?, filters: RegisterFilter) =
+  override suspend fun countRegisterFiltered(filters: RegisterFilter): Long =
     searchAppointments(filters, loadAll = true).count().toLong()
 
   private suspend fun patientCategoryMatches(

android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/FamilyRegisterDao.kt

@@ -23,6 +23,8 @@ import com.google.android.fhir.search.search
 import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import org.hl7.fhir.r4.model.CarePlan
 import org.hl7.fhir.r4.model.Condition
 import org.hl7.fhir.r4.model.Flag
@@ -76,10 +78,9 @@ constructor(
     val families =
       fhirEngine.search<Group> {
         getRegisterDataFilters(FAMILY.name).forEach { filterBy(it) }
-        count =
-          if (loadAll) {
-            countRegisterData(appFeatureName).toInt()
-          } else PaginationConstant.DEFAULT_PAGE_SIZE + PaginationConstant.EXTRA_ITEM_COUNT
+        if (!loadAll) {
+          count = PaginationConstant.DEFAULT_PAGE_SIZE + PaginationConstant.EXTRA_ITEM_COUNT
+        }
         from = currentPage * PaginationConstant.DEFAULT_PAGE_SIZE
       }
 
@@ -140,14 +141,18 @@ constructor(
     )
   }
 
-  override suspend fun countRegisterData(appFeatureName: String?): Long {
+  override suspend fun countRegisterData(): Flow<Long> {
     // TODO fix this workaround for groups count
-    return fhirEngine
-      .search<Group> { getRegisterDataFilters(FAMILY.name).forEach { filterBy(it) } }
-      .map { it.resource }
-      .filter { it.active && !it.name.isNullOrEmpty() }
-      .size
-      .toLong()
+    return flow {
+      val count =
+        fhirEngine
+          .search<Group> { getRegisterDataFilters(FAMILY.name).forEach { filterBy(it) } }
+          .map { it.resource }
+          .filter { it.active && !it.name.isNullOrEmpty() }
+          .size
+          .toLong()
+      emit(count)
+    }
   }
 
   private suspend fun loadFamilyHead(family: Group) =

android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt

@@ -29,6 +29,8 @@ import com.google.android.fhir.search.search
 import javax.inject.Inject
 import javax.inject.Provider
 import javax.inject.Singleton
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import org.hl7.fhir.r4.model.CodeType
 import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
@@ -103,6 +105,15 @@ constructor(
 
   private suspend fun searchRegisterData(block: Search.() -> Unit = {}) =
     fhirEngine.search<Patient> {
+      filter(Patient.ACTIVE, { value = of(true) })
+      filter(Patient.DECEASED, { value = of(false) })
+      filter(
+        Patient.GENDER,
+        { value = of("male") },
+        { value = of("female") },
+        operation = Operation.OR,
+      )
+
       revInclude<Condition>(Condition.SUBJECT) {
         filter(
           Condition.CODE,
@@ -169,7 +180,6 @@ constructor(
     appFeatureName: String?,
   ): List<RegisterData> {
     val patients = searchRegisterData {
-      filter(Patient.ACTIVE, { value = of(true) })
       if (!loadAll) {
         count = PaginationConstant.DEFAULT_PAGE_SIZE + PaginationConstant.EXTRA_ITEM_COUNT
       }
@@ -239,16 +249,39 @@ constructor(
     )
   }
 
-  override suspend fun countRegisterData(appFeatureName: String?): Long {
-    return fhirEngine
-      .search<Patient> { filter(Patient.ACTIVE, { value = of(true) }) }
-      .map { it.resource }
-      .filter(this::isValidPatient)
-      .filterNot {
-        it.extractHealthStatusFromMeta(patientTypeMetaTagCodingSystem) == HealthStatus.DEFAULT
-      }
-      .size
-      .toLong()
+  override suspend fun countRegisterData(): Flow<Long> {
+    var counter = 0L
+    var offset = 0
+    val pageCount = 100
+
+    return flow {
+      do {
+        val patients =
+          fhirEngine.search<Patient> {
+            filter(Patient.ACTIVE, { value = of(true) })
+            filter(Patient.DECEASED, { value = of(false) })
+            filter(
+              Patient.GENDER,
+              { value = of("male") },
+              { value = of("female") },
+              operation = Operation.OR,
+            )
+            from = offset
+            count = pageCount
+          }
+        offset += patients.size
+        val validPatientCount =
+          patients
+            .map { it.resource }
+            .filter(this@HivRegisterDao::isValidPatient)
+            .filterNot {
+              it.extractHealthStatusFromMeta(patientTypeMetaTagCodingSystem) == HealthStatus.DEFAULT
+            }
+            .size
+        counter += validPatientCount
+        emit(counter)
+      } while (patients.isNotEmpty())
+    }
   }
 
   override suspend fun loadPatient(patientId: String) = fhirEngine.loadResource<Patient>(patientId)

android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/TracingRegisterDao.kt

@@ -32,8 +32,11 @@ import com.google.android.fhir.search.search
 import java.time.LocalDate
 import java.time.ZoneId
 import java.util.Date
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import org.hl7.fhir.r4.model.Appointment
 import org.hl7.fhir.r4.model.CarePlan
+import org.hl7.fhir.r4.model.CodeType
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.DateTimeType
 import org.hl7.fhir.r4.model.ListResource
@@ -104,9 +107,7 @@ abstract class TracingRegisterDao(
   private val filtersForValidTask: BaseSearch.() -> Unit = {
     filter(
       TokenClientParam("_tag"),
-      { value = of(tracingCoding) },
-      { value = of(alternateTracingCoding.value) },
-      operation = Operation.OR,
+      { value = of(CodeType(tracingCoding.code)) },
     )
     filter(
       Task.STATUS,
@@ -401,19 +402,30 @@ abstract class TracingRegisterDao(
       }
       .map { defaultRepository.loadResource(it.other) }
 
-  override suspend fun countRegisterFiltered(
-    appFeatureName: String?,
-    filters: RegisterFilter,
-  ): Long {
+  override suspend fun countRegisterFiltered(filters: RegisterFilter): Long {
     return searchRegister(filters, loadAll = true).count().toLong()
   }
 
-  override suspend fun countRegisterData(appFeatureName: String?): Long {
-    val patients =
-      fhirEngine
-        .search<Patient> { has<Task>(Task.SUBJECT) { filtersForValidTask() } }
-        .map { it.resource }
-    return patients.count { validTasks(it).any() }.toLong()
+  override suspend fun countRegisterData(): Flow<Long> {
+    var counter = 0L
+    var offset = 0
+    val pageCount = 100
+
+    return flow {
+      do {
+        val tracingPatients =
+          fhirEngine.search<Patient> {
+            has<Task>(Task.SUBJECT) { filtersForValidTask() }
+            from = offset
+            count = pageCount
+          }
+        offset += tracingPatients.size
+        val validTracingPatientsCount =
+          tracingPatients.map { it.resource }.count { validTasks(it).any() }.toLong()
+        counter += validTracingPatientsCount
+        emit(counter)
+      } while (tracingPatients.isNotEmpty())
+    }
   }
 
   private fun applicationConfiguration(): ApplicationConfiguration =

android/engine/src/main/java/org/smartregister/fhircore/engine/domain/model/SideMenuOption.kt

@@ -34,9 +34,6 @@ data class SideMenuOption(
   val healthModule: HealthModule = HealthModule.DEFAULT,
   val iconResource: Int,
   val titleResource: Int,
-  val count: Long = SIDE_MENU_COUNT_NOT_SET,
-  val getCount: suspend () -> Long = { count },
-  val showCount: Boolean = true,
+  val count: Int = 0,
+  val showCount: Boolean = false,
 )
-
-const val SIDE_MENU_COUNT_NOT_SET = -1L

android/engine/src/main/java/org/smartregister/fhircore/engine/domain/repository/RegisterDao.kt

@@ -16,6 +16,8 @@
 
 package org.smartregister.fhircore.engine.domain.repository
 
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
 import org.smartregister.fhircore.engine.data.local.RegisterFilter
 import org.smartregister.fhircore.engine.domain.model.ProfileData
 import org.smartregister.fhircore.engine.domain.model.RegisterData
@@ -45,11 +47,11 @@ interface RegisterDao {
     TODO("default")
   }
 
-  suspend fun countRegisterFiltered(appFeatureName: String? = null, filters: RegisterFilter): Long {
+  suspend fun countRegisterFiltered(filters: RegisterFilter): Long {
     TODO("default")
   }
 
-  suspend fun countRegisterData(appFeatureName: String?): Long = 0
+  suspend fun countRegisterData(): Flow<Long> = emptyFlow()
 
   suspend fun loadProfileData(appFeatureName: String?, resourceId: String): ProfileData? = null
 }

android/engine/src/main/java/org/smartregister/fhircore/engine/domain/repository/RegisterRepository.kt

@@ -16,6 +16,7 @@
 
 package org.smartregister.fhircore.engine.domain.repository
 
+import kotlinx.coroutines.flow.Flow
 import org.smartregister.fhircore.engine.appfeature.model.HealthModule
 import org.smartregister.fhircore.engine.data.local.RegisterFilter
 import org.smartregister.fhircore.engine.domain.model.ProfileData
@@ -39,15 +40,13 @@ interface RegisterRepository {
   ): List<RegisterData>
 
   suspend fun countRegisterFiltered(
-    appFeatureName: String? = null,
     healthModule: HealthModule,
     filters: RegisterFilter,
   ): Long
 
   suspend fun countRegisterData(
-    appFeatureName: String? = null,
     healthModule: HealthModule = HealthModule.DEFAULT,
-  ): Long
+  ): Flow<Long>
 
   suspend fun loadPatientProfileData(
     appFeatureName: String? = null,

android/engine/src/main/java/org/smartregister/fhircore/engine/sync/OnSyncListener.kt

@@ -22,7 +22,7 @@ import com.google.android.fhir.sync.SyncJobStatus
  * An interface the exposes a callback method [onSync] which accepts an application level FHIR Sync
  * [State].
  */
-interface OnSyncListener {
+fun interface OnSyncListener {
   /** Callback method invoked to handle sync [state] */
   fun onSync(state: SyncJobStatus)
 }

android/engine/src/main/java/org/smartregister/fhircore/engine/sync/SyncBroadcaster.kt

@@ -121,7 +121,7 @@ constructor(
       is SyncJobStatus.Failed,
       is SyncJobStatus.Succeeded, -> {
         if (syncJobStatus is SyncJobStatus.Failed) {
-          syncJobStatus.exceptions.forEachIndexed { _, resourceSyncException ->
+          syncJobStatus.exceptions?.forEachIndexed { _, resourceSyncException ->
             Firebase.crashlytics.recordException(resourceSyncException.exception)
           }
         }