HLM-5180 making activities and resources empty instead of null in sea…

…rch response
egovernments · May 14, 2024 · 49b0f3f · 49b0f3f
1 parent 659a660
commit 49b0f3f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/health-services/plan-service/src/main/java/digit/repository/rowmapper/PlanRowMapper.java b/health-services/plan-service/src/main/java/digit/repository/rowmapper/PlanRowMapper.java
@@ -80,6 +80,11 @@ private void addActivities(ResultSet rs, Plan plan,
             addActivityConditions(rs, activityMap.get(activityId), conditionMap);
             return;
         }
+        else if (ObjectUtils.isEmpty(activityId)) {
+            // Set activities list to empty if no activity found
+            plan.setActivities(new ArrayList<>());
+            return;
+        }
 
         String dependencies = rs.getString("plan_activity_dependencies");
         AuditDetails auditDetails = AuditDetails.builder()
@@ -116,6 +121,8 @@ private void addActivityConditions(ResultSet rs, Activity activity, Map<String,
         String conditionId = rs.getString("plan_activity_condition_id");
 
         if(ObjectUtils.isEmpty(conditionId) || conditionMap.containsKey(conditionId)) {
+            List<Condition> conditionList = new ArrayList<>();
+            activity.setConditions(conditionList);
             return;
         }
 
@@ -150,6 +157,8 @@ private void addResources(ResultSet rs, Plan planEntry, Map<String, Resource> re
         String resourceId = rs.getString("plan_resource_id");
 
         if(ObjectUtils.isEmpty(resourceId) || resourceMap.containsKey(resourceId)) {
+            List<Resource> resourceList = new ArrayList<>();
+            planEntry.setResources(resourceList);
             return;
         }
 
@@ -183,6 +192,8 @@ private void addTargets(ResultSet rs, Plan planEntry, Map<String, Target> target
         String targetId = rs.getString("plan_target_id");
 
         if(ObjectUtils.isEmpty(targetId) || targetMap.containsKey(targetId)) {
+            List<Target> targetList = new ArrayList<>();
+            planEntry.setTargets(targetList);
             return;
         }
 

diff --git a/health-services/plan-service/src/main/java/digit/web/models/Plan.java b/health-services/plan-service/src/main/java/digit/web/models/Plan.java
@@ -48,15 +48,15 @@ public class Plan {
 
     @JsonProperty("activities")
     @Valid
-    private List<Activity> activities = null;
+    private List<Activity> activities;
 
     @JsonProperty("resources")
     @Valid
-    private List<Resource> resources = null;
+    private List<Resource> resources;
 
     @JsonProperty("targets")
     @Valid
-    private List<Target> targets = null;
+    private List<Target> targets;
 
     @JsonProperty("auditDetails")
     private AuditDetails auditDetails = null;