customization api modified

PSMRI · Jul 29, 2024 · 2e28f6c · 2e28f6c
1 parent 2e6fac3
commit 2e28f6c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
@@ -83,7 +83,7 @@ public int compareTo(BeneficiariesDTO ben) {
 	private String accountNo;
 	private Long benAccountID;
 	private Integer occupationId;
-	private String occupation;
+	private String occupationName;
 	private String incomeStatus;
 	private BigInteger religionId;
 	private String religion;

diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
@@ -74,7 +74,7 @@ public class IdentityDTO {
 	private String maritalStatus;
 	private String middleName;
 	private Integer occupationId;
-	private String occupation;
+	private String occupationName;
 	private Integer phcId;
 	private Integer parkingPlaceId;
 	private String placeOfWork;

diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java
@@ -98,7 +98,7 @@ public class IdentityEditDTO {
 	private Integer incomeStatusId;
 	private String incomeStatus;
 	private Integer occupationId;
-	private String occupation;
+	private String occupationName;
 	private Integer religionId;
 	private String religion;
 	private String placeOfWork;
@@ -146,5 +146,5 @@ public class IdentityEditDTO {
 	private Integer vanID;
 	private Integer parkingPlaceId;
 	private boolean emergencyRegistration;
-//	private Object otherFields;
+	private String otherFields;
 }
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
@@ -344,7 +344,7 @@ MBeneficiaryfamilymapping identityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 	@Mapping(target = "email", source = "map.MBeneficiarycontact.emailId")
 
 	@Mapping(source = "map.MBeneficiarydetail.occupationId", target = "occupationId")
-	@Mapping(source = "map.MBeneficiarydetail.occupation", target = "occupation")
+	@Mapping(source = "map.MBeneficiarydetail.occupation", target = "occupationName")
 	@Mapping(source = "map.MBeneficiarydetail.incomeStatus", target = "incomeStatus")
 	@Mapping(source = "map.MBeneficiarydetail.monthlyFamilyIncome", target = "monthlyFamilyIncome")
 	@Mapping(source = "map.MBeneficiarydetail.religionId", target = "religionId")

diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -776,7 +776,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 //					}
 //				}
 //				String otherFieldsJsonString = otherFieldsJson.toString();
-				mbDetl.setOtherFields(benDetails.getOtherFields());
+			//	mbDetl.setOtherFields(benDetails.getOtherFields());
 				logger.debug("Beneficiary details to update = " + new OutputMapper().gson().toJson(mbDetl));
 				if (benDetails.getEmergencyRegistration() != null && benDetails.getEmergencyRegistration()) {
 					mbDetl.setEmergencyRegistration(true);
@@ -1004,7 +1004,7 @@ private MBeneficiarydetail convertIdentityEditDTOToMBeneficiarydetail(IdentityEd
 		beneficiarydetail.setMaritalStatusId(dto.getMaritalStatusId());
 		beneficiarydetail.setMaritalStatus(dto.getMaritalStatus());
 		beneficiarydetail.setMiddleName(dto.getMiddleName());
-		beneficiarydetail.setOccupation(dto.getOccupation());
+		beneficiarydetail.setOccupation(dto.getOccupationName());
 		beneficiarydetail.setOccupationId(dto.getOccupationId());
 		beneficiarydetail.setPhcId(dto.getPhcId());
 		beneficiarydetail.setPlaceOfWork(dto.getPlaceOfWork());
@@ -1027,6 +1027,8 @@ private MBeneficiarydetail convertIdentityEditDTOToMBeneficiarydetail(IdentityEd
 				MBeneficiarydetail.getAgeAtMarriageCalc(dto.getDob(), dto.getMarriageDate(), dto.getAgeAtMarriage()));
 		beneficiarydetail.setMarriageDate(
 				MBeneficiarydetail.getMarriageDateCalc(dto.getDob(), dto.getMarriageDate(), dto.getAgeAtMarriage()));
+		if(dto.getOtherFields() != null)
+			beneficiarydetail.setOtherFields(dto.getOtherFields());
 
 		return beneficiarydetail;
 	}
@@ -1335,7 +1337,7 @@ private MBeneficiarydetail convertIdentityDTOToMBeneficiarydetail(IdentityDTO dt
 		beneficiarydetail.setMaritalStatusId(dto.getMaritalStatusId());
 		beneficiarydetail.setMaritalStatus(dto.getMaritalStatus());
 		beneficiarydetail.setMiddleName(dto.getMiddleName());
-		beneficiarydetail.setOccupation(dto.getOccupation());
+		beneficiarydetail.setOccupation(dto.getOccupationName());
 		beneficiarydetail.setOccupationId(dto.getOccupationId());
 		beneficiarydetail.setPhcId(dto.getPhcId());
 		beneficiarydetail.setPlaceOfWork(dto.getPlaceOfWork());

diff --git a/src/test/java/com/iemr/common/identity/controller/IdentityControllerTest.java b/src/test/java/com/iemr/common/identity/controller/IdentityControllerTest.java
@@ -142,7 +142,7 @@ private void makeBeneficiariesDTO(BeneficiariesDTO dto) {
 		dto.setModifiedBy(null);
 		dto.setMonthlyFamilyIncome(null);
 		dto.setMotherName(null);
-		dto.setOccupation(null);
+		dto.setOccupationName(null);
 		dto.setOccupationId(null);
 		dto.setPermanentAddress(address);
 		dto.setPreferredEmailId(null);