Merge pull request #785 from opensrp/bump-evaluator-version

Bump plan evaluator version

Author: vincent-karuri

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=4.3.2-SNAPSHOT
+VERSION_NAME=4.3.3-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application

opensrp-app/build.gradle

@@ -230,7 +230,7 @@ dependencies {
 
     implementation 'org.smartregister:opensrp-client-utils:0.0.2-SNAPSHOT'
 
-    implementation 'org.smartregister:opensrp-plan-evaluator:1.3.1-SNAPSHOT'
+    implementation 'org.smartregister:opensrp-plan-evaluator:1.5.1-SNAPSHOT'
 
     implementation 'xerces:xercesImpl:2.12.0'
 

opensrp-app/src/main/java/org/smartregister/repository/TaskRepository.java

@@ -710,10 +710,18 @@ public int getUnsyncedCreatedTasksAndTaskStatusCount() {
 
     @NonNull
     public Set<Task> getTasksByJurisdictionAndPlan(@NonNull String jurisdictionId, String planIdentifier) {
-        String query = "SELECT * FROM " + TASK_TABLE + " WHERE " + GROUP_ID + " = ? AND " + PLAN_ID + " = ?";
+        String query = TextUtils.join(" ",
+                new String[]{"SELECT * FROM", TASK_TABLE, "WHERE", GROUP_ID, "=?", "AND", PLAN_ID, "=?"});
         return getTasks(query, new String[]{jurisdictionId, planIdentifier});
     }
 
+    @NonNull
+    public Set<Task> getTasksByJurisdiction(@NonNull String jurisdictionId) {
+        String query = TextUtils.join(" ",
+                new String[]{"SELECT * FROM", TASK_TABLE, "WHERE", GROUP_ID, "=?"});
+        return getTasks(query, new String[]{jurisdictionId});
+    }
+
     public List<String> getEntityIdsWithDuplicateTasks() {
         List<String> entityIds = new ArrayList<>();
         android.database.Cursor cursor = null;

opensrp-app/src/main/java/org/smartregister/repository/dao/TaskDaoImpl.java

@@ -17,6 +17,7 @@
 import org.smartregister.repository.TaskRepository;
 
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static org.smartregister.AllConstants.INTENT_KEY.TASK_GENERATED;
@@ -88,9 +89,18 @@ public org.smartregister.domain.Task updateTask(org.smartregister.domain.Task ta
 
 
     @Override
-    public List<Task> findTasksByJurisdiction(String jurisdiction,String planIdentifier) {
-        return getTasksByJurisdictionAndPlan(jurisdiction,planIdentifier)
-                .stream()
+    public List<Task> findTasksByJurisdiction(String jurisdiction, String planIdentifier) {
+        return convertToListOfFHIRTasks(getTasksByJurisdictionAndPlan(jurisdiction, planIdentifier));
+    }
+
+    @Override
+    public List<Task> findTasksByJurisdiction(String jurisdiction) {
+        return convertToListOfFHIRTasks(getTasksByJurisdiction(jurisdiction));
+
+    }
+
+    private List<Task> convertToListOfFHIRTasks(Set<org.smartregister.domain.Task> tasks) {
+        return tasks.stream()
                 .map(TaskConverter::convertTasktoFihrResource)
                 .collect(Collectors.toList());
     }

opensrp-app/src/test/java/org/smartregister/repository/dao/TaskDaoImplTest.java

@@ -2,8 +2,6 @@
 
 import android.content.Intent;
 
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
 import com.ibm.fhir.model.resource.QuestionnaireResponse;
 import com.ibm.fhir.model.resource.Task;
 
@@ -30,6 +28,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import static com.ibm.fhir.model.type.code.TaskStatus.READY;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -107,22 +107,39 @@ public void testFindTasksForEntity() {
     }
 
     @Test
-    public void testFindTasksByJurisdiction() {
+    public void testFindTasksByJurisdictionAndPlanShouldReturnMatchingRecords() {
         String jurisdictionId = "jurisdiction-id";
         String planId = "plan-id";
 
-        String query = "SELECT * FROM task WHERE group_id = ? AND plan_id = ?";
-        when(sqLiteDatabase.rawQuery(query, new String[]{jurisdictionId,planId})).thenReturn(getCursor());
+        String query = "SELECT * FROM task WHERE group_id =? AND plan_id =?"; // ensure query exactly matches what is in TaskDaoImpl
+        when(sqLiteDatabase.rawQuery(query, new String[]{jurisdictionId, planId})).thenReturn(getCursor());
         taskDao = Mockito.spy(taskDao);
 
         // Call the method under test
-        List<Task> allTasks = taskDao.findTasksByJurisdiction(jurisdictionId,planId);
+        List<Task> allTasks = taskDao.findTasksByJurisdiction(jurisdictionId, planId);
 
         // Perform verifications and assertions
         verify(taskDao).getTasksByJurisdictionAndPlan(jurisdictionId, planId);
         assertEquals(1, allTasks.size());
     }
 
+    @Test
+    public void testFindTasksByJurisdictionShouldReturnMatchingRecords() {
+        String jurisdictionId = "jurisdiction-id";
+
+        String query = "SELECT * FROM task WHERE group_id =?"; // ensure query exactly matches what is in TaskDaoImpl
+        when(sqLiteDatabase.rawQuery(query, new String[]{jurisdictionId})).thenReturn(getCursor());
+        taskDao = Mockito.spy(taskDao);
+
+        // Call the method under test
+        List<Task> allTasks = taskDao.findTasksByJurisdiction(jurisdictionId);
+
+        // Perform verifications and assertions
+        verify(taskDao).getTasksByJurisdiction(jurisdictionId);
+        assertEquals(1, allTasks.size());
+    }
+
+
     @Test
     public void testUpdateTaskShouldInvokeExpectedMethods() {
         taskDao = Mockito.spy(taskDao);