#752 | Respect voided in contract for GroupRole, IndividualRelation and Program

Author: 1t5j0y

avni-server-api/src/main/java/org/avni/server/service/GroupRoleService.java

@@ -36,6 +36,7 @@ public GroupRole saveGroupRole(GroupRoleContract groupRoleRequest, SubjectType g
         groupRole.setPrimary(groupRoleRequest.getPrimary());
         groupRole.setMaximumNumberOfMembers(groupRoleRequest.getMaximumNumberOfMembers());
         groupRole.setMinimumNumberOfMembers(groupRoleRequest.getMinimumNumberOfMembers());
+        groupRole.setVoided(groupRoleRequest.isVoided());
         return groupRoleRepository.save(groupRole);
     }
 

avni-server-api/src/main/java/org/avni/server/service/IndividualRelationService.java

@@ -58,6 +58,7 @@ public void uploadRelation(IndividualRelationContract individualRelationContract
             individualRelation.setUuid(uuid == null ? UUID.randomUUID().toString() : uuid);
         }
         individualRelation.setName(name); //Update name if changed
+        individualRelation.setVoided(individualRelationContract.isVoided());
         IndividualRelation savedRelation = individualRelationRepository.save(individualRelation);
         saveGenderMappings(individualRelationContract, savedRelation);
     }

avni-server-api/src/main/java/org/avni/server/service/ProgramService.java

@@ -63,6 +63,7 @@ public void updateAndSaveProgram(Program program, ProgramContract programContrac
         program.setManualEnrolmentEligibilityCheckRule(programContract.getManualEnrolmentEligibilityCheckRule());
         program.setManualEnrolmentEligibilityCheckDeclarativeRule(programContract.getManualEnrolmentEligibilityCheckDeclarativeRule());
         program.setAllowMultipleEnrolments(programContract.isAllowMultipleEnrolments());
+        program.setVoided(programContract.isVoided());
         programRepository.save(program);
     }
 

avni-server-api/src/main/java/org/avni/server/web/request/GroupRoleContract.java

@@ -24,6 +24,7 @@ public static GroupRoleContract fromEntity(GroupRole groupRole) {
         groupRoleContract.setSubjectMemberName(groupRole.getMemberSubjectType().getName());
         groupRoleContract.setMaximumNumberOfMembers(groupRole.getMaximumNumberOfMembers());
         groupRoleContract.setMinimumNumberOfMembers(groupRole.getMinimumNumberOfMembers());
+        groupRoleContract.setVoided(groupRole.isVoided());
         return groupRoleContract;
     }