From d09380bde8fa8eb701810ee4c2131e3df7ad2e04 Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Tue, 11 Jul 2023 21:51:48 +0530 Subject: [PATCH 01/10] mmu cr changes --- .../com/iemr/common/dto/identity/BeneficiariesDTO.java | 1 + .../com/iemr/common/dto/identity/CommonIdentityDTO.java | 1 + .../java/com/iemr/common/dto/identity/IdentityEditDTO.java | 1 + .../iemr/common/mapper/CommonIdentityMapperDecorator.java | 1 + .../iemr/common/mapper/IdentityBenEditMapperDecorator.java | 2 ++ .../model/beneficiary/BeneficiaryDemographicsModel.java | 4 ++++ .../iemr/common/model/beneficiary/BeneficiaryModel.java | 7 +++++++ 7 files changed, 17 insertions(+) diff --git a/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java b/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java index 31ea41f3..02d63161 100644 --- a/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java @@ -74,6 +74,7 @@ public class BeneficiariesDTO { private String incomeStatus; private BigInteger religionId; private String religion; + private String monthlyFamilyIncome; // End Outreach diff --git a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java index b29aa0b4..c9d63448 100644 --- a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java @@ -88,6 +88,7 @@ public class CommonIdentityDTO { private Integer titleId; private String title; private Integer zoneId; + private String monthlyFamilyIncome; // address private Address currentAddress; diff --git a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java index 7b8ee7e8..3522cbba 100644 --- a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java @@ -104,6 +104,7 @@ public class IdentityEditDTO { private String religion; private Integer religionId; private String placeOfWork; + private String monthlyFamilyIncome; // family details private Boolean changeInFamilyDetails = false; diff --git a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java index f9b5737d..b4534e96 100644 --- a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java @@ -185,6 +185,7 @@ public CommonIdentityDTO beneficiaryModelCommonIdentityDTO(BeneficiaryModel bene commonIdentityDTO.setParkingPlaceId(beneficiary.getParkingPlaceID()); commonIdentityDTO.setBeneficiaryConsent(beneficiary.getBeneficiaryConsent()); + commonIdentityDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); // End return commonIdentityDTO; } diff --git a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java index 43ebc4aa..d6f69fe4 100644 --- a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java @@ -238,6 +238,8 @@ public IdentityEditDTO BenToIdentityEditMapper(BeneficiaryModel beneficiary) { identityEditDTO.setVanID(beneficiary.getVanID()); if (beneficiary.getParkingPlaceID() != null) identityEditDTO.setParkingPlaceId(beneficiary.getParkingPlaceID()); + + identityEditDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); return identityEditDTO; } diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java index 7346607e..83450844 100644 --- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java +++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java @@ -33,9 +33,11 @@ import com.iemr.common.model.userbeneficiary.ReligionModel; import com.iemr.common.model.userbeneficiary.StateModel; +import lombok.AllArgsConstructor; import lombok.Data; @Data +@AllArgsConstructor public class BeneficiaryDemographicsModel { @Expose private Long benDemographicsID; @@ -177,6 +179,8 @@ public class BeneficiaryDemographicsModel { private String incomeStatus; @Expose private String religion; + @Expose + private String monthlyFamilyIncome; public BeneficiaryDemographicsModel() { diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java index 809eeaf9..1da661ba 100644 --- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java +++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java @@ -41,9 +41,13 @@ import com.iemr.common.model.userbeneficiary.SexualOrientationModel; import com.iemr.common.model.userbeneficiary.StatusModel; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@NoArgsConstructor +@AllArgsConstructor public class BeneficiaryModel implements Comparable { private static final Integer DAYS_IN_YEAR = 365; private static final Integer DAYS_IN_MONTH = 30; @@ -261,6 +265,9 @@ public class BeneficiaryModel implements Comparable { @Expose private Boolean beneficiaryConsent; + + @Expose + private String monthlyFamilyIncome; public static Timestamp getTimestampData(Timestamp timestamp) { return timestamp; From 51008999e15b8527efcd4674f4ee3ebd52bd3585 Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Fri, 14 Jul 2023 18:09:02 +0530 Subject: [PATCH 02/10] mmu cr changes for registration, quick search and update api --- .../java/com/iemr/common/dto/identity/BenDetailDTO.java | 1 + .../common/mapper/BenCompleteDetailMapperDecorator.java | 3 +++ .../iemr/common/mapper/CommonIdentityMapperDecorator.java | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java b/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java index d27e22ff..ad55f7b3 100644 --- a/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java @@ -75,6 +75,7 @@ public class BenDetailDTO implements Serializable { private Short healthCareWorkerId; private String isHIVPositive; private Integer beneficiaryAge; + private String monthlyFamilyIncome; private Long houseHoldID; private String guideLineID; diff --git a/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java b/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java index af328e07..a9d7f947 100644 --- a/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java @@ -135,6 +135,9 @@ public BeneficiaryDemographicsModel createBenDemographicsModel(BeneficiariesDTO demographicsModel.setIncomeStatusName(benDetails.getIncomeStatus()); demographicsModel.setIncomeStatus(benDetails.getIncomeStatus()); } + if (benDetails.getMonthlyFamilyIncome() != null) { + demographicsModel.setMonthlyFamilyIncome(benDetails.getMonthlyFamilyIncome()); + } demographicsModel.setCreatedBy(createdBy); demographicsModel.setPinCode(address.getPinCode()); demographicsModel.setAddressLine1(address.getAddrLine1()); diff --git a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java index b4534e96..925d2cae 100644 --- a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java @@ -185,7 +185,11 @@ public CommonIdentityDTO beneficiaryModelCommonIdentityDTO(BeneficiaryModel bene commonIdentityDTO.setParkingPlaceId(beneficiary.getParkingPlaceID()); commonIdentityDTO.setBeneficiaryConsent(beneficiary.getBeneficiaryConsent()); - commonIdentityDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); + String monthlyFamilyIncome = beneficiary.getI_bendemographics().getMonthlyFamilyIncome(); + if(monthlyFamilyIncome != null) { + commonIdentityDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); + } + // End return commonIdentityDTO; } From 9501d672dd89e4569f3898833caa91e354d52d23 Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Fri, 14 Jul 2023 19:16:39 +0530 Subject: [PATCH 03/10] changes mmu cr --- .../java/com/iemr/common/dto/identity/CommonIdentityDTO.java | 2 +- .../com/iemr/common/model/beneficiary/BeneficiaryModel.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java index 52d63649..c9d63448 100644 --- a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java @@ -58,7 +58,7 @@ public class CommonIdentityDTO { private Integer ageAtMarriage; private Integer educationId; private String education; - private Boolean emergencyRegistration = false; + private Boolean emergencyRegistration; private Integer healthCareWorkerId; private String healthCareWorker; private String fatherName; diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java index 7fbcb32a..c8ee1dc9 100644 --- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java +++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java @@ -269,8 +269,9 @@ public class BeneficiaryModel implements Comparable { @Expose private String monthlyFamilyIncome; @Expose - private Boolean emergencyRegistration = false; - + private Boolean emergencyRegistration=false; + + public static Timestamp getTimestampData(Timestamp timestamp) { return timestamp; From d989c45ade5df687c3803fc9484cffb6dfb3b6bb Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Fri, 14 Jul 2023 19:50:11 +0530 Subject: [PATCH 04/10] changes mmu cr --- .../java/com/iemr/common/dto/identity/CommonIdentityDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java index c9d63448..52d63649 100644 --- a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java @@ -58,7 +58,7 @@ public class CommonIdentityDTO { private Integer ageAtMarriage; private Integer educationId; private String education; - private Boolean emergencyRegistration; + private Boolean emergencyRegistration = false; private Integer healthCareWorkerId; private String healthCareWorker; private String fatherName; From fee3e6e498ae7ca45c29286563ea1ae1422893b0 Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Fri, 14 Jul 2023 20:03:17 +0530 Subject: [PATCH 05/10] changes mmu cr --- .../com/iemr/common/mapper/CommonIdentityMapperDecorator.java | 3 +-- .../iemr/common/mapper/IdentityBenEditMapperDecorator.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java index 925d2cae..2a1ed05b 100644 --- a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java @@ -185,8 +185,7 @@ public CommonIdentityDTO beneficiaryModelCommonIdentityDTO(BeneficiaryModel bene commonIdentityDTO.setParkingPlaceId(beneficiary.getParkingPlaceID()); commonIdentityDTO.setBeneficiaryConsent(beneficiary.getBeneficiaryConsent()); - String monthlyFamilyIncome = beneficiary.getI_bendemographics().getMonthlyFamilyIncome(); - if(monthlyFamilyIncome != null) { + if(beneficiary.getI_bendemographics() != null && beneficiary.getI_bendemographics().getMonthlyFamilyIncome() != null) { commonIdentityDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); } diff --git a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java index d6f69fe4..010fbb28 100644 --- a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java @@ -238,8 +238,8 @@ public IdentityEditDTO BenToIdentityEditMapper(BeneficiaryModel beneficiary) { identityEditDTO.setVanID(beneficiary.getVanID()); if (beneficiary.getParkingPlaceID() != null) identityEditDTO.setParkingPlaceId(beneficiary.getParkingPlaceID()); - - identityEditDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); + if (beneficiary.getI_bendemographics() != null && beneficiary.getI_bendemographics().getMonthlyFamilyIncome() != null) + identityEditDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); return identityEditDTO; } From 4c1de6aa62c9aa58ac2f16461a18b17015c5deca Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Mon, 17 Jul 2023 21:19:06 +0530 Subject: [PATCH 06/10] changes mmu cr --- .../RegisterBenificiaryServiceImpl.java | 193 ++++++++---------- 1 file changed, 90 insertions(+), 103 deletions(-) diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java index 343dd980..0ca7c518 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java @@ -62,8 +62,7 @@ * */ @Service -public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryService -{ +public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryService { @Autowired CommonIdentityMapper identityMapper; @@ -75,7 +74,7 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic @Autowired Validator validator; - + @Autowired OutboundHistoryRepository outboundHistoryRepository; @@ -113,8 +112,7 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Override - public Beneficiary save(Beneficiary benificiaryDetails) - { + public Beneficiary save(Beneficiary benificiaryDetails) { logger.info("benificiaryDetails: " + benificiaryDetails); // CommonIdentityDTO identityDTO = @@ -150,35 +148,37 @@ public Beneficiary save(Beneficiary benificiaryDetails) } @Async - private void updateBeneficiaryID(String beneficiaryID, Long beneficiaryRegID) - { - try - { + private void updateBeneficiaryID(String beneficiaryID, Long beneficiaryRegID) { + try { // benificiaryRepository.addBeneficiaryID(beneficiaryID, beneficiaryRegID); - } catch (Exception e) - { + } catch (Exception e) { logger.error("updateBeneficiaryID failed with error " + e.getMessage(), e); } } @Async @Override - public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException - { + public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException { Integer updatedRows = 0; // try // { - //// updatedRows = benificiaryRepository.updateDetailsbyID(benificiaryDetails.getTitleId(), + //// updatedRows = + // benificiaryRepository.updateDetailsbyID(benificiaryDetails.getTitleId(), //// benificiaryDetails.getFirstName(), benificiaryDetails.getMiddleName(), //// benificiaryDetails.getLastName(), benificiaryDetails.getStatusID(), //// benificiaryDetails.getGenderID(), benificiaryDetails.getMaritalStatusID(), - //// benificiaryDetails.getdOB(), benificiaryDetails.getFatherName(), benificiaryDetails.getSpouseName(), - //// benificiaryDetails.getGovtIdentityNo(), benificiaryDetails.getGovtIdentityTypeID(), - //// benificiaryDetails.getRegisteredServiceID(), benificiaryDetails.isDeleted(), - //// benificiaryDetails.getBeneficiaryRegID(), benificiaryDetails.getSexualOrientationId(), + //// benificiaryDetails.getdOB(), benificiaryDetails.getFatherName(), + // benificiaryDetails.getSpouseName(), + //// benificiaryDetails.getGovtIdentityNo(), + // benificiaryDetails.getGovtIdentityTypeID(), + //// benificiaryDetails.getRegisteredServiceID(), + // benificiaryDetails.isDeleted(), + //// benificiaryDetails.getBeneficiaryRegID(), + // benificiaryDetails.getSexualOrientationId(), //// benificiaryDetails.getIsHIVPos(), benificiaryDetails.getPlaceOfWork(), - //// benificiaryDetails.getRemarks(), benificiaryDetails.getSourceOfInformation()); + //// benificiaryDetails.getRemarks(), + // benificiaryDetails.getSourceOfInformation()); // if (benificiaryDetails.getI_bendemographics() != null) // { // updatedRows = updateDemographics(benificiaryDetails.getI_bendemographics()); @@ -191,12 +191,15 @@ public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String aut //// logger.debug(benPhoneMap.toString()); //// if (benPhoneMap.getBenPhMapID() != null) //// { - //// benPhoneMapRepository.update(benPhoneMap.getBenPhMapID(), benPhoneMap.getBenificiaryRegID(), + //// benPhoneMapRepository.update(benPhoneMap.getBenPhMapID(), + // benPhoneMap.getBenificiaryRegID(), //// benPhoneMap.getParentBenRegID(), benPhoneMap.getBenRelationshipID(), - //// benPhoneMap.getPhoneNo(), benPhoneMap.getPhoneTypeID(), benPhoneMap.getDeleted()); + //// benPhoneMap.getPhoneNo(), benPhoneMap.getPhoneTypeID(), + // benPhoneMap.getDeleted()); //// } else //// { - //// benPhoneMapRepository.save(new Gson().fromJson(benPhoneMap.toString(), BenPhoneMap.class)); + //// benPhoneMapRepository.save(new Gson().fromJson(benPhoneMap.toString(), + // BenPhoneMap.class)); //// } //// } // } @@ -207,24 +210,22 @@ public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String aut IdentityEditDTO identityEditDTO = identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails); if (benificiaryDetails.getBeneficiaryIdentities() != null - && benificiaryDetails.getBeneficiaryIdentities().size() > 0) - { + && benificiaryDetails.getBeneficiaryIdentities().size() > 0) { identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(), benificiaryDetails.getCreatedBy())); } identityEditDTO.setDob(benificiaryDetails.getDOB()); // String jsoninput=new Gson().toJson(identityEditDTO); - updatedRows = - identityBeneficiaryService.editIdentityEditDTO(identityEditDTO, auth, benificiaryDetails.getIs1097()); + updatedRows = identityBeneficiaryService.editIdentityEditDTO(identityEditDTO, auth, + benificiaryDetails.getIs1097()); // updateBeneficiaryPreferredLanguage(identityEditDTO, auth); - + // updateMCTSRecord(benificiaryDetails); - + return updatedRows; } - private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics) - { + private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics) { int updatedRows = 0; System.out.println(i_BenDemographics); // if @@ -254,8 +255,7 @@ private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics) } @Override - public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception - { + public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception { // logger.info("benificiaryDetails: " + beneficiaryModel); @@ -265,38 +265,38 @@ public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servlet .setBenFamilyDTOs(identityMapper.benPhoneMapListToBenFamilyDTOList(beneficiaryModel.getBenPhoneMaps())); String request = InputMapper.getInstance().gson().toJson(identityDTO).toString(); + if (beneficiaryModel.getIs1097() == null) + beneficiaryModel.setIs1097(false); + String identityResponse = identityBeneficiaryService.getIdentityResponse(request, servletRequest.getHeader("authorization"), beneficiaryModel.getIs1097()); JSONObject responseObj = new JSONObject(identityResponse); BeneficiaryModel beneficiary = new BeneficiaryModel(); - if (responseObj.has("response")) - { + if (responseObj.has("response")) { OutputResponse response = InputMapper.getInstance() .fromJson(responseObj.getJSONObject("response").toString(), OutputResponse.class); - if (response.isSuccess()) - { - BeneficiariesDTO createdBen = - InputMapper.getInstance().fromJson(response.getData(), BeneficiariesDTO.class); + if (response.isSuccess()) { + BeneficiariesDTO createdBen = InputMapper.getInstance().fromJson(response.getData(), + BeneficiariesDTO.class); beneficiaryModel.setBeneficiaryRegID(Long.parseLong(createdBen.getBenRegId().toString())); beneficiaryModel.setBeneficiaryID(createdBen.getBenId().toString()); beneficiary = beneficiaryModel; - } - else - { - return response.toString(); + } else { + return response.toString(); } } return OutputMapper.gsonWithoutExposeRestriction().toJson(beneficiary); } + @Override - public Integer updateCommunityorEducation(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException{ + public Integer updateCommunityorEducation(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException { IdentityEditDTO identityEditDTO = new IdentityEditDTO(); - identityEditDTO.setBeneficiaryRegId(new BigInteger(benificiaryDetails.getBeneficiaryRegID()+"")); - if(benificiaryDetails.getI_bendemographics()!=null){ + identityEditDTO.setBeneficiaryRegId(new BigInteger(benificiaryDetails.getBeneficiaryRegID() + "")); + if (benificiaryDetails.getI_bendemographics() != null) { identityEditDTO.setCommunityId(benificiaryDetails.getI_bendemographics().getCommunityID()); identityEditDTO.setEducationId(benificiaryDetails.getI_bendemographics().getEducationID()); } - + //// identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails); // if (benificiaryDetails.getBeneficiaryIdentities() != null // && benificiaryDetails.getBeneficiaryIdentities().size() > 0) @@ -305,88 +305,75 @@ public Integer updateCommunityorEducation(BeneficiaryModel benificiaryDetails, S // benificiaryDetails.getCreatedBy())); // } // identityEditDTO.setDob(benificiaryDetails.getDOB()); - - Integer updatedRows=0; - updatedRows = - identityBeneficiaryService.editIdentityEditDTOCommunityorEducation(identityEditDTO, auth, benificiaryDetails.getIs1097()); + + Integer updatedRows = 0; + updatedRows = identityBeneficiaryService.editIdentityEditDTOCommunityorEducation(identityEditDTO, auth, + benificiaryDetails.getIs1097()); // updateBeneficiaryPreferredLanguage(identityEditDTO, auth); return updatedRows; } - - private void updateMCTSRecord(BeneficiaryModel beneficiaryModel) - { + private void updateMCTSRecord(BeneficiaryModel beneficiaryModel) { List mctsOutboundCallDetails = new ArrayList(); - + try { - - mctsOutboundCallDetails= outboundHistoryRepository.checkBenExist(beneficiaryModel.getBeneficiaryRegID()); - - MctsOutboundCallDetail callDetail= mctsOutboundCallDetails.get(0); - - if(callDetail !=null && callDetail.getIsMother()!=null) - { - + + mctsOutboundCallDetails = outboundHistoryRepository.checkBenExist(beneficiaryModel.getBeneficiaryRegID()); + + MctsOutboundCallDetail callDetail = mctsOutboundCallDetails.get(0); + + if (callDetail != null && callDetail.getIsMother() != null) { + String firstName = beneficiaryModel.getFirstName(); String lastName = beneficiaryModel.getLastName(); - String name= ""; - if(lastName!=null && !lastName.equalsIgnoreCase("")) - { - name= firstName +" "+ lastName; - } - else - { - name= firstName; + String name = ""; + if (lastName != null && !lastName.equalsIgnoreCase("")) { + name = firstName + " " + lastName; + } else { + name = firstName; } - + Integer age = beneficiaryModel.getAge(); - - String districtName= outboundHistoryRepository.getDistrictName(beneficiaryModel.getI_bendemographics().getDistrictID()); - String talukaName= outboundHistoryRepository.getBlockName(beneficiaryModel.getI_bendemographics().getBlockID()); - String villageName= outboundHistoryRepository.getVillageName(beneficiaryModel.getI_bendemographics().getDistrictBranchID()); - - String gender=null; - if(beneficiaryModel.getGenderID()==1) - { - gender ="Male"; - } - else if(beneficiaryModel.getGenderID()==2) - { - gender ="Female"; - } - else - { - gender="Transgender"; + + String districtName = outboundHistoryRepository + .getDistrictName(beneficiaryModel.getI_bendemographics().getDistrictID()); + String talukaName = outboundHistoryRepository + .getBlockName(beneficiaryModel.getI_bendemographics().getBlockID()); + String villageName = outboundHistoryRepository + .getVillageName(beneficiaryModel.getI_bendemographics().getDistrictBranchID()); + + String gender = null; + if (beneficiaryModel.getGenderID() == 1) { + gender = "Male"; + } else if (beneficiaryModel.getGenderID() == 2) { + gender = "Female"; + } else { + gender = "Transgender"; } - + Timestamp lastModDate = Timestamp.valueOf(LocalDateTime.now()); - if(callDetail.getIsMother()==true) - { - int updateRow= outboundHistoryRepository.updateMotherData(name, age, districtName, talukaName, villageName, - lastModDate, beneficiaryModel.getBeneficiaryRegID()); - } - else - { - int updateRow= outboundHistoryRepository.updateChildData(name, gender, districtName, talukaName, villageName, - lastModDate, beneficiaryModel.getBeneficiaryRegID()); + if (callDetail.getIsMother() == true) { + int updateRow = outboundHistoryRepository.updateMotherData(name, age, districtName, talukaName, + villageName, lastModDate, beneficiaryModel.getBeneficiaryRegID()); + } else { + int updateRow = outboundHistoryRepository.updateChildData(name, gender, districtName, talukaName, + villageName, lastModDate, beneficiaryModel.getBeneficiaryRegID()); } } } catch (Exception e) { } - - + } @Override - public String generateBeneficiaryIDs(String request, HttpServletRequest servletRequest) throws Exception - { + public String generateBeneficiaryIDs(String request, HttpServletRequest servletRequest) throws Exception { logger.info("request: " + request.toString()); List listBen = identityBeneficiaryService.generateBeneficiaryIDs(request, servletRequest.getHeader("authorization")); - + return listBen.toString(); } } From be8ac62faf5307c7a5330b6021de835d8bfe8f48 Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Tue, 18 Jul 2023 14:18:40 +0530 Subject: [PATCH 07/10] password encryption changes- strong algorithm modified --- src/main/java/com/iemr/common/utils/encryption/AESUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/utils/encryption/AESUtil.java b/src/main/java/com/iemr/common/utils/encryption/AESUtil.java index e48f4262..834318a5 100644 --- a/src/main/java/com/iemr/common/utils/encryption/AESUtil.java +++ b/src/main/java/com/iemr/common/utils/encryption/AESUtil.java @@ -53,7 +53,7 @@ public enum DataType { private static final Logger logger = LoggerFactory.getLogger(AESUtil.class); private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; - private static final String SECRET_KEY_ALGORITHM = "PBKDF2WithHmacSHA1"; + private static final String SECRET_KEY_ALGORITHM = "PBKDF2WithHmacSHA512"; private static final String KEY_ALGORITHM = "AES"; private final int IV_SIZE = 128; From 15f81c083ec86cf9a008137b09566538b9384b65 Mon Sep 17 00:00:00 2001 From: indraniBan <133205641+indraniBan@users.noreply.github.com> Date: Tue, 18 Jul 2023 14:28:45 +0530 Subject: [PATCH 08/10] Update sast-and-package.yml --- .github/workflows/sast-and-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml index 7802cd60..b907b2d3 100644 --- a/.github/workflows/sast-and-package.yml +++ b/.github/workflows/sast-and-package.yml @@ -6,6 +6,7 @@ on: env: ENV_VAR: test + jobs: CodeQL: runs-on: ubuntu-latest From 9ac61fe91de7c50a4ef6c7c1247aed76c231007c Mon Sep 17 00:00:00 2001 From: indraniBan <133205641+indraniBan@users.noreply.github.com> Date: Tue, 18 Jul 2023 16:00:47 +0530 Subject: [PATCH 09/10] Update AESUtil.java --- src/main/java/com/iemr/common/utils/encryption/AESUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/iemr/common/utils/encryption/AESUtil.java b/src/main/java/com/iemr/common/utils/encryption/AESUtil.java index 834318a5..83fae986 100644 --- a/src/main/java/com/iemr/common/utils/encryption/AESUtil.java +++ b/src/main/java/com/iemr/common/utils/encryption/AESUtil.java @@ -54,6 +54,7 @@ public enum DataType { private static final Logger logger = LoggerFactory.getLogger(AESUtil.class); private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; private static final String SECRET_KEY_ALGORITHM = "PBKDF2WithHmacSHA512"; + private static final String KEY_ALGORITHM = "AES"; private final int IV_SIZE = 128; From 3f5e71c3f67c3fecb73ccbf12a3b5ddafaa4e84b Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Tue, 18 Jul 2023 18:15:17 +0530 Subject: [PATCH 10/10] register service change --- .../RegisterBenificiaryServiceImpl.java | 193 ++++++++++-------- 1 file changed, 103 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java index 0ca7c518..343dd980 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java @@ -62,7 +62,8 @@ * */ @Service -public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryService { +public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryService +{ @Autowired CommonIdentityMapper identityMapper; @@ -74,7 +75,7 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic @Autowired Validator validator; - + @Autowired OutboundHistoryRepository outboundHistoryRepository; @@ -112,7 +113,8 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Override - public Beneficiary save(Beneficiary benificiaryDetails) { + public Beneficiary save(Beneficiary benificiaryDetails) + { logger.info("benificiaryDetails: " + benificiaryDetails); // CommonIdentityDTO identityDTO = @@ -148,37 +150,35 @@ public Beneficiary save(Beneficiary benificiaryDetails) { } @Async - private void updateBeneficiaryID(String beneficiaryID, Long beneficiaryRegID) { - try { + private void updateBeneficiaryID(String beneficiaryID, Long beneficiaryRegID) + { + try + { // benificiaryRepository.addBeneficiaryID(beneficiaryID, beneficiaryRegID); - } catch (Exception e) { + } catch (Exception e) + { logger.error("updateBeneficiaryID failed with error " + e.getMessage(), e); } } @Async @Override - public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException { + public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException + { Integer updatedRows = 0; // try // { - //// updatedRows = - // benificiaryRepository.updateDetailsbyID(benificiaryDetails.getTitleId(), + //// updatedRows = benificiaryRepository.updateDetailsbyID(benificiaryDetails.getTitleId(), //// benificiaryDetails.getFirstName(), benificiaryDetails.getMiddleName(), //// benificiaryDetails.getLastName(), benificiaryDetails.getStatusID(), //// benificiaryDetails.getGenderID(), benificiaryDetails.getMaritalStatusID(), - //// benificiaryDetails.getdOB(), benificiaryDetails.getFatherName(), - // benificiaryDetails.getSpouseName(), - //// benificiaryDetails.getGovtIdentityNo(), - // benificiaryDetails.getGovtIdentityTypeID(), - //// benificiaryDetails.getRegisteredServiceID(), - // benificiaryDetails.isDeleted(), - //// benificiaryDetails.getBeneficiaryRegID(), - // benificiaryDetails.getSexualOrientationId(), + //// benificiaryDetails.getdOB(), benificiaryDetails.getFatherName(), benificiaryDetails.getSpouseName(), + //// benificiaryDetails.getGovtIdentityNo(), benificiaryDetails.getGovtIdentityTypeID(), + //// benificiaryDetails.getRegisteredServiceID(), benificiaryDetails.isDeleted(), + //// benificiaryDetails.getBeneficiaryRegID(), benificiaryDetails.getSexualOrientationId(), //// benificiaryDetails.getIsHIVPos(), benificiaryDetails.getPlaceOfWork(), - //// benificiaryDetails.getRemarks(), - // benificiaryDetails.getSourceOfInformation()); + //// benificiaryDetails.getRemarks(), benificiaryDetails.getSourceOfInformation()); // if (benificiaryDetails.getI_bendemographics() != null) // { // updatedRows = updateDemographics(benificiaryDetails.getI_bendemographics()); @@ -191,15 +191,12 @@ public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String aut //// logger.debug(benPhoneMap.toString()); //// if (benPhoneMap.getBenPhMapID() != null) //// { - //// benPhoneMapRepository.update(benPhoneMap.getBenPhMapID(), - // benPhoneMap.getBenificiaryRegID(), + //// benPhoneMapRepository.update(benPhoneMap.getBenPhMapID(), benPhoneMap.getBenificiaryRegID(), //// benPhoneMap.getParentBenRegID(), benPhoneMap.getBenRelationshipID(), - //// benPhoneMap.getPhoneNo(), benPhoneMap.getPhoneTypeID(), - // benPhoneMap.getDeleted()); + //// benPhoneMap.getPhoneNo(), benPhoneMap.getPhoneTypeID(), benPhoneMap.getDeleted()); //// } else //// { - //// benPhoneMapRepository.save(new Gson().fromJson(benPhoneMap.toString(), - // BenPhoneMap.class)); + //// benPhoneMapRepository.save(new Gson().fromJson(benPhoneMap.toString(), BenPhoneMap.class)); //// } //// } // } @@ -210,22 +207,24 @@ public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String aut IdentityEditDTO identityEditDTO = identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails); if (benificiaryDetails.getBeneficiaryIdentities() != null - && benificiaryDetails.getBeneficiaryIdentities().size() > 0) { + && benificiaryDetails.getBeneficiaryIdentities().size() > 0) + { identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(), benificiaryDetails.getCreatedBy())); } identityEditDTO.setDob(benificiaryDetails.getDOB()); // String jsoninput=new Gson().toJson(identityEditDTO); - updatedRows = identityBeneficiaryService.editIdentityEditDTO(identityEditDTO, auth, - benificiaryDetails.getIs1097()); + updatedRows = + identityBeneficiaryService.editIdentityEditDTO(identityEditDTO, auth, benificiaryDetails.getIs1097()); // updateBeneficiaryPreferredLanguage(identityEditDTO, auth); - + // updateMCTSRecord(benificiaryDetails); - + return updatedRows; } - private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics) { + private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics) + { int updatedRows = 0; System.out.println(i_BenDemographics); // if @@ -255,7 +254,8 @@ private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics) { } @Override - public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception { + public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception + { // logger.info("benificiaryDetails: " + beneficiaryModel); @@ -265,38 +265,38 @@ public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servlet .setBenFamilyDTOs(identityMapper.benPhoneMapListToBenFamilyDTOList(beneficiaryModel.getBenPhoneMaps())); String request = InputMapper.getInstance().gson().toJson(identityDTO).toString(); - if (beneficiaryModel.getIs1097() == null) - beneficiaryModel.setIs1097(false); - String identityResponse = identityBeneficiaryService.getIdentityResponse(request, servletRequest.getHeader("authorization"), beneficiaryModel.getIs1097()); JSONObject responseObj = new JSONObject(identityResponse); BeneficiaryModel beneficiary = new BeneficiaryModel(); - if (responseObj.has("response")) { + if (responseObj.has("response")) + { OutputResponse response = InputMapper.getInstance() .fromJson(responseObj.getJSONObject("response").toString(), OutputResponse.class); - if (response.isSuccess()) { - BeneficiariesDTO createdBen = InputMapper.getInstance().fromJson(response.getData(), - BeneficiariesDTO.class); + if (response.isSuccess()) + { + BeneficiariesDTO createdBen = + InputMapper.getInstance().fromJson(response.getData(), BeneficiariesDTO.class); beneficiaryModel.setBeneficiaryRegID(Long.parseLong(createdBen.getBenRegId().toString())); beneficiaryModel.setBeneficiaryID(createdBen.getBenId().toString()); beneficiary = beneficiaryModel; - } else { - return response.toString(); + } + else + { + return response.toString(); } } return OutputMapper.gsonWithoutExposeRestriction().toJson(beneficiary); } - @Override - public Integer updateCommunityorEducation(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException { + public Integer updateCommunityorEducation(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException{ IdentityEditDTO identityEditDTO = new IdentityEditDTO(); - identityEditDTO.setBeneficiaryRegId(new BigInteger(benificiaryDetails.getBeneficiaryRegID() + "")); - if (benificiaryDetails.getI_bendemographics() != null) { + identityEditDTO.setBeneficiaryRegId(new BigInteger(benificiaryDetails.getBeneficiaryRegID()+"")); + if(benificiaryDetails.getI_bendemographics()!=null){ identityEditDTO.setCommunityId(benificiaryDetails.getI_bendemographics().getCommunityID()); identityEditDTO.setEducationId(benificiaryDetails.getI_bendemographics().getEducationID()); } - + //// identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails); // if (benificiaryDetails.getBeneficiaryIdentities() != null // && benificiaryDetails.getBeneficiaryIdentities().size() > 0) @@ -305,75 +305,88 @@ public Integer updateCommunityorEducation(BeneficiaryModel benificiaryDetails, S // benificiaryDetails.getCreatedBy())); // } // identityEditDTO.setDob(benificiaryDetails.getDOB()); - - Integer updatedRows = 0; - updatedRows = identityBeneficiaryService.editIdentityEditDTOCommunityorEducation(identityEditDTO, auth, - benificiaryDetails.getIs1097()); + + Integer updatedRows=0; + updatedRows = + identityBeneficiaryService.editIdentityEditDTOCommunityorEducation(identityEditDTO, auth, benificiaryDetails.getIs1097()); // updateBeneficiaryPreferredLanguage(identityEditDTO, auth); return updatedRows; } + - private void updateMCTSRecord(BeneficiaryModel beneficiaryModel) { + private void updateMCTSRecord(BeneficiaryModel beneficiaryModel) + { List mctsOutboundCallDetails = new ArrayList(); - + try { - - mctsOutboundCallDetails = outboundHistoryRepository.checkBenExist(beneficiaryModel.getBeneficiaryRegID()); - - MctsOutboundCallDetail callDetail = mctsOutboundCallDetails.get(0); - - if (callDetail != null && callDetail.getIsMother() != null) { - + + mctsOutboundCallDetails= outboundHistoryRepository.checkBenExist(beneficiaryModel.getBeneficiaryRegID()); + + MctsOutboundCallDetail callDetail= mctsOutboundCallDetails.get(0); + + if(callDetail !=null && callDetail.getIsMother()!=null) + { + String firstName = beneficiaryModel.getFirstName(); String lastName = beneficiaryModel.getLastName(); - String name = ""; - if (lastName != null && !lastName.equalsIgnoreCase("")) { - name = firstName + " " + lastName; - } else { - name = firstName; + String name= ""; + if(lastName!=null && !lastName.equalsIgnoreCase("")) + { + name= firstName +" "+ lastName; } - + else + { + name= firstName; + } + Integer age = beneficiaryModel.getAge(); - - String districtName = outboundHistoryRepository - .getDistrictName(beneficiaryModel.getI_bendemographics().getDistrictID()); - String talukaName = outboundHistoryRepository - .getBlockName(beneficiaryModel.getI_bendemographics().getBlockID()); - String villageName = outboundHistoryRepository - .getVillageName(beneficiaryModel.getI_bendemographics().getDistrictBranchID()); - - String gender = null; - if (beneficiaryModel.getGenderID() == 1) { - gender = "Male"; - } else if (beneficiaryModel.getGenderID() == 2) { - gender = "Female"; - } else { - gender = "Transgender"; + + String districtName= outboundHistoryRepository.getDistrictName(beneficiaryModel.getI_bendemographics().getDistrictID()); + String talukaName= outboundHistoryRepository.getBlockName(beneficiaryModel.getI_bendemographics().getBlockID()); + String villageName= outboundHistoryRepository.getVillageName(beneficiaryModel.getI_bendemographics().getDistrictBranchID()); + + String gender=null; + if(beneficiaryModel.getGenderID()==1) + { + gender ="Male"; } - + else if(beneficiaryModel.getGenderID()==2) + { + gender ="Female"; + } + else + { + gender="Transgender"; + } + Timestamp lastModDate = Timestamp.valueOf(LocalDateTime.now()); - if (callDetail.getIsMother() == true) { - int updateRow = outboundHistoryRepository.updateMotherData(name, age, districtName, talukaName, - villageName, lastModDate, beneficiaryModel.getBeneficiaryRegID()); - } else { - int updateRow = outboundHistoryRepository.updateChildData(name, gender, districtName, talukaName, - villageName, lastModDate, beneficiaryModel.getBeneficiaryRegID()); + if(callDetail.getIsMother()==true) + { + int updateRow= outboundHistoryRepository.updateMotherData(name, age, districtName, talukaName, villageName, + lastModDate, beneficiaryModel.getBeneficiaryRegID()); + } + else + { + int updateRow= outboundHistoryRepository.updateChildData(name, gender, districtName, talukaName, villageName, + lastModDate, beneficiaryModel.getBeneficiaryRegID()); } } } catch (Exception e) { } - + + } @Override - public String generateBeneficiaryIDs(String request, HttpServletRequest servletRequest) throws Exception { + public String generateBeneficiaryIDs(String request, HttpServletRequest servletRequest) throws Exception + { logger.info("request: " + request.toString()); List listBen = identityBeneficiaryService.generateBeneficiaryIDs(request, servletRequest.getHeader("authorization")); - + return listBen.toString(); } }