Merge remote-tracking branch 'origin/main' into main-validate-extracted-resources

Author: LZRS

.github/workflows/docs.yml

@@ -44,6 +44,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 17
+          
+      - name: Add empty local.properties
+        run: touch local.properties
+        working-directory: android
+
+      - name: Add empty keystore.properties
+        run: touch keystore.properties
+        working-directory: android
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

.github/workflows/manual-apk-release.yml .github/workflows/manual-release.yml

@@ -1,10 +1,10 @@
-name: Manual APK Release
-run-name: Generating a FHIR Core Release APK 🚀
+name: Manual Release
+run-name: Generating a FHIR Core Release 🚀
 on: 
    workflow_dispatch:
     inputs:
       buildType:
-        description: 'Select APK Build Type'     
+        description: 'Select Build Type'     
         required: true
         default: 'Release'
         type: choice
@@ -13,7 +13,7 @@ on:
           - DebugNonProxy
           - Release
       flavor:
-        description: 'APK flavor e.g. sidBunda'
+        description: 'Release flavor e.g. sidBunda'
         type: string   
         required: true
       isAab:

android/build.gradle.kts

@@ -58,18 +58,17 @@ subprojects {
   }
 
   configure<SpotlessExtension> {
-    val lintVersion = "0.49.0"
 
     kotlin {
       target("**/*.kt")
-      ktlint(lintVersion)
+      ktlint(BuildConfigs.ktLintVersion)
       ktfmt().googleStyle()
       licenseHeaderFile("${project.rootProject.projectDir}/license-header.txt")
     }
 
     kotlinGradle {
       target("*.gradle.kts")
-      ktlint(lintVersion)
+      ktlint(BuildConfigs.ktLintVersion)
       ktfmt().googleStyle()
     }
 
@@ -91,7 +90,7 @@ subprojects {
     resolutionStrategy {
       eachDependency {
         when (requested.group) {
-          "org.jacoco" -> useVersion("0.8.11")
+          "org.jacoco" -> useVersion(BuildConfigs.jacocoVersion)
         }
       }
     }

android/buildSrc/src/main/kotlin/BuildConfigs.kt

@@ -0,0 +1,12 @@
+object BuildConfigs {
+    const val minSdk = 26
+    const val compileSdk = 34
+    const val targetSdk = 34
+    const val versionCode = 10
+    const val versionName = "1.1.0"
+    const val applicationId = "org.smartregister.opensrp"
+    const val jvmToolchain = 17
+    const val kotlinCompilerExtensionVersion = "1.5.8"
+    const val jacocoVersion ="0.8.11"
+    const val ktLintVersion = "0.49.0"
+}

android/engine/build.gradle.kts

@@ -15,12 +15,12 @@ plugins {
 }
 
 android {
-  compileSdk = 34
+  compileSdk = BuildConfigs.compileSdk
 
   namespace = "org.smartregister.fhircore.engine"
 
   defaultConfig {
-    minSdk = 26
+    minSdk = BuildConfigs.minSdk
     testInstrumentationRunner = "org.smartregister.fhircore.engine.EngineTestRunner"
     consumerProguardFiles("consumer-rules.pro")
     buildConfigField(
@@ -62,7 +62,7 @@ android {
     dataBinding = true
     buildConfig = true
   }
-  composeOptions { kotlinCompilerExtensionVersion = "1.5.8" }
+  composeOptions { kotlinCompilerExtensionVersion = BuildConfigs.kotlinCompilerExtensionVersion }
 
   packaging {
     resources.excludes.addAll(
@@ -100,7 +100,7 @@ android {
 
   lint { baseline = file("lint-baseline.xml") }
 
-  testCoverage { jacocoVersion = "0.8.11" }
+  testCoverage { jacocoVersion = BuildConfigs.jacocoVersion }
 }
 
 tasks.withType<Test> {

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt

@@ -482,7 +482,7 @@ constructor(
               .toRequestBody(NetworkModule.JSON_MEDIA_TYPE),
         )
 
-    processResultBundleEntries(resultBundle, patientRelatedResourceTypes)
+    processResultBundleEntries(resultBundle.entry, patientRelatedResourceTypes)
 
     return resultBundle
   }
@@ -492,23 +492,36 @@ constructor(
     searchPath: String,
     patientRelatedResourceTypes: MutableList<ResourceType>,
   ) {
-    val resultBundle =
-      if (gatewayModeHeaderValue.isNullOrEmpty()) {
-        fhirResourceDataSource.getResource(searchPath)
-      } else
-        fhirResourceDataSource.getResourceWithGatewayModeHeader(
-          gatewayModeHeaderValue,
-          searchPath,
-        )
+    val resultBundle = fetchResourceBundle(gatewayModeHeaderValue, searchPath)
+    val nextPageUrl = resultBundle.getLink(PAGINATION_NEXT)?.url ?: ""
+
+    processResultBundleEntries(resultBundle.entry, patientRelatedResourceTypes)
+
+    if (nextPageUrl.isNotEmpty()) {
+      processCompositionManifestResources(
+        gatewayModeHeaderValue,
+        nextPageUrl,
+        patientRelatedResourceTypes,
+      )
+    }
+  }
 
-    processResultBundleEntries(resultBundle, patientRelatedResourceTypes)
+  private suspend fun fetchResourceBundle(
+    gatewayModeHeaderValue: String?,
+    searchPath: String,
+  ): Bundle {
+    return if (gatewayModeHeaderValue.isNullOrEmpty()) {
+      fhirResourceDataSource.getResource(searchPath)
+    } else {
+      fhirResourceDataSource.getResourceWithGatewayModeHeader(gatewayModeHeaderValue, searchPath)
+    }
   }
 
   private suspend fun processResultBundleEntries(
-    resultBundle: Bundle,
+    resultBundleEntries: List<Bundle.BundleEntryComponent>,
     patientRelatedResourceTypes: MutableList<ResourceType>,
   ) {
-    resultBundle.entry?.forEach { bundleEntryComponent ->
+    resultBundleEntries.forEach { bundleEntryComponent ->
       when (bundleEntryComponent.resource) {
         is Bundle -> {
           val bundle = bundleEntryComponent.resource as Bundle
@@ -711,7 +724,8 @@ constructor(
       resourceGroup.value.forEach {
         processCompositionManifestResources(
           gatewayModeHeaderValue = FHIR_GATEWAY_MODE_HEADER_VALUE,
-          searchPath = "${resourceGroup.key}/${it.focus.extractId()}",
+          searchPath =
+            "${resourceGroup.key}?$ID=${it.focus.extractId()}&_page=1&_count=$DEFAULT_COUNT",
           patientRelatedResourceTypes = patientRelatedResourceTypes,
         )
       }
@@ -770,6 +784,7 @@ constructor(
     const val ORGANIZATION = "organization"
     const val TYPE_REFERENCE_DELIMITER = "/"
     const val DEFAULT_COUNT = 200
+    const val PAGINATION_NEXT = "next"
 
     /**
      * The list of resources whose types can be synced down as part of the Composition configs.

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt

@@ -86,6 +86,7 @@ data class QuestionnaireConfig(
         ),
       planDefinitions = planDefinitions?.map { it.interpolate(computedValuesMap) },
       readOnlyLinkIds = readOnlyLinkIds?.map { it.interpolate(computedValuesMap) },
+      extraParams = extraParams?.map { it.interpolate(computedValuesMap) },
       onSubmitActions = onSubmitActions?.map { it.interpolate(computedValuesMap) },
       barcodeLinkId = barcodeLinkId?.interpolate(computedValuesMap),
       cqlInputResources = cqlInputResources?.map { it.interpolate(computedValuesMap) },

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/event/EventWorkflow.kt

@@ -22,6 +22,7 @@ import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
+import org.hl7.fhir.r4.model.ResourceType
 import org.smartregister.fhircore.engine.domain.model.ResourceConfig
 import org.smartregister.fhircore.engine.domain.model.ResourceFilterExpression
 
@@ -32,24 +33,27 @@ data class EventWorkflow(
   val triggerConditions: List<EventTriggerCondition> = emptyList(),
   val eventResources: List<ResourceConfig> = emptyList(),
   val updateValues: List<UpdateWorkflowValueConfig> = emptyList(),
-  val resourceFilterExpression: ResourceFilterExpression? = null,
+  val resourceFilterExpressions: List<ResourceFilterExpression>? = null,
 ) : java.io.Serializable, Parcelable
 
 @Serializable
 data class UpdateWorkflowValueConfig(
   val jsonPathExpression: String,
   val value: JsonElement,
+  val resourceType: ResourceType = ResourceType.Task,
 ) : java.io.Serializable, Parcelable {
   constructor(
     parcel: Parcel,
   ) : this(
     parcel.readString() ?: "",
     Json.decodeFromString(parcel.readString() ?: ""),
+    ResourceType.fromCode(parcel.readString()),
   )
 
   override fun writeToParcel(parcel: Parcel, flags: Int) {
     parcel.writeString(jsonPathExpression)
     parcel.writeString(value.toString())
+    parcel.writeString(resourceType.name)
   }
 
   override fun describeContents(): Int {

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/register/RegisterFilterConfig.kt

@@ -19,6 +19,7 @@ package org.smartregister.fhircore.engine.configuration.register
 import kotlinx.serialization.Serializable
 import org.smartregister.fhircore.engine.domain.model.ActionConfig
 import org.smartregister.fhircore.engine.domain.model.DataQuery
+import org.smartregister.fhircore.engine.domain.model.NestedSearchConfig
 
 @Serializable
 data class RegisterFilterConfig(
@@ -28,6 +29,7 @@ data class RegisterFilterConfig(
 
 @Serializable
 data class RegisterFilterField(
-  val dataQueries: List<DataQuery>,
   val filterId: String,
+  val dataQueries: List<DataQuery>? = null,
+  val nestedSearchResources: List<NestedSearchConfig>? = null,
 ) : java.io.Serializable