Refactor code to support single apk approach

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "android/p2p"]
+	path = android/p2p
+	url = git@github.com:opensrp/p2p.git

CHANGELOG.md

@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Quest | Swahili localization
 - Quest | Added G6PD Patient Details page to show G6PD Status and Test Results
 - Quest | Add tasking list
+- Quest | Added ability to reference Related Persons and Patients to the Groups representing families
 
 - EIR | Added workflow configurations
 - EIR | Add Adverse Events feature to log any reactions after the first dose of vaccine using Structure map
@@ -51,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Engine | Fixed login authentication issue.
 - Engine | Implement language switcher on profile page
 - Engine | Add tasking abstraction
+- Engine | Integrate Group resource for family representation
 - Engine | Performance improvement when openning questionnaires and saving QRs
 
 ### Fixed

android/anc/build.gradle

@@ -81,19 +81,20 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
         coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_11.toString()
+        freeCompilerArgs = ['-Xjvm-default=compatibility']
     }
     buildFeatures {
         compose true
         viewBinding true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.0.4'
+        kotlinCompilerExtensionVersion '1.1.1'
     }
     packagingOptions {
         exclude 'META-INF/ASL-2.0.txt'
@@ -139,12 +140,10 @@ android {
 dependencies {
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
     implementation(project(":engine"))
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation deps.lifecycle.viewmodel
     implementation deps.work.runtime
@@ -155,7 +154,7 @@ dependencies {
     androidTestImplementation "com.google.dagger:hilt-android-testing:$hiltVersion"
     kaptAndroidTest "com.google.dagger:hilt-android-compiler:$hiltVersion"
 
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0'
 
     testImplementation deps.junit5_api
     testRuntimeOnly deps.junit5_engine

android/anc/src/main/AndroidManifest.xml

@@ -2,9 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.smartregister.fhircore.anc">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
-
     <application
         android:name=".AncApplication"
         android:allowBackup="true"
@@ -16,49 +13,21 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar">
-        <activity
-            android:name="org.smartregister.fhircore.engine.ui.appsetting.AppSettingActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="org.smartregister.fhircore.engine.ui.login.LoginActivity"
-            android:exported="false" />
-        <activity
-            android:name="org.smartregister.fhircore.engine.ui.pin.PinLoginActivity"
-            android:exported="false" />
-        <activity
-            android:name="org.smartregister.fhircore.engine.ui.pin.PinSetupActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.family.register.FamilyRegisterActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.report.ReportHomeActivity"
-            android:exported="false" />
+        <activity android:name=".ui.family.register.FamilyRegisterActivity" />
+        <activity android:name=".ui.report.ReportHomeActivity" />
         <activity
             android:name=".ui.details.bmicompute.BmiQuestionnaireActivity"
             android:exported="false"
             android:theme="@style/AppTheme" />
-        <activity
-            android:name=".ui.family.removefamily.RemoveFamilyQuestionnaireActivity"
-            android:exported="false"
-            android:theme="@style/AppTheme" />
         <activity
             android:name=".ui.family.form.FamilyQuestionnaireActivity"
+            android:exported="false"
             android:noHistory="true"
             android:theme="@style/AppTheme" />
         <activity
-            android:name="org.smartregister.fhircore.anc.ui.details.PatientDetailsActivity"
+            android:name=".ui.details.PatientDetailsActivity"
             android:exported="false" />
-        <activity
-            android:name="org.smartregister.fhircore.engine.ui.questionnaire.QuestionnaireActivity"
-            android:exported="false"
-            android:theme="@style/AppTheme" />
         <activity
             android:name=".ui.anccare.encounters.EncounterListActivity"
             android:exported="false" />
@@ -68,7 +37,7 @@
 
         <service
             android:name="org.smartregister.fhircore.engine.auth.AuthAndroidService"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>

android/anc/src/main/java/org/smartregister/fhircore/anc/data/EncounterRepository.kt

@@ -24,7 +24,7 @@ import com.google.android.fhir.search.search
 import javax.inject.Inject
 import org.hl7.fhir.r4.model.Encounter
 import org.smartregister.fhircore.anc.data.model.EncounterItem
-import org.smartregister.fhircore.engine.data.domain.util.PaginationUtil
+import org.smartregister.fhircore.engine.domain.util.PaginationConstant
 
 class EncounterRepository @Inject constructor(val fhirEngine: FhirEngine) :
   PagingSource<Int, EncounterItem>() {
@@ -43,8 +43,8 @@ class EncounterRepository @Inject constructor(val fhirEngine: FhirEngine) :
       val encounters =
         fhirEngine.search<Encounter> {
           apply { filter(Encounter.SUBJECT, { value = "Patient/$patientId" }) }.getQuery()
-          from = nextPage * PaginationUtil.DEFAULT_PAGE_SIZE
-          count = PaginationUtil.DEFAULT_PAGE_SIZE
+          from = nextPage * PaginationConstant.DEFAULT_PAGE_SIZE
+          count = PaginationConstant.DEFAULT_PAGE_SIZE
         }
 
       val data =

android/anc/src/main/java/org/smartregister/fhircore/anc/data/family/FamilyRepository.kt

@@ -29,7 +29,6 @@ import javax.inject.Inject
 import kotlinx.coroutines.withContext
 import org.hl7.fhir.r4.model.Flag
 import org.hl7.fhir.r4.model.Patient
-import org.hl7.fhir.r4.model.ResourceType
 import org.smartregister.fhircore.anc.data.family.model.FamilyItem
 import org.smartregister.fhircore.anc.data.family.model.FamilyMemberItem
 import org.smartregister.fhircore.anc.data.patient.PatientRepository
@@ -40,8 +39,8 @@ import org.smartregister.fhircore.anc.util.asCodeableConcept
 import org.smartregister.fhircore.anc.util.filterBy
 import org.smartregister.fhircore.anc.util.filterByPatientName
 import org.smartregister.fhircore.anc.util.loadRegisterConfig
-import org.smartregister.fhircore.engine.data.domain.util.PaginationUtil
 import org.smartregister.fhircore.engine.data.domain.util.RegisterRepository
+import org.smartregister.fhircore.engine.domain.util.PaginationConstant
 import org.smartregister.fhircore.engine.util.DispatcherProvider
 import org.smartregister.fhircore.engine.util.extension.asReference
 import org.smartregister.fhircore.engine.util.extension.extractFamilyTag
@@ -52,7 +51,7 @@ class FamilyRepository
 constructor(
   @ApplicationContext val context: Context,
   override val fhirEngine: FhirEngine,
-  override val domainMapper: FamilyItemMapper,
+  override val dataMapper: FamilyItemMapper,
   val dispatcherProvider: DispatcherProvider,
   val ancPatientRepository: PatientRepository
 ) : RegisterRepository<Family, FamilyItem> {
@@ -72,15 +71,15 @@ constructor(
           filterByPatientName(query)
 
           sort(Patient.NAME, Order.ASCENDING)
-          count = if (loadAll) countAll().toInt() else PaginationUtil.DEFAULT_PAGE_SIZE
-          from = pageNumber * PaginationUtil.DEFAULT_PAGE_SIZE
+          count = if (loadAll) countAll().toInt() else PaginationConstant.DEFAULT_PAGE_SIZE
+          from = pageNumber * PaginationConstant.DEFAULT_PAGE_SIZE
         }
 
       patients.map { p ->
         val members = searchFamilyMembers(p.logicalId)
 
         val familyServices = ancPatientRepository.searchCarePlan(p.logicalId, p.extractFamilyTag())
-        domainMapper.mapToDomainModel(Family(p, members, familyServices))
+        dataMapper.transformInputToOutputModel(Family(p, members, familyServices))
       }
     }
   }
@@ -99,7 +98,7 @@ constructor(
       .map {
         val services = ancPatientRepository.searchCarePlan(it.logicalId)
         val conditions = ancPatientRepository.searchCondition(it.logicalId)
-        domainMapper.toFamilyMemberItem(it, conditions, services)
+        dataMapper.toFamilyMemberItem(it, conditions, services)
       }
       .sortedBy {
         var weight = 0
@@ -141,7 +140,7 @@ constructor(
       newHead.link.clear()
 
       val newHeadFlag = Flag()
-      newHeadFlag.id = ResourceType.Flag.generateUniqueId()
+      newHeadFlag.id = generateUniqueId()
       newHeadFlag.status = Flag.FlagStatus.ACTIVE
       newHeadFlag.subject = newHead.asReference()
       newHeadFlag.code = familyTag.asCodeableConcept()

android/anc/src/main/java/org/smartregister/fhircore/anc/data/patient/PatientRepository.kt

@@ -22,7 +22,6 @@ import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.get
 import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.count
-import com.google.android.fhir.search.getQuery
 import com.google.android.fhir.search.search
 import dagger.hilt.android.qualifiers.ApplicationContext
 import java.util.Date
@@ -58,8 +57,8 @@ import org.smartregister.fhircore.anc.util.SearchFilter
 import org.smartregister.fhircore.anc.util.filterBy
 import org.smartregister.fhircore.anc.util.loadRegisterConfig
 import org.smartregister.fhircore.anc.util.loadRegisterConfigAnc
-import org.smartregister.fhircore.engine.data.domain.util.PaginationUtil
 import org.smartregister.fhircore.engine.data.domain.util.RegisterRepository
+import org.smartregister.fhircore.engine.domain.util.PaginationConstant
 import org.smartregister.fhircore.engine.util.DispatcherProvider
 import org.smartregister.fhircore.engine.util.extension.due
 import org.smartregister.fhircore.engine.util.extension.extractAddress
@@ -85,7 +84,7 @@ class PatientRepository
 constructor(
   @ApplicationContext val context: Context,
   override val fhirEngine: FhirEngine,
-  override val domainMapper: AncItemMapper,
+  override val dataMapper: AncItemMapper,
   val dispatcherProvider: DispatcherProvider
 ) : RegisterRepository<Anc, PatientItem> {
 
@@ -106,8 +105,8 @@ constructor(
             filterBy(registerConfig.primaryFilter!!)
             registerConfig.secondaryFilter?.let { filterBy(it) }
 
-            count = if (loadAll) countAll().toInt() else PaginationUtil.DEFAULT_PAGE_SIZE
-            from = pageNumber * PaginationUtil.DEFAULT_PAGE_SIZE
+            count = if (loadAll) countAll().toInt() else PaginationConstant.DEFAULT_PAGE_SIZE
+            from = pageNumber * PaginationConstant.DEFAULT_PAGE_SIZE
           }
           .distinctBy { it.subject.extractId() }
 
@@ -125,7 +124,7 @@ constructor(
 
         val carePlans = searchCarePlan(it.logicalId)
         val conditions = searchCondition(it.logicalId)
-        domainMapper.mapToDomainModel(Anc(it, head, conditions, carePlans))
+        dataMapper.transformInputToOutputModel(Anc(it, head, conditions, carePlans))
       }
     }
   }
@@ -259,7 +258,9 @@ constructor(
   }
 
   fun fetchCarePlanItem(carePlan: List<CarePlan>): List<CarePlanItem> =
-    carePlan.filter { it.due() || it.overdue() }.map { CarePlanItemMapper.mapToDomainModel(it) }
+    carePlan.filter { it.due() || it.overdue() }.map {
+      CarePlanItemMapper.transformInputToOutputModel(it)
+    }
 
   suspend fun fetchCarePlan(patientId: String): List<CarePlan> =
     withContext(dispatcherProvider.io()) {
@@ -385,10 +386,8 @@ constructor(
         withContext(dispatcherProvider.io()) {
           val carePlanId = it.logicalId
           val tasks =
-            fhirEngine.search<Task> {
-              apply { filter(Task.FOCUS, { value = "CarePlan/$carePlanId" }) }.getQuery()
-            }
-          if (!tasks.isNullOrEmpty()) {
+            fhirEngine.search<Task> { filter(Task.FOCUS, { value = "CarePlan/$carePlanId" }) }
+          if (tasks.isNotEmpty()) {
             task = tasks[0]
             listCarePlan.add(
               UpcomingServiceItem(
@@ -408,7 +407,7 @@ constructor(
     val listCarePlan = arrayListOf<EncounterItem>()
     if (encounters.isNotEmpty()) {
       for (i in encounters.indices) {
-        listCarePlan.add(EncounterItemMapper.mapToDomainModel(encounters[i]))
+        listCarePlan.add(EncounterItemMapper.transformInputToOutputModel(encounters[i]))
       }
     }
     return listCarePlan
@@ -457,7 +456,7 @@ constructor(
     val bmiEncounter = loadConfig(Template.BMI_ENCOUNTER, Encounter::class.java, bmiEncounterData)
     fhirEngine.create(bmiEncounter)
 
-    val bmiWeightObservationRecordId = ResourceType.Observation.generateUniqueId()
+    val bmiWeightObservationRecordId = generateUniqueId()
     val bmiWeightObservationData =
       buildBmiConfigData(
         patientId = patientId,
@@ -471,7 +470,7 @@ constructor(
       loadConfig(Template.BMI_PATIENT_WEIGHT, Observation::class.java, bmiWeightObservationData)
     fhirEngine.create(bmiWeightObservation)
 
-    val bmiHeightObservationRecordId = ResourceType.Observation.generateUniqueId()
+    val bmiHeightObservationRecordId = generateUniqueId()
     val bmiHeightObservationData =
       buildBmiConfigData(
         patientId = patientId,
@@ -485,7 +484,7 @@ constructor(
       loadConfig(Template.BMI_PATIENT_HEIGHT, Observation::class.java, bmiHeightObservationData)
     fhirEngine.create(bmiHeightObservation)
 
-    val bmiObservationRecordId = ResourceType.Observation.generateUniqueId()
+    val bmiObservationRecordId = generateUniqueId()
     val bmiObservationData =
       buildBmiConfigData(
         patientId = patientId,
@@ -538,7 +537,7 @@ constructor(
   }
 
   fun setAncItemMapperType(ancItemMapperType: AncItemMapper.AncItemMapperType) {
-    domainMapper.setAncItemMapperType(ancItemMapperType)
+    dataMapper.setAncItemMapperType(ancItemMapperType)
   }
 
   companion object {

android/anc/src/main/java/org/smartregister/fhircore/anc/ui/anccare/details/CarePlanItemMapper.kt

@@ -18,23 +18,24 @@ package org.smartregister.fhircore.anc.ui.anccare.details
 
 import org.hl7.fhir.r4.model.CarePlan
 import org.smartregister.fhircore.anc.data.model.CarePlanItem
-import org.smartregister.fhircore.engine.data.domain.util.DomainMapper
+import org.smartregister.fhircore.engine.domain.util.DataMapper
 import org.smartregister.fhircore.engine.util.extension.due
 import org.smartregister.fhircore.engine.util.extension.overdue
 
-object CarePlanItemMapper : DomainMapper<CarePlan, CarePlanItem> {
+object CarePlanItemMapper : DataMapper<CarePlan, CarePlanItem> {
 
-  override fun mapToDomainModel(dto: CarePlan): CarePlanItem {
+  override fun transformInputToOutputModel(inputModel: CarePlan): CarePlanItem {
     var typeString = ""
-    for (j in dto.activity.indices) {
-      if (dto.activity[j].hasDetail())
-        if (dto.activity[j].detail.hasDescription()) typeString = dto.activity[j].detail.description
+    for (j in inputModel.activity.indices) {
+      if (inputModel.activity[j].hasDetail())
+        if (inputModel.activity[j].detail.hasDescription())
+          typeString = inputModel.activity[j].detail.description
     }
     return CarePlanItem(
-      carePlanIdentifier = dto.id,
+      carePlanIdentifier = inputModel.id,
       title = typeString,
-      due = dto.due(),
-      overdue = dto.overdue()
+      due = inputModel.due(),
+      overdue = inputModel.overdue()
     )
   }
 }