avniproject/avni-webapp#1189 - SubjectTypeType.User support

avniproject · Apr 12, 2024 · 68a5783 · 68a5783
1 parent af196a5
commit 68a5783
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/messaging/service/MessageTemplateService.java b/avni-server-api/src/main/java/org/avni/messaging/service/MessageTemplateService.java
@@ -23,8 +23,8 @@ public MessageTemplateService(GlificMessageTemplateRepository messageTemplateRep
     }
 
     public List<GlificMessageTemplate> findAll() {
-        return organisationConfigService.isMessagingEnabled()?
-                messageTemplateRepository.findAllForOrganisationId(UserContextHolder.getUserContext().getOrganisationId()):
+        return organisationConfigService.isMessagingEnabled() ?
+                messageTemplateRepository.findAllForOrganisationId(UserContextHolder.getUserContext().getOrganisationId()) :
                 Collections.emptyList();
     }
 }
diff --git a/avni-server-api/src/main/java/org/avni/server/application/Subject.java b/avni-server-api/src/main/java/org/avni/server/application/Subject.java
@@ -1,5 +1,5 @@
 package org.avni.server.application;
 
 public enum Subject {
-    Group, Household, Individual, Person
+    Group, Household, Individual, Person, User
 }
diff --git a/avni-server-api/src/main/java/org/avni/server/domain/metadata/SubjectTypes.java b/avni-server-api/src/main/java/org/avni/server/domain/metadata/SubjectTypes.java
@@ -11,9 +11,9 @@
 
 public class SubjectTypes implements MetaData {
     private List<SubjectType> subjectTypes;
-    private Map<SubjectType, List<Program>> programs = new HashMap<>();
-    private Map<SubjectType, Map<Program, List<EncounterType>>> programEncounterTypes = new HashMap<>();
-    private Map<SubjectType, List<EncounterType>> generalEncounterTypes = new HashMap<>();
+    private final Map<SubjectType, List<Program>> programs = new HashMap<>();
+    private final Map<SubjectType, Map<Program, List<EncounterType>>> programEncounterTypes = new HashMap<>();
+    private final Map<SubjectType, List<EncounterType>> generalEncounterTypes = new HashMap<>();
 
     public SubjectTypes(List<SubjectType> subjectTypes) {
         this.subjectTypes = subjectTypes;

diff --git a/avni-server-api/src/main/java/org/avni/server/web/SubjectTypeController.java b/avni-server-api/src/main/java/org/avni/server/web/SubjectTypeController.java
@@ -99,7 +99,8 @@ public ResponseEntity getOne(@PathVariable("id") Long id) {
             return ResponseEntity.notFound().build();
         FormMapping formMapping = formMappingService.find(operationalSubjectType.getSubjectType());
         SubjectTypeContractWeb subjectTypeContractWeb = SubjectTypeContractWeb.fromOperationalSubjectType(operationalSubjectType, formMapping);
-        List<SubjectTypeSetting> customRegistrationLocations = objectMapper.convertValue(organisationConfigService.getSettingsByKey(KeyType.customRegistrationLocations.toString()), new TypeReference<List<SubjectTypeSetting>>() {});
+        List<SubjectTypeSetting> customRegistrationLocations = objectMapper.convertValue(organisationConfigService.getSettingsByKey(KeyType.customRegistrationLocations.toString()), new TypeReference<List<SubjectTypeSetting>>() {
+        });
         Optional<List<String>> locationUUIDs = customRegistrationLocations
                 .stream()
                 .filter(s -> s.getSubjectTypeUUID().equals(operationalSubjectType.getSubjectTypeUUID()))
@@ -111,7 +112,7 @@ public ResponseEntity getOne(@PathVariable("id") Long id) {
 
     @PostMapping(value = "/web/subjectType")
     @Transactional
-    ResponseEntity saveSubjectTypeForWeb(@RequestBody SubjectTypeContractWeb request) {
+    public ResponseEntity saveSubjectTypeForWeb(@RequestBody SubjectTypeContractWeb request) {
         accessControlService.checkPrivilege(PrivilegeType.EditSubjectType);
         SubjectType existingSubjectType =
                 subjectTypeRepository.findByNameIgnoreCase(request.getName());
@@ -121,7 +122,7 @@ ResponseEntity saveSubjectTypeForWeb(@RequestBody SubjectTypeContractWeb request
             return ResponseEntity.badRequest().body(
                     ReactAdminUtil.generateJsonError(String.format("SubjectType %s already exists", request.getName()))
             );
-        if(request.getType() == null){
+        if (request.getType() == null) {
             return ResponseEntity.badRequest().body(
                     ReactAdminUtil.generateJsonError("Can't save subjectType with empty type")
             );
@@ -197,10 +198,10 @@ public ResponseEntity updateSubjectTypeForWeb(@RequestBody SubjectTypeContractWe
         SubjectType subjectType = operationalSubjectType.getSubjectType();
         boolean isSyncConcept1Changed = !Objects.equals(request.getSyncRegistrationConcept1(), subjectType.getSyncRegistrationConcept1());
         boolean isSyncConcept2Changed = !Objects.equals(request.getSyncRegistrationConcept2(), subjectType.getSyncRegistrationConcept2());
-            if (isSyncConcept1Changed)
-                subjectType.setSyncRegistrationConcept1Usable(false);
-            if (isSyncConcept2Changed)
-                subjectType.setSyncRegistrationConcept2Usable(false);
+        if (isSyncConcept1Changed)
+            subjectType.setSyncRegistrationConcept1Usable(false);
+        if (isSyncConcept2Changed)
+            subjectType.setSyncRegistrationConcept2Usable(false);
         resetSyncService.recordSyncAttributeChange(operationalSubjectType.getSubjectType(), request);
         updateSubjectType(request, operationalSubjectType);
         subjectTypeService.updateSyncAttributesIfRequired(subjectType);
@@ -254,7 +255,7 @@ public ResponseEntity voidSubjectType(@PathVariable("id") Long id) {
 
     @GetMapping(value = "/subjectType/syncAttributesData")
     public UserSyncAttributeAssignmentRequest getAllConceptSyncAttributes() {
-       return subjectTypeService.getSyncAttributeData();
+        return subjectTypeService.getSyncAttributeData();
     }
 
     private void voidAllGroupRoles(SubjectType subjectType) {