Revert "#768 | Add null check in get and rename var in void of identi…

…fierUserAssignment" This reverts commit 9146195.
avniproject · Aug 8, 2024 · a98556f · a98556f
1 parent 2b44ce0
commit a98556f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/avni-server-api/src/main/java/org/avni/server/builder/ChecklistDetailBuilder.java b/avni-server-api/src/main/java/org/avni/server/builder/ChecklistDetailBuilder.java
@@ -49,14 +49,15 @@ public ChecklistDetailBuilder withItems(List<ChecklistItemDetailRequest> items)
                     .withVoided(item.isVoided())
                     .withform(form)
                     .withConcept(concept)
-                    .withLeadItem(builtItems.get(item.getDependentOn()))
                     .withScheduleOnExpiryOfDependency(item.getScheduleOnExpiryOfDependency())
                     .withMinDaysFromStartDate(item.getMinDaysFromStartDate())
                     .withMinDaysFromDependent(item.getMinDaysFromDependent())
                     .withExpiresAfter(item.getExpiresAfter())
                     .build();
             builtItems.put(builtItemDetail.getUuid(), builtItemDetail);
         });
+        //set dependentOn after all items in request have been processed so order of items in request does not matter for dependents
+        items.forEach(item -> getExistingChecklistItemDetail(this.get(), item).setLeadChecklistItemDetail(builtItems.get(item.getDependentOn())));
         return this;
     }