#663 | Minor method extraction

avniproject · Dec 11, 2023 · 39c0469 · 39c0469
1 parent 38e5b4e
commit 39c0469
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/service/UserSubjectAssignmentService.java b/avni-server-api/src/main/java/org/avni/server/service/UserSubjectAssignmentService.java
@@ -147,13 +147,7 @@ public List<UserSubjectAssignment> assignSubjects(User user, List<Individual> su
             List<Individual> listOfSubjects = subjectTypeList.getValue();
             List<Long> addressLevels = addressLevelService.getAllRegistrationAddressIdsBySubjectType(user.getCatchment(), subjectType);
             for (Individual subject : listOfSubjects) {
-                try {
-                    checkIfSubjectLiesWithinUserCatchment(assignmentVoided, subject, addressLevels);
-                    checkIfSubjectIsPartOfGroupAssignedToUser(assignmentVoided, user, subject);
-                    createUpdateAssignment(assignmentVoided, userSubjectAssignmentList, user, subject);
-                } catch (Exception ve) {
-                    errors.add(ve.getMessage());
-                }
+                validateAndCreateUpdateUserSubjectAssignment(assignmentVoided, user, subject, userSubjectAssignmentList, addressLevels, errors);
             }
         }
         if(errors.isEmpty()) {
@@ -163,6 +157,18 @@ public List<UserSubjectAssignment> assignSubjects(User user, List<Individual> su
         }
     }
 
+    private void validateAndCreateUpdateUserSubjectAssignment(boolean assignmentVoided, User user, Individual subject,
+                                                              List<UserSubjectAssignment> userSubjectAssignmentList,
+                                                              List<Long> addressLevels, List<String> errors) {
+        try {
+            checkIfSubjectLiesWithinUserCatchment(assignmentVoided, subject, addressLevels);
+            checkIfSubjectIsPartOfGroupAssignedToUser(assignmentVoided, user, subject);
+            createUpdateAssignment(assignmentVoided, userSubjectAssignmentList, user, subject);
+        } catch (Exception ve) {
+            errors.add(ve.getMessage());
+        }
+    }
+
     private void checkIfSubjectIsPartOfGroupAssignedToUser(boolean assignmentVoided, User user, Individual subject) throws ValidationException {
         if (assignmentVoided && !subject.getSubjectType().isGroup()) {
             List<GroupSubject> groupSubjects = groupSubjectRepository.findAllByMemberSubjectAndIsVoidedFalse(subject);
@@ -212,7 +218,7 @@ private void onlyIfAssignGroupThenAssignMembersAlsoToUser(boolean assignmentVoid
         if (!assignmentVoided && subject.getSubjectType().isGroup()) {
             List<GroupSubject> groupSubjects = groupSubjectRepository.findAllByGroupSubjectAndIsVoidedFalse(subject);
             for (GroupSubject groupSubject : groupSubjects) {
-                createUpdateAssignment(assignmentVoided, userSubjectAssignmentList, user, groupSubject.getMemberSubject());
+                createUpdateAssignment(false, userSubjectAssignmentList, user, groupSubject.getMemberSubject());
             }
         }
     }