From a3bea5f5c9f1266432cc35cf4faeeacc3d31095b Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Thu, 13 Jul 2023 11:55:55 +0300
Subject: [PATCH 01/27] Implement QuestionnaireFragment and ViewModel

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 android/engine/build.gradle.kts               |   1 +
 .../configuration/QuestionnaireConfig.kt      |  10 +-
 .../fhircore/engine/ui/base/AlertDialogue.kt  |  49 ++----
 .../ui/base/BaseMultiLanguageActivity.kt      |   7 -
 .../engine/util/SharedPreferenceKey.kt        |   2 -
 .../res/layout/activity_questionnaire.xml     |  20 +--
 .../layout/questionnaire_fragment_layout.xml  |  25 +++
 android/engine/src/main/res/values/styles.xml |   9 +-
 .../engine/ui/base/AlertDialogueTest.kt       |   4 +-
 android/geowidget/build.gradle.kts            |   1 +
 .../FhirEngineCreateUpdateMethodCallRule.kt   |   3 +-
 android/quest/build.gradle.kts                |   1 +
 android/quest/src/main/AndroidManifest.xml    |   1 +
 .../quest/navigation/MainNavigationScreen.kt  |   2 +
 .../quest/navigation/NavigationArg.kt         |   1 +
 .../ui/questionnaire/QuestionnaireFragment.kt | 155 ++++++++++++++++++
 .../QuestionnaireFragmentViewModel.kt         |  55 +++++++
 .../questionnaire/QuestionnaireViewModel.kt   |  12 +-
 .../quest/util/extensions/ConfigExtensions.kt |   9 +-
 .../src/main/res/drawable/ic_arrow_back.xml   |  10 ++
 .../res/navigation/application_nav_graph.xml  |   9 +
 .../src/main/res/values-night/themes.xml      |  18 +-
 android/quest/src/main/res/values/themes.xml  |  17 +-
 23 files changed, 320 insertions(+), 101 deletions(-)
 create mode 100644 android/engine/src/main/res/layout/questionnaire_fragment_layout.xml
 create mode 100644 android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragment.kt
 create mode 100644 android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragmentViewModel.kt
 create mode 100644 android/quest/src/main/res/drawable/ic_arrow_back.xml

diff --git a/android/engine/build.gradle.kts b/android/engine/build.gradle.kts
index bebc20a748..06cc907789 100644
--- a/android/engine/build.gradle.kts
+++ b/android/engine/build.gradle.kts
@@ -46,6 +46,7 @@ android {
   buildFeatures {
     compose = true
     viewBinding = true
+    dataBinding = true
   }
   composeOptions { kotlinCompilerExtensionVersion = "1.3.0" }
 
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
index c85fa828e0..6db969572c 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
@@ -35,9 +35,6 @@ data class QuestionnaireConfig(
   val id: String,
   val title: String? = null,
   val saveButtonText: String? = null,
-  val setPractitionerDetails: Boolean = true,
-  val setOrganizationDetails: Boolean = true,
-  val setAppVersion: Boolean = true,
   val planDefinitions: List<String>? = null,
   var type: QuestionnaireType = QuestionnaireType.DEFAULT,
   val resourceIdentifier: String? = null,
@@ -52,6 +49,13 @@ data class QuestionnaireConfig(
   val configRules: List<RuleConfig>? = null,
   val extraParams: List<ActionParameter>? = null,
   val onSubmitActions: List<ActionConfig>? = null,
+  val questionnaireSubjects: List<ResourceType> =
+    listOf(
+      ResourceType.Patient,
+      ResourceType.Group,
+      ResourceType.Practitioner,
+      ResourceType.Location,
+    ),
 ) : java.io.Serializable, Parcelable {
 
   fun interpolate(computedValuesMap: Map<String, Any>) =
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/AlertDialogue.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/AlertDialogue.kt
index ba84f3c3a9..854a861a00 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/AlertDialogue.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/AlertDialogue.kt
@@ -16,11 +16,12 @@
 
 package org.smartregister.fhircore.engine.ui.base
 
-import android.app.Activity
 import android.app.AlertDialog
 import android.app.DatePickerDialog
+import android.content.Context
 import android.content.DialogInterface
 import android.content.res.Resources
+import android.view.LayoutInflater
 import android.view.View
 import android.widget.TextView
 import androidx.annotation.StringRes
@@ -29,6 +30,7 @@ import androidx.core.view.setPadding
 import java.util.Calendar
 import java.util.Date
 import org.smartregister.fhircore.engine.R
+import org.smartregister.fhircore.engine.util.extension.getActivity
 import org.smartregister.fhircore.engine.util.extension.hide
 import org.smartregister.fhircore.engine.util.extension.show
 
@@ -44,20 +46,8 @@ data class AlertDialogListItem(val key: String, val value: String)
 object AlertDialogue {
   private val ITEMS_LIST_KEY = "alert_dialog_items_list"
 
-  fun AlertDialog.getSingleChoiceSelectedKey() = getSingleChoiceSelectedItem()?.key
-
-  private fun AlertDialog.getSingleChoiceSelectedItem() =
-    if (this.listView.checkedItemCount != 1) {
-      null
-    } else {
-      getListItems()!![this.listView.checkedItemPosition]
-    }
-
-  private fun AlertDialog.getListItems() =
-    this.ownerActivity?.intent?.getSerializableExtra(ITEMS_LIST_KEY) as Array<AlertDialogListItem>?
-
   fun showAlert(
-    context: Activity,
+    context: Context,
     alertIntent: AlertIntent,
     message: CharSequence,
     title: String? = null,
@@ -71,7 +61,7 @@ object AlertDialogue {
     val dialog =
       AlertDialog.Builder(context, R.style.AlertDialogTheme)
         .apply {
-          val view = context.layoutInflater.inflate(R.layout.alert_dialog, null)
+          val view = LayoutInflater.from(context).inflate(R.layout.alert_dialog, null)
           setView(view)
           title?.let { setTitle(it) }
           setCancelable(cancellable)
@@ -97,15 +87,17 @@ object AlertDialogue {
     dialog.findViewById<TextView>(R.id.tv_alert_message)?.apply { this.text = message }
 
     options?.let {
-      context.intent.putExtra(ITEMS_LIST_KEY, it)
-      dialog.setOwnerActivity(context)
+      context.getActivity()?.run {
+        intent?.putExtra(ITEMS_LIST_KEY, it)
+        dialog.setOwnerActivity(this)
+      }
     }
 
     return dialog
   }
 
   fun showInfoAlert(
-    context: Activity,
+    context: Context,
     message: String,
     title: String? = null,
     confirmButtonListener: ((d: DialogInterface) -> Unit) = { d -> d.dismiss() },
@@ -121,7 +113,7 @@ object AlertDialogue {
     )
   }
 
-  fun showErrorAlert(context: Activity, message: String, title: String? = null): AlertDialog {
+  fun showErrorAlert(context: Context, message: String, title: String? = null): AlertDialog {
     return showAlert(
       context = context,
       alertIntent = AlertIntent.ERROR,
@@ -133,7 +125,7 @@ object AlertDialogue {
   }
 
   fun showErrorAlert(
-    context: Activity,
+    context: Context,
     @StringRes message: Int,
     @StringRes title: Int? = null,
   ): AlertDialog {
@@ -144,12 +136,12 @@ object AlertDialogue {
     )
   }
 
-  fun showProgressAlert(context: Activity, @StringRes message: Int): AlertDialog {
+  fun showProgressAlert(context: Context, @StringRes message: Int): AlertDialog {
     return showAlert(context, AlertIntent.PROGRESS, context.getString(message))
   }
 
   fun showConfirmAlert(
-    context: Activity,
+    context: Context,
     @StringRes message: Int,
     @StringRes title: Int? = null,
     confirmButtonListener: ((d: DialogInterface) -> Unit),
@@ -171,7 +163,7 @@ object AlertDialogue {
   }
 
   fun showCancelAlert(
-    context: Activity,
+    context: Context,
     @StringRes message: Int,
     @StringRes title: Int? = null,
     confirmButtonListener: ((d: DialogInterface) -> Unit),
@@ -196,11 +188,10 @@ object AlertDialogue {
   }
 
   fun showDatePickerAlert(
-    context: Activity,
-    confirmButtonListener: ((d: Date) -> Unit),
+    context: Context,
+    confirmButtonListener: (d: Date) -> Unit,
     confirmButtonText: String,
     max: Date?,
-    default: Date = Date(),
     title: String?,
     dangerActionColor: Boolean = true,
   ): DatePickerDialog {
@@ -229,18 +220,14 @@ object AlertDialogue {
           }
         confirmButtonListener.invoke(date.time)
       }
-    }
-
-    dateDialog.create()
+    }.create()
 
     if (dangerActionColor) {
       dateDialog
         .getButton(DialogInterface.BUTTON_POSITIVE)
         .setTextColor(context.resources.getColor(R.color.colorError))
     }
-
     dateDialog.show()
-
     return dateDialog
   }
 }
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/BaseMultiLanguageActivity.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/BaseMultiLanguageActivity.kt
index fd5a9d97be..f5b9f6a7d2 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/BaseMultiLanguageActivity.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/BaseMultiLanguageActivity.kt
@@ -33,13 +33,6 @@ abstract class BaseMultiLanguageActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     inject()
     super.onCreate(savedInstanceState)
-    val themePref =
-      sharedPreferencesHelper.read(key = SharedPreferenceKey.THEME.name, defaultValue = "")!!
-
-    if (themePref.isNotEmpty()) {
-      val resourceId = this.resources.getIdentifier(themePref, "style", packageName)
-      if (resourceId != 0) theme.applyStyle(resourceId, true)
-    }
   }
 
   override fun attachBaseContext(baseContext: Context) {
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/SharedPreferenceKey.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/SharedPreferenceKey.kt
index d58b335a0d..21e528f5f9 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/SharedPreferenceKey.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/SharedPreferenceKey.kt
@@ -23,9 +23,7 @@ enum class SharedPreferenceKey {
   PRACTITIONER_ID,
   PRACTITIONER_DETAILS,
   PRACTITIONER_LOCATION_HIERARCHIES,
-  THEME,
   REMOTE_SYNC_RESOURCES,
-  OVERDUE_TASK_LAST_AUTHORED_ON_DATE,
   LOGIN_CREDENTIAL_KEY,
   LOGIN_PIN_KEY,
   LOGIN_PIN_SALT,
diff --git a/android/engine/src/main/res/layout/activity_questionnaire.xml b/android/engine/src/main/res/layout/activity_questionnaire.xml
index fbc919c3b0..11a1252b45 100644
--- a/android/engine/src/main/res/layout/activity_questionnaire.xml
+++ b/android/engine/src/main/res/layout/activity_questionnaire.xml
@@ -17,25 +17,24 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     tools:context="org.smartregister.fhircore.engine.org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/btn_edit_qr"/>
+        app:layout_constraintBottom_toTopOf="@id/btn_edit_qr"
+        app:layout_constraintTop_toTopOf="parent" />
 
 
     <Button
         android:id="@+id/btn_edit_qr"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="15dp"
-        android:layout_marginEnd="15dp"
+        android:layout_gravity="bottom|start"
         android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
+        android:layout_marginBottom="15dp"
         android:fontFamily="sans-serif-medium"
         android:padding="10dp"
         android:text="@string/edit"
@@ -43,7 +42,6 @@
         android:textColor="@color/white"
         android:textSize="18sp"
         android:visibility="gone"
-        android:layout_gravity="bottom|start"
         app:layout_constraintBottom_toBottomOf="parent" />
 
     <ProgressBar
@@ -51,10 +49,10 @@
         style="?android:attr/progressBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="15dp"
-        android:layout_marginEnd="15dp"
+        android:layout_gravity="bottom|start"
         android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
+        android:layout_marginBottom="15dp"
         android:visibility="gone"
-        android:layout_gravity="bottom|start"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/engine/src/main/res/layout/questionnaire_fragment_layout.xml b/android/engine/src/main/res/layout/questionnaire_fragment_layout.xml
new file mode 100644
index 0000000000..8ad4b2d76d
--- /dev/null
+++ b/android/engine/src/main/res/layout/questionnaire_fragment_layout.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/questionnaireToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorPrimary"
+            android:minHeight="?android:attr/actionBarSize"
+            app:titleTextColor="@color/white" />
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            app:layout_constraintStart_toStartOf="parent" />
+    </LinearLayout>
+</layout>
diff --git a/android/engine/src/main/res/values/styles.xml b/android/engine/src/main/res/values/styles.xml
index df3c1423e8..f294c1f655 100644
--- a/android/engine/src/main/res/values/styles.xml
+++ b/android/engine/src/main/res/values/styles.xml
@@ -17,8 +17,6 @@
         <item name="android:listDivider">@color/white_slightly_opaque</item>
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
         <item name="questionnaire_theme">@style/AppTheme.Questionnaire</item>
-        <!-- This Theme override seems to be causing the radio buttons to NOT render
-        <item name="questionnaire_theme">@style/Theme.MaterialComponents.Light.DarkActionBar</item> -->
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -59,10 +57,10 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:textColorSecondary">@color/white</item>
-        <item name="questionnaireSubmitButtonStyle">@style/Quest.Questionnaire.SubmitButtonStyle
-        </item>
+        <item name="questionnaireSubmitButtonStyle">@style/AppTheme.SubmitButtonStyle</item>
     </style>
-    <style name="Quest.Questionnaire.SubmitButtonStyle" parent="Questionnaire.SubmitButtonStyle">
+
+    <style name="AppTheme.SubmitButtonStyle" parent="Questionnaire.SubmitButtonStyle">
         <item name="android:text">@string/str_save</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:layout_marginVertical">15dp</item>
@@ -75,5 +73,4 @@
         <item name="android:textSize">18sp</item>
         <item name="android:layout_gravity">bottom|start</item>
     </style>
-
 </resources>
diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/ui/base/AlertDialogueTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/ui/base/AlertDialogueTest.kt
index d6badcb728..7f79333faf 100644
--- a/android/engine/src/test/java/org/smartregister/fhircore/engine/ui/base/AlertDialogueTest.kt
+++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/ui/base/AlertDialogueTest.kt
@@ -204,10 +204,10 @@ class AlertDialogueTest : ActivityRobolectricTest() {
   fun testShowDatePromptShouldShowAlertWithCorrectData() {
     AlertDialogue.showDatePickerAlert(
       context = context,
+      confirmButtonListener = {},
+      confirmButtonText = "Date confirm",
       max = Date(),
       title = "Date title",
-      confirmButtonText = "Date confirm",
-      confirmButtonListener = {},
     )
 
     val dialog = shadowOf(ShadowAlertDialog.getLatestAlertDialog())
diff --git a/android/geowidget/build.gradle.kts b/android/geowidget/build.gradle.kts
index dc7134ddaa..205dd9e371 100644
--- a/android/geowidget/build.gradle.kts
+++ b/android/geowidget/build.gradle.kts
@@ -50,6 +50,7 @@ android {
   buildFeatures {
     compose = true
     viewBinding = true
+    dataBinding = true
   }
 
   composeOptions { kotlinCompilerExtensionVersion = "1.3.0" }
diff --git a/android/linting/src/main/java/org/smartregister/lint/FhirEngineCreateUpdateMethodCallRule.kt b/android/linting/src/main/java/org/smartregister/lint/FhirEngineCreateUpdateMethodCallRule.kt
index 811c29bf38..6ac14bd521 100644
--- a/android/linting/src/main/java/org/smartregister/lint/FhirEngineCreateUpdateMethodCallRule.kt
+++ b/android/linting/src/main/java/org/smartregister/lint/FhirEngineCreateUpdateMethodCallRule.kt
@@ -51,7 +51,8 @@ class FhirEngineCreateUpdateMethodCallRule :
 
     val parent = node.parent(ElementType.DOT_QUALIFIED_EXPRESSION)
 
-    if (parent != null &&
+    if (
+      parent != null &&
         node.elementType == ElementType.REFERENCE_EXPRESSION &&
         node.text == FHIR_ENGINE_VARIABLE_NAME
     ) {
diff --git a/android/quest/build.gradle.kts b/android/quest/build.gradle.kts
index 6aa7899a08..0679eaf99c 100644
--- a/android/quest/build.gradle.kts
+++ b/android/quest/build.gradle.kts
@@ -139,6 +139,7 @@ android {
   buildFeatures {
     compose = true
     viewBinding = true
+    dataBinding = true
   }
 
   composeOptions { kotlinCompilerExtensionVersion = "1.3.0" }
diff --git a/android/quest/src/main/AndroidManifest.xml b/android/quest/src/main/AndroidManifest.xml
index 636b53d49b..5f19201f5f 100644
--- a/android/quest/src/main/AndroidManifest.xml
+++ b/android/quest/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         android:theme="@style/AppTheme.NoActionBar"
         android:windowSoftInputMode="adjustResize"
         tools:ignore="UnusedAttribute,LockedOrientationActivity"
+        android:enableOnBackInvokedCallback="true"
         tools:replace="android:theme">
 
         <meta-data android:name="io.sentry.auto-init" android:value="false" />
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
index eb53e49dbc..1d3dfda13e 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
@@ -38,5 +38,7 @@ sealed class MainNavigationScreen(
 
   object GeoWidget : MainNavigationScreen(route = R.id.geoWidgetFragment)
 
+  object Questionnaire : MainNavigationScreen(route = R.id.questionnaireFragment)
+
   fun eventId(id: String) = route.toString() + "_" + id
 }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/NavigationArg.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/NavigationArg.kt
index 3d41d3cfb7..732ebf57e9 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/NavigationArg.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/NavigationArg.kt
@@ -22,6 +22,7 @@ object NavigationArg {
   const val PROFILE_ID = "profileId"
   const val SCREEN_TITLE = "screenTitle"
   const val RESOURCE_ID = "resourceId"
+  const val QUESTIONNAIRE_CONFIG = "questionnaireConfig"
   const val RESOURCE_CONFIG = "resourceConfig"
   const val CONFIG_ID = "configId"
   const val REPORT_ID = "reportId"
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragment.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragment.kt
new file mode 100644
index 0000000000..befb269b0c
--- /dev/null
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragment.kt
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2021-2023 Ona Systems, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.smartregister.fhircore.quest.ui.questionnaire
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import com.google.android.fhir.datacapture.QuestionnaireFragment
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.smartregister.fhircore.engine.databinding.QuestionnaireFragmentLayoutBinding
+import org.smartregister.fhircore.engine.ui.base.AlertDialogue
+import org.smartregister.fhircore.quest.R
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity.Companion.QUESTIONNAIRE_FRAGMENT_TAG
+
+typealias SdcQuestionnaireFragment = QuestionnaireFragment
+
+@AndroidEntryPoint
+class QuestionnaireFragment : Fragment() {
+
+  val viewModel by viewModels<QuestionnaireFragmentViewModel>()
+  private val questionnaireFragmentArgs by navArgs<QuestionnaireFragmentArgs>()
+  private var viewBinding: QuestionnaireFragmentLayoutBinding? = null
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?,
+  ): View? {
+    inflater.context.setTheme(R.style.AppTheme_Questionnaire)
+    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+    viewBinding = QuestionnaireFragmentLayoutBinding.inflate(inflater, container, false)
+    return viewBinding?.root
+  }
+
+  override fun onDestroyView() {
+    super.onDestroyView()
+    viewBinding = null
+  }
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    requireActivity()
+      .onBackPressedDispatcher
+      .addCallback(
+        this,
+        object : OnBackPressedCallback(true) {
+          override fun handleOnBackPressed() {
+            handleBackPress()
+          }
+        },
+      )
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    childFragmentManager.setFragmentResultListener(
+      QuestionnaireFragment.SUBMIT_REQUEST_KEY,
+      viewLifecycleOwner,
+    ) { _, _ ->
+      val sdcQuestionnaireFragment = retrieveSdcQuestionnaireFragment()
+      val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
+      if(sdcQuestionnaireFragment != null && questionnaireConfig != null) {
+        viewModel.handleQuestionnaireSubmission(
+          questionnaireResponse = sdcQuestionnaireFragment.getQuestionnaireResponse(),
+          questionnaireConfig = questionnaireConfig
+        )
+      }
+    }
+    if (savedInstanceState == null) renderQuestionnaire()
+  }
+
+  private fun renderQuestionnaire() {
+    viewLifecycleOwner.lifecycleScope.launch {
+      val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
+      if (
+        childFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) == null &&
+          questionnaireConfig != null
+      ) {
+        viewBinding?.questionnaireToolbar?.apply {
+          title = questionnaireConfig.title
+          setNavigationIcon(R.drawable.ic_arrow_back)
+          setNavigationOnClickListener { handleBackPress() }
+        }
+
+        val questionnaireJson = viewModel.retrieveQuestionnaireJson(questionnaireConfig)
+        if (questionnaireJson.isNotEmpty()) {
+          childFragmentManager.commit {
+            setReorderingAllowed(true)
+            add(
+              R.id.container,
+              QuestionnaireFragment.builder().setQuestionnaire(questionnaireJson).build(),
+              QUESTIONNAIRE_FRAGMENT_TAG,
+            )
+          }
+        }
+        retrieveSdcQuestionnaireFragment()?.context?.setTheme(R.style.AppTheme_Questionnaire)
+      }
+    }
+  }
+
+  private fun handleBackPress() {
+    val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
+    if (questionnaireConfig != null) {
+      if (questionnaireConfig.type.isReadOnly()) {
+        findNavController().popBackStack()
+      } else if (questionnaireConfig.saveDraft) {
+        AlertDialogue.showCancelAlert(
+          requireContext(),
+          R.string.questionnaire_in_progress_alert_back_pressed_message,
+          R.string.questionnaire_alert_back_pressed_title,
+          { /**TODO handleSaveDraftQuestionnaire() */},
+          R.string.questionnaire_alert_back_pressed_save_draft_button_title,
+          { findNavController().popBackStack() },
+          R.string.questionnaire_alert_back_pressed_button_title,
+        )
+      } else {
+        AlertDialogue.showConfirmAlert(
+          requireActivity(),
+          R.string.questionnaire_alert_back_pressed_message,
+          R.string.questionnaire_alert_back_pressed_title,
+          {  findNavController().popBackStack() },
+          R.string.questionnaire_alert_back_pressed_button_title,
+        )
+      }
+    }
+  }
+
+  private fun retrieveSdcQuestionnaireFragment(): SdcQuestionnaireFragment? =
+    childFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) as SdcQuestionnaireFragment?
+}
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragmentViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragmentViewModel.kt
new file mode 100644
index 0000000000..791284d7dd
--- /dev/null
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragmentViewModel.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2021-2023 Ona Systems, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.smartregister.fhircore.quest.ui.questionnaire
+
+import androidx.lifecycle.ViewModel
+import ca.uhn.fhir.parser.IParser
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import org.hl7.fhir.r4.model.Questionnaire
+import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
+import org.smartregister.fhircore.engine.data.local.DefaultRepository
+import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
+import org.smartregister.fhircore.engine.util.DispatcherProvider
+import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
+
+@HiltViewModel
+class QuestionnaireFragmentViewModel
+@Inject
+constructor(
+  val parser: IParser,
+  val defaultRepository: DefaultRepository,
+  val dispatcherProvider: DispatcherProvider,
+  val fhirCarePlanGenerator: FhirCarePlanGenerator
+) : ViewModel() {
+
+  suspend fun retrieveQuestionnaireJson(questionnaireConfig: QuestionnaireConfig): String {
+    if (questionnaireConfig.id.isEmpty()) return ""
+    return defaultRepository
+      .loadResource<Questionnaire>(questionnaireConfig.id)
+      ?.encodeResourceToString()
+      ?: ""
+  }
+
+  fun handleQuestionnaireSubmission(
+    questionnaireResponse: QuestionnaireResponse,
+    questionnaireConfig: QuestionnaireConfig
+  ) {
+    TODO("Not yet implemented")
+  }
+}
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
index 975e2d4031..599dfb1797 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -218,16 +218,10 @@ constructor(
             questionnaireResponse.subject = bundleEntry.resource.asReference()
           }
 
-          if (questionnaireConfig.setPractitionerDetails) {
-            appendPractitionerInfo(bundleEntry.resource)
-          }
-          if (questionnaireConfig.setOrganizationDetails) {
-            appendOrganizationInfo(bundleEntry.resource)
-          }
+          appendPractitionerInfo(bundleEntry.resource)
+          appendOrganizationInfo(bundleEntry.resource)
+          appendAppVersion(context, bundleEntry.resource)
 
-          if (questionnaireConfig.setAppVersion) {
-            appendAppVersion(context, bundleEntry.resource)
-          }
           if (bundleEntry.hasResource()) bundleEntry.resource.updateLastUpdated()
           if (
             questionnaireConfig.type != QuestionnaireType.EDIT &&
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
index d39dda77fb..609489783a 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
@@ -29,7 +29,6 @@ import org.smartregister.fhircore.engine.domain.model.ResourceData
 import org.smartregister.fhircore.engine.util.extension.isIn
 import org.smartregister.fhircore.quest.navigation.MainNavigationScreen
 import org.smartregister.fhircore.quest.navigation.NavigationArg
-import org.smartregister.fhircore.quest.ui.shared.QuestionnaireHandler
 import org.smartregister.p2p.utils.startP2PScreen
 
 fun List<ActionConfig>.handleClickEvent(
@@ -47,6 +46,7 @@ fun List<ActionConfig>.handleClickEvent(
         actionConfig.questionnaire?.let { questionnaireConfig ->
           val questionnaireConfigInterpolated = questionnaireConfig.interpolate(computedValuesMap)
 
+          /*
           if (navController.context is QuestionnaireHandler) {
             (navController.context as QuestionnaireHandler).launchQuestionnaire<Any>(
               context = navController.context,
@@ -55,7 +55,12 @@ fun List<ActionConfig>.handleClickEvent(
               baseResourceId = resourceData?.baseResourceId,
               baseResourceType = resourceData?.baseResourceType?.name,
             )
-          }
+          }*/
+          val args =
+            bundleOf(
+              NavigationArg.QUESTIONNAIRE_CONFIG to questionnaireConfigInterpolated,
+            )
+          navController.navigate(MainNavigationScreen.Questionnaire.route, args)
         }
       }
       ApplicationWorkflow.LAUNCH_PROFILE -> {
diff --git a/android/quest/src/main/res/drawable/ic_arrow_back.xml b/android/quest/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000000..479a7c5a2d
--- /dev/null
+++ b/android/quest/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M12.707,5.707C13.098,5.317 13.098,4.683 12.707,4.293C12.317,3.902 11.683,3.902 11.293,4.293L4.293,11.293C3.902,11.683 3.902,12.317 4.293,12.707L11.293,19.707C11.683,20.098 12.317,20.098 12.707,19.707C13.098,19.317 13.098,18.683 12.707,18.293L7.414,13H19C19.552,13 20,12.552 20,12C20,11.448 19.552,11 19,11H7.414L12.707,5.707Z" />
+</vector>
diff --git a/android/quest/src/main/res/navigation/application_nav_graph.xml b/android/quest/src/main/res/navigation/application_nav_graph.xml
index 2b0fe217e7..b045aa48f8 100644
--- a/android/quest/src/main/res/navigation/application_nav_graph.xml
+++ b/android/quest/src/main/res/navigation/application_nav_graph.xml
@@ -78,4 +78,13 @@
             app:argType="string"
             app:nullable="false" />
     </fragment>
+
+    <fragment
+        android:id="@+id/questionnaireFragment"
+        android:name="org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireFragment">
+        <argument
+            android:name="questionnaireConfig"
+            app:argType="org.smartregister.fhircore.engine.configuration.QuestionnaireConfig"
+            app:nullable="true" />
+    </fragment>
 </navigation>
diff --git a/android/quest/src/main/res/values-night/themes.xml b/android/quest/src/main/res/values-night/themes.xml
index eef569808b..4eef06e583 100644
--- a/android/quest/src/main/res/values-night/themes.xml
+++ b/android/quest/src/main/res/values-night/themes.xml
@@ -1,24 +1,16 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Fhircoreandroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.FhirCoreAndroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
-    <style name="QuestBlue" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">@color/dodger_blue</item>
-        <item name="colorPrimaryDark">@color/purple_700</item>
-    </style>
-    <style name="QuestGray" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">@color/light_gray</item>
-        <item name="colorPrimaryDark">@color/gray</item>
-    </style>
 </resources>
diff --git a/android/quest/src/main/res/values/themes.xml b/android/quest/src/main/res/values/themes.xml
index fa7d2e40e9..4eef06e583 100644
--- a/android/quest/src/main/res/values/themes.xml
+++ b/android/quest/src/main/res/values/themes.xml
@@ -1,9 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Fhircoreandroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.FhirCoreAndroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
@@ -13,15 +13,4 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
-    <style name="QuestDefault" parent="AppTheme.NoActionBar"></style>
-    <style name="QuestBlue" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">@color/dodger_blue</item>
-        <item name="colorPrimaryDark">@color/purple_700</item>
-        <item name="colorAccent">@color/dodger_blue</item>
-    </style>
-    <style name="QuestGray" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">@color/gray</item>
-        <item name="colorPrimaryDark">@color/darkGrayText</item>
-        <item name="colorAccent">@color/gray</item>
-    </style>
 </resources>

From cea38acd0e40af96fc97388ebe44cf6b98855047 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Mon, 17 Jul 2023 14:38:22 +0300
Subject: [PATCH 02/27] Implement logic for perfroming extraction

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../engine/data/local/DefaultRepository.kt    |   6 +-
 .../fhircore/engine/ui/base/AlertDialogue.kt  |  44 +--
 .../util/extension/QuestionnaireExtension.kt  |   2 +-
 .../util/extension/ResourceExtension.kt       |  35 +-
 .../extension/QuestionnaireExtensionTest.kt   |   6 +-
 android/quest/src/main/AndroidManifest.xml    |   5 +
 .../fhircore/quest/QuestConfigService.kt      |  13 +
 .../quest/navigation/MainNavigationScreen.kt  |   2 +-
 .../ui/questionnaire/QuestionnaireActivity.kt |   2 +-
 .../ui/questionnaire/QuestionnaireFragment.kt | 155 ---------
 .../QuestionnaireFragmentViewModel.kt         |  55 ---
 .../questionnaire/QuestionnaireNewActivity.kt | 160 +++++++++
 .../QuestionnaireNewViewModel.kt              | 321 ++++++++++++++++++
 .../questionnaire/QuestionnaireViewModel.kt   |   4 +-
 .../quest/util/extensions/ConfigExtensions.kt |   1 +
 .../res/layout/questionnaire_activity.xml}    |   0
 .../res/navigation/application_nav_graph.xml  |  12 +-
 android/quest/src/main/res/values/strings.xml |   2 +-
 18 files changed, 578 insertions(+), 247 deletions(-)
 delete mode 100644 android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragment.kt
 delete mode 100644 android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragmentViewModel.kt
 create mode 100644 android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
 create mode 100644 android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
 rename android/{engine/src/main/res/layout/questionnaire_fragment_layout.xml => quest/src/main/res/layout/questionnaire_activity.xml} (100%)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
index 4661bf9cfd..fef94ac258 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
@@ -165,8 +165,10 @@ constructor(
 
   private fun preProcessResources(addResourceTags: Boolean, vararg resource: Resource) {
     resource.onEach { currentResource ->
-      currentResource.updateLastUpdated()
-      currentResource.generateMissingId()
+      currentResource.apply {
+        updateLastUpdated()
+        generateMissingId()
+      }
       if (addResourceTags) {
         val tags = configService.provideResourceTags(sharedPreferencesHelper)
         tags.forEach {
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/AlertDialogue.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/AlertDialogue.kt
index 854a861a00..b7a2d9eb1c 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/AlertDialogue.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/AlertDialogue.kt
@@ -197,30 +197,32 @@ object AlertDialogue {
   ): DatePickerDialog {
     val dateDialog = DatePickerDialog(context)
 
-    dateDialog.apply {
-      max?.let { this.datePicker.maxDate = it.time }
-      val id = Resources.getSystem().getIdentifier("date_picker_header_date", "id", "android")
-      if (id != 0) {
-        this.datePicker.findViewById<TextView>(id).textSize = 14f
-      }
+    dateDialog
+      .apply {
+        max?.let { this.datePicker.maxDate = it.time }
+        val id = Resources.getSystem().getIdentifier("date_picker_header_date", "id", "android")
+        if (id != 0) {
+          this.datePicker.findViewById<TextView>(id).textSize = 14f
+        }
 
-      title?.let {
-        this.setCustomTitle(
-          TextView(context).apply {
-            this.text = it
-            this.setPadding(20)
-          },
-        )
-      }
+        title?.let {
+          this.setCustomTitle(
+            TextView(context).apply {
+              this.text = it
+              this.setPadding(20)
+            },
+          )
+        }
 
-      this.setButton(DialogInterface.BUTTON_POSITIVE, confirmButtonText) { d, _ ->
-        val date =
-          Calendar.getInstance().apply {
-            (d as DatePickerDialog).datePicker.let { this.set(it.year, it.month, it.dayOfMonth) }
-          }
-        confirmButtonListener.invoke(date.time)
+        this.setButton(DialogInterface.BUTTON_POSITIVE, confirmButtonText) { d, _ ->
+          val date =
+            Calendar.getInstance().apply {
+              (d as DatePickerDialog).datePicker.let { this.set(it.year, it.month, it.dayOfMonth) }
+            }
+          confirmButtonListener.invoke(date.time)
+        }
       }
-    }.create()
+      .create()
 
     if (dangerActionColor) {
       dateDialog
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt
index 0e16cb504b..c145d2bb75 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt
@@ -49,7 +49,7 @@ fun QuestionnaireResponse.QuestionnaireResponseItemComponent.asLabel() =
     ""
   }
 
-fun Questionnaire.isExtractionCandidate() =
+fun Questionnaire.extractByStructureMap() =
   this.targetStructureMap != null ||
     this.extension.any { it.url.contains("sdc-questionnaire-itemExtractionContext") }
 
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
index 11197b8338..eac086acad 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
@@ -37,10 +37,12 @@ import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Composition
 import org.hl7.fhir.r4.model.Condition
+import org.hl7.fhir.r4.model.Encounter
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Group
 import org.hl7.fhir.r4.model.HumanName
 import org.hl7.fhir.r4.model.Immunization
+import org.hl7.fhir.r4.model.Location
 import org.hl7.fhir.r4.model.Observation
 import org.hl7.fhir.r4.model.Patient
 import org.hl7.fhir.r4.model.Practitioner
@@ -191,7 +193,7 @@ fun List<Questionnaire.QuestionnaireItemComponent>.generateMissingItems(
  * question when mapped to the corresponding [QuestionnaireResponse]
  */
 fun List<Questionnaire.QuestionnaireItemComponent>.prepareQuestionsForReadingOrEditing(
-  path: String,
+  path: String = "QuestionnaireResponse.item",
   readOnly: Boolean = false,
   readOnlyLinkIds: List<String>? = emptyList(),
 ) {
@@ -240,6 +242,37 @@ fun Resource.generateMissingId() {
   if (logicalId.isBlank()) id = UUID.randomUUID().toString()
 }
 
+fun Resource.appendOrganizationInfo(authenticatedOrganizationIds: List<String>?) {
+  // Organization reference in shared pref as "Organization/some-gibberish-uuid"
+  authenticatedOrganizationIds?.let { ids ->
+    val organizationRef =
+      ids.firstOrNull()?.extractLogicalIdUuid()?.asReference(ResourceType.Organization)
+
+    when (this) {
+      is Patient -> managingOrganization = organizationRef
+      is Group -> managingEntity = organizationRef
+      is Encounter -> serviceProvider = organizationRef
+      is Location -> managingOrganization = organizationRef
+    }
+  }
+}
+
+fun Resource.appendPractitionerInfo(practitionerId: String?) {
+  practitionerId?.let {
+    // Convert practitioner uuid to reference e.g. "Practitioner/some-gibberish-uuid"
+    val practitionerRef = it.asReference(ResourceType.Practitioner)
+
+    when (this) {
+      is Patient -> generalPractitioner = arrayListOf(practitionerRef)
+      is Encounter ->
+        participant =
+          arrayListOf(
+            Encounter.EncounterParticipantComponent().apply { individual = practitionerRef },
+          )
+    }
+  }
+}
+
 fun Resource.updateLastUpdated() {
   meta.lastUpdated = Date()
 }
diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtensionTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtensionTest.kt
index 2ea050ace9..a52c5cf33a 100644
--- a/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtensionTest.kt
+++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtensionTest.kt
@@ -72,19 +72,19 @@ class QuestionnaireExtensionTest {
 
   @Test
   fun testIsExtractionCandidateEmptyFalse() {
-    Assert.assertEquals(false, questionniare.isExtractionCandidate())
+    Assert.assertEquals(false, questionniare.extractByStructureMap())
   }
 
   @Test
   fun testIsExtractionCandidatePartialStringFalse() {
     questionniare.extension.add(Extension("https://questionnaire-itemExtractionContext/abc"))
-    Assert.assertEquals(false, questionniare.isExtractionCandidate())
+    Assert.assertEquals(false, questionniare.extractByStructureMap())
   }
 
   @Test
   fun testIsExtractionCandidateTrue() {
     questionniare.extension.add(Extension("https://sdc-questionnaire-itemExtractionContext/abc"))
-    Assert.assertEquals(true, questionniare.isExtractionCandidate())
+    Assert.assertEquals(true, questionniare.extractByStructureMap())
   }
 
   @Test
diff --git a/android/quest/src/main/AndroidManifest.xml b/android/quest/src/main/AndroidManifest.xml
index 5f19201f5f..3d32a307b7 100644
--- a/android/quest/src/main/AndroidManifest.xml
+++ b/android/quest/src/main/AndroidManifest.xml
@@ -53,6 +53,11 @@
             android:exported="false"
             android:theme="@style/AppTheme" />
 
+        <activity
+            android:name=".ui.questionnaire.QuestionnaireNewActivity"
+            android:exported="false"
+            android:theme="@style/AppTheme" />
+
         <activity android:name=".HiltActivityForTest" />
 
         <service
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/QuestConfigService.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/QuestConfigService.kt
index 9a0f770eb3..a39df18542 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/QuestConfigService.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/QuestConfigService.kt
@@ -73,9 +73,22 @@ class QuestConfigService @Inject constructor(@ApplicationContext val context: Co
             display = context.getString(R.string.sync_strategy_practitioner_display)
           },
       ),
+      ResourceTag(
+        type = APP_VERSION,
+        tag =
+          Coding().apply {
+            system = context.getString(R.string.app_version_tag_url)
+            code = BuildConfig.VERSION_NAME
+            display = context.getString(R.string.application_version)
+          },
+      ),
     )
 
   override fun provideConfigurationSyncPageSize(): String {
     return BuildConfig.CONFIGURATION_SYNC_PAGE_SIZE
   }
+
+  companion object {
+    private const val APP_VERSION = "AppVersion"
+  }
 }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
index 1d3dfda13e..8185a15a75 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
@@ -38,7 +38,7 @@ sealed class MainNavigationScreen(
 
   object GeoWidget : MainNavigationScreen(route = R.id.geoWidgetFragment)
 
-  object Questionnaire : MainNavigationScreen(route = R.id.questionnaireFragment)
+  object Questionnaire : MainNavigationScreen(route = R.id.questionnaireActivity)
 
   fun eventId(id: String) = route.toString() + "_" + id
 }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
index c0c0894183..c390eae1ae 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
@@ -186,7 +186,7 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
             context = questionnaireActivity,
           )
         if (!questionnaireResponseValid) {
-          showToast(getString(R.string.questionnaire_response_broken))
+          showToast(getString(R.string.questionnaire_response_invalid))
           finish()
         }
 
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragment.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragment.kt
deleted file mode 100644
index befb269b0c..0000000000
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragment.kt
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2021-2023 Ona Systems, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.smartregister.fhircore.quest.ui.questionnaire
-
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.OnBackPressedCallback
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.commit
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
-import com.google.android.fhir.datacapture.QuestionnaireFragment
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import org.smartregister.fhircore.engine.databinding.QuestionnaireFragmentLayoutBinding
-import org.smartregister.fhircore.engine.ui.base.AlertDialogue
-import org.smartregister.fhircore.quest.R
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity.Companion.QUESTIONNAIRE_FRAGMENT_TAG
-
-typealias SdcQuestionnaireFragment = QuestionnaireFragment
-
-@AndroidEntryPoint
-class QuestionnaireFragment : Fragment() {
-
-  val viewModel by viewModels<QuestionnaireFragmentViewModel>()
-  private val questionnaireFragmentArgs by navArgs<QuestionnaireFragmentArgs>()
-  private var viewBinding: QuestionnaireFragmentLayoutBinding? = null
-
-  override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup?,
-    savedInstanceState: Bundle?,
-  ): View? {
-    inflater.context.setTheme(R.style.AppTheme_Questionnaire)
-    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-    viewBinding = QuestionnaireFragmentLayoutBinding.inflate(inflater, container, false)
-    return viewBinding?.root
-  }
-
-  override fun onDestroyView() {
-    super.onDestroyView()
-    viewBinding = null
-  }
-
-  override fun onAttach(context: Context) {
-    super.onAttach(context)
-    requireActivity()
-      .onBackPressedDispatcher
-      .addCallback(
-        this,
-        object : OnBackPressedCallback(true) {
-          override fun handleOnBackPressed() {
-            handleBackPress()
-          }
-        },
-      )
-  }
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
-    childFragmentManager.setFragmentResultListener(
-      QuestionnaireFragment.SUBMIT_REQUEST_KEY,
-      viewLifecycleOwner,
-    ) { _, _ ->
-      val sdcQuestionnaireFragment = retrieveSdcQuestionnaireFragment()
-      val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
-      if(sdcQuestionnaireFragment != null && questionnaireConfig != null) {
-        viewModel.handleQuestionnaireSubmission(
-          questionnaireResponse = sdcQuestionnaireFragment.getQuestionnaireResponse(),
-          questionnaireConfig = questionnaireConfig
-        )
-      }
-    }
-    if (savedInstanceState == null) renderQuestionnaire()
-  }
-
-  private fun renderQuestionnaire() {
-    viewLifecycleOwner.lifecycleScope.launch {
-      val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
-      if (
-        childFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) == null &&
-          questionnaireConfig != null
-      ) {
-        viewBinding?.questionnaireToolbar?.apply {
-          title = questionnaireConfig.title
-          setNavigationIcon(R.drawable.ic_arrow_back)
-          setNavigationOnClickListener { handleBackPress() }
-        }
-
-        val questionnaireJson = viewModel.retrieveQuestionnaireJson(questionnaireConfig)
-        if (questionnaireJson.isNotEmpty()) {
-          childFragmentManager.commit {
-            setReorderingAllowed(true)
-            add(
-              R.id.container,
-              QuestionnaireFragment.builder().setQuestionnaire(questionnaireJson).build(),
-              QUESTIONNAIRE_FRAGMENT_TAG,
-            )
-          }
-        }
-        retrieveSdcQuestionnaireFragment()?.context?.setTheme(R.style.AppTheme_Questionnaire)
-      }
-    }
-  }
-
-  private fun handleBackPress() {
-    val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
-    if (questionnaireConfig != null) {
-      if (questionnaireConfig.type.isReadOnly()) {
-        findNavController().popBackStack()
-      } else if (questionnaireConfig.saveDraft) {
-        AlertDialogue.showCancelAlert(
-          requireContext(),
-          R.string.questionnaire_in_progress_alert_back_pressed_message,
-          R.string.questionnaire_alert_back_pressed_title,
-          { /**TODO handleSaveDraftQuestionnaire() */},
-          R.string.questionnaire_alert_back_pressed_save_draft_button_title,
-          { findNavController().popBackStack() },
-          R.string.questionnaire_alert_back_pressed_button_title,
-        )
-      } else {
-        AlertDialogue.showConfirmAlert(
-          requireActivity(),
-          R.string.questionnaire_alert_back_pressed_message,
-          R.string.questionnaire_alert_back_pressed_title,
-          {  findNavController().popBackStack() },
-          R.string.questionnaire_alert_back_pressed_button_title,
-        )
-      }
-    }
-  }
-
-  private fun retrieveSdcQuestionnaireFragment(): SdcQuestionnaireFragment? =
-    childFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) as SdcQuestionnaireFragment?
-}
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragmentViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragmentViewModel.kt
deleted file mode 100644
index 791284d7dd..0000000000
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireFragmentViewModel.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2021-2023 Ona Systems, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.smartregister.fhircore.quest.ui.questionnaire
-
-import androidx.lifecycle.ViewModel
-import ca.uhn.fhir.parser.IParser
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-import org.hl7.fhir.r4.model.Questionnaire
-import org.hl7.fhir.r4.model.QuestionnaireResponse
-import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
-import org.smartregister.fhircore.engine.data.local.DefaultRepository
-import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
-import org.smartregister.fhircore.engine.util.DispatcherProvider
-import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
-
-@HiltViewModel
-class QuestionnaireFragmentViewModel
-@Inject
-constructor(
-  val parser: IParser,
-  val defaultRepository: DefaultRepository,
-  val dispatcherProvider: DispatcherProvider,
-  val fhirCarePlanGenerator: FhirCarePlanGenerator
-) : ViewModel() {
-
-  suspend fun retrieveQuestionnaireJson(questionnaireConfig: QuestionnaireConfig): String {
-    if (questionnaireConfig.id.isEmpty()) return ""
-    return defaultRepository
-      .loadResource<Questionnaire>(questionnaireConfig.id)
-      ?.encodeResourceToString()
-      ?: ""
-  }
-
-  fun handleQuestionnaireSubmission(
-    questionnaireResponse: QuestionnaireResponse,
-    questionnaireConfig: QuestionnaireConfig
-  ) {
-    TODO("Not yet implemented")
-  }
-}
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
new file mode 100644
index 0000000000..e7a76d5c2e
--- /dev/null
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2021-2023 Ona Systems, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.smartregister.fhircore.quest.ui.questionnaire
+
+import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.fragment.app.commit
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.navArgs
+import com.google.android.fhir.datacapture.QuestionnaireFragment
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.hl7.fhir.r4.model.Questionnaire
+import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.smartregister.fhircore.engine.ui.base.AlertDialogue
+import org.smartregister.fhircore.engine.ui.base.BaseMultiLanguageActivity
+import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
+import org.smartregister.fhircore.engine.util.extension.showToast
+import org.smartregister.fhircore.quest.R
+import org.smartregister.fhircore.quest.databinding.QuestionnaireActivityBinding
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity.Companion.QUESTIONNAIRE_FRAGMENT_TAG
+
+@AndroidEntryPoint
+class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
+
+  val viewModel by viewModels<QuestionnaireNewViewModel>()
+  private val questionnaireFragmentArgs by navArgs<QuestionnaireNewActivityArgs>()
+  private lateinit var viewBinding: QuestionnaireActivityBinding
+  private var questionnaire: Questionnaire? = null
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+    setTheme(R.style.AppTheme_Questionnaire)
+    viewBinding = QuestionnaireActivityBinding.inflate(layoutInflater)
+    setContentView(viewBinding.root)
+
+    if (savedInstanceState == null) renderQuestionnaire()
+
+    this.onBackPressedDispatcher.addCallback(
+      this,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          handleBackPress()
+        }
+      },
+    )
+  }
+
+  override fun onStart() {
+    super.onStart()
+    supportFragmentManager.setFragmentResultListener(
+      QuestionnaireFragment.SUBMIT_REQUEST_KEY,
+      this,
+    ) { _, _ ->
+      val questionnaireResponse = retrieveQuestionnaireResponse()
+      questionnaireFragmentArgs.questionnaireConfig?.let { questionnaireConfig ->
+        // Close questionnaire if opened in read only mode or if experimental
+        if (questionnaireConfig.type.isReadOnly() || questionnaire?.experimental == false) {
+          finish()
+        }
+        if (questionnaireResponse != null && questionnaire != null) {
+          viewModel.handleQuestionnaireSubmission(
+            questionnaire = questionnaire!!,
+            currentQuestionnaireResponse = questionnaireResponse,
+            questionnaireConfig = questionnaireConfig,
+            actionParameters = questionnaireFragmentArgs.params,
+            context = this,
+          )
+        }
+      }
+    }
+  }
+
+  private fun renderQuestionnaire() {
+    val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
+    val actionParameters = questionnaireFragmentArgs.params
+
+    lifecycleScope.launch {
+      if (
+        supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) == null &&
+          questionnaireConfig != null
+      ) {
+        viewBinding.questionnaireToolbar.apply {
+          title = questionnaireConfig.title
+          setNavigationIcon(R.drawable.ic_arrow_back)
+          setNavigationOnClickListener { handleBackPress() }
+        }
+
+        questionnaire = viewModel.retrieveQuestionnaire(questionnaireConfig, actionParameters)
+        val questionnaireJson = questionnaire?.asJson()
+        if (questionnaireJson.isNullOrEmpty()) {
+          showToast(getString(R.string.questionnaire_not_found))
+          finish()
+        }
+        supportFragmentManager.commit {
+          setReorderingAllowed(true)
+          add(
+            R.id.container,
+            QuestionnaireFragment.builder().setQuestionnaire(questionnaireJson!!).build(),
+            QUESTIONNAIRE_FRAGMENT_TAG,
+          )
+        }
+      }
+    }
+  }
+
+  private fun Questionnaire?.asJson(): String? = this?.encodeResourceToString()
+
+  private fun handleBackPress() {
+    val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
+    if (questionnaireConfig != null) {
+      if (questionnaireConfig.type.isReadOnly()) {
+        finish()
+      } else if (questionnaireConfig.saveDraft) {
+        AlertDialogue.showCancelAlert(
+          context = this,
+          message = R.string.questionnaire_in_progress_alert_back_pressed_message,
+          title = R.string.questionnaire_alert_back_pressed_title,
+          confirmButtonListener = {
+            retrieveQuestionnaireResponse()?.let { questionnaireResponse ->
+              viewModel.saveDraftQuestionnaire(questionnaireResponse)
+            }
+          },
+          confirmButtonText = R.string.questionnaire_alert_back_pressed_save_draft_button_title,
+          neutralButtonListener = { finish() },
+          neutralButtonText = R.string.questionnaire_alert_back_pressed_button_title,
+        )
+      } else {
+        AlertDialogue.showConfirmAlert(
+          context = this,
+          message = R.string.questionnaire_alert_back_pressed_message,
+          title = R.string.questionnaire_alert_back_pressed_title,
+          confirmButtonListener = { finish() },
+          confirmButtonText = R.string.questionnaire_alert_back_pressed_button_title,
+        )
+      }
+    }
+  }
+
+  private fun retrieveQuestionnaireResponse(): QuestionnaireResponse? =
+    (supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) as QuestionnaireFragment?)
+      ?.getQuestionnaireResponse()
+}
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
new file mode 100644
index 0000000000..f96b817eaa
--- /dev/null
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2021-2023 Ona Systems, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.smartregister.fhircore.quest.ui.questionnaire
+
+import android.content.Context
+import android.widget.Toast
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.google.android.fhir.datacapture.mapping.ResourceMapper
+import com.google.android.fhir.datacapture.mapping.StructureMapExtractionContext
+import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValidator
+import com.google.android.fhir.datacapture.validation.Valid
+import com.google.android.fhir.db.ResourceNotFoundException
+import dagger.hilt.android.lifecycle.HiltViewModel
+import java.util.Date
+import java.util.UUID
+import javax.inject.Inject
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.hl7.fhir.r4.context.IWorkerContext
+import org.hl7.fhir.r4.model.Bundle
+import org.hl7.fhir.r4.model.ListResource
+import org.hl7.fhir.r4.model.ListResource.ListEntryComponent
+import org.hl7.fhir.r4.model.Questionnaire
+import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.hl7.fhir.r4.model.Resource
+import org.hl7.fhir.r4.model.ResourceType
+import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
+import org.smartregister.fhircore.engine.data.local.DefaultRepository
+import org.smartregister.fhircore.engine.domain.model.ActionParameter
+import org.smartregister.fhircore.engine.domain.model.ActionParameterType
+import org.smartregister.fhircore.engine.rulesengine.ResourceDataRulesExecutor
+import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
+import org.smartregister.fhircore.engine.util.DispatcherProvider
+import org.smartregister.fhircore.engine.util.SharedPreferenceKey
+import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
+import org.smartregister.fhircore.engine.util.extension.DEFAULT_PLACEHOLDER_PREFIX
+import org.smartregister.fhircore.engine.util.extension.appendOrganizationInfo
+import org.smartregister.fhircore.engine.util.extension.appendPractitionerInfo
+import org.smartregister.fhircore.engine.util.extension.asReference
+import org.smartregister.fhircore.engine.util.extension.extractByStructureMap
+import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
+import org.smartregister.fhircore.engine.util.extension.prePopulateInitialValues
+import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForReadingOrEditing
+import org.smartregister.fhircore.engine.util.extension.resourceClassType
+import org.smartregister.fhircore.engine.util.extension.showToast
+import org.smartregister.fhircore.engine.util.extension.updateLastUpdated
+import org.smartregister.fhircore.engine.util.helper.TransformSupportServices
+import org.smartregister.fhircore.quest.R
+import timber.log.Timber
+
+@HiltViewModel
+class QuestionnaireNewViewModel
+@Inject
+constructor(
+  val defaultRepository: DefaultRepository,
+  val dispatcherProvider: DispatcherProvider,
+  val fhirCarePlanGenerator: FhirCarePlanGenerator,
+  val resourceDataRulesExecutor: ResourceDataRulesExecutor,
+  val transformSupportServices: TransformSupportServices,
+  val sharedPreferencesHelper: SharedPreferencesHelper,
+) : ViewModel() {
+
+  private val authenticatedOrganizationIds by lazy {
+    sharedPreferencesHelper.read<List<String>>(ResourceType.Organization.name)
+  }
+
+  private val practitionerId: String? by lazy {
+    sharedPreferencesHelper
+      .read(SharedPreferenceKey.PRACTITIONER_ID.name, null)
+      ?.extractLogicalIdUuid()
+  }
+
+  /**
+   * This function retrieves the [Questionnaire] as configured via the [QuestionnaireConfig]. The
+   * retrieved [Questionnaire] can be pre-populated with computed values from the Rules engine.
+   */
+  suspend fun retrieveQuestionnaire(
+    questionnaireConfig: QuestionnaireConfig,
+    actionParameters: Array<ActionParameter>?,
+  ): Questionnaire? {
+    if (questionnaireConfig.id.isEmpty()) return null
+
+    // Compute questionnaire config rules and add extra questionnaire params to action parameters
+    val questionnaireComputedValues =
+      questionnaireConfig.configRules?.let {
+        resourceDataRulesExecutor.computeResourceDataRules(it, null)
+      }
+        ?: emptyMap()
+
+    val allActionParameters =
+      actionParameters?.plus(
+        questionnaireConfig.extraParams?.map { it.interpolate(questionnaireComputedValues) }
+          ?: emptyList(),
+      )
+
+    val questionnaire =
+      defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)?.apply {
+        if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditMode()) {
+          item.prepareQuestionsForReadingOrEditing(
+            readOnly = questionnaireConfig.type.isReadOnly(),
+            readOnlyLinkIds = questionnaireConfig.readOnlyLinkIds,
+          )
+        }
+
+        // Pre-populate questionnaire items with configured values
+        allActionParameters
+          ?.filter { (it.paramType == ActionParameterType.PREPOPULATE && it.value.isNotEmpty()) }
+          ?.let { actionParam ->
+            item.prePopulateInitialValues(DEFAULT_PLACEHOLDER_PREFIX, actionParam)
+          }
+      }
+    return questionnaire
+  }
+
+  /**
+   * This function performs data extraction against the [QuestionnaireResponse]. The generated
+   * resources are then saved in the database. Optionally, this function will generate CarePlan
+   * using the PlanDefinition resource configured in [QuestionnaireConfig.planDefinitions]
+   */
+  fun handleQuestionnaireSubmission(
+    questionnaire: Questionnaire,
+    currentQuestionnaireResponse: QuestionnaireResponse,
+    questionnaireConfig: QuestionnaireConfig,
+    actionParameters: Array<ActionParameter>?,
+    context: Context,
+  ) {
+    val questionnaireResponseValid =
+      validateQuestionnaireResponse(
+        questionnaire = questionnaire,
+        questionnaireResponse = currentQuestionnaireResponse,
+        context = context,
+      )
+
+    if (!questionnaireResponseValid) {
+      Timber.e("Invalid questionnaire response")
+      context.showToast(context.getString(R.string.questionnaire_response_invalid))
+      return
+    }
+
+    currentQuestionnaireResponse.processMetadata(questionnaire)
+
+    viewModelScope.launch {
+      val bundle =
+        performExtraction(
+          extractByStructureMap = questionnaire.extractByStructureMap(),
+          questionnaire = questionnaire,
+          questionnaireResponse = currentQuestionnaireResponse,
+          context = context,
+        )
+
+      val containedList = ListResource().apply { id = UUID.randomUUID().toString() }
+      bundle.entry.forEach { bundleEntryComponent ->
+        val bundleEntryResource: Resource? = bundleEntryComponent.resource
+        bundleEntryResource?.run {
+          applyResourceMetadata()
+          defaultRepository.addOrUpdate(resource = this)
+
+          // Track ids for the generated resources in ListResource added to the
+          // QuestionnaireResponse
+          val listEntryComponent =
+            ListEntryComponent().apply {
+              deleted = false
+              date = Date()
+              item = bundleEntryResource.asReference()
+            }
+          containedList.addEntry(listEntryComponent)
+        }
+
+        // Save questionnaire response
+        currentQuestionnaireResponse.addContained(containedList)
+        defaultRepository.addOrUpdate(resource = currentQuestionnaireResponse)
+
+        actionParameters?.let { parameters -> updateResourcesLastUpdatedProperty(parameters) }
+
+        // TODO Handle CarePlan generation and closing of configured resources
+      }
+    }
+  }
+
+  private fun QuestionnaireResponse.processMetadata(questionnaire: Questionnaire) {
+    status = QuestionnaireResponse.QuestionnaireResponseStatus.COMPLETED
+    authored = Date()
+    questionnaire.useContext
+      .filter { it.hasValueCodeableConcept() }
+      .forEach { it.valueCodeableConcept.coding.forEach { coding -> this.meta.addTag(coding) } }
+    applyResourceMetadata()
+  }
+
+  private fun Resource?.applyResourceMetadata(): Resource? {
+    this?.apply {
+      appendOrganizationInfo(authenticatedOrganizationIds)
+      appendPractitionerInfo(practitionerId)
+      updateLastUpdated()
+    }
+    return this
+  }
+
+  suspend fun performExtraction(
+    extractByStructureMap: Boolean,
+    questionnaire: Questionnaire,
+    questionnaireResponse: QuestionnaireResponse,
+    context: Context,
+  ): Bundle =
+    withContext(dispatcherProvider.io()) {
+      kotlin
+        .runCatching {
+          if (extractByStructureMap) {
+            ResourceMapper.extract(
+              questionnaire = questionnaire,
+              questionnaireResponse = questionnaireResponse,
+              StructureMapExtractionContext(
+                context = context,
+                transformSupportServices = transformSupportServices,
+                structureMapProvider = { structureMapUrl: String, _: IWorkerContext ->
+                  defaultRepository.loadResource(structureMapUrl.extractLogicalIdUuid())
+                },
+              ),
+            )
+          } else {
+            ResourceMapper.extract(
+              questionnaire = questionnaire,
+              questionnaireResponse = questionnaireResponse,
+            )
+          }
+        }
+        .onFailure { exception ->
+          Timber.e(exception)
+          viewModelScope.launch {
+            if (exception is NullPointerException && exception.message!!.contains("StructureMap")) {
+              context.showToast(
+                context.getString(R.string.structure_map_missing_message),
+                Toast.LENGTH_LONG,
+              )
+            } else {
+              context.showToast(
+                context.getString(R.string.structuremap_failed, questionnaire.name),
+                Toast.LENGTH_LONG,
+              )
+            }
+          }
+        }
+        .getOrDefault(Bundle())
+    }
+
+  /**
+   * This function saves [QuestionnaireResponse] as draft if any of the [QuestionnaireResponse.item]
+   * has an answer.
+   */
+  fun saveDraftQuestionnaire(questionnaireResponse: QuestionnaireResponse) {
+    val questionnaireHasAnswer =
+      questionnaireResponse.item.any {
+        it.answer.any { answerComponent -> answerComponent.hasValue() }
+      }
+    if (questionnaireHasAnswer) {
+      viewModelScope.launch(dispatcherProvider.io()) {
+        questionnaireResponse.status = QuestionnaireResponse.QuestionnaireResponseStatus.INPROGRESS
+        defaultRepository.addOrUpdate(addMandatoryTags = true, resource = questionnaireResponse)
+      }
+    }
+  }
+
+  /**
+   * This function updates the _lastUpdated property of resources configured by the
+   * [ActionParameter.paramType] of [ActionParameterType.UPDATE_DATE_ON_EDIT]. Each time a
+   * questionnaire is submitted, the affected resources last modified/updated date will also be
+   * updated.
+   */
+  suspend fun updateResourcesLastUpdatedProperty(actionParameters: Array<ActionParameter>) {
+    val updateOnEditParams =
+      actionParameters.filter {
+        it.paramType == ActionParameterType.UPDATE_DATE_ON_EDIT && it.value.isNotEmpty()
+      }
+
+    updateOnEditParams.forEach { param ->
+      try {
+        val resourceType =
+          param.value.substringBefore("/").resourceClassType().newInstance().resourceType
+        val resource =
+          defaultRepository.loadResource(param.value.extractLogicalIdUuid(), resourceType)
+        resource.let { defaultRepository.addOrUpdate(resource = it) }
+      } catch (resourceNotFoundException: ResourceNotFoundException) {
+        Timber.e("Unable to update resource's _lastUpdated", resourceNotFoundException)
+      }
+    }
+  }
+
+  /**
+   * This function validates all [QuestionnaireResponse] and returns true if all the validation
+   * result of [QuestionnaireResponseValidator] are [Valid] or [NotValidated] (validation is
+   * optional on [Questionnaire] fields)
+   */
+  fun validateQuestionnaireResponse(
+    questionnaire: Questionnaire,
+    questionnaireResponse: QuestionnaireResponse,
+    context: Context,
+  ) =
+    QuestionnaireResponseValidator.validateQuestionnaireResponse(
+        questionnaire = questionnaire,
+        questionnaireResponse = questionnaireResponse,
+        context = context,
+      )
+      .values
+      .flatten()
+      .all { it is Valid || it is NotValidated }
+}
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
index 86784b3518..5a61549d6f 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -63,12 +63,12 @@ import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
 import org.smartregister.fhircore.engine.util.extension.asReference
 import org.smartregister.fhircore.engine.util.extension.cqfLibraryIds
 import org.smartregister.fhircore.engine.util.extension.deleteRelatedResources
+import org.smartregister.fhircore.engine.util.extension.extractByStructureMap
 import org.smartregister.fhircore.engine.util.extension.extractId
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
 import org.smartregister.fhircore.engine.util.extension.extractType
 import org.smartregister.fhircore.engine.util.extension.find
 import org.smartregister.fhircore.engine.util.extension.findSubject
-import org.smartregister.fhircore.engine.util.extension.isExtractionCandidate
 import org.smartregister.fhircore.engine.util.extension.isIn
 import org.smartregister.fhircore.engine.util.extension.prePopulateInitialValues
 import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForReadingOrEditing
@@ -205,7 +205,7 @@ constructor(
         questionnaire,
         questionnaireResponse,
       )
-      if (questionnaire.isExtractionCandidate()) {
+      if (questionnaire.extractByStructureMap()) {
         val bundle = performExtraction(context, questionnaire, questionnaireResponse)
         bundle.entry.forEach { bundleEntry ->
           if (
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
index 609489783a..d2ecf9d90e 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
@@ -59,6 +59,7 @@ fun List<ActionConfig>.handleClickEvent(
           val args =
             bundleOf(
               NavigationArg.QUESTIONNAIRE_CONFIG to questionnaireConfigInterpolated,
+              NavigationArg.PARAMS to interpolateActionParamsValue(actionConfig, resourceData),
             )
           navController.navigate(MainNavigationScreen.Questionnaire.route, args)
         }
diff --git a/android/engine/src/main/res/layout/questionnaire_fragment_layout.xml b/android/quest/src/main/res/layout/questionnaire_activity.xml
similarity index 100%
rename from android/engine/src/main/res/layout/questionnaire_fragment_layout.xml
rename to android/quest/src/main/res/layout/questionnaire_activity.xml
diff --git a/android/quest/src/main/res/navigation/application_nav_graph.xml b/android/quest/src/main/res/navigation/application_nav_graph.xml
index b045aa48f8..6d2da59299 100644
--- a/android/quest/src/main/res/navigation/application_nav_graph.xml
+++ b/android/quest/src/main/res/navigation/application_nav_graph.xml
@@ -79,12 +79,16 @@
             app:nullable="false" />
     </fragment>
 
-    <fragment
-        android:id="@+id/questionnaireFragment"
-        android:name="org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireFragment">
+    <activity
+        android:id="@+id/questionnaireActivity"
+        android:name="org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireNewActivity">
         <argument
             android:name="questionnaireConfig"
             app:argType="org.smartregister.fhircore.engine.configuration.QuestionnaireConfig"
             app:nullable="true" />
-    </fragment>
+        <argument
+            android:name="params"
+            app:argType="org.smartregister.fhircore.engine.domain.model.ActionParameter[]"
+            app:nullable="true" />
+    </activity>
 </navigation>
diff --git a/android/quest/src/main/res/values/strings.xml b/android/quest/src/main/res/values/strings.xml
index 8ab7a0e8fd..72607d67c1 100644
--- a/android/quest/src/main/res/values/strings.xml
+++ b/android/quest/src/main/res/values/strings.xml
@@ -100,7 +100,7 @@
     <string name="error_fetching_user_details">Failed to fetch user details</string>
     <string name="questionnaire_not_found">Questionnaire not found.  Sync all questionnaires to fix</string>
     <string name="no_visits">No visits</string>
-    <string name="questionnaire_response_broken">Questionnaire response broken</string>
+    <string name="questionnaire_response_invalid">Questionnaire response invalid</string>
     <string name="app_version_tag_url" translatable="false">https://smartregister.org/app-version</string>
     <string name="application_version" translatable="false">Application Version</string>
 

From 8dbc3ef933879858e9bcaef2038f16d78bc99d9b Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Tue, 18 Jul 2023 16:40:25 +0300
Subject: [PATCH 03/27] Fix extraction

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../QuestionnaireNewViewModel.kt              | 88 +++++++++----------
 1 file changed, 43 insertions(+), 45 deletions(-)

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index f96b817eaa..5fd95e7a99 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -31,7 +31,6 @@ import java.util.Date
 import java.util.UUID
 import javax.inject.Inject
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.hl7.fhir.r4.context.IWorkerContext
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.ListResource
@@ -165,14 +164,13 @@ constructor(
         )
 
       val containedList = ListResource().apply { id = UUID.randomUUID().toString() }
-      bundle.entry.forEach { bundleEntryComponent ->
+      bundle?.entry?.forEach { bundleEntryComponent ->
         val bundleEntryResource: Resource? = bundleEntryComponent.resource
         bundleEntryResource?.run {
           applyResourceMetadata()
           defaultRepository.addOrUpdate(resource = this)
 
-          // Track ids for the generated resources in ListResource added to the
-          // QuestionnaireResponse
+          // Track ids for resources in ListResource added to the QuestionnaireResponse
           val listEntryComponent =
             ListEntryComponent().apply {
               deleted = false
@@ -181,15 +179,17 @@ constructor(
             }
           containedList.addEntry(listEntryComponent)
         }
+      }
 
-        // Save questionnaire response
+      // Save questionnaire response
+      if (bundle != null) {
         currentQuestionnaireResponse.addContained(containedList)
-        defaultRepository.addOrUpdate(resource = currentQuestionnaireResponse)
+      }
+      defaultRepository.addOrUpdate(resource = currentQuestionnaireResponse)
 
-        actionParameters?.let { parameters -> updateResourcesLastUpdatedProperty(parameters) }
+      actionParameters?.let { parameters -> updateResourcesLastUpdatedProperty(parameters) }
 
-        // TODO Handle CarePlan generation and closing of configured resources
-      }
+      // TODO Handle CarePlan generation and closing of configured resources
     }
   }
 
@@ -216,47 +216,45 @@ constructor(
     questionnaire: Questionnaire,
     questionnaireResponse: QuestionnaireResponse,
     context: Context,
-  ): Bundle =
-    withContext(dispatcherProvider.io()) {
-      kotlin
-        .runCatching {
-          if (extractByStructureMap) {
-            ResourceMapper.extract(
-              questionnaire = questionnaire,
-              questionnaireResponse = questionnaireResponse,
-              StructureMapExtractionContext(
-                context = context,
-                transformSupportServices = transformSupportServices,
-                structureMapProvider = { structureMapUrl: String, _: IWorkerContext ->
-                  defaultRepository.loadResource(structureMapUrl.extractLogicalIdUuid())
-                },
-              ),
+  ): Bundle? =
+    kotlin
+      .runCatching {
+        if (extractByStructureMap) {
+          ResourceMapper.extract(
+            questionnaire = questionnaire,
+            questionnaireResponse = questionnaireResponse,
+            StructureMapExtractionContext(
+              context = context,
+              transformSupportServices = transformSupportServices,
+              structureMapProvider = { structureMapUrl: String?, _: IWorkerContext ->
+                structureMapUrl?.substringAfterLast("/")?.let { defaultRepository.loadResource(it) }
+              },
+            ),
+          )
+        } else {
+          ResourceMapper.extract(
+            questionnaire = questionnaire,
+            questionnaireResponse = questionnaireResponse,
+          )
+        }
+      }
+      .onFailure { exception ->
+        Timber.e(exception)
+        viewModelScope.launch {
+          if (exception is NullPointerException && exception.message!!.contains("StructureMap")) {
+            context.showToast(
+              context.getString(R.string.structure_map_missing_message),
+              Toast.LENGTH_LONG,
             )
           } else {
-            ResourceMapper.extract(
-              questionnaire = questionnaire,
-              questionnaireResponse = questionnaireResponse,
+            context.showToast(
+              context.getString(R.string.structuremap_failed, questionnaire.name),
+              Toast.LENGTH_LONG,
             )
           }
         }
-        .onFailure { exception ->
-          Timber.e(exception)
-          viewModelScope.launch {
-            if (exception is NullPointerException && exception.message!!.contains("StructureMap")) {
-              context.showToast(
-                context.getString(R.string.structure_map_missing_message),
-                Toast.LENGTH_LONG,
-              )
-            } else {
-              context.showToast(
-                context.getString(R.string.structuremap_failed, questionnaire.name),
-                Toast.LENGTH_LONG,
-              )
-            }
-          }
-        }
-        .getOrDefault(Bundle())
-    }
+      }
+      .getOrDefault(null)
 
   /**
    * This function saves [QuestionnaireResponse] as draft if any of the [QuestionnaireResponse.item]

From bc0896fa75c119ed352ff7dc6225d102b03d5d57 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Tue, 18 Jul 2023 19:30:51 +0300
Subject: [PATCH 04/27] Clean up code

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../configuration/QuestionnaireConfig.kt      |   7 -
 .../fhircore/engine/cql/LibraryEvaluator.kt   |  11 +-
 .../QuestionnaireNewViewModel.kt              | 145 +++++++++++++++---
 .../questionnaire/QuestionnaireViewModel.kt   |   2 +-
 4 files changed, 128 insertions(+), 37 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
index fcce32036c..a0140527f3 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
@@ -50,13 +50,6 @@ data class QuestionnaireConfig(
   val configRules: List<RuleConfig>? = null,
   val extraParams: List<ActionParameter>? = null,
   val onSubmitActions: List<ActionConfig>? = null,
-  val questionnaireSubjects: List<ResourceType> =
-    listOf(
-      ResourceType.Patient,
-      ResourceType.Group,
-      ResourceType.Practitioner,
-      ResourceType.Location,
-    ),
 ) : java.io.Serializable, Parcelable {
 
   fun interpolate(computedValuesMap: Map<String, Any>) =
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/cql/LibraryEvaluator.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/cql/LibraryEvaluator.kt
index bb8a519644..e07a7434a4 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/cql/LibraryEvaluator.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/cql/LibraryEvaluator.kt
@@ -65,7 +65,7 @@ import timber.log.Timber
  * https://github.com/DBCG/CqlEvaluatorSampleApp See also https://www.hl7.org/fhir/
  */
 @Singleton
-class LibraryEvaluator @Inject constructor() {
+class LibraryEvaluator @Inject constructor(val defaultRepository: DefaultRepository) {
   private val fhirContext = FhirContext.forR4Cached()
   private val parser = fhirContext.newJsonParser()
   private var adapterFactory = AdapterFactory()
@@ -224,18 +224,17 @@ class LibraryEvaluator @Inject constructor() {
     libraryId: String,
     patient: Patient?,
     data: Bundle,
-    repository: DefaultRepository,
     outputLog: Boolean = false,
   ): List<String> {
     initialize()
 
-    val library = repository.fhirEngine.get<LibraryResource>(libraryId)
+    val library = defaultRepository.fhirEngine.get<LibraryResource>(libraryId)
 
     val helpers =
       library.relatedArtifact
         .filter { it.hasResource() && it.resource.startsWith("Library/") }
         .mapNotNull {
-          repository.fhirEngine.get<LibraryResource>(it.resource.replace("Library/", ""))
+          defaultRepository.fhirEngine.get<LibraryResource>(it.resource.replace("Library/", ""))
         }
 
     loadConfigs(
@@ -247,7 +246,7 @@ class LibraryEvaluator @Inject constructor() {
         listOfNotNull(
           patient,
           *data.entry.map { it.resource }.toTypedArray(),
-          *repository.search(library.dataRequirementFirstRep).toTypedArray(),
+          *defaultRepository.search(library.dataRequirementFirstRep).toTypedArray(),
         ),
       ),
     )
@@ -267,7 +266,7 @@ class LibraryEvaluator @Inject constructor() {
 
         if (p.name.equals(OUTPUT_PARAMETER_KEY) && it.isResource) {
           data.addEntry().apply { this.resource = p.resource }
-          repository.create(true, it as Resource)
+          defaultRepository.create(true, it as Resource)
         }
 
         when {
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index 5fd95e7a99..44fac8e79d 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -31,18 +31,22 @@ import java.util.Date
 import java.util.UUID
 import javax.inject.Inject
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.hl7.fhir.r4.context.IWorkerContext
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.ListResource
 import org.hl7.fhir.r4.model.ListResource.ListEntryComponent
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.hl7.fhir.r4.model.Reference
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
+import org.smartregister.fhircore.engine.cql.LibraryEvaluator
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.domain.model.ActionParameterType
+import org.smartregister.fhircore.engine.domain.model.QuestionnaireType
 import org.smartregister.fhircore.engine.rulesengine.ResourceDataRulesExecutor
 import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
 import org.smartregister.fhircore.engine.util.DispatcherProvider
@@ -52,11 +56,12 @@ import org.smartregister.fhircore.engine.util.extension.DEFAULT_PLACEHOLDER_PREF
 import org.smartregister.fhircore.engine.util.extension.appendOrganizationInfo
 import org.smartregister.fhircore.engine.util.extension.appendPractitionerInfo
 import org.smartregister.fhircore.engine.util.extension.asReference
+import org.smartregister.fhircore.engine.util.extension.cqfLibraryIds
 import org.smartregister.fhircore.engine.util.extension.extractByStructureMap
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
+import org.smartregister.fhircore.engine.util.extension.findSubject
 import org.smartregister.fhircore.engine.util.extension.prePopulateInitialValues
 import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForReadingOrEditing
-import org.smartregister.fhircore.engine.util.extension.resourceClassType
 import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.engine.util.extension.updateLastUpdated
 import org.smartregister.fhircore.engine.util.helper.TransformSupportServices
@@ -73,6 +78,7 @@ constructor(
   val resourceDataRulesExecutor: ResourceDataRulesExecutor,
   val transformSupportServices: TransformSupportServices,
   val sharedPreferencesHelper: SharedPreferencesHelper,
+  val libraryEvaluator: LibraryEvaluator,
 ) : ViewModel() {
 
   private val authenticatedOrganizationIds by lazy {
@@ -110,9 +116,12 @@ constructor(
 
     val questionnaire =
       defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)?.apply {
-        if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditMode()) {
+        if (
+          questionnaireConfig.type == QuestionnaireType.READ_ONLY ||
+            questionnaireConfig.type == QuestionnaireType.EDIT
+        ) {
           item.prepareQuestionsForReadingOrEditing(
-            readOnly = questionnaireConfig.type.isReadOnly(),
+            readOnly = questionnaireConfig.type == QuestionnaireType.READ_ONLY,
             readOnlyLinkIds = questionnaireConfig.readOnlyLinkIds,
           )
         }
@@ -128,9 +137,13 @@ constructor(
   }
 
   /**
-   * This function performs data extraction against the [QuestionnaireResponse]. The generated
-   * resources are then saved in the database. Optionally, this function will generate CarePlan
-   * using the PlanDefinition resource configured in [QuestionnaireConfig.planDefinitions]
+   * This function performs data extraction against the [QuestionnaireResponse]. All the resources
+   * generated from a successful extraction by StructureMap or definition are stored in the
+   * database. The [QuestionnaireResponse] is also stored in the database regardless of the outcome
+   * of [ResourceMapper.extract]. This function will optionally generate CarePlan using the
+   * PlanDefinition resource configured in [QuestionnaireConfig.planDefinitions]. The
+   * [QuestionnaireConfig.eventWorkflows] contains configurations to cascade update the statuses of
+   * resources to in-active (close) that are related to the current [QuestionnaireResponse.subject]
    */
   fun handleQuestionnaireSubmission(
     questionnaire: Questionnaire,
@@ -163,36 +176,73 @@ constructor(
           context = context,
         )
 
-      val containedList = ListResource().apply { id = UUID.randomUUID().toString() }
+      val extractionDate = Date()
+
+      // Create a list resource to store the references for generated resources
+      val listResource =
+        ListResource().apply {
+          id = UUID.randomUUID().toString()
+          status = ListResource.ListStatus.CURRENT
+          mode = ListResource.ListMode.WORKING
+          title = CONTAINED_LIST_TITLE
+          date = extractionDate
+        }
+
       bundle?.entry?.forEach { bundleEntryComponent ->
         val bundleEntryResource: Resource? = bundleEntryComponent.resource
         bundleEntryResource?.run {
           applyResourceMetadata()
           defaultRepository.addOrUpdate(resource = this)
 
-          // Track ids for resources in ListResource added to the QuestionnaireResponse
+          // Track ids for resources in ListResource added to the QuestionnaireResponse.contained
           val listEntryComponent =
             ListEntryComponent().apply {
               deleted = false
-              date = Date()
+              date = extractionDate
               item = bundleEntryResource.asReference()
             }
-          containedList.addEntry(listEntryComponent)
+          listResource.addEntry(listEntryComponent)
         }
       }
 
       // Save questionnaire response
-      if (bundle != null) {
-        currentQuestionnaireResponse.addContained(containedList)
-      }
+      currentQuestionnaireResponse.addContained(listResource)
       defaultRepository.addOrUpdate(resource = currentQuestionnaireResponse)
 
-      actionParameters?.let { parameters -> updateResourcesLastUpdatedProperty(parameters) }
+      // Update _lastUpdated for resources configured via ActionParameterType.UPDATE_DATE_ON_EDIT
+      updateResourcesLastUpdatedProperty(actionParameters)
+
+      // Generate CarePlan using configured plan definitions
+      generateCarePlan(
+        questionnaire = questionnaire,
+        bundle = bundle.copyBundle(currentQuestionnaireResponse),
+        questionnaireConfig = questionnaireConfig,
+      )
+
+      // Execute CQL
+      executeCql(
+        questionnaire = questionnaire,
+        bundle = bundle.copyBundle(currentQuestionnaireResponse),
+      )
 
-      // TODO Handle CarePlan generation and closing of configured resources
+      // Cascade update statuses of resources closed by this Questionnaire submission
+      bundle?.let {
+        viewModelScope.launch {
+          fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
+            questionnaireConfig = questionnaireConfig,
+            subject = retrieveSubject(questionnaire, it),
+            bundle = it,
+          )
+        }
+      }
     }
   }
 
+  private fun Bundle?.copyBundle(currentQuestionnaireResponse: QuestionnaireResponse): Bundle? =
+    this?.copy()?.apply {
+      addEntry(Bundle.BundleEntryComponent().apply { resource = currentQuestionnaireResponse })
+    }
+
   private fun QuestionnaireResponse.processMetadata(questionnaire: Questionnaire) {
     status = QuestionnaireResponse.QuestionnaireResponseStatus.COMPLETED
     authored = Date()
@@ -211,6 +261,11 @@ constructor(
     return this
   }
 
+  /**
+   * Perform StructureMap or Definition based definition. The result of this function returns a
+   * Bundle that contains the resources that were generated via the [ResourceMapper.extract]
+   * operation otherwise returns null if an exception is encountered.
+   */
   suspend fun performExtraction(
     extractByStructureMap: Boolean,
     questionnaire: Questionnaire,
@@ -279,19 +334,16 @@ constructor(
    * questionnaire is submitted, the affected resources last modified/updated date will also be
    * updated.
    */
-  suspend fun updateResourcesLastUpdatedProperty(actionParameters: Array<ActionParameter>) {
+  suspend fun updateResourcesLastUpdatedProperty(actionParameters: Array<ActionParameter>?) {
     val updateOnEditParams =
-      actionParameters.filter {
+      actionParameters?.filter {
         it.paramType == ActionParameterType.UPDATE_DATE_ON_EDIT && it.value.isNotEmpty()
       }
 
-    updateOnEditParams.forEach { param ->
+    updateOnEditParams?.forEach { param ->
       try {
-        val resourceType =
-          param.value.substringBefore("/").resourceClassType().newInstance().resourceType
-        val resource =
-          defaultRepository.loadResource(param.value.extractLogicalIdUuid(), resourceType)
-        resource.let { defaultRepository.addOrUpdate(resource = it) }
+        val resource = defaultRepository.loadResource(Reference(param.value))
+        defaultRepository.addOrUpdate(resource = resource)
       } catch (resourceNotFoundException: ResourceNotFoundException) {
         Timber.e("Unable to update resource's _lastUpdated", resourceNotFoundException)
       }
@@ -316,4 +368,51 @@ constructor(
       .values
       .flatten()
       .all { it is Valid || it is NotValidated }
+
+  suspend fun executeCql(questionnaire: Questionnaire, bundle: Bundle?) {
+    withContext(dispatcherProvider.io()) {
+      questionnaire.cqfLibraryIds().forEach {
+        // TODO Get the id of the resource of type Questionnaire.subjectType from the bundle
+        //  libraryEvaluator.runCqlLibrary(it, patient, bundle)
+      }
+    }
+  }
+
+  /**
+   * This function generates CarePlans for the [QuestionnaireResponse.subject] using the configured
+   * [QuestionnaireConfig.planDefinitions]
+   */
+  suspend fun generateCarePlan(
+    questionnaire: Questionnaire,
+    bundle: Bundle?,
+    questionnaireConfig: QuestionnaireConfig,
+  ) {
+    val subject = retrieveSubject(questionnaire, bundle)
+    questionnaireConfig.planDefinitions?.forEach { planId ->
+      kotlin
+        .runCatching {
+          if (bundle != null) {
+            fhirCarePlanGenerator.generateOrUpdateCarePlan(
+              planDefinitionId = planId,
+              subject = subject,
+              data = bundle,
+            )
+          }
+        }
+        .onFailure { Timber.e(it) }
+    }
+  }
+
+  // TODO Subject should be the resource obtained from the bundle of type Questionnaire.subjectType
+  private suspend fun retrieveSubject(
+    questionnaire: Questionnaire,
+    bundle: Bundle?,
+  ): Resource {
+    return (questionnaire.findSubject(bundle)
+      ?: defaultRepository.loadResource(questionnaire.subject))
+  }
+
+  companion object {
+    const val CONTAINED_LIST_TITLE = "GeneratedResourcesList"
+  }
 }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
index cb6828e529..7b89b6ac69 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -434,7 +434,7 @@ constructor(
             } else {
               null
             }
-          libraryEvaluator.runCqlLibrary(it, patient, data, defaultRepository)
+          libraryEvaluator.runCqlLibrary(it, patient, data)
         }
         .forEach { output ->
           if (output.isNotEmpty()) extractionProgressMessage.postValue(output.joinToString("\n"))

From 5d7513413c3eb6d4bc48553db4925366b8580795 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Wed, 19 Jul 2023 12:07:16 +0300
Subject: [PATCH 05/27] Fix retrieval of subjectType

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../questionnaire/QuestionnaireNewActivity.kt |  8 ++
 .../QuestionnaireNewViewModel.kt              | 82 +++++++++++--------
 android/quest/src/main/res/values/strings.xml |  1 +
 .../quest/StructureMapUtilitiesTest.kt        |  4 +-
 4 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
index e7a76d5c2e..3a7fddecfa 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
@@ -35,6 +35,7 @@ import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.quest.R
 import org.smartregister.fhircore.quest.databinding.QuestionnaireActivityBinding
 import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity.Companion.QUESTIONNAIRE_FRAGMENT_TAG
+import timber.log.Timber
 
 @AndroidEntryPoint
 class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
@@ -104,6 +105,13 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
         }
 
         questionnaire = viewModel.retrieveQuestionnaire(questionnaireConfig, actionParameters)
+        if (questionnaire?.subjectType.isNullOrEmpty()) {
+          showToast(getString(R.string.missing_subject_type))
+          Timber.e(
+            "Missing subject type on questionnaire. Provide Questionnaire.subjectType to resolve.",
+          )
+          finish()
+        }
         val questionnaireJson = questionnaire?.asJson()
         if (questionnaireJson.isNullOrEmpty()) {
           showToast(getString(R.string.questionnaire_not_found))
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index 44fac8e79d..a07a2d9c48 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -36,6 +36,7 @@ import org.hl7.fhir.r4.context.IWorkerContext
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.ListResource
 import org.hl7.fhir.r4.model.ListResource.ListEntryComponent
+import org.hl7.fhir.r4.model.Patient
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.Reference
@@ -59,7 +60,6 @@ import org.smartregister.fhircore.engine.util.extension.asReference
 import org.smartregister.fhircore.engine.util.extension.cqfLibraryIds
 import org.smartregister.fhircore.engine.util.extension.extractByStructureMap
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
-import org.smartregister.fhircore.engine.util.extension.findSubject
 import org.smartregister.fhircore.engine.util.extension.prePopulateInitialValues
 import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForReadingOrEditing
 import org.smartregister.fhircore.engine.util.extension.showToast
@@ -212,34 +212,37 @@ constructor(
       // Update _lastUpdated for resources configured via ActionParameterType.UPDATE_DATE_ON_EDIT
       updateResourcesLastUpdatedProperty(actionParameters)
 
-      // Generate CarePlan using configured plan definitions
-      generateCarePlan(
-        questionnaire = questionnaire,
-        bundle = bundle.copyBundle(currentQuestionnaireResponse),
-        questionnaireConfig = questionnaireConfig,
-      )
+      val subject = retrieveSubject(questionnaire, bundle)
+      if (subject != null && bundle != null) {
+        // Generate CarePlan using configured plan definitions and execute cql
+        val newBundle = bundle.copyBundle(currentQuestionnaireResponse)
+        generateCarePlan(
+          subject = subject,
+          bundle = newBundle,
+          questionnaireConfig = questionnaireConfig,
+        )
 
-      // Execute CQL
-      executeCql(
-        questionnaire = questionnaire,
-        bundle = bundle.copyBundle(currentQuestionnaireResponse),
-      )
+        // Execute CQL
+        executeCql(
+          subject = subject,
+          bundle = newBundle,
+          questionnaire = questionnaire,
+        )
 
-      // Cascade update statuses of resources closed by this Questionnaire submission
-      bundle?.let {
+        // Cascade update statuses of resources closed by this Questionnaire submission
         viewModelScope.launch {
           fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
             questionnaireConfig = questionnaireConfig,
-            subject = retrieveSubject(questionnaire, it),
-            bundle = it,
+            subject = subject,
+            bundle = bundle,
           )
         }
       }
     }
   }
 
-  private fun Bundle?.copyBundle(currentQuestionnaireResponse: QuestionnaireResponse): Bundle? =
-    this?.copy()?.apply {
+  private fun Bundle.copyBundle(currentQuestionnaireResponse: QuestionnaireResponse): Bundle =
+    this.copy().apply {
       addEntry(Bundle.BundleEntryComponent().apply { resource = currentQuestionnaireResponse })
     }
 
@@ -369,11 +372,12 @@ constructor(
       .flatten()
       .all { it is Valid || it is NotValidated }
 
-  suspend fun executeCql(questionnaire: Questionnaire, bundle: Bundle?) {
+  suspend fun executeCql(subject: Resource, bundle: Bundle, questionnaire: Questionnaire) {
     withContext(dispatcherProvider.io()) {
       questionnaire.cqfLibraryIds().forEach {
-        // TODO Get the id of the resource of type Questionnaire.subjectType from the bundle
-        //  libraryEvaluator.runCqlLibrary(it, patient, bundle)
+        if (subject.resourceType == ResourceType.Patient) {
+          libraryEvaluator.runCqlLibrary(it, subject as Patient, bundle)
+        }
       }
     }
   }
@@ -383,33 +387,39 @@ constructor(
    * [QuestionnaireConfig.planDefinitions]
    */
   suspend fun generateCarePlan(
-    questionnaire: Questionnaire,
-    bundle: Bundle?,
+    subject: Resource,
+    bundle: Bundle,
     questionnaireConfig: QuestionnaireConfig,
   ) {
-    val subject = retrieveSubject(questionnaire, bundle)
     questionnaireConfig.planDefinitions?.forEach { planId ->
       kotlin
         .runCatching {
-          if (bundle != null) {
-            fhirCarePlanGenerator.generateOrUpdateCarePlan(
-              planDefinitionId = planId,
-              subject = subject,
-              data = bundle,
-            )
-          }
+          fhirCarePlanGenerator.generateOrUpdateCarePlan(
+            planDefinitionId = planId,
+            subject = subject,
+            data = bundle,
+          )
         }
         .onFailure { Timber.e(it) }
     }
   }
 
-  // TODO Subject should be the resource obtained from the bundle of type Questionnaire.subjectType
-  private suspend fun retrieveSubject(
+  /**
+   * This function returns the first resource of type [Questionnaire.subjectType] retrieved from the
+   * [Bundle.entry]
+   */
+  fun retrieveSubject(
     questionnaire: Questionnaire,
     bundle: Bundle?,
-  ): Resource {
-    return (questionnaire.findSubject(bundle)
-      ?: defaultRepository.loadResource(questionnaire.subject))
+  ): Resource? {
+    questionnaire.subjectType.forEach {
+      val resourceType = ResourceType.valueOf(it.primitiveValue())
+      return bundle
+        ?.entry
+        ?.first { entryComponent -> entryComponent.resource.resourceType == resourceType }
+        ?.resource
+    }
+    return null
   }
 
   companion object {
diff --git a/android/quest/src/main/res/values/strings.xml b/android/quest/src/main/res/values/strings.xml
index 72607d67c1..4d71e71b18 100644
--- a/android/quest/src/main/res/values/strings.xml
+++ b/android/quest/src/main/res/values/strings.xml
@@ -103,5 +103,6 @@
     <string name="questionnaire_response_invalid">Questionnaire response invalid</string>
     <string name="app_version_tag_url" translatable="false">https://smartregister.org/app-version</string>
     <string name="application_version" translatable="false">Application Version</string>
+    <string name="missing_subject_type">Missing subject type on questionnaire. Provide Questionnaire.subjectType to resolve.</string>
 
 </resources>
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/StructureMapUtilitiesTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/StructureMapUtilitiesTest.kt
index 58afd1b63a..e27dca7a27 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/StructureMapUtilitiesTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/StructureMapUtilitiesTest.kt
@@ -137,9 +137,7 @@ class StructureMapUtilitiesTest : RobolectricTest() {
     val questionnaire = iParser.parseResource(Questionnaire::class.java, questionnaireJson)
     val questionnaireResponse: QuestionnaireResponse
 
-    runBlocking {
-      questionnaireResponse = ResourceMapper.populate(questionnaire, patient, immunization)
-    }
+    runBlocking { questionnaireResponse = firstTaskpulate(questionnaire, patient, immunization) }
 
     structureMapUtilities.transform(contextR4, questionnaireResponse, structureMap, targetResource)
 

From 1283ccd07697d0a138266a5d76143e42b225f233 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Thu, 20 Jul 2023 10:43:06 +0300
Subject: [PATCH 06/27] Register questionnaire fragment listner after rendering

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../questionnaire/QuestionnaireNewActivity.kt | 61 +++++++++----------
 .../QuestionnaireNewViewModel.kt              | 28 ++++-----
 2 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
index 3a7fddecfa..1a582c6080 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
@@ -64,31 +64,6 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
     )
   }
 
-  override fun onStart() {
-    super.onStart()
-    supportFragmentManager.setFragmentResultListener(
-      QuestionnaireFragment.SUBMIT_REQUEST_KEY,
-      this,
-    ) { _, _ ->
-      val questionnaireResponse = retrieveQuestionnaireResponse()
-      questionnaireFragmentArgs.questionnaireConfig?.let { questionnaireConfig ->
-        // Close questionnaire if opened in read only mode or if experimental
-        if (questionnaireConfig.type.isReadOnly() || questionnaire?.experimental == false) {
-          finish()
-        }
-        if (questionnaireResponse != null && questionnaire != null) {
-          viewModel.handleQuestionnaireSubmission(
-            questionnaire = questionnaire!!,
-            currentQuestionnaireResponse = questionnaireResponse,
-            questionnaireConfig = questionnaireConfig,
-            actionParameters = questionnaireFragmentArgs.params,
-            context = this,
-          )
-        }
-      }
-    }
-  }
-
   private fun renderQuestionnaire() {
     val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
     val actionParameters = questionnaireFragmentArgs.params
@@ -113,24 +88,48 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
           finish()
         }
         val questionnaireJson = questionnaire?.asJson()
-        if (questionnaireJson.isNullOrEmpty()) {
+        if (questionnaire?.id.isNullOrEmpty() || questionnaireJson.isNullOrEmpty()) {
           showToast(getString(R.string.questionnaire_not_found))
           finish()
         }
+        val questionnaireFragment =
+          QuestionnaireFragment.builder().setQuestionnaire(questionnaireJson!!).build()
         supportFragmentManager.commit {
           setReorderingAllowed(true)
-          add(
-            R.id.container,
-            QuestionnaireFragment.builder().setQuestionnaire(questionnaireJson!!).build(),
-            QUESTIONNAIRE_FRAGMENT_TAG,
-          )
+          add(R.id.container, questionnaireFragment, QUESTIONNAIRE_FRAGMENT_TAG)
         }
       }
+
+      registerFragmentResultListener()
     }
   }
 
   private fun Questionnaire?.asJson(): String? = this?.encodeResourceToString()
 
+  private fun registerFragmentResultListener() {
+    supportFragmentManager.setFragmentResultListener(
+      QuestionnaireFragment.SUBMIT_REQUEST_KEY,
+      this,
+    ) { _, _ ->
+      val questionnaireResponse = retrieveQuestionnaireResponse()
+      questionnaireFragmentArgs.questionnaireConfig?.let { questionnaireConfig ->
+        // Close questionnaire if opened in read only mode or if experimental
+        if (questionnaireConfig.type.isReadOnly() || questionnaire?.experimental == false) {
+          finish()
+        }
+        if (questionnaireResponse != null && questionnaire != null) {
+          viewModel.handleQuestionnaireSubmission(
+            questionnaire = questionnaire!!,
+            currentQuestionnaireResponse = questionnaireResponse,
+            questionnaireConfig = questionnaireConfig,
+            actionParameters = questionnaireFragmentArgs.params,
+            context = this,
+          )
+        }
+      }
+    }
+  }
+
   private fun handleBackPress() {
     val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
     if (questionnaireConfig != null) {
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index a07a2d9c48..4f719b7e1e 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -31,7 +31,6 @@ import java.util.Date
 import java.util.UUID
 import javax.inject.Inject
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.hl7.fhir.r4.context.IWorkerContext
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.ListResource
@@ -47,7 +46,6 @@ import org.smartregister.fhircore.engine.cql.LibraryEvaluator
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.domain.model.ActionParameterType
-import org.smartregister.fhircore.engine.domain.model.QuestionnaireType
 import org.smartregister.fhircore.engine.rulesengine.ResourceDataRulesExecutor
 import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
 import org.smartregister.fhircore.engine.util.DispatcherProvider
@@ -116,12 +114,9 @@ constructor(
 
     val questionnaire =
       defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)?.apply {
-        if (
-          questionnaireConfig.type == QuestionnaireType.READ_ONLY ||
-            questionnaireConfig.type == QuestionnaireType.EDIT
-        ) {
+        if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditMode()) {
           item.prepareQuestionsForReadingOrEditing(
-            readOnly = questionnaireConfig.type == QuestionnaireType.READ_ONLY,
+            readOnly = questionnaireConfig.type.isReadOnly(),
             readOnlyLinkIds = questionnaireConfig.readOnlyLinkIds,
           )
         }
@@ -205,14 +200,19 @@ constructor(
         }
       }
 
+      val subject = retrieveSubject(questionnaire, bundle)
+
       // Save questionnaire response
-      currentQuestionnaireResponse.addContained(listResource)
-      defaultRepository.addOrUpdate(resource = currentQuestionnaireResponse)
+      currentQuestionnaireResponse
+        .apply {
+          setSubject(subject?.asReference())
+          addContained(listResource)
+        }
+        .run { defaultRepository.addOrUpdate(resource = this) }
 
       // Update _lastUpdated for resources configured via ActionParameterType.UPDATE_DATE_ON_EDIT
       updateResourcesLastUpdatedProperty(actionParameters)
 
-      val subject = retrieveSubject(questionnaire, bundle)
       if (subject != null && bundle != null) {
         // Generate CarePlan using configured plan definitions and execute cql
         val newBundle = bundle.copyBundle(currentQuestionnaireResponse)
@@ -373,11 +373,9 @@ constructor(
       .all { it is Valid || it is NotValidated }
 
   suspend fun executeCql(subject: Resource, bundle: Bundle, questionnaire: Questionnaire) {
-    withContext(dispatcherProvider.io()) {
-      questionnaire.cqfLibraryIds().forEach {
-        if (subject.resourceType == ResourceType.Patient) {
-          libraryEvaluator.runCqlLibrary(it, subject as Patient, bundle)
-        }
+    questionnaire.cqfLibraryIds().forEach {
+      if (subject.resourceType == ResourceType.Patient) {
+        libraryEvaluator.runCqlLibrary(it, subject as Patient, bundle)
       }
     }
   }

From da5cf60f83a6a00dbdfdafdbc3a79569dc22565e Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Thu, 20 Jul 2023 14:37:25 +0300
Subject: [PATCH 07/27] Use SupervisorJob on coroutine

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../fhircore/engine/task/FhirTaskUtil.kt      | 10 +++--
 .../QuestionnaireNewViewModel.kt              | 44 +++++++++++--------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirTaskUtil.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirTaskUtil.kt
index 9ee86fda49..2990d78072 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirTaskUtil.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirTaskUtil.kt
@@ -139,7 +139,9 @@ constructor(@ApplicationContext val appContext: Context, val defaultRepository:
         )
       }
 
-    Timber.i("Found ${tasks.size} upcoming Tasks to be updated")
+    Timber.i(
+      "Found ${tasks.size} upcoming Tasks (with statuses REQUESTED, ACCEPTED or RECEIVED) to be updated"
+    )
 
     tasks.forEach { task ->
       val previousStatus = task.status
@@ -149,8 +151,10 @@ constructor(@ApplicationContext val appContext: Context, val defaultRepository:
 
       if (task.hasPartOf() && !task.preRequisiteConditionSatisfied()) task.status = previousStatus
 
-      if (task.status != previousStatus) defaultRepository.update(task)
-      Timber.d("Task with ID '${task.id}' status updated to ${task.status}")
+      if (task.status != previousStatus) {
+        defaultRepository.update(task)
+        Timber.d("Task with ID '${task.id}' status updated FROM $previousStatus TO ${task.status}")
+      }
     }
   }
 
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index 4f719b7e1e..de71fb9afb 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -26,10 +26,12 @@ import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValidator
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.db.ResourceNotFoundException
+import com.google.android.fhir.logicalId
 import dagger.hilt.android.lifecycle.HiltViewModel
 import java.util.Date
 import java.util.UUID
 import javax.inject.Inject
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.context.IWorkerContext
 import org.hl7.fhir.r4.model.Bundle
@@ -147,22 +149,22 @@ constructor(
     actionParameters: Array<ActionParameter>?,
     context: Context,
   ) {
-    val questionnaireResponseValid =
-      validateQuestionnaireResponse(
-        questionnaire = questionnaire,
-        questionnaireResponse = currentQuestionnaireResponse,
-        context = context,
-      )
+    viewModelScope.launch(SupervisorJob()) {
+      val questionnaireResponseValid =
+        validateQuestionnaireResponse(
+          questionnaire = questionnaire,
+          questionnaireResponse = currentQuestionnaireResponse,
+          context = context,
+        )
 
-    if (!questionnaireResponseValid) {
-      Timber.e("Invalid questionnaire response")
-      context.showToast(context.getString(R.string.questionnaire_response_invalid))
-      return
-    }
+      if (!questionnaireResponseValid) {
+        Timber.e("Invalid questionnaire response")
+        context.showToast(context.getString(R.string.questionnaire_response_invalid))
+        return@launch
+      }
 
-    currentQuestionnaireResponse.processMetadata(questionnaire)
+      currentQuestionnaireResponse.processMetadata(questionnaire)
 
-    viewModelScope.launch {
       val bundle =
         performExtraction(
           extractByStructureMap = questionnaire.extractByStructureMap(),
@@ -203,12 +205,16 @@ constructor(
       val subject = retrieveSubject(questionnaire, bundle)
 
       // Save questionnaire response
-      currentQuestionnaireResponse
-        .apply {
-          setSubject(subject?.asReference())
-          addContained(listResource)
-        }
-        .run { defaultRepository.addOrUpdate(resource = this) }
+      if (subject != null) {
+        defaultRepository.addOrUpdate(
+          resource =
+            currentQuestionnaireResponse.apply {
+              setQuestionnaire("${questionnaire.resourceType}/${questionnaire.logicalId}")
+              setSubject(subject.asReference())
+              addContained(listResource)
+            },
+        )
+      }
 
       // Update _lastUpdated for resources configured via ActionParameterType.UPDATE_DATE_ON_EDIT
       updateResourcesLastUpdatedProperty(actionParameters)

From 7603575b53d57a50486c3bfdecca3612944d4758 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Thu, 20 Jul 2023 20:42:48 +0300
Subject: [PATCH 08/27] Register group member

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../fhircore/engine/task/FhirTaskUtil.kt      |  2 +-
 .../util/extension/ResourceExtension.kt       | 10 +----
 .../util/extension/ResourceExtensionTest.kt   |  9 -----
 .../QuestionnaireNewViewModel.kt              | 37 ++++++++++++++++++-
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirTaskUtil.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirTaskUtil.kt
index 2990d78072..f41d008d42 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirTaskUtil.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirTaskUtil.kt
@@ -140,7 +140,7 @@ constructor(@ApplicationContext val appContext: Context, val defaultRepository:
       }
 
     Timber.i(
-      "Found ${tasks.size} upcoming Tasks (with statuses REQUESTED, ACCEPTED or RECEIVED) to be updated"
+      "Found ${tasks.size} upcoming Tasks (with statuses REQUESTED, ACCEPTED or RECEIVED) to be updated",
     )
 
     tasks.forEach { task ->
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
index eac086acad..cffb14db57 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
@@ -277,15 +277,9 @@ fun Resource.updateLastUpdated() {
   meta.lastUpdated = Date()
 }
 
-fun Resource.isPatient(patientId: String) =
-  this.resourceType == ResourceType.Patient && this.logicalId == patientId
+fun Resource.asReference() = Reference().apply { this.reference = "$resourceType/$logicalId" }
 
-fun Resource.asReference(): Reference {
-  val referenceValue = "${fhirType()}/$logicalId"
-  return Reference().apply { this.reference = referenceValue }
-}
-
-fun Resource.referenceValue(): String = "${fhirType()}/$logicalId"
+fun Resource.referenceValue(): String = "$resourceType/$logicalId"
 
 fun Resource.referenceParamForCondition(): ReferenceClientParam =
   when (resourceType) {
diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt
index f9fd93474c..13d6f41197 100644
--- a/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt
+++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt
@@ -634,15 +634,6 @@ class ResourceExtensionTest : RobolectricTest() {
     Assert.assertEquals(Observation.FOCUS, result)
   }
 
-  @Test
-  fun `Resource#isPatient() should return true if resource is valid`() {
-    val resource = Patient()
-    Assert.assertFalse(resource.isPatient("1"))
-
-    resource.id = "1"
-    Assert.assertTrue(resource.isPatient("1"))
-  }
-
   @Test
   fun `isValidResourceType() should return true if resource type is valid`() {
     Assert.assertTrue(isValidResourceType("Patient"))
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index de71fb9afb..3827a87044 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -35,6 +35,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.context.IWorkerContext
 import org.hl7.fhir.r4.model.Bundle
+import org.hl7.fhir.r4.model.Group
 import org.hl7.fhir.r4.model.ListResource
 import org.hl7.fhir.r4.model.ListResource.ListEntryComponent
 import org.hl7.fhir.r4.model.Patient
@@ -60,6 +61,7 @@ import org.smartregister.fhircore.engine.util.extension.asReference
 import org.smartregister.fhircore.engine.util.extension.cqfLibraryIds
 import org.smartregister.fhircore.engine.util.extension.extractByStructureMap
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
+import org.smartregister.fhircore.engine.util.extension.isIn
 import org.smartregister.fhircore.engine.util.extension.prePopulateInitialValues
 import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForReadingOrEditing
 import org.smartregister.fhircore.engine.util.extension.showToast
@@ -185,12 +187,20 @@ constructor(
           date = extractionDate
         }
 
+      val group =
+        questionnaireConfig.groupResource?.groupIdentifier?.let { groupId ->
+          defaultRepository.loadResource<Group>(groupId)
+        }
+
       bundle?.entry?.forEach { bundleEntryComponent ->
         val bundleEntryResource: Resource? = bundleEntryComponent.resource
         bundleEntryResource?.run {
           applyResourceMetadata()
           defaultRepository.addOrUpdate(resource = this)
 
+          // List resource as member of a (configured) Group
+          group?.let { bundleEntryResource.addMemberToGroup(it) }
+
           // Track ids for resources in ListResource added to the QuestionnaireResponse.contained
           val listEntryComponent =
             ListEntryComponent().apply {
@@ -204,6 +214,9 @@ constructor(
 
       val subject = retrieveSubject(questionnaire, bundle)
 
+      // Update Group resource to save members
+      group?.let { defaultRepository.addOrUpdate(resource = it) }
+
       // Save questionnaire response
       if (subject != null) {
         defaultRepository.addOrUpdate(
@@ -417,7 +430,7 @@ constructor(
     bundle: Bundle?,
   ): Resource? {
     questionnaire.subjectType.forEach {
-      val resourceType = ResourceType.valueOf(it.primitiveValue())
+      val resourceType = ResourceType.valueOf(it.code)
       return bundle
         ?.entry
         ?.first { entryComponent -> entryComponent.resource.resourceType == resourceType }
@@ -426,6 +439,28 @@ constructor(
     return null
   }
 
+  /** Adds [Resource] to [Group.member] */
+  fun Resource.addMemberToGroup(group: Group) {
+    this.run {
+      if (
+        this.resourceType.isIn(
+          ResourceType.CareTeam,
+          ResourceType.Device,
+          ResourceType.Group,
+          ResourceType.HealthcareService,
+          ResourceType.Location,
+          ResourceType.Organization,
+          ResourceType.Patient,
+          ResourceType.Practitioner,
+          ResourceType.PractitionerRole,
+          ResourceType.Specimen,
+        )
+      ) {
+        group.addMember(Group.GroupMemberComponent().apply { entity = asReference() })
+      }
+    }
+  }
+
   companion object {
     const val CONTAINED_LIST_TITLE = "GeneratedResourcesList"
   }

From 65bcef65d868c309eb06f8026bffb5d89a96adc8 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Fri, 21 Jul 2023 10:35:46 +0300
Subject: [PATCH 09/27] Fix NoSuchElementException

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../quest/ui/questionnaire/QuestionnaireNewViewModel.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index 3827a87044..440682c566 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -433,7 +433,7 @@ constructor(
       val resourceType = ResourceType.valueOf(it.code)
       return bundle
         ?.entry
-        ?.first { entryComponent -> entryComponent.resource.resourceType == resourceType }
+        ?.firstOrNull { entryComponent -> entryComponent.resource.resourceType == resourceType }
         ?.resource
     }
     return null

From cdf05f91c7ad2523f6421f049f48d75950cd05ab Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Mon, 24 Jul 2023 13:04:16 +0300
Subject: [PATCH 10/27] Configure deletion of resources via Questionnaire
 submission

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../util/extension/ResourceExtension.kt       |  2 +-
 .../QuestionnaireNewViewModel.kt              | 81 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
index cffb14db57..c9a9ffead7 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
@@ -239,7 +239,7 @@ fun QuestionnaireResponse.getEncounterId(): String? {
 }
 
 fun Resource.generateMissingId() {
-  if (logicalId.isBlank()) id = UUID.randomUUID().toString()
+  if (id.isNullOrEmpty()) id = UUID.randomUUID().toString()
 }
 
 fun Resource.appendOrganizationInfo(authenticatedOrganizationIds: List<String>?) {
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index 440682c566..782fc4ad46 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -177,7 +177,7 @@ constructor(
 
       val extractionDate = Date()
 
-      // Create a list resource to store the references for generated resources
+      // Create a ListResource to store the references for generated resources
       val listResource =
         ListResource().apply {
           id = UUID.randomUUID().toString()
@@ -198,7 +198,7 @@ constructor(
           applyResourceMetadata()
           defaultRepository.addOrUpdate(resource = this)
 
-          // List resource as member of a (configured) Group
+          // Add resource as member of a (configured) Group
           group?.let { bundleEntryResource.addMemberToGroup(it) }
 
           // Track ids for resources in ListResource added to the QuestionnaireResponse.contained
@@ -212,7 +212,8 @@ constructor(
         }
       }
 
-      val subject = retrieveSubject(questionnaire, bundle)
+      val subject =
+        retrieveSubject(questionnaire, bundle)?.apply { id = "$resourceType/$logicalId" }
 
       // Update Group resource to save members
       group?.let { defaultRepository.addOrUpdate(resource = it) }
@@ -256,6 +257,8 @@ constructor(
             bundle = bundle,
           )
         }
+
+        softDeleteResources(questionnaireConfig)
       }
     }
   }
@@ -461,6 +464,78 @@ constructor(
     }
   }
 
+  /**
+   * This function triggers removal of [Resource] s as per the [QuestionnaireConfig.groupResource]
+   * or [QuestionnaireConfig.removeResource] config properties.
+   */
+  fun softDeleteResources(questionnaireConfig: QuestionnaireConfig) {
+    if (questionnaireConfig.groupResource != null) {
+      removeGroup(
+        groupId = questionnaireConfig.groupResource!!.groupIdentifier,
+        removeGroup = questionnaireConfig.groupResource?.removeGroup ?: false,
+        deactivateMembers = questionnaireConfig.groupResource!!.deactivateMembers,
+      )
+      removeGroupMember(
+        memberId = questionnaireConfig.resourceIdentifier,
+        removeMember = questionnaireConfig.groupResource?.removeMember ?: false,
+        groupIdentifier = questionnaireConfig.groupResource!!.groupIdentifier,
+        memberResourceType = questionnaireConfig.groupResource!!.memberResourceType,
+      )
+    }
+
+    if (
+      questionnaireConfig.removeResource == true &&
+        questionnaireConfig.resourceType != null &&
+        !questionnaireConfig.resourceIdentifier.isNullOrEmpty()
+    ) {
+      viewModelScope.launch {
+        defaultRepository.delete(
+          resourceType = questionnaireConfig.resourceType!!,
+          resourceId = questionnaireConfig.resourceIdentifier!!,
+          softDelete = true,
+        )
+      }
+    }
+  }
+
+  private fun removeGroup(groupId: String, removeGroup: Boolean, deactivateMembers: Boolean) {
+    if (removeGroup) {
+      viewModelScope.launch(dispatcherProvider.io()) {
+        try {
+          defaultRepository.removeGroup(
+            groupId = groupId,
+            isDeactivateMembers = deactivateMembers,
+            configComputedRuleValues = emptyMap(),
+          )
+        } catch (exception: Exception) {
+          Timber.e(exception)
+        }
+      }
+    }
+  }
+
+  private fun removeGroupMember(
+    memberId: String?,
+    groupIdentifier: String?,
+    memberResourceType: ResourceType?,
+    removeMember: Boolean,
+  ) {
+    if (removeMember && !memberId.isNullOrEmpty()) {
+      viewModelScope.launch(dispatcherProvider.io()) {
+        try {
+          defaultRepository.removeGroupMember(
+            memberId = memberId,
+            groupId = groupIdentifier,
+            groupMemberResourceType = memberResourceType,
+            configComputedRuleValues = emptyMap(),
+          )
+        } catch (exception: Exception) {
+          Timber.e(exception)
+        }
+      }
+    }
+  }
+
   companion object {
     const val CONTAINED_LIST_TITLE = "GeneratedResourcesList"
   }

From fe52bf9521c7aef3248d8ecd8c72858929dcee4e Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Tue, 25 Jul 2023 12:23:18 +0300
Subject: [PATCH 11/27] Launch refactored questionnaire activity

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../util/extension/AndroidExtensions.kt       |  31 +++++
 .../quest/navigation/MainNavigationScreen.kt  |   2 -
 .../quest/ui/main/AppMainViewModel.kt         |  12 +-
 .../ui/questionnaire/QuestionnaireActivity.kt |   4 -
 .../questionnaire/QuestionnaireNewActivity.kt | 125 +++++++++++-------
 .../QuestionnaireNewViewModel.kt              |   6 +-
 .../quest/ui/shared/QuestionnaireHandler.kt   |  21 ++-
 .../quest/util/extensions/ConfigExtensions.kt |  29 ++--
 .../res/navigation/application_nav_graph.xml  |  13 --
 android/quest/src/main/res/values/strings.xml |   1 +
 .../QuestionnaireActivityTest.kt              |   2 -
 .../util/extensions/ConfigExtensionsTest.kt   |   7 +-
 12 files changed, 143 insertions(+), 110 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensions.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensions.kt
index 15ed1ac75f..7ae7553308 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensions.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensions.kt
@@ -25,8 +25,10 @@ import android.content.res.Resources
 import android.graphics.Color
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
+import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.os.LocaleList
+import android.os.Parcelable
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.ui.graphics.Color as ComposeColor
@@ -41,6 +43,7 @@ import org.smartregister.fhircore.engine.ui.theme.InfoColor
 import org.smartregister.fhircore.engine.ui.theme.LightColors
 import org.smartregister.fhircore.engine.ui.theme.SuccessColor
 import org.smartregister.fhircore.engine.ui.theme.WarningColor
+import org.smartregister.fhircore.engine.util.annotation.ExcludeFromJacocoGeneratedReport
 import timber.log.Timber
 
 const val ERROR_COLOR = "errorColor"
@@ -185,3 +188,31 @@ fun Context.isDeviceOnline(): Boolean {
  * List.first() and List.last() extensions
  */
 fun <T> List<T>.second(): T = this[1]
+
+@ExcludeFromJacocoGeneratedReport
+inline fun <reified T : Parcelable> Intent.parcelable(key: String): T? =
+  when {
+    SDK_INT >= 33 -> getParcelableExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelableExtra(key) as? T
+  }
+
+@ExcludeFromJacocoGeneratedReport
+inline fun <reified T : Parcelable> Bundle.parcelable(key: String): T? =
+  when {
+    SDK_INT >= 33 -> getParcelable(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelable(key) as? T
+  }
+
+@ExcludeFromJacocoGeneratedReport
+inline fun <reified T : Parcelable> Bundle.parcelableArrayList(key: String): ArrayList<T>? =
+  when {
+    SDK_INT >= 33 -> getParcelableArrayList(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelableArrayList(key)
+  }
+
+@ExcludeFromJacocoGeneratedReport
+inline fun <reified T : Parcelable> Intent.parcelableArrayList(key: String): ArrayList<T>? =
+  when {
+    SDK_INT >= 33 -> getParcelableArrayListExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelableArrayListExtra(key)
+  }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
index 8185a15a75..eb53e49dbc 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
@@ -38,7 +38,5 @@ sealed class MainNavigationScreen(
 
   object GeoWidget : MainNavigationScreen(route = R.id.geoWidgetFragment)
 
-  object Questionnaire : MainNavigationScreen(route = R.id.questionnaireActivity)
-
   fun eventId(id: String) = route.toString() + "_" + id
 }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
index a0020769d2..7b67f1c7c9 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
@@ -77,7 +77,7 @@ import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.engine.util.extension.tryParse
 import org.smartregister.fhircore.quest.navigation.MainNavigationScreen
 import org.smartregister.fhircore.quest.navigation.NavigationArg
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireNewActivity
 import org.smartregister.fhircore.quest.ui.report.measure.worker.MeasureReportMonthPeriodWorker
 import org.smartregister.fhircore.quest.ui.shared.QuestionnaireHandler
 import org.smartregister.fhircore.quest.ui.shared.models.QuestionnaireSubmission
@@ -237,13 +237,17 @@ constructor(
     viewModelScope.launch {
       val location = registerRepository.loadResource<Location>(locationId)?.encodeResourceToString()
       if (context is QuestionnaireHandler) {
-        context.launchQuestionnaire<Any>(
+        context.launchQuestionnaire(
           context = context,
-          intentBundle =
+          extraIntentBundle =
             bundleOf(
-              Pair(QuestionnaireActivity.QUESTIONNAIRE_POPULATION_RESOURCES, arrayListOf(location)),
+              Pair(
+                QuestionnaireNewActivity.QUESTIONNAIRE_POPULATION_RESOURCES,
+                arrayListOf(location),
+              ),
             ),
           questionnaireConfig = questionnaireConfig,
+          actionParams = emptyArray(),
         )
       }
     }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
index c390eae1ae..6bbfac4eb0 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
@@ -573,7 +573,6 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
     fun Intent.questionnaireResponse() = this.getStringExtra(QUESTIONNAIRE_RESPONSE)
 
     fun intentArgs(
-      questionnaireResponse: QuestionnaireResponse? = null,
       populationResources: ArrayList<Resource> = ArrayList(),
       questionnaireConfig: QuestionnaireConfig? = null,
       actionParams: List<ActionParameter> = emptyList(),
@@ -587,9 +586,6 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
           Pair(BASE_RESOURCE_TYPE, baseResourceType),
         )
         .apply {
-          questionnaireResponse?.let {
-            putString(QUESTIONNAIRE_RESPONSE, it.encodeResourceToString())
-          }
           val resourcesList = populationResources.map { it.encodeResourceToString() }
           if (resourcesList.isNotEmpty()) {
             putStringArrayList(
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
index 1a582c6080..c202d2322b 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
@@ -20,17 +20,21 @@ import android.os.Bundle
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.os.bundleOf
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.navArgs
 import com.google.android.fhir.datacapture.QuestionnaireFragment
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
+import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.ui.base.AlertDialogue
 import org.smartregister.fhircore.engine.ui.base.BaseMultiLanguageActivity
 import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
+import org.smartregister.fhircore.engine.util.extension.parcelable
+import org.smartregister.fhircore.engine.util.extension.parcelableArrayList
 import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.quest.R
 import org.smartregister.fhircore.quest.databinding.QuestionnaireActivityBinding
@@ -41,7 +45,8 @@ import timber.log.Timber
 class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
 
   val viewModel by viewModels<QuestionnaireNewViewModel>()
-  private val questionnaireFragmentArgs by navArgs<QuestionnaireNewActivityArgs>()
+  private lateinit var questionnaireConfig: QuestionnaireConfig
+  private lateinit var actionParameters: ArrayList<ActionParameter>
   private lateinit var viewBinding: QuestionnaireActivityBinding
   private var questionnaire: Questionnaire? = null
 
@@ -51,6 +56,15 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
     setTheme(R.style.AppTheme_Questionnaire)
     viewBinding = QuestionnaireActivityBinding.inflate(layoutInflater)
     setContentView(viewBinding.root)
+    with(intent) {
+      parcelable<QuestionnaireConfig>(QUESTIONNAIRE_CONFIG)?.also { questionnaireConfig = it }
+      actionParameters = parcelableArrayList(QUESTIONNAIRE_ACTION_PARAMETERS) ?: arrayListOf()
+    }
+
+    if (!::questionnaireConfig.isInitialized) {
+      showToast(getString(R.string.missing_questionnaire_config))
+      finish()
+    }
 
     if (savedInstanceState == null) renderQuestionnaire()
 
@@ -64,15 +78,14 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
     )
   }
 
-  private fun renderQuestionnaire() {
-    val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
-    val actionParameters = questionnaireFragmentArgs.params
+  override fun onSaveInstanceState(outState: Bundle) {
+    super.onSaveInstanceState(outState)
+    outState.clear()
+  }
 
+  private fun renderQuestionnaire() {
     lifecycleScope.launch {
-      if (
-        supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) == null &&
-          questionnaireConfig != null
-      ) {
+      if (supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) == null) {
         viewBinding.questionnaireToolbar.apply {
           title = questionnaireConfig.title
           setNavigationIcon(R.drawable.ic_arrow_back)
@@ -112,56 +125,68 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
       this,
     ) { _, _ ->
       val questionnaireResponse = retrieveQuestionnaireResponse()
-      questionnaireFragmentArgs.questionnaireConfig?.let { questionnaireConfig ->
-        // Close questionnaire if opened in read only mode or if experimental
-        if (questionnaireConfig.type.isReadOnly() || questionnaire?.experimental == false) {
-          finish()
-        }
-        if (questionnaireResponse != null && questionnaire != null) {
-          viewModel.handleQuestionnaireSubmission(
-            questionnaire = questionnaire!!,
-            currentQuestionnaireResponse = questionnaireResponse,
-            questionnaireConfig = questionnaireConfig,
-            actionParameters = questionnaireFragmentArgs.params,
-            context = this,
-          )
-        }
-      }
-    }
-  }
 
-  private fun handleBackPress() {
-    val questionnaireConfig = questionnaireFragmentArgs.questionnaireConfig
-    if (questionnaireConfig != null) {
-      if (questionnaireConfig.type.isReadOnly()) {
+      // Close questionnaire if opened in read only mode or if experimental
+      if (questionnaireConfig.type.isReadOnly() || questionnaire?.experimental == false) {
         finish()
-      } else if (questionnaireConfig.saveDraft) {
-        AlertDialogue.showCancelAlert(
-          context = this,
-          message = R.string.questionnaire_in_progress_alert_back_pressed_message,
-          title = R.string.questionnaire_alert_back_pressed_title,
-          confirmButtonListener = {
-            retrieveQuestionnaireResponse()?.let { questionnaireResponse ->
-              viewModel.saveDraftQuestionnaire(questionnaireResponse)
-            }
-          },
-          confirmButtonText = R.string.questionnaire_alert_back_pressed_save_draft_button_title,
-          neutralButtonListener = { finish() },
-          neutralButtonText = R.string.questionnaire_alert_back_pressed_button_title,
-        )
-      } else {
-        AlertDialogue.showConfirmAlert(
+      }
+      if (questionnaireResponse != null && questionnaire != null) {
+        viewModel.handleQuestionnaireSubmission(
+          questionnaire = questionnaire!!,
+          currentQuestionnaireResponse = questionnaireResponse,
+          questionnaireConfig = questionnaireConfig,
+          actionParameters = actionParameters,
           context = this,
-          message = R.string.questionnaire_alert_back_pressed_message,
-          title = R.string.questionnaire_alert_back_pressed_title,
-          confirmButtonListener = { finish() },
-          confirmButtonText = R.string.questionnaire_alert_back_pressed_button_title,
         )
       }
     }
   }
 
+  private fun handleBackPress() {
+    if (questionnaireConfig.type.isReadOnly()) {
+      finish()
+    } else if (questionnaireConfig.saveDraft) {
+      AlertDialogue.showCancelAlert(
+        context = this,
+        message = R.string.questionnaire_in_progress_alert_back_pressed_message,
+        title = R.string.questionnaire_alert_back_pressed_title,
+        confirmButtonListener = {
+          retrieveQuestionnaireResponse()?.let { questionnaireResponse ->
+            viewModel.saveDraftQuestionnaire(questionnaireResponse)
+          }
+        },
+        confirmButtonText = R.string.questionnaire_alert_back_pressed_save_draft_button_title,
+        neutralButtonListener = { finish() },
+        neutralButtonText = R.string.questionnaire_alert_back_pressed_button_title,
+      )
+    } else {
+      AlertDialogue.showConfirmAlert(
+        context = this,
+        message = R.string.questionnaire_alert_back_pressed_message,
+        title = R.string.questionnaire_alert_back_pressed_title,
+        confirmButtonListener = { finish() },
+        confirmButtonText = R.string.questionnaire_alert_back_pressed_button_title,
+      )
+    }
+  }
+
   private fun retrieveQuestionnaireResponse(): QuestionnaireResponse? =
     (supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) as QuestionnaireFragment?)
       ?.getQuestionnaireResponse()
+
+  companion object {
+
+    const val QUESTIONNAIRE_CONFIG = "questionnaireConfig"
+    const val QUESTIONNAIRE_ACTION_PARAMETERS = "questionnaireActionParameters"
+    const val QUESTIONNAIRE_POPULATION_RESOURCES = "questionnairePopulationResources"
+
+    fun intentArgs(
+      questionnaireConfig: QuestionnaireConfig,
+      actionParams: List<ActionParameter>,
+    ): Bundle =
+      bundleOf(
+        Pair(QUESTIONNAIRE_CONFIG, questionnaireConfig),
+        Pair(QUESTIONNAIRE_ACTION_PARAMETERS, actionParams),
+      )
+  }
 }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index 782fc4ad46..4d27efdd1f 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -99,7 +99,7 @@ constructor(
    */
   suspend fun retrieveQuestionnaire(
     questionnaireConfig: QuestionnaireConfig,
-    actionParameters: Array<ActionParameter>?,
+    actionParameters: List<ActionParameter>?,
   ): Questionnaire? {
     if (questionnaireConfig.id.isEmpty()) return null
 
@@ -148,7 +148,7 @@ constructor(
     questionnaire: Questionnaire,
     currentQuestionnaireResponse: QuestionnaireResponse,
     questionnaireConfig: QuestionnaireConfig,
-    actionParameters: Array<ActionParameter>?,
+    actionParameters: List<ActionParameter>?,
     context: Context,
   ) {
     viewModelScope.launch(SupervisorJob()) {
@@ -359,7 +359,7 @@ constructor(
    * questionnaire is submitted, the affected resources last modified/updated date will also be
    * updated.
    */
-  suspend fun updateResourcesLastUpdatedProperty(actionParameters: Array<ActionParameter>?) {
+  suspend fun updateResourcesLastUpdatedProperty(actionParameters: List<ActionParameter>?) {
     val updateOnEditParams =
       actionParameters?.filter {
         it.paramType == ActionParameterType.UPDATE_DATE_ON_EDIT && it.value.isNotEmpty()
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt
index 66e5f8d78c..f8575760ab 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt
@@ -24,32 +24,31 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.core.os.bundleOf
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireNewActivity
 
 interface QuestionnaireHandler {
 
   val startForResult: ActivityResultLauncher<Intent>
 
-  fun <T> launchQuestionnaire(
+  /**
+   * This function launches [QuestionnaireNewActivity] and returns [ActivityResult] on submission.
+   */
+  fun launchQuestionnaire(
     context: Context,
-    intentBundle: Bundle = bundleOf(),
+    extraIntentBundle: Bundle = bundleOf(),
     questionnaireConfig: QuestionnaireConfig? = null,
-    actionParams: List<ActionParameter> = emptyList(),
-    baseResourceId: String? = null,
-    baseResourceType: String? = null,
+    actionParams: List<ActionParameter>,
   ) {
     if (questionnaireConfig != null) {
       startForResult.launch(
-        Intent(context, QuestionnaireActivity::class.java)
+        Intent(context, QuestionnaireNewActivity::class.java)
           .putExtras(
-            QuestionnaireActivity.intentArgs(
+            QuestionnaireNewActivity.intentArgs(
               questionnaireConfig = questionnaireConfig,
               actionParams = actionParams,
-              baseResourceId = baseResourceId,
-              baseResourceType = baseResourceType,
             ),
           )
-          .putExtras(intentBundle),
+          .putExtras(extraIntentBundle),
       )
     }
   }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
index cc3b5cf204..7abd1b72a1 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
@@ -26,10 +26,14 @@ import org.smartregister.fhircore.engine.domain.model.ActionConfig
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.domain.model.ActionParameterType
 import org.smartregister.fhircore.engine.domain.model.ResourceData
+import org.smartregister.fhircore.engine.util.extension.decodeJson
+import org.smartregister.fhircore.engine.util.extension.encodeJson
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
+import org.smartregister.fhircore.engine.util.extension.interpolate
 import org.smartregister.fhircore.engine.util.extension.isIn
 import org.smartregister.fhircore.quest.navigation.MainNavigationScreen
 import org.smartregister.fhircore.quest.navigation.NavigationArg
+import org.smartregister.fhircore.quest.ui.shared.QuestionnaireHandler
 import org.smartregister.p2p.utils.startP2PScreen
 
 const val PRACTITIONER_ID = "practitionerId"
@@ -57,22 +61,14 @@ fun List<ActionConfig>.handleClickEvent(
         actionConfig.questionnaire?.let { questionnaireConfig ->
           val questionnaireConfigInterpolated = questionnaireConfig.interpolate(computedValuesMap)
 
-          /*
+          // Questionnaire is NOT launched via navigation component. It is started for result.
           if (navController.context is QuestionnaireHandler) {
-            (navController.context as QuestionnaireHandler).launchQuestionnaire<Any>(
+            (navController.context as QuestionnaireHandler).launchQuestionnaire(
               context = navController.context,
               questionnaireConfig = questionnaireConfigInterpolated,
-              actionParams = interpolateActionParamsValue(actionConfig, resourceData).toList(),
-              baseResourceId = resourceData?.baseResourceId,
-              baseResourceType = resourceData?.baseResourceType?.name,
+              actionParams = interpolatedParams,
             )
-          }*/
-          val args =
-            bundleOf(
-              NavigationArg.QUESTIONNAIRE_CONFIG to questionnaireConfigInterpolated,
-              NavigationArg.PARAMS to interpolateActionParamsValue(actionConfig, resourceData),
-            )
-          navController.navigate(MainNavigationScreen.Questionnaire.route, args)
+          }
         }
       }
       ApplicationWorkflow.LAUNCH_PROFILE -> {
@@ -82,7 +78,7 @@ fun List<ActionConfig>.handleClickEvent(
               NavigationArg.PROFILE_ID to id,
               NavigationArg.RESOURCE_ID to resourceId,
               NavigationArg.RESOURCE_CONFIG to actionConfig.resourceConfig,
-              NavigationArg.PARAMS to interpolatedParams,
+              NavigationArg.PARAMS to interpolatedParams.toTypedArray(),
             )
           navController.navigate(MainNavigationScreen.Profile.route, args)
         }
@@ -93,7 +89,7 @@ fun List<ActionConfig>.handleClickEvent(
             Pair(NavigationArg.REGISTER_ID, actionConfig.id ?: navMenu?.id),
             Pair(NavigationArg.SCREEN_TITLE, actionConfig.display ?: navMenu?.display ?: ""),
             Pair(NavigationArg.TOOL_BAR_HOME_NAVIGATION, actionConfig.toolBarHomeNavigation),
-            Pair(NavigationArg.PARAMS, interpolateActionParamsValue(actionConfig, resourceData)),
+            Pair(NavigationArg.PARAMS, interpolatedParams.toTypedArray()),
           )
 
         // If value != null, we are navigating FROM a register; disallow same register navigation
@@ -140,8 +136,9 @@ fun List<ActionConfig>.handleClickEvent(
 
 fun interpolateActionParamsValue(actionConfig: ActionConfig, resourceData: ResourceData?) =
   actionConfig.params
-    .map { it.interpolate(resourceData?.computedValuesMap ?: emptyMap()) }
-    .toTypedArray()
+    .encodeJson()
+    .interpolate(resourceData?.computedValuesMap ?: emptyMap())
+    .decodeJson<List<ActionParameter>>()
 
 /**
  * Apply navigation options. Restrict destination to only use a single instance in the back stack.
diff --git a/android/quest/src/main/res/navigation/application_nav_graph.xml b/android/quest/src/main/res/navigation/application_nav_graph.xml
index 741191d3e3..964bc8990e 100644
--- a/android/quest/src/main/res/navigation/application_nav_graph.xml
+++ b/android/quest/src/main/res/navigation/application_nav_graph.xml
@@ -83,17 +83,4 @@
             app:argType="string"
             app:nullable="false" />
     </fragment>
-
-    <activity
-        android:id="@+id/questionnaireActivity"
-        android:name="org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireNewActivity">
-        <argument
-            android:name="questionnaireConfig"
-            app:argType="org.smartregister.fhircore.engine.configuration.QuestionnaireConfig"
-            app:nullable="true" />
-        <argument
-            android:name="params"
-            app:argType="org.smartregister.fhircore.engine.domain.model.ActionParameter[]"
-            app:nullable="true" />
-    </activity>
 </navigation>
diff --git a/android/quest/src/main/res/values/strings.xml b/android/quest/src/main/res/values/strings.xml
index 4d71e71b18..bca931d3cf 100644
--- a/android/quest/src/main/res/values/strings.xml
+++ b/android/quest/src/main/res/values/strings.xml
@@ -104,5 +104,6 @@
     <string name="app_version_tag_url" translatable="false">https://smartregister.org/app-version</string>
     <string name="application_version" translatable="false">Application Version</string>
     <string name="missing_subject_type">Missing subject type on questionnaire. Provide Questionnaire.subjectType to resolve.</string>
+    <string name="missing_questionnaire_config">QuestionnaireConfig is required but missing.</string>
 
 </resources>
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
index 021f9d3575..0f933835e3 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
@@ -223,8 +223,6 @@ class QuestionnaireActivityTest : ActivityRobolectricTest() {
     populationResources.add(patient)
     val result =
       QuestionnaireActivity.intentArgs(
-        questionnaireResponse = questionnaireResponse,
-        populationResources = populationResources,
         questionnaireConfig =
           QuestionnaireConfig(
             id = "my-form",
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensionsTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensionsTest.kt
index 2fb79fab92..50f2f7e747 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensionsTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensionsTest.kt
@@ -46,7 +46,6 @@ import org.smartregister.fhircore.quest.app.fakes.Faker
 import org.smartregister.fhircore.quest.navigation.MainNavigationScreen
 import org.smartregister.fhircore.quest.navigation.NavigationArg
 import org.smartregister.fhircore.quest.robolectric.RobolectricTest
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
 import org.smartregister.fhircore.quest.ui.shared.QuestionnaireHandler
 
 class ConfigExtensionsTest : RobolectricTest() {
@@ -275,13 +274,11 @@ class ConfigExtensionsTest : RobolectricTest() {
       )
     listOf(clickAction).handleClickEvent(navController, resourceData)
     verify {
-      (navController.context as QuestionnaireHandler).launchQuestionnaire<QuestionnaireActivity>(
+      (navController.context as QuestionnaireHandler).launchQuestionnaire(
         context = any(),
-        intentBundle = any(),
+        extraIntentBundle = any(),
         questionnaireConfig = any(),
         actionParams = emptyList(),
-        baseResourceId = patient.logicalId,
-        baseResourceType = patient.resourceType.name,
       )
     }
   }

From 2f6c05ca3dc9471d837ceb6eb278563bccc9ed80 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Tue, 25 Jul 2023 12:37:24 +0300
Subject: [PATCH 12/27] Disable dark mode on all activities

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../fhircore/engine/ui/base/BaseMultiLanguageActivity.kt   | 7 +++++++
 .../fhircore/quest/ui/main/AppMainViewModel.kt             | 2 +-
 .../quest/ui/questionnaire/QuestionnaireNewActivity.kt     | 2 --
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/BaseMultiLanguageActivity.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/BaseMultiLanguageActivity.kt
index f5b9f6a7d2..8c2a01ad07 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/BaseMultiLanguageActivity.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/BaseMultiLanguageActivity.kt
@@ -19,6 +19,7 @@ package org.smartregister.fhircore.engine.ui.base
 import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import java.lang.UnsupportedOperationException
 import java.util.Locale
 import javax.inject.Inject
@@ -26,6 +27,10 @@ import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
 import org.smartregister.fhircore.engine.util.extension.setAppLocale
 
+/**
+ * Base class for all activities used in the app. Every activity should extend this class for
+ * multi-language support.
+ */
 abstract class BaseMultiLanguageActivity : AppCompatActivity() {
 
   @Inject lateinit var sharedPreferencesHelper: SharedPreferencesHelper
@@ -33,6 +38,8 @@ abstract class BaseMultiLanguageActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     inject()
     super.onCreate(savedInstanceState)
+    // Disable dark theme on All Activities.
+    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
   }
 
   override fun attachBaseContext(baseContext: Context) {
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
index 7b67f1c7c9..b18bfc90cf 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
@@ -247,7 +247,7 @@ constructor(
               ),
             ),
           questionnaireConfig = questionnaireConfig,
-          actionParams = emptyArray(),
+          actionParams = emptyList(),
         )
       }
     }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
index c202d2322b..f39900caf5 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
@@ -19,7 +19,6 @@ package org.smartregister.fhircore.quest.ui.questionnaire
 import android.os.Bundle
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.bundleOf
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
@@ -52,7 +51,6 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
     setTheme(R.style.AppTheme_Questionnaire)
     viewBinding = QuestionnaireActivityBinding.inflate(layoutInflater)
     setContentView(viewBinding.root)

From f86c2ba64b92a59bc45881eff4a6627c8e4ee77d Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Wed, 26 Jul 2023 11:21:03 +0300
Subject: [PATCH 13/27] Implement functionality to populate resources

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../configuration/QuestionnaireConfig.kt      |  2 +-
 .../engine/data/local/DefaultRepository.kt    |  2 +
 .../questionnaire/QuestionnaireNewActivity.kt | 93 +++++++++++++++++--
 .../QuestionnaireNewViewModel.kt              | 53 +++++++++++
 4 files changed, 139 insertions(+), 11 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
index a0140527f3..9129367956 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
@@ -38,8 +38,8 @@ data class QuestionnaireConfig(
   val planDefinitions: List<String>? = null,
   var type: QuestionnaireType = QuestionnaireType.DEFAULT,
   val resourceIdentifier: String? = null,
-  val removeResource: Boolean? = null,
   val resourceType: ResourceType? = null,
+  val removeResource: Boolean? = null,
   val confirmationDialog: ConfirmationDialog? = null,
   val groupResource: GroupResourceConfig? = null,
   val taskId: String? = null,
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
index fef94ac258..af481d9466 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
@@ -142,6 +142,8 @@ constructor(
       else -> listOf()
     }
 
+  suspend inline fun <reified R : Resource> search(search: Search) = fhirEngine.search<R>(search)
+
   /**
    * Saves a resource in the database. It also updates the [Resource.meta.lastUpdated] and generates
    * the [Resource.id] if it is missing before saving the resource.
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
index f39900caf5..c10704cbde 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
@@ -23,10 +23,16 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.QuestionnaireFragment
+import com.google.android.fhir.datacapture.mapping.ResourceMapper
+import com.google.android.fhir.logicalId
 import dagger.hilt.android.AndroidEntryPoint
+import java.util.LinkedList
 import kotlinx.coroutines.launch
+import org.hl7.fhir.r4.model.ListResource
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.hl7.fhir.r4.model.Resource
+import org.hl7.fhir.r4.model.ResourceType
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.ui.base.AlertDialogue
@@ -38,6 +44,7 @@ import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.quest.R
 import org.smartregister.fhircore.quest.databinding.QuestionnaireActivityBinding
 import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity.Companion.QUESTIONNAIRE_FRAGMENT_TAG
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireNewViewModel.Companion.CONTAINED_LIST_TITLE
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -91,6 +98,12 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
         }
 
         questionnaire = viewModel.retrieveQuestionnaire(questionnaireConfig, actionParameters)
+
+        if (questionnaire == null) {
+          showToast(getString(R.string.questionnaire_not_found))
+          finish()
+        }
+
         if (questionnaire?.subjectType.isNullOrEmpty()) {
           showToast(getString(R.string.missing_subject_type))
           Timber.e(
@@ -98,24 +111,84 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
           )
           finish()
         }
-        val questionnaireJson = questionnaire?.asJson()
-        if (questionnaire?.id.isNullOrEmpty() || questionnaireJson.isNullOrEmpty()) {
-          showToast(getString(R.string.questionnaire_not_found))
-          finish()
-        }
-        val questionnaireFragment =
-          QuestionnaireFragment.builder().setQuestionnaire(questionnaireJson!!).build()
+
+        val questionnaireFragmentBuilder = buildQuestionnaireFragment(questionnaire!!)
+
         supportFragmentManager.commit {
           setReorderingAllowed(true)
-          add(R.id.container, questionnaireFragment, QUESTIONNAIRE_FRAGMENT_TAG)
+          add(R.id.container, questionnaireFragmentBuilder.build(), QUESTIONNAIRE_FRAGMENT_TAG)
         }
+
+        registerFragmentResultListener()
       }
+    }
+  }
+
+  private suspend fun buildQuestionnaireFragment(
+    questionnaire: Questionnaire,
+  ): QuestionnaireFragment.Builder {
+    val questionnaireFragmentBuilder =
+      QuestionnaireFragment.builder().setQuestionnaire(questionnaire.json())
+
+    val questionnaireSubjectType = questionnaire.subjectType.firstOrNull()?.code
+    val resourceType =
+      questionnaireConfig.resourceType ?: questionnaireSubjectType?.let { ResourceType.valueOf(it) }
+    val resourceIdentifier = questionnaireConfig.resourceIdentifier
+
+    val populationResources = LinkedList<Resource>()
 
-      registerFragmentResultListener()
+    if (resourceType != null && !resourceIdentifier.isNullOrEmpty()) {
+      val subjectResource = viewModel.loadResource(resourceType, resourceIdentifier)
+
+      if (subjectResource != null) {
+        val launchContexts = listOf(subjectResource.json())
+        questionnaireFragmentBuilder.setQuestionnaireLaunchContexts(launchContexts)
+        populationResources.add(subjectResource)
+      }
+
+      // Get previously extracted resources from the QuestionnaireResponse.contained for population
+      val latestQuestionnaireResponse =
+        viewModel.searchLatestQuestionnaireResponse(
+          resourceId = resourceIdentifier,
+          resourceType = resourceType,
+          questionnaireId = questionnaire.id,
+        )
+      latestQuestionnaireResponse?.contained?.forEach { resource ->
+        if (
+          resource is ListResource && resource.title.equals(CONTAINED_LIST_TITLE, ignoreCase = true)
+        ) {
+          resource.entry?.forEach { listEntryComponent ->
+            if (listEntryComponent.hasItem()) {
+              viewModel.loadResource(listEntryComponent.item)?.let { populationResources.add(it) }
+            }
+          }
+        } else {
+          viewModel.loadResource(resource.resourceType, resource.logicalId)?.let {
+            populationResources.add(it)
+          }
+        }
+      }
     }
+
+    val configuredPopulationResources = viewModel.retrievePopulationResources(actionParameters)
+
+    val questionnaireResponse =
+      ResourceMapper.populate(
+        questionnaire = questionnaire,
+        resources = populationResources.plus(configuredPopulationResources).toTypedArray(),
+      )
+
+    val validQuestionnaireResponse =
+      viewModel.validateQuestionnaireResponse(questionnaire, questionnaireResponse, this)
+
+    if (validQuestionnaireResponse && !resourceIdentifier.isNullOrEmpty()) {
+      questionnaireFragmentBuilder.setQuestionnaireResponse(questionnaireResponse.json())
+    }
+
+    return questionnaireFragmentBuilder
   }
 
-  private fun Questionnaire?.asJson(): String? = this?.encodeResourceToString()
+  private fun Resource.json(): String = this.encodeResourceToString()
 
   private fun registerFragmentResultListener() {
     supportFragmentManager.setFragmentResultListener(
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index 4d27efdd1f..085a98829b 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -27,6 +27,7 @@ import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValid
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.logicalId
+import com.google.android.fhir.search.Search
 import dagger.hilt.android.lifecycle.HiltViewModel
 import java.util.Date
 import java.util.UUID
@@ -536,6 +537,58 @@ constructor(
     }
   }
 
+  /**
+   * This function searches and returns the latest [QuestionnaireResponse] for the given
+   * [resourceId] that was extracted from the [Questionnaire] identified as [questionnaireId].
+   * Returns null if non is found.
+   */
+  suspend fun searchLatestQuestionnaireResponse(
+    resourceId: String,
+    resourceType: ResourceType,
+    questionnaireId: String,
+  ): QuestionnaireResponse? {
+    val search =
+      Search(ResourceType.QuestionnaireResponse).apply {
+        filter(QuestionnaireResponse.SUBJECT, { value = "$resourceType/$resourceId" })
+        filter(
+          QuestionnaireResponse.QUESTIONNAIRE,
+          { value = "${ResourceType.Questionnaire}/$questionnaireId" },
+        )
+      }
+    val questionnaireResponses: List<QuestionnaireResponse> = defaultRepository.search(search)
+    return questionnaireResponses.maxByOrNull { it.meta.lastUpdated }
+  }
+
+  suspend fun retrievePopulationResources(actionParameters: List<ActionParameter>): List<Resource> {
+    return actionParameters
+      .filter {
+        it.paramType == ActionParameterType.QUESTIONNAIRE_RESPONSE_POPULATION_RESOURCE &&
+          it.resourceType != null &&
+          it.value.isNotEmpty()
+      }
+      .mapNotNull {
+        try {
+          loadResource(it.resourceType!!, it.value)
+        } catch (resourceNotFoundException: ResourceNotFoundException) {
+          null
+        }
+      }
+  }
+
+  suspend fun loadResource(resourceType: ResourceType, resourceIdentifier: String): Resource? =
+    try {
+      defaultRepository.loadResource(resourceIdentifier, resourceType)
+    } catch (resourceNotFoundException: ResourceNotFoundException) {
+      null
+    }
+
+  suspend fun loadResource(reference: Reference): Resource? =
+    try {
+      defaultRepository.loadResource(reference)
+    } catch (resourceNotFoundException: ResourceNotFoundException) {
+      null
+    }
+
   companion object {
     const val CONTAINED_LIST_TITLE = "GeneratedResourcesList"
   }

From d0a4691a2eaa240b7c7bcc603c79f58c1d97ff82 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Wed, 26 Jul 2023 16:48:22 +0300
Subject: [PATCH 14/27] Populate Questionnaire with previous responses

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../engine/domain/model/QuestionnaireType.kt  |  2 +-
 .../util/extension/ResourceExtension.kt       |  5 +-
 .../domain/model/QuestionnaireTypeTest.kt     |  6 +-
 .../ui/questionnaire/QuestionnaireActivity.kt |  4 +-
 .../questionnaire/QuestionnaireNewActivity.kt | 79 ++++++++-----------
 .../QuestionnaireNewViewModel.kt              | 11 +--
 .../questionnaire/QuestionnaireViewModel.kt   |  8 +-
 android/quest/src/main/res/values/strings.xml |  1 +
 .../QuestionnaireActivityTest.kt              |  4 +-
 9 files changed, 52 insertions(+), 68 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/domain/model/QuestionnaireType.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/domain/model/QuestionnaireType.kt
index 6c74df1980..62ad2e4b4f 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/domain/model/QuestionnaireType.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/domain/model/QuestionnaireType.kt
@@ -24,7 +24,7 @@ enum class QuestionnaireType {
 
   fun isDefault() = this == DEFAULT
 
-  fun isEditMode() = this == EDIT
+  fun isEditable() = this == EDIT
 
   fun isReadOnly() = this == READ_ONLY
 }
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
index c9a9ffead7..9e2e131eda 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
@@ -62,6 +62,8 @@ import org.json.JSONObject
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
 import timber.log.Timber
 
+const val REFERENCE = "reference"
+const val PARTOF = "part-of"
 private val fhirR4JsonParser = FhirContext.forR4Cached().getCustomJsonParser()
 
 fun Base?.valueToString(): String {
@@ -426,6 +428,3 @@ suspend fun Task.updateDependentTaskDueDate(
     }
   }
 }
-
-const val REFERENCE = "reference"
-const val PARTOF = "part-of"
diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/domain/model/QuestionnaireTypeTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/domain/model/QuestionnaireTypeTest.kt
index a473596c16..47d620b228 100644
--- a/android/engine/src/test/java/org/smartregister/fhircore/engine/domain/model/QuestionnaireTypeTest.kt
+++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/domain/model/QuestionnaireTypeTest.kt
@@ -30,9 +30,9 @@ class QuestionnaireTypeTest {
 
   @Test
   fun testEdit() {
-    Assert.assertFalse(QuestionnaireType.DEFAULT.isEditMode())
-    Assert.assertTrue(QuestionnaireType.EDIT.isEditMode())
-    Assert.assertFalse(QuestionnaireType.READ_ONLY.isEditMode())
+    Assert.assertFalse(QuestionnaireType.DEFAULT.isEditable())
+    Assert.assertTrue(QuestionnaireType.EDIT.isEditable())
+    Assert.assertFalse(QuestionnaireType.READ_ONLY.isEditable())
   }
 
   @Test
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
index 6bbfac4eb0..1c616d5eba 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
@@ -220,7 +220,7 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
 
       if (questionnaireConfig.type.isReadOnly() || questionnaire.experimental) {
         text = context.getString(R.string.done)
-      } else if (questionnaireConfig.type.isEditMode()) {
+      } else if (questionnaireConfig.type.isEditable()) {
         // setting the save button text from Questionnaire Config
         text = questionnaireConfig.saveButtonText ?: getString(R.string.str_save)
       }
@@ -229,7 +229,7 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
     supportActionBar?.apply {
       setDisplayHomeAsUpEnabled(true)
       title =
-        if (questionnaireConfig.type.isEditMode()) {
+        if (questionnaireConfig.type.isEditable()) {
           "${getString(R.string.edit)} ${questionnaireConfig.title}"
         } else {
           questionnaireConfig.title
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
index c10704cbde..fbed2b2d3a 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
@@ -23,18 +23,17 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.QuestionnaireFragment
-import com.google.android.fhir.datacapture.mapping.ResourceMapper
 import com.google.android.fhir.logicalId
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.LinkedList
 import kotlinx.coroutines.launch
-import org.hl7.fhir.r4.model.ListResource
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
+import org.smartregister.fhircore.engine.domain.model.ActionParameterType
 import org.smartregister.fhircore.engine.ui.base.AlertDialogue
 import org.smartregister.fhircore.engine.ui.base.BaseMultiLanguageActivity
 import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
@@ -44,7 +43,6 @@ import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.quest.R
 import org.smartregister.fhircore.quest.databinding.QuestionnaireActivityBinding
 import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity.Companion.QUESTIONNAIRE_FRAGMENT_TAG
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireNewViewModel.Companion.CONTAINED_LIST_TITLE
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -135,56 +133,49 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
       questionnaireConfig.resourceType ?: questionnaireSubjectType?.let { ResourceType.valueOf(it) }
     val resourceIdentifier = questionnaireConfig.resourceIdentifier
 
-    val populationResources = LinkedList<Resource>()
-
     if (resourceType != null && !resourceIdentifier.isNullOrEmpty()) {
-      val subjectResource = viewModel.loadResource(resourceType, resourceIdentifier)
 
-      if (subjectResource != null) {
-        val launchContexts = listOf(subjectResource.json())
-        questionnaireFragmentBuilder.setQuestionnaireLaunchContexts(launchContexts)
-        populationResources.add(subjectResource)
-      }
+      // Add subject and other configured resource to launchContext
+      val launchContextResources =
+        LinkedList<Resource>().apply {
+          viewModel.loadResource(resourceType, resourceIdentifier)?.let { add(it) }
+          addAll(
+            // Exclude the subject resource its already added
+            viewModel.retrievePopulationResources(
+              actionParameters.filterNot {
+                it.paramType == ActionParameterType.QUESTIONNAIRE_RESPONSE_POPULATION_RESOURCE &&
+                  resourceType == it.resourceType &&
+                  resourceIdentifier.equals(it.value, ignoreCase = true)
+              },
+            ),
+          )
+        }
 
-      // Get previously extracted resources from the QuestionnaireResponse.contained for population
-      val latestQuestionnaireResponse =
-        viewModel.searchLatestQuestionnaireResponse(
-          resourceId = resourceIdentifier,
-          resourceType = resourceType,
-          questionnaireId = questionnaire.id,
+      if (launchContextResources.isNotEmpty()) {
+        questionnaireFragmentBuilder.setQuestionnaireLaunchContexts(
+          launchContextResources.map { it.json() },
         )
-      latestQuestionnaireResponse?.contained?.forEach { resource ->
-        if (
-          resource is ListResource && resource.title.equals(CONTAINED_LIST_TITLE, ignoreCase = true)
-        ) {
-          resource.entry?.forEach { listEntryComponent ->
-            if (listEntryComponent.hasItem()) {
-              viewModel.loadResource(listEntryComponent.item)?.let { populationResources.add(it) }
-            }
-          }
-        } else {
-          viewModel.loadResource(resource.resourceType, resource.logicalId)?.let {
-            populationResources.add(it)
-          }
-        }
       }
-    }
-
-    val configuredPopulationResources = viewModel.retrievePopulationResources(actionParameters)
 
-    val questionnaireResponse =
-      ResourceMapper.populate(
-        questionnaire = questionnaire,
-        resources = populationResources.plus(configuredPopulationResources).toTypedArray(),
-      )
+      // Populate questionnaire with latest QuestionnaireResponse
+      if (questionnaireConfig.type.isEditable()) {
+        val latestQuestionnaireResponse =
+          viewModel.searchLatestQuestionnaireResponse(
+            resourceId = resourceIdentifier,
+            resourceType = resourceType,
+            questionnaireId = questionnaire.logicalId,
+          )
 
-    val validQuestionnaireResponse =
-      viewModel.validateQuestionnaireResponse(questionnaire, questionnaireResponse, this)
+        val questionnaireResponse =
+          QuestionnaireResponse().apply { item = latestQuestionnaireResponse?.item }
 
-    if (validQuestionnaireResponse && !resourceIdentifier.isNullOrEmpty()) {
-      questionnaireFragmentBuilder.setQuestionnaireResponse(questionnaireResponse.json())
+        if (viewModel.validateQuestionnaireResponse(questionnaire, questionnaireResponse, this)) {
+          questionnaireFragmentBuilder.setQuestionnaireResponse(questionnaireResponse.json())
+        } else {
+          showToast(getString(R.string.error_populating_questionnaire))
+        }
+      }
     }
-
     return questionnaireFragmentBuilder
   }
 
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index 085a98829b..1b75b61642 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -119,7 +119,7 @@ constructor(
 
     val questionnaire =
       defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)?.apply {
-        if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditMode()) {
+        if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditable()) {
           item.prepareQuestionsForReadingOrEditing(
             readOnly = questionnaireConfig.type.isReadOnly(),
             readOnlyLinkIds = questionnaireConfig.readOnlyLinkIds,
@@ -149,7 +149,7 @@ constructor(
     questionnaire: Questionnaire,
     currentQuestionnaireResponse: QuestionnaireResponse,
     questionnaireConfig: QuestionnaireConfig,
-    actionParameters: List<ActionParameter>?,
+    actionParameters: List<ActionParameter>,
     context: Context,
   ) {
     viewModelScope.launch(SupervisorJob()) {
@@ -582,13 +582,6 @@ constructor(
       null
     }
 
-  suspend fun loadResource(reference: Reference): Resource? =
-    try {
-      defaultRepository.loadResource(reference)
-    } catch (resourceNotFoundException: ResourceNotFoundException) {
-      null
-    }
-
   companion object {
     const val CONTAINED_LIST_TITLE = "GeneratedResourcesList"
   }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
index 7b89b6ac69..a3e69b539f 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -121,7 +121,7 @@ constructor(
     readOnlyLinkIds: List<String>? = emptyList(),
   ): Questionnaire? =
     defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)?.apply {
-      if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditMode()) {
+      if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditable()) {
         item.prepareQuestionsForReadingOrEditing(
           QUESTIONNAIRE_RESPONSE_ITEM,
           questionnaireConfig.type.isReadOnly(),
@@ -239,7 +239,7 @@ constructor(
           // TODO https://github.com/opensrp/fhircore/issues/900
           // for edit mode replace client and resource subject ids.
           // Ideally ResourceMapper should allow this internally via structure-map
-          if (questionnaireConfig.type.isEditMode()) {
+          if (questionnaireConfig.type.isEditable()) {
             if (bundleEntry.resource.resourceType.isIn(ResourceType.Patient, ResourceType.Group)) {
               bundleEntry.resource.id = questionnaireResponse.subject.extractId()
             } else {
@@ -259,7 +259,7 @@ constructor(
           saveBundleResources(bundle)
         }
 
-        if (questionnaireConfig.type.isEditMode() && editQuestionnaireResponse != null) {
+        if (questionnaireConfig.type.isEditable() && editQuestionnaireResponse != null) {
           questionnaireResponse.retainMetadata(editQuestionnaireResponse!!)
         }
 
@@ -268,7 +268,7 @@ constructor(
         // TODO https://github.com/opensrp/fhircore/issues/900
         // reassess following i.e. deleting/updating older resources because one resource
         // might have generated other flow in subsequent followups
-        if (questionnaireConfig.type.isEditMode() && editQuestionnaireResponse != null) {
+        if (questionnaireConfig.type.isEditable() && editQuestionnaireResponse != null) {
           editQuestionnaireResponse!!.deleteRelatedResources(defaultRepository)
         }
         performExtraction(questionnaireResponse, questionnaireConfig, questionnaire, bundle)
diff --git a/android/quest/src/main/res/values/strings.xml b/android/quest/src/main/res/values/strings.xml
index bca931d3cf..c62b2e6195 100644
--- a/android/quest/src/main/res/values/strings.xml
+++ b/android/quest/src/main/res/values/strings.xml
@@ -105,5 +105,6 @@
     <string name="application_version" translatable="false">Application Version</string>
     <string name="missing_subject_type">Missing subject type on questionnaire. Provide Questionnaire.subjectType to resolve.</string>
     <string name="missing_questionnaire_config">QuestionnaireConfig is required but missing.</string>
+    <string name="error_populating_questionnaire">Unable to populate the questionnaire. Invalid Response.</string>
 
 </resources>
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
index 0f933835e3..295a6d0721 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
@@ -556,13 +556,13 @@ class QuestionnaireActivityTest : ActivityRobolectricTest() {
   fun testOnClickEditButtonShouldSetEditModeToTrue() = runTest {
     val questionnaire = Questionnaire().apply { experimental = false }
     ReflectionHelpers.setField(questionnaireActivity, "questionnaire", questionnaire)
-    Assert.assertFalse(questionnaireConfig.type.isEditMode())
+    Assert.assertFalse(questionnaireConfig.type.isEditable())
 
     questionnaireActivity.onClick(questionnaireActivity.findViewById(R.id.btn_edit_qr))
 
     val updatedQuestionnaireConfig =
       ReflectionHelpers.getField<QuestionnaireConfig>(questionnaireActivity, "questionnaireConfig")
-    Assert.assertTrue(updatedQuestionnaireConfig.type.isEditMode())
+    Assert.assertTrue(updatedQuestionnaireConfig.type.isEditable())
   }
 
   @Test

From f8f89b4e07de96a97722b5f51da03a82e742bc1c Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Wed, 26 Jul 2023 18:15:08 +0300
Subject: [PATCH 15/27] Retrieve existing subject

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../questionnaire/QuestionnaireNewActivity.kt |  1 -
 .../QuestionnaireNewViewModel.kt              | 40 +++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
index fbed2b2d3a..fa93690227 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
@@ -134,7 +134,6 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
     val resourceIdentifier = questionnaireConfig.resourceIdentifier
 
     if (resourceType != null && !resourceIdentifier.isNullOrEmpty()) {
-
       // Add subject and other configured resource to launchContext
       val launchContextResources =
         LinkedList<Resource>().apply {
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index 1b75b61642..e9479f387e 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -214,7 +214,12 @@ constructor(
       }
 
       val subject =
-        retrieveSubject(questionnaire, bundle)?.apply { id = "$resourceType/$logicalId" }
+        retrieveSubject(
+            questionnaire = questionnaire,
+            questionnaireConfig = questionnaireConfig,
+            bundle = bundle,
+          )
+          ?.apply { id = "$resourceType/$logicalId" }
 
       // Update Group resource to save members
       group?.let { defaultRepository.addOrUpdate(resource = it) }
@@ -235,7 +240,7 @@ constructor(
       updateResourcesLastUpdatedProperty(actionParameters)
 
       if (subject != null && bundle != null) {
-        // Generate CarePlan using configured plan definitions and execute cql
+        // Generate CarePlan using configured plan definitions
         val newBundle = bundle.copyBundle(currentQuestionnaireResponse)
         generateCarePlan(
           subject = subject,
@@ -258,9 +263,9 @@ constructor(
             bundle = bundle,
           )
         }
-
-        softDeleteResources(questionnaireConfig)
       }
+
+      softDeleteResources(questionnaireConfig)
     }
   }
 
@@ -426,13 +431,26 @@ constructor(
   }
 
   /**
-   * This function returns the first resource of type [Questionnaire.subjectType] retrieved from the
-   * [Bundle.entry]
+   * This retrieves and returns [Resource] as subject if [QuestionnaireConfig.resourceType] and
+   * [QuestionnaireConfig.resourceIdentifier] are provided. This will be the typical case for
+   * subsequent [Questionnaire] submissions where the [QuestionnaireResponse.subject] already
+   * exists. For instances where the [Questionnaire] is submitted the first time (e.g. during
+   * registration events), the subject [Resource] will be included and accessed from the extracted
+   * resources in the [Bundle.entry]
    */
-  fun retrieveSubject(
+  suspend fun retrieveSubject(
     questionnaire: Questionnaire,
+    questionnaireConfig: QuestionnaireConfig,
     bundle: Bundle?,
   ): Resource? {
+    val questionnaireSubjectType = questionnaire.subjectType.firstOrNull()?.code
+    val resourceType =
+      questionnaireConfig.resourceType ?: questionnaireSubjectType?.let { ResourceType.valueOf(it) }
+    val resourceIdentifier = questionnaireConfig.resourceIdentifier
+
+    if (resourceType != null && !resourceIdentifier.isNullOrEmpty()) {
+      return loadResource(resourceType, resourceIdentifier)
+    }
     questionnaire.subjectType.forEach {
       val resourceType = ResourceType.valueOf(it.code)
       return bundle
@@ -559,6 +577,13 @@ constructor(
     return questionnaireResponses.maxByOrNull { it.meta.lastUpdated }
   }
 
+  /**
+   * Return [Resource]s to be used in the launch context of the questionnaire. Launch context allows
+   * information to be passed into questionnaire based on the context in which the questionnaire is
+   * being evaluated. For example, what patient, what encounter, what user, etc. is "in context" at
+   * the time the questionnaire response is being completed:
+   * https://build.fhir.org/ig/HL7/sdc/StructureDefinition-sdc-questionnaire-launchContext.html
+   */
   suspend fun retrievePopulationResources(actionParameters: List<ActionParameter>): List<Resource> {
     return actionParameters
       .filter {
@@ -575,6 +600,7 @@ constructor(
       }
   }
 
+  /** Load [Resource] of type [ResourceType] for the provided [resourceIdentifier] */
   suspend fun loadResource(resourceType: ResourceType, resourceIdentifier: String): Resource? =
     try {
       defaultRepository.loadResource(resourceIdentifier, resourceType)

From de51afe9aa42a2a9e82c4a362f7454840b71557f Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Wed, 26 Jul 2023 20:07:03 +0300
Subject: [PATCH 16/27] Show progress indicators

Display alert dialog when launching/performing extraction

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../util/extension/AndroidExtensions.kt       |  8 +++
 .../fhircore/quest/ui/main/AppMainActivity.kt | 23 +++++---
 .../questionnaire/QuestionnaireNewActivity.kt | 59 ++++++++++++++++---
 .../QuestionnaireNewViewModel.kt              | 21 ++++++-
 .../QuestionnaireProgressState.kt             | 29 +++++++++
 .../shared/models/QuestionnaireSubmission.kt  |  7 +++
 android/quest/src/main/res/values/strings.xml |  2 +
 7 files changed, 132 insertions(+), 17 deletions(-)
 create mode 100644 android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireProgressState.kt

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensions.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensions.kt
index 7ae7553308..6b6bdf6b1c 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensions.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensions.kt
@@ -36,6 +36,7 @@ import androidx.core.os.bundleOf
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
+import java.io.Serializable
 import java.util.Locale
 import org.smartregister.fhircore.engine.ui.theme.DangerColor
 import org.smartregister.fhircore.engine.ui.theme.DefaultColor
@@ -210,6 +211,13 @@ inline fun <reified T : Parcelable> Bundle.parcelableArrayList(key: String): Arr
     else -> @Suppress("DEPRECATION") getParcelableArrayList(key)
   }
 
+@ExcludeFromJacocoGeneratedReport
+inline fun <reified T : Serializable> Intent.serializable(key: String): T? =
+  when {
+    SDK_INT >= 33 -> getSerializableExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializableExtra(key) as? T
+  }
+
 @ExcludeFromJacocoGeneratedReport
 inline fun <reified T : Parcelable> Intent.parcelableArrayList(key: String): ArrayList<T>? =
   when {
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt
index f1cfc52cf0..91ac01563e 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt
@@ -34,6 +34,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.sentry.android.navigation.SentryNavigationListener
 import javax.inject.Inject
 import kotlinx.coroutines.launch
+import org.hl7.fhir.r4.model.IdType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.configuration.app.ConfigService
@@ -45,6 +46,8 @@ import org.smartregister.fhircore.engine.ui.base.BaseMultiLanguageActivity
 import org.smartregister.fhircore.engine.util.DefaultDispatcherProvider
 import org.smartregister.fhircore.engine.util.extension.addDateTimeIndex
 import org.smartregister.fhircore.engine.util.extension.isDeviceOnline
+import org.smartregister.fhircore.engine.util.extension.parcelable
+import org.smartregister.fhircore.engine.util.extension.serializable
 import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.geowidget.model.GeoWidgetEvent
 import org.smartregister.fhircore.geowidget.screens.GeoWidgetViewModel
@@ -52,7 +55,7 @@ import org.smartregister.fhircore.quest.R
 import org.smartregister.fhircore.quest.event.AppEvent
 import org.smartregister.fhircore.quest.event.EventBus
 import org.smartregister.fhircore.quest.navigation.NavigationArg
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireNewActivity
 import org.smartregister.fhircore.quest.ui.shared.QuestionnaireHandler
 import org.smartregister.fhircore.quest.ui.shared.models.QuestionnaireSubmission
 import timber.log.Timber
@@ -158,22 +161,28 @@ open class AppMainActivity : BaseMultiLanguageActivity(), QuestionnaireHandler,
   override suspend fun onSubmitQuestionnaire(activityResult: ActivityResult) {
     if (activityResult.resultCode == RESULT_OK) {
       val questionnaireResponse: QuestionnaireResponse? =
-        activityResult.data?.getSerializableExtra(QuestionnaireActivity.QUESTIONNAIRE_RESPONSE)
+        activityResult.data?.serializable(QuestionnaireNewActivity.QUESTIONNAIRE_RESPONSE)
           as QuestionnaireResponse?
+      val extractedResourceIds =
+        activityResult.data?.serializable(
+          QuestionnaireNewActivity.QUESTIONNAIRE_SUBMISSION_EXTRACTED_RESOURCE_IDS,
+        ) as List<IdType>?
+          ?: emptyList()
       val questionnaireConfig =
-        activityResult.data?.getSerializableExtra(QuestionnaireActivity.QUESTIONNAIRE_CONFIG)
+        activityResult.data?.parcelable(QuestionnaireNewActivity.QUESTIONNAIRE_CONFIG)
           as QuestionnaireConfig?
 
-      if (questionnaireConfig != null) {
+      if (questionnaireConfig != null && questionnaireResponse != null) {
         eventBus.triggerEvent(
           AppEvent.OnSubmitQuestionnaire(
             QuestionnaireSubmission(
-              questionnaireConfig,
-              questionnaireResponse ?: QuestionnaireResponse(),
+              questionnaireConfig = questionnaireConfig,
+              questionnaireResponse = questionnaireResponse,
+              extractedResourceIds = extractedResourceIds,
             ),
           ),
         )
-      }
+      } else Timber.e("QuestionnaireConfig & QuestionnaireResponse are both null")
     }
   }
 
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
index fa93690227..e002b1cb3b 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
@@ -16,7 +16,11 @@
 
 package org.smartregister.fhircore.quest.ui.questionnaire
 
+import android.app.Activity
+import android.app.AlertDialog
+import android.content.Intent
 import android.os.Bundle
+import android.os.Parcelable
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.core.os.bundleOf
@@ -25,6 +29,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.QuestionnaireFragment
 import com.google.android.fhir.logicalId
 import dagger.hilt.android.AndroidEntryPoint
+import java.io.Serializable
 import java.util.LinkedList
 import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.model.Questionnaire
@@ -53,6 +58,7 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
   private lateinit var actionParameters: ArrayList<ActionParameter>
   private lateinit var viewBinding: QuestionnaireActivityBinding
   private var questionnaire: Questionnaire? = null
+  private var alertDialog: AlertDialog? = null
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -69,6 +75,22 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
       finish()
     }
 
+    viewModel.questionnaireProgressStateLiveData.observe(this) { progressState ->
+      alertDialog =
+        if (progressState?.active == false) {
+          alertDialog?.dismiss()
+          null
+        } else {
+          when (progressState) {
+            is QuestionnaireProgressState.ExtractionInProgress ->
+              AlertDialogue.showProgressAlert(this, R.string.extraction_in_progress)
+            is QuestionnaireProgressState.QuestionnaireLaunch ->
+              AlertDialogue.showProgressAlert(this, R.string.loading_questionnaire)
+            null -> null
+          }
+        }
+    }
+
     if (savedInstanceState == null) renderQuestionnaire()
 
     this.onBackPressedDispatcher.addCallback(
@@ -89,12 +111,12 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
   private fun renderQuestionnaire() {
     lifecycleScope.launch {
       if (supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) == null) {
+        viewModel.setProgressState(QuestionnaireProgressState.QuestionnaireLaunch(true))
         viewBinding.questionnaireToolbar.apply {
           title = questionnaireConfig.title
           setNavigationIcon(R.drawable.ic_arrow_back)
           setNavigationOnClickListener { handleBackPress() }
         }
-
         questionnaire = viewModel.retrieveQuestionnaire(questionnaireConfig, actionParameters)
 
         if (questionnaire == null) {
@@ -118,6 +140,8 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
         }
 
         registerFragmentResultListener()
+
+        viewModel.setProgressState(QuestionnaireProgressState.QuestionnaireLaunch(false))
       }
     }
   }
@@ -188,17 +212,32 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
       val questionnaireResponse = retrieveQuestionnaireResponse()
 
       // Close questionnaire if opened in read only mode or if experimental
-      if (questionnaireConfig.type.isReadOnly() || questionnaire?.experimental == false) {
+      if (questionnaireConfig.type.isReadOnly() || questionnaire?.experimental == true) {
         finish()
       }
       if (questionnaireResponse != null && questionnaire != null) {
-        viewModel.handleQuestionnaireSubmission(
-          questionnaire = questionnaire!!,
-          currentQuestionnaireResponse = questionnaireResponse,
-          questionnaireConfig = questionnaireConfig,
-          actionParameters = actionParameters,
-          context = this,
-        )
+        viewModel.run {
+          setProgressState(QuestionnaireProgressState.ExtractionInProgress(true))
+          handleQuestionnaireSubmission(
+            questionnaire = questionnaire!!,
+            currentQuestionnaireResponse = questionnaireResponse,
+            questionnaireConfig = questionnaireConfig,
+            actionParameters = actionParameters,
+            context = this@QuestionnaireNewActivity,
+          ) { idTypes, questionnaireResponse ->
+            // Dismiss progress indicator dialog, submit result then finish activity
+            setProgressState(QuestionnaireProgressState.ExtractionInProgress(false))
+            setResult(
+              Activity.RESULT_OK,
+              Intent().apply {
+                putExtra(QUESTIONNAIRE_RESPONSE, questionnaireResponse as Serializable)
+                putExtra(QUESTIONNAIRE_SUBMISSION_EXTRACTED_RESOURCE_IDS, idTypes as Serializable)
+                putExtra(QUESTIONNAIRE_CONFIG, questionnaireConfig as Parcelable)
+              },
+            )
+            finish()
+          }
+        }
       }
     }
   }
@@ -238,6 +277,8 @@ class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
   companion object {
 
     const val QUESTIONNAIRE_CONFIG = "questionnaireConfig"
+    const val QUESTIONNAIRE_SUBMISSION_EXTRACTED_RESOURCE_IDS = "questionnaireExtractedResourceIds"
+    const val QUESTIONNAIRE_RESPONSE = "questionnaireResponse"
     const val QUESTIONNAIRE_ACTION_PARAMETERS = "questionnaireActionParameters"
     const val QUESTIONNAIRE_POPULATION_RESOURCES = "questionnairePopulationResources"
 
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
index e9479f387e..784fc871fb 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
@@ -18,6 +18,8 @@ package org.smartregister.fhircore.quest.ui.questionnaire
 
 import android.content.Context
 import android.widget.Toast
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.google.android.fhir.datacapture.mapping.ResourceMapper
@@ -37,6 +39,7 @@ import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.context.IWorkerContext
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.Group
+import org.hl7.fhir.r4.model.IdType
 import org.hl7.fhir.r4.model.ListResource
 import org.hl7.fhir.r4.model.ListResource.ListEntryComponent
 import org.hl7.fhir.r4.model.Patient
@@ -94,6 +97,10 @@ constructor(
       ?.extractLogicalIdUuid()
   }
 
+  private val _questionnaireProgressStateLiveData = MutableLiveData<QuestionnaireProgressState?>()
+  val questionnaireProgressStateLiveData: LiveData<QuestionnaireProgressState?>
+    get() = _questionnaireProgressStateLiveData
+
   /**
    * This function retrieves the [Questionnaire] as configured via the [QuestionnaireConfig]. The
    * retrieved [Questionnaire] can be pre-populated with computed values from the Rules engine.
@@ -102,7 +109,7 @@ constructor(
     questionnaireConfig: QuestionnaireConfig,
     actionParameters: List<ActionParameter>?,
   ): Questionnaire? {
-    if (questionnaireConfig.id.isEmpty()) return null
+    if (questionnaireConfig.id.isEmpty() || questionnaireConfig.id.isBlank()) return null
 
     // Compute questionnaire config rules and add extra questionnaire params to action parameters
     val questionnaireComputedValues =
@@ -151,6 +158,7 @@ constructor(
     questionnaireConfig: QuestionnaireConfig,
     actionParameters: List<ActionParameter>,
     context: Context,
+    onSuccessfulSubmission: (List<IdType>, QuestionnaireResponse) -> Unit,
   ) {
     viewModelScope.launch(SupervisorJob()) {
       val questionnaireResponseValid =
@@ -266,6 +274,12 @@ constructor(
       }
 
       softDeleteResources(questionnaireConfig)
+
+      // On successful submission callback
+      val idTypes =
+        bundle?.entry?.map { IdType(it.resource.resourceType.name, it.resource.logicalId) }
+          ?: emptyList()
+      onSuccessfulSubmission(idTypes, currentQuestionnaireResponse)
     }
   }
 
@@ -608,6 +622,11 @@ constructor(
       null
     }
 
+  /** Update the current progress state of the questionnaire. */
+  fun setProgressState(questionnaireState: QuestionnaireProgressState) {
+    _questionnaireProgressStateLiveData.postValue(questionnaireState)
+  }
+
   companion object {
     const val CONTAINED_LIST_TITLE = "GeneratedResourcesList"
   }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireProgressState.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireProgressState.kt
new file mode 100644
index 0000000000..9c5d713681
--- /dev/null
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireProgressState.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021-2023 Ona Systems, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.smartregister.fhircore.quest.ui.questionnaire
+
+/** This sealed class represents the different progress states while working with Questionnaires. */
+sealed class QuestionnaireProgressState(val active: Boolean = false) {
+  /** Determines whether to display the progress dialog when questionnaire is launched */
+  class QuestionnaireLaunch(active: Boolean) : QuestionnaireProgressState(active)
+
+  /**
+   * This [QuestionnaireProgressState] determine when to display/dismiss progress dialog during and
+   * after extraction
+   */
+  class ExtractionInProgress(active: Boolean) : QuestionnaireProgressState(active)
+}
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/QuestionnaireSubmission.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/QuestionnaireSubmission.kt
index ee0735a038..6d9a80d9f3 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/QuestionnaireSubmission.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/QuestionnaireSubmission.kt
@@ -16,10 +16,17 @@
 
 package org.smartregister.fhircore.quest.ui.shared.models
 
+import org.hl7.fhir.r4.model.Bundle
+import org.hl7.fhir.r4.model.IdType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 
+/**
+ * This data class represents the result of a Questionnaire submission. (Optionally,
+ * [extractedResourceIds] can be used to reference the extracted [Bundle.entry] resources.
+ */
 data class QuestionnaireSubmission(
   val questionnaireConfig: QuestionnaireConfig,
   val questionnaireResponse: QuestionnaireResponse,
+  val extractedResourceIds: List<IdType> = emptyList(),
 )
diff --git a/android/quest/src/main/res/values/strings.xml b/android/quest/src/main/res/values/strings.xml
index c62b2e6195..ac36854a04 100644
--- a/android/quest/src/main/res/values/strings.xml
+++ b/android/quest/src/main/res/values/strings.xml
@@ -106,5 +106,7 @@
     <string name="missing_subject_type">Missing subject type on questionnaire. Provide Questionnaire.subjectType to resolve.</string>
     <string name="missing_questionnaire_config">QuestionnaireConfig is required but missing.</string>
     <string name="error_populating_questionnaire">Unable to populate the questionnaire. Invalid Response.</string>
+    <string name="extraction_in_progress">Questionnaire data extraction in progress. Please wait…</string>
+    <string name="loading_questionnaire">Loading questionnaire…</string>
 
 </resources>

From a84d4c06223615795749e9be57296025644aeea1 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Wed, 26 Jul 2023 20:20:12 +0300
Subject: [PATCH 17/27] Refactor QuestionnaireActivity and
 QuestionnaireViewModel classes

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 android/quest/src/main/AndroidManifest.xml    |    5 -
 .../fhircore/quest/ui/main/AppMainActivity.kt |    8 +-
 .../quest/ui/main/AppMainViewModel.kt         |    4 +-
 .../ui/questionnaire/QuestionnaireActivity.kt |  678 +++--------
 .../questionnaire/QuestionnaireNewActivity.kt |  294 -----
 .../QuestionnaireNewViewModel.kt              |  633 ----------
 .../questionnaire/QuestionnaireViewModel.kt   | 1031 +++++++----------
 .../quest/ui/shared/QuestionnaireHandler.kt   |   10 +-
 .../quest/ui/main/AppMainActivityTest.kt      |    1 -
 .../QuestionnaireActivityTest.kt              |    2 -
 .../shared/model/QuestionnaireHandlerTest.kt  |    1 -
 11 files changed, 609 insertions(+), 2058 deletions(-)
 delete mode 100644 android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
 delete mode 100644 android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt

diff --git a/android/quest/src/main/AndroidManifest.xml b/android/quest/src/main/AndroidManifest.xml
index 3d32a307b7..5f19201f5f 100644
--- a/android/quest/src/main/AndroidManifest.xml
+++ b/android/quest/src/main/AndroidManifest.xml
@@ -53,11 +53,6 @@
             android:exported="false"
             android:theme="@style/AppTheme" />
 
-        <activity
-            android:name=".ui.questionnaire.QuestionnaireNewActivity"
-            android:exported="false"
-            android:theme="@style/AppTheme" />
-
         <activity android:name=".HiltActivityForTest" />
 
         <service
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt
index 91ac01563e..11e4f1cd09 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt
@@ -55,7 +55,7 @@ import org.smartregister.fhircore.quest.R
 import org.smartregister.fhircore.quest.event.AppEvent
 import org.smartregister.fhircore.quest.event.EventBus
 import org.smartregister.fhircore.quest.navigation.NavigationArg
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireNewActivity
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
 import org.smartregister.fhircore.quest.ui.shared.QuestionnaireHandler
 import org.smartregister.fhircore.quest.ui.shared.models.QuestionnaireSubmission
 import timber.log.Timber
@@ -161,15 +161,15 @@ open class AppMainActivity : BaseMultiLanguageActivity(), QuestionnaireHandler,
   override suspend fun onSubmitQuestionnaire(activityResult: ActivityResult) {
     if (activityResult.resultCode == RESULT_OK) {
       val questionnaireResponse: QuestionnaireResponse? =
-        activityResult.data?.serializable(QuestionnaireNewActivity.QUESTIONNAIRE_RESPONSE)
+        activityResult.data?.serializable(QuestionnaireActivity.QUESTIONNAIRE_RESPONSE)
           as QuestionnaireResponse?
       val extractedResourceIds =
         activityResult.data?.serializable(
-          QuestionnaireNewActivity.QUESTIONNAIRE_SUBMISSION_EXTRACTED_RESOURCE_IDS,
+          QuestionnaireActivity.QUESTIONNAIRE_SUBMISSION_EXTRACTED_RESOURCE_IDS,
         ) as List<IdType>?
           ?: emptyList()
       val questionnaireConfig =
-        activityResult.data?.parcelable(QuestionnaireNewActivity.QUESTIONNAIRE_CONFIG)
+        activityResult.data?.parcelable(QuestionnaireActivity.QUESTIONNAIRE_CONFIG)
           as QuestionnaireConfig?
 
       if (questionnaireConfig != null && questionnaireResponse != null) {
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
index b18bfc90cf..e6866ae713 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
@@ -77,7 +77,7 @@ import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.engine.util.extension.tryParse
 import org.smartregister.fhircore.quest.navigation.MainNavigationScreen
 import org.smartregister.fhircore.quest.navigation.NavigationArg
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireNewActivity
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
 import org.smartregister.fhircore.quest.ui.report.measure.worker.MeasureReportMonthPeriodWorker
 import org.smartregister.fhircore.quest.ui.shared.QuestionnaireHandler
 import org.smartregister.fhircore.quest.ui.shared.models.QuestionnaireSubmission
@@ -242,7 +242,7 @@ constructor(
           extraIntentBundle =
             bundleOf(
               Pair(
-                QuestionnaireNewActivity.QUESTIONNAIRE_POPULATION_RESOURCES,
+                QuestionnaireActivity.QUESTIONNAIRE_POPULATION_RESOURCES,
                 arrayListOf(location),
               ),
             ),
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
index 1c616d5eba..2996ae9e08 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
@@ -20,579 +20,275 @@ import android.app.Activity
 import android.app.AlertDialog
 import android.content.Intent
 import android.os.Bundle
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
+import android.os.Parcelable
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
-import androidx.annotation.VisibleForTesting
 import androidx.core.os.bundleOf
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.whenStarted
-import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.datacapture.QuestionnaireFragment
-import com.google.android.fhir.datacapture.extensions.flattened
-import com.google.android.fhir.datacapture.validation.NotValidated
-import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValidator
-import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.logicalId
 import dagger.hilt.android.AndroidEntryPoint
 import java.io.Serializable
-import java.util.Date
-import java.util.UUID
-import javax.inject.Inject
+import java.util.LinkedList
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.hl7.fhir.r4.model.IdType
 import org.hl7.fhir.r4.model.Questionnaire
-import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemAnswerOptionComponent
-import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemInitialComponent
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
-import org.hl7.fhir.r4.model.StringType
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.domain.model.ActionParameterType
-import org.smartregister.fhircore.engine.domain.model.QuestionnaireType
 import org.smartregister.fhircore.engine.ui.base.AlertDialogue
-import org.smartregister.fhircore.engine.ui.base.AlertDialogue.showCancelAlert
-import org.smartregister.fhircore.engine.ui.base.AlertDialogue.showConfirmAlert
-import org.smartregister.fhircore.engine.ui.base.AlertDialogue.showProgressAlert
-import org.smartregister.fhircore.engine.ui.base.AlertIntent
 import org.smartregister.fhircore.engine.ui.base.BaseMultiLanguageActivity
-import org.smartregister.fhircore.engine.util.DispatcherProvider
-import org.smartregister.fhircore.engine.util.callSuspendFunctionOnField
-import org.smartregister.fhircore.engine.util.extension.FieldType
 import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
-import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
-import org.smartregister.fhircore.engine.util.extension.find
-import org.smartregister.fhircore.engine.util.extension.generateMissingItems
-import org.smartregister.fhircore.engine.util.extension.initialExpression
+import org.smartregister.fhircore.engine.util.extension.parcelable
+import org.smartregister.fhircore.engine.util.extension.parcelableArrayList
 import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.quest.R
+import org.smartregister.fhircore.quest.databinding.QuestionnaireActivityBinding
 import timber.log.Timber
 
-/**
- * Launches Questionnaire/ Implement a subclass of this [QuestionnaireActivity] to provide
- * functionality on how to [handleQuestionnaireResponse]
- */
 @AndroidEntryPoint
-open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickListener {
-
-  @Inject lateinit var dispatcherProvider: DispatcherProvider
+class QuestionnaireActivity : BaseMultiLanguageActivity() {
 
-  @Inject lateinit var parser: IParser
-  open val questionnaireViewModel: QuestionnaireViewModel by viewModels()
-  private lateinit var questionnaire: Questionnaire
-  internal lateinit var fragment: QuestionnaireFragment
-  private lateinit var saveProcessingAlertDialog: AlertDialog
+  val viewModel by viewModels<QuestionnaireViewModel>()
   private lateinit var questionnaireConfig: QuestionnaireConfig
-  private lateinit var actionParams: List<ActionParameter>
-  private lateinit var prePopulationParams: List<ActionParameter>
-  private var questionnaireResponse: QuestionnaireResponse = QuestionnaireResponse()
-  private var baseResourceId: String? = null
-  private var baseResourceType: ResourceType? = null
-
-  override fun onSaveInstanceState(outState: Bundle) {
-    super.onSaveInstanceState(outState)
-    outState.clear()
-  }
+  private lateinit var actionParameters: ArrayList<ActionParameter>
+  private lateinit var viewBinding: QuestionnaireActivityBinding
+  private var questionnaire: Questionnaire? = null
+  private var alertDialog: AlertDialog? = null
 
-  @Suppress("UNCHECKED_CAST")
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    setContentView(R.layout.activity_questionnaire)
-
-    questionnaireConfig = (intent.getSerializableExtra(QUESTIONNAIRE_CONFIG) as QuestionnaireConfig)
+    setTheme(R.style.AppTheme_Questionnaire)
+    viewBinding = QuestionnaireActivityBinding.inflate(layoutInflater)
+    setContentView(viewBinding.root)
+    with(intent) {
+      parcelable<QuestionnaireConfig>(QUESTIONNAIRE_CONFIG)?.also { questionnaireConfig = it }
+      actionParameters = parcelableArrayList(QUESTIONNAIRE_ACTION_PARAMETERS) ?: arrayListOf()
+    }
 
-    actionParams =
-      intent.getSerializableExtra(QUESTIONNAIRE_ACTION_PARAMETERS) as List<ActionParameter>?
-        ?: emptyList()
+    if (!::questionnaireConfig.isInitialized) {
+      showToast(getString(R.string.missing_questionnaire_config))
+      finish()
+    }
 
-    // Compute questionnaire config rules and interpolate the extra questionnaire params
-    val questionnaireComputedValues =
-      questionnaireConfig.configRules?.let {
-        questionnaireViewModel.computeQuestionnaireConfigRules(it)
-      }
-        ?: emptyMap()
-
-    val extraQuestionnaireParams =
-      questionnaireConfig.extraParams?.map { it.interpolate(questionnaireComputedValues) }
-        ?: emptyList()
-
-    prePopulationParams =
-      actionParams
-        .filter {
-          (it.paramType == ActionParameterType.PREPOPULATE ||
-            it.paramType == ActionParameterType.UPDATE_DATE_ON_EDIT) &&
-            it.value.isNotEmpty() &&
-            !it.value.contains(STRING_INTERPOLATION_PREFIX)
+    viewModel.questionnaireProgressStateLiveData.observe(this) { progressState ->
+      alertDialog =
+        if (progressState?.active == false) {
+          alertDialog?.dismiss()
+          null
+        } else {
+          when (progressState) {
+            is QuestionnaireProgressState.ExtractionInProgress ->
+              AlertDialogue.showProgressAlert(this, R.string.extraction_in_progress)
+            is QuestionnaireProgressState.QuestionnaireLaunch ->
+              AlertDialogue.showProgressAlert(this, R.string.loading_questionnaire)
+            null -> null
+          }
         }
-        .plus(extraQuestionnaireParams)
-
-    baseResourceId = intent.getStringExtra(BASE_RESOURCE_ID)
-    val strBaseResourceType = intent.getStringExtra(BASE_RESOURCE_TYPE)
-    if (!strBaseResourceType.isNullOrEmpty()) {
-      baseResourceType = ResourceType.fromCode(strBaseResourceType)
     }
 
-    val questionnaireActivity = this@QuestionnaireActivity
-    questionnaireViewModel.removeOperation.observe(questionnaireActivity) {
-      if (it) {
-        setResult(
-          Activity.RESULT_OK,
-          Intent().apply { putExtra(QUESTIONNAIRE_CONFIG, questionnaireConfig as Serializable) },
-        )
-        finish()
-      }
-    }
+    if (savedInstanceState == null) renderQuestionnaire()
 
-    val loadProgress = showProgressAlert(questionnaireActivity, R.string.loading)
+    this.onBackPressedDispatcher.addCallback(
+      this,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          handleBackPress()
+        }
+      },
+    )
+  }
+
+  override fun onSaveInstanceState(outState: Bundle) {
+    super.onSaveInstanceState(outState)
+    outState.clear()
+  }
 
+  private fun renderQuestionnaire() {
     lifecycleScope.launch {
-      val questionnaire =
-        questionnaireViewModel.loadQuestionnaire(
-          questionnaireConfig = questionnaireConfig,
-          prePopulationParams = prePopulationParams,
-        )
-      if (questionnaire == null) {
-        showToast(getString(R.string.questionnaire_not_found))
-        finish()
-      } else {
-        this@QuestionnaireActivity.questionnaire =
-          questionnaire.apply {
-            if (questionnaireConfig.resourceIdentifier != null) {
-              setBarcode(questionnaire, questionnaireConfig.resourceIdentifier!!)
-            }
-          }
+      if (supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) == null) {
+        viewModel.setProgressState(QuestionnaireProgressState.QuestionnaireLaunch(true))
+        viewBinding.questionnaireToolbar.apply {
+          title = questionnaireConfig.title
+          setNavigationIcon(R.drawable.ic_arrow_back)
+          setNavigationOnClickListener { handleBackPress() }
+        }
+        questionnaire = viewModel.retrieveQuestionnaire(questionnaireConfig, actionParameters)
 
-        questionnaireResponse =
-          questionnaireViewModel
-            .getQuestionnaireResponseFromDbOrPopulation(
-              questionnaire = questionnaire,
-              subjectId = baseResourceId?.extractLogicalIdUuid(),
-              subjectType = baseResourceType,
-              questionnaireConfig = questionnaireConfig,
-              resourceMap = getResourcesFromParamsForQR(),
-            )
-            .apply { generateMissingItems(questionnaire) }
+        if (questionnaire == null) {
+          showToast(getString(R.string.questionnaire_not_found))
+          finish()
+        }
 
-        val questionnaireResponseValid =
-          questionnaireViewModel.isQuestionnaireResponseValid(
-            questionnaire = questionnaire,
-            questionnaireResponse = questionnaireResponse,
-            context = questionnaireActivity,
+        if (questionnaire?.subjectType.isNullOrEmpty()) {
+          showToast(getString(R.string.missing_subject_type))
+          Timber.e(
+            "Missing subject type on questionnaire. Provide Questionnaire.subjectType to resolve.",
           )
-        if (!questionnaireResponseValid) {
-          showToast(getString(R.string.questionnaire_response_invalid))
           finish()
         }
 
-        // Only add the fragment once, when the activity is first created.
-        if (savedInstanceState == null) renderFragment()
+        val questionnaireFragmentBuilder = buildQuestionnaireFragment(questionnaire!!)
 
-        withContext(dispatcherProvider.main()) {
-          updateViews()
-          fragment.whenStarted { loadProgress.dismiss() }
+        supportFragmentManager.commit {
+          setReorderingAllowed(true)
+          add(R.id.container, questionnaireFragmentBuilder.build(), QUESTIONNAIRE_FRAGMENT_TAG)
         }
+
+        registerFragmentResultListener()
+
+        viewModel.setProgressState(QuestionnaireProgressState.QuestionnaireLaunch(false))
       }
     }
   }
 
-  @VisibleForTesting
-  internal fun getResourcesFromParamsForQR(): Map<ResourceType?, String> =
-    actionParams
-      .filter { it.paramType == ActionParameterType.QUESTIONNAIRE_RESPONSE_POPULATION_RESOURCE }
-      .associate { it.resourceType to it.value }
+  private suspend fun buildQuestionnaireFragment(
+    questionnaire: Questionnaire,
+  ): QuestionnaireFragment.Builder {
+    val questionnaireFragmentBuilder =
+      QuestionnaireFragment.builder().setQuestionnaire(questionnaire.json())
+
+    val questionnaireSubjectType = questionnaire.subjectType.firstOrNull()?.code
+    val resourceType =
+      questionnaireConfig.resourceType ?: questionnaireSubjectType?.let { ResourceType.valueOf(it) }
+    val resourceIdentifier = questionnaireConfig.resourceIdentifier
+
+    if (resourceType != null && !resourceIdentifier.isNullOrEmpty()) {
+      // Add subject and other configured resource to launchContext
+      val launchContextResources =
+        LinkedList<Resource>().apply {
+          viewModel.loadResource(resourceType, resourceIdentifier)?.let { add(it) }
+          addAll(
+            // Exclude the subject resource its already added
+            viewModel.retrievePopulationResources(
+              actionParameters.filterNot {
+                it.paramType == ActionParameterType.QUESTIONNAIRE_RESPONSE_POPULATION_RESOURCE &&
+                  resourceType == it.resourceType &&
+                  resourceIdentifier.equals(it.value, ignoreCase = true)
+              },
+            ),
+          )
+        }
 
-  fun updateViews() {
-    findViewById<Button>(R.id.btn_edit_qr).apply {
-      visibility = if (questionnaireConfig.type.isReadOnly()) View.VISIBLE else View.GONE
-      setOnClickListener(this@QuestionnaireActivity)
-    }
+      if (launchContextResources.isNotEmpty()) {
+        questionnaireFragmentBuilder.setQuestionnaireLaunchContexts(
+          launchContextResources.map { it.json() },
+        )
+      }
 
-    findViewById<Button>(R.id.submit_questionnaire)?.apply {
-      layoutParams.width =
-        ViewGroup.LayoutParams
-          .MATCH_PARENT // Override by Styles xml does not seem to work for this layout param
+      // Populate questionnaire with latest QuestionnaireResponse
+      if (questionnaireConfig.type.isEditable()) {
+        val latestQuestionnaireResponse =
+          viewModel.searchLatestQuestionnaireResponse(
+            resourceId = resourceIdentifier,
+            resourceType = resourceType,
+            questionnaireId = questionnaire.logicalId,
+          )
 
-      if (questionnaireConfig.type.isReadOnly() || questionnaire.experimental) {
-        text = context.getString(R.string.done)
-      } else if (questionnaireConfig.type.isEditable()) {
-        // setting the save button text from Questionnaire Config
-        text = questionnaireConfig.saveButtonText ?: getString(R.string.str_save)
-      }
-    }
+        val questionnaireResponse =
+          QuestionnaireResponse().apply { item = latestQuestionnaireResponse?.item }
 
-    supportActionBar?.apply {
-      setDisplayHomeAsUpEnabled(true)
-      title =
-        if (questionnaireConfig.type.isEditable()) {
-          "${getString(R.string.edit)} ${questionnaireConfig.title}"
+        if (viewModel.validateQuestionnaireResponse(questionnaire, questionnaireResponse, this)) {
+          questionnaireFragmentBuilder.setQuestionnaireResponse(questionnaireResponse.json())
         } else {
-          questionnaireConfig.title
+          showToast(getString(R.string.error_populating_questionnaire))
         }
+      }
     }
+    return questionnaireFragmentBuilder
   }
 
-  private suspend fun renderFragment() {
-    fragment =
-      fragmentBuilder(
-          Questionnaire().apply { this.extension = questionnaire.extension },
-          QuestionnaireResponse(),
-        )
-        .build()
-    fragment.lifecycleScope.launchWhenCreated {
-      setInitialExpression(questionnaire)
-
-      fragment = fragmentBuilder(questionnaire, questionnaireResponse).build()
-      supportFragmentManager
-        .beginTransaction()
-        .replace(R.id.container, fragment, QUESTIONNAIRE_FRAGMENT_TAG)
-        .commit()
-    }
-    supportFragmentManager.commit { add(R.id.container, fragment, QUESTIONNAIRE_FRAGMENT_TAG) }
+  private fun Resource.json(): String = this.encodeResourceToString()
+
+  private fun registerFragmentResultListener() {
     supportFragmentManager.setFragmentResultListener(
       QuestionnaireFragment.SUBMIT_REQUEST_KEY,
       this,
     ) { _, _ ->
-      if (
-        this.getQuestionnaireConfig().type.isReadOnly() ||
-          this.getQuestionnaireObject().experimental
-      ) { // Experimental questionnaires should not be submitted
-        this.finish()
-      } else {
-        this.handleQuestionnaireSubmit()
-      }
-    }
-  }
+      val questionnaireResponse = retrieveQuestionnaireResponse()
 
-  private suspend fun fragmentBuilder(
-    questionnaire: Questionnaire,
-    questionnaireResponse: QuestionnaireResponse,
-  ) =
-    QuestionnaireFragment.builder().apply {
-      setQuestionnaire(questionnaire.encodeResourceToString())
-      if (!questionnaireConfig.type.isDefault()) {
-        setQuestionnaireResponse(questionnaireResponse.encodeResourceToString())
+      // Close questionnaire if opened in read only mode or if experimental
+      if (questionnaireConfig.type.isReadOnly() || questionnaire?.experimental == true) {
+        finish()
       }
-      questionnaireConfig.resourceIdentifier
-        ?.takeIf { it.isNotBlank() }
-        ?.let {
-          val resourceId = IdType(it)
-          val resourceType =
-            resourceId.resourceType?.let { resourceType -> ResourceType.fromCode(resourceType) }
-              ?: questionnaireConfig.resourceType ?: ResourceType.Patient
-
-          setQuestionnaireLaunchContexts(
-            listOf(
-              questionnaireViewModel.defaultRepository
-                .loadResource(resourceId.idPart, resourceType)
-                .encodeResourceToString(),
-            ),
-          )
-        }
-    }
-
-  private fun setBarcode(questionnaire: Questionnaire, code: String) {
-    questionnaire.find(QUESTIONNAIRE_ARG_BARCODE)?.apply {
-      initial = mutableListOf(QuestionnaireItemInitialComponent().setValue(StringType(code)))
-      readOnly = true
-    }
-  }
-
-  suspend fun setInitialExpression(questionnaire: Questionnaire) {
-    // TODO handle hierarchy and scope for variable items
-    // TODO add functionality to SDK instead
-    questionnaire.item.flattened().forEach { item ->
-      item.initialExpression
-        ?.takeIf { it.language == "application/x-fhir-query" }
-        ?.let { expression ->
-          val answerOptions: List<QuestionnaireItemAnswerOptionComponent> =
-            QuestionnaireFragment::class.callSuspendFunctionOnField(
-              fragment,
-              "viewModel",
-              "loadAnswerExpressionOptions",
-              item,
-              expression,
-            ) as List<QuestionnaireItemAnswerOptionComponent>
-          answerOptions
-        }
-        ?.let {
-          it.let {
-            item.initial =
-              it.map {
-                QuestionnaireItemInitialComponent().apply { value = it.castToType(it.value) }
-              }
-          }
-        }
-    }
-  }
-
-  override fun onClick(view: View) {
-    if (view.id == R.id.btn_edit_qr) {
-      questionnaireConfig = questionnaireConfig.copy(type = QuestionnaireType.EDIT)
-      val loadProgress = showProgressAlert(this, R.string.loading)
-      lifecycleScope.launch {
-        // Reload the questionnaire and reopen the fragment
-        questionnaire =
-          questionnaireViewModel.loadQuestionnaire(
+      if (questionnaireResponse != null && questionnaire != null) {
+        viewModel.run {
+          setProgressState(QuestionnaireProgressState.ExtractionInProgress(true))
+          handleQuestionnaireSubmission(
+            questionnaire = questionnaire!!,
+            currentQuestionnaireResponse = questionnaireResponse,
             questionnaireConfig = questionnaireConfig,
-            prePopulationParams = prePopulationParams,
-            readOnlyLinkIds = questionnaireConfig.readOnlyLinkIds,
-          )!!
-        supportFragmentManager.commit { detach(fragment) }
-        renderFragment()
-        withContext(dispatcherProvider.main()) {
-          updateViews()
-          loadProgress.dismiss()
+            actionParameters = actionParameters,
+            context = this@QuestionnaireActivity,
+          ) { idTypes, questionnaireResponse ->
+            // Dismiss progress indicator dialog, submit result then finish activity
+            setProgressState(QuestionnaireProgressState.ExtractionInProgress(false))
+            setResult(
+              Activity.RESULT_OK,
+              Intent().apply {
+                putExtra(QUESTIONNAIRE_RESPONSE, questionnaireResponse as Serializable)
+                putExtra(QUESTIONNAIRE_SUBMISSION_EXTRACTED_RESOURCE_IDS, idTypes as Serializable)
+                putExtra(QUESTIONNAIRE_CONFIG, questionnaireConfig as Parcelable)
+              },
+            )
+            finish()
+          }
         }
       }
-    } else {
-      showToast(getString(R.string.error_saving_form))
-    }
-  }
-
-  fun getQuestionnaireResponse(): QuestionnaireResponse {
-    val questionnaireFragment =
-      supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) as QuestionnaireFragment
-    return questionnaireFragment.getQuestionnaireResponse().apply {
-      // TODO this is required until require condition in [QuestionnaireResponseValidator] is fixed
-      this@QuestionnaireActivity.questionnaire.let { it.url = "${it.resourceType}/${it.logicalId}" }
-
-      if (this.logicalId.isEmpty()) {
-        this.id = UUID.randomUUID().toString()
-        this.authored = Date()
-      }
-
-      this@QuestionnaireActivity.questionnaire.useContext
-        .asSequence()
-        .filter { it.hasValueCodeableConcept() }
-        .forEach { it.valueCodeableConcept.coding.forEach { coding -> this.meta.addTag(coding) } }
-
-      this.questionnaire =
-        this@QuestionnaireActivity.questionnaire.let { "${it.resourceType}/${it.logicalId}" }
-      // important to set response subject so that structure map can handle subject for all entities
-      questionnaireViewModel.handleQuestionnaireResponseSubject(
-        questionnaireConfig.resourceIdentifier,
-        this@QuestionnaireActivity.questionnaire,
-        this,
-      )
-    }
-  }
-
-  fun dismissSaveProcessing() {
-    if (::saveProcessingAlertDialog.isInitialized && saveProcessingAlertDialog.isShowing) {
-      saveProcessingAlertDialog.dismiss()
-    }
-  }
-
-  open fun handleSaveDraftQuestionnaire() {
-    saveProcessingAlertDialog = showProgressAlert(this, R.string.form_progress_message)
-    val questionnaireResponse = getQuestionnaireResponse()
-    if (questionnaireViewModel.partialQuestionnaireResponseHasValues(questionnaireResponse)) {
-      handlePartialQuestionnaireResponse(questionnaireResponse)
-    }
-    finish()
-  }
-
-  open fun handleQuestionnaireSubmit() {
-    saveProcessingAlertDialog = showProgressAlert(this, R.string.form_progress_message)
-
-    val questionnaireResponse = getQuestionnaireResponse()
-    if (!validQuestionnaireResponse(questionnaireResponse)) {
-      saveProcessingAlertDialog.dismiss()
-
-      AlertDialogue.showErrorAlert(
-        this,
-        R.string.questionnaire_alert_invalid_message,
-        R.string.questionnaire_alert_invalid_title,
-      )
-      return
-    }
-
-    handleQuestionnaireResponse(questionnaireResponse)
-
-    questionnaireViewModel.extractionProgress.observe(this) { result ->
-      onPostSave(result, questionnaireResponse)
-    }
-  }
-
-  fun onPostSave(result: Boolean, questionnaireResponse: QuestionnaireResponse) {
-    dismissSaveProcessing()
-    if (result) {
-      postSaveSuccessful(questionnaireResponse)
-    } else {
-      Timber.e("An error occurred during extraction")
     }
   }
 
-  open fun postSaveSuccessful(questionnaireResponse: QuestionnaireResponse) {
-    val message = questionnaireViewModel.extractionProgressMessage.value
-    if (message?.isNotEmpty() == true) {
-      AlertDialogue.showInfoAlert(
-        this,
-        message,
-        getString(R.string.done),
-        {
-          it.dismiss()
-          finishActivity(questionnaireResponse)
+  private fun handleBackPress() {
+    if (questionnaireConfig.type.isReadOnly()) {
+      finish()
+    } else if (questionnaireConfig.saveDraft) {
+      AlertDialogue.showCancelAlert(
+        context = this,
+        message = R.string.questionnaire_in_progress_alert_back_pressed_message,
+        title = R.string.questionnaire_alert_back_pressed_title,
+        confirmButtonListener = {
+          retrieveQuestionnaireResponse()?.let { questionnaireResponse ->
+            viewModel.saveDraftQuestionnaire(questionnaireResponse)
+          }
         },
+        confirmButtonText = R.string.questionnaire_alert_back_pressed_save_draft_button_title,
+        neutralButtonListener = { finish() },
+        neutralButtonText = R.string.questionnaire_alert_back_pressed_button_title,
       )
     } else {
-      finishActivity(questionnaireResponse)
-    }
-  }
-
-  private fun finishActivity(questionnaireResponse: QuestionnaireResponse) {
-    val parcelResponse = questionnaireResponse.copy()
-    questionnaire
-      .find(FieldType.TYPE, Questionnaire.QuestionnaireItemType.ATTACHMENT.name)
-      .forEach { parcelResponse.find(it.linkId)?.answer?.clear() }
-    setResult(
-      Activity.RESULT_OK,
-      Intent().apply {
-        putExtra(QUESTIONNAIRE_RESPONSE, parcelResponse)
-        putExtra(QUESTIONNAIRE_CONFIG, questionnaireConfig as Serializable)
-      },
-    )
-    finish()
-  }
-
-  fun validQuestionnaireResponse(questionnaireResponse: QuestionnaireResponse) =
-    QuestionnaireResponseValidator.validateQuestionnaireResponse(
-        questionnaire = questionnaire,
-        questionnaireResponse = questionnaireResponse,
+      AlertDialogue.showConfirmAlert(
         context = this,
+        message = R.string.questionnaire_alert_back_pressed_message,
+        title = R.string.questionnaire_alert_back_pressed_title,
+        confirmButtonListener = { finish() },
+        confirmButtonText = R.string.questionnaire_alert_back_pressed_button_title,
       )
-      .values
-      .flatten()
-      .all { it is Valid || it is NotValidated }
-
-  open fun handleQuestionnaireResponse(questionnaireResponse: QuestionnaireResponse) {
-    if (questionnaireConfig.confirmationDialog != null) {
-      dismissSaveProcessing()
-      confirmationDialog(questionnaireResponse)
-    } else {
-      executeExtraction(questionnaireResponse)
     }
   }
 
-  open fun handlePartialQuestionnaireResponse(questionnaireResponse: QuestionnaireResponse) {
-    dismissSaveProcessing()
-    questionnaireViewModel.savePartialQuestionnaireResponse(questionnaire, questionnaireResponse)
-  }
-
-  private fun confirmationDialog(questionnaireResponse: QuestionnaireResponse) {
-    AlertDialogue.showAlert(
-      context = this,
-      alertIntent = AlertIntent.CONFIRM,
-      title = questionnaireConfig.confirmationDialog!!.title,
-      message = questionnaireConfig.confirmationDialog!!.message,
-      confirmButtonListener = { dialog ->
-        executeExtraction(questionnaireResponse)
-        dialog.dismiss()
-      },
-      neutralButtonListener = { dialog -> dialog.dismiss() },
-    )
-  }
-
-  private fun executeExtraction(questionnaireResponse: QuestionnaireResponse) {
-    questionnaireResponse.status = QuestionnaireResponse.QuestionnaireResponseStatus.COMPLETED
-
-    questionnaireViewModel.extractAndSaveResources(
-      context = this,
-      questionnaire = questionnaire,
-      questionnaireResponse = questionnaireResponse,
-      questionnaireConfig = questionnaireConfig,
-    )
-  }
-
-  override fun onOptionsItemSelected(item: MenuItem): Boolean {
-    return when (item.itemId) {
-      android.R.id.home -> {
-        onBackPressed()
-        true
-      }
-      else -> super.onOptionsItemSelected(item)
-    }
-  }
-
-  override fun onBackPressed() {
-    if (questionnaireConfig.type.isReadOnly()) {
-      finish()
-    } else if (questionnaireConfig.saveDraft) {
-      showCancelQuestionnaireAlertDialog()
-    } else {
-      showConfirmAlertDialog()
-    }
-  }
-
-  private fun showConfirmAlertDialog() {
-    showConfirmAlert(
-      this,
-      getDismissDialogMessage(),
-      R.string.questionnaire_alert_back_pressed_title,
-      { finish() },
-      R.string.questionnaire_alert_back_pressed_button_title,
-    )
-  }
-
-  private fun showCancelQuestionnaireAlertDialog() {
-    showCancelAlert(
-      this,
-      R.string.questionnaire_in_progress_alert_back_pressed_message,
-      R.string.questionnaire_alert_back_pressed_title,
-      { handleSaveDraftQuestionnaire() },
-      R.string.questionnaire_alert_back_pressed_save_draft_button_title,
-      { finish() },
-      R.string.questionnaire_alert_back_pressed_button_title,
-    )
-  }
-
-  open fun getDismissDialogMessage() = R.string.questionnaire_alert_back_pressed_message
-
-  fun getQuestionnaireObject() = questionnaire
-
-  fun getQuestionnaireConfig() = questionnaireConfig
+  private fun retrieveQuestionnaireResponse(): QuestionnaireResponse? =
+    (supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) as QuestionnaireFragment?)
+      ?.getQuestionnaireResponse()
 
   companion object {
-    const val QUESTIONNAIRE_POPULATION_RESOURCES = "questionnaire-population-resources"
-    const val QUESTIONNAIRE_FRAGMENT_TAG = "questionnaire-fragment-tag"
-    const val QUESTIONNAIRE_RESPONSE = "questionnaire-response"
-    const val QUESTIONNAIRE_ARG_BARCODE = "patient-barcode"
-    const val QUESTIONNAIRE_AGE = "PR-age"
-    const val QUESTIONNAIRE_CONFIG = "questionnaire-config"
-    const val BASE_RESOURCE_ID = "base-resource-id"
-    const val BASE_RESOURCE_TYPE = "base-resource-type"
-    const val QUESTIONNAIRE_ACTION_PARAMETERS = "action-parameters"
-    const val STRING_INTERPOLATION_PREFIX = "@{"
-
-    fun Intent.questionnaireResponse() = this.getStringExtra(QUESTIONNAIRE_RESPONSE)
+
+    const val QUESTIONNAIRE_FRAGMENT_TAG = "questionnaireFragment"
+    const val QUESTIONNAIRE_CONFIG = "questionnaireConfig"
+    const val QUESTIONNAIRE_SUBMISSION_EXTRACTED_RESOURCE_IDS = "questionnaireExtractedResourceIds"
+    const val QUESTIONNAIRE_RESPONSE = "questionnaireResponse"
+    const val QUESTIONNAIRE_ACTION_PARAMETERS = "questionnaireActionParameters"
+    const val QUESTIONNAIRE_POPULATION_RESOURCES = "questionnairePopulationResources"
 
     fun intentArgs(
-      populationResources: ArrayList<Resource> = ArrayList(),
-      questionnaireConfig: QuestionnaireConfig? = null,
-      actionParams: List<ActionParameter> = emptyList(),
-      baseResourceId: String? = null,
-      baseResourceType: String? = null,
-    ) =
+      questionnaireConfig: QuestionnaireConfig,
+      actionParams: List<ActionParameter>,
+    ): Bundle =
       bundleOf(
-          Pair(QUESTIONNAIRE_CONFIG, questionnaireConfig),
-          Pair(QUESTIONNAIRE_ACTION_PARAMETERS, actionParams),
-          Pair(BASE_RESOURCE_ID, baseResourceId),
-          Pair(BASE_RESOURCE_TYPE, baseResourceType),
-        )
-        .apply {
-          val resourcesList = populationResources.map { it.encodeResourceToString() }
-          if (resourcesList.isNotEmpty()) {
-            putStringArrayList(
-              QUESTIONNAIRE_POPULATION_RESOURCES,
-              resourcesList.toCollection(ArrayList()),
-            )
-          }
-        }
+        Pair(QUESTIONNAIRE_CONFIG, questionnaireConfig),
+        Pair(QUESTIONNAIRE_ACTION_PARAMETERS, actionParams),
+      )
   }
 }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
deleted file mode 100644
index e002b1cb3b..0000000000
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewActivity.kt
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright 2021-2023 Ona Systems, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.smartregister.fhircore.quest.ui.questionnaire
-
-import android.app.Activity
-import android.app.AlertDialog
-import android.content.Intent
-import android.os.Bundle
-import android.os.Parcelable
-import androidx.activity.OnBackPressedCallback
-import androidx.activity.viewModels
-import androidx.core.os.bundleOf
-import androidx.fragment.app.commit
-import androidx.lifecycle.lifecycleScope
-import com.google.android.fhir.datacapture.QuestionnaireFragment
-import com.google.android.fhir.logicalId
-import dagger.hilt.android.AndroidEntryPoint
-import java.io.Serializable
-import java.util.LinkedList
-import kotlinx.coroutines.launch
-import org.hl7.fhir.r4.model.Questionnaire
-import org.hl7.fhir.r4.model.QuestionnaireResponse
-import org.hl7.fhir.r4.model.Resource
-import org.hl7.fhir.r4.model.ResourceType
-import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
-import org.smartregister.fhircore.engine.domain.model.ActionParameter
-import org.smartregister.fhircore.engine.domain.model.ActionParameterType
-import org.smartregister.fhircore.engine.ui.base.AlertDialogue
-import org.smartregister.fhircore.engine.ui.base.BaseMultiLanguageActivity
-import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
-import org.smartregister.fhircore.engine.util.extension.parcelable
-import org.smartregister.fhircore.engine.util.extension.parcelableArrayList
-import org.smartregister.fhircore.engine.util.extension.showToast
-import org.smartregister.fhircore.quest.R
-import org.smartregister.fhircore.quest.databinding.QuestionnaireActivityBinding
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity.Companion.QUESTIONNAIRE_FRAGMENT_TAG
-import timber.log.Timber
-
-@AndroidEntryPoint
-class QuestionnaireNewActivity : BaseMultiLanguageActivity() {
-
-  val viewModel by viewModels<QuestionnaireNewViewModel>()
-  private lateinit var questionnaireConfig: QuestionnaireConfig
-  private lateinit var actionParameters: ArrayList<ActionParameter>
-  private lateinit var viewBinding: QuestionnaireActivityBinding
-  private var questionnaire: Questionnaire? = null
-  private var alertDialog: AlertDialog? = null
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setTheme(R.style.AppTheme_Questionnaire)
-    viewBinding = QuestionnaireActivityBinding.inflate(layoutInflater)
-    setContentView(viewBinding.root)
-    with(intent) {
-      parcelable<QuestionnaireConfig>(QUESTIONNAIRE_CONFIG)?.also { questionnaireConfig = it }
-      actionParameters = parcelableArrayList(QUESTIONNAIRE_ACTION_PARAMETERS) ?: arrayListOf()
-    }
-
-    if (!::questionnaireConfig.isInitialized) {
-      showToast(getString(R.string.missing_questionnaire_config))
-      finish()
-    }
-
-    viewModel.questionnaireProgressStateLiveData.observe(this) { progressState ->
-      alertDialog =
-        if (progressState?.active == false) {
-          alertDialog?.dismiss()
-          null
-        } else {
-          when (progressState) {
-            is QuestionnaireProgressState.ExtractionInProgress ->
-              AlertDialogue.showProgressAlert(this, R.string.extraction_in_progress)
-            is QuestionnaireProgressState.QuestionnaireLaunch ->
-              AlertDialogue.showProgressAlert(this, R.string.loading_questionnaire)
-            null -> null
-          }
-        }
-    }
-
-    if (savedInstanceState == null) renderQuestionnaire()
-
-    this.onBackPressedDispatcher.addCallback(
-      this,
-      object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-          handleBackPress()
-        }
-      },
-    )
-  }
-
-  override fun onSaveInstanceState(outState: Bundle) {
-    super.onSaveInstanceState(outState)
-    outState.clear()
-  }
-
-  private fun renderQuestionnaire() {
-    lifecycleScope.launch {
-      if (supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) == null) {
-        viewModel.setProgressState(QuestionnaireProgressState.QuestionnaireLaunch(true))
-        viewBinding.questionnaireToolbar.apply {
-          title = questionnaireConfig.title
-          setNavigationIcon(R.drawable.ic_arrow_back)
-          setNavigationOnClickListener { handleBackPress() }
-        }
-        questionnaire = viewModel.retrieveQuestionnaire(questionnaireConfig, actionParameters)
-
-        if (questionnaire == null) {
-          showToast(getString(R.string.questionnaire_not_found))
-          finish()
-        }
-
-        if (questionnaire?.subjectType.isNullOrEmpty()) {
-          showToast(getString(R.string.missing_subject_type))
-          Timber.e(
-            "Missing subject type on questionnaire. Provide Questionnaire.subjectType to resolve.",
-          )
-          finish()
-        }
-
-        val questionnaireFragmentBuilder = buildQuestionnaireFragment(questionnaire!!)
-
-        supportFragmentManager.commit {
-          setReorderingAllowed(true)
-          add(R.id.container, questionnaireFragmentBuilder.build(), QUESTIONNAIRE_FRAGMENT_TAG)
-        }
-
-        registerFragmentResultListener()
-
-        viewModel.setProgressState(QuestionnaireProgressState.QuestionnaireLaunch(false))
-      }
-    }
-  }
-
-  private suspend fun buildQuestionnaireFragment(
-    questionnaire: Questionnaire,
-  ): QuestionnaireFragment.Builder {
-    val questionnaireFragmentBuilder =
-      QuestionnaireFragment.builder().setQuestionnaire(questionnaire.json())
-
-    val questionnaireSubjectType = questionnaire.subjectType.firstOrNull()?.code
-    val resourceType =
-      questionnaireConfig.resourceType ?: questionnaireSubjectType?.let { ResourceType.valueOf(it) }
-    val resourceIdentifier = questionnaireConfig.resourceIdentifier
-
-    if (resourceType != null && !resourceIdentifier.isNullOrEmpty()) {
-      // Add subject and other configured resource to launchContext
-      val launchContextResources =
-        LinkedList<Resource>().apply {
-          viewModel.loadResource(resourceType, resourceIdentifier)?.let { add(it) }
-          addAll(
-            // Exclude the subject resource its already added
-            viewModel.retrievePopulationResources(
-              actionParameters.filterNot {
-                it.paramType == ActionParameterType.QUESTIONNAIRE_RESPONSE_POPULATION_RESOURCE &&
-                  resourceType == it.resourceType &&
-                  resourceIdentifier.equals(it.value, ignoreCase = true)
-              },
-            ),
-          )
-        }
-
-      if (launchContextResources.isNotEmpty()) {
-        questionnaireFragmentBuilder.setQuestionnaireLaunchContexts(
-          launchContextResources.map { it.json() },
-        )
-      }
-
-      // Populate questionnaire with latest QuestionnaireResponse
-      if (questionnaireConfig.type.isEditable()) {
-        val latestQuestionnaireResponse =
-          viewModel.searchLatestQuestionnaireResponse(
-            resourceId = resourceIdentifier,
-            resourceType = resourceType,
-            questionnaireId = questionnaire.logicalId,
-          )
-
-        val questionnaireResponse =
-          QuestionnaireResponse().apply { item = latestQuestionnaireResponse?.item }
-
-        if (viewModel.validateQuestionnaireResponse(questionnaire, questionnaireResponse, this)) {
-          questionnaireFragmentBuilder.setQuestionnaireResponse(questionnaireResponse.json())
-        } else {
-          showToast(getString(R.string.error_populating_questionnaire))
-        }
-      }
-    }
-    return questionnaireFragmentBuilder
-  }
-
-  private fun Resource.json(): String = this.encodeResourceToString()
-
-  private fun registerFragmentResultListener() {
-    supportFragmentManager.setFragmentResultListener(
-      QuestionnaireFragment.SUBMIT_REQUEST_KEY,
-      this,
-    ) { _, _ ->
-      val questionnaireResponse = retrieveQuestionnaireResponse()
-
-      // Close questionnaire if opened in read only mode or if experimental
-      if (questionnaireConfig.type.isReadOnly() || questionnaire?.experimental == true) {
-        finish()
-      }
-      if (questionnaireResponse != null && questionnaire != null) {
-        viewModel.run {
-          setProgressState(QuestionnaireProgressState.ExtractionInProgress(true))
-          handleQuestionnaireSubmission(
-            questionnaire = questionnaire!!,
-            currentQuestionnaireResponse = questionnaireResponse,
-            questionnaireConfig = questionnaireConfig,
-            actionParameters = actionParameters,
-            context = this@QuestionnaireNewActivity,
-          ) { idTypes, questionnaireResponse ->
-            // Dismiss progress indicator dialog, submit result then finish activity
-            setProgressState(QuestionnaireProgressState.ExtractionInProgress(false))
-            setResult(
-              Activity.RESULT_OK,
-              Intent().apply {
-                putExtra(QUESTIONNAIRE_RESPONSE, questionnaireResponse as Serializable)
-                putExtra(QUESTIONNAIRE_SUBMISSION_EXTRACTED_RESOURCE_IDS, idTypes as Serializable)
-                putExtra(QUESTIONNAIRE_CONFIG, questionnaireConfig as Parcelable)
-              },
-            )
-            finish()
-          }
-        }
-      }
-    }
-  }
-
-  private fun handleBackPress() {
-    if (questionnaireConfig.type.isReadOnly()) {
-      finish()
-    } else if (questionnaireConfig.saveDraft) {
-      AlertDialogue.showCancelAlert(
-        context = this,
-        message = R.string.questionnaire_in_progress_alert_back_pressed_message,
-        title = R.string.questionnaire_alert_back_pressed_title,
-        confirmButtonListener = {
-          retrieveQuestionnaireResponse()?.let { questionnaireResponse ->
-            viewModel.saveDraftQuestionnaire(questionnaireResponse)
-          }
-        },
-        confirmButtonText = R.string.questionnaire_alert_back_pressed_save_draft_button_title,
-        neutralButtonListener = { finish() },
-        neutralButtonText = R.string.questionnaire_alert_back_pressed_button_title,
-      )
-    } else {
-      AlertDialogue.showConfirmAlert(
-        context = this,
-        message = R.string.questionnaire_alert_back_pressed_message,
-        title = R.string.questionnaire_alert_back_pressed_title,
-        confirmButtonListener = { finish() },
-        confirmButtonText = R.string.questionnaire_alert_back_pressed_button_title,
-      )
-    }
-  }
-
-  private fun retrieveQuestionnaireResponse(): QuestionnaireResponse? =
-    (supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) as QuestionnaireFragment?)
-      ?.getQuestionnaireResponse()
-
-  companion object {
-
-    const val QUESTIONNAIRE_CONFIG = "questionnaireConfig"
-    const val QUESTIONNAIRE_SUBMISSION_EXTRACTED_RESOURCE_IDS = "questionnaireExtractedResourceIds"
-    const val QUESTIONNAIRE_RESPONSE = "questionnaireResponse"
-    const val QUESTIONNAIRE_ACTION_PARAMETERS = "questionnaireActionParameters"
-    const val QUESTIONNAIRE_POPULATION_RESOURCES = "questionnairePopulationResources"
-
-    fun intentArgs(
-      questionnaireConfig: QuestionnaireConfig,
-      actionParams: List<ActionParameter>,
-    ): Bundle =
-      bundleOf(
-        Pair(QUESTIONNAIRE_CONFIG, questionnaireConfig),
-        Pair(QUESTIONNAIRE_ACTION_PARAMETERS, actionParams),
-      )
-  }
-}
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
deleted file mode 100644
index 784fc871fb..0000000000
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireNewViewModel.kt
+++ /dev/null
@@ -1,633 +0,0 @@
-/*
- * Copyright 2021-2023 Ona Systems, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.smartregister.fhircore.quest.ui.questionnaire
-
-import android.content.Context
-import android.widget.Toast
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.google.android.fhir.datacapture.mapping.ResourceMapper
-import com.google.android.fhir.datacapture.mapping.StructureMapExtractionContext
-import com.google.android.fhir.datacapture.validation.NotValidated
-import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValidator
-import com.google.android.fhir.datacapture.validation.Valid
-import com.google.android.fhir.db.ResourceNotFoundException
-import com.google.android.fhir.logicalId
-import com.google.android.fhir.search.Search
-import dagger.hilt.android.lifecycle.HiltViewModel
-import java.util.Date
-import java.util.UUID
-import javax.inject.Inject
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.launch
-import org.hl7.fhir.r4.context.IWorkerContext
-import org.hl7.fhir.r4.model.Bundle
-import org.hl7.fhir.r4.model.Group
-import org.hl7.fhir.r4.model.IdType
-import org.hl7.fhir.r4.model.ListResource
-import org.hl7.fhir.r4.model.ListResource.ListEntryComponent
-import org.hl7.fhir.r4.model.Patient
-import org.hl7.fhir.r4.model.Questionnaire
-import org.hl7.fhir.r4.model.QuestionnaireResponse
-import org.hl7.fhir.r4.model.Reference
-import org.hl7.fhir.r4.model.Resource
-import org.hl7.fhir.r4.model.ResourceType
-import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
-import org.smartregister.fhircore.engine.cql.LibraryEvaluator
-import org.smartregister.fhircore.engine.data.local.DefaultRepository
-import org.smartregister.fhircore.engine.domain.model.ActionParameter
-import org.smartregister.fhircore.engine.domain.model.ActionParameterType
-import org.smartregister.fhircore.engine.rulesengine.ResourceDataRulesExecutor
-import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
-import org.smartregister.fhircore.engine.util.DispatcherProvider
-import org.smartregister.fhircore.engine.util.SharedPreferenceKey
-import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
-import org.smartregister.fhircore.engine.util.extension.DEFAULT_PLACEHOLDER_PREFIX
-import org.smartregister.fhircore.engine.util.extension.appendOrganizationInfo
-import org.smartregister.fhircore.engine.util.extension.appendPractitionerInfo
-import org.smartregister.fhircore.engine.util.extension.asReference
-import org.smartregister.fhircore.engine.util.extension.cqfLibraryIds
-import org.smartregister.fhircore.engine.util.extension.extractByStructureMap
-import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
-import org.smartregister.fhircore.engine.util.extension.isIn
-import org.smartregister.fhircore.engine.util.extension.prePopulateInitialValues
-import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForReadingOrEditing
-import org.smartregister.fhircore.engine.util.extension.showToast
-import org.smartregister.fhircore.engine.util.extension.updateLastUpdated
-import org.smartregister.fhircore.engine.util.helper.TransformSupportServices
-import org.smartregister.fhircore.quest.R
-import timber.log.Timber
-
-@HiltViewModel
-class QuestionnaireNewViewModel
-@Inject
-constructor(
-  val defaultRepository: DefaultRepository,
-  val dispatcherProvider: DispatcherProvider,
-  val fhirCarePlanGenerator: FhirCarePlanGenerator,
-  val resourceDataRulesExecutor: ResourceDataRulesExecutor,
-  val transformSupportServices: TransformSupportServices,
-  val sharedPreferencesHelper: SharedPreferencesHelper,
-  val libraryEvaluator: LibraryEvaluator,
-) : ViewModel() {
-
-  private val authenticatedOrganizationIds by lazy {
-    sharedPreferencesHelper.read<List<String>>(ResourceType.Organization.name)
-  }
-
-  private val practitionerId: String? by lazy {
-    sharedPreferencesHelper
-      .read(SharedPreferenceKey.PRACTITIONER_ID.name, null)
-      ?.extractLogicalIdUuid()
-  }
-
-  private val _questionnaireProgressStateLiveData = MutableLiveData<QuestionnaireProgressState?>()
-  val questionnaireProgressStateLiveData: LiveData<QuestionnaireProgressState?>
-    get() = _questionnaireProgressStateLiveData
-
-  /**
-   * This function retrieves the [Questionnaire] as configured via the [QuestionnaireConfig]. The
-   * retrieved [Questionnaire] can be pre-populated with computed values from the Rules engine.
-   */
-  suspend fun retrieveQuestionnaire(
-    questionnaireConfig: QuestionnaireConfig,
-    actionParameters: List<ActionParameter>?,
-  ): Questionnaire? {
-    if (questionnaireConfig.id.isEmpty() || questionnaireConfig.id.isBlank()) return null
-
-    // Compute questionnaire config rules and add extra questionnaire params to action parameters
-    val questionnaireComputedValues =
-      questionnaireConfig.configRules?.let {
-        resourceDataRulesExecutor.computeResourceDataRules(it, null)
-      }
-        ?: emptyMap()
-
-    val allActionParameters =
-      actionParameters?.plus(
-        questionnaireConfig.extraParams?.map { it.interpolate(questionnaireComputedValues) }
-          ?: emptyList(),
-      )
-
-    val questionnaire =
-      defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)?.apply {
-        if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditable()) {
-          item.prepareQuestionsForReadingOrEditing(
-            readOnly = questionnaireConfig.type.isReadOnly(),
-            readOnlyLinkIds = questionnaireConfig.readOnlyLinkIds,
-          )
-        }
-
-        // Pre-populate questionnaire items with configured values
-        allActionParameters
-          ?.filter { (it.paramType == ActionParameterType.PREPOPULATE && it.value.isNotEmpty()) }
-          ?.let { actionParam ->
-            item.prePopulateInitialValues(DEFAULT_PLACEHOLDER_PREFIX, actionParam)
-          }
-      }
-    return questionnaire
-  }
-
-  /**
-   * This function performs data extraction against the [QuestionnaireResponse]. All the resources
-   * generated from a successful extraction by StructureMap or definition are stored in the
-   * database. The [QuestionnaireResponse] is also stored in the database regardless of the outcome
-   * of [ResourceMapper.extract]. This function will optionally generate CarePlan using the
-   * PlanDefinition resource configured in [QuestionnaireConfig.planDefinitions]. The
-   * [QuestionnaireConfig.eventWorkflows] contains configurations to cascade update the statuses of
-   * resources to in-active (close) that are related to the current [QuestionnaireResponse.subject]
-   */
-  fun handleQuestionnaireSubmission(
-    questionnaire: Questionnaire,
-    currentQuestionnaireResponse: QuestionnaireResponse,
-    questionnaireConfig: QuestionnaireConfig,
-    actionParameters: List<ActionParameter>,
-    context: Context,
-    onSuccessfulSubmission: (List<IdType>, QuestionnaireResponse) -> Unit,
-  ) {
-    viewModelScope.launch(SupervisorJob()) {
-      val questionnaireResponseValid =
-        validateQuestionnaireResponse(
-          questionnaire = questionnaire,
-          questionnaireResponse = currentQuestionnaireResponse,
-          context = context,
-        )
-
-      if (!questionnaireResponseValid) {
-        Timber.e("Invalid questionnaire response")
-        context.showToast(context.getString(R.string.questionnaire_response_invalid))
-        return@launch
-      }
-
-      currentQuestionnaireResponse.processMetadata(questionnaire)
-
-      val bundle =
-        performExtraction(
-          extractByStructureMap = questionnaire.extractByStructureMap(),
-          questionnaire = questionnaire,
-          questionnaireResponse = currentQuestionnaireResponse,
-          context = context,
-        )
-
-      val extractionDate = Date()
-
-      // Create a ListResource to store the references for generated resources
-      val listResource =
-        ListResource().apply {
-          id = UUID.randomUUID().toString()
-          status = ListResource.ListStatus.CURRENT
-          mode = ListResource.ListMode.WORKING
-          title = CONTAINED_LIST_TITLE
-          date = extractionDate
-        }
-
-      val group =
-        questionnaireConfig.groupResource?.groupIdentifier?.let { groupId ->
-          defaultRepository.loadResource<Group>(groupId)
-        }
-
-      bundle?.entry?.forEach { bundleEntryComponent ->
-        val bundleEntryResource: Resource? = bundleEntryComponent.resource
-        bundleEntryResource?.run {
-          applyResourceMetadata()
-          defaultRepository.addOrUpdate(resource = this)
-
-          // Add resource as member of a (configured) Group
-          group?.let { bundleEntryResource.addMemberToGroup(it) }
-
-          // Track ids for resources in ListResource added to the QuestionnaireResponse.contained
-          val listEntryComponent =
-            ListEntryComponent().apply {
-              deleted = false
-              date = extractionDate
-              item = bundleEntryResource.asReference()
-            }
-          listResource.addEntry(listEntryComponent)
-        }
-      }
-
-      val subject =
-        retrieveSubject(
-            questionnaire = questionnaire,
-            questionnaireConfig = questionnaireConfig,
-            bundle = bundle,
-          )
-          ?.apply { id = "$resourceType/$logicalId" }
-
-      // Update Group resource to save members
-      group?.let { defaultRepository.addOrUpdate(resource = it) }
-
-      // Save questionnaire response
-      if (subject != null) {
-        defaultRepository.addOrUpdate(
-          resource =
-            currentQuestionnaireResponse.apply {
-              setQuestionnaire("${questionnaire.resourceType}/${questionnaire.logicalId}")
-              setSubject(subject.asReference())
-              addContained(listResource)
-            },
-        )
-      }
-
-      // Update _lastUpdated for resources configured via ActionParameterType.UPDATE_DATE_ON_EDIT
-      updateResourcesLastUpdatedProperty(actionParameters)
-
-      if (subject != null && bundle != null) {
-        // Generate CarePlan using configured plan definitions
-        val newBundle = bundle.copyBundle(currentQuestionnaireResponse)
-        generateCarePlan(
-          subject = subject,
-          bundle = newBundle,
-          questionnaireConfig = questionnaireConfig,
-        )
-
-        // Execute CQL
-        executeCql(
-          subject = subject,
-          bundle = newBundle,
-          questionnaire = questionnaire,
-        )
-
-        // Cascade update statuses of resources closed by this Questionnaire submission
-        viewModelScope.launch {
-          fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
-            questionnaireConfig = questionnaireConfig,
-            subject = subject,
-            bundle = bundle,
-          )
-        }
-      }
-
-      softDeleteResources(questionnaireConfig)
-
-      // On successful submission callback
-      val idTypes =
-        bundle?.entry?.map { IdType(it.resource.resourceType.name, it.resource.logicalId) }
-          ?: emptyList()
-      onSuccessfulSubmission(idTypes, currentQuestionnaireResponse)
-    }
-  }
-
-  private fun Bundle.copyBundle(currentQuestionnaireResponse: QuestionnaireResponse): Bundle =
-    this.copy().apply {
-      addEntry(Bundle.BundleEntryComponent().apply { resource = currentQuestionnaireResponse })
-    }
-
-  private fun QuestionnaireResponse.processMetadata(questionnaire: Questionnaire) {
-    status = QuestionnaireResponse.QuestionnaireResponseStatus.COMPLETED
-    authored = Date()
-    questionnaire.useContext
-      .filter { it.hasValueCodeableConcept() }
-      .forEach { it.valueCodeableConcept.coding.forEach { coding -> this.meta.addTag(coding) } }
-    applyResourceMetadata()
-  }
-
-  private fun Resource?.applyResourceMetadata(): Resource? {
-    this?.apply {
-      appendOrganizationInfo(authenticatedOrganizationIds)
-      appendPractitionerInfo(practitionerId)
-      updateLastUpdated()
-    }
-    return this
-  }
-
-  /**
-   * Perform StructureMap or Definition based definition. The result of this function returns a
-   * Bundle that contains the resources that were generated via the [ResourceMapper.extract]
-   * operation otherwise returns null if an exception is encountered.
-   */
-  suspend fun performExtraction(
-    extractByStructureMap: Boolean,
-    questionnaire: Questionnaire,
-    questionnaireResponse: QuestionnaireResponse,
-    context: Context,
-  ): Bundle? =
-    kotlin
-      .runCatching {
-        if (extractByStructureMap) {
-          ResourceMapper.extract(
-            questionnaire = questionnaire,
-            questionnaireResponse = questionnaireResponse,
-            StructureMapExtractionContext(
-              context = context,
-              transformSupportServices = transformSupportServices,
-              structureMapProvider = { structureMapUrl: String?, _: IWorkerContext ->
-                structureMapUrl?.substringAfterLast("/")?.let { defaultRepository.loadResource(it) }
-              },
-            ),
-          )
-        } else {
-          ResourceMapper.extract(
-            questionnaire = questionnaire,
-            questionnaireResponse = questionnaireResponse,
-          )
-        }
-      }
-      .onFailure { exception ->
-        Timber.e(exception)
-        viewModelScope.launch {
-          if (exception is NullPointerException && exception.message!!.contains("StructureMap")) {
-            context.showToast(
-              context.getString(R.string.structure_map_missing_message),
-              Toast.LENGTH_LONG,
-            )
-          } else {
-            context.showToast(
-              context.getString(R.string.structuremap_failed, questionnaire.name),
-              Toast.LENGTH_LONG,
-            )
-          }
-        }
-      }
-      .getOrDefault(null)
-
-  /**
-   * This function saves [QuestionnaireResponse] as draft if any of the [QuestionnaireResponse.item]
-   * has an answer.
-   */
-  fun saveDraftQuestionnaire(questionnaireResponse: QuestionnaireResponse) {
-    val questionnaireHasAnswer =
-      questionnaireResponse.item.any {
-        it.answer.any { answerComponent -> answerComponent.hasValue() }
-      }
-    if (questionnaireHasAnswer) {
-      viewModelScope.launch(dispatcherProvider.io()) {
-        questionnaireResponse.status = QuestionnaireResponse.QuestionnaireResponseStatus.INPROGRESS
-        defaultRepository.addOrUpdate(addMandatoryTags = true, resource = questionnaireResponse)
-      }
-    }
-  }
-
-  /**
-   * This function updates the _lastUpdated property of resources configured by the
-   * [ActionParameter.paramType] of [ActionParameterType.UPDATE_DATE_ON_EDIT]. Each time a
-   * questionnaire is submitted, the affected resources last modified/updated date will also be
-   * updated.
-   */
-  suspend fun updateResourcesLastUpdatedProperty(actionParameters: List<ActionParameter>?) {
-    val updateOnEditParams =
-      actionParameters?.filter {
-        it.paramType == ActionParameterType.UPDATE_DATE_ON_EDIT && it.value.isNotEmpty()
-      }
-
-    updateOnEditParams?.forEach { param ->
-      try {
-        val resource = defaultRepository.loadResource(Reference(param.value))
-        defaultRepository.addOrUpdate(resource = resource)
-      } catch (resourceNotFoundException: ResourceNotFoundException) {
-        Timber.e("Unable to update resource's _lastUpdated", resourceNotFoundException)
-      }
-    }
-  }
-
-  /**
-   * This function validates all [QuestionnaireResponse] and returns true if all the validation
-   * result of [QuestionnaireResponseValidator] are [Valid] or [NotValidated] (validation is
-   * optional on [Questionnaire] fields)
-   */
-  fun validateQuestionnaireResponse(
-    questionnaire: Questionnaire,
-    questionnaireResponse: QuestionnaireResponse,
-    context: Context,
-  ) =
-    QuestionnaireResponseValidator.validateQuestionnaireResponse(
-        questionnaire = questionnaire,
-        questionnaireResponse = questionnaireResponse,
-        context = context,
-      )
-      .values
-      .flatten()
-      .all { it is Valid || it is NotValidated }
-
-  suspend fun executeCql(subject: Resource, bundle: Bundle, questionnaire: Questionnaire) {
-    questionnaire.cqfLibraryIds().forEach {
-      if (subject.resourceType == ResourceType.Patient) {
-        libraryEvaluator.runCqlLibrary(it, subject as Patient, bundle)
-      }
-    }
-  }
-
-  /**
-   * This function generates CarePlans for the [QuestionnaireResponse.subject] using the configured
-   * [QuestionnaireConfig.planDefinitions]
-   */
-  suspend fun generateCarePlan(
-    subject: Resource,
-    bundle: Bundle,
-    questionnaireConfig: QuestionnaireConfig,
-  ) {
-    questionnaireConfig.planDefinitions?.forEach { planId ->
-      kotlin
-        .runCatching {
-          fhirCarePlanGenerator.generateOrUpdateCarePlan(
-            planDefinitionId = planId,
-            subject = subject,
-            data = bundle,
-          )
-        }
-        .onFailure { Timber.e(it) }
-    }
-  }
-
-  /**
-   * This retrieves and returns [Resource] as subject if [QuestionnaireConfig.resourceType] and
-   * [QuestionnaireConfig.resourceIdentifier] are provided. This will be the typical case for
-   * subsequent [Questionnaire] submissions where the [QuestionnaireResponse.subject] already
-   * exists. For instances where the [Questionnaire] is submitted the first time (e.g. during
-   * registration events), the subject [Resource] will be included and accessed from the extracted
-   * resources in the [Bundle.entry]
-   */
-  suspend fun retrieveSubject(
-    questionnaire: Questionnaire,
-    questionnaireConfig: QuestionnaireConfig,
-    bundle: Bundle?,
-  ): Resource? {
-    val questionnaireSubjectType = questionnaire.subjectType.firstOrNull()?.code
-    val resourceType =
-      questionnaireConfig.resourceType ?: questionnaireSubjectType?.let { ResourceType.valueOf(it) }
-    val resourceIdentifier = questionnaireConfig.resourceIdentifier
-
-    if (resourceType != null && !resourceIdentifier.isNullOrEmpty()) {
-      return loadResource(resourceType, resourceIdentifier)
-    }
-    questionnaire.subjectType.forEach {
-      val resourceType = ResourceType.valueOf(it.code)
-      return bundle
-        ?.entry
-        ?.firstOrNull { entryComponent -> entryComponent.resource.resourceType == resourceType }
-        ?.resource
-    }
-    return null
-  }
-
-  /** Adds [Resource] to [Group.member] */
-  fun Resource.addMemberToGroup(group: Group) {
-    this.run {
-      if (
-        this.resourceType.isIn(
-          ResourceType.CareTeam,
-          ResourceType.Device,
-          ResourceType.Group,
-          ResourceType.HealthcareService,
-          ResourceType.Location,
-          ResourceType.Organization,
-          ResourceType.Patient,
-          ResourceType.Practitioner,
-          ResourceType.PractitionerRole,
-          ResourceType.Specimen,
-        )
-      ) {
-        group.addMember(Group.GroupMemberComponent().apply { entity = asReference() })
-      }
-    }
-  }
-
-  /**
-   * This function triggers removal of [Resource] s as per the [QuestionnaireConfig.groupResource]
-   * or [QuestionnaireConfig.removeResource] config properties.
-   */
-  fun softDeleteResources(questionnaireConfig: QuestionnaireConfig) {
-    if (questionnaireConfig.groupResource != null) {
-      removeGroup(
-        groupId = questionnaireConfig.groupResource!!.groupIdentifier,
-        removeGroup = questionnaireConfig.groupResource?.removeGroup ?: false,
-        deactivateMembers = questionnaireConfig.groupResource!!.deactivateMembers,
-      )
-      removeGroupMember(
-        memberId = questionnaireConfig.resourceIdentifier,
-        removeMember = questionnaireConfig.groupResource?.removeMember ?: false,
-        groupIdentifier = questionnaireConfig.groupResource!!.groupIdentifier,
-        memberResourceType = questionnaireConfig.groupResource!!.memberResourceType,
-      )
-    }
-
-    if (
-      questionnaireConfig.removeResource == true &&
-        questionnaireConfig.resourceType != null &&
-        !questionnaireConfig.resourceIdentifier.isNullOrEmpty()
-    ) {
-      viewModelScope.launch {
-        defaultRepository.delete(
-          resourceType = questionnaireConfig.resourceType!!,
-          resourceId = questionnaireConfig.resourceIdentifier!!,
-          softDelete = true,
-        )
-      }
-    }
-  }
-
-  private fun removeGroup(groupId: String, removeGroup: Boolean, deactivateMembers: Boolean) {
-    if (removeGroup) {
-      viewModelScope.launch(dispatcherProvider.io()) {
-        try {
-          defaultRepository.removeGroup(
-            groupId = groupId,
-            isDeactivateMembers = deactivateMembers,
-            configComputedRuleValues = emptyMap(),
-          )
-        } catch (exception: Exception) {
-          Timber.e(exception)
-        }
-      }
-    }
-  }
-
-  private fun removeGroupMember(
-    memberId: String?,
-    groupIdentifier: String?,
-    memberResourceType: ResourceType?,
-    removeMember: Boolean,
-  ) {
-    if (removeMember && !memberId.isNullOrEmpty()) {
-      viewModelScope.launch(dispatcherProvider.io()) {
-        try {
-          defaultRepository.removeGroupMember(
-            memberId = memberId,
-            groupId = groupIdentifier,
-            groupMemberResourceType = memberResourceType,
-            configComputedRuleValues = emptyMap(),
-          )
-        } catch (exception: Exception) {
-          Timber.e(exception)
-        }
-      }
-    }
-  }
-
-  /**
-   * This function searches and returns the latest [QuestionnaireResponse] for the given
-   * [resourceId] that was extracted from the [Questionnaire] identified as [questionnaireId].
-   * Returns null if non is found.
-   */
-  suspend fun searchLatestQuestionnaireResponse(
-    resourceId: String,
-    resourceType: ResourceType,
-    questionnaireId: String,
-  ): QuestionnaireResponse? {
-    val search =
-      Search(ResourceType.QuestionnaireResponse).apply {
-        filter(QuestionnaireResponse.SUBJECT, { value = "$resourceType/$resourceId" })
-        filter(
-          QuestionnaireResponse.QUESTIONNAIRE,
-          { value = "${ResourceType.Questionnaire}/$questionnaireId" },
-        )
-      }
-    val questionnaireResponses: List<QuestionnaireResponse> = defaultRepository.search(search)
-    return questionnaireResponses.maxByOrNull { it.meta.lastUpdated }
-  }
-
-  /**
-   * Return [Resource]s to be used in the launch context of the questionnaire. Launch context allows
-   * information to be passed into questionnaire based on the context in which the questionnaire is
-   * being evaluated. For example, what patient, what encounter, what user, etc. is "in context" at
-   * the time the questionnaire response is being completed:
-   * https://build.fhir.org/ig/HL7/sdc/StructureDefinition-sdc-questionnaire-launchContext.html
-   */
-  suspend fun retrievePopulationResources(actionParameters: List<ActionParameter>): List<Resource> {
-    return actionParameters
-      .filter {
-        it.paramType == ActionParameterType.QUESTIONNAIRE_RESPONSE_POPULATION_RESOURCE &&
-          it.resourceType != null &&
-          it.value.isNotEmpty()
-      }
-      .mapNotNull {
-        try {
-          loadResource(it.resourceType!!, it.value)
-        } catch (resourceNotFoundException: ResourceNotFoundException) {
-          null
-        }
-      }
-  }
-
-  /** Load [Resource] of type [ResourceType] for the provided [resourceIdentifier] */
-  suspend fun loadResource(resourceType: ResourceType, resourceIdentifier: String): Resource? =
-    try {
-      defaultRepository.loadResource(resourceIdentifier, resourceType)
-    } catch (resourceNotFoundException: ResourceNotFoundException) {
-      null
-    }
-
-  /** Update the current progress state of the questionnaire. */
-  fun setProgressState(questionnaireState: QuestionnaireProgressState) {
-    _questionnaireProgressStateLiveData.postValue(questionnaireState)
-  }
-
-  companion object {
-    const val CONTAINED_LIST_TITLE = "GeneratedResourcesList"
-  }
-}
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
index a3e69b539f..3fc3975fe0 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -18,91 +18,75 @@ package org.smartregister.fhircore.quest.ui.questionnaire
 
 import android.content.Context
 import android.widget.Toast
-import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.google.android.fhir.datacapture.mapping.ResourceMapper
 import com.google.android.fhir.datacapture.mapping.StructureMapExtractionContext
+import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValidator
+import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.logicalId
-import com.google.android.fhir.search.search
+import com.google.android.fhir.search.Search
 import dagger.hilt.android.lifecycle.HiltViewModel
-import java.util.Calendar
 import java.util.Date
 import java.util.UUID
 import javax.inject.Inject
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.hl7.fhir.r4.context.IWorkerContext
 import org.hl7.fhir.r4.model.Bundle
-import org.hl7.fhir.r4.model.Encounter
 import org.hl7.fhir.r4.model.Group
-import org.hl7.fhir.r4.model.Location
+import org.hl7.fhir.r4.model.IdType
+import org.hl7.fhir.r4.model.ListResource
+import org.hl7.fhir.r4.model.ListResource.ListEntryComponent
 import org.hl7.fhir.r4.model.Patient
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
-import org.hl7.fhir.r4.model.RelatedPerson
+import org.hl7.fhir.r4.model.Reference
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
-import org.hl7.fhir.r4.model.StructureMap
-import org.smartregister.fhircore.engine.configuration.ConfigurationRegistry
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.cql.LibraryEvaluator
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.domain.model.ActionParameterType
-import org.smartregister.fhircore.engine.domain.model.QuestionnaireType
-import org.smartregister.fhircore.engine.domain.model.RuleConfig
 import org.smartregister.fhircore.engine.rulesengine.ResourceDataRulesExecutor
 import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
 import org.smartregister.fhircore.engine.util.DispatcherProvider
 import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
+import org.smartregister.fhircore.engine.util.extension.DEFAULT_PLACEHOLDER_PREFIX
+import org.smartregister.fhircore.engine.util.extension.appendOrganizationInfo
+import org.smartregister.fhircore.engine.util.extension.appendPractitionerInfo
 import org.smartregister.fhircore.engine.util.extension.asReference
 import org.smartregister.fhircore.engine.util.extension.cqfLibraryIds
-import org.smartregister.fhircore.engine.util.extension.deleteRelatedResources
 import org.smartregister.fhircore.engine.util.extension.extractByStructureMap
-import org.smartregister.fhircore.engine.util.extension.extractId
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
-import org.smartregister.fhircore.engine.util.extension.extractType
-import org.smartregister.fhircore.engine.util.extension.find
-import org.smartregister.fhircore.engine.util.extension.findSubject
 import org.smartregister.fhircore.engine.util.extension.isIn
 import org.smartregister.fhircore.engine.util.extension.prePopulateInitialValues
 import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForReadingOrEditing
-import org.smartregister.fhircore.engine.util.extension.referenceValue
-import org.smartregister.fhircore.engine.util.extension.resourceClassType
-import org.smartregister.fhircore.engine.util.extension.retainMetadata
-import org.smartregister.fhircore.engine.util.extension.setPropertySafely
 import org.smartregister.fhircore.engine.util.extension.showToast
 import org.smartregister.fhircore.engine.util.extension.updateLastUpdated
 import org.smartregister.fhircore.engine.util.helper.TransformSupportServices
-import org.smartregister.fhircore.quest.BuildConfig
 import org.smartregister.fhircore.quest.R
 import timber.log.Timber
 
 @HiltViewModel
-open class QuestionnaireViewModel
+class QuestionnaireViewModel
 @Inject
 constructor(
   val defaultRepository: DefaultRepository,
-  val configurationRegistry: ConfigurationRegistry,
-  val transformSupportServices: TransformSupportServices,
   val dispatcherProvider: DispatcherProvider,
-  val sharedPreferencesHelper: SharedPreferencesHelper,
-  val libraryEvaluator: LibraryEvaluator,
   val fhirCarePlanGenerator: FhirCarePlanGenerator,
   val resourceDataRulesExecutor: ResourceDataRulesExecutor,
+  val transformSupportServices: TransformSupportServices,
+  val sharedPreferencesHelper: SharedPreferencesHelper,
+  val libraryEvaluator: LibraryEvaluator,
 ) : ViewModel() {
 
-  val extractionProgress = MutableLiveData<Boolean>()
-  val extractionProgressMessage = MutableLiveData<String>()
-  val removeOperation = MutableLiveData(false)
-  var editQuestionnaireResponse: QuestionnaireResponse? = null
-  var structureMapProvider: (suspend (String, IWorkerContext) -> StructureMap?)? = null
-
   private val authenticatedOrganizationIds by lazy {
     sharedPreferencesHelper.read<List<String>>(ResourceType.Organization.name)
   }
@@ -113,408 +97,246 @@ constructor(
       ?.extractLogicalIdUuid()
   }
 
-  private var editQuestionnaireResourceParams: List<ActionParameter>? = emptyList()
+  private val _questionnaireProgressStateLiveData = MutableLiveData<QuestionnaireProgressState?>()
+  val questionnaireProgressStateLiveData: LiveData<QuestionnaireProgressState?>
+    get() = _questionnaireProgressStateLiveData
 
-  suspend fun loadQuestionnaire(
+  /**
+   * This function retrieves the [Questionnaire] as configured via the [QuestionnaireConfig]. The
+   * retrieved [Questionnaire] can be pre-populated with computed values from the Rules engine.
+   */
+  suspend fun retrieveQuestionnaire(
     questionnaireConfig: QuestionnaireConfig,
-    prePopulationParams: List<ActionParameter>? = emptyList(),
-    readOnlyLinkIds: List<String>? = emptyList(),
-  ): Questionnaire? =
-    defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)?.apply {
-      if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditable()) {
-        item.prepareQuestionsForReadingOrEditing(
-          QUESTIONNAIRE_RESPONSE_ITEM,
-          questionnaireConfig.type.isReadOnly(),
-          readOnlyLinkIds,
-        )
+    actionParameters: List<ActionParameter>?,
+  ): Questionnaire? {
+    if (questionnaireConfig.id.isEmpty() || questionnaireConfig.id.isBlank()) return null
+
+    // Compute questionnaire config rules and add extra questionnaire params to action parameters
+    val questionnaireComputedValues =
+      questionnaireConfig.configRules?.let {
+        resourceDataRulesExecutor.computeResourceDataRules(it, null)
       }
-      // prepopulate questionnaireItems with initial values
-      prePopulationParams
-        ?.takeIf { it.isNotEmpty() }
-        ?.let { nonEmptyParams ->
-          editQuestionnaireResourceParams =
-            nonEmptyParams.filter { it.paramType == ActionParameterType.UPDATE_DATE_ON_EDIT }
-          item.prePopulateInitialValues(STRING_INTERPOLATION_PREFIX, nonEmptyParams)
-        }
-
-      // TODO https://github.com/opensrp/fhircore/issues/991#issuecomment-1027872061
-      this.url = this.url ?: this.referenceValue()
-    }
+        ?: emptyMap()
 
-  suspend fun fetchStructureMap(structureMapUrl: String?): StructureMap? {
-    var structureMap: StructureMap? = null
-    structureMapUrl?.substringAfterLast("/")?.run {
-      structureMap = defaultRepository.loadResource(this)
-    }
-    return structureMap
-  }
+    val allActionParameters =
+      actionParameters?.plus(
+        questionnaireConfig.extraParams?.map { it.interpolate(questionnaireComputedValues) }
+          ?: emptyList(),
+      )
 
-  suspend fun addGroupMember(resource: Resource, groupResourceId: String) {
-    defaultRepository.loadResource<Group>(groupResourceId)?.run {
-      // Support all the valid group member references as per the FHIR specs
-      if (
-        resource.resourceType.isIn(
-          ResourceType.CareTeam,
-          ResourceType.Device,
-          ResourceType.Group,
-          ResourceType.HealthcareService,
-          ResourceType.Location,
-          ResourceType.Organization,
-          ResourceType.Patient,
-          ResourceType.Practitioner,
-          ResourceType.PractitionerRole,
-          ResourceType.Specimen,
-        )
-      ) {
-        this.member?.add(Group.GroupMemberComponent().apply { entity = resource.asReference() })
-      }
+    val questionnaire =
+      defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)?.apply {
+        if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditable()) {
+          item.prepareQuestionsForReadingOrEditing(
+            readOnly = questionnaireConfig.type.isReadOnly(),
+            readOnlyLinkIds = questionnaireConfig.readOnlyLinkIds,
+          )
+        }
 
-      // set managing entity for extracted related resource
-      if (resource.resourceType == ResourceType.RelatedPerson) {
-        this.managingEntity = resource.logicalId.asReference(ResourceType.RelatedPerson)
+        // Pre-populate questionnaire items with configured values
+        allActionParameters
+          ?.filter { (it.paramType == ActionParameterType.PREPOPULATE && it.value.isNotEmpty()) }
+          ?.let { actionParam ->
+            item.prePopulateInitialValues(DEFAULT_PLACEHOLDER_PREFIX, actionParam)
+          }
       }
-      defaultRepository.addOrUpdate(resource = this)
-    }
+    return questionnaire
   }
 
-  fun extractAndSaveResources(
-    context: Context,
-    questionnaireResponse: QuestionnaireResponse,
+  /**
+   * This function performs data extraction against the [QuestionnaireResponse]. All the resources
+   * generated from a successful extraction by StructureMap or definition are stored in the
+   * database. The [QuestionnaireResponse] is also stored in the database regardless of the outcome
+   * of [ResourceMapper.extract]. This function will optionally generate CarePlan using the
+   * PlanDefinition resource configured in [QuestionnaireConfig.planDefinitions]. The
+   * [QuestionnaireConfig.eventWorkflows] contains configurations to cascade update the statuses of
+   * resources to in-active (close) that are related to the current [QuestionnaireResponse.subject]
+   */
+  fun handleQuestionnaireSubmission(
     questionnaire: Questionnaire,
+    currentQuestionnaireResponse: QuestionnaireResponse,
     questionnaireConfig: QuestionnaireConfig,
+    actionParameters: List<ActionParameter>,
+    context: Context,
+    onSuccessfulSubmission: (List<IdType>, QuestionnaireResponse) -> Unit,
   ) {
-    questionnaireResponse.questionnaire = "${questionnaire.resourceType}/${questionnaire.logicalId}"
+    viewModelScope.launch(SupervisorJob()) {
+      val questionnaireResponseValid =
+        validateQuestionnaireResponse(
+          questionnaire = questionnaire,
+          questionnaireResponse = currentQuestionnaireResponse,
+          context = context,
+        )
 
-    if (questionnaireResponse.logicalId.isEmpty()) {
-      questionnaireResponse.id = UUID.randomUUID().toString()
-      questionnaireResponse.authored = Date()
-    }
+      if (!questionnaireResponseValid) {
+        Timber.e("Invalid questionnaire response")
+        context.showToast(context.getString(R.string.questionnaire_response_invalid))
+        return@launch
+      }
 
-    viewModelScope.launch(dispatcherProvider.io()) {
-      questionnaire.useContext
-        .filter { it.hasValueCodeableConcept() }
-        .forEach {
-          it.valueCodeableConcept.coding.forEach { coding ->
-            questionnaireResponse.meta.addTag(coding)
-          }
-        }
+      currentQuestionnaireResponse.processMetadata(questionnaire)
 
-      // important to set response subject so that structure map can handle subject for all entities
-      handleQuestionnaireResponseSubject(
-        questionnaireConfig.resourceIdentifier,
-        questionnaire,
-        questionnaireResponse,
-      )
-      if (questionnaire.extractByStructureMap()) {
-        val bundle = performExtraction(context, questionnaire, questionnaireResponse)
-        bundle.entry.forEach { bundleEntry ->
-          if (
-            bundleEntry.resource.resourceType.isIn(
-              ResourceType.Patient,
-              ResourceType.Group,
-              ResourceType.Encounter,
-            ) && questionnaireResponse.subject?.reference.isNullOrEmpty()
-          ) {
-            questionnaireResponse.subject = bundleEntry.resource.asReference()
-          }
+      val bundle =
+        performExtraction(
+          extractByStructureMap = questionnaire.extractByStructureMap(),
+          questionnaire = questionnaire,
+          questionnaireResponse = currentQuestionnaireResponse,
+          context = context,
+        )
 
-          appendPractitionerInfo(bundleEntry.resource)
-          appendOrganizationInfo(bundleEntry.resource)
-          appendAppVersion(context, bundleEntry.resource)
-
-          if (bundleEntry.hasResource()) bundleEntry.resource.updateLastUpdated()
-          if (
-            questionnaireConfig.type != QuestionnaireType.EDIT &&
-              bundleEntry.resource.resourceType.isIn(
-                ResourceType.Patient,
-                ResourceType.RelatedPerson,
-              )
-          ) {
-            questionnaireConfig.groupResource?.groupIdentifier?.let {
-              addGroupMember(resource = bundleEntry.resource, groupResourceId = it)
-            }
-          }
-          updateResourceLastUpdatedLinkedAsSubject(questionnaireResponse)
-
-          // TODO https://github.com/opensrp/fhircore/issues/900
-          // for edit mode replace client and resource subject ids.
-          // Ideally ResourceMapper should allow this internally via structure-map
-          if (questionnaireConfig.type.isEditable()) {
-            if (bundleEntry.resource.resourceType.isIn(ResourceType.Patient, ResourceType.Group)) {
-              bundleEntry.resource.id = questionnaireResponse.subject.extractId()
-            } else {
-              bundleEntry.resource.setPropertySafely("subject", questionnaireResponse.subject)
-              bundleEntry.resource.setPropertySafely("patient", questionnaireResponse.subject)
-            }
-          }
-          questionnaireResponse.contained.add(bundleEntry.resource)
-        }
-        updateResourceLastUpdatedLinkedAsSubject(questionnaireResponse)
+      val extractionDate = Date()
 
-        if (questionnaire.experimental) {
-          Timber.w(
-            "${questionnaire.name}(${questionnaire.logicalId}) is experimental and not save any data",
-          )
-        } else {
-          saveBundleResources(bundle)
+      // Create a ListResource to store the references for generated resources
+      val listResource =
+        ListResource().apply {
+          id = UUID.randomUUID().toString()
+          status = ListResource.ListStatus.CURRENT
+          mode = ListResource.ListMode.WORKING
+          title = CONTAINED_LIST_TITLE
+          date = extractionDate
         }
 
-        if (questionnaireConfig.type.isEditable() && editQuestionnaireResponse != null) {
-          questionnaireResponse.retainMetadata(editQuestionnaireResponse!!)
+      val group =
+        questionnaireConfig.groupResource?.groupIdentifier?.let { groupId ->
+          defaultRepository.loadResource<Group>(groupId)
         }
 
-        saveQuestionnaireResponse(questionnaire, questionnaireResponse)
-
-        // TODO https://github.com/opensrp/fhircore/issues/900
-        // reassess following i.e. deleting/updating older resources because one resource
-        // might have generated other flow in subsequent followups
-        if (questionnaireConfig.type.isEditable() && editQuestionnaireResponse != null) {
-          editQuestionnaireResponse!!.deleteRelatedResources(defaultRepository)
+      bundle?.entry?.forEach { bundleEntryComponent ->
+        val bundleEntryResource: Resource? = bundleEntryComponent.resource
+        bundleEntryResource?.run {
+          applyResourceMetadata()
+          defaultRepository.addOrUpdate(resource = this)
+
+          // Add resource as member of a (configured) Group
+          group?.let { bundleEntryResource.addMemberToGroup(it) }
+
+          // Track ids for resources in ListResource added to the QuestionnaireResponse.contained
+          val listEntryComponent =
+            ListEntryComponent().apply {
+              deleted = false
+              date = extractionDate
+              item = bundleEntryResource.asReference()
+            }
+          listResource.addEntry(listEntryComponent)
         }
-        performExtraction(questionnaireResponse, questionnaireConfig, questionnaire, bundle)
-      } else {
-        saveQuestionnaireResponse(questionnaire, questionnaireResponse)
-        performExtraction(questionnaireResponse, questionnaireConfig, questionnaire)
       }
-      viewModelScope.launch(dispatcherProvider.main()) { extractionProgress.postValue(true) }
-      triggerRemoveResources(questionnaireConfig)
-    }
-  }
 
-  /**
-   * This function triggers removal of [Resource] s as per the [QuestionnaireConfig.groupResource]
-   * or [QuestionnaireConfig.removeResource] config properties.
-   */
-  fun triggerRemoveResources(questionnaireConfig: QuestionnaireConfig) {
-    if (questionnaireConfig.groupResource != null) {
-      removeGroup(
-        groupId = questionnaireConfig.groupResource!!.groupIdentifier,
-        removeGroup = questionnaireConfig.groupResource?.removeGroup ?: false,
-        deactivateMembers = questionnaireConfig.groupResource!!.deactivateMembers,
-      )
-      removeGroupMember(
-        memberId = questionnaireConfig.resourceIdentifier,
-        removeMember = questionnaireConfig.groupResource?.removeMember ?: false,
-        groupIdentifier = questionnaireConfig.groupResource!!.groupIdentifier,
-        memberResourceType = questionnaireConfig.groupResource!!.memberResourceType,
-      )
-    }
-
-    if (
-      questionnaireConfig.removeResource == true &&
-        questionnaireConfig.resourceType != null &&
-        !questionnaireConfig.resourceIdentifier.isNullOrEmpty()
-    ) {
-      viewModelScope.launch {
-        defaultRepository.delete(
-          resourceType = questionnaireConfig.resourceType!!,
-          resourceId = questionnaireConfig.resourceIdentifier!!,
-          softDelete = true,
+      val subject =
+        retrieveSubject(
+            questionnaire = questionnaire,
+            questionnaireConfig = questionnaireConfig,
+            bundle = bundle,
+          )
+          ?.apply { id = "$resourceType/$logicalId" }
+
+      // Update Group resource to save members
+      group?.let { defaultRepository.addOrUpdate(resource = it) }
+
+      // Save questionnaire response
+      if (subject != null) {
+        defaultRepository.addOrUpdate(
+          resource =
+            currentQuestionnaireResponse.apply {
+              setQuestionnaire("${questionnaire.resourceType}/${questionnaire.logicalId}")
+              setSubject(subject.asReference())
+              addContained(listResource)
+            },
         )
       }
-    }
-  }
 
-  /* We can remove this after we review why a subject is needed for every questionnaire response in fhir core.
-  The subject is not required in the questionnaire response
-   https://www.hl7.org/fhir/questionnaireresponse-definitions.html#QuestionnaireResponse.subject */
-  suspend fun performExtraction(
-    questionnaireResponse: QuestionnaireResponse,
-    questionnaireConfig: QuestionnaireConfig,
-    questionnaire: Questionnaire,
-    bundle: Bundle = Bundle(),
-  ) {
-    extractCqlOutput(questionnaire, questionnaireResponse, bundle)
-    extractCarePlan(questionnaireResponse, bundle, questionnaireConfig)
-  }
+      // Update _lastUpdated for resources configured via ActionParameterType.UPDATE_DATE_ON_EDIT
+      updateResourcesLastUpdatedProperty(actionParameters)
 
-  fun savePartialQuestionnaireResponse(
-    questionnaire: Questionnaire,
-    questionnaireResponse: QuestionnaireResponse,
-  ) {
-    viewModelScope.launch(dispatcherProvider.io()) {
-      questionnaireResponse.status = QuestionnaireResponse.QuestionnaireResponseStatus.INPROGRESS
-      saveQuestionnaireResponse(questionnaire, questionnaireResponse)
-    }
-  }
+      if (subject != null && bundle != null) {
+        // Generate CarePlan using configured plan definitions
+        val newBundle = bundle.copyBundle(currentQuestionnaireResponse)
+        generateCarePlan(
+          subject = subject,
+          bundle = newBundle,
+          questionnaireConfig = questionnaireConfig,
+        )
 
-  fun appendOrganizationInfo(resource: Resource) {
-    // Organization reference in shared pref as "Organization/some-gibberish-uuid"
-    authenticatedOrganizationIds.let { ids ->
-      val organizationRef =
-        ids?.first()?.extractLogicalIdUuid()?.asReference(ResourceType.Organization)
-
-      when (resource) {
-        is Patient -> resource.managingOrganization = organizationRef
-        is Group -> resource.managingEntity = organizationRef
-        is Encounter -> resource.serviceProvider = organizationRef
-        is Location -> resource.managingOrganization = organizationRef
-      }
-    }
-  }
+        // Execute CQL
+        executeCql(
+          subject = subject,
+          bundle = newBundle,
+          questionnaire = questionnaire,
+        )
 
-  fun appendPractitionerInfo(resource: Resource) {
-    practitionerId?.let {
-      // Convert practitioner uuid to reference e.g. "Practitioner/some-gibberish-uuid"
-      val practitionerRef = it.asReference(ResourceType.Practitioner)
-
-      if (resource is Patient) {
-        resource.generalPractitioner = arrayListOf(practitionerRef)
-      } else if (resource is Encounter) {
-        resource.participant =
-          arrayListOf(
-            Encounter.EncounterParticipantComponent().apply { individual = practitionerRef },
+        // Cascade update statuses of resources closed by this Questionnaire submission
+        viewModelScope.launch {
+          fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
+            questionnaireConfig = questionnaireConfig,
+            subject = subject,
+            bundle = bundle,
           )
+        }
       }
-    }
-  }
 
-  /**
-   * This creates a meta tag that records the App Version as defined in the build.gradle and updates
-   * all resources created by the App with the relevant app version name. The tag defines three
-   * strings: 'setSystem - The code system' , 'setCode - The code would be the App Version defined
-   * on the build.gradle.', and 'setDisplay - The display name'. All resources created by the App
-   * will have a tag of the App Version on the meta.tag.
-   *
-   * @property resource The resource to add the meta tag to.
-   */
-  fun appendAppVersion(context: Context, resource: Resource) {
-    // Create a tag with the app version
-    val metaTag = resource.meta.addTag()
-    metaTag
-      .setSystem(context.getString(R.string.app_version_tag_url))
-      .setCode(BuildConfig.VERSION_NAME)
-      .display = context.getString(R.string.application_version)
-  }
-
-  suspend fun extractCarePlan(
-    questionnaireResponse: QuestionnaireResponse,
-    bundle: Bundle?,
-    questionnaireConfig: QuestionnaireConfig,
-  ) {
-    val subject =
-      questionnaireResponse.findSubject(bundle)
-        ?: defaultRepository.loadResource(questionnaireResponse.subject)
-
-    val data =
-      Bundle().apply {
-        bundle?.entry?.map { this.addEntry(it) }
-        addEntry().resource = questionnaireResponse
-      }
+      softDeleteResources(questionnaireConfig)
 
-    questionnaireConfig.planDefinitions?.forEach { planId ->
-      kotlin
-        .runCatching { fhirCarePlanGenerator.generateOrUpdateCarePlan(planId, subject, data) }
-        .onFailure {
-          Timber.e(it)
-          extractionProgressMessage.postValue("Error extracting care plan. ${it.message}")
-        }
+      // On successful submission callback
+      val idTypes =
+        bundle?.entry?.map { IdType(it.resource.resourceType.name, it.resource.logicalId) }
+          ?: emptyList()
+      onSuccessfulSubmission(idTypes, currentQuestionnaireResponse)
     }
-
-    fhirCarePlanGenerator.conditionallyUpdateResourceStatus(questionnaireConfig, subject, data)
   }
 
-  suspend fun extractCqlOutput(
-    questionnaire: Questionnaire,
-    questionnaireResponse: QuestionnaireResponse,
-    bundle: Bundle?,
-  ) {
-    withContext(dispatcherProvider.default()) {
-      val data =
-        Bundle().apply {
-          bundle?.entry?.map { this.addEntry(it) }
-          addEntry().resource = questionnaireResponse
-        }
-      questionnaire
-        .cqfLibraryIds()
-        .map {
-          val patient =
-            if (questionnaireResponse.hasSubject()) {
-              loadPatient(questionnaireResponse.subject.extractId())
-            } else {
-              null
-            }
-          libraryEvaluator.runCqlLibrary(it, patient, data)
-        }
-        .forEach { output ->
-          if (output.isNotEmpty()) extractionProgressMessage.postValue(output.joinToString("\n"))
-        }
+  private fun Bundle.copyBundle(currentQuestionnaireResponse: QuestionnaireResponse): Bundle =
+    this.copy().apply {
+      addEntry(Bundle.BundleEntryComponent().apply { resource = currentQuestionnaireResponse })
     }
-  }
 
-  /**
-   * Sets questionnaireResponse subject with proper subject-type defined in questionnaire with an
-   * existing resourceId or organization or null
-   */
-  fun handleQuestionnaireResponseSubject(
-    resourceId: String?,
-    questionnaire: Questionnaire,
-    questionnaireResponse: QuestionnaireResponse,
-  ) {
-    val subjectType = questionnaire.subjectType.firstOrNull()?.code ?: ResourceType.Patient.name
-    questionnaireResponse.subject =
-      when (subjectType) {
-        ResourceType.Organization.name ->
-          authenticatedOrganizationIds?.first()?.asReference(ResourceType.Organization)
-        else -> resourceId?.asReference(ResourceType.valueOf(subjectType))
-      }
+  private fun QuestionnaireResponse.processMetadata(questionnaire: Questionnaire) {
+    status = QuestionnaireResponse.QuestionnaireResponseStatus.COMPLETED
+    authored = Date()
+    questionnaire.useContext
+      .filter { it.hasValueCodeableConcept() }
+      .forEach { it.valueCodeableConcept.coding.forEach { coding -> this.meta.addTag(coding) } }
+    applyResourceMetadata()
   }
 
-  /**
-   * Add or update the [questionnaireResponse] resource with the passed content, and if an
-   * [editQuestionnaireResourceParams] represents the IDs of the resources to be updated on
-   * Questionnaire edit.
-   *
-   * @param questionnaire the [Questionnaire] this response is related to
-   * @param questionnaireResponse the questionnaireResponse resource to save
-   */
-  suspend fun saveQuestionnaireResponse(
-    questionnaire: Questionnaire,
-    questionnaireResponse: QuestionnaireResponse,
-  ) {
-    if (questionnaire.experimental) {
-      Timber.w(
-        "${questionnaire.name}(${questionnaire.logicalId}) is experimental and not save any data",
-      )
-      return
-    }
-    defaultRepository.addOrUpdate(resource = questionnaireResponse)
-    editQuestionnaireResourceParams?.forEach { param ->
-      try {
-        val resource =
-          param.value.let {
-            val resourceType =
-              it.substringBefore("/").resourceClassType().newInstance().resourceType
-            defaultRepository.loadResource(it.extractLogicalIdUuid(), resourceType)
-          }
-        resource.let { defaultRepository.addOrUpdate(resource = it) }
-      } catch (e: ResourceNotFoundException) {
-        Timber.e(e)
-      }
+  private fun Resource?.applyResourceMetadata(): Resource? {
+    this?.apply {
+      appendOrganizationInfo(authenticatedOrganizationIds)
+      appendPractitionerInfo(practitionerId)
+      updateLastUpdated()
     }
+    return this
   }
 
+  /**
+   * Perform StructureMap or Definition based definition. The result of this function returns a
+   * Bundle that contains the resources that were generated via the [ResourceMapper.extract]
+   * operation otherwise returns null if an exception is encountered.
+   */
   suspend fun performExtraction(
-    context: Context,
+    extractByStructureMap: Boolean,
     questionnaire: Questionnaire,
     questionnaireResponse: QuestionnaireResponse,
-  ): Bundle {
-    return kotlin
+    context: Context,
+  ): Bundle? =
+    kotlin
       .runCatching {
-        ResourceMapper.extract(
-          questionnaire = questionnaire,
-          questionnaireResponse = questionnaireResponse,
-          StructureMapExtractionContext(
-            context = context,
-            transformSupportServices = transformSupportServices,
-            structureMapProvider = retrieveStructureMapProvider(),
-          ),
-        )
-      }
-      .onSuccess {
-        Timber.d(
-          "Questionnaire (${questionnaire.name}) with ${questionnaire.id} extracted successfully",
-        )
+        if (extractByStructureMap) {
+          ResourceMapper.extract(
+            questionnaire = questionnaire,
+            questionnaireResponse = questionnaireResponse,
+            StructureMapExtractionContext(
+              context = context,
+              transformSupportServices = transformSupportServices,
+              structureMapProvider = { structureMapUrl: String?, _: IWorkerContext ->
+                structureMapUrl?.substringAfterLast("/")?.let { defaultRepository.loadResource(it) }
+              },
+            ),
+          )
+        } else {
+          ResourceMapper.extract(
+            questionnaire = questionnaire,
+            questionnaireResponse = questionnaireResponse,
+          )
+        }
       }
       .onFailure { exception ->
         Timber.e(exception)
@@ -532,61 +354,184 @@ constructor(
           }
         }
       }
-      .getOrDefault(Bundle())
-  }
+      .getOrDefault(null)
 
-  suspend fun saveBundleResources(bundle: Bundle) {
-    if (!bundle.isEmpty) {
-      bundle.entry.forEach { bundleEntry ->
-        defaultRepository.addOrUpdate(resource = bundleEntry.resource)
+  /**
+   * This function saves [QuestionnaireResponse] as draft if any of the [QuestionnaireResponse.item]
+   * has an answer.
+   */
+  fun saveDraftQuestionnaire(questionnaireResponse: QuestionnaireResponse) {
+    val questionnaireHasAnswer =
+      questionnaireResponse.item.any {
+        it.answer.any { answerComponent -> answerComponent.hasValue() }
+      }
+    if (questionnaireHasAnswer) {
+      viewModelScope.launch(dispatcherProvider.io()) {
+        questionnaireResponse.status = QuestionnaireResponse.QuestionnaireResponseStatus.INPROGRESS
+        defaultRepository.addOrUpdate(addMandatoryTags = true, resource = questionnaireResponse)
       }
     }
   }
 
-  fun retrieveStructureMapProvider(): (suspend (String, IWorkerContext) -> StructureMap?) {
-    if (structureMapProvider == null) {
-      structureMapProvider = { structureMapUrl: String, _: IWorkerContext ->
-        fetchStructureMap(structureMapUrl)
+  /**
+   * This function updates the _lastUpdated property of resources configured by the
+   * [ActionParameter.paramType] of [ActionParameterType.UPDATE_DATE_ON_EDIT]. Each time a
+   * questionnaire is submitted, the affected resources last modified/updated date will also be
+   * updated.
+   */
+  suspend fun updateResourcesLastUpdatedProperty(actionParameters: List<ActionParameter>?) {
+    val updateOnEditParams =
+      actionParameters?.filter {
+        it.paramType == ActionParameterType.UPDATE_DATE_ON_EDIT && it.value.isNotEmpty()
+      }
+
+    updateOnEditParams?.forEach { param ->
+      try {
+        val resource = defaultRepository.loadResource(Reference(param.value))
+        defaultRepository.addOrUpdate(resource = resource)
+      } catch (resourceNotFoundException: ResourceNotFoundException) {
+        Timber.e("Unable to update resource's _lastUpdated", resourceNotFoundException)
       }
     }
+  }
 
-    return structureMapProvider!!
+  /**
+   * This function validates all [QuestionnaireResponse] and returns true if all the validation
+   * result of [QuestionnaireResponseValidator] are [Valid] or [NotValidated] (validation is
+   * optional on [Questionnaire] fields)
+   */
+  fun validateQuestionnaireResponse(
+    questionnaire: Questionnaire,
+    questionnaireResponse: QuestionnaireResponse,
+    context: Context,
+  ) =
+    QuestionnaireResponseValidator.validateQuestionnaireResponse(
+        questionnaire = questionnaire,
+        questionnaireResponse = questionnaireResponse,
+        context = context,
+      )
+      .values
+      .flatten()
+      .all { it is Valid || it is NotValidated }
+
+  suspend fun executeCql(subject: Resource, bundle: Bundle, questionnaire: Questionnaire) {
+    questionnaire.cqfLibraryIds().forEach {
+      if (subject.resourceType == ResourceType.Patient) {
+        libraryEvaluator.runCqlLibrary(it, subject as Patient, bundle)
+      }
+    }
   }
 
-  fun saveResource(resource: Resource) {
-    viewModelScope.launch { defaultRepository.create(true, resource) }
+  /**
+   * This function generates CarePlans for the [QuestionnaireResponse.subject] using the configured
+   * [QuestionnaireConfig.planDefinitions]
+   */
+  suspend fun generateCarePlan(
+    subject: Resource,
+    bundle: Bundle,
+    questionnaireConfig: QuestionnaireConfig,
+  ) {
+    questionnaireConfig.planDefinitions?.forEach { planId ->
+      kotlin
+        .runCatching {
+          fhirCarePlanGenerator.generateOrUpdateCarePlan(
+            planDefinitionId = planId,
+            subject = subject,
+            data = bundle,
+          )
+        }
+        .onFailure { Timber.e(it) }
+    }
   }
 
-  fun partialQuestionnaireResponseHasValues(questionnaireResponse: QuestionnaireResponse): Boolean {
-    val questionnaireResponseItemListIterator = questionnaireResponse.item.iterator()
-    while (questionnaireResponseItemListIterator.hasNext()) {
-      val questionnaireResponseItem = questionnaireResponseItemListIterator.next()
-      questionnaireResponseItem.answer?.forEach { if (it.hasValue()) return true }
+  /**
+   * This retrieves and returns [Resource] as subject if [QuestionnaireConfig.resourceType] and
+   * [QuestionnaireConfig.resourceIdentifier] are provided. This will be the typical case for
+   * subsequent [Questionnaire] submissions where the [QuestionnaireResponse.subject] already
+   * exists. For instances where the [Questionnaire] is submitted the first time (e.g. during
+   * registration events), the subject [Resource] will be included and accessed from the extracted
+   * resources in the [Bundle.entry]
+   */
+  suspend fun retrieveSubject(
+    questionnaire: Questionnaire,
+    questionnaireConfig: QuestionnaireConfig,
+    bundle: Bundle?,
+  ): Resource? {
+    val questionnaireSubjectType = questionnaire.subjectType.firstOrNull()?.code
+    val resourceType =
+      questionnaireConfig.resourceType ?: questionnaireSubjectType?.let { ResourceType.valueOf(it) }
+    val resourceIdentifier = questionnaireConfig.resourceIdentifier
+
+    if (resourceType != null && !resourceIdentifier.isNullOrEmpty()) {
+      return loadResource(resourceType, resourceIdentifier)
+    }
+    questionnaire.subjectType.forEach {
+      val resourceType = ResourceType.valueOf(it.code)
+      return bundle
+        ?.entry
+        ?.firstOrNull { entryComponent -> entryComponent.resource.resourceType == resourceType }
+        ?.resource
     }
-    return false
+    return null
   }
 
-  fun getAgeInput(questionnaireResponse: QuestionnaireResponse): Int? {
-    return questionnaireResponse
-      .find(QuestionnaireActivity.QUESTIONNAIRE_AGE)
-      ?.answer
-      ?.firstOrNull()
-      ?.valueDecimalType
-      ?.value
-      ?.toInt()
+  /** Adds [Resource] to [Group.member] */
+  fun Resource.addMemberToGroup(group: Group) {
+    this.run {
+      if (
+        this.resourceType.isIn(
+          ResourceType.CareTeam,
+          ResourceType.Device,
+          ResourceType.Group,
+          ResourceType.HealthcareService,
+          ResourceType.Location,
+          ResourceType.Organization,
+          ResourceType.Patient,
+          ResourceType.Practitioner,
+          ResourceType.PractitionerRole,
+          ResourceType.Specimen,
+        )
+      ) {
+        group.addMember(Group.GroupMemberComponent().apply { entity = asReference() })
+      }
+    }
   }
 
-  /** Subtract [age] from today's date */
-  fun calculateDobFromAge(age: Int): Date =
-    Calendar.getInstance()
-      .apply {
-        add(Calendar.YEAR, -age)
-        set(Calendar.DAY_OF_YEAR, 1)
-        set(Calendar.MONTH, 1)
+  /**
+   * This function triggers removal of [Resource] s as per the [QuestionnaireConfig.groupResource]
+   * or [QuestionnaireConfig.removeResource] config properties.
+   */
+  fun softDeleteResources(questionnaireConfig: QuestionnaireConfig) {
+    if (questionnaireConfig.groupResource != null) {
+      removeGroup(
+        groupId = questionnaireConfig.groupResource!!.groupIdentifier,
+        removeGroup = questionnaireConfig.groupResource?.removeGroup ?: false,
+        deactivateMembers = questionnaireConfig.groupResource!!.deactivateMembers,
+      )
+      removeGroupMember(
+        memberId = questionnaireConfig.resourceIdentifier,
+        removeMember = questionnaireConfig.groupResource?.removeMember ?: false,
+        groupIdentifier = questionnaireConfig.groupResource!!.groupIdentifier,
+        memberResourceType = questionnaireConfig.groupResource!!.memberResourceType,
+      )
+    }
+
+    if (
+      questionnaireConfig.removeResource == true &&
+        questionnaireConfig.resourceType != null &&
+        !questionnaireConfig.resourceIdentifier.isNullOrEmpty()
+    ) {
+      viewModelScope.launch {
+        defaultRepository.delete(
+          resourceType = questionnaireConfig.resourceType!!,
+          resourceId = questionnaireConfig.resourceIdentifier!!,
+          softDelete = true,
+        )
       }
-      .time
+    }
+  }
 
-  fun removeGroup(groupId: String, removeGroup: Boolean, deactivateMembers: Boolean) {
+  private fun removeGroup(groupId: String, removeGroup: Boolean, deactivateMembers: Boolean) {
     if (removeGroup) {
       viewModelScope.launch(dispatcherProvider.io()) {
         try {
@@ -597,14 +542,12 @@ constructor(
           )
         } catch (exception: Exception) {
           Timber.e(exception)
-        } finally {
-          removeOperation.postValue(true)
         }
       }
     }
   }
 
-  fun removeGroupMember(
+  private fun removeGroupMember(
     memberId: String?,
     groupIdentifier: String?,
     memberResourceType: ResourceType?,
@@ -621,220 +564,70 @@ constructor(
           )
         } catch (exception: Exception) {
           Timber.e(exception)
-        } finally {
-          removeOperation.postValue(true)
         }
       }
     }
   }
 
-  suspend fun updateResourceLastUpdatedLinkedAsSubject(
-    questionnaireResponse: QuestionnaireResponse,
-  ) {
-    if (questionnaireResponse.hasSubject() && questionnaireResponse.subject.hasReference()) {
-      val resourceId = questionnaireResponse.subject.reference.extractLogicalIdUuid()
-      val resourceType =
-        questionnaireResponse.subject
-          .extractType()!!
-          .name
-          .resourceClassType()
-          .newInstance()
-          .resourceType
-      try {
-        if (resourceType.isIn(ResourceType.Patient, ResourceType.Group)) {
-          defaultRepository.loadResource(resourceId, resourceType).let { resource ->
-            resource.updateLastUpdated()
-            defaultRepository.addOrUpdate(true, resource)
-          }
-        }
-      } catch (exception: ResourceNotFoundException) {
-        Timber.e(exception)
-      }
-    }
-  }
-
-  /**
-   * Validates the given Questionnaire Response using the SDK [QuestionnaireResponseValidator].
-   *
-   * @param questionnaire Questionnaire to use in validation
-   * @param questionnaireResponse QuestionnaireResponse to validate
-   * @param context Context to use in validation
-   */
-  fun isQuestionnaireResponseValid(
-    questionnaire: Questionnaire,
-    questionnaireResponse: QuestionnaireResponse,
-    context: Context,
-  ): Boolean {
-    return try {
-      QuestionnaireResponseValidator.checkQuestionnaireResponse(
-        questionnaire,
-        questionnaireResponse,
-      )
-      QuestionnaireResponseValidator.validateQuestionnaireResponse(
-        questionnaire,
-        questionnaireResponse,
-        context,
-      )
-      true
-    } catch (e: IllegalArgumentException) {
-      Timber.tag("QuestionnaireViewModel.isQuestionnaireResponseValid").d(e)
-      false
-    }
-  }
-
-  /**
-   * Gets a Questionnaire Response from the database if it exists. Generates Questionnaire Response
-   * from population, otherwise.
-   *
-   * @param questionnaire Questionnaire as the basis for how the resources are to be populated
-   * @param subjectId ID of the resource that submitted the Questionnaire Response, and related with
-   *   the population resources
-   * @param subjectType resource type of the resource that submitted the Questionnaire Response
-   */
-  suspend fun getQuestionnaireResponseFromDbOrPopulation(
-    questionnaire: Questionnaire,
-    subjectId: String?,
-    subjectType: ResourceType?,
-    questionnaireConfig: QuestionnaireConfig,
-    resourceMap: Map<ResourceType?, String>,
-  ): QuestionnaireResponse {
-    var questionnaireResponse: QuestionnaireResponse? = QuestionnaireResponse()
-
-    if (!subjectId.isNullOrEmpty() && subjectType != null) {
-      // Load questionnaire response from DB for Questionnaires opened in EDIT/READONLY mode
-      questionnaireResponse =
-        searchQuestionnaireResponses(
-            subjectId = subjectId,
-            subjectType = subjectType,
-            questionnaireId = questionnaire.logicalId,
-          )
-          .maxByOrNull { it.meta.lastUpdated }
-
-      /**
-       * This will catch an exception and return QR from DB when population resource is empty,
-       * ResourceMapper.selectPopulateContext() will return null, then that null will get evaluated
-       * and gives an exception as a result.
-       */
-      if (
-        questionnaireResponse == null ||
-          questionnaireResponse.isEmpty ||
-          !questionnaireResponse.hasItem()
-      ) {
-        questionnaireResponse =
-          runCatching {
-              // load required resources sent through Param for questionnaire Response
-              // expressions
-              val populationResources = arrayListOf<Resource>()
-              if (resourceMap.isEmpty()) {
-                populationResources.addAll(loadPopulationResources(subjectId, subjectType))
-              } else {
-                resourceMap.forEach {
-                  populationResources.addAll(
-                    loadPopulationResources(it.value.extractLogicalIdUuid(), it.key!!),
-                  )
-                }
-              }
-
-              populateQuestionnaireResponse(
-                questionnaire = questionnaire,
-                populationResources = populationResources,
-              )
-            }
-            .onFailure { Timber.e(it, "Error encountered while populating QuestionnaireResponse") }
-            .getOrDefault(questionnaireResponse)
-      }
-    }
-
-    return questionnaireResponse ?: QuestionnaireResponse()
-  }
-
   /**
-   * Generates a Questionnaire Response by populating the given resources.
-   *
-   * @param questionnaire Questionnaire as the basis for how the resources are to be populated
-   * @param populationResources resources to be populated
+   * This function searches and returns the latest [QuestionnaireResponse] for the given
+   * [resourceId] that was extracted from the [Questionnaire] identified as [questionnaireId].
+   * Returns null if non is found.
    */
-  @VisibleForTesting
-  suspend fun populateQuestionnaireResponse(
-    questionnaire: Questionnaire,
-    populationResources: List<Resource>,
-  ): QuestionnaireResponse {
-    return ResourceMapper.populate(questionnaire, *populationResources.toTypedArray()).also {
-      questionnaireResponse ->
-      if (!questionnaireResponse.hasItem()) {
-        Timber.tag("QuestionnaireViewModel.populateQuestionnaireResponse")
-          .d("Questionnaire response has no populated answers")
-      }
-    }
-  }
-
-  /**
-   * Search Questionnaire Response resources that are associated with the given subject ID and
-   * Questionnaire ID.
-   *
-   * @param subjectId ID of the resource that submitted the Questionnaire Response
-   * @param subjectType resource type of the resource that submitted the Questionnaire Response
-   * @param questionnaireId ID of the Questionnaire that owns the Questionnaire Response
-   */
-  private suspend fun searchQuestionnaireResponses(
-    subjectId: String,
-    subjectType: ResourceType,
+  suspend fun searchLatestQuestionnaireResponse(
+    resourceId: String,
+    resourceType: ResourceType,
     questionnaireId: String,
-  ): List<QuestionnaireResponse> =
-    withContext(dispatcherProvider.io()) {
-      defaultRepository.fhirEngine.search {
-        filter(QuestionnaireResponse.SUBJECT, { value = "${subjectType.name}/$subjectId" })
+  ): QuestionnaireResponse? {
+    val search =
+      Search(ResourceType.QuestionnaireResponse).apply {
+        filter(QuestionnaireResponse.SUBJECT, { value = "$resourceType/$resourceId" })
         filter(
           QuestionnaireResponse.QUESTIONNAIRE,
-          { value = "${ResourceType.Questionnaire.name}/$questionnaireId" },
+          { value = "${ResourceType.Questionnaire}/$questionnaireId" },
         )
       }
-    }
+    val questionnaireResponses: List<QuestionnaireResponse> = defaultRepository.search(search)
+    return questionnaireResponses.maxByOrNull { it.meta.lastUpdated }
+  }
 
   /**
-   * Loads resources to be populated into a Questionnaire Response.
-   *
-   * @param subjectId can be Patient ID or Group ID
-   * @param subjectType resource type of the ID
+   * Return [Resource]s to be used in the launch context of the questionnaire. Launch context allows
+   * information to be passed into questionnaire based on the context in which the questionnaire is
+   * being evaluated. For example, what patient, what encounter, what user, etc. is "in context" at
+   * the time the questionnaire response is being completed:
+   * https://build.fhir.org/ig/HL7/sdc/StructureDefinition-sdc-questionnaire-launchContext.html
    */
-  private suspend fun loadPopulationResources(
-    subjectId: String,
-    subjectType: ResourceType,
-  ): List<Resource> {
-    val populationResources = arrayListOf<Resource>()
-    try {
-      populationResources.add(defaultRepository.loadResource(subjectId, subjectType))
-    } catch (exception: ResourceNotFoundException) {
-      Timber.e(exception)
-    }
-    if (subjectType == ResourceType.Patient) {
-      loadRelatedPerson(subjectId)?.run { populationResources.add(this) }
-    }
-    return populationResources
+  suspend fun retrievePopulationResources(actionParameters: List<ActionParameter>): List<Resource> {
+    return actionParameters
+      .filter {
+        it.paramType == ActionParameterType.QUESTIONNAIRE_RESPONSE_POPULATION_RESOURCE &&
+          it.resourceType != null &&
+          it.value.isNotEmpty()
+      }
+      .mapNotNull {
+        try {
+          loadResource(it.resourceType!!, it.value)
+        } catch (resourceNotFoundException: ResourceNotFoundException) {
+          null
+        }
+      }
   }
 
-  /** Loads a Patient resource with the given ID. */
-  private suspend fun loadPatient(patientId: String): Patient? {
-    return defaultRepository.loadResource(patientId)
-  }
+  /** Load [Resource] of type [ResourceType] for the provided [resourceIdentifier] */
+  suspend fun loadResource(resourceType: ResourceType, resourceIdentifier: String): Resource? =
+    try {
+      defaultRepository.loadResource(resourceIdentifier, resourceType)
+    } catch (resourceNotFoundException: ResourceNotFoundException) {
+      null
+    }
 
-  /** Loads a RelatedPerson resource that belongs to the given Patient ID. */
-  private suspend fun loadRelatedPerson(patientId: String): RelatedPerson? {
-    return defaultRepository
-      .searchResourceFor<RelatedPerson>(
-        subjectType = ResourceType.Patient,
-        subjectId = patientId,
-        subjectParam = RelatedPerson.PATIENT,
-        configComputedRuleValues = emptyMap(),
-      )
-      .singleOrNull()
+  /** Update the current progress state of the questionnaire. */
+  fun setProgressState(questionnaireState: QuestionnaireProgressState) {
+    _questionnaireProgressStateLiveData.postValue(questionnaireState)
   }
 
-  fun computeQuestionnaireConfigRules(ruleConfigs: List<RuleConfig>): Map<String, Any> =
-    resourceDataRulesExecutor.computeResourceDataRules(ruleConfigs, null)
-
   companion object {
-    private const val QUESTIONNAIRE_RESPONSE_ITEM = "QuestionnaireResponse.item"
-    private const val STRING_INTERPOLATION_PREFIX = "@{"
+    const val CONTAINED_LIST_TITLE = "GeneratedResourcesList"
   }
 }
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt
index f8575760ab..bddc1dac7e 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt
@@ -24,15 +24,13 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.core.os.bundleOf
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireNewActivity
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
 
 interface QuestionnaireHandler {
 
   val startForResult: ActivityResultLauncher<Intent>
 
-  /**
-   * This function launches [QuestionnaireNewActivity] and returns [ActivityResult] on submission.
-   */
+  /** This function launches [QuestionnaireActivity] and returns [ActivityResult] on submission. */
   fun launchQuestionnaire(
     context: Context,
     extraIntentBundle: Bundle = bundleOf(),
@@ -41,9 +39,9 @@ interface QuestionnaireHandler {
   ) {
     if (questionnaireConfig != null) {
       startForResult.launch(
-        Intent(context, QuestionnaireNewActivity::class.java)
+        Intent(context, QuestionnaireActivity::class.java)
           .putExtras(
-            QuestionnaireNewActivity.intentArgs(
+            QuestionnaireActivity.intentArgs(
               questionnaireConfig = questionnaireConfig,
               actionParams = actionParams,
             ),
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainActivityTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainActivityTest.kt
index 1cc3803fc8..bc78a6e3e8 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainActivityTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainActivityTest.kt
@@ -51,7 +51,6 @@ import org.smartregister.fhircore.quest.app.fakes.Faker
 import org.smartregister.fhircore.quest.event.AppEvent
 import org.smartregister.fhircore.quest.event.EventBus
 import org.smartregister.fhircore.quest.robolectric.ActivityRobolectricTest
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
 
 @OptIn(ExperimentalMaterialApi::class)
 @HiltAndroidTest
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
index 295a6d0721..a281329971 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
@@ -88,8 +88,6 @@ import org.smartregister.fhircore.engine.util.extension.decodeResourceFromString
 import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
 import org.smartregister.fhircore.engine.util.extension.find
 import org.smartregister.fhircore.quest.robolectric.ActivityRobolectricTest
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity.Companion.QUESTIONNAIRE_ARG_BARCODE
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity.Companion.QUESTIONNAIRE_FRAGMENT_TAG
 
 @HiltAndroidTest
 class QuestionnaireActivityTest : ActivityRobolectricTest() {
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt
index 28f5889cbe..f6d38fdab6 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt
@@ -35,7 +35,6 @@ import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.domain.model.ActionParameterType
 import org.smartregister.fhircore.quest.robolectric.RobolectricTest
-import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
 import org.smartregister.fhircore.quest.ui.shared.QuestionnaireHandler
 
 @HiltAndroidTest

From 785ad363b6785ed4aff5c2e664059f23200df798 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Wed, 26 Jul 2023 20:35:05 +0300
Subject: [PATCH 18/27] Configure setting Barcode on Questionnaire

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../engine/configuration/QuestionnaireConfig.kt    |  1 +
 .../ui/questionnaire/QuestionnaireActivity.kt      |  1 +
 .../ui/questionnaire/QuestionnaireViewModel.kt     | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
index 9129367956..0f848400ac 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt
@@ -50,6 +50,7 @@ data class QuestionnaireConfig(
   val configRules: List<RuleConfig>? = null,
   val extraParams: List<ActionParameter>? = null,
   val onSubmitActions: List<ActionConfig>? = null,
+  val barcodeLinkId: String = "patient-barcode",
 ) : java.io.Serializable, Parcelable {
 
   fun interpolate(computedValuesMap: Map<String, Any>) =
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
index 2996ae9e08..f662f022d6 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
@@ -281,6 +281,7 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
     const val QUESTIONNAIRE_RESPONSE = "questionnaireResponse"
     const val QUESTIONNAIRE_ACTION_PARAMETERS = "questionnaireActionParameters"
     const val QUESTIONNAIRE_POPULATION_RESOURCES = "questionnairePopulationResources"
+    const val QUESTIONNAIRE_BARCODE = "pa"
 
     fun intentArgs(
       questionnaireConfig: QuestionnaireConfig,
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
index 3fc3975fe0..4a92a1a96b 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -48,6 +48,7 @@ import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.Reference
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
+import org.hl7.fhir.r4.model.StringType
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.cql.LibraryEvaluator
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
@@ -65,6 +66,7 @@ import org.smartregister.fhircore.engine.util.extension.asReference
 import org.smartregister.fhircore.engine.util.extension.cqfLibraryIds
 import org.smartregister.fhircore.engine.util.extension.extractByStructureMap
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
+import org.smartregister.fhircore.engine.util.extension.find
 import org.smartregister.fhircore.engine.util.extension.isIn
 import org.smartregister.fhircore.engine.util.extension.prePopulateInitialValues
 import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForReadingOrEditing
@@ -139,6 +141,18 @@ constructor(
           ?.let { actionParam ->
             item.prePopulateInitialValues(DEFAULT_PLACEHOLDER_PREFIX, actionParam)
           }
+
+        // Set barcode to the configured linkId default: "patient-barcode"
+        if (!questionnaireConfig.resourceIdentifier.isNullOrEmpty()) {
+          find(questionnaireConfig.barcodeLinkId)?.apply {
+            initial =
+              mutableListOf(
+                Questionnaire.QuestionnaireItemInitialComponent()
+                  .setValue(StringType(questionnaireConfig.resourceIdentifier)),
+              )
+            readOnly = true
+          }
+        }
       }
     return questionnaire
   }

From db74635d6bd37955c4bf57f821061406fc2bc708 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Wed, 26 Jul 2023 20:45:02 +0300
Subject: [PATCH 19/27] Reinstate code for setting inital expression

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../ui/questionnaire/QuestionnaireActivity.kt | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
index f662f022d6..b8f99fda70 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
@@ -27,6 +27,7 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.QuestionnaireFragment
+import com.google.android.fhir.datacapture.extensions.flattened
 import com.google.android.fhir.logicalId
 import dagger.hilt.android.AndroidEntryPoint
 import java.io.Serializable
@@ -41,7 +42,9 @@ import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.domain.model.ActionParameterType
 import org.smartregister.fhircore.engine.ui.base.AlertDialogue
 import org.smartregister.fhircore.engine.ui.base.BaseMultiLanguageActivity
+import org.smartregister.fhircore.engine.util.callSuspendFunctionOnField
 import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
+import org.smartregister.fhircore.engine.util.extension.initialExpression
 import org.smartregister.fhircore.engine.util.extension.parcelable
 import org.smartregister.fhircore.engine.util.extension.parcelableArrayList
 import org.smartregister.fhircore.engine.util.extension.showToast
@@ -116,6 +119,7 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
           setNavigationIcon(R.drawable.ic_arrow_back)
           setNavigationOnClickListener { handleBackPress() }
         }
+
         questionnaire = viewModel.retrieveQuestionnaire(questionnaireConfig, actionParameters)
 
         if (questionnaire == null) {
@@ -273,6 +277,36 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
     (supportFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) as QuestionnaireFragment?)
       ?.getQuestionnaireResponse()
 
+  // TODO This maybe required or Not. To be called before Questionnaire is launched
+  suspend fun setInitialExpression(questionnaire: Questionnaire, fragment: QuestionnaireFragment) {
+    // TODO Remove once SDK PR https://github.com/google/android-fhir/pull/2045 is merged
+    questionnaire.item.flattened().forEach { item ->
+      item.initialExpression
+        ?.takeIf { it.language == "application/x-fhir-query" }
+        ?.let { expression ->
+          val answerOptions: List<Questionnaire.QuestionnaireItemAnswerOptionComponent> =
+            QuestionnaireFragment::class.callSuspendFunctionOnField(
+              fragment,
+              "viewModel",
+              "loadAnswerExpressionOptions",
+              item,
+              expression,
+            ) as List<Questionnaire.QuestionnaireItemAnswerOptionComponent>
+          answerOptions
+        }
+        ?.let {
+          it.let {
+            item.initial =
+              it.map {
+                Questionnaire.QuestionnaireItemInitialComponent().apply {
+                  value = it.castToType(it.value)
+                }
+              }
+          }
+        }
+    }
+  }
+
   companion object {
 
     const val QUESTIONNAIRE_FRAGMENT_TAG = "questionnaireFragment"
@@ -281,7 +315,6 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
     const val QUESTIONNAIRE_RESPONSE = "questionnaireResponse"
     const val QUESTIONNAIRE_ACTION_PARAMETERS = "questionnaireActionParameters"
     const val QUESTIONNAIRE_POPULATION_RESOURCES = "questionnairePopulationResources"
-    const val QUESTIONNAIRE_BARCODE = "pa"
 
     fun intentArgs(
       questionnaireConfig: QuestionnaireConfig,

From dcd556f53024070b0cacd4b127c04c6e446eb7f4 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Wed, 26 Jul 2023 20:49:29 +0300
Subject: [PATCH 20/27] Delete unused xml layout

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../res/layout/activity_questionnaire.xml     | 58 -------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 android/engine/src/main/res/layout/activity_questionnaire.xml

diff --git a/android/engine/src/main/res/layout/activity_questionnaire.xml b/android/engine/src/main/res/layout/activity_questionnaire.xml
deleted file mode 100644
index 11a1252b45..0000000000
--- a/android/engine/src/main/res/layout/activity_questionnaire.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2020 Google LLC
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="org.smartregister.fhircore.engine.org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity">
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/btn_edit_qr"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-    <Button
-        android:id="@+id/btn_edit_qr"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|start"
-        android:layout_marginStart="15dp"
-        android:layout_marginEnd="15dp"
-        android:layout_marginBottom="15dp"
-        android:fontFamily="sans-serif-medium"
-        android:padding="10dp"
-        android:text="@string/edit"
-        android:textAllCaps="true"
-        android:textColor="@color/white"
-        android:textSize="18sp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-    <ProgressBar
-        android:id="@+id/progress"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|start"
-        android:layout_marginStart="15dp"
-        android:layout_marginEnd="15dp"
-        android:layout_marginBottom="15dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>

From 4b09775d2aaa1f8136acf99994f48516423c6600 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Thu, 27 Jul 2023 18:02:12 +0300
Subject: [PATCH 21/27] Fix setting subject

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../util/extension/ResourceExtension.kt       |   2 +-
 .../questionnaire/QuestionnaireViewModel.kt   | 105 ++++++++----------
 android/quest/src/main/res/values/strings.xml |   2 +-
 3 files changed, 48 insertions(+), 61 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
index 9e2e131eda..5c00366ba2 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
@@ -241,7 +241,7 @@ fun QuestionnaireResponse.getEncounterId(): String? {
 }
 
 fun Resource.generateMissingId() {
-  if (id.isNullOrEmpty()) id = UUID.randomUUID().toString()
+  if (logicalId.isEmpty() || logicalId.isBlank()) id = UUID.randomUUID().toString()
 }
 
 fun Resource.appendOrganizationInfo(authenticatedOrganizationIds: List<String>?) {
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
index 4a92a1a96b..d30ec88f85 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -67,6 +67,7 @@ import org.smartregister.fhircore.engine.util.extension.cqfLibraryIds
 import org.smartregister.fhircore.engine.util.extension.extractByStructureMap
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
 import org.smartregister.fhircore.engine.util.extension.find
+import org.smartregister.fhircore.engine.util.extension.generateMissingId
 import org.smartregister.fhircore.engine.util.extension.isIn
 import org.smartregister.fhircore.engine.util.extension.prePopulateInitialValues
 import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForReadingOrEditing
@@ -188,7 +189,7 @@ constructor(
         return@launch
       }
 
-      currentQuestionnaireResponse.processMetadata(questionnaire)
+      currentQuestionnaireResponse.processMetadata(questionnaire, questionnaireConfig)
 
       val bundle =
         performExtraction(
@@ -216,53 +217,51 @@ constructor(
         }
 
       bundle?.entry?.forEach { bundleEntryComponent ->
-        val bundleEntryResource: Resource? = bundleEntryComponent.resource
-        bundleEntryResource?.run {
+        bundleEntryComponent.resource?.run {
           applyResourceMetadata()
           defaultRepository.addOrUpdate(resource = this)
+          val subjectType = questionnaireSubjectType(questionnaire, questionnaireConfig)
+
+          if (
+            currentQuestionnaireResponse.subject.reference.isNullOrEmpty() &&
+              subjectType != null &&
+              this.resourceType == subjectType &&
+              logicalId.isNotEmpty()
+          ) {
+            currentQuestionnaireResponse.subject = this.logicalId.asReference(subjectType)
+          }
 
-          // Add resource as member of a (configured) Group
-          group?.let { bundleEntryResource.addMemberToGroup(it) }
+          group?.let { addMemberToGroup(it) }
 
           // Track ids for resources in ListResource added to the QuestionnaireResponse.contained
           val listEntryComponent =
             ListEntryComponent().apply {
               deleted = false
               date = extractionDate
-              item = bundleEntryResource.asReference()
+              item = asReference()
             }
           listResource.addEntry(listEntryComponent)
         }
       }
 
-      val subject =
-        retrieveSubject(
-            questionnaire = questionnaire,
-            questionnaireConfig = questionnaireConfig,
-            bundle = bundle,
-          )
-          ?.apply { id = "$resourceType/$logicalId" }
-
       // Update Group resource to save members
       group?.let { defaultRepository.addOrUpdate(resource = it) }
 
-      // Save questionnaire response
-      if (subject != null) {
+      // Save questionnaire response only if subject is present
+      if (currentQuestionnaireResponse.subject != null) {
         defaultRepository.addOrUpdate(
-          resource =
-            currentQuestionnaireResponse.apply {
-              setQuestionnaire("${questionnaire.resourceType}/${questionnaire.logicalId}")
-              setSubject(subject.asReference())
-              addContained(listResource)
-            },
+          resource = currentQuestionnaireResponse.apply { addContained(listResource) },
         )
       }
 
-      // Update _lastUpdated for resources configured via ActionParameterType.UPDATE_DATE_ON_EDIT
       updateResourcesLastUpdatedProperty(actionParameters)
 
+      // Important to load subject resource to retrieve ID (as reference) correctly
+      val subjectIdType = IdType(currentQuestionnaireResponse.subject.reference)
+      val subject =
+        loadResource(ResourceType.valueOf(subjectIdType.resourceType), subjectIdType.idPart)
+
       if (subject != null && bundle != null) {
-        // Generate CarePlan using configured plan definitions
         val newBundle = bundle.copyBundle(currentQuestionnaireResponse)
         generateCarePlan(
           subject = subject,
@@ -270,14 +269,12 @@ constructor(
           questionnaireConfig = questionnaireConfig,
         )
 
-        // Execute CQL
         executeCql(
           subject = subject,
           bundle = newBundle,
           questionnaire = questionnaire,
         )
 
-        // Cascade update statuses of resources closed by this Questionnaire submission
         viewModelScope.launch {
           fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
             questionnaireConfig = questionnaireConfig,
@@ -289,7 +286,6 @@ constructor(
 
       softDeleteResources(questionnaireConfig)
 
-      // On successful submission callback
       val idTypes =
         bundle?.entry?.map { IdType(it.resource.resourceType.name, it.resource.logicalId) }
           ?: emptyList()
@@ -302,13 +298,34 @@ constructor(
       addEntry(Bundle.BundleEntryComponent().apply { resource = currentQuestionnaireResponse })
     }
 
-  private fun QuestionnaireResponse.processMetadata(questionnaire: Questionnaire) {
+  private fun QuestionnaireResponse.processMetadata(
+    questionnaire: Questionnaire,
+    questionnaireConfig: QuestionnaireConfig,
+  ) {
     status = QuestionnaireResponse.QuestionnaireResponseStatus.COMPLETED
     authored = Date()
+
     questionnaire.useContext
       .filter { it.hasValueCodeableConcept() }
       .forEach { it.valueCodeableConcept.coding.forEach { coding -> this.meta.addTag(coding) } }
     applyResourceMetadata()
+    setQuestionnaire("${questionnaire.resourceType}/${questionnaire.logicalId}")
+
+    // Set subject if exists
+    val resourceType = questionnaireSubjectType(questionnaire, questionnaireConfig)
+    val resourceIdentifier = questionnaireConfig.resourceIdentifier
+    if (resourceType != null && !resourceIdentifier.isNullOrEmpty()) {
+      subject = resourceIdentifier.asReference(resourceType)
+    }
+  }
+
+  private fun questionnaireSubjectType(
+    questionnaire: Questionnaire,
+    questionnaireConfig: QuestionnaireConfig,
+  ): ResourceType? {
+    val questionnaireSubjectType = questionnaire.subjectType.firstOrNull()?.code
+    return questionnaireConfig.resourceType
+      ?: questionnaireSubjectType?.let { ResourceType.valueOf(it) }
   }
 
   private fun Resource?.applyResourceMetadata(): Resource? {
@@ -316,6 +333,7 @@ constructor(
       appendOrganizationInfo(authenticatedOrganizationIds)
       appendPractitionerInfo(practitionerId)
       updateLastUpdated()
+      generateMissingId()
     }
     return this
   }
@@ -458,37 +476,6 @@ constructor(
     }
   }
 
-  /**
-   * This retrieves and returns [Resource] as subject if [QuestionnaireConfig.resourceType] and
-   * [QuestionnaireConfig.resourceIdentifier] are provided. This will be the typical case for
-   * subsequent [Questionnaire] submissions where the [QuestionnaireResponse.subject] already
-   * exists. For instances where the [Questionnaire] is submitted the first time (e.g. during
-   * registration events), the subject [Resource] will be included and accessed from the extracted
-   * resources in the [Bundle.entry]
-   */
-  suspend fun retrieveSubject(
-    questionnaire: Questionnaire,
-    questionnaireConfig: QuestionnaireConfig,
-    bundle: Bundle?,
-  ): Resource? {
-    val questionnaireSubjectType = questionnaire.subjectType.firstOrNull()?.code
-    val resourceType =
-      questionnaireConfig.resourceType ?: questionnaireSubjectType?.let { ResourceType.valueOf(it) }
-    val resourceIdentifier = questionnaireConfig.resourceIdentifier
-
-    if (resourceType != null && !resourceIdentifier.isNullOrEmpty()) {
-      return loadResource(resourceType, resourceIdentifier)
-    }
-    questionnaire.subjectType.forEach {
-      val resourceType = ResourceType.valueOf(it.code)
-      return bundle
-        ?.entry
-        ?.firstOrNull { entryComponent -> entryComponent.resource.resourceType == resourceType }
-        ?.resource
-    }
-    return null
-  }
-
   /** Adds [Resource] to [Group.member] */
   fun Resource.addMemberToGroup(group: Group) {
     this.run {
diff --git a/android/quest/src/main/res/values/strings.xml b/android/quest/src/main/res/values/strings.xml
index ac36854a04..765e7fc1c5 100644
--- a/android/quest/src/main/res/values/strings.xml
+++ b/android/quest/src/main/res/values/strings.xml
@@ -106,7 +106,7 @@
     <string name="missing_subject_type">Missing subject type on questionnaire. Provide Questionnaire.subjectType to resolve.</string>
     <string name="missing_questionnaire_config">QuestionnaireConfig is required but missing.</string>
     <string name="error_populating_questionnaire">Unable to populate the questionnaire. Invalid Response.</string>
-    <string name="extraction_in_progress">Questionnaire data extraction in progress. Please wait…</string>
+    <string name="extraction_in_progress">Processing questionnaire data…</string>
     <string name="loading_questionnaire">Loading questionnaire…</string>
 
 </resources>

From fb16c552a9b82f47c571fa3e9f2ff9c173db6919 Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Fri, 28 Jul 2023 14:11:00 +0300
Subject: [PATCH 22/27] Fix updating resources

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../engine/data/local/DefaultRepository.kt    |  3 +-
 .../questionnaire/QuestionnaireViewModel.kt   | 70 +++++++++++--------
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
index af481d9466..0a625132d1 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
@@ -229,7 +229,8 @@ constructor(
       resource.updateLastUpdated()
       try {
         fhirEngine.get(resource.resourceType, resource.logicalId).run {
-          fhirEngine.update(updateFrom(resource))
+          val updateFrom = updateFrom(resource)
+          fhirEngine.update(updateFrom)
         }
       } catch (resourceNotFoundException: ResourceNotFoundException) {
         create(addMandatoryTags, resource)
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
index d30ec88f85..67a437cc7a 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -49,6 +49,7 @@ import org.hl7.fhir.r4.model.Reference
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 import org.hl7.fhir.r4.model.StringType
+import org.smartregister.fhircore.engine.configuration.GroupResourceConfig
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.cql.LibraryEvaluator
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
@@ -65,6 +66,7 @@ import org.smartregister.fhircore.engine.util.extension.appendPractitionerInfo
 import org.smartregister.fhircore.engine.util.extension.asReference
 import org.smartregister.fhircore.engine.util.extension.cqfLibraryIds
 import org.smartregister.fhircore.engine.util.extension.extractByStructureMap
+import org.smartregister.fhircore.engine.util.extension.extractId
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
 import org.smartregister.fhircore.engine.util.extension.find
 import org.smartregister.fhircore.engine.util.extension.generateMissingId
@@ -211,17 +213,10 @@ constructor(
           date = extractionDate
         }
 
-      val group =
-        questionnaireConfig.groupResource?.groupIdentifier?.let { groupId ->
-          defaultRepository.loadResource<Group>(groupId)
-        }
-
       bundle?.entry?.forEach { bundleEntryComponent ->
         bundleEntryComponent.resource?.run {
           applyResourceMetadata()
-          defaultRepository.addOrUpdate(resource = this)
           val subjectType = questionnaireSubjectType(questionnaire, questionnaireConfig)
-
           if (
             currentQuestionnaireResponse.subject.reference.isNullOrEmpty() &&
               subjectType != null &&
@@ -231,7 +226,14 @@ constructor(
             currentQuestionnaireResponse.subject = this.logicalId.asReference(subjectType)
           }
 
-          group?.let { addMemberToGroup(it) }
+          // TODO Fix StructureMaps to use the QuestionnaireResponse subject directly
+          if (this.resourceType == subjectType) {
+            this.id = currentQuestionnaireResponse.subject.extractId()
+          }
+
+          defaultRepository.addOrUpdate(resource = this)
+
+          addMemberToConfiguredGroup(questionnaireConfig.groupResource)
 
           // Track ids for resources in ListResource added to the QuestionnaireResponse.contained
           val listEntryComponent =
@@ -244,9 +246,6 @@ constructor(
         }
       }
 
-      // Update Group resource to save members
-      group?.let { defaultRepository.addOrUpdate(resource = it) }
-
       // Save questionnaire response only if subject is present
       if (currentQuestionnaireResponse.subject != null) {
         defaultRepository.addOrUpdate(
@@ -476,25 +475,36 @@ constructor(
     }
   }
 
-  /** Adds [Resource] to [Group.member] */
-  fun Resource.addMemberToGroup(group: Group) {
-    this.run {
-      if (
-        this.resourceType.isIn(
-          ResourceType.CareTeam,
-          ResourceType.Device,
-          ResourceType.Group,
-          ResourceType.HealthcareService,
-          ResourceType.Location,
-          ResourceType.Organization,
-          ResourceType.Patient,
-          ResourceType.Practitioner,
-          ResourceType.PractitionerRole,
-          ResourceType.Specimen,
-        )
-      ) {
-        group.addMember(Group.GroupMemberComponent().apply { entity = asReference() })
-      }
+  /**
+   * Adds [Resource] to [Group.member] if the member does not exist and if [Resource.logicalId] is
+   * NOT the same as the retrieved [GroupResourceConfig.groupIdentifier] (Cannot add a [Group] as
+   * member of itself.
+   */
+  private suspend fun Resource.addMemberToConfiguredGroup(groupConfig: GroupResourceConfig?) {
+    val group: Group =
+      groupConfig?.groupIdentifier?.let { loadResource(ResourceType.Group, it) } as Group? ?: return
+    val reference = asReference()
+    val member = group.member.find { it.entity == reference }
+
+    // Cannot add Group as member of itself; Cannot not duplicate existing members
+    if (this.logicalId == group.logicalId || member != null) return
+
+    if (
+      this.resourceType.isIn(
+        ResourceType.CareTeam,
+        ResourceType.Device,
+        ResourceType.Group,
+        ResourceType.HealthcareService,
+        ResourceType.Location,
+        ResourceType.Organization,
+        ResourceType.Patient,
+        ResourceType.Practitioner,
+        ResourceType.PractitionerRole,
+        ResourceType.Specimen,
+      )
+    ) {
+      group.addMember(Group.GroupMemberComponent().apply { entity = reference })
+      defaultRepository.addOrUpdate(resource = group)
     }
   }
 

From 51b68f73d812b2f16fa1260bda1368b20bb88b6b Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Fri, 28 Jul 2023 16:36:40 +0300
Subject: [PATCH 23/27] Refactor engine module failing tests

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../configuration/QuestionnaireConfigTest.kt  |  3 -
 .../engine/cql/LibraryEvaluatorTest.kt        | 65 +++++++------------
 2 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfigTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfigTest.kt
index 29d5e49acc..abf8b039b9 100644
--- a/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfigTest.kt
+++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfigTest.kt
@@ -49,9 +49,6 @@ class QuestionnaireConfigTest : RobolectricTest() {
       QuestionnaireConfig(
         id = "@{id}",
         title = "@{title}",
-        setPractitionerDetails = false,
-        setOrganizationDetails = false,
-        setAppVersion = false,
         type = QuestionnaireType.EDIT,
         resourceIdentifier = "@{resourceIdentifier}",
         confirmationDialog =
diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/cql/LibraryEvaluatorTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/cql/LibraryEvaluatorTest.kt
index 1ac654436e..1a825ff796 100644
--- a/android/engine/src/test/java/org/smartregister/fhircore/engine/cql/LibraryEvaluatorTest.kt
+++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/cql/LibraryEvaluatorTest.kt
@@ -62,35 +62,44 @@ class LibraryEvaluatorTest : RobolectricTest() {
 
   @get:Rule val hiltRule = HiltAndroidRule(this)
 
-  private val application = ApplicationProvider.getApplicationContext<Application>()
-
   @Inject lateinit var gson: Gson
-  private val configurationRegistry = Faker.buildTestConfigurationRegistry()
 
   @Inject lateinit var configService: ConfigService
 
   @Inject lateinit var configRulesExecutor: ConfigRulesExecutor
-
-  var evaluator: LibraryEvaluator? = null
-  var libraryData = ""
-  var helperData = ""
-  var valueSetData = ""
-  var testData = ""
-  var result = ""
-  var evaluatorId = "ANCRecommendationA2"
-  var context = "Patient"
-  var contextLabel = "mom-with-anemia"
+  private val application = ApplicationProvider.getApplicationContext<Application>()
+  private val configurationRegistry = Faker.buildTestConfigurationRegistry()
+  val fhirEngine = mockk<FhirEngine>()
+  private var evaluator: LibraryEvaluator? = null
+  private var libraryData = ""
+  private var helperData = ""
+  private var valueSetData = ""
+  private var testData = ""
+  private var result = ""
+  private var evaluatorId = "ANCRecommendationA2"
+  private var context = "Patient"
+  private var contextLabel = "mom-with-anemia"
 
   @Before
   fun setUp() {
     hiltRule.inject()
+
+    val defaultRepository =
+      DefaultRepository(
+        fhirEngine = fhirEngine,
+        dispatcherProvider = DefaultDispatcherProvider(),
+        sharedPreferencesHelper = SharedPreferencesHelper(application, gson),
+        configurationRegistry = configurationRegistry,
+        configService = configService,
+        configRulesExecutor = configRulesExecutor,
+      )
     try {
       libraryData = FileUtil.readJsonFile("test/resources/cql/libraryevaluator/library.json")
       helperData = FileUtil.readJsonFile("test/resources/cql/libraryevaluator/helper.json")
       valueSetData = FileUtil.readJsonFile("test/resources/cql/libraryevaluator/valueSet.json")
       testData = FileUtil.readJsonFile("test/resources/cql/libraryevaluator/patient.json")
       result = FileUtil.readJsonFile("test/resources/cql/libraryevaluator/result.json")
-      evaluator = LibraryEvaluator().apply { initialize() }
+      evaluator = LibraryEvaluator(defaultRepository).apply { initialize() }
     } catch (e: IOException) {
       Timber.e(e, e.message)
     }
@@ -180,18 +189,6 @@ class LibraryEvaluatorTest : RobolectricTest() {
       dataBundle.entry.first { it.resource.resourceType == ResourceType.Patient }.resource
         as Patient
 
-    val fhirEngine = mockk<FhirEngine>()
-    val sharedPreferencesHelper = SharedPreferencesHelper(application, gson)
-    val defaultRepository =
-      DefaultRepository(
-        fhirEngine,
-        DefaultDispatcherProvider(),
-        sharedPreferencesHelper,
-        configurationRegistry,
-        configService,
-        configRulesExecutor,
-      )
-
     coEvery { fhirEngine.get(ResourceType.Library, cqlLibrary.logicalId) } returns cqlLibrary
     coEvery { fhirEngine.get(ResourceType.Library, fhirHelpersLibrary.logicalId) } returns
       fhirHelpersLibrary
@@ -202,7 +199,6 @@ class LibraryEvaluatorTest : RobolectricTest() {
         cqlLibrary.logicalId,
         patient,
         dataBundle.apply { entry.removeIf { it.resource.resourceType == ResourceType.Patient } },
-        defaultRepository,
         true,
       )
     }
@@ -238,29 +234,16 @@ class LibraryEvaluatorTest : RobolectricTest() {
       dataBundle.entry.first { it.resource.resourceType == ResourceType.Patient }.resource
         as Patient
 
-    val fhirEngine = mockk<FhirEngine>()
-    val sharedPreferencesHelper = SharedPreferencesHelper(application, gson)
-    val defaultRepository =
-      DefaultRepository(
-        fhirEngine,
-        DefaultDispatcherProvider(),
-        sharedPreferencesHelper,
-        configurationRegistry,
-        configService,
-        configRulesExecutor,
-      )
-
     coEvery { fhirEngine.get(ResourceType.Library, cqlLibrary.logicalId) } returns cqlLibrary
     coEvery { fhirEngine.get(ResourceType.Library, fhirHelpersLibrary.logicalId) } returns
       fhirHelpersLibrary
     coEvery { fhirEngine.create(any()) } answers { listOf() }
 
-    var result = runBlocking {
+    val result = runBlocking {
       evaluator!!.runCqlLibrary(
         cqlLibrary.logicalId,
         patient,
         dataBundle.apply { entry.removeIf { it.resource.resourceType == ResourceType.Patient } },
-        defaultRepository,
         false,
       )
     }

From 0b607e5946e2f182da6e9d9b1d788a0aaf7b9f3b Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Mon, 31 Jul 2023 17:18:12 +0300
Subject: [PATCH 24/27] Refactor QuestionnaireViewModelTest

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../util/extension/QuestionnaireExtension.kt  |    6 +-
 .../questionnaire/QuestionnaireViewModel.kt   |   43 +-
 .../fhircore/quest/CqlContentTest.kt          |   84 +-
 .../quest/StructureMapUtilitiesTest.kt        |    4 +-
 .../quest/ui/main/AppMainActivityTest.kt      |    1 +
 .../QuestionnaireActivityTest.kt              | 1050 +-------
 .../QuestionnaireViewModelTest.kt             | 2208 +++--------------
 .../shared/model/QuestionnaireHandlerTest.kt  |    1 +
 8 files changed, 437 insertions(+), 2960 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt
index c145d2bb75..e93cccff58 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireExtension.kt
@@ -55,7 +55,7 @@ fun Questionnaire.extractByStructureMap() =
 
 fun Questionnaire.cqfLibraryIds() =
   this.extension
-    .filter { it.url.contains("cqf-library") }
+    .filter { it.url.contains("cqf-library", ignoreCase = true) }
     .mapNotNull { it.value?.asStringValue()?.replace("Library/", "") }
 
 fun QuestionnaireResponse.findSubject(bundle: Bundle?) =
@@ -155,9 +155,7 @@ fun List<Questionnaire.QuestionnaireItemComponent>.prePopulateInitialValues(
   forEach { item ->
     prePopulationParams
       .firstOrNull {
-        it.linkId == item.linkId &&
-          !it.value.isNullOrEmpty() &&
-          !it.value.contains(interpolationPrefix)
+        it.linkId == item.linkId && it.value.isNotEmpty() && !it.value.contains(interpolationPrefix)
       }
       ?.let { actionParam ->
         /**
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
index 67a437cc7a..9efc6e11c0 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -45,7 +45,6 @@ import org.hl7.fhir.r4.model.ListResource.ListEntryComponent
 import org.hl7.fhir.r4.model.Patient
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
-import org.hl7.fhir.r4.model.Reference
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 import org.hl7.fhir.r4.model.StringType
@@ -233,7 +232,7 @@ constructor(
 
           defaultRepository.addOrUpdate(resource = this)
 
-          addMemberToConfiguredGroup(questionnaireConfig.groupResource)
+          addMemberToConfiguredGroup(this, questionnaireConfig.groupResource)
 
           // Track ids for resources in ListResource added to the QuestionnaireResponse.contained
           val listEntryComponent =
@@ -392,12 +391,12 @@ constructor(
    * has an answer.
    */
   fun saveDraftQuestionnaire(questionnaireResponse: QuestionnaireResponse) {
-    val questionnaireHasAnswer =
-      questionnaireResponse.item.any {
-        it.answer.any { answerComponent -> answerComponent.hasValue() }
-      }
-    if (questionnaireHasAnswer) {
-      viewModelScope.launch(dispatcherProvider.io()) {
+    viewModelScope.launch {
+      val questionnaireHasAnswer =
+        questionnaireResponse.item.any {
+          it.answer.any { answerComponent -> answerComponent.hasValue() }
+        }
+      if (questionnaireHasAnswer) {
         questionnaireResponse.status = QuestionnaireResponse.QuestionnaireResponseStatus.INPROGRESS
         defaultRepository.addOrUpdate(addMandatoryTags = true, resource = questionnaireResponse)
       }
@@ -418,10 +417,24 @@ constructor(
 
     updateOnEditParams?.forEach { param ->
       try {
-        val resource = defaultRepository.loadResource(Reference(param.value))
-        defaultRepository.addOrUpdate(resource = resource)
+        defaultRepository.run {
+          val resourceType = param.resourceType
+          if (resourceType != null) {
+            loadResource(resourceType, param.value)?.let { addOrUpdate(resource = it) }
+          } else {
+            val valueResourceType = param.value.substringBefore("/")
+            val valueResourceId = param.value.substringAfter("/")
+            addOrUpdate(
+              resource = loadResource(valueResourceId, ResourceType.valueOf(valueResourceType)),
+            )
+          }
+        }
       } catch (resourceNotFoundException: ResourceNotFoundException) {
         Timber.e("Unable to update resource's _lastUpdated", resourceNotFoundException)
+      } catch (illegalArgumentException: IllegalArgumentException) {
+        Timber.e(
+          "No enum constant org.hl7.fhir.r4.model.ResourceType.${param.value.substringBefore("/")}",
+        )
       }
     }
   }
@@ -480,17 +493,17 @@ constructor(
    * NOT the same as the retrieved [GroupResourceConfig.groupIdentifier] (Cannot add a [Group] as
    * member of itself.
    */
-  private suspend fun Resource.addMemberToConfiguredGroup(groupConfig: GroupResourceConfig?) {
+  suspend fun addMemberToConfiguredGroup(resource: Resource, groupConfig: GroupResourceConfig?) {
     val group: Group =
       groupConfig?.groupIdentifier?.let { loadResource(ResourceType.Group, it) } as Group? ?: return
-    val reference = asReference()
-    val member = group.member.find { it.entity == reference }
+    val reference = resource.asReference()
+    val member = group.member.find { it.entity.reference.equals(reference.reference, true) }
 
     // Cannot add Group as member of itself; Cannot not duplicate existing members
-    if (this.logicalId == group.logicalId || member != null) return
+    if (resource.logicalId == group.logicalId || member != null) return
 
     if (
-      this.resourceType.isIn(
+      resource.resourceType.isIn(
         ResourceType.CareTeam,
         ResourceType.Device,
         ResourceType.Group,
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/CqlContentTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/CqlContentTest.kt
index 9af2ab15ae..8bd6726d88 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/CqlContentTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/CqlContentTest.kt
@@ -47,7 +47,6 @@ import org.smartregister.fhircore.engine.configuration.app.ConfigService
 import org.smartregister.fhircore.engine.cql.LibraryEvaluator
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
 import org.smartregister.fhircore.engine.rulesengine.ConfigRulesExecutor
-import org.smartregister.fhircore.engine.util.DefaultDispatcherProvider
 import org.smartregister.fhircore.quest.app.fakes.Faker
 import org.smartregister.fhircore.quest.robolectric.RobolectricTest
 
@@ -57,14 +56,28 @@ class CqlContentTest : RobolectricTest() {
   @get:Rule(order = 0) var hiltRule = HiltAndroidRule(this)
   private val fhirContext: FhirContext = FhirContext.forCached(FhirVersionEnum.R4)
   private val parser = fhirContext.newJsonParser()!!
-  private val evaluator = LibraryEvaluator().apply { initialize() }
   private val configurationRegistry = Faker.buildTestConfigurationRegistry()
   private val configService: ConfigService = mockk()
   private val configRulesExecutor: ConfigRulesExecutor = mockk()
+  private lateinit var evaluator: LibraryEvaluator
+  private lateinit var defaultRepository: DefaultRepository
+  val fhirEngine = mockk<FhirEngine>()
 
   @Before
   fun setUp() {
     hiltRule.inject()
+    defaultRepository =
+      spyk(
+        DefaultRepository(
+          fhirEngine = fhirEngine,
+          dispatcherProvider = coroutineTestRule.testDispatcherProvider,
+          sharedPreferencesHelper = mockk(),
+          configurationRegistry = configurationRegistry,
+          configService = configService,
+          configRulesExecutor = configRulesExecutor,
+        ),
+      )
+    evaluator = LibraryEvaluator(defaultRepository).apply { initialize() }
   }
 
   @Test
@@ -101,17 +114,6 @@ class CqlContentTest : RobolectricTest() {
       }
 
     val fhirEngine = mockk<FhirEngine>()
-    val defaultRepository =
-      spyk(
-        DefaultRepository(
-          fhirEngine,
-          DefaultDispatcherProvider(),
-          mockk(),
-          configurationRegistry,
-          configService,
-          configRulesExecutor,
-        ),
-      )
 
     coEvery { fhirEngine.get(ResourceType.Library, cqlLibrary.logicalId) } returns cqlLibrary
     coEvery { fhirEngine.get(ResourceType.Library, fhirHelpersLibrary.logicalId) } returns
@@ -121,13 +123,13 @@ class CqlContentTest : RobolectricTest() {
 
     val result = runBlocking {
       evaluator.runCqlLibrary(
-        cqlLibrary.logicalId,
-        patient,
-        dataBundle.apply {
-          this.entry.removeIf { it.resource.resourceType == ResourceType.Patient }
-        },
-        defaultRepository,
-        true,
+        libraryId = cqlLibrary.logicalId,
+        patient = patient,
+        data =
+          dataBundle.apply {
+            this.entry.removeIf { it.resource.resourceType == ResourceType.Patient }
+          },
+        outputLog = true,
       )
     }
 
@@ -167,19 +169,6 @@ class CqlContentTest : RobolectricTest() {
           .forEach { addEntry().apply { resource = it } }
       }
 
-    val fhirEngine = mockk<FhirEngine>()
-    val defaultRepository =
-      spyk(
-        DefaultRepository(
-          fhirEngine,
-          DefaultDispatcherProvider(),
-          mockk(),
-          configurationRegistry,
-          configService,
-          configRulesExecutor,
-        ),
-      )
-
     coEvery { fhirEngine.get(ResourceType.Library, cqlLibrary.logicalId) } returns cqlLibrary
     coEvery { fhirEngine.get(ResourceType.Library, fhirHelpersLibrary.logicalId) } returns
       fhirHelpersLibrary
@@ -188,13 +177,13 @@ class CqlContentTest : RobolectricTest() {
 
     val result = runBlocking {
       evaluator.runCqlLibrary(
-        cqlLibrary.logicalId,
-        patient,
-        dataBundle.apply {
-          this.entry.removeIf { it.resource.resourceType == ResourceType.Patient }
-        },
-        defaultRepository,
-        true,
+        libraryId = cqlLibrary.logicalId,
+        patient = patient,
+        data =
+          dataBundle.apply {
+            this.entry.removeIf { it.resource.resourceType == ResourceType.Patient }
+          },
+        outputLog = true,
       )
     }
 
@@ -239,19 +228,6 @@ class CqlContentTest : RobolectricTest() {
         }
       }
 
-    val fhirEngine = mockk<FhirEngine>()
-    val defaultRepository =
-      spyk(
-        DefaultRepository(
-          fhirEngine,
-          DefaultDispatcherProvider(),
-          mockk(),
-          configurationRegistry,
-          configService,
-          configRulesExecutor,
-        ),
-      )
-
     coEvery { fhirEngine.get(ResourceType.Library, cqlLibrary.logicalId) } returns cqlLibrary
     coEvery { fhirEngine.get(ResourceType.Library, fhirHelpersLibrary.logicalId) } returns
       fhirHelpersLibrary
@@ -259,7 +235,7 @@ class CqlContentTest : RobolectricTest() {
     coEvery { configService.provideResourceTags(any()) } returns listOf()
 
     val result = runBlocking {
-      evaluator.runCqlLibrary(cqlLibrary.logicalId, null, dataBundle, defaultRepository)
+      evaluator.runCqlLibrary(libraryId = cqlLibrary.logicalId, patient = null, data = dataBundle)
     }
 
     println(result)
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/StructureMapUtilitiesTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/StructureMapUtilitiesTest.kt
index e27dca7a27..58afd1b63a 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/StructureMapUtilitiesTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/StructureMapUtilitiesTest.kt
@@ -137,7 +137,9 @@ class StructureMapUtilitiesTest : RobolectricTest() {
     val questionnaire = iParser.parseResource(Questionnaire::class.java, questionnaireJson)
     val questionnaireResponse: QuestionnaireResponse
 
-    runBlocking { questionnaireResponse = firstTaskpulate(questionnaire, patient, immunization) }
+    runBlocking {
+      questionnaireResponse = ResourceMapper.populate(questionnaire, patient, immunization)
+    }
 
     structureMapUtilities.transform(contextR4, questionnaireResponse, structureMap, targetResource)
 
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainActivityTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainActivityTest.kt
index bc78a6e3e8..1cc3803fc8 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainActivityTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainActivityTest.kt
@@ -51,6 +51,7 @@ import org.smartregister.fhircore.quest.app.fakes.Faker
 import org.smartregister.fhircore.quest.event.AppEvent
 import org.smartregister.fhircore.quest.event.EventBus
 import org.smartregister.fhircore.quest.robolectric.ActivityRobolectricTest
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
 
 @OptIn(ExperimentalMaterialApi::class)
 @HiltAndroidTest
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
index a281329971..42621f4861 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
@@ -17,1077 +17,31 @@
 package org.smartregister.fhircore.quest.ui.questionnaire
 
 import android.app.Activity
-import android.app.AlertDialog
 import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.MenuItem
-import android.widget.Button
-import android.widget.TextView
-import androidx.core.os.bundleOf
-import androidx.fragment.app.commitNow
-import androidx.fragment.app.setFragmentResult
 import androidx.test.core.app.ApplicationProvider
-import ca.uhn.fhir.context.FhirContext
-import ca.uhn.fhir.context.FhirVersionEnum
-import ca.uhn.fhir.parser.IParser
-import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.datacapture.DataCaptureConfig
-import com.google.android.fhir.datacapture.QuestionnaireFragment
-import com.google.android.fhir.search.Search
-import com.google.android.fhir.search.search
-import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.just
-import io.mockk.mockk
-import io.mockk.runs
-import io.mockk.spyk
-import io.mockk.unmockkObject
-import io.mockk.verify
-import java.util.Date
-import javax.inject.Inject
-import kotlin.test.assertTrue
-import kotlinx.coroutines.test.runTest
-import org.hl7.fhir.r4.model.BooleanType
-import org.hl7.fhir.r4.model.Enumerations.DataType
-import org.hl7.fhir.r4.model.Extension
-import org.hl7.fhir.r4.model.Immunization
-import org.hl7.fhir.r4.model.Patient
-import org.hl7.fhir.r4.model.Questionnaire
-import org.hl7.fhir.r4.model.QuestionnaireResponse
-import org.hl7.fhir.r4.model.Resource
-import org.hl7.fhir.r4.model.ResourceType
-import org.hl7.fhir.r4.model.StringType
-import org.junit.After
-import org.junit.Assert
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.robolectric.Robolectric
-import org.robolectric.Shadows.shadowOf
-import org.robolectric.shadows.ShadowAlertDialog
-import org.robolectric.util.ReflectionHelpers
 import org.smartregister.fhircore.engine.R
-import org.smartregister.fhircore.engine.configuration.ConfirmationDialog
-import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
-import org.smartregister.fhircore.engine.data.local.DefaultRepository
-import org.smartregister.fhircore.engine.domain.model.ActionParameter
-import org.smartregister.fhircore.engine.domain.model.ActionParameterType
-import org.smartregister.fhircore.engine.domain.model.QuestionnaireType
-import org.smartregister.fhircore.engine.domain.model.RuleConfig
-import org.smartregister.fhircore.engine.rulesengine.ResourceDataRulesExecutor
-import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
-import org.smartregister.fhircore.engine.util.DefaultDispatcherProvider
-import org.smartregister.fhircore.engine.util.DispatcherProvider
-import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
-import org.smartregister.fhircore.engine.util.extension.decodeResourceFromString
-import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
-import org.smartregister.fhircore.engine.util.extension.find
 import org.smartregister.fhircore.quest.robolectric.ActivityRobolectricTest
 
 @HiltAndroidTest
 class QuestionnaireActivityTest : ActivityRobolectricTest() {
 
   @get:Rule(order = 0) var hiltRule = HiltAndroidRule(this)
-
-  @Inject lateinit var fhirCarePlanGenerator: FhirCarePlanGenerator
-
-  @Inject lateinit var jsonParser: IParser
-
-  @Inject lateinit var resourceDataRulesExecutor: ResourceDataRulesExecutor
   private lateinit var questionnaireActivity: QuestionnaireActivity
-  private lateinit var questionnaireFragment: QuestionnaireFragment
-  private lateinit var intent: Intent
-  private lateinit var questionnaireConfig: QuestionnaireConfig
-  private val dispatcherProvider: DispatcherProvider = spyk(DefaultDispatcherProvider())
-  private val fhirEngine: FhirEngine = mockk()
-  private val defaultRepository: DefaultRepository =
-    DefaultRepository(fhirEngine, dispatcherProvider, mockk(), mockk(), mockk(), mockk())
-
-  @BindValue
-  val questionnaireViewModel: QuestionnaireViewModel =
-    spyk(
-      QuestionnaireViewModel(
-        defaultRepository = defaultRepository,
-        configurationRegistry = mockk(),
-        transformSupportServices = mockk(),
-        dispatcherProvider = dispatcherProvider,
-        sharedPreferencesHelper = mockk(),
-        libraryEvaluator = mockk(),
-        fhirCarePlanGenerator = mockk(),
-        resourceDataRulesExecutor = mockk(),
-      ),
-    )
 
   @Before
   fun setUp() {
-    // TODO Proper set up
     hiltRule.inject()
     ApplicationProvider.getApplicationContext<Context>().apply { setTheme(R.style.AppTheme) }
-    val questionnaireConfigRules =
-      listOf(
-        RuleConfig(
-          name = "humanReadableId",
-          description = "Generate OpenSRP ID",
-          condition = "true",
-          actions = listOf("data.put('humanReadableId', service.generateRandomSixDigitInt())"),
-        ),
-      )
-    questionnaireConfig =
-      QuestionnaireConfig(
-        id = "patient-registration",
-        title = "Patient registration",
-        "form",
-        resourceIdentifier = "Patient/P1",
-        extraParams =
-          listOf(
-            ActionParameter(
-              paramType = ActionParameterType.PREPOPULATE,
-              linkId = "household.id",
-              dataType = DataType.INTEGER,
-              key = "opensrpId",
-              value = "@{humanReadableId}",
-            ),
-          ),
-        configRules = questionnaireConfigRules,
-      )
-    val actionParams =
-      listOf(
-        ActionParameter(
-          paramType = ActionParameterType.PREPOPULATE,
-          linkId = "25cc8d26-ac42-475f-be79-6f1d62a44881",
-          dataType = DataType.INTEGER,
-          key = "maleCondomPreviousBalance",
-          value = "100",
-        ),
-      )
-    intent =
-      Intent()
-        .putExtras(
-          bundleOf(
-            Pair(QuestionnaireActivity.QUESTIONNAIRE_CONFIG, questionnaireConfig),
-            Pair(QuestionnaireActivity.QUESTIONNAIRE_ACTION_PARAMETERS, actionParams),
-          ),
-        )
-
-    coEvery {
-      questionnaireViewModel.computeQuestionnaireConfigRules(questionnaireConfigRules)
-    } returns mapOf("humanReadableId" to "199290")
-    coEvery { questionnaireViewModel.libraryEvaluator.initialize() } just runs
-    coEvery { questionnaireViewModel.loadQuestionnaire(any(), any()) } returns
-      Questionnaire().apply { id = "12345" }
-
-    buildActivity(buildQuestionnaireWithConstraints(), questionnaireConfig)
-  }
-
-  private fun buildActivity(
-    questionnaire: Questionnaire,
-    questionnaireConfig: QuestionnaireConfig,
-  ) {
-    questionnaireFragment = spyk()
-
-    questionnaireFragment.apply {
-      arguments = bundleOf(Pair("questionnaire", questionnaire.encodeResourceToString()))
-    }
-
-    val controller = Robolectric.buildActivity(QuestionnaireActivity::class.java, intent)
-    questionnaireActivity = controller.create().resume().get()
-    questionnaireActivity.supportFragmentManager.executePendingTransactions()
-    questionnaireActivity.supportFragmentManager.commitNow {
-      add(questionnaireFragment, QUESTIONNAIRE_FRAGMENT_TAG)
-    }
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaireConfig", questionnaireConfig)
-  }
-
-  @After
-  fun cleanup() {
-    unmockkObject(SharedPreferencesHelper)
-  }
-
-  @Test
-  fun testActivityShouldNotNull() {
-    Assert.assertNotNull(questionnaireActivity)
-  }
-
-  @Test
-  fun testIntentArgsShouldInsertValues() {
-    val questionnaireResponse = QuestionnaireResponse()
-    val patient = Patient().apply { id = "my-patient-id" }
-    val populationResources = ArrayList<Resource>()
-    populationResources.add(patient)
-    val result =
-      QuestionnaireActivity.intentArgs(
-        questionnaireConfig =
-          QuestionnaireConfig(
-            id = "my-form",
-            resourceIdentifier = "1234",
-            type = QuestionnaireType.READ_ONLY,
-          ),
-        actionParams =
-          listOf(
-            ActionParameter(
-              paramType = ActionParameterType.PREPOPULATE,
-              linkId = "my-param",
-              dataType = DataType.INTEGER,
-              key = "my-key",
-              value = "100",
-            ),
-          ),
-      )
-
-    val actualQuestionnaireConfig =
-      result.getSerializable(QuestionnaireActivity.QUESTIONNAIRE_CONFIG) as QuestionnaireConfig
-    val actualActionParams =
-      result.getSerializable(QuestionnaireActivity.QUESTIONNAIRE_ACTION_PARAMETERS)
-        as List<ActionParameter>
-    Assert.assertEquals("my-form", actualQuestionnaireConfig.id)
-    Assert.assertEquals("1234", actualQuestionnaireConfig.resourceIdentifier)
-    Assert.assertEquals(1, actualActionParams.size)
-    Assert.assertEquals("my-param", actualActionParams[0].linkId)
-    Assert.assertEquals(QuestionnaireType.READ_ONLY.name, actualQuestionnaireConfig.type.name)
-    Assert.assertEquals(
-      FhirContext.forCached(FhirVersionEnum.R4)
-        .newJsonParser()
-        .encodeResourceToString(questionnaireResponse),
-      result.getString(QuestionnaireActivity.QUESTIONNAIRE_RESPONSE),
-    )
-    Assert.assertEquals(
-      FhirContext.forCached(FhirVersionEnum.R4).newJsonParser().encodeResourceToString(patient),
-      result.getStringArrayList(QuestionnaireActivity.QUESTIONNAIRE_POPULATION_RESOURCES)?.get(0),
-    )
-    Assert.assertEquals(1, actualActionParams.size)
-    Assert.assertEquals("my-param", actualActionParams[0].linkId)
-  }
-
-  @Test
-  fun testReadOnlyIntentShouldBeReadToReadOnlyFlag() {
-    Assert.assertFalse(questionnaireConfig.type.isReadOnly())
-    val expectedQuestionnaireConfig =
-      QuestionnaireConfig(
-        id = "patient-registration",
-        title = "Patient registration",
-        type = QuestionnaireType.READ_ONLY,
-      )
-    val actionParams =
-      listOf(
-        ActionParameter(
-          paramType = ActionParameterType.PREPOPULATE,
-          linkId = "my-param",
-          dataType = DataType.INTEGER,
-          key = "my-key",
-          value = "100",
-        ),
-      )
-    intent =
-      Intent()
-        .putExtras(
-          bundleOf(
-            Pair(QuestionnaireActivity.QUESTIONNAIRE_CONFIG, expectedQuestionnaireConfig),
-            Pair(QuestionnaireActivity.QUESTIONNAIRE_ACTION_PARAMETERS, actionParams),
-          ),
-        )
-
-    val questionnaireFragment = spyk<QuestionnaireFragment>()
-    every { questionnaireFragment.getQuestionnaireResponse() } returns QuestionnaireResponse()
-
-    val controller = Robolectric.buildActivity(QuestionnaireActivity::class.java, intent)
-    questionnaireActivity = controller.create().resume().get()
-
-    val updatedQuestionnaireConfig =
-      ReflectionHelpers.getField<QuestionnaireConfig>(questionnaireActivity, "questionnaireConfig")
-    Assert.assertTrue(updatedQuestionnaireConfig.type.isReadOnly())
-  }
-
-  @Test
-  fun testPrePopulationParamsFiltersEmptyAndNonInterpolatedValues() {
-    Assert.assertFalse(questionnaireConfig.type.isReadOnly())
-    val expectedQuestionnaireConfig =
-      QuestionnaireConfig(
-        id = "patient-registration",
-        title = "Patient registration",
-        type = QuestionnaireType.READ_ONLY,
-      )
-    val actionParams =
-      listOf(
-        ActionParameter(
-          paramType = ActionParameterType.PREPOPULATE,
-          linkId = "my-param1",
-          dataType = DataType.INTEGER,
-          key = "my-key",
-          value = "100",
-        ),
-        ActionParameter(
-          paramType = ActionParameterType.PREPOPULATE,
-          linkId = "my-param2",
-          dataType = DataType.STRING,
-          key = "my-key",
-          value = "@{value}",
-        ),
-        ActionParameter(
-          paramType = ActionParameterType.PREPOPULATE,
-          linkId = "my-param2",
-          dataType = DataType.STRING,
-          key = "my-key",
-          value = "",
-        ),
-        ActionParameter(key = "patientId", value = "patient-id"),
-      )
-    intent =
-      Intent()
-        .putExtras(
-          bundleOf(
-            Pair(QuestionnaireActivity.QUESTIONNAIRE_CONFIG, expectedQuestionnaireConfig),
-            Pair(QuestionnaireActivity.QUESTIONNAIRE_ACTION_PARAMETERS, actionParams),
-          ),
-        )
-
-    val questionnaireFragment = spyk<QuestionnaireFragment>()
-    every { questionnaireFragment.getQuestionnaireResponse() } returns QuestionnaireResponse()
-
-    val controller = Robolectric.buildActivity(QuestionnaireActivity::class.java, intent)
-    questionnaireActivity = controller.create().resume().get()
-
-    val updatedActionParams =
-      ReflectionHelpers.getField<List<ActionParameter>>(questionnaireActivity, "actionParams")
-    val prePopulationParams =
-      ReflectionHelpers.getField<List<ActionParameter>>(
-        questionnaireActivity,
-        "prePopulationParams",
-      )
-    Assert.assertEquals(4, updatedActionParams.size)
-    Assert.assertEquals(1, prePopulationParams.size)
-    Assert.assertEquals("my-param1", prePopulationParams[0].linkId)
-  }
-
-  @Test
-  fun testGetQuestionnaireResponseShouldHaveSubjectAndDate() {
-    val questionnaire = Questionnaire().apply { id = "12345" }
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", questionnaire)
-    var questionnaireResponse = QuestionnaireResponse()
-
-    Assert.assertNull(questionnaireResponse.id)
-    Assert.assertNull(questionnaireResponse.authored)
-
-    questionnaireResponse = questionnaireActivity.getQuestionnaireResponse()
-
-    Assert.assertNotNull(questionnaireResponse.id)
-    Assert.assertNotNull(questionnaireResponse.authored)
-    Assert.assertEquals(
-      "Patient/${questionnaireConfig.resourceIdentifier}",
-      questionnaireResponse.subject.reference,
-    )
-    Assert.assertEquals("Questionnaire/12345", questionnaireResponse.questionnaire)
-  }
-
-  @Test
-  fun testOnBackPressedShouldShowConfirmAlert() {
-    questionnaireActivity.onBackPressed()
-
-    val dialog = shadowOf(ShadowAlertDialog.getLatestDialog())
-    val alertDialog = ReflectionHelpers.getField<AlertDialog>(dialog, "realDialog")
-
-    Assert.assertEquals(
-      getString(R.string.questionnaire_alert_back_pressed_message),
-      alertDialog.findViewById<TextView>(R.id.tv_alert_message)!!.text,
-    )
-    Assert.assertEquals(
-      getString(R.string.questionnaire_alert_back_pressed_button_title),
-      alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).text,
-    )
-  }
-
-  @Test
-  fun testOnBackPressedWithSaveDraftEnabledShouldShowCancelAlert() {
-    questionnaireConfig = questionnaireConfig.copy(saveDraft = true)
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaireConfig", questionnaireConfig)
-    questionnaireActivity.onBackPressed()
-
-    val dialog = shadowOf(ShadowAlertDialog.getLatestDialog())
-    val alertDialog = ReflectionHelpers.getField<AlertDialog>(dialog, "realDialog")
-
-    Assert.assertEquals(
-      getString(R.string.questionnaire_in_progress_alert_back_pressed_message),
-      alertDialog.findViewById<TextView>(R.id.tv_alert_message)!!.text,
-    )
-    Assert.assertEquals(
-      getString(R.string.questionnaire_alert_back_pressed_save_draft_button_title),
-      alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).text,
-    )
-  }
-
-  @Test
-  fun testHandleSaveDraftQuestionnaireShowsProgressAlertAndCallsHandlePartialResponse() {
-    questionnaireConfig = questionnaireConfig.copy(saveDraft = true)
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", Questionnaire())
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaireConfig", questionnaireConfig)
-
-    every { questionnaireFragment.getQuestionnaireResponse() } returns QuestionnaireResponse()
-    every { questionnaireViewModel.partialQuestionnaireResponseHasValues(any()) } returns true
-    questionnaireActivity.handleSaveDraftQuestionnaire()
-
-    val dialog = shadowOf(ShadowAlertDialog.getLatestDialog())
-    val alertDialog = ReflectionHelpers.getField<AlertDialog>(dialog, "realDialog")
-
-    Assert.assertEquals(
-      getString(R.string.form_progress_message),
-      alertDialog.findViewById<TextView>(R.id.tv_alert_message)!!.text,
-    )
-
-    verify(timeout = 2000) { questionnaireActivity.handlePartialQuestionnaireResponse(any()) }
-  }
-
-  @Test
-  fun testHandlePartialQuestionnaireResponseCallsSavePartialResponse() {
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", Questionnaire())
-    questionnaireActivity.handlePartialQuestionnaireResponse(QuestionnaireResponse())
-    verify { questionnaireViewModel.savePartialQuestionnaireResponse(any(), any()) }
-  }
-
-  @Test
-  fun testOnBackPressedShouldCallFinishWhenInReadOnlyMode() {
-    val qActivity = spyk(questionnaireActivity)
-    questionnaireConfig = questionnaireConfig.copy(type = QuestionnaireType.READ_ONLY)
-    ReflectionHelpers.setField(qActivity, "questionnaireConfig", questionnaireConfig)
-    qActivity.onBackPressed()
-
-    verify { qActivity.finish() }
-  }
-
-  @Test
-  fun testHandleQuestionnaireResponseShouldCallExtractAndSaveResources() {
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", Questionnaire())
-
-    questionnaireActivity.handleQuestionnaireResponse(QuestionnaireResponse())
-
-    verify { questionnaireViewModel.extractAndSaveResources(any(), any(), any(), any()) }
-  }
-
-  // TODO: https://github.com/opensrp/fhircore/issues/2494 - fix this test.
-  @Ignore
-  @Test
-  fun testHandleQuestionnaireResponseThroughADialogShouldCallExtractAndSaveResources() {
-    val questionnaireResponseId = "patient-registration-response"
-    val questionnaireResponse = QuestionnaireResponse().apply { id = questionnaireResponseId }
-    questionnaireConfig =
-      QuestionnaireConfig(
-        id = questionnaireResponseId,
-        title = "Patient registration",
-        "form",
-        confirmationDialog =
-          ConfirmationDialog(
-            title = "title",
-            message = "message",
-            actionButtonText = "Save changes",
-          ),
-      )
-
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", Questionnaire())
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaireConfig", questionnaireConfig)
-
-    questionnaireActivity.handleQuestionnaireResponse(QuestionnaireResponse())
-
-    val dialog = shadowOf(ShadowAlertDialog.getLatestDialog())
-    val alertDialog = ReflectionHelpers.getField<AlertDialog>(dialog, "realDialog")
-    alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick()
-
-    coEvery { fhirEngine.get(any(), any()) } returns questionnaireResponse
-    coEvery { fhirEngine.update(any()) } returns Unit
-
-    verify { questionnaireViewModel.extractAndSaveResources(any(), any(), any(), any()) }
-  }
-
-  @Test
-  fun testHandleQuestionnaireSubmitShouldShowProgressAndCallExtractAndSaveResources() {
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", Questionnaire())
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaireConfig", questionnaireConfig)
-
-    every { questionnaireFragment.getQuestionnaireResponse() } returns QuestionnaireResponse()
-
-    questionnaireActivity.handleQuestionnaireSubmit()
-
-    val dialog = shadowOf(ShadowAlertDialog.getLatestDialog())
-    val alertDialog = ReflectionHelpers.getField<AlertDialog>(dialog, "realDialog")
-
-    Assert.assertEquals(
-      getString(R.string.form_progress_message),
-      alertDialog.findViewById<TextView>(R.id.tv_alert_message)!!.text,
-    )
-
-    verify(timeout = 2000) {
-      questionnaireViewModel.extractAndSaveResources(any(), any(), any(), any())
-    }
-  }
-
-  @Test
-  fun testHandleQuestionnaireSubmitShouldShowErrorAlertOnInvalidData() {
-    val questionnaire = buildQuestionnaireWithConstraints()
-
-    coEvery { questionnaireViewModel.defaultRepository.addOrUpdate(resource = any()) } just runs
-    every { questionnaireFragment.getQuestionnaireResponse() } returns
-      QuestionnaireResponse().apply {
-        addItem().apply { linkId = "1" }
-        addItem().apply { linkId = "2" }
-      }
-
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", questionnaire)
-    questionnaireActivity.handleQuestionnaireSubmit()
-
-    val dialog = shadowOf(ShadowAlertDialog.getLatestDialog())
-    val alertDialog = ReflectionHelpers.getField<AlertDialog>(dialog, "realDialog")
-
-    Assert.assertEquals(
-      getString(R.string.questionnaire_alert_invalid_message),
-      alertDialog.findViewById<TextView>(R.id.tv_alert_message)!!.text,
-    )
-
-    verify(inverse = true) {
-      questionnaireViewModel.extractAndSaveResources(any(), any(), any(), any())
-    }
-  }
-
-  @Test
-  @kotlinx.coroutines.ExperimentalCoroutinesApi
-  fun testOnClickEditButtonShouldSetEditModeToTrue() = runTest {
-    val questionnaire = Questionnaire().apply { experimental = false }
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", questionnaire)
-    Assert.assertFalse(questionnaireConfig.type.isEditable())
-
-    questionnaireActivity.onClick(questionnaireActivity.findViewById(R.id.btn_edit_qr))
-
-    val updatedQuestionnaireConfig =
-      ReflectionHelpers.getField<QuestionnaireConfig>(questionnaireActivity, "questionnaireConfig")
-    Assert.assertTrue(updatedQuestionnaireConfig.type.isEditable())
-  }
-
-  @Test
-  fun testValidQuestionnaireResponseShouldReturnTrueForValidData() {
-    val questionnaire = buildQuestionnaireWithConstraints()
-
-    val questionnaireResponse = QuestionnaireResponse()
-    questionnaireResponse.apply {
-      addItem().apply {
-        addAnswer().apply { this.value = StringType("v1") }
-        linkId = "1"
-      }
-      addItem().apply {
-        addAnswer().apply { this.value = StringType("") }
-        linkId = "3"
-      }
-    }
-
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", questionnaire)
-
-    val result = questionnaireActivity.validQuestionnaireResponse(questionnaireResponse)
-
-    Assert.assertTrue(result)
-  }
-
-  @Test
-  fun testValidQuestionnaireResponseShouldReturnFalseForInvalidData() {
-    val questionnaire = buildQuestionnaireWithConstraints()
-
-    val questionnaireResponse = QuestionnaireResponse()
-    questionnaireResponse.apply { addItem().apply { linkId = "1" } }
-
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", questionnaire)
-
-    val result = questionnaireActivity.validQuestionnaireResponse(questionnaireResponse)
-
-    Assert.assertFalse(result)
-  }
-
-  @Test
-  fun testValidQuestionnaireResponseShouldReturnFalseForInvalidDataWhenHiddenIsFalse() {
-    val questionnaire = buildQuestionnaireWithConstraints()
-    questionnaire.apply {
-      addItem().apply {
-        required = true
-        linkId = "4"
-        type = Questionnaire.QuestionnaireItemType.STRING
-        addExtension(
-          Extension(
-            "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
-            BooleanType(false),
-          ),
-        )
-      }
-    }
-
-    val questionnaireResponse = QuestionnaireResponse()
-    questionnaireResponse.apply {
-      addItem().apply {
-        addAnswer().apply { this.value = StringType("v1") }
-        linkId = "1"
-      }
-      addItem().apply {
-        addAnswer().apply { this.value = StringType("") }
-        linkId = "4"
-      }
-    }
-
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", questionnaire)
-
-    val result = questionnaireActivity.validQuestionnaireResponse(questionnaireResponse)
-
-    Assert.assertFalse(result)
-  }
-
-  @Test
-  fun testPostSaveSuccessfulShouldFinishActivity() {
-    val questionnaire = buildQuestionnaireWithConstraints()
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", questionnaire)
-    questionnaireActivity.postSaveSuccessful(QuestionnaireResponse())
-
-    Assert.assertTrue(questionnaireActivity.isFinishing)
-  }
-
-  @Test
-  fun testPostSaveSuccessfulWithExtractionMessageShouldShowAlert() {
-    questionnaireActivity.questionnaireViewModel.extractionProgressMessage.postValue("ABC")
-    questionnaireActivity.postSaveSuccessful(QuestionnaireResponse())
-
-    val dialog = shadowOf(ShadowAlertDialog.getLatestDialog())
-    val alertDialog = ReflectionHelpers.getField<AlertDialog>(dialog, "realDialog")
-
-    Assert.assertEquals("ABC", alertDialog.findViewById<TextView>(R.id.tv_alert_message)!!.text)
-  }
-
-  @Test
-  fun onOptionsItemSelectedShouldCallOnBackPressedWhenHomeIsPressed() {
-    val spiedActivity = spyk(questionnaireActivity)
-    val menuItem = mockk<MenuItem>()
-    every { menuItem.itemId } returns android.R.id.home
-    every { spiedActivity.onBackPressed() } just runs
-
-    Assert.assertTrue(spiedActivity.onOptionsItemSelected(menuItem))
-
-    verify { spiedActivity.onBackPressed() }
-  }
-
-  @Test
-  fun onPostSaveShouldCallPostSaveSuccessfulWhenResultIsTrue() {
-    val spiedActivity = spyk(questionnaireActivity)
-    val qr = mockk<QuestionnaireResponse>()
-    every { qr.copy() } returns qr
-    every { spiedActivity.postSaveSuccessful(qr) } just runs
-
-    spiedActivity.onPostSave(true, qr)
-
-    verify { spiedActivity.postSaveSuccessful(qr) }
-    verify { spiedActivity.dismissSaveProcessing() }
-  }
-
-  @Test
-  fun testQuestionnaireTypeEditShouldAppendEditPrefixInActionBarTitle() {
-    with(questionnaireActivity) {
-      val questionnaireConfig =
-        QuestionnaireConfig("form", "title", "form-id", type = QuestionnaireType.EDIT)
-      ReflectionHelpers.setField(this, "questionnaireConfig", questionnaireConfig)
-
-      updateViews()
-
-      Assert.assertEquals("${getString(R.string.edit)} title", supportActionBar?.title)
-    }
-  }
-
-  @Test
-  fun testQuestionnaireTypeDefaultShouldHasNormalActionBarTitle() {
-    with(questionnaireActivity) {
-      questionnaireConfig.copy(type = QuestionnaireType.DEFAULT)
-      val questionnaireConfig = QuestionnaireConfig("form", "title", "form-id")
-      ReflectionHelpers.setField(this, "questionnaireConfig", questionnaireConfig)
-
-      updateViews()
-
-      Assert.assertEquals("title", supportActionBar?.title)
-    }
-  }
-
-  @Test
-  fun testQuestionnaireTypeReadOnlyShouldHasNormalActionBarTitle() {
-    with(questionnaireActivity) {
-      questionnaireConfig.copy(type = QuestionnaireType.READ_ONLY)
-      val questionnaireConfig = QuestionnaireConfig("form", "title", "form-id")
-      ReflectionHelpers.setField(this, "questionnaireConfig", questionnaireConfig)
-
-      updateViews()
-
-      Assert.assertEquals("title", questionnaireActivity.supportActionBar?.title)
-    }
+    questionnaireActivity = Robolectric.buildActivity(QuestionnaireActivity::class.java).get()
   }
 
-  @Test
-  fun testQuestionnaireSubmitButtonDisplayCorrectTitle() {
-    with(questionnaireActivity) {
-      questionnaireConfig.copy(type = QuestionnaireType.READ_ONLY)
-      val questionnaireConfig =
-        QuestionnaireConfig("form", "title", "form-id", type = QuestionnaireType.READ_ONLY)
-      ReflectionHelpers.setField(this, "questionnaireConfig", questionnaireConfig)
-
-      updateViews()
-      val button = findViewById<Button>(org.smartregister.fhircore.quest.R.id.submit_questionnaire)
-      if (button != null) {
-        Assert.assertEquals("${getString(R.string.done)}", button.text.toString())
-      }
-    }
-  }
-
-  private fun buildQuestionnaireWithConstraints(): Questionnaire {
-    return Questionnaire().apply {
-      addItem().apply {
-        required = true
-        linkId = "1"
-        type = Questionnaire.QuestionnaireItemType.STRING
-      }
-      addItem().apply {
-        maxLength = 4
-        linkId = "2"
-        type = Questionnaire.QuestionnaireItemType.STRING
-      }
-      addItem().apply {
-        required = true
-        linkId = "3"
-        type = Questionnaire.QuestionnaireItemType.STRING
-        addExtension(
-          Extension(
-            "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden",
-            BooleanType(true),
-          ),
-        )
-      }
-    }
-  }
-
-  @Ignore("Needs fixing")
-  @Test
-  fun testFragmentQuestionnaireSubmitHandlesQuestionnaireSubmit() {
-    every { questionnaireActivity.getQuestionnaireConfig() } returns QuestionnaireConfig(id = "123")
-    every { questionnaireActivity.getQuestionnaireObject() } returns Questionnaire()
-    every { questionnaireFragment.getQuestionnaireResponse() } returns QuestionnaireResponse()
-    every { questionnaireActivity.finish() } just runs
-    every { questionnaireActivity.handleQuestionnaireSubmit() } just runs
-
-    questionnaireActivity = spyk(questionnaireActivity)
-    questionnaireFragment.setFragmentResult(QuestionnaireFragment.SUBMIT_REQUEST_KEY, Bundle.EMPTY)
-
-    verify { questionnaireActivity.handleQuestionnaireSubmit() }
-  }
-
-  @Ignore("Needs fixing")
-  @Test
-  fun testFragmentQuestionnaireSubmitWithReadOnlyModeFinishesActivity() {
-    every { questionnaireFragment.getQuestionnaireResponse() } returns QuestionnaireResponse()
-    every { questionnaireActivity.finish() } just runs
-    every { questionnaireActivity.getQuestionnaireConfig().type.isReadOnly() } returns true
-
-    questionnaireFragment.setFragmentResult(QuestionnaireFragment.SUBMIT_REQUEST_KEY, Bundle.EMPTY)
-
-    verify { questionnaireActivity.finish() }
-  }
-
-  @Ignore("Needs fixing")
-  @Test
-  fun testFragmentQuestionnaireSubmitWithExperimentalModeFinishesActivity() {
-    every { questionnaireFragment.getQuestionnaireResponse() } returns QuestionnaireResponse()
-    every { questionnaireActivity.finish() } just runs
-    every { questionnaireActivity.getQuestionnaireObject().experimental } returns true
-    every { questionnaireActivity.getQuestionnaireConfig() } returns QuestionnaireConfig(id = "123")
-
-    questionnaireFragment.setFragmentResult(QuestionnaireFragment.SUBMIT_REQUEST_KEY, Bundle.EMPTY)
-
-    verify { questionnaireActivity.finish() }
-  }
-
-  @Test
-  fun testRemoveOperationWithValueOfTrueFinishesActivity() {
-    questionnaireActivity.questionnaireViewModel.removeOperation.postValue(true)
-    assertTrue { questionnaireActivity.isFinishing }
-  }
-
-  @Test
-  fun testQuestionnaireShouldExist() {
-    val expectedQuestionnaireConfig =
-      QuestionnaireConfig(
-        id = "patient-registration",
-        title = "Patient registration",
-        type = QuestionnaireType.DEFAULT,
-      )
-    intent =
-      Intent()
-        .putExtras(
-          bundleOf(Pair(QuestionnaireActivity.QUESTIONNAIRE_CONFIG, expectedQuestionnaireConfig)),
-        )
-
-    coEvery { questionnaireViewModel.loadQuestionnaire(any(), any()) } returns
-      Questionnaire().apply { id = "12345" }
-
-    val controller = Robolectric.buildActivity(QuestionnaireActivity::class.java, intent)
-    questionnaireActivity = controller.create().resume().get()
-
-    val questionnaire =
-      ReflectionHelpers.getField<Questionnaire>(questionnaireActivity, "questionnaire")
-    Assert.assertNotNull(questionnaire)
-  }
-
-  @Test
-  fun testQuestionnaireShouldNotExist() {
-    val expectedQuestionnaireConfig =
-      QuestionnaireConfig(
-        id = "patient-registration",
-        title = "Patient registration",
-        type = QuestionnaireType.DEFAULT,
-      )
-    intent =
-      Intent()
-        .putExtras(
-          bundleOf(Pair(QuestionnaireActivity.QUESTIONNAIRE_CONFIG, expectedQuestionnaireConfig)),
-        )
-
-    coEvery { questionnaireViewModel.loadQuestionnaire(any(), any()) } returns null
-
-    val controller = Robolectric.buildActivity(QuestionnaireActivity::class.java, intent)
-    questionnaireActivity = controller.create().resume().get()
-
-    val questionnaire =
-      ReflectionHelpers.getField<Questionnaire>(questionnaireActivity, "questionnaire")
-    Assert.assertNull(questionnaire)
-  }
-
-  @Test
-  fun testQuestionnaireShouldSetBarcode() {
-    val expectedQuestionnaireConfig =
-      QuestionnaireConfig(
-        id = "patient-registration",
-        title = "Patient registration",
-        resourceIdentifier = "1234",
-        type = QuestionnaireType.DEFAULT,
-      )
-    intent =
-      Intent()
-        .putExtras(
-          bundleOf(Pair(QuestionnaireActivity.QUESTIONNAIRE_CONFIG, expectedQuestionnaireConfig)),
-        )
-
-    coEvery { questionnaireViewModel.loadQuestionnaire(any(), any()) } returns
-      Questionnaire().apply {
-        id = "12345"
-        addItem().apply { linkId = QUESTIONNAIRE_ARG_BARCODE }
-      }
-
-    val controller = Robolectric.buildActivity(QuestionnaireActivity::class.java, intent)
-    questionnaireActivity = controller.create().resume().get()
-
-    val questionnaire =
-      ReflectionHelpers.getField<Questionnaire>(questionnaireActivity, "questionnaire")
-    Assert.assertNotNull(questionnaire.find(QUESTIONNAIRE_ARG_BARCODE))
-    Assert.assertTrue(
-      "Barcode initial not found with ID 1234",
-      questionnaire.find(QUESTIONNAIRE_ARG_BARCODE)!!.initial.first().valueStringType.value ==
-        "1234",
-    )
-    Assert.assertTrue(
-      "Barcode not in read only mode",
-      questionnaire.find(QUESTIONNAIRE_ARG_BARCODE)!!.readOnly,
-    )
-  }
-
-  @Test
-  fun testQuestionnaireResponseShouldExistInEditMode() {
-    val questionnaireId = "patient-registration"
-    val questionnaireConfig =
-      QuestionnaireConfig(
-        id = questionnaireId,
-        title = "Patient registration",
-        type = QuestionnaireType.EDIT,
-      )
-    val baseResourceId = "Patient/1122"
-    val baseResourceType = "Patient"
-    intent =
-      Intent()
-        .putExtras(
-          bundleOf(
-            Pair(QuestionnaireActivity.QUESTIONNAIRE_CONFIG, questionnaireConfig),
-            Pair(QuestionnaireActivity.BASE_RESOURCE_ID, baseResourceId),
-            Pair(QuestionnaireActivity.BASE_RESOURCE_TYPE, baseResourceType),
-          ),
-        )
-
-    val questionnaireResponseId = "patient-registration-response"
-    coEvery { questionnaireViewModel.loadQuestionnaire(any(), any()) } returns
-      Questionnaire().apply { id = questionnaireId }
-    coEvery {
-      questionnaireViewModel.defaultRepository.fhirEngine.search<QuestionnaireResponse> {
-        filter(QuestionnaireResponse.SUBJECT, { value = baseResourceId })
-        filter(QuestionnaireResponse.QUESTIONNAIRE, { value = "Questionnaire/$questionnaireId" })
-      }
-    } returns
-      listOf(
-        QuestionnaireResponse().apply {
-          id = questionnaireResponseId
-          meta.lastUpdated = Date()
-        },
-      )
-
-    val controller = Robolectric.buildActivity(QuestionnaireActivity::class.java, intent)
-    questionnaireActivity = controller.create().resume().get()
-
-    val questionnaireResponse =
-      ReflectionHelpers.getField<QuestionnaireResponse>(
-        questionnaireActivity,
-        "questionnaireResponse",
-      )
-    Assert.assertNotNull("Questionnaire Response is null", questionnaireResponse)
-  }
-
-  @Test
-  fun testQuestionnaireResponseShouldExistInReadOnlyMode() {
-    val questionnaireId = "patient-registration"
-    val questionnaireConfig =
-      QuestionnaireConfig(
-        id = questionnaireId,
-        title = "Patient registration",
-        type = QuestionnaireType.READ_ONLY,
-      )
-    val baseResourceId = "Patient/1122"
-    val baseResourceType = "Patient"
-    intent =
-      Intent()
-        .putExtras(
-          bundleOf(
-            Pair(QuestionnaireActivity.QUESTIONNAIRE_CONFIG, questionnaireConfig),
-            Pair(QuestionnaireActivity.BASE_RESOURCE_ID, baseResourceId),
-            Pair(QuestionnaireActivity.BASE_RESOURCE_TYPE, baseResourceType),
-          ),
-        )
-
-    val questionnaireResponseId = "patient-registration-response"
-    coEvery { questionnaireViewModel.loadQuestionnaire(any(), any()) } returns
-      Questionnaire().apply { id = questionnaireId }
-    coEvery {
-      questionnaireViewModel.defaultRepository.fhirEngine.search<QuestionnaireResponse> {
-        filter(QuestionnaireResponse.SUBJECT, { value = baseResourceId })
-        filter(QuestionnaireResponse.QUESTIONNAIRE, { value = "Questionnaire/$questionnaireId" })
-      }
-    } returns
-      listOf(
-        QuestionnaireResponse().apply {
-          id = questionnaireResponseId
-          meta.lastUpdated = Date()
-        },
-      )
-
-    val controller = Robolectric.buildActivity(QuestionnaireActivity::class.java, intent)
-    questionnaireActivity = controller.create().resume().get()
-
-    val questionnaireResponse =
-      ReflectionHelpers.getField<QuestionnaireResponse>(
-        questionnaireActivity,
-        "questionnaireResponse",
-      )
-    Assert.assertNotNull("Questionnaire Response is null", questionnaireResponse)
-  }
-
-  @Test
-  fun `test covid 19 vaccines questionnaire on followup`() = runTest {
-    ReflectionHelpers.loadClass(
-        QuestionnaireFragment.javaClass.classLoader,
-        "com.google.android.fhir.datacapture.DataCapture",
-      )
-      .let {
-        it
-          .getDeclaredField("configuration")
-          .also { it.isAccessible = true }
-          .set(null, DataCaptureConfig(xFhirQueryResolver = { fhirEngine.search(it) }))
-      }
-    val questionnaire =
-      "covid-19/questionnaire.json".readFile().decodeResourceFromString<Questionnaire>()
-    val data =
-      "covid-19/resource_data_bundle.json"
-        .readFile()
-        .decodeResourceFromString<org.hl7.fhir.r4.model.Bundle>()
-
-    coEvery { fhirEngine.get(ResourceType.Patient, "P1") } returns
-      Patient().apply {
-        id = "P1"
-        birthDate = Date()
-      }
-    coEvery { fhirEngine.search<Resource>(any<Search>()) } returns
-      data.entry.map { it.resource as Immunization }
-    coEvery { questionnaireViewModel.loadQuestionnaire(any(), any()) } returns questionnaire
-
-    buildActivity(questionnaire, questionnaireConfig)
-
-    ReflectionHelpers.setField(questionnaireActivity, "questionnaire", questionnaire)
-
-    questionnaireActivity.fragment = questionnaireFragment
-
-    val questionnaireResponse = questionnaireActivity.getQuestionnaireResponse()
-    questionnaireActivity.setInitialExpression(questionnaire)
-
-    Assert.assertNotNull(questionnaireResponse.id)
-    Assert.assertNotNull(questionnaireResponse.authored)
-    Assert.assertEquals(
-      "Patient/${questionnaireConfig.resourceIdentifier}",
-      questionnaireResponse.subject.reference,
-    )
-    Assert.assertEquals(2, questionnaire.item.elementAt(1).initial.size)
-  }
-
-  fun testGetResourcesFromParamsForQR_shouldFilterQuestionnaireResponsePopulationParam() {
-    val questionnaireConfig =
-      QuestionnaireConfig(
-        id = "patient-registration",
-        title = "Patient registration",
-        type = QuestionnaireType.EDIT,
-      )
-    val actionParams =
-      listOf(
-        ActionParameter(
-          paramType = ActionParameterType.QUESTIONNAIRE_RESPONSE_POPULATION_RESOURCE,
-          resourceType = ResourceType.Patient,
-          key = "resourcePatient",
-          value = "patient-1",
-          dataType = DataType.STRING,
-        ),
-        ActionParameter(
-          key = "paramName",
-          paramType = ActionParameterType.PARAMDATA,
-          value = "testing",
-          dataType = DataType.STRING,
-          linkId = null,
-        ),
-        ActionParameter(
-          key = "paramName2",
-          paramType = ActionParameterType.PREPOPULATE,
-          value = "testing2",
-          dataType = DataType.STRING,
-          linkId = null,
-        ),
-      )
-    intent =
-      Intent()
-        .putExtras(
-          bundleOf(
-            Pair(QuestionnaireActivity.QUESTIONNAIRE_CONFIG, questionnaireConfig),
-            Pair(QuestionnaireActivity.QUESTIONNAIRE_ACTION_PARAMETERS, actionParams),
-          ),
-        )
-
-    val questionnaireFragment = spyk<QuestionnaireFragment>()
-    every { questionnaireFragment.getQuestionnaireResponse() } returns QuestionnaireResponse()
-
-    val controller = Robolectric.buildActivity(QuestionnaireActivity::class.java, intent)
-    questionnaireActivity = controller.create().resume().get()
-
-    val resourceMap = questionnaireActivity.getResourcesFromParamsForQR()
-
-    Assert.assertEquals(1, resourceMap.size)
-    Assert.assertTrue(resourceMap.containsKey(ResourceType.Patient))
-  }
+  @Test fun testQuestionnaireFragmentIsRenderedWhenActivityIsLaunched() {}
 
   override fun getActivity(): Activity {
     return questionnaireActivity
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt
index 2ab7e926b9..c908675aff 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt
@@ -17,78 +17,37 @@
 package org.smartregister.fhircore.quest.ui.questionnaire
 
 import android.app.Application
-import android.content.Context
-import android.os.Looper
-import android.widget.Toast
 import androidx.test.core.app.ApplicationProvider
-import ca.uhn.fhir.context.FhirContext
-import ca.uhn.fhir.context.FhirVersionEnum
-import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.datacapture.mapping.ResourceMapper
 import com.google.android.fhir.db.ResourceNotFoundException
-import com.google.android.fhir.get
 import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.search
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.coEvery
 import io.mockk.coVerify
-import io.mockk.coVerifyOrder
 import io.mockk.just
 import io.mockk.mockk
-import io.mockk.mockkObject
 import io.mockk.runs
-import io.mockk.slot
 import io.mockk.spyk
-import io.mockk.unmockkObject
-import io.mockk.verify
-import java.math.BigDecimal
-import java.text.SimpleDateFormat
-import java.util.Calendar
 import java.util.Date
 import javax.inject.Inject
-import kotlin.jvm.Throws
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertIs
-import kotlin.test.assertNotNull
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
-import org.hl7.fhir.r4.context.SimpleWorkerContext
-import org.hl7.fhir.r4.model.Age
 import org.hl7.fhir.r4.model.Bundle
-import org.hl7.fhir.r4.model.CanonicalType
-import org.hl7.fhir.r4.model.CodeableConcept
-import org.hl7.fhir.r4.model.Coding
-import org.hl7.fhir.r4.model.DecimalType
-import org.hl7.fhir.r4.model.Encounter
 import org.hl7.fhir.r4.model.Enumerations
-import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Group
-import org.hl7.fhir.r4.model.HumanName
-import org.hl7.fhir.r4.model.Patient
+import org.hl7.fhir.r4.model.IntegerType
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
-import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent
-import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemComponent
-import org.hl7.fhir.r4.model.Reference
-import org.hl7.fhir.r4.model.RelatedPerson
-import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 import org.hl7.fhir.r4.model.StringType
-import org.hl7.fhir.r4.model.StructureMap
+import org.hl7.fhir.r4.model.Type
 import org.junit.Assert
-import org.junit.Assert.assertTrue
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
-import org.robolectric.Shadows
-import org.robolectric.util.ReflectionHelpers
-import org.smartregister.fhircore.engine.configuration.ConfigurationRegistry
 import org.smartregister.fhircore.engine.configuration.GroupResourceConfig
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.configuration.app.ConfigService
@@ -103,42 +62,41 @@ import org.smartregister.fhircore.engine.rulesengine.ResourceDataRulesExecutor
 import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
 import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
+import org.smartregister.fhircore.engine.util.extension.asReference
+import org.smartregister.fhircore.engine.util.extension.decodeResourceFromString
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
-import org.smartregister.fhircore.engine.util.extension.extractType
-import org.smartregister.fhircore.engine.util.extension.generateMissingItems
-import org.smartregister.fhircore.engine.util.extension.loadResource
-import org.smartregister.fhircore.engine.util.extension.resourceClassType
-import org.smartregister.fhircore.engine.util.extension.retainMetadata
-import org.smartregister.fhircore.engine.util.extension.showToast
+import org.smartregister.fhircore.engine.util.extension.find
 import org.smartregister.fhircore.engine.util.extension.valueToString
-import org.smartregister.fhircore.quest.BuildConfig
-import org.smartregister.fhircore.quest.R
+import org.smartregister.fhircore.engine.util.extension.yesterday
 import org.smartregister.fhircore.quest.app.fakes.Faker
 import org.smartregister.fhircore.quest.robolectric.RobolectricTest
 import org.smartregister.model.practitioner.FhirPractitionerDetails
 import org.smartregister.model.practitioner.KeycloakUserDetails
 import org.smartregister.model.practitioner.PractitionerDetails
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @HiltAndroidTest
 class QuestionnaireViewModelTest : RobolectricTest() {
+
   @get:Rule(order = 0) val hiltRule = HiltAndroidRule(this)
 
   @Inject lateinit var sharedPreferencesHelper: SharedPreferencesHelper
 
-  @Inject lateinit var fhirCarePlanGenerator: FhirCarePlanGenerator
-
   @Inject lateinit var configService: ConfigService
 
   @Inject lateinit var resourceDataRulesExecutor: ResourceDataRulesExecutor
+  private lateinit var samplePatientRegisterQuestionnaire: Questionnaire
+  private lateinit var questionnaireConfig: QuestionnaireConfig
+  private lateinit var questionnaireViewModel: QuestionnaireViewModel
+  private lateinit var defaultRepository: DefaultRepository
   private val configurationRegistry = Faker.buildTestConfigurationRegistry()
   private val fhirEngine: FhirEngine = mockk()
   private val context: Application = ApplicationProvider.getApplicationContext()
-  private lateinit var questionnaireViewModel: QuestionnaireViewModel
-  private lateinit var defaultRepo: DefaultRepository
-  private val libraryEvaluator: LibraryEvaluator = mockk()
-  private lateinit var samplePatientRegisterQuestionnaire: Questionnaire
-  private lateinit var questionnaireConfig: QuestionnaireConfig
+  private val libraryEvaluator: LibraryEvaluator = mockk(relaxed = true, relaxUnitFun = true)
   private val configRulesExecutor: ConfigRulesExecutor = mockk()
+  private val patient = Faker.buildPatient()
+  private val fhirCarePlanGenerator: FhirCarePlanGenerator =
+    mockk(relaxUnitFun = true, relaxed = true)
 
   @Before
   @ExperimentalCoroutinesApi
@@ -153,7 +111,7 @@ class QuestionnaireViewModelTest : RobolectricTest() {
 
     sharedPreferencesHelper.write(ResourceType.Organization.name, listOf("105"))
 
-    defaultRepo =
+    defaultRepository =
       spyk(
         DefaultRepository(
           fhirEngine = fhirEngine,
@@ -165,26 +123,19 @@ class QuestionnaireViewModelTest : RobolectricTest() {
         ),
       )
 
-    val configurationRegistry = mockk<ConfigurationRegistry>()
-
     questionnaireConfig =
       QuestionnaireConfig(
-        id = "patient-registration",
+        id = "754", // Same as ID in sample_patient_registration.json
         title = "Patient registration",
-        type = QuestionnaireType.READ_ONLY,
-        setPractitionerDetails = false,
-        setOrganizationDetails = false,
-        resourceIdentifier = "2",
-        resourceType = ResourceType.Patient,
+        type = QuestionnaireType.DEFAULT,
       )
 
     questionnaireViewModel =
       spyk(
         QuestionnaireViewModel(
-          defaultRepository = defaultRepo,
-          configurationRegistry = configurationRegistry,
+          defaultRepository = defaultRepository,
           transformSupportServices = mockk(),
-          dispatcherProvider = defaultRepo.dispatcherProvider,
+          dispatcherProvider = defaultRepository.dispatcherProvider,
           sharedPreferencesHelper = sharedPreferencesHelper,
           libraryEvaluator = libraryEvaluator,
           fhirCarePlanGenerator = fhirCarePlanGenerator,
@@ -192,1882 +143,463 @@ class QuestionnaireViewModelTest : RobolectricTest() {
         ),
       )
 
-    coEvery { fhirEngine.create(any()) } answers { listOf() }
-    coEvery { fhirEngine.update(any()) } answers {}
-
-    coEvery { defaultRepo.create(any()) } returns emptyList()
-    coEvery { defaultRepo.addOrUpdate(resource = any()) } just runs
-
-    // Setup sample resources
-    val iParser: IParser = FhirContext.forR4Cached().newJsonParser()
-    val qJson =
+    // Sample questionnaire
+    val questionnaireJson =
       context.assets.open("sample_patient_registration.json").bufferedReader().use { it.readText() }
 
-    samplePatientRegisterQuestionnaire = iParser.parseResource(qJson) as Questionnaire
+    samplePatientRegisterQuestionnaire = questionnaireJson.decodeResourceFromString()
   }
 
-  @Test
-  fun testLoadQuestionnaireShouldCallDefaultRepoLoadResource() {
-    coEvery { fhirEngine.get(ResourceType.Questionnaire, "12345") } returns
-      Questionnaire().apply { id = "12345" }
-
-    val result = runBlocking {
-      questionnaireViewModel.loadQuestionnaire(
-        QuestionnaireConfig(id = "12345", type = QuestionnaireType.DEFAULT),
-      )
+  private fun practitionerDetails(): PractitionerDetails {
+    return PractitionerDetails().apply {
+      userDetail = KeycloakUserDetails().apply { id = "12345" }
+      fhirPractitionerDetails =
+        FhirPractitionerDetails().apply {
+          id = "12345"
+          practitionerId = StringType("12345")
+        }
     }
-
-    coVerify { fhirEngine.get(ResourceType.Questionnaire, "12345") }
-    Assert.assertEquals("12345", result!!.logicalId)
   }
 
   @Test
-  fun testLoadQuestionnaireShouldSetQuestionnaireQuestionsToReadOnly() {
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              type = Questionnaire.QuestionnaireItemType.GROUP
-              linkId = "q1-grp"
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    type = Questionnaire.QuestionnaireItemType.TEXT
-                    linkId = "q1-name"
-                  },
-                )
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              type = Questionnaire.QuestionnaireItemType.CHOICE
-              linkId = "q2-gender"
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              type = Questionnaire.QuestionnaireItemType.DATE
-              linkId = "q3-date"
-            },
-          )
-      }
-    coEvery { fhirEngine.get(ResourceType.Questionnaire, "12345") } returns questionnaire
-
-    ReflectionHelpers.setField(questionnaireViewModel, "defaultRepository", defaultRepo)
-
-    val result = runBlocking {
-      questionnaireViewModel.loadQuestionnaire(
-        QuestionnaireConfig(id = "12345", type = QuestionnaireType.READ_ONLY),
-      )
-    }
-
-    assertTrue(result!!.item[0].item[0].readOnly)
-    Assert.assertEquals("q1-name", result.item[0].item[0].linkId)
-    assertTrue(result.item[1].readOnly)
-    Assert.assertEquals("q2-gender", result.item[1].linkId)
-    assertTrue(result.item[2].readOnly)
-    Assert.assertEquals("q3-date", result.item[2].linkId)
-  }
+  fun testRetrieveQuestionnaireShouldReturnValidQuestionnaire() = runTest {
+    coEvery { fhirEngine.get(ResourceType.Questionnaire, questionnaireConfig.id) } returns
+      samplePatientRegisterQuestionnaire
 
-  @Test
-  fun testLoadQuestionnaireShouldMakeQuestionsReadOnlyAndAddInitialExpressionExtension() {
     val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-first-name"
-              type = Questionnaire.QuestionnaireItemType.TEXT
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-last-name"
-                    type = Questionnaire.QuestionnaireItemType.TEXT
-                  },
-                )
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-age"
-              type = Questionnaire.QuestionnaireItemType.INTEGER
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-contact"
-              type = Questionnaire.QuestionnaireItemType.GROUP
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-dob"
-                    type = Questionnaire.QuestionnaireItemType.DATE
-                  },
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-related-person"
-                    type = Questionnaire.QuestionnaireItemType.GROUP
-                    item =
-                      listOf(
-                        Questionnaire.QuestionnaireItemComponent().apply {
-                          linkId = "rp-name"
-                          type = Questionnaire.QuestionnaireItemType.TEXT
-                        },
-                      )
-                  },
-                )
-            },
-          )
-      }
-
-    coEvery { fhirEngine.get(ResourceType.Questionnaire, "12345") } returns questionnaire
-
-    val result = runBlocking {
-      questionnaireViewModel.loadQuestionnaire(
-        QuestionnaireConfig(id = "12345", type = QuestionnaireType.READ_ONLY),
+      questionnaireViewModel.retrieveQuestionnaire(
+        questionnaireConfig = questionnaireConfig,
+        actionParameters = emptyList(),
       )
-    }
 
-    Assert.assertEquals("12345", result!!.logicalId)
-    assertTrue(result.item[0].readOnly)
-    Assert.assertEquals("patient-first-name", result.item[0].linkId)
-    Assert.assertEquals("patient-last-name", result.item[0].item[0].linkId)
-    assertTrue(result.item[1].readOnly)
-    Assert.assertFalse(result.item[2].readOnly)
-    Assert.assertEquals(0, result.item[2].extension.size)
-    assertTrue(result.item[2].item[0].readOnly)
-    Assert.assertFalse(result.item[2].item[1].readOnly)
-    assertTrue(result.item[2].item[1].item[0].readOnly)
+    Assert.assertNotNull(questionnaire)
+    Assert.assertEquals(questionnaireConfig.id, questionnaire?.id?.extractLogicalIdUuid())
   }
 
   @Test
-  fun testLoadQuestionnaireShouldMakeQuestionsEditableAndAddInitialExpressionExtension() {
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        item =
+  fun testRetrieveQuestionnaireShouldReturnPrePopulatedQuestionnaire() = runTest {
+    val patientAgeLinkId = "patient-age"
+    val newQuestionnaireConfig =
+      questionnaireConfig.copy(
+        resourceIdentifier = patient.id,
+        resourceType = patient.resourceType,
+        barcodeLinkId = "patient-barcode",
+        configRules =
+          listOf(RuleConfig(name = "rule1", actions = listOf("data.put('rule1', 'Sample Rule')"))),
+        extraParams =
           listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-first-name"
-              type = Questionnaire.QuestionnaireItemType.TEXT
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-last-name"
-                    type = Questionnaire.QuestionnaireItemType.TEXT
-                  },
-                )
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-age"
-              type = Questionnaire.QuestionnaireItemType.INTEGER
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-contact"
-              type = Questionnaire.QuestionnaireItemType.GROUP
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-dob"
-                    type = Questionnaire.QuestionnaireItemType.DATE
-                  },
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-related-person"
-                    type = Questionnaire.QuestionnaireItemType.GROUP
-                    item =
-                      listOf(
-                        Questionnaire.QuestionnaireItemComponent().apply {
-                          linkId = "rp-name"
-                          type = Questionnaire.QuestionnaireItemType.TEXT
-                        },
-                      )
-                  },
-                )
-            },
-          )
+            ActionParameter(
+              key = "rule1",
+              value = "@{rule1}",
+              paramType = ActionParameterType.PARAMDATA,
+            ),
+          ),
+      )
+    coEvery { fhirEngine.get(ResourceType.Questionnaire, newQuestionnaireConfig.id) } returns
+      samplePatientRegisterQuestionnaire.apply {
+        addItem(
+          Questionnaire.QuestionnaireItemComponent().apply {
+            linkId = patientAgeLinkId
+            type = Questionnaire.QuestionnaireItemType.INTEGER
+            readOnly = true
+          },
+        )
       }
-
-    coEvery { fhirEngine.get(ResourceType.Questionnaire, "12345") } returns questionnaire
-
-    val result = runBlocking {
-      questionnaireViewModel.loadQuestionnaire(
-        QuestionnaireConfig(id = "12345", type = QuestionnaireType.EDIT),
+    val actionParameter =
+      listOf(
+        ActionParameter(
+          paramType = ActionParameterType.PREPOPULATE,
+          linkId = patientAgeLinkId,
+          dataType = Enumerations.DataType.INTEGER,
+          key = patientAgeLinkId,
+          value = "20",
+        ),
       )
-    }
 
-    Assert.assertEquals("12345", result!!.logicalId)
-    Assert.assertFalse(result.item[0].readOnly)
-    Assert.assertEquals("patient-first-name", result.item[0].linkId)
-    Assert.assertEquals("patient-last-name", result.item[0].item[0].linkId)
-    Assert.assertFalse(result.item[1].readOnly)
-    Assert.assertFalse(result.item[2].readOnly)
-    Assert.assertEquals(0, result.item[2].extension.size)
-    Assert.assertFalse(result.item[2].item[0].readOnly)
-    Assert.assertFalse(result.item[2].item[1].readOnly)
-    Assert.assertFalse(result.item[2].item[1].item[0].readOnly)
+    val questionnaire =
+      questionnaireViewModel.retrieveQuestionnaire(
+        questionnaireConfig = newQuestionnaireConfig,
+        actionParameters = actionParameter,
+      )
+    Assert.assertNotNull(questionnaire)
+
+    // Questionnaire.item pre-populated
+    val questionnairePatientAgeItem = questionnaire?.find(patientAgeLinkId)
+    val itemValue: Type? = questionnairePatientAgeItem?.initial?.firstOrNull()?.value
+    Assert.assertTrue(itemValue is IntegerType)
+    Assert.assertEquals(20, itemValue?.primitiveValue()?.toInt())
+
+    // Barcode linkId updated
+    val questionnaireBarcodeItem = questionnaire?.find(newQuestionnaireConfig.barcodeLinkId)
+    val barCodeItemValue: Type? = questionnaireBarcodeItem?.initial?.firstOrNull()?.value
+    Assert.assertTrue(barCodeItemValue is StringType)
+    Assert.assertEquals(
+      newQuestionnaireConfig.resourceIdentifier,
+      barCodeItemValue?.primitiveValue(),
+    )
   }
 
   @Test
-  fun testLoadQuestionnaireShouldMakeQuestionsEditableWithReadonlyAndAddInitialExpressionExtension() {
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-first-name"
-              type = Questionnaire.QuestionnaireItemType.TEXT
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-last-name"
-                    type = Questionnaire.QuestionnaireItemType.TEXT
-                  },
-                )
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-age"
-              type = Questionnaire.QuestionnaireItemType.INTEGER
-              readOnly = true
-            },
-          )
+  fun testSaveDraftQuestionnaireShouldUpdateStatusToInProgress() = runTest {
+    val questionnaireResponse =
+      QuestionnaireResponse().apply {
+        addItem(
+          QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+            addAnswer(
+              QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
+                .setValue(StringType("Sky is the limit")),
+            )
+          },
+        )
       }
-
-    coEvery { fhirEngine.get(ResourceType.Questionnaire, "12345") } returns questionnaire
-
-    val result = runBlocking {
-      questionnaireViewModel.loadQuestionnaire(
-        QuestionnaireConfig(id = "12345", type = QuestionnaireType.EDIT),
-      )
-    }
-
-    Assert.assertEquals("12345", result!!.logicalId)
-    Assert.assertFalse(result.item[0].readOnly)
-    Assert.assertEquals("patient-first-name", result.item[0].linkId)
-    Assert.assertEquals("patient-last-name", result.item[0].item[0].linkId)
-    assertTrue(result.item[1].readOnly)
+    questionnaireViewModel.saveDraftQuestionnaire(questionnaireResponse)
+    Assert.assertEquals(
+      QuestionnaireResponse.QuestionnaireResponseStatus.INPROGRESS,
+      questionnaireResponse.status,
+    )
+    coVerify { defaultRepository.addOrUpdate(resource = questionnaireResponse) }
   }
 
   @Test
-  fun testLoadQuestionnaireShouldPrepopulateFieldsWithPrepopulationParams() {
-    val prePopulationParams =
+  fun testUpdateResourcesLastUpdatedProperty() = runTest {
+    val yesterday = yesterday()
+    val thisPatient = Faker.buildPatient(id = "someId").apply { meta.lastUpdated = yesterday }
+    val actionParameters =
       listOf(
         ActionParameter(
-          paramType = ActionParameterType.PREPOPULATE,
-          linkId = "patient-age",
-          dataType = Enumerations.DataType.INTEGER,
-          key = "patientAge",
-          value = "100",
+          paramType = ActionParameterType.UPDATE_DATE_ON_EDIT,
+          resourceType = ResourceType.Patient,
+          value = thisPatient.id,
+          key = "patientId",
         ),
       )
 
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-first-name"
-              type = Questionnaire.QuestionnaireItemType.TEXT
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-last-name"
-                    type = Questionnaire.QuestionnaireItemType.TEXT
-                  },
-                )
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-age"
-              type = Questionnaire.QuestionnaireItemType.INTEGER
-              readOnly = true
-            },
-          )
-      }
+    coEvery { fhirEngine.update(any()) } just runs
+    coEvery { fhirEngine.create(thisPatient) } returns listOf(thisPatient.logicalId)
+    coEvery { fhirEngine.get(ResourceType.Patient, thisPatient.id) } returns thisPatient
 
-    coEvery { fhirEngine.get(ResourceType.Questionnaire, "12345") } returns questionnaire
+    questionnaireViewModel.updateResourcesLastUpdatedProperty(actionParameters)
+    Assert.assertTrue(thisPatient.meta.lastUpdated.after(yesterday))
 
-    val result = runBlocking {
-      questionnaireViewModel.loadQuestionnaire(
-        QuestionnaireConfig(id = "12345", type = QuestionnaireType.EDIT),
-        prePopulationParams,
+    val otherActionParameters =
+      listOf(
+        ActionParameter(
+          paramType = ActionParameterType.UPDATE_DATE_ON_EDIT,
+          value = "Patient/${thisPatient.id}",
+          key = "patientId",
+        ),
       )
-    }
-
-    Assert.assertEquals("12345", result!!.logicalId)
-    Assert.assertEquals("100", result.item[1].initial[0].value.valueToString())
+    questionnaireViewModel.updateResourcesLastUpdatedProperty(otherActionParameters)
+    Assert.assertTrue(thisPatient.meta.lastUpdated.after(yesterday))
   }
 
   @Test
-  @ExperimentalCoroutinesApi
-  fun testExtractAndSaveResourcesWithTargetStructureMapShouldCallExtractionService() {
-    mockkObject(ResourceMapper)
-    val patient = samplePatient()
-
-    coEvery { fhirEngine.get(ResourceType.Patient, any()) } returns Patient()
-    coEvery { fhirEngine.get(ResourceType.StructureMap, any()) } returns StructureMap()
-    coEvery { fhirEngine.get(ResourceType.Group, any()) } returns Group()
-    coEvery { ResourceMapper.extract(any(), any(), any()) } returns
-      Bundle().apply { addEntry().apply { this.resource = patient } }
-
+  fun testValidateQuestionnaireResponse() {
     val questionnaire =
       Questionnaire().apply {
-        addUseContext().apply {
-          code = Coding().apply { code = "focus" }
-          value = CodeableConcept().apply { addCoding().apply { code = "1234567" } }
-        }
-        addExtension(
-          "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap",
-          CanonicalType("1234"),
+        addItem(
+          Questionnaire.QuestionnaireItemComponent().apply {
+            linkId = "linkId"
+            type = Questionnaire.QuestionnaireItemType.INTEGER
+            required = true
+          },
         )
       }
 
-    Shadows.shadowOf(Looper.getMainLooper()).idle()
-
-    runTest {
-      val questionnaireResponse = QuestionnaireResponse()
+    val questionnaireResponse =
+      QuestionnaireResponse().apply {
+        addItem(
+          QuestionnaireResponse.QuestionnaireResponseItemComponent().apply { linkId = "linkId" },
+        )
+      }
 
-      questionnaireViewModel.extractAndSaveResources(
-        context = context,
-        questionnaireResponse = questionnaireResponse,
-        questionnaire = questionnaire,
-        questionnaireConfig = questionnaireConfig,
-      )
+    // No answer provided
+    Assert.assertFalse(
+      questionnaireViewModel.validateQuestionnaireResponse(
+        questionnaire,
+        questionnaireResponse,
+        context,
+      ),
+    )
 
-      coVerify { defaultRepo.addOrUpdate(resource = patient) }
-      coVerify { defaultRepo.addOrUpdate(resource = questionnaireResponse) }
-      coVerify(timeout = 10000) { ResourceMapper.extract(any(), any(), any()) }
-    }
-    unmockkObject(ResourceMapper)
+    // With an answer provided
+    Assert.assertTrue(
+      questionnaireViewModel.validateQuestionnaireResponse(
+        questionnaire,
+        questionnaireResponse.apply {
+          itemFirstRep.answer =
+            listOf(
+              QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
+                .setValue(StringType("Answer")),
+            )
+        },
+        context,
+      ),
+    )
   }
 
   @Test
-  @Ignore("Fix java.lang.NullPointerException")
-  fun testExtractAndSaveResourcesWithExtractionExtensionAndNullResourceShouldAssignTags() {
+  fun testExecuteCqlShouldInvokeRunCqlLibrary() = runTest {
+    val bundle =
+      Bundle().apply { addEntry(Bundle.BundleEntryComponent().apply { resource = patient }) }
+
     val questionnaire =
-      Questionnaire().apply {
-        addUseContext().apply {
-          code = Coding().apply { code = "focus" }
-          value = CodeableConcept().apply { addCoding().apply { code = "1234567" } }
-        }
+      samplePatientRegisterQuestionnaire.copy().apply {
         addExtension(
-          Extension(
-            "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemExtractionContext",
-            Expression().apply {
-              language = "application/x-fhir-query"
-              expression = "Patient"
-              name = "Patient"
-            },
-          ),
+          Extension().apply {
+            url = "https://sample.cqf-library.url"
+            setValue(StringType("Library/123"))
+          },
         )
       }
+    questionnaireViewModel.executeCql(patient, bundle, questionnaire)
 
-    val questionnaireResponse = QuestionnaireResponse().apply { subject = Reference("12345") }
-
-    questionnaireViewModel.extractAndSaveResources(
-      context = context,
-      questionnaireResponse = questionnaireResponse,
-      questionnaire = questionnaire,
-      questionnaireConfig = questionnaireConfig,
-    )
-
-    coVerify { defaultRepo.addOrUpdate(resource = any()) }
-
-    unmockkObject(ResourceMapper)
+    coVerify { libraryEvaluator.runCqlLibrary("123", patient, bundle) }
   }
 
   @Test
-  fun testExtractAndSaveResourcesWithResourceIdShouldSaveQuestionnaireResponse() {
-    coEvery { fhirEngine.get(ResourceType.Patient, "2") } returns samplePatient()
-
-    val questionnaireResponseSlot = slot<QuestionnaireResponse>()
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        addUseContext().apply {
-          code = Coding().apply { code = "focus" }
-          value = CodeableConcept().apply { addCoding().apply { code = "1234567" } }
-        }
-      }
-
-    questionnaireViewModel.extractAndSaveResources(
-      context = context,
-      questionnaireResponse =
-        QuestionnaireResponse().apply { subject = Reference().apply { reference = "Patient/2" } },
-      questionnaire = questionnaire,
-      questionnaireConfig = questionnaireConfig,
-    )
+  fun testGenerateCarePlan() = runTest {
+    val bundle =
+      Bundle().apply { addEntry(Bundle.BundleEntryComponent().apply { resource = patient }) }
 
-    coVerify(timeout = 2000) {
-      defaultRepo.addOrUpdate(resource = capture(questionnaireResponseSlot))
+    val questionnaireConfig = questionnaireConfig.copy(planDefinitions = listOf("planDefId"))
+    questionnaireViewModel.generateCarePlan(patient, bundle, questionnaireConfig)
+    coVerify {
+      fhirCarePlanGenerator.generateOrUpdateCarePlan(
+        planDefinitionId = "planDefId",
+        subject = patient,
+        data = bundle,
+      )
     }
-
-    Assert.assertEquals(
-      "2",
-      questionnaireResponseSlot.captured.subject.reference.replace("Patient/", ""),
-    )
-    Assert.assertEquals("1234567", questionnaireResponseSlot.captured.meta.tagFirstRep.code)
   }
 
   @Test
-  fun testExtractAndSaveResourcesWithEditModeShouldSaveQuestionnaireResponse() {
-    mockkObject(ResourceMapper)
-
-    coEvery { ResourceMapper.extract(any(), any(), any()) } returns
-      Bundle().apply { addEntry().resource = samplePatient() }
-    coEvery { fhirEngine.get(ResourceType.Patient, "2") } returns samplePatient().apply { id = "2" }
-    coEvery { defaultRepo.addOrUpdate(resource = any()) } just runs
-
-    val questionnaireResponseSlot = slot<QuestionnaireResponse>()
-    val patientSlot = slot<Resource>()
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        addUseContext().apply {
-          code = Coding().apply { code = "focus" }
-          value = CodeableConcept().apply { addCoding().apply { code = "1234567" } }
-        }
-        addExtension().url = "sdc-questionnaire-itemExtractionContext"
+  fun testAddResourceToConfiguredGroup() = runTest {
+    val group =
+      Group().apply {
+        id = "testGroupId"
+        active = true
       }
-    questionnaireConfig = questionnaireConfig.copy(type = QuestionnaireType.EDIT)
 
-    questionnaireViewModel.extractAndSaveResources(
-      context = context,
-      questionnaireResponse =
-        QuestionnaireResponse().apply { subject = Reference().apply { reference = "Patient/2" } },
-      questionnaire = questionnaire,
-      questionnaireConfig = questionnaireConfig,
-    )
+    coEvery { fhirEngine.get(ResourceType.Group, group.logicalId) } returns group
+    coEvery { fhirEngine.update(any()) } just runs
 
-    coVerifyOrder {
-      defaultRepo.addOrUpdate(resource = capture(patientSlot))
-      defaultRepo.addOrUpdate(resource = capture(questionnaireResponseSlot))
-    }
+    // Attempting to add Group as member of itself should fail
+    questionnaireViewModel.addMemberToConfiguredGroup(
+      group,
+      GroupResourceConfig(
+        groupIdentifier = group.logicalId,
+        memberResourceType = ResourceType.Patient,
+      ),
+    )
+    coVerify(exactly = 0) { defaultRepository.addOrUpdate(resource = group) }
+
+    // Should add member to a group if not exits
+    questionnaireViewModel.addMemberToConfiguredGroup(
+      patient,
+      GroupResourceConfig(
+        groupIdentifier = group.logicalId,
+        memberResourceType = ResourceType.Patient,
+      ),
+    )
 
-    Assert.assertEquals("2", patientSlot.captured.id)
-    unmockkObject(ResourceMapper)
-  }
+    Assert.assertFalse(group.member.isNullOrEmpty())
+    coVerify { defaultRepository.addOrUpdate(resource = group) }
 
-  @Test
-  fun testSaveResourceShouldVerifyResourceSaveMethodCall() {
-    coEvery { defaultRepo.create(any()) } returns emptyList()
-    questionnaireViewModel.saveResource(mockk())
-    coVerify(exactly = 1) { defaultRepo.create(any(), any()) }
+    // Attempting to add existing member to a Group should fail
+    val anotherGroup =
+      Group()
+        .apply {
+          id = "anotherGroup"
+          active = true
+        }
+        .apply { addMember(Group.GroupMemberComponent(patient.asReference())) }
+    coEvery { fhirEngine.get(ResourceType.Group, anotherGroup.logicalId) } returns anotherGroup
+    questionnaireViewModel.addMemberToConfiguredGroup(
+      patient,
+      GroupResourceConfig(
+        groupIdentifier = group.logicalId,
+        memberResourceType = ResourceType.Patient,
+      ),
+    )
+    coVerify(exactly = 0) { defaultRepository.addOrUpdate(resource = anotherGroup) }
   }
 
   @Test
-  @ExperimentalCoroutinesApi
-  fun testSaveQuestionnaireResponseShouldCallAddOrUpdateWhenResourceIdIsNotBlank() {
-    val questionnaire = Questionnaire().apply { id = "qId" }
-    val questionnaireResponse = QuestionnaireResponse().apply { subject = Reference("12345") }
-    coEvery { defaultRepo.addOrUpdate(resource = any()) } returns Unit
-
-    runBlocking {
-      questionnaireViewModel.saveQuestionnaireResponse(questionnaire, questionnaireResponse)
-    }
-
-    coVerify { defaultRepo.addOrUpdate(resource = questionnaireResponse) }
-  }
+  fun testSoftDeleteShouldTriggerDefaultRepositoryRemoveGroupFunction() {
+    val theQuestionnaireConfig =
+      QuestionnaireConfig(
+        id = samplePatientRegisterQuestionnaire.id,
+        groupResource =
+          GroupResourceConfig(
+            groupIdentifier = "sampleGroupId",
+            removeGroup = true,
+            memberResourceType = ResourceType.Patient,
+          ),
+      )
 
-  @Test
-  @ExperimentalCoroutinesApi
-  fun testSaveQuestionnaireResponseWithExperimentalQuestionnaireShouldNotSave() {
-    val questionnaire = Questionnaire().apply { experimental = true }
-    val questionnaireResponse = QuestionnaireResponse()
+    questionnaireViewModel.softDeleteResources(theQuestionnaireConfig)
 
-    runBlocking {
-      questionnaireViewModel.saveQuestionnaireResponse(questionnaire, questionnaireResponse)
+    coVerify {
+      defaultRepository.removeGroup(
+        groupId = theQuestionnaireConfig.groupResource?.groupIdentifier!!,
+        isDeactivateMembers = true,
+        configComputedRuleValues = emptyMap(),
+      )
     }
-
-    coVerify(inverse = true) { defaultRepo.addOrUpdate(resource = questionnaireResponse) }
   }
 
   @Test
-  @ExperimentalCoroutinesApi
-  fun testSaveQuestionnaireResponseWithActionParameterIdShouldAddOrUpdate() {
-    val theId = "the Id"
-    val uuid = "the uuid"
-    val relatedResourceId = "Group/$uuid"
-    val questionnaire = Questionnaire().apply { id = theId }
-    val questionnaireResponse = QuestionnaireResponse()
-    val resource = Group().apply { id = uuid }
+  fun testSoftDeleteShouldTriggerDefaultRepositoryRemoveGroupMemberFunction() {
+    val theQuestionnaireConfig =
+      QuestionnaireConfig(
+        id = samplePatientRegisterQuestionnaire.id,
+        resourceIdentifier = patient.logicalId,
+        groupResource =
+          GroupResourceConfig(
+            groupIdentifier = "sampleGroupId",
+            removeGroup = true,
+            memberResourceType = ResourceType.Patient,
+            removeMember = true,
+          ),
+      )
 
-    coEvery { fhirEngine.loadResource<Questionnaire>(theId) } returns questionnaire
-    coEvery { defaultRepo.loadResource(uuid, ResourceType.Group) } returns resource
+    questionnaireViewModel.softDeleteResources(theQuestionnaireConfig)
 
-    runBlocking {
-      questionnaireViewModel.loadQuestionnaire(
-        QuestionnaireConfig(id = theId, type = QuestionnaireType.DEFAULT),
-        listOf(
-          ActionParameter(
-            "key",
-            ActionParameterType.UPDATE_DATE_ON_EDIT,
-            value = relatedResourceId,
-          ),
-        ),
+    coVerify {
+      defaultRepository.removeGroupMember(
+        memberId = patient.logicalId,
+        groupId = theQuestionnaireConfig.groupResource?.groupIdentifier!!,
+        groupMemberResourceType = ResourceType.Patient,
+        configComputedRuleValues = emptyMap(),
       )
-      questionnaireViewModel.saveQuestionnaireResponse(questionnaire, questionnaireResponse)
     }
-
-    coVerify { defaultRepo.addOrUpdate(resource = questionnaireResponse) }
-    coVerify { defaultRepo.addOrUpdate(resource = resource) }
   }
 
   @Test
-  fun testExtractAndSaveResourcesWithExperimentalQuestionnaireShouldNotSave() {
-    mockkObject(ResourceMapper)
-
-    coEvery { ResourceMapper.extract(any(), any(), any()) } returns
-      Bundle().apply { addEntry().apply { resource = Patient() } }
-
-    val questionnaire =
-      Questionnaire().apply {
-        experimental = true
-        addExtension().url = "sdc-questionnaire-itemExtractionContext"
-      }
-    val questionnaireResponse = QuestionnaireResponse()
-
-    runBlocking {
-      questionnaireViewModel.extractAndSaveResources(
-        context = ApplicationProvider.getApplicationContext(),
-        questionnaireResponse = questionnaireResponse,
-        questionnaire = questionnaire,
-        questionnaireConfig = questionnaireConfig,
+  fun testSoftDeleteShouldTriggerDefaultRepositoryUpdateResourceFunction() {
+    val patient = Faker.buildPatient()
+    val theQuestionnaireConfig =
+      QuestionnaireConfig(
+        id = "the-questionnaire-id",
+        resourceIdentifier = patient.id,
+        resourceType = ResourceType.Patient,
+        removeResource = true,
       )
-    }
-
-    coVerify { ResourceMapper.extract(any(), any(), any()) }
-    coVerify(inverse = true) { defaultRepo.addOrUpdate(resource = questionnaireResponse) }
+    coEvery { fhirEngine.get(ResourceType.Patient, patient.id) } returns patient
+    questionnaireViewModel.softDeleteResources(theQuestionnaireConfig)
 
-    unmockkObject(ResourceMapper)
+    // Soft delete sets Patient.active to false
+    Assert.assertFalse(patient.active)
+    coVerify { defaultRepository.addOrUpdate(true, patient) }
   }
 
   @Test
-  fun testExtractQuestionnaireResponseShouldAddIdAndAuthoredWhenQuestionnaireResponseDoesNotHaveId() {
-    val questionnaire = Questionnaire().apply { id = "qId" }
-    val questionnaireResponse = QuestionnaireResponse().apply { subject = Reference("12345") }
-    coEvery { defaultRepo.addOrUpdate(resource = any()) } returns Unit
+  fun testSearchLatestQuestionnaireResponseShouldReturnLatestQuestionnaireResponse() = runTest {
+    coEvery {
+      fhirEngine.search<QuestionnaireResponse> {
+        filter(QuestionnaireResponse.SUBJECT, { value = patient.logicalId })
+        filter(
+          QuestionnaireResponse.QUESTIONNAIRE,
+          { value = ResourceType.Questionnaire.name + "/" + questionnaireConfig.id },
+        )
+      }
+    } returns emptyList()
 
-    Assert.assertNull(questionnaireResponse.id)
-    Assert.assertNull(questionnaireResponse.authored)
+    Assert.assertNull(
+      questionnaireViewModel.searchLatestQuestionnaireResponse(
+        resourceId = patient.logicalId,
+        resourceType = ResourceType.Patient,
+        questionnaireId = questionnaireConfig.id,
+      ),
+    )
 
-    runBlocking {
-      questionnaireViewModel.extractAndSaveResources(
-        context = context,
-        questionnaireResponse = questionnaireResponse,
-        questionnaire = questionnaire,
-        questionnaireConfig = questionnaireConfig,
+    val questionnaireResponses =
+      listOf(
+        QuestionnaireResponse().apply {
+          id = "qr1"
+          meta.lastUpdated = Date()
+        },
+        QuestionnaireResponse().apply {
+          id = "qr2"
+          meta.lastUpdated = yesterday()
+        },
       )
-    }
-
-    Assert.assertNotNull(questionnaireResponse.id)
-    Assert.assertNotNull(questionnaireResponse.authored)
-  }
 
-  @Test
-  fun testExtractQuestionnaireResponseShouldRetainIdAndAuthoredWhenQuestionnaireResponseHasId() {
-    val authoredDate = Date()
-    val questionnaire = Questionnaire().apply { id = "qId" }
-    val questionnaireResponse =
-      QuestionnaireResponse().apply {
-        id = "qrId"
-        authored = authoredDate
-        subject = Reference("12345")
+    coEvery {
+      fhirEngine.search<QuestionnaireResponse> {
+        filter(QuestionnaireResponse.SUBJECT, { value = patient.logicalId })
+        filter(
+          QuestionnaireResponse.QUESTIONNAIRE,
+          { value = ResourceType.Questionnaire.name + "/" + questionnaireConfig.id },
+        )
       }
-    coEvery { defaultRepo.addOrUpdate(resource = any()) } returns Unit
+    } returns questionnaireResponses
 
-    runBlocking {
-      questionnaireViewModel.extractAndSaveResources(
-        context,
-        questionnaireResponse,
-        questionnaire,
-        questionnaireConfig,
+    val latestQuestionnaireResponse =
+      questionnaireViewModel.searchLatestQuestionnaireResponse(
+        resourceId = patient.logicalId,
+        resourceType = ResourceType.Patient,
+        questionnaireId = questionnaireConfig.id,
       )
-    }
-
-    Assert.assertEquals("qrId", questionnaireResponse.id)
-    Assert.assertEquals(authoredDate, questionnaireResponse.authored)
+    Assert.assertNotNull(latestQuestionnaireResponse)
+    Assert.assertEquals("qr1", latestQuestionnaireResponse?.id)
   }
 
   @Test
-  fun testExtractAndSaveResourcesShouldCallDeleteRelatedResourcesWhenEditModeIsTrue() {
-    mockkObject(ResourceMapper)
-    val id = "qrId"
-    val authoredDate = Date()
-    val versionId = "5"
-    val author = Reference()
-    val patient = samplePatient()
-
-    coEvery { fhirEngine.get(ResourceType.Patient, any()) } returns Patient()
-    coEvery { fhirEngine.get(ResourceType.StructureMap, any()) } returns StructureMap()
-    coEvery { ResourceMapper.extract(any(), any(), any()) } returns
-      Bundle().apply { addEntry().apply { this.resource = patient } }
-
-    val questionnaire =
-      spyk(
-        Questionnaire().apply {
-          addUseContext().apply {
-            code = Coding().apply { code = "focus" }
-            value = CodeableConcept().apply { addCoding().apply { code = "1234567" } }
-          }
-          addExtension(
-            "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap",
-            CanonicalType("1234"),
-          )
-        },
+  fun testRetrievePopulationResourcesReturnsListOfResourcesOrEmptyList() = runTest {
+    val specimenId = "specimenId"
+    val actionParameters =
+      listOf(
+        ActionParameter(
+          paramType = ActionParameterType.QUESTIONNAIRE_RESPONSE_POPULATION_RESOURCE,
+          resourceType = ResourceType.Patient,
+          value = patient.id,
+          key = "patientId",
+        ),
+        ActionParameter(
+          paramType = ActionParameterType.QUESTIONNAIRE_RESPONSE_POPULATION_RESOURCE,
+          resourceType = ResourceType.Specimen,
+          value = specimenId,
+          key = specimenId,
+        ),
       )
 
-    val oldQuestionnaireResponse =
-      QuestionnaireResponse().apply {
-        setId(id)
-        authored = authoredDate
-        setAuthor(author)
-        meta.apply { setVersionId(versionId) }
-      }
-    val questionnaireResponse = spyk(QuestionnaireResponse())
-
-    questionnaireViewModel.editQuestionnaireResponse = oldQuestionnaireResponse
-    questionnaireViewModel.extractAndSaveResources(
-      context = context,
-      questionnaireResponse = questionnaireResponse,
-      questionnaire = questionnaire,
-      questionnaireConfig = questionnaireConfig.copy(type = QuestionnaireType.EDIT),
+    // No resources found, empty list returned
+    coEvery { fhirEngine.get(ResourceType.Patient, patient.id) } throws
+      (ResourceNotFoundException("Patient", patient.id))
+    coEvery { fhirEngine.get(ResourceType.Specimen, specimenId) } throws
+      (ResourceNotFoundException("Specimen", specimenId))
+    Assert.assertTrue(
+      questionnaireViewModel.retrievePopulationResources(actionParameters).isEmpty(),
     )
 
-    verify { questionnaireResponse.retainMetadata(oldQuestionnaireResponse) }
-
-    unmockkObject(ResourceMapper)
+    // Provide only Patient resource
+    coEvery { fhirEngine.get(ResourceType.Patient, patient.id) } returns patient
+    coEvery { fhirEngine.get(ResourceType.Specimen, specimenId) } throws
+      (ResourceNotFoundException("Specimen", specimenId))
+    val resources = questionnaireViewModel.retrievePopulationResources(actionParameters)
+    Assert.assertEquals(1, resources.size)
+    Assert.assertEquals(patient.id, resources.firstOrNull()?.id)
   }
 
   @Test
-  fun testCalculateDobFromAge() {
-    val expectedBirthDate = Calendar.getInstance()
-    val ageInput = expectedBirthDate.get(Calendar.YEAR) - 2010
-    expectedBirthDate.set(Calendar.YEAR, 2010)
-    expectedBirthDate.set(Calendar.MONTH, 1)
-    expectedBirthDate.set(Calendar.DAY_OF_YEAR, 1)
-    val resultBirthDate = Calendar.getInstance()
-    resultBirthDate.time = questionnaireViewModel.calculateDobFromAge(ageInput)
-    Assert.assertEquals(expectedBirthDate.get(Calendar.YEAR), resultBirthDate.get(Calendar.YEAR))
-  }
+  fun testLoadResourceShouldReturnResourceOrNullIfNotFound() = runTest {
+    coEvery { fhirEngine.get(ResourceType.Patient, patient.id) } throws
+      (ResourceNotFoundException("Patient", patient.id))
+    Assert.assertNull(questionnaireViewModel.loadResource(ResourceType.Patient, patient.id))
 
-  @Test
-  fun testGetAgeInputFromQuestionnaire() {
-    val expectedAge = 25
-    val questionnaireResponse =
-      QuestionnaireResponse().apply {
-        id = "12345"
-        item =
-          listOf(
-            QuestionnaireResponseItemComponent().apply {
-              linkId = "q1-grp"
-              item =
-                listOf(
-                  QuestionnaireResponseItemComponent().apply {
-                    linkId = QuestionnaireActivity.QUESTIONNAIRE_AGE
-                    answer =
-                      listOf(
-                        QuestionnaireResponseItemAnswerComponent().apply {
-                          value = DecimalType(25)
-                        },
-                      )
-                  },
-                )
-            },
-          )
-      }
-    Assert.assertEquals(expectedAge, questionnaireViewModel.getAgeInput(questionnaireResponse))
+    coEvery { fhirEngine.get(ResourceType.Patient, patient.id) } returns patient
+    Assert.assertNotNull(questionnaireViewModel.loadResource(ResourceType.Patient, patient.id))
   }
 
   @Test
-  fun `saveBundleResources() should call saveResources()`() {
-    val bundle = Bundle()
-    val size = 1
-
-    for (i in 1..size) {
-      val bundleEntry = Bundle.BundleEntryComponent()
-      bundleEntry.resource =
-        Patient().apply {
-          name =
-            listOf(
-              HumanName().apply {
-                family = "Doe"
-                given = listOf(StringType("John"))
-              },
-            )
-        }
-      bundle.addEntry(bundleEntry)
-    }
-    bundle.total = size
-
-    // call the method under test
-    runBlocking { questionnaireViewModel.saveBundleResources(bundle) }
-
-    coVerify(exactly = size) { defaultRepo.addOrUpdate(resource = any()) }
-  }
-
-  @Test
-  fun `saveBundleResources() should call saveResources and inject resourceId()`() {
-    val bundle = Bundle()
-    val size = 5
-    val resource = slot<Resource>()
-
-    val bundleEntry = Bundle.BundleEntryComponent()
-    bundleEntry.resource =
-      Patient().apply {
-        name =
-          listOf(
-            HumanName().apply {
-              family = "Doe"
-              given = listOf(StringType("John"))
-            },
-          )
-      }
-    bundle.addEntry(bundleEntry)
-    bundle.total = size
-
-    // call the method under test
-    runBlocking { questionnaireViewModel.saveBundleResources(bundle) }
-
-    coVerify(exactly = 1) { defaultRepo.addOrUpdate(resource = capture(resource)) }
-  }
-
-  @Test
-  fun `fetchStructureMap() should call fhirEngine load and parse out the resourceId`() {
-    val structureMap = StructureMap()
-    val structureMapIdSlot = slot<String>()
-
-    coEvery { fhirEngine.get(ResourceType.StructureMap, any()) } returns structureMap
-
-    runBlocking {
-      questionnaireViewModel.fetchStructureMap("https://someorg.org/StructureMap/678934")
-    }
-
-    coVerify(exactly = 1) { fhirEngine.get(ResourceType.StructureMap, capture(structureMapIdSlot)) }
-
-    Assert.assertEquals("678934", structureMapIdSlot.captured)
-  }
-
-  @Test
-  fun `extractAndSaveResources() should call saveBundleResources when Questionnaire uses Definition-based extraction`() {
-    coEvery { fhirEngine.get(ResourceType.Questionnaire, any()) } returns
-      samplePatientRegisterQuestionnaire
-    coEvery { fhirEngine.get(ResourceType.Group, any()) } returns Group()
-
-    val questionnaire = Questionnaire()
-    questionnaire.extension.add(
-      Extension(
-        "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemExtractionContext",
-        Expression().apply {
-          language = "application/x-fhir-query"
-          expression = "Patient"
-        },
-      ),
-    )
-    questionnaire.addSubjectType("Patient")
-    val questionnaireResponse = QuestionnaireResponse()
-    val bundle = Bundle().apply { id = "1234" }
-    runBlocking { questionnaireViewModel.saveBundleResources(bundle) }
-    coEvery { questionnaireViewModel.saveBundleResources(bundle) } just runs
-    runBlocking {
-      questionnaireViewModel.performExtraction(context, questionnaire, questionnaireResponse)
-    }
-    coEvery { questionnaireViewModel.performExtraction(any<Context>(), any(), any()) } returns
-      Bundle().apply { addEntry().resource = samplePatient() }
-    runBlocking {
-      questionnaireViewModel.saveQuestionnaireResponse(questionnaire, questionnaireResponse)
-    }
-    coEvery { questionnaireViewModel.saveQuestionnaireResponse(any(), any()) } just runs
-
-    questionnaireViewModel.extractAndSaveResources(
-      context = context,
-      questionnaireResponse = questionnaireResponse,
-      questionnaire = questionnaire,
-      questionnaireConfig = questionnaireConfig,
-    )
-
-    coVerify(exactly = 1, timeout = 2000) { questionnaireViewModel.saveBundleResources(bundle) }
-    coVerify(exactly = 1, timeout = 2000) {
-      questionnaireViewModel.saveQuestionnaireResponse(questionnaire, questionnaireResponse)
-    }
-  }
-
-  @Test
-  @ExperimentalCoroutinesApi
-  fun testPerformExtractionOnNullBundle() {
-    runTest {
-      val bundle = Bundle()
-      val questionnaire = Questionnaire()
-      val questionnaireResponse = QuestionnaireResponse()
-      val questionnaireConfig = questionnaireConfig
-
-      coEvery { questionnaireViewModel.extractCqlOutput(any(), any(), any()) } just runs
-      coEvery { questionnaireViewModel.extractCarePlan(any(), any(), any()) } just runs
-
-      questionnaireViewModel.performExtraction(
-        questionnaireResponse,
-        questionnaireConfig,
-        questionnaire,
-        bundle,
-      )
-      coVerifyOrder {
-        questionnaireViewModel.extractCqlOutput(questionnaire, questionnaireResponse, bundle)
-        questionnaireViewModel.extractCarePlan(questionnaireResponse, bundle, questionnaireConfig)
-      }
-    }
-  }
-
-  @Test
-  fun testPerformExtractionOnSuccessReturnsABundleAndShowsSuccessToast() {
-    val context = mockk<Context>(relaxed = true)
-    val bundle = Bundle()
-    val questionnaire = Questionnaire()
-    questionnaire.name = "eCBIS Add Family Member Registration"
-    coEvery {
-      questionnaireViewModel.performExtraction(
-        context,
-        questionnaire = questionnaire,
-        questionnaireResponse = QuestionnaireResponse(),
-      )
-    } returns bundle
-    Assert.assertNotNull(bundle)
-
-    context.getString(R.string.structure_success)
-    coVerify { context.getString(R.string.structure_success) }
-    context.showToast(
-      context.getString(R.string.structure_success, questionnaire.name),
-      Toast.LENGTH_LONG,
-    )
-    coVerify {
-      context.showToast(
-        context.getString(R.string.structure_success, questionnaire.name),
-        Toast.LENGTH_LONG,
-      )
-    }
-  }
-
-  @Test
-  fun testPerformExtractionOnFailureShowsMissingStructureMapToast() {
-    val context = mockk<Context>(relaxed = true)
-    val questionnaire = Questionnaire()
-    questionnaire.name = "eCBIS Add Family Member Registration"
-    val missingStructureMapExceptionMessage =
-      context.getString(R.string.structure_map_missing_message, questionnaire.name)
-    val questionnaireResponse = QuestionnaireResponse()
-
-    coEvery { questionnaireViewModel.retrieveStructureMapProvider() } throws
-      NullPointerException(
-        "NullPointerException when invoking StructureMap on Null Object reference",
-      )
-
-    coEvery {
-      questionnaireViewModel.performExtraction(context, questionnaire, questionnaireResponse)
-    }
-    context.getString(R.string.structure_map_missing_message)
-    context.showToast(missingStructureMapExceptionMessage, Toast.LENGTH_LONG)
-    coVerify { context.getString(R.string.structure_map_missing_message) }
-
-    coVerify { context.showToast(missingStructureMapExceptionMessage, Toast.LENGTH_LONG) }
-  }
-
-  @Test
-  @ExperimentalCoroutinesApi
-  fun testPerformExtractionOnFailureShowsErrorToast() = runTest {
-    val context = mockk<Context>(relaxed = true)
-    val questionnaire = Questionnaire()
-    val questionnaireResponse = QuestionnaireResponse()
-    questionnaire.name = "eCBIS Add Family Member Registration"
-    val errorMessage = context.getString(R.string.structuremap_failed, questionnaire.name)
-    coEvery { questionnaireViewModel.retrieveStructureMapProvider() } throws
-      Exception("Failed to process resources")
-
-    questionnaireViewModel.performExtraction(context, questionnaire, questionnaireResponse)
-    coVerify {
-      questionnaireViewModel.performExtraction(context, questionnaire, questionnaireResponse)
-    }
-    coVerify { context.getString(R.string.structuremap_failed, questionnaire.name) }
-    coVerify { context.showToast(errorMessage, Toast.LENGTH_LONG) }
-  }
-
-  @Test
-  fun `extractAndSaveResources() should call runCqlLibrary when Questionnaire uses cqf-library extension`() {
-    coEvery { fhirEngine.get(ResourceType.Questionnaire, any()) } returns
-      samplePatientRegisterQuestionnaire
-    coEvery { fhirEngine.get(ResourceType.Group, any()) } returns Group()
-
-    val questionnaire =
-      Questionnaire().apply {
-        addSubjectType("Patient")
-        extension =
-          mutableListOf(
-            Extension(
-              "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemExtractionContext",
-              Expression().apply {
-                language = "application/x-fhir-query"
-                expression = "Patient"
-              },
-            ),
-            Extension(
-              "http://hl7.org/fhir/uv/sdc/StructureDefinition/cqf-library",
-              CanonicalType("Library/1234"),
-            ),
-          )
-      }
-    val questionnaireResponse = QuestionnaireResponse()
-
-    val patient = samplePatient().apply { id = "2" }
-    coEvery { fhirEngine.get(ResourceType.Patient, "2") } returns patient
-    coEvery { fhirEngine.get<Patient>(any()) } returns patient
-    coEvery { questionnaireViewModel.saveBundleResources(any()) } just runs
-    coEvery { questionnaireViewModel.performExtraction(any<Context>(), any(), any()) } returns
-      Bundle().apply { addEntry().resource = patient }
-
-    coEvery {
-      libraryEvaluator.runCqlLibrary(
-        eq("1234"),
-        eq(patient),
-        eq(Bundle().apply { addEntry().resource = patient }),
-        eq(defaultRepo),
-        eq(false),
-      )
-    } returns listOf()
-
-    val slotQuestionnaire = slot<Questionnaire>()
-    val slotQuestionnaireResponse = slot<QuestionnaireResponse>()
-    coEvery {
-      questionnaireViewModel.saveQuestionnaireResponse(
-        capture(slotQuestionnaire),
-        capture(slotQuestionnaireResponse),
-      )
-    } just runs
-
-    questionnaireViewModel.extractAndSaveResources(
-      context = context,
-      questionnaireResponse = questionnaireResponse,
-      questionnaire = questionnaire,
-      questionnaireConfig = questionnaireConfig,
-    )
-    coVerify(exactly = 1, timeout = 2000) { questionnaireViewModel.saveBundleResources(any()) }
-    coVerify { fhirEngine.get(ResourceType.Patient, "2") }
-
-    assertEquals(questionnaire, slotQuestionnaire.captured)
-    assertEquals(questionnaireResponse, slotQuestionnaireResponse.captured)
-  }
-
-  @Test
-  fun testSaveResourceShouldCallDefaultRepositorySave() {
-    val sourcePatient = Patient().apply { id = "test_patient_1_id" }
-    questionnaireViewModel.saveResource(sourcePatient)
-
-    coVerify { defaultRepo.create(true, sourcePatient) }
-  }
-
-  @Test
-  fun `getStructureMapProvider() should return valid provider`() {
-    Assert.assertNull(questionnaireViewModel.structureMapProvider)
-
-    Assert.assertNotNull(questionnaireViewModel.retrieveStructureMapProvider())
-  }
-
-  @Test
-  fun `structureMapProvider should call fetchStructureMap()`() {
-    val resourceUrl = "https://fhir.org/StructureMap/89"
-    val structureMapProvider = questionnaireViewModel.retrieveStructureMapProvider()
-
-    coEvery { questionnaireViewModel.fetchStructureMap(any()) } returns StructureMap()
-
-    runBlocking { structureMapProvider.invoke(resourceUrl, SimpleWorkerContext()) }
-
-    coVerify { questionnaireViewModel.fetchStructureMap(resourceUrl) }
-  }
-
-  fun testHandlePatientSubjectShouldReturnSetCorrectReference() {
-    val questionnaire = Questionnaire().apply { addSubjectType("Patient") }
-    val questionnaireResponse = QuestionnaireResponse()
-
-    Assert.assertFalse(questionnaireResponse.hasSubject())
-
-    questionnaireViewModel.handleQuestionnaireResponseSubject(
-      "123",
-      questionnaire,
-      questionnaireResponse,
-    )
-
-    Assert.assertEquals("Patient/123", questionnaireResponse.subject.reference)
-  }
-
-  @Test
-  fun testHandleOrganizationSubjectShouldReturnSetCorrectReference() {
-    val questionnaire = Questionnaire().apply { addSubjectType("Organization") }
-    val questionnaireResponse = QuestionnaireResponse()
-
-    Assert.assertFalse(questionnaireResponse.hasSubject())
-
-    questionnaireViewModel.handleQuestionnaireResponseSubject(
-      "123",
-      questionnaire,
-      questionnaireResponse,
-    )
-
-    Assert.assertEquals("Organization/105", questionnaireResponse.subject.reference)
-  }
-
-  private fun practitionerDetails(): PractitionerDetails {
-    return PractitionerDetails().apply {
-      userDetail = KeycloakUserDetails().apply { id = "12345" }
-      fhirPractitionerDetails =
-        FhirPractitionerDetails().apply {
-          id = "12345"
-          practitionerId = StringType("12345")
-        }
-    }
-  }
-
-  private fun samplePatient() =
-    Patient().apply {
-      Patient@ this.id = "123456"
-      this.birthDate = questionnaireViewModel.calculateDobFromAge(25)
-    }
-
-  @Test
-  fun testPartialQuestionnaireResponseHasValues() {
-    // empty QuestionnaireResponse
-    Assert.assertFalse(
-      questionnaireViewModel.partialQuestionnaireResponseHasValues(QuestionnaireResponse()),
-    )
-
-    // empty item
-    Assert.assertFalse(
-      questionnaireViewModel.partialQuestionnaireResponseHasValues(
-        QuestionnaireResponse().apply {
-          item = mutableListOf(QuestionnaireResponseItemComponent())
-        },
-      ),
-    )
-
-    // with answer
-    Assert.assertFalse(
-      questionnaireViewModel.partialQuestionnaireResponseHasValues(
-        QuestionnaireResponse().apply {
-          item =
-            mutableListOf(
-              QuestionnaireResponseItemComponent().apply {
-                answer = mutableListOf(QuestionnaireResponseItemAnswerComponent())
-              },
-            )
-        },
-      ),
-    )
-
-    // with answer and value that is empty
-    Assert.assertFalse(
-      questionnaireViewModel.partialQuestionnaireResponseHasValues(
-        QuestionnaireResponse().apply {
-          item =
-            mutableListOf(
-              QuestionnaireResponseItemComponent().apply {
-                answer =
-                  mutableListOf(QuestionnaireResponseItemAnswerComponent().apply { value = Age() })
-              },
-            )
-        },
-      ),
-    )
-
-    // with answer and value that is not empty
-    assertTrue(
-      questionnaireViewModel.partialQuestionnaireResponseHasValues(
-        QuestionnaireResponse().apply {
-          item =
-            mutableListOf(
-              QuestionnaireResponseItemComponent().apply {
-                answer =
-                  mutableListOf(
-                    QuestionnaireResponseItemAnswerComponent().apply {
-                      value = Age().apply { value = BigDecimal.ONE }
-                    },
-                  )
-              },
-            )
-        },
-      ),
-    )
-
-    // second answer has non empty value
-    assertTrue(
-      questionnaireViewModel.partialQuestionnaireResponseHasValues(
-        QuestionnaireResponse().apply {
-          item =
-            mutableListOf(
-              QuestionnaireResponseItemComponent().apply {
-                answer =
-                  mutableListOf(
-                    QuestionnaireResponseItemAnswerComponent(),
-                    QuestionnaireResponseItemAnswerComponent().apply {
-                      value = Age().apply { value = BigDecimal.ONE }
-                    },
-                  )
-              },
-            )
-        },
-      ),
-    )
-  }
-
-  @Test
-  fun testSavePartialQuestionnaireResponseCallsSaveResponse() {
-    val questionnaireResponse = QuestionnaireResponse()
-    questionnaireViewModel.savePartialQuestionnaireResponse(Questionnaire(), questionnaireResponse)
+  fun testSetProgressStateShouldUpdateLiveData() {
+    val questionnaireState = QuestionnaireProgressState.QuestionnaireLaunch(true)
+    questionnaireViewModel.setProgressState(questionnaireState)
     Assert.assertEquals(
-      QuestionnaireResponse.QuestionnaireResponseStatus.INPROGRESS,
-      questionnaireResponse.status,
+      questionnaireState,
+      questionnaireViewModel.questionnaireProgressStateLiveData.value,
     )
-    coVerify { questionnaireViewModel.saveQuestionnaireResponse(any(), any()) }
-  }
-
-  @Test
-  fun testAddPractitionerInfoShouldSetGeneralPractitionerReferenceToPatientResource() {
-    val patient = samplePatient()
-
-    questionnaireViewModel.appendPractitionerInfo(patient)
-
-    Assert.assertEquals("Practitioner/12345", patient.generalPractitioner.first().reference)
-  }
-
-  @Test
-  fun testAddOrganizationInfoShouldSetOrganizationToQuestionnaireResponse() {
-    // For patient
-    val patient = samplePatient()
-    questionnaireViewModel.appendOrganizationInfo(patient)
-    Assert.assertNotNull("Organization/105", patient.managingOrganization.reference)
-
-    // For group
-    val group = Group().apply { id = "123" }
-    questionnaireViewModel.appendOrganizationInfo(group)
-    Assert.assertEquals("Organization/105", group.managingEntity.reference)
-  }
-
-  @Test
-  fun testAppVersionIsAppendedToPatientResource() {
-    // Version name
-    val versionName = BuildConfig.VERSION_NAME
-
-    // For Patient
-    val patient = samplePatient()
-    questionnaireViewModel.appendAppVersion(context, resource = patient)
-    val tag = patient.meta.tag
-    val appVersionTag = tag[0]
-    Assert.assertEquals("https://smartregister.org/app-version", appVersionTag.system)
-    Assert.assertEquals(versionName, appVersionTag.code)
-    Assert.assertEquals("Application Version", appVersionTag.display)
-  }
-
-  @Test
-  fun testAddPractitionerInfoShouldSetIndividualPractitionerReferenceToEncounterResource() {
-    val encounter = Encounter().apply { this.id = "123456" }
-    questionnaireViewModel.appendPractitionerInfo(encounter)
-    Assert.assertEquals("Practitioner/12345", encounter.participant.first().individual.reference)
-  }
-
-  @Test
-  @ExperimentalCoroutinesApi
-  fun testAppendPatientsAndRelatedPersonsToGroupsShouldAddMembersToGroup() {
-    runTest {
-      val patient = samplePatient()
-      val familyGroup =
-        Group().apply {
-          id = "grp1"
-          name = "Mandela Family"
-        }
-      coEvery { fhirEngine.get<Group>(familyGroup.id) } returns familyGroup
-      questionnaireViewModel.addGroupMember(patient, familyGroup.id)
-      Assert.assertEquals(1, familyGroup.member.size)
-
-      val familyGroup2 = Group().apply { id = "grp2" }
-      coEvery { fhirEngine.get<Group>(familyGroup2.id) } returns familyGroup2
-      // Sets the managing entity
-      questionnaireViewModel.addGroupMember(RelatedPerson().apply { id = "rel1" }, familyGroup2.id)
-      Assert.assertNotNull(familyGroup2.managingEntity)
-    }
-  }
-
-  @Test
-  fun testRemoveGroupCallsDefaultRepositoryRemoveGroup() {
-    val groupId = "group-1"
-    val deactivateMembers = false
-    Assert.assertFalse(questionnaireViewModel.removeOperation.value!!)
-    questionnaireViewModel.removeGroup(
-      groupId = groupId,
-      removeGroup = true,
-      deactivateMembers = deactivateMembers,
-    )
-
-    coVerify { defaultRepo.removeGroup(groupId, deactivateMembers, emptyMap()) }
-    assertTrue(questionnaireViewModel.removeOperation.value!!)
-  }
-
-  @Test
-  fun testRemoveGroupMemberCallsDefaultRepositoryRemoveGroupMember() {
-    val memberId = "member-id"
-    val groupIdentifier = "group_id"
-    val memberResourceType = ResourceType.Patient
-    val removeMember = true
-    Assert.assertFalse(questionnaireViewModel.removeOperation.value!!)
-    questionnaireViewModel.removeGroupMember(
-      memberId = memberId,
-      groupIdentifier = groupIdentifier,
-      memberResourceType = memberResourceType,
-      removeMember = removeMember,
-    )
-
-    coVerify {
-      defaultRepo.removeGroupMember(
-        memberId = memberId,
-        groupId = groupIdentifier,
-        groupMemberResourceType = memberResourceType,
-        emptyMap(),
-      )
-    }
-    assertTrue(questionnaireViewModel.removeOperation.value!!)
-  }
-
-  @Test
-  fun testGenerateMissingItemsForQuestionnaire() {
-    val patientRegistrationQuestionnaire =
-      "patient-registration-questionnaire/sample/missingitem-questionnaire.json".readFile()
-
-    val patientRegistrationQuestionnaireResponse =
-      "patient-registration-questionnaire/sample/missingitem-questionnaire-response.json".readFile()
-
-    val iParser: IParser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
-
-    val questionnaire =
-      iParser.parseResource(Questionnaire::class.java, patientRegistrationQuestionnaire)
-
-    val questionnaireResponse =
-      iParser.parseResource(
-        QuestionnaireResponse::class.java,
-        patientRegistrationQuestionnaireResponse,
-      )
-
-    questionnaire.item.generateMissingItems(questionnaireResponse.item)
-
-    assertTrue(questionnaireResponse.item.size <= questionnaire.item.size)
-  }
-
-  @Test
-  fun testGenerateMissingItemsForQuestionnaireResponse() {
-    val patientRegistrationQuestionnaire =
-      "patient-registration-questionnaire/questionnaire.json".readFile()
-
-    val patientRegistrationQuestionnaireResponse =
-      "patient-registration-questionnaire/questionnaire-response.json".readFile()
-
-    val iParser: IParser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
-
-    val questionnaire =
-      iParser.parseResource(Questionnaire::class.java, patientRegistrationQuestionnaire)
-
-    val questionnaireResponse =
-      iParser.parseResource(
-        QuestionnaireResponse::class.java,
-        patientRegistrationQuestionnaireResponse,
-      )
-
-    questionnaireResponse.generateMissingItems(questionnaire)
-
-    assertTrue(questionnaireResponse.item.size <= questionnaire.item.size)
-  }
-
-  @Test
-  fun testLoadQuestionnaireShouldUReturnCorrectItemsWithUpdateOnEdit() {
-    val updateResourcesIdsParams =
-      questionnaireViewModel::class.java.getDeclaredField("editQuestionnaireResourceParams")
-    updateResourcesIdsParams.isAccessible = true
-    val expected =
-      listOf(
-        ActionParameter(
-          paramType = ActionParameterType.UPDATE_DATE_ON_EDIT,
-          linkId = "patient-age-3",
-          dataType = Enumerations.DataType.INTEGER,
-          key = "patientAge-three",
-          value = "20",
-        ),
-        ActionParameter(
-          paramType = ActionParameterType.UPDATE_DATE_ON_EDIT,
-          linkId = "patient-age-4",
-          dataType = Enumerations.DataType.INTEGER,
-          key = "patientAge-four",
-          value = "25",
-        ),
-      )
-
-    val prePopulationParams =
-      listOf(
-        ActionParameter(
-          paramType = ActionParameterType.PREPOPULATE,
-          linkId = "patient-age-1",
-          dataType = Enumerations.DataType.INTEGER,
-          key = "patientAge-one",
-          value = "10",
-        ),
-        ActionParameter(
-          paramType = ActionParameterType.PREPOPULATE,
-          linkId = "patient-age-2",
-          dataType = Enumerations.DataType.INTEGER,
-          key = "patientAge-two",
-          value = "15",
-        ),
-        ActionParameter(
-          paramType = ActionParameterType.UPDATE_DATE_ON_EDIT,
-          linkId = "patient-age-3",
-          dataType = Enumerations.DataType.INTEGER,
-          key = "patientAge-three",
-          value = "20",
-        ),
-        ActionParameter(
-          paramType = ActionParameterType.UPDATE_DATE_ON_EDIT,
-          linkId = "patient-age-4",
-          dataType = Enumerations.DataType.INTEGER,
-          key = "patientAge-four",
-          value = "25",
-        ),
-      )
-
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-first-name"
-              type = Questionnaire.QuestionnaireItemType.TEXT
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-last-name"
-                    type = Questionnaire.QuestionnaireItemType.TEXT
-                  },
-                )
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-age"
-              type = Questionnaire.QuestionnaireItemType.INTEGER
-              readOnly = true
-            },
-          )
-      }
-
-    coEvery { fhirEngine.get(ResourceType.Questionnaire, "12345") } returns questionnaire
-
-    runBlocking {
-      questionnaireViewModel.loadQuestionnaire(
-        QuestionnaireConfig(id = "12345", type = QuestionnaireType.EDIT),
-        prePopulationParams,
-      )
-    }
-    coVerify {
-      questionnaireViewModel.loadQuestionnaire(
-        QuestionnaireConfig(id = "12345", type = QuestionnaireType.EDIT),
-        prePopulationParams,
-      )
-    }
-    assertEquals(expected, updateResourcesIdsParams.get(questionnaireViewModel))
-  }
-
-  @Test
-  fun testExtractAndSaveResourcesShouldUpdateResourceLastUpdatedPatient() {
-    mockkObject(ResourceMapper)
-    val questionnaireResponse =
-      QuestionnaireResponse().apply {
-        id = "12345"
-        subject = Reference("Patient/2511692c-74d5-401d-bc29-a70aff33d176")
-      }
-    val patient = Patient().apply { id = "2511692c-74d5-401d-bc29-a70aff33d176" }
-    val resourceId = questionnaireResponse.subject.reference.extractLogicalIdUuid()
-    val resourceType =
-      questionnaireResponse.subject
-        .extractType()
-        .toString()
-        .resourceClassType()
-        .newInstance()
-        .resourceType
-    coEvery { ResourceMapper.extract(any(), any(), any()) } returns
-      Bundle().apply { addEntry().resource = patient }
-    coEvery { fhirEngine.get(ResourceType.Patient, "12345") } returns patient
-    coEvery { defaultRepo.addOrUpdate(resource = any()) } just runs
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        addUseContext().apply {
-          code = Coding().apply { code = "1234" }
-          value = CodeableConcept().apply { addCoding().apply { code = "1234567" } }
-        }
-        addExtension().url = "sdc-questionnaire-itemExtractionContext"
-      }
-
-    questionnaireConfig = questionnaireConfig.copy(type = QuestionnaireType.DEFAULT)
-    coEvery { fhirEngine.get(ResourceType.Patient, "2511692c-74d5-401d-bc29-a70aff33d176") } returns
-      patient
-    coEvery { defaultRepo.loadResource(resourceId, resourceType) } returns patient
-    questionnaireViewModel.extractAndSaveResources(
-      context = context,
-      questionnaireResponse = questionnaireResponse,
-      questionnaire = questionnaire,
-      questionnaireConfig = questionnaireConfig,
-    )
-    runBlocking { defaultRepo.loadResource(resourceId, resourceType) }
-    coVerify { defaultRepo.loadResource(resourceId = resourceId, resourceType = resourceType) }
-    val formatter = SimpleDateFormat("dd MM yyyy HH:mm:ss")
-    Assert.assertEquals(formatter.format(patient.meta.lastUpdated), formatter.format(Date()))
-    unmockkObject(ResourceMapper)
-  }
-
-  @Test
-  fun testExtractAndSaveResourcesShouldUpdateResourceLastUpdatedGroup() {
-    mockkObject(ResourceMapper)
-    val questionnaireResponse =
-      QuestionnaireResponse().apply {
-        id = "12345"
-        subject = Reference("Group/2511692c-74d5-401d-bc29-a70aff33d176")
-      }
-    val group = Group().apply { id = "2511692c-74d5-401d-bc29-a70aff33d176" }
-    coEvery { ResourceMapper.extract(any(), any(), any()) } returns
-      Bundle().apply { addEntry().resource = group }
-    coEvery { fhirEngine.get(ResourceType.Patient, "12345") } returns group
-    coEvery { defaultRepo.addOrUpdate(resource = any()) } just runs
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        addUseContext().apply {
-          code = Coding().apply { code = "1234" }
-          value = CodeableConcept().apply { addCoding().apply { code = "1234567" } }
-        }
-        addExtension().url = "sdc-questionnaire-itemExtractionContext"
-      }
-
-    questionnaireConfig = questionnaireConfig.copy(type = QuestionnaireType.DEFAULT)
-    coEvery { fhirEngine.get(ResourceType.Patient, "2511692c-74d5-401d-bc29-a70aff33d176") } returns
-      group
-    val beforeTime = Date()
-    questionnaireViewModel.extractAndSaveResources(
-      context = context,
-      questionnaireResponse = questionnaireResponse,
-      questionnaire = questionnaire,
-      questionnaireConfig = questionnaireConfig,
-    )
-    val afterTime = Date()
-    assertTrue(
-      (group.meta.lastUpdated.equals(beforeTime) || group.meta.lastUpdated.after(beforeTime)) &&
-        (group.meta.lastUpdated.equals(afterTime) || group.meta.lastUpdated.before(afterTime)),
-    )
-    unmockkObject(ResourceMapper)
-  }
-
-  @Test
-  fun `updateResourceLastUpdatedLinkedAsSubject() should catch ResourceNotFoundException`() {
-    val resourceNotFoundException =
-      ResourceNotFoundException(type = "Resource not found exception", id = "1234")
-    val questionnaireResponse =
-      QuestionnaireResponse().apply {
-        id = "1234"
-        subject.reference = "Patient/123467"
-      }
-    coEvery { defaultRepo.loadResource(any(), any()) } throws resourceNotFoundException
-    runBlocking {
-      questionnaireViewModel.updateResourceLastUpdatedLinkedAsSubject(questionnaireResponse)
-    }
-    // if no exception is thrown that is sufficient to show the test passed
-  }
-
-  @Test
-  fun testGetQuestionnaireResponseFromDbOrPopulation_whenResourceMapIsNotEmpty_retrievePatientPlusRelatedPersonScenario_returnQuestionnaireResponseFromPopulation() {
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-first-name"
-              type = Questionnaire.QuestionnaireItemType.TEXT
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-last-name"
-                    type = Questionnaire.QuestionnaireItemType.TEXT
-                  },
-                )
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-age"
-              type = Questionnaire.QuestionnaireItemType.INTEGER
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-contact"
-              type = Questionnaire.QuestionnaireItemType.GROUP
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-dob"
-                    type = Questionnaire.QuestionnaireItemType.DATE
-                  },
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-related-person"
-                    type = Questionnaire.QuestionnaireItemType.GROUP
-                    item =
-                      listOf(
-                        Questionnaire.QuestionnaireItemComponent().apply {
-                          linkId = "rp-name"
-                          type = Questionnaire.QuestionnaireItemType.TEXT
-                        },
-                      )
-                  },
-                )
-            },
-          )
-      }
-    val patient = Patient().apply { id = "patient-1" }
-    val relatedPerson = RelatedPerson().apply { id = "related-person-1" }
-    val resourceMap: Map<ResourceType?, String> = mapOf(patient.resourceType to patient.id)
-
-    // Mandatory get QR from DB, but only used when there's no population resource which triggers an
-    // exception
-    coEvery {
-      fhirEngine.search<QuestionnaireResponse> {
-        filter(QuestionnaireResponse.SUBJECT, { value = patient.id })
-        filter(QuestionnaireResponse.QUESTIONNAIRE, { value = questionnaire.id })
-      }
-    } returns listOf(QuestionnaireResponse())
-
-    // Gets population resources from resource map
-    coEvery { fhirEngine.get(patient.resourceType, patient.id) } returns patient
-    coEvery {
-      fhirEngine.search<RelatedPerson> {
-        filter(QuestionnaireResponse.SUBJECT, { value = patient.id })
-        filter(RelatedPerson.PATIENT, { value = "${patient.resourceType.name}/${patient.id}" })
-      }
-    } returns listOf(relatedPerson)
-
-    val result = runBlocking {
-      questionnaireViewModel.getQuestionnaireResponseFromDbOrPopulation(
-        questionnaire = questionnaire,
-        subjectId = patient.id,
-        subjectType = patient.resourceType,
-        questionnaireConfig = questionnaireConfig,
-        resourceMap = resourceMap,
-      )
-    }
-
-    assertTrue(result.hasItem())
-    coVerify { fhirEngine.get(patient.resourceType, patient.id) }
-    coVerify {
-      fhirEngine.search<RelatedPerson> {
-        filter(QuestionnaireResponse.SUBJECT, { value = patient.id })
-        filter(RelatedPerson.PATIENT, { value = "${patient.resourceType.name}/${patient.id}" })
-      }
-    }
-    val slotPopulationResources = slot<ArrayList<Resource>>()
-    coVerify {
-      questionnaireViewModel.populateQuestionnaireResponse(any(), capture(slotPopulationResources))
-    }
-    assert(slotPopulationResources.captured.size == 2)
-    assertIs<Patient>(slotPopulationResources.captured[0])
-    assertIs<RelatedPerson>(slotPopulationResources.captured[1])
-  }
-
-  @Test
-  fun testGetQuestionnaireResponseFromDbOrPopulation_whenResourceMapIsNotEmpty_retrieveThatResourceOnlyScenario_returnQuestionnaireResponseFromPopulation() {
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-first-name"
-              type = Questionnaire.QuestionnaireItemType.TEXT
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-last-name"
-                    type = Questionnaire.QuestionnaireItemType.TEXT
-                  },
-                )
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-age"
-              type = Questionnaire.QuestionnaireItemType.INTEGER
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-contact"
-              type = Questionnaire.QuestionnaireItemType.GROUP
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-dob"
-                    type = Questionnaire.QuestionnaireItemType.DATE
-                  },
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-related-person"
-                    type = Questionnaire.QuestionnaireItemType.GROUP
-                    item =
-                      listOf(
-                        Questionnaire.QuestionnaireItemComponent().apply {
-                          linkId = "rp-name"
-                          type = Questionnaire.QuestionnaireItemType.TEXT
-                        },
-                      )
-                  },
-                )
-            },
-          )
-      }
-    val group = Group().apply { id = "group-1" }
-    val resourceMap: Map<ResourceType?, String> = mapOf(group.resourceType to group.id)
-
-    // Mandatory get QR from DB, but only used when there's no population resource which triggers an
-    // exception
-    coEvery {
-      fhirEngine.search<QuestionnaireResponse> {
-        filter(QuestionnaireResponse.SUBJECT, { value = group.id })
-        filter(QuestionnaireResponse.QUESTIONNAIRE, { value = questionnaire.id })
-      }
-    } returns listOf(QuestionnaireResponse())
-
-    // Gets population resources from resource map
-    coEvery { fhirEngine.get(group.resourceType, group.id) } returns group
-    val result = runBlocking {
-      questionnaireViewModel.getQuestionnaireResponseFromDbOrPopulation(
-        questionnaire = questionnaire,
-        subjectId = group.id,
-        subjectType = group.resourceType,
-        questionnaireConfig = questionnaireConfig,
-        resourceMap = resourceMap,
-      )
-    }
-
-    assertTrue(result.hasItem())
-    coVerify { fhirEngine.get(group.resourceType, group.id) }
-    val slotPopulationResources = slot<ArrayList<Resource>>()
-    coVerify {
-      questionnaireViewModel.populateQuestionnaireResponse(any(), capture(slotPopulationResources))
-    }
-    assert(slotPopulationResources.captured.size == 1)
-    assertIs<Group>(slotPopulationResources.captured[0])
-  }
-
-  @Test
-  fun testGetQuestionnaireResponseFromDbOrPopulation_whenResourceMapIsEmpty_returnQuestionnaireResponseFromPopulation() {
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-first-name"
-              type = Questionnaire.QuestionnaireItemType.TEXT
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-last-name"
-                    type = Questionnaire.QuestionnaireItemType.TEXT
-                  },
-                )
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-age"
-              type = Questionnaire.QuestionnaireItemType.INTEGER
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-contact"
-              type = Questionnaire.QuestionnaireItemType.GROUP
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-dob"
-                    type = Questionnaire.QuestionnaireItemType.DATE
-                  },
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-related-person"
-                    type = Questionnaire.QuestionnaireItemType.GROUP
-                    item =
-                      listOf(
-                        Questionnaire.QuestionnaireItemComponent().apply {
-                          linkId = "rp-name"
-                          type = Questionnaire.QuestionnaireItemType.TEXT
-                        },
-                      )
-                  },
-                )
-            },
-          )
-      }
-    val group = Group().apply { id = "group-1" }
-    val resourceMap: Map<ResourceType?, String> = mapOf()
-
-    // Mandatory get QR from DB, but only used when there's no population resource which triggers an
-    // exception
-    coEvery {
-      fhirEngine.search<QuestionnaireResponse> {
-        filter(QuestionnaireResponse.SUBJECT, { value = group.id })
-        filter(QuestionnaireResponse.QUESTIONNAIRE, { value = questionnaire.id })
-      }
-    } returns listOf(QuestionnaireResponse())
-
-    // Gets population resources from subjectId and subjectType
-    coEvery { fhirEngine.get(group.resourceType, group.id) } returns group
-    val slotPopulationResources = slot<ArrayList<Resource>>()
-    val result = runBlocking {
-      questionnaireViewModel
-        .getQuestionnaireResponseFromDbOrPopulation(
-          questionnaire = questionnaire,
-          subjectId = group.id,
-          subjectType = group.resourceType,
-          questionnaireConfig = questionnaireConfig,
-          resourceMap = resourceMap,
-        )
-        .apply { item = listOf(QuestionnaireResponseItemComponent()) }
-    }
-    assertFalse(result.hasItem())
-    coVerify {
-      questionnaireViewModel.populateQuestionnaireResponse(any(), capture(slotPopulationResources))
-    }
-    assert(slotPopulationResources.captured.size == 1)
-    assertIs<Group>(slotPopulationResources.captured[0])
-  }
-
-  @Test
-  @Throws(ResourceNotFoundException::class)
-  fun testGetQuestionnaireResponseFromDbOrPopulationThrowsResourceNotFoundException() {
-    val questionnaire =
-      Questionnaire().apply {
-        id = "12345"
-        item =
-          listOf(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-first-name"
-              type = Questionnaire.QuestionnaireItemType.TEXT
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-last-name"
-                    type = Questionnaire.QuestionnaireItemType.TEXT
-                  },
-                )
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-age"
-              type = Questionnaire.QuestionnaireItemType.INTEGER
-            },
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "patient-contact"
-              type = Questionnaire.QuestionnaireItemType.GROUP
-              item =
-                listOf(
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-dob"
-                    type = Questionnaire.QuestionnaireItemType.DATE
-                  },
-                  Questionnaire.QuestionnaireItemComponent().apply {
-                    linkId = "patient-related-person"
-                    type = Questionnaire.QuestionnaireItemType.GROUP
-                    item =
-                      listOf(
-                        Questionnaire.QuestionnaireItemComponent().apply {
-                          linkId = "rp-name"
-                          type = Questionnaire.QuestionnaireItemType.TEXT
-                        },
-                      )
-                  },
-                )
-            },
-          )
-      }
-    val group = Group().apply { id = "group-1" }
-    val resourceMap: Map<ResourceType?, String> = mapOf()
-
-    // Mandatory get QR from DB, to be used when there's no population resource which triggers an
-    // exception
-    coEvery {
-      fhirEngine.search<QuestionnaireResponse> {
-        filter(QuestionnaireResponse.SUBJECT, { value = group.id })
-        filter(QuestionnaireResponse.QUESTIONNAIRE, { value = questionnaire.id })
-      }
-    } returns listOf(QuestionnaireResponse())
-
-    // Population resource not found
-    coEvery { fhirEngine.get(group.resourceType, group.id) } throws
-      ResourceNotFoundException(group.resourceType.name, group.id)
-
-    val result = runBlocking {
-      questionnaireViewModel.getQuestionnaireResponseFromDbOrPopulation(
-        questionnaire = questionnaire,
-        subjectId = group.id,
-        subjectType = group.resourceType,
-        questionnaireConfig = questionnaireConfig,
-        resourceMap = resourceMap,
-      )
-    }
-    assertTrue(result.hasItem())
-    coVerify { fhirEngine.get(any(), any()) }
-    val slotPopulationResources = slot<ArrayList<Resource>>()
-    coVerify {
-      questionnaireViewModel.populateQuestionnaireResponse(any(), capture(slotPopulationResources))
-    }
-    assertTrue(slotPopulationResources.captured.isEmpty())
-  }
-
-  @Test
-  fun testComputeQuestionnaireConfigRulesShouldReturnMap() {
-    val map =
-      questionnaireViewModel.computeQuestionnaireConfigRules(
-        listOf(
-          RuleConfig(
-            name = "humanReadableId",
-            description = "Generate OpenSRP ID",
-            condition = "true",
-            actions = listOf("data.put('humanReadableId', service.generateRandomSixDigitInt())"),
-          ),
-        ),
-      )
-    val key = "humanReadableId"
-    assertTrue(map.containsKey(key))
-    assertNotNull(map[key])
-  }
-
-  @Test
-  fun testTriggerRemoveShouldInvokeRemoveGroup() {
-    val theQuestionnaireConfig =
-      QuestionnaireConfig(
-        id = "the-questionnaire-id",
-        groupResource =
-          GroupResourceConfig(
-            groupIdentifier = "the-group-id",
-            removeGroup = true,
-            removeMember = true,
-            memberResourceType = ResourceType.Patient,
-          ),
-      )
-
-    questionnaireViewModel.triggerRemoveResources(theQuestionnaireConfig)
-
-    coVerify {
-      defaultRepo.removeGroup(
-        theQuestionnaireConfig.groupResource?.groupIdentifier!!,
-        true,
-        emptyMap(),
-      )
-    }
-  }
-
-  @Test
-  fun testTriggerRemoveShouldSoftDeleteResource() {
-    val patient = Faker.buildPatient()
-    val theQuestionnaireConfig =
-      QuestionnaireConfig(
-        id = "the-questionnaire-id",
-        resourceIdentifier = patient.id,
-        resourceType = ResourceType.Patient,
-        removeResource = true,
-      )
-    coEvery { fhirEngine.get(ResourceType.Patient, patient.id) } returns patient
-    questionnaireViewModel.triggerRemoveResources(theQuestionnaireConfig)
-
-    // Soft delete sets Patient.active to false
-    assertFalse(patient.active)
-    coVerify { defaultRepo.addOrUpdate(true, patient) }
   }
 }
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt
index f6d38fdab6..28f5889cbe 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt
@@ -35,6 +35,7 @@ import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.domain.model.ActionParameterType
 import org.smartregister.fhircore.quest.robolectric.RobolectricTest
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireActivity
 import org.smartregister.fhircore.quest.ui.shared.QuestionnaireHandler
 
 @HiltAndroidTest

From 1cf2463e252610e77e4be075ff70f5ba82977a9a Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Tue, 1 Aug 2023 14:56:40 +0300
Subject: [PATCH 25/27] Write test for
 QuestionnaireViewModel#handleQuestionnaireSubmission

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../fhircore/engine/cql/LibraryEvaluator.kt   |  42 +--
 .../questionnaire/QuestionnaireViewModel.kt   | 145 +++++----
 .../fhircore/quest/CqlContentTest.kt          |   4 +-
 .../QuestionnaireViewModelTest.kt             | 279 +++++++++++++++++-
 4 files changed, 382 insertions(+), 88 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/cql/LibraryEvaluator.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/cql/LibraryEvaluator.kt
index e07a7434a4..12779aaede 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/cql/LibraryEvaluator.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/cql/LibraryEvaluator.kt
@@ -228,32 +228,36 @@ class LibraryEvaluator @Inject constructor(val defaultRepository: DefaultReposit
   ): List<String> {
     initialize()
 
-    val library = defaultRepository.fhirEngine.get<LibraryResource>(libraryId)
+    val library = defaultRepository.loadResource<LibraryResource>(libraryId)
 
     val helpers =
-      library.relatedArtifact
-        .filter { it.hasResource() && it.resource.startsWith("Library/") }
-        .mapNotNull {
-          defaultRepository.fhirEngine.get<LibraryResource>(it.resource.replace("Library/", ""))
+      library
+        ?.relatedArtifact
+        ?.filter { it.hasResource() && it.resource.startsWith("Library/") }
+        ?.mapNotNull {
+          defaultRepository.loadResource<LibraryResource>(it.resource.substringAfter("/"))
         }
 
-    loadConfigs(
-      library,
-      helpers,
-      Bundle(),
-      // TODO check and handle when data bundle has multiple Patient resources
-      createBundle(
-        listOfNotNull(
-          patient,
-          *data.entry.map { it.resource }.toTypedArray(),
-          *defaultRepository.search(library.dataRequirementFirstRep).toTypedArray(),
-        ),
-      ),
-    )
+    if (library != null && helpers != null) {
+      loadConfigs(
+        library = library,
+        helpers = helpers,
+        valueSet = Bundle(),
+        // TODO check and handle when data bundle has multiple Patient resources
+        data =
+          createBundle(
+            listOfNotNull(
+              patient,
+              *data.entry.map { it.resource }.toTypedArray(),
+              *defaultRepository.search(library.dataRequirementFirstRep).toTypedArray(),
+            ),
+          ),
+      )
+    }
 
     val result =
       libEvaluator!!.evaluate(
-        VersionedIdentifier().withId(library.name).withVersion(library.version),
+        VersionedIdentifier().withId(library?.name).withVersion(library?.version),
         patient?.let { Pair.of("Patient", it.logicalId) },
         null,
         null,
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
index 9efc6e11c0..45f32ae1f0 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -200,57 +200,12 @@ constructor(
           context = context,
         )
 
-      val extractionDate = Date()
-
-      // Create a ListResource to store the references for generated resources
-      val listResource =
-        ListResource().apply {
-          id = UUID.randomUUID().toString()
-          status = ListResource.ListStatus.CURRENT
-          mode = ListResource.ListMode.WORKING
-          title = CONTAINED_LIST_TITLE
-          date = extractionDate
-        }
-
-      bundle?.entry?.forEach { bundleEntryComponent ->
-        bundleEntryComponent.resource?.run {
-          applyResourceMetadata()
-          val subjectType = questionnaireSubjectType(questionnaire, questionnaireConfig)
-          if (
-            currentQuestionnaireResponse.subject.reference.isNullOrEmpty() &&
-              subjectType != null &&
-              this.resourceType == subjectType &&
-              logicalId.isNotEmpty()
-          ) {
-            currentQuestionnaireResponse.subject = this.logicalId.asReference(subjectType)
-          }
-
-          // TODO Fix StructureMaps to use the QuestionnaireResponse subject directly
-          if (this.resourceType == subjectType) {
-            this.id = currentQuestionnaireResponse.subject.extractId()
-          }
-
-          defaultRepository.addOrUpdate(resource = this)
-
-          addMemberToConfiguredGroup(this, questionnaireConfig.groupResource)
-
-          // Track ids for resources in ListResource added to the QuestionnaireResponse.contained
-          val listEntryComponent =
-            ListEntryComponent().apply {
-              deleted = false
-              date = extractionDate
-              item = asReference()
-            }
-          listResource.addEntry(listEntryComponent)
-        }
-      }
-
-      // Save questionnaire response only if subject is present
-      if (currentQuestionnaireResponse.subject != null) {
-        defaultRepository.addOrUpdate(
-          resource = currentQuestionnaireResponse.apply { addContained(listResource) },
-        )
-      }
+      saveExtractedResources(
+        bundle = bundle,
+        questionnaire = questionnaire,
+        questionnaireConfig = questionnaireConfig,
+        currentQuestionnaireResponse = currentQuestionnaireResponse,
+      )
 
       updateResourcesLastUpdatedProperty(actionParameters)
 
@@ -273,13 +228,11 @@ constructor(
           questionnaire = questionnaire,
         )
 
-        viewModelScope.launch {
-          fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
-            questionnaireConfig = questionnaireConfig,
-            subject = subject,
-            bundle = bundle,
-          )
-        }
+        fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
+          questionnaireConfig = questionnaireConfig,
+          subject = subject,
+          bundle = bundle,
+        )
       }
 
       softDeleteResources(questionnaireConfig)
@@ -291,6 +244,65 @@ constructor(
     }
   }
 
+  suspend fun saveExtractedResources(
+    bundle: Bundle?,
+    questionnaire: Questionnaire,
+    questionnaireConfig: QuestionnaireConfig,
+    currentQuestionnaireResponse: QuestionnaireResponse,
+  ) {
+    val extractionDate = Date()
+
+    // Create a ListResource to store the references for generated resources
+    val listResource =
+      ListResource().apply {
+        id = UUID.randomUUID().toString()
+        status = ListResource.ListStatus.CURRENT
+        mode = ListResource.ListMode.WORKING
+        title = CONTAINED_LIST_TITLE
+        date = extractionDate
+      }
+
+    bundle?.entry?.forEach { bundleEntryComponent ->
+      bundleEntryComponent.resource?.run {
+        applyResourceMetadata()
+        val subjectType = questionnaireSubjectType(questionnaire, questionnaireConfig)
+        if (
+          currentQuestionnaireResponse.subject.reference.isNullOrEmpty() &&
+            subjectType != null &&
+            this.resourceType == subjectType &&
+            logicalId.isNotEmpty()
+        ) {
+          currentQuestionnaireResponse.subject = this.logicalId.asReference(subjectType)
+        }
+
+        // TODO Fix StructureMaps to use the QuestionnaireResponse subject directly
+        if (this.resourceType == subjectType) {
+          this.id = currentQuestionnaireResponse.subject.extractId()
+        }
+
+        defaultRepository.addOrUpdate(resource = this)
+
+        addMemberToConfiguredGroup(this, questionnaireConfig.groupResource)
+
+        // Track ids for resources in ListResource added to the QuestionnaireResponse.contained
+        val listEntryComponent =
+          ListEntryComponent().apply {
+            deleted = false
+            date = extractionDate
+            item = asReference()
+          }
+        listResource.addEntry(listEntryComponent)
+      }
+    }
+
+    // Save questionnaire response only if subject is present
+    if (currentQuestionnaireResponse.subject != null) {
+      defaultRepository.addOrUpdate(
+        resource = currentQuestionnaireResponse.apply { addContained(listResource) },
+      )
+    }
+  }
+
   private fun Bundle.copyBundle(currentQuestionnaireResponse: QuestionnaireResponse): Bundle =
     this.copy().apply {
       addEntry(Bundle.BundleEntryComponent().apply { resource = currentQuestionnaireResponse })
@@ -353,13 +365,16 @@ constructor(
           ResourceMapper.extract(
             questionnaire = questionnaire,
             questionnaireResponse = questionnaireResponse,
-            StructureMapExtractionContext(
-              context = context,
-              transformSupportServices = transformSupportServices,
-              structureMapProvider = { structureMapUrl: String?, _: IWorkerContext ->
-                structureMapUrl?.substringAfterLast("/")?.let { defaultRepository.loadResource(it) }
-              },
-            ),
+            structureMapExtractionContext =
+              StructureMapExtractionContext(
+                context = context,
+                transformSupportServices = transformSupportServices,
+                structureMapProvider = { structureMapUrl: String?, _: IWorkerContext ->
+                  structureMapUrl?.substringAfterLast("/")?.let {
+                    defaultRepository.loadResource(it)
+                  }
+                },
+              ),
           )
         } else {
           ResourceMapper.extract(
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/CqlContentTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/CqlContentTest.kt
index 8bd6726d88..701aad1379 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/CqlContentTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/CqlContentTest.kt
@@ -61,7 +61,7 @@ class CqlContentTest : RobolectricTest() {
   private val configRulesExecutor: ConfigRulesExecutor = mockk()
   private lateinit var evaluator: LibraryEvaluator
   private lateinit var defaultRepository: DefaultRepository
-  val fhirEngine = mockk<FhirEngine>()
+  private val fhirEngine = mockk<FhirEngine>()
 
   @Before
   fun setUp() {
@@ -113,8 +113,6 @@ class CqlContentTest : RobolectricTest() {
           .forEach { addEntry().apply { resource = it } }
       }
 
-    val fhirEngine = mockk<FhirEngine>()
-
     coEvery { fhirEngine.get(ResourceType.Library, cqlLibrary.logicalId) } returns cqlLibrary
     coEvery { fhirEngine.get(ResourceType.Library, fhirHelpersLibrary.logicalId) } returns
       fhirHelpersLibrary
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt
index c908675aff..4f0eb4fe5b 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt
@@ -19,6 +19,7 @@ package org.smartregister.fhircore.quest.ui.questionnaire
 import android.app.Application
 import androidx.test.core.app.ApplicationProvider
 import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.datacapture.mapping.ResourceMapper
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.search
@@ -26,21 +27,31 @@ import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.coEvery
 import io.mockk.coVerify
+import io.mockk.coVerifyOrder
 import io.mockk.just
 import io.mockk.mockk
+import io.mockk.mockkObject
 import io.mockk.runs
+import io.mockk.slot
 import io.mockk.spyk
+import io.mockk.unmockkObject
+import io.mockk.verify
 import java.util.Date
 import javax.inject.Inject
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
+import org.hl7.fhir.r4.model.Address
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.Enumerations
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Group
+import org.hl7.fhir.r4.model.IdType
 import org.hl7.fhir.r4.model.IntegerType
+import org.hl7.fhir.r4.model.ListResource
+import org.hl7.fhir.r4.model.Patient
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 import org.hl7.fhir.r4.model.StringType
 import org.hl7.fhir.r4.model.Type
@@ -66,13 +77,16 @@ import org.smartregister.fhircore.engine.util.extension.asReference
 import org.smartregister.fhircore.engine.util.extension.decodeResourceFromString
 import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
 import org.smartregister.fhircore.engine.util.extension.find
+import org.smartregister.fhircore.engine.util.extension.isToday
 import org.smartregister.fhircore.engine.util.extension.valueToString
 import org.smartregister.fhircore.engine.util.extension.yesterday
 import org.smartregister.fhircore.quest.app.fakes.Faker
 import org.smartregister.fhircore.quest.robolectric.RobolectricTest
+import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireViewModel.Companion.CONTAINED_LIST_TITLE
 import org.smartregister.model.practitioner.FhirPractitionerDetails
 import org.smartregister.model.practitioner.KeycloakUserDetails
 import org.smartregister.model.practitioner.PractitionerDetails
+import timber.log.Timber
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @HiltAndroidTest
@@ -94,7 +108,16 @@ class QuestionnaireViewModelTest : RobolectricTest() {
   private val context: Application = ApplicationProvider.getApplicationContext()
   private val libraryEvaluator: LibraryEvaluator = mockk(relaxed = true, relaxUnitFun = true)
   private val configRulesExecutor: ConfigRulesExecutor = mockk()
-  private val patient = Faker.buildPatient()
+  private val patient =
+    Faker.buildPatient().apply {
+      address =
+        listOf(
+          Address().apply {
+            city = "Mombasa"
+            country = "Kenya"
+          },
+        )
+    }
   private val fhirCarePlanGenerator: FhirCarePlanGenerator =
     mockk(relaxUnitFun = true, relaxed = true)
 
@@ -161,6 +184,260 @@ class QuestionnaireViewModelTest : RobolectricTest() {
     }
   }
 
+  // TODO Write integration test for QuestionnaireActivity to compliment this unit test;
+  @Test
+  fun testHandleQuestionnaireSubmission() = runTest {
+    mockkObject(ResourceMapper)
+    val questionnaire =
+      extractionQuestionnaire().apply {
+        // Use StructureMap for extraction
+        extension = samplePatientRegisterQuestionnaire.extension
+      }
+    val questionnaireResponse = extractionQuestionnaireResponse()
+    val actionParameters = emptyList<ActionParameter>()
+    val onSuccessfulSubmission =
+      spyk({ idsTypes: List<IdType>, _: QuestionnaireResponse -> Timber.i(idsTypes.toString()) })
+
+    // Throw ResourceNotFoundException existing QuestionnaireResponse
+    coEvery { fhirEngine.get(ResourceType.Patient, patient.logicalId) } returns patient
+    coEvery { fhirEngine.get(ResourceType.QuestionnaireResponse, any()) } throws
+      ResourceNotFoundException("QuestionnaireResponse", "")
+    coEvery { fhirEngine.create(resource = anyVararg()) } returns listOf(patient.logicalId)
+    coEvery { fhirEngine.update(resource = anyVararg()) } just runs
+
+    // Mock returned bundle after extraction refer to FhirExtractionTest.kt for extraction test
+    coEvery {
+      ResourceMapper.extract(
+        questionnaire = questionnaire,
+        questionnaireResponse = questionnaireResponse,
+        structureMapExtractionContext = any(),
+      )
+    } returns
+      Bundle().apply { addEntry(Bundle.BundleEntryComponent().apply { resource = patient }) }
+
+    questionnaireViewModel.handleQuestionnaireSubmission(
+      questionnaire = questionnaire,
+      currentQuestionnaireResponse = questionnaireResponse,
+      actionParameters = actionParameters,
+      context = context,
+      questionnaireConfig = questionnaireConfig,
+      onSuccessfulSubmission = onSuccessfulSubmission,
+    )
+
+    // Verify QuestionnaireResponse was validated
+    verify {
+      questionnaireViewModel.validateQuestionnaireResponse(
+        questionnaire,
+        questionnaireResponse,
+        context,
+      )
+    }
+
+    // Assert that the QuestionnaireResponse metadata were set
+    Assert.assertEquals(
+      QuestionnaireResponse.QuestionnaireResponseStatus.COMPLETED,
+      questionnaireResponse.status,
+    )
+    Assert.assertTrue(questionnaireResponse.authored.isToday())
+    Assert.assertEquals(
+      "${questionnaire.resourceType}/${questionnaire.logicalId}",
+      questionnaireResponse.questionnaire,
+    )
+    Assert.assertNotNull(questionnaireResponse.id)
+    Assert.assertNotNull(questionnaireResponse.meta.lastUpdated)
+
+    // Verify perform extraction was invoked
+    coVerify {
+      questionnaireViewModel.performExtraction(
+        extractByStructureMap = true,
+        questionnaire = questionnaire,
+        questionnaireResponse = questionnaireResponse,
+        context = context,
+      )
+    }
+
+    // Verify that the questionnaire response and extracted resources were saved
+    val bundleSlot = slot<Bundle>()
+    coVerify {
+      questionnaireViewModel.saveExtractedResources(
+        bundle = capture(bundleSlot),
+        questionnaire = questionnaire,
+        questionnaireConfig = questionnaireConfig,
+        currentQuestionnaireResponse = questionnaireResponse,
+      )
+    }
+
+    val bundle = bundleSlot.captured
+    Assert.assertNotNull(bundle)
+    Assert.assertTrue(bundle.entryFirstRep?.resource is Patient)
+    Assert.assertEquals(patient.id, bundle.entryFirstRep?.resource?.id)
+    bundle.entry.forEach {
+      // Every extracted resource saved and optionally added to configured group
+      val resource = it.resource
+      Assert.assertNotNull(resource.id)
+      Assert.assertNotNull(resource.meta.lastUpdated)
+      coVerify { defaultRepository.addOrUpdate(addMandatoryTags = true, resource = resource) }
+      /*coVerify {
+        questionnaireViewModel.addMemberToConfiguredGroup(resource = resource, groupConfig = null)
+      }*/
+    }
+    // QuestionnaireResponse should have, subject and contained properties set then it's saved
+    Assert.assertEquals("Patient/" + patient.logicalId, questionnaireResponse.subject.reference)
+    coVerify {
+      defaultRepository.addOrUpdate(addMandatoryTags = true, resource = questionnaireResponse)
+    }
+    Assert.assertEquals(1, questionnaireResponse.contained.size)
+    Assert.assertTrue(questionnaireResponse.contained.firstOrNull() is ListResource)
+    val listResource = questionnaireResponse.contained.firstOrNull() as ListResource
+    Assert.assertEquals(ListResource.ListStatus.CURRENT, listResource.status)
+    Assert.assertEquals(ListResource.ListMode.WORKING, listResource.mode)
+    Assert.assertEquals(CONTAINED_LIST_TITLE, listResource.title)
+    Assert.assertTrue(listResource.date.isToday())
+
+    val subjectSlot = slot<Resource>()
+    val idsTypesSlot = slot<List<IdType>>()
+
+    // Mock result for subject (Patient) that is reloaded via loadResource function
+    coEvery { questionnaireViewModel.loadResource(ResourceType.Patient, patient.logicalId) } returns
+      patient
+
+    // Verify other function calls in order of execution after saving resources
+    coVerifyOrder {
+      questionnaireViewModel.updateResourcesLastUpdatedProperty(actionParameters)
+
+      questionnaireViewModel.generateCarePlan(
+        subject = capture(subjectSlot),
+        bundle = capture(bundleSlot),
+        questionnaireConfig = questionnaireConfig,
+      )
+
+      questionnaireViewModel.executeCql(
+        subject = capture(subjectSlot),
+        bundle = capture(bundleSlot),
+        questionnaire = questionnaire,
+      )
+
+      fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
+        questionnaireConfig = questionnaireConfig,
+        subject = capture(subjectSlot),
+        bundle = capture(bundleSlot),
+      )
+
+      questionnaireViewModel.softDeleteResources(questionnaireConfig)
+
+      onSuccessfulSubmission(capture(idsTypesSlot), questionnaireResponse)
+    }
+
+    // ID of extracted resources passed to the onSuccessfulSubmission callback
+    Assert.assertEquals(idsTypesSlot.captured.firstOrNull()?.idPart, patient.logicalId)
+
+    unmockkObject(ResourceMapper)
+  }
+
+  @Test
+  fun testPerformExtractionWithStructureMap() = runTest {
+    mockkObject(ResourceMapper)
+    val questionnaire = extractionQuestionnaire()
+    val theQuestionnaireResponse = extractionQuestionnaireResponse()
+
+    coEvery {
+      ResourceMapper.extract(
+        questionnaire = questionnaire,
+        questionnaireResponse = theQuestionnaireResponse,
+        structureMapExtractionContext = any(),
+      )
+    } returns
+      Bundle().apply { addEntry(Bundle.BundleEntryComponent().apply { resource = patient }) }
+    val bundle =
+      questionnaireViewModel.performExtraction(
+        extractByStructureMap = true,
+        questionnaire = questionnaire,
+        questionnaireResponse = theQuestionnaireResponse,
+        context = context,
+      )
+    Assert.assertNotNull(bundle)
+    Assert.assertTrue(bundle?.entryFirstRep?.resource is Patient)
+    Assert.assertEquals(patient.id, bundle?.entryFirstRep?.resource?.id)
+    unmockkObject(ResourceMapper)
+  }
+
+  @Test
+  fun testPerformExtractionWithDefinitionBasedExtraction() = runTest {
+    mockkObject(ResourceMapper)
+    val questionnaire = extractionQuestionnaire()
+    val theQuestionnaireResponse = extractionQuestionnaireResponse()
+
+    coEvery { ResourceMapper.extract(questionnaire, theQuestionnaireResponse) } returns
+      Bundle().apply { addEntry(Bundle.BundleEntryComponent().apply { resource = patient }) }
+    val bundle =
+      questionnaireViewModel.performExtraction(
+        extractByStructureMap = false,
+        questionnaire = questionnaire,
+        questionnaireResponse = theQuestionnaireResponse,
+        context = context,
+      )
+    Assert.assertNotNull(bundle)
+    Assert.assertTrue(bundle?.entryFirstRep?.resource is Patient)
+    Assert.assertEquals(patient.id, bundle?.entryFirstRep?.resource?.id)
+    unmockkObject(ResourceMapper)
+  }
+
+  private fun extractionQuestionnaireResponse() =
+    QuestionnaireResponse().apply {
+      addItem(
+        QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+          linkId = "patient-name"
+          addAnswer(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
+              .setValue(StringType("Nelson Mandela")),
+          )
+        },
+      )
+      addItem(
+        QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+          linkId = "patient-address"
+          addAnswer(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
+              .setValue(StringType("Mombasa")),
+          )
+        },
+      )
+      addItem(
+        QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+          linkId = "country-of-residence"
+          addAnswer(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
+              .setValue(StringType("Kenya")),
+          )
+        },
+      )
+    }
+
+  private fun extractionQuestionnaire() =
+    Questionnaire().apply {
+      id = questionnaireConfig.id
+      name = questionnaireConfig.title
+      addSubjectType("Patient")
+      addItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "patient-name"
+          type = Questionnaire.QuestionnaireItemType.STRING
+        },
+      )
+      addItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "patient-address"
+          type = Questionnaire.QuestionnaireItemType.STRING
+        },
+      )
+      addItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          linkId = "country-of-residence"
+          type = Questionnaire.QuestionnaireItemType.STRING
+        },
+      )
+    }
+
   @Test
   fun testRetrieveQuestionnaireShouldReturnValidQuestionnaire() = runTest {
     coEvery { fhirEngine.get(ResourceType.Questionnaire, questionnaireConfig.id) } returns

From 5f259cdb5b3b447754fe3c59805df855f067d19c Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Tue, 1 Aug 2023 16:47:00 +0300
Subject: [PATCH 26/27] Write test for QuestionnaireActivity

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../ui/questionnaire/QuestionnaireActivity.kt |   2 +-
 .../quest/ui/shared/QuestionnaireHandler.kt   |   2 +-
 .../QuestionnaireActivityTest.kt              | 140 +++++++++++++++++-
 .../shared/model/QuestionnaireHandlerTest.kt  |   2 +-
 4 files changed, 136 insertions(+), 10 deletions(-)

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
index b8f99fda70..963bde9e6f 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
@@ -316,7 +316,7 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
     const val QUESTIONNAIRE_ACTION_PARAMETERS = "questionnaireActionParameters"
     const val QUESTIONNAIRE_POPULATION_RESOURCES = "questionnairePopulationResources"
 
-    fun intentArgs(
+    fun intentBundle(
       questionnaireConfig: QuestionnaireConfig,
       actionParams: List<ActionParameter>,
     ): Bundle =
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt
index bddc1dac7e..9053deda16 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt
@@ -41,7 +41,7 @@ interface QuestionnaireHandler {
       startForResult.launch(
         Intent(context, QuestionnaireActivity::class.java)
           .putExtras(
-            QuestionnaireActivity.intentArgs(
+            QuestionnaireActivity.intentBundle(
               questionnaireConfig = questionnaireConfig,
               actionParams = actionParams,
             ),
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
index 42621f4861..f1495e2380 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
@@ -16,34 +16,160 @@
 
 package org.smartregister.fhircore.quest.ui.questionnaire
 
-import android.app.Activity
+import android.app.Application
 import android.content.Context
+import android.content.Intent
 import androidx.test.core.app.ApplicationProvider
+import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.datacapture.QuestionnaireFragment
+import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import io.mockk.coEvery
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import io.mockk.spyk
+import javax.inject.Inject
+import kotlinx.coroutines.test.runTest
+import org.hl7.fhir.r4.model.Enumerations
+import org.hl7.fhir.r4.model.Questionnaire
+import org.junit.After
+import org.junit.Assert
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.robolectric.Robolectric
+import org.robolectric.android.controller.ActivityController
+import org.robolectric.shadows.ShadowToast
 import org.smartregister.fhircore.engine.R
-import org.smartregister.fhircore.quest.robolectric.ActivityRobolectricTest
+import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
+import org.smartregister.fhircore.engine.data.local.DefaultRepository
+import org.smartregister.fhircore.engine.domain.model.ActionParameter
+import org.smartregister.fhircore.engine.domain.model.ActionParameterType
+import org.smartregister.fhircore.engine.domain.model.QuestionnaireType
+import org.smartregister.fhircore.engine.domain.model.RuleConfig
+import org.smartregister.fhircore.engine.rulesengine.ResourceDataRulesExecutor
+import org.smartregister.fhircore.engine.util.DefaultDispatcherProvider
+import org.smartregister.fhircore.engine.util.DispatcherProvider
+import org.smartregister.fhircore.engine.util.extension.decodeResourceFromString
+import org.smartregister.fhircore.quest.robolectric.RobolectricTest
 
 @HiltAndroidTest
-class QuestionnaireActivityTest : ActivityRobolectricTest() {
+class QuestionnaireActivityTest : RobolectricTest() {
 
   @get:Rule(order = 0) var hiltRule = HiltAndroidRule(this)
+
+  @Inject lateinit var resourceDataRulesExecutor: ResourceDataRulesExecutor
+
+  private val context: Application = ApplicationProvider.getApplicationContext()
+  private lateinit var questionnaireConfig: QuestionnaireConfig
+  private lateinit var questionnaireJson: String
+  private lateinit var questionnaire: Questionnaire
+  private lateinit var questionnaireActivityController: ActivityController<QuestionnaireActivity>
   private lateinit var questionnaireActivity: QuestionnaireActivity
+  private val dispatcherProvider: DispatcherProvider = spyk(DefaultDispatcherProvider())
+  private val fhirEngine: FhirEngine = mockk()
+  private val defaultRepository: DefaultRepository =
+    DefaultRepository(fhirEngine, dispatcherProvider, mockk(), mockk(), mockk(), mockk())
+
+  @BindValue
+  val questionnaireViewModel: QuestionnaireViewModel =
+    spyk(
+      QuestionnaireViewModel(
+        defaultRepository = defaultRepository,
+        transformSupportServices = mockk(),
+        dispatcherProvider = dispatcherProvider,
+        sharedPreferencesHelper = mockk(),
+        libraryEvaluator = mockk(),
+        fhirCarePlanGenerator = mockk(),
+        resourceDataRulesExecutor = mockk(),
+      ),
+    )
 
   @Before
   fun setUp() {
     hiltRule.inject()
     ApplicationProvider.getApplicationContext<Context>().apply { setTheme(R.style.AppTheme) }
-    questionnaireActivity = Robolectric.buildActivity(QuestionnaireActivity::class.java).get()
+    questionnaireConfig =
+      QuestionnaireConfig(
+        id = "754", // Same as ID in sample_patient_registration.json
+        title = "Patient registration",
+        type = QuestionnaireType.DEFAULT,
+        extraParams =
+          listOf(
+            ActionParameter(
+              paramType = ActionParameterType.PREPOPULATE,
+              linkId = "household.id",
+              dataType = Enumerations.DataType.INTEGER,
+              key = "opensrpId",
+              value = "@{humanReadableId}",
+            ),
+          ),
+        configRules =
+          listOf(
+            RuleConfig(
+              name = "humanReadableId",
+              description = "Generate OpenSRP ID",
+              condition = "true",
+              actions = listOf("data.put('humanReadableId', service.generateRandomSixDigitInt())"),
+            ),
+          ),
+      )
+    questionnaireJson =
+      context.assets.open("sample_patient_registration.json").bufferedReader().use { it.readText() }
+    questionnaire = questionnaireJson.decodeResourceFromString()
+
+    coEvery { questionnaireViewModel.libraryEvaluator.initialize() } just runs
+  }
+
+  @After
+  override fun tearDown() {
+    super.tearDown()
+    questionnaireActivityController.destroy()
   }
 
-  @Test fun testQuestionnaireFragmentIsRenderedWhenActivityIsLaunched() {}
+  @Test
+  fun testThatActivityIsFinishedIfQuestionnaireConfigIsMissing() {
+    questionnaireActivityController = Robolectric.buildActivity(QuestionnaireActivity::class.java)
+    questionnaireActivity = questionnaireActivityController.create().resume().get()
+    Assert.assertEquals(
+      "QuestionnaireConfig is required but missing.",
+      ShadowToast.getTextOfLatestToast(),
+    )
+  }
+
+  @Test
+  fun testThatActivityRendersConfiguredQuestionnaire() = runTest {
+    coEvery {
+      questionnaireViewModel.retrieveQuestionnaire(questionnaireConfig, emptyList())
+    } returns questionnaire
+
+    val bundle = QuestionnaireActivity.intentBundle(questionnaireConfig, emptyList())
+    questionnaireActivityController =
+      Robolectric.buildActivity(
+        QuestionnaireActivity::class.java,
+        Intent().apply { putExtras(bundle) },
+      )
+    questionnaireActivity = questionnaireActivityController.create().resume().get()
+    Assert.assertTrue(questionnaireActivity.supportFragmentManager.fragments.isNotEmpty())
+    val firstFragment = questionnaireActivity.supportFragmentManager.fragments.firstOrNull()
+    Assert.assertTrue(firstFragment is QuestionnaireFragment)
+
+    // Questionnaire should be the same
+    val fragmentQuestionnaire =
+      questionnaireActivity.supportFragmentManager.fragments
+        .firstOrNull()
+        ?.arguments
+        ?.getString("questionnaire")
+        ?.decodeResourceFromString<Questionnaire>()
+
+    Assert.assertEquals(questionnaire.id, fragmentQuestionnaire?.id)
+    val sortedQuestionnaireItemLinkIds =
+      questionnaire.item.map { it.linkId }.sorted().joinToString(",")
+    val sortedFragmentQuestionnaireItemLinkIds =
+      fragmentQuestionnaire?.item?.map { it.linkId }?.sorted()?.joinToString(",")
 
-  override fun getActivity(): Activity {
-    return questionnaireActivity
+    Assert.assertEquals(sortedQuestionnaireItemLinkIds, sortedFragmentQuestionnaireItemLinkIds)
   }
 }
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt
index 28f5889cbe..97d924d81f 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/shared/model/QuestionnaireHandlerTest.kt
@@ -74,7 +74,7 @@ class QuestionnaireHandlerTest : RobolectricTest() {
       .launch(
         Intent(context, QuestionnaireActivity::class.java)
           .putExtras(
-            QuestionnaireActivity.intentArgs(
+            QuestionnaireActivity.intentBundle(
               questionnaireConfig = questionnaire,
               actionParams = params,
             ),

From c17027b13e9f6ffcff759f5aabbf0adb0b3f3f0e Mon Sep 17 00:00:00 2001
From: Elly Kitoto <junkmailstoelly@gmail.com>
Date: Tue, 1 Aug 2023 16:58:28 +0300
Subject: [PATCH 27/27] Test QuestionnaireActivity#onBackPress

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
---
 .../QuestionnaireActivityTest.kt              | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
index f1495e2380..8fc7e13b94 100644
--- a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
+++ b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt
@@ -40,7 +40,9 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.robolectric.Robolectric
+import org.robolectric.Shadows
 import org.robolectric.android.controller.ActivityController
+import org.robolectric.shadows.ShadowAlertDialog
 import org.robolectric.shadows.ShadowToast
 import org.smartregister.fhircore.engine.R
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
@@ -141,17 +143,7 @@ class QuestionnaireActivityTest : RobolectricTest() {
 
   @Test
   fun testThatActivityRendersConfiguredQuestionnaire() = runTest {
-    coEvery {
-      questionnaireViewModel.retrieveQuestionnaire(questionnaireConfig, emptyList())
-    } returns questionnaire
-
-    val bundle = QuestionnaireActivity.intentBundle(questionnaireConfig, emptyList())
-    questionnaireActivityController =
-      Robolectric.buildActivity(
-        QuestionnaireActivity::class.java,
-        Intent().apply { putExtras(bundle) },
-      )
-    questionnaireActivity = questionnaireActivityController.create().resume().get()
+    setupActivity()
     Assert.assertTrue(questionnaireActivity.supportFragmentManager.fragments.isNotEmpty())
     val firstFragment = questionnaireActivity.supportFragmentManager.fragments.firstOrNull()
     Assert.assertTrue(firstFragment is QuestionnaireFragment)
@@ -172,4 +164,26 @@ class QuestionnaireActivityTest : RobolectricTest() {
 
     Assert.assertEquals(sortedQuestionnaireItemLinkIds, sortedFragmentQuestionnaireItemLinkIds)
   }
+
+  @Test
+  fun testThatOnBackPressShowsConfirmationAlertDialog() {
+    setupActivity()
+    questionnaireActivity.onBackPressedDispatcher.onBackPressed()
+    val dialog = Shadows.shadowOf(ShadowAlertDialog.getLatestAlertDialog())
+    Assert.assertNotNull(dialog)
+  }
+
+  private fun setupActivity() {
+    coEvery {
+      questionnaireViewModel.retrieveQuestionnaire(questionnaireConfig, emptyList())
+    } returns questionnaire
+
+    val bundle = QuestionnaireActivity.intentBundle(questionnaireConfig, emptyList())
+    questionnaireActivityController =
+      Robolectric.buildActivity(
+        QuestionnaireActivity::class.java,
+        Intent().apply { putExtras(bundle) },
+      )
+    questionnaireActivity = questionnaireActivityController.create().resume().get()
+  }
 }