Merge branch 'mwcore-dev' into mwcore-p2p-setup

android/engine/build.gradle

@@ -222,7 +222,7 @@ dependencies {
         transitive = true
     }
 
-    api('org.smartregister:engine:0.1.0-beta04-preview4-SNAPSHOT') {
+    api('org.smartregister:engine:0.1.0-beta04-preview4.1-SNAPSHOT') {
         transitive = true
         exclude group: 'org.hamcrest', module: 'hamcrest-core'
         exclude group: 'javax.xml.bind', module: 'jaxb-api'

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

@@ -21,12 +21,10 @@ import androidx.annotation.VisibleForTesting.Companion.PROTECTED
 import ca.uhn.fhir.rest.gclient.TokenClientParam
 import ca.uhn.fhir.rest.param.ParamPrefixEnum
 import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.get
 import com.google.android.fhir.logicalId
+import com.google.android.fhir.search.BaseSearch
 import com.google.android.fhir.search.Operation
 import com.google.android.fhir.search.Order
-import com.google.android.fhir.search.Search
-import com.google.android.fhir.search.count
 import com.google.android.fhir.search.filter.ReferenceParamFilterCriterion
 import com.google.android.fhir.search.filter.TokenParamFilterCriterion
 import com.google.android.fhir.search.has
@@ -99,7 +97,7 @@ constructor(
     sharedPreferencesHelper.read<Practitioner>(key = LOGGED_IN_PRACTITIONER, decodeWithGson = true)
   }
 
-  private fun Search.validTasksFilters() {
+  private val filtersForValidTask: BaseSearch.() -> Unit = {
     filter(
       TokenClientParam("_tag"),
       { value = of(tracingCoding) },
@@ -134,7 +132,7 @@ constructor(
 
           if (page >= 0) from = page * PaginationConstant.DEFAULT_PAGE_SIZE
 
-          has<Task>(Task.SUBJECT) { this@search.validTasksFilters() }
+          has<Task>(Task.SUBJECT) { filtersForValidTask() }
 
           filters.patientCategory?.let {
             val paramQueries: List<(TokenParamFilterCriterion.() -> Unit)> =
@@ -193,7 +191,7 @@ constructor(
       if (patientrefs.isNotEmpty()) {
         fhirEngine
           .search<Task> {
-            validTasksFilters()
+            filtersForValidTask()
             filter(Task.SUBJECT, *patientrefs, operation = Operation.OR)
           }
           .map { it.resource }
@@ -274,7 +272,7 @@ constructor(
   ): List<RegisterData> {
 
     val tracingPatients =
-      fhirEngine.search<Patient> { has<Task>(Task.SUBJECT) { this@search.validTasksFilters() } }
+      fhirEngine.search<Patient> { has<Task>(Task.SUBJECT) { filtersForValidTask() } }
 
     return tracingPatients
       .map { it.resource }
@@ -394,9 +392,9 @@ constructor(
 
   override suspend fun countRegisterData(appFeatureName: String?): Long {
     val patients =
-      fhirEngine
-        .search<Patient> { has<Task>(Task.SUBJECT) { this@search.validTasksFilters() } }
-        .map { it.resource }
+      fhirEngine.search<Patient> { has<Task>(Task.SUBJECT) { filtersForValidTask() } }.map {
+        it.resource
+      }
     return patients.count { validTasks(it).any() }.toLong()
   }
 
@@ -407,7 +405,7 @@ constructor(
     val patientTasks =
       fhirEngine
         .search<Task> {
-          validTasksFilters()
+          filtersForValidTask()
           filter(Task.SUBJECT, { value = patient.referenceValue() })
         }
         .map { it.resource }

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

@@ -17,15 +17,25 @@
 package org.smartregister.fhircore.engine.sync
 
 import android.content.Context
+import androidx.lifecycle.asFlow
+import androidx.work.WorkManager
+import androidx.work.hasKeyWithValueOfType
 import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.sync.FhirSyncWorker
 import com.google.android.fhir.sync.ResourceSyncException
 import com.google.android.fhir.sync.Sync
 import com.google.android.fhir.sync.SyncJobStatus
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.asFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.flatMapConcat
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.model.ResourceType
 import org.smartregister.fhircore.engine.R
@@ -57,6 +67,14 @@ constructor(
   val tokenAuthenticator: TokenAuthenticator,
   @ApplicationContext val appContext: Context
 ) {
+
+  private inline fun <reified W : FhirSyncWorker> getWorkerInfo(): Flow<SyncJobStatus> {
+    val oneTimeWorkName = "${W::class.java.name}-oneTimeSync"
+    val periodicWorkName = "${W::class.java.name}-periodicSync"
+
+    return getWorkerInfo(oneTimeWorkName)
+  }
+
   fun runSync(networkState: (Context) -> Boolean = { NetworkState(it).invoke() }) {
     Timber.i("Running one-time sync...")
     CoroutineScope(dispatcherProvider.io()).launch {
@@ -78,7 +96,9 @@ constructor(
         sharedSyncStatus.emit(SyncJobStatus.Failed(listOf(authFailResourceSyncException)))
         return@launch
       }
-      Sync.oneTimeSync<AppSyncWorker>(appContext).collect {
+
+      Sync.oneTimeSync<AppSyncWorker>(appContext)
+      getWorkerInfo<AppSyncWorker>().collect {
         sharedSyncStatus.emit(it)
         this@SyncBroadcaster.traceSync(it)
       }
@@ -111,6 +131,28 @@ constructor(
     }
   }
 
+  /**
+   * Workaround to ensure terminal SyncJobStatus, i.e SyncJobStatus.Failed and
+   * SyncJobStatus.Finished, get emitted
+   *
+   * Gets the worker info for the [FhirSyncWorker], including outputData
+   */
+  @OptIn(ExperimentalCoroutinesApi::class)
+  private fun getWorkerInfo(workerName: String): Flow<SyncJobStatus> =
+    WorkManager.getInstance(appContext)
+      .getWorkInfosForUniqueWorkLiveData(workerName)
+      .asFlow()
+      .flatMapConcat { it.asFlow() }
+      .flatMapConcat { workInfo ->
+        flowOf(workInfo.progress, workInfo.outputData)
+          .filter { it.keyValueMap.isNotEmpty() && it.hasKeyWithValueOfType<String>("StateType") }
+          .mapNotNull {
+            val state = it.getString("StateType")!!
+            val stateData = it.getString("State")
+            Sync.gson.fromJson(stateData, Class.forName(state)) as SyncJobStatus
+          }
+      }
+
   companion object {
     const val SYNC_TRACE = "runSync"
     const val SYNC_GLITCHES_METRIC = "sync_glitches"

android/engine/src/main/java/org/smartregister/fhircore/engine/util/TracingHelpers.kt

@@ -25,7 +25,14 @@ object TracingHelpers {
       "art-client-welcome-service-high-or-detectable-viral-load",
       "art-client-viral-load-collection",
       "exposed-infant-convert-to-art-client",
-      "patient-finish-visit"
+      "patient-finish-visit",
+      "exposed-infant-record-hiv-test-results",
+      "art-client-child-contact-registration",
+      "art-client-biological-parent-contact-registration",
+      "art-client-child-contact-registration",
+      "art-client-sexual-contact-registration",
+      "art-client-sibling-contact-registration",
+      "art-client-social-network-contact-registration"
     )
   const val tracingBundleId = "tracing"
   fun requireTracingTasks(id: String): Boolean =

android/quest/build.gradle

@@ -173,22 +173,22 @@ android {
             dimension "apps"
             applicationIdSuffix ".mwcore"
             versionNameSuffix "-mwcore"
-            versionCode 25
-            versionName "0.1.15"
+            versionCode 29
+            versionName "0.1.19"
         }
         mwcoreDev {
             dimension "apps"
             applicationIdSuffix ".mwcoreDev"
             versionNameSuffix "-mwcoreDev"
-            versionCode 25
-            versionName "0.1.15"
+            versionCode 29
+            versionName "0.1.19"
         }
         mwcoreProd {
             dimension "apps"
             applicationIdSuffix ".mwcoreProd"
             versionNameSuffix "-mwcoreProd"
-            versionCode 4
-            versionName "0.0.4"
+            versionCode 7
+            versionName "0.0.7"
         }
         afyayangu {
             dimension "apps"

android/quest/src/main/java/org/smartregister/fhircore/quest/QuestApplication.kt

@@ -16,6 +16,7 @@
 
 package org.smartregister.fhircore.quest
 
+import android.accounts.AccountManager
 import android.app.Activity
 import android.app.Application
 import android.content.Context
@@ -41,7 +42,6 @@ import org.smartregister.fhircore.engine.ui.appsetting.AppSettingActivity
 import org.smartregister.fhircore.engine.ui.login.LoginActivity
 import org.smartregister.fhircore.engine.ui.questionnaire.QuestionnaireItemViewHolderFactoryMatchersProviderFactoryImpl
 import org.smartregister.fhircore.engine.util.extension.getActivity
-import org.smartregister.fhircore.engine.util.extension.launchActivityWithNoBackStackHistory
 import org.smartregister.fhircore.engine.util.extension.showToast
 import timber.log.Timber
 
@@ -147,9 +147,15 @@ class QuestApplication :
         name !in activitiesAccessWithoutAuth
       }
       ?.let {
-        mForegroundActivityContext
-          ?.getActivity()
-          ?.launchActivityWithNoBackStackHistory<LoginActivity>()
+        mForegroundActivityContext?.getActivity()?.run {
+          this.startActivity(
+            Intent(this, LoginActivity::class.java).apply {
+              accountAuthenticator.retrieveLastLoggedInUsername()?.takeIf { it.isNotBlank() }?.let {
+                putExtra(AccountManager.KEY_ACCOUNT_NAME, it)
+              }
+            }
+          )
+        }
       }
   }
 

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/MeasureReportViewModel.kt

@@ -35,6 +35,7 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 import javax.inject.Inject
+import javax.inject.Provider
 import kotlin.math.ceil
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -64,7 +65,7 @@ class MeasureReportViewModel
 @Inject
 constructor(
   val fhirEngine: FhirEngine,
-  val fhirOperator: FhirOperator,
+  val fhirOperator: Provider<FhirOperator>,
   val sharedPreferencesHelper: SharedPreferencesHelper,
   val dispatcherProvider: DefaultDispatcherProvider,
   val measureReportRepository: MeasureReportRepository,
@@ -210,23 +211,25 @@ constructor(
             withContext(dispatcherProvider.io()) {
               fhirEngine.loadCqlLibraryBundle(
                 context = context,
-                fhirOperator = fhirOperator,
+                fhirOperator = fhirOperator.get(),
                 sharedPreferencesHelper = sharedPreferencesHelper,
                 resourcesBundlePath = measureResourceBundleUrl
               )
             }
             if (reportTypeSelectorUiState.value.patientViewData != null && individualEvaluation) {
               val measureReport =
                 withContext(dispatcherProvider.io()) {
-                  fhirOperator.evaluateMeasure(
-                    measureUrl = measureUrl,
-                    start = startDateFormatted,
-                    end = endDateFormatted,
-                    reportType = SUBJECT,
-                    subject = reportTypeSelectorUiState.value.patientViewData!!.logicalId,
-                    practitioner = loggedInPractitioner?.id,
-                    lastReceivedOn = null // Non-null value not supported yet
-                  )
+                  fhirOperator
+                    .get()
+                    .evaluateMeasure(
+                      measureUrl = measureUrl,
+                      start = startDateFormatted,
+                      end = endDateFormatted,
+                      reportType = SUBJECT,
+                      subject = reportTypeSelectorUiState.value.patientViewData!!.logicalId,
+                      practitioner = loggedInPractitioner?.id,
+                      lastReceivedOn = null // Non-null value not supported yet
+                    )
                 }
 
               if (measureReport.type == MeasureReport.MeasureReportType.INDIVIDUAL) {
@@ -262,15 +265,17 @@ constructor(
   ) {
     val measureReport =
       withContext(dispatcherProvider.io()) {
-        fhirOperator.evaluateMeasure(
-          measureUrl = measureUrl,
-          start = startDateFormatted,
-          end = endDateFormatted,
-          reportType = POPULATION,
-          subject = null,
-          practitioner = loggedInPractitioner?.id,
-          lastReceivedOn = null // Non-null value not supported yet
-        )
+        fhirOperator
+          .get()
+          .evaluateMeasure(
+            measureUrl = measureUrl,
+            start = startDateFormatted,
+            end = endDateFormatted,
+            reportType = POPULATION,
+            subject = null,
+            practitioner = loggedInPractitioner?.id,
+            lastReceivedOn = null // Non-null value not supported yet
+          )
       }
 
     measureReportPopulationResults.value = formatPopulationMeasureReport(measureReport)