#0 | Undo rename of subjectMemberName

avniproject · Jan 29, 2021 · 0e4d541 · 0e4d541
1 parent 50d3147
commit 0e4d541
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/openchs-server-api/src/main/java/org/openchs/web/SubjectTypeController.java b/openchs-server-api/src/main/java/org/openchs/web/SubjectTypeController.java
@@ -14,10 +14,10 @@
 import org.openchs.service.*;
 import org.openchs.util.ObjectMapperSingleton;
 import org.openchs.util.ReactAdminUtil;
-import org.openchs.web.request.SubjectTypeContract;
-import org.openchs.web.request.webapp.SubjectTypeSetting;
 import org.openchs.web.request.GroupRoleContract;
+import org.openchs.web.request.SubjectTypeContract;
 import org.openchs.web.request.webapp.SubjectTypeContractWeb;
+import org.openchs.web.request.webapp.SubjectTypeSetting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -243,7 +243,7 @@ private GroupRole getGroupRole(GroupRoleContract groupRoleContract, SubjectType
         }
         groupRole.setUuid(groupRoleContract.getGroupRoleUUID());
         groupRole.setGroupSubjectType(groupSubjectType);
-        groupRole.setMemberSubjectType(subjectTypeRepository.findByName(groupRoleContract.getMemberSubjectTypeName()));
+        groupRole.setMemberSubjectType(subjectTypeRepository.findByName(groupRoleContract.getSubjectMemberName()));
         groupRole.setVoided(groupRoleContract.isVoided());
         groupRole.setRole(groupRoleContract.getRole());
         groupRole.setMinimumNumberOfMembers(groupRoleContract.getMinimumNumberOfMembers());

diff --git a/openchs-server-api/src/main/java/org/openchs/web/request/GroupRoleContract.java b/openchs-server-api/src/main/java/org/openchs/web/request/GroupRoleContract.java
@@ -7,7 +7,7 @@ public class GroupRoleContract extends CHSRequest {
     private String groupSubjectTypeUUID;
     private String memberSubjectTypeUUID;
     private String role;
-    private String memberSubjectTypeName;
+    private String subjectMemberName;
     private String groupRoleUUID;
     private Boolean isPrimary;
     private Long maximumNumberOfMembers;
@@ -21,7 +21,7 @@ public static GroupRoleContract fromEntity(GroupRole groupRole) {
         groupRoleContract.setRole(groupRole.getRole());
         groupRoleContract.setPrimary(groupRole.isPrimary());
         groupRoleContract.setGroupRoleUUID(groupRole.getUuid());
-        groupRoleContract.setMemberSubjectTypeName(groupRole.getMemberSubjectType().getName());
+        groupRoleContract.setSubjectMemberName(groupRole.getMemberSubjectType().getName());
         groupRoleContract.setMaximumNumberOfMembers(groupRole.getMaximumNumberOfMembers());
         groupRoleContract.setMinimumNumberOfMembers(groupRole.getMinimumNumberOfMembers());
         return groupRoleContract;
@@ -59,12 +59,12 @@ public void setPrimary(Boolean primary) {
         isPrimary = primary;
     }
 
-    public String getMemberSubjectTypeName() {
-        return memberSubjectTypeName;
+    public String getSubjectMemberName() {
+        return subjectMemberName;
     }
 
-    public void setMemberSubjectTypeName(String memberSubjectTypeName) {
-        this.memberSubjectTypeName = memberSubjectTypeName;
+    public void setSubjectMemberName(String subjectMemberName) {
+        this.subjectMemberName = subjectMemberName;
     }
 
     public String getGroupRoleUUID() {