Fix failing tests (#3785)

* Remove unnecessary logging of IDs

* Fix failling executeCqlShouldInvokeRunCqlLibrary test

* Revert deleted comment

* Run spotless Apply

* Run spotless Apply on engine module

* Run spotless Apply on engine module

* Add Resource Extension test case

Author: Rkareko

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

@@ -452,6 +452,28 @@ fun String.resourceClassType(): Class<out Resource> =
  */
 fun String.extractLogicalIdUuid() = this.substringAfter("/").substringBefore("/")
 
+/**
+ * A function that extracts only the UUID part of a resource logicalId from a URI.
+ *
+ * Examples:
+ * 1. "http://smartreg.org/Library/3e2bb367-b9bb-4c30-9033-8f42657c5df7/history/3" returns
+ *
+ * ```
+ *    "3e2bb367-b9bb-4c30-9033-8f42657c5df7".
+ * ```
+ */
+fun String.extractLogicalIdUuidFromURI(resourceType: ResourceType): String {
+  val pathSegments: List<String> = this.split("/")
+  val resourceIndex = pathSegments.indexOf(resourceType.name)
+
+  // Check if the resource type was found and if there's a segment after it
+  return if (resourceIndex != -1 && resourceIndex + 1 < pathSegments.size) {
+    pathSegments[resourceIndex + 1]
+  } else {
+    "" // Return empty if the resource type or its ID is not found
+  }
+}
+
 /**
  * This suspend function updates the due date of the dependents of the current [Task], based on the
  * date of a related [Immunization] [Task]. The function loops through all the tasks that are

android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt

@@ -52,6 +52,7 @@ 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.RelatedPerson
+import org.hl7.fhir.r4.model.ResourceType
 import org.hl7.fhir.r4.model.StringType
 import org.hl7.fhir.r4.model.Task
 import org.hl7.fhir.r4.model.Timing
@@ -688,6 +689,24 @@ class ResourceExtensionTest : RobolectricTest() {
     )
   }
 
+  @Test
+  fun testLogicalIdFromFhirPathExtractedURIReturnsCorrectValue() {
+    val libraryUri = "http://smartreg.org/Library/3e2bb367-b9bb-4c30-9033-8f42657c5df7/history/3"
+    Assert.assertEquals(
+      "3e2bb367-b9bb-4c30-9033-8f42657c5df7",
+      libraryUri.extractLogicalIdUuidFromURI(ResourceType.Library),
+    )
+  }
+
+  @Test
+  fun testLogicalIdFromFhirPathExtractedURIReturnsEmptyStringWhenResourceTypeIsMissing() {
+    val libraryUri = "http://smartreg.org/3e2bb367-b9bb-4c30-9033-8f42657c5df7/history/3"
+    Assert.assertEquals(
+      "",
+      libraryUri.extractLogicalIdUuidFromURI(ResourceType.Library),
+    )
+  }
+
   @Test
   fun `prepareQuestionsForReadingOrEditing should set readOnly to true when passed`() {
     val questionnaire = Questionnaire()

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt

@@ -89,6 +89,7 @@ import org.smartregister.fhircore.engine.util.extension.cqfLibraryUrls
 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.extractLogicalIdUuidFromURI
 import org.smartregister.fhircore.engine.util.extension.find
 import org.smartregister.fhircore.engine.util.extension.generateMissingId
 import org.smartregister.fhircore.engine.util.extension.isIn
@@ -882,7 +883,9 @@ constructor(
 
     val libraryFilters =
       questionnaire.cqfLibraryUrls().map {
-        val apply: TokenParamFilterCriterion.() -> Unit = { value = of(it.extractLogicalIdUuid()) }
+        val apply: TokenParamFilterCriterion.() -> Unit = {
+          value = of(it.extractLogicalIdUuidFromURI(ResourceType.Library))
+        }
         apply
       }
 

android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt

@@ -128,7 +128,6 @@ import org.smartregister.fhircore.quest.ui.questionnaire.QuestionnaireViewModel.
 import org.smartregister.fhircore.quest.util.QuestionnaireResponseUtils
 import org.smartregister.model.practitioner.FhirPractitionerDetails
 import org.smartregister.model.practitioner.PractitionerDetails
-import timber.log.Timber
 
 @HiltAndroidTest
 class QuestionnaireViewModelTest : RobolectricTest() {
@@ -259,8 +258,7 @@ class QuestionnaireViewModelTest : RobolectricTest() {
         {
           runBlocking { (firstArg() as suspend () -> Unit).invoke() }
         }
-      val onSuccessfulSubmission =
-        spyk({ idsTypes: List<IdType>, _: QuestionnaireResponse -> Timber.i(idsTypes.toString()) })
+      val onSuccessfulSubmission: (List<IdType>, QuestionnaireResponse) -> Unit = spyk()
       coEvery {
         ResourceMapper.extract(
           questionnaire = questionnaire,
@@ -1225,7 +1223,7 @@ class QuestionnaireViewModelTest : RobolectricTest() {
 
     val cqlLibrary =
       Library().apply {
-        id = "Library/123"
+        id = "123"
         url = "http://smartreg.org/Library/123"
         name = "123"
         version = "1.0.0"
@@ -1244,9 +1242,18 @@ class QuestionnaireViewModelTest : RobolectricTest() {
       },
     )
 
-    fhirEngine.create(patient)
+    defaultRepository.fhirEngine.create(cqlLibrary)
 
-    questionnaireViewModel.executeCql(patient, bundle, questionnaire)
+    // Load the CQL input resources from the questionnaireConfig
+    val questionnaireConfigCqlInputResources =
+      questionnaireConfig.copy(cqlInputResources = listOf("basic-resource-id"))
+
+    questionnaireViewModel.executeCql(
+      patient,
+      bundle,
+      questionnaire,
+      questionnaireConfigCqlInputResources,
+    )
 
     coVerify {
       fhirOperator.evaluateLibrary(