avniproject/avni-webapp#1288 | Use second pass to process dependents during checklist save

Author: 1t5j0y

avni-server-api/src/main/java/org/avni/server/builder/ChecklistDetailBuilder.java

@@ -1,9 +1,6 @@
 package org.avni.server.builder;
 
 import org.avni.server.application.Form;
-
-import java.util.Map;
-
 import org.avni.server.dao.application.FormRepository;
 import org.avni.server.domain.ChecklistDetail;
 import org.avni.server.domain.ChecklistItemDetail;
@@ -14,6 +11,7 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class ChecklistDetailBuilder extends BaseBuilder<ChecklistDetail, ChecklistDetailBuilder> {
 
@@ -51,14 +49,17 @@ 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 -> new ChecklistItemDetailBuilder(this.get(), getExistingChecklistItemDetail(this.get(), item))
+                .withLeadItem(builtItems.get(item.getDependentOn()))
+                .build());
         return this;
     }