Refactor FhirResourceUtils for Optimization

- Add optional resources filter parameter to further reduct search results
opensrp · Aug 24, 2023 · 53f7a8f · 53f7a8f
1 parent ae1f8bb
commit 53f7a8f
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 2 deletions.
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt
@@ -167,9 +167,14 @@ constructor(
       }
     }
 
+    val carePlanTasks = output.contained.filterIsInstance<Task>()
+
     if (carePlanModified) saveCarePlan(output)
 
-    fhirTaskUtil.updateUpcomingTasksToDue(subject = subject.asReference())
+    fhirTaskUtil.updateUpcomingTasksToDue(
+      subject = subject.asReference(),
+      taskResourcesToFilterBy = carePlanTasks,
+    )
 
     return if (output.hasActivity()) output else null
   }

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirResourceUtil.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirResourceUtil.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import ca.uhn.fhir.rest.param.ParamPrefixEnum
 import com.google.android.fhir.get
 import com.google.android.fhir.logicalId
+import com.google.android.fhir.search.filter.TokenParamFilterCriterion
 import com.google.android.fhir.search.search
 import dagger.hilt.android.qualifiers.ApplicationContext
 import java.util.Date
@@ -130,8 +131,15 @@ constructor(
    * [TaskStatus.READY]. A [Task] should only be due when the start date of the Tasks
    * [Task.executionPeriod] is before today and the status is [TaskStatus.REQUESTED] and the
    * pre-requisite [Task] s are completed.
+   *
+   * @param subject optional subject resources to use as an additional filter to tasks processed
+   * @param taskResourcesToFilterBy optional set of Task resources whose resource ids will be used
+   *   to filter tasks processed
    */
-  suspend fun updateUpcomingTasksToDue(subject: Reference? = null) {
+  suspend fun updateUpcomingTasksToDue(
+    subject: Reference? = null,
+    taskResourcesToFilterBy: List<Task>? = null,
+  ) {
     Timber.i("Update upcoming Tasks to due...")
 
     val tasks =
@@ -152,6 +160,14 @@ constructor(
         if (!subject?.reference.isNullOrEmpty()) {
           filter(Task.SUBJECT, { value = subject?.reference })
         }
+        taskResourcesToFilterBy?.let {
+          val filters =
+            it.map {
+              val apply: TokenParamFilterCriterion.() -> Unit = { value = of(it.logicalId) }
+              apply
+            }
+          filter(Resource.RES_ID, *filters.toTypedArray())
+        }
       }
 
     Timber.i(

diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/task/FhirResourceUtilTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/task/FhirResourceUtilTest.kt
@@ -222,4 +222,48 @@ class FhirResourceUtilTest : RobolectricTest() {
 
     assertEquals(TaskStatus.READY, task.status)
   }
+
+  @Test
+  fun testUpdateTaskStatusesGivenTasks() {
+    val task =
+      Task().apply {
+        id = "test-task-id"
+        partOf = listOf(Reference("Task/parent-test-task-id"))
+        executionPeriod =
+          Period().apply {
+            start = Date().plusDays(-5)
+            status = TaskStatus.REQUESTED
+          }
+      }
+
+    coEvery {
+      fhirEngine.search<Task> {
+        filter(
+          Task.STATUS,
+          { value = of(TaskStatus.REQUESTED.toCoding()) },
+          { value = of(TaskStatus.ACCEPTED.toCoding()) },
+          { value = of(TaskStatus.RECEIVED.toCoding()) },
+        )
+        filter(
+          Task.PERIOD,
+          {
+            prefix = ParamPrefixEnum.LESSTHAN_OR_EQUALS
+            value = of(DateTimeType(Date().plusDays(-1)))
+          },
+        )
+      }
+    } returns listOf(task)
+
+    coEvery { fhirEngine.get<Task>(any()).status.isIn(TaskStatus.COMPLETED) } returns true
+
+    coEvery { defaultRepository.update(any()) } just runs
+
+    assertEquals(TaskStatus.REQUESTED, task.status)
+
+    runBlocking { fhirTaskUtil.updateUpcomingTasksToDue(taskResourcesToFilterBy = listOf(task)) }
+
+    coVerify { defaultRepository.update(task) }
+
+    assertEquals(TaskStatus.READY, task.status)
+  }
 }