Skip to content

AES Utils secret key algorithm and padding change #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jul 19, 2023
Merged

AES Utils secret key algorithm and padding change #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d09380b
mmu cr changes
Jul 11, 2023
7b62b08
Merge branch 'PSMRI:develop' into develop
indraniBan Jul 13, 2023
5100899
mmu cr changes for registration, quick search and update api
Jul 14, 2023
2f1846d
merge conflict resolved
Jul 14, 2023
9501d67
changes mmu cr
Jul 14, 2023
d989c45
changes mmu cr
Jul 14, 2023
fee3e6e
changes mmu cr
Jul 14, 2023
799f3d2
Merge branch 'PSMRI:develop' into develop
indraniBan Jul 17, 2023
4c1de6a
changes mmu cr
Jul 17, 2023
e1a5126
Merge branch 'develop' of https://github.com/indraniBan/Common-API in…
Jul 17, 2023
be8ac62
password encryption changes- strong algorithm modified
Jul 18, 2023
15f81c0
Update sast-and-package.yml
indraniBan Jul 18, 2023
9ac61fe
Update AESUtil.java
indraniBan Jul 18, 2023
3f5e71c
register service change
Jul 18, 2023
06617a6
Merge branch 'develop' of https://github.com/indraniBan/Common-API in…
Jul 18, 2023
8751ac1
Merge branch 'develop' of https://github.com/indraniBan/Common-API in…
Jul 18, 2023
9b9e7b2
AES utils
Jul 18, 2023
c7a5516
AES utils
Jul 18, 2023
3feedce
AES utils padding stromg
Jul 18, 2023
c8aa022
registration change
Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
288 changes: 72 additions & 216 deletions src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@
*
*/
@Service
public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryService
{
public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryService {

@Autowired
CommonIdentityMapper identityMapper;
Expand All @@ -75,7 +74,7 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic

@Autowired
Validator validator;

@Autowired
OutboundHistoryRepository outboundHistoryRepository;

Expand All @@ -87,175 +86,54 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic
/**
* Inject IemrUserRegisterRepository
*/
// @Autowired
// public void setBeneficiaryRepository(BeneficiaryRepository
// benificiaryRepository) {
//
// this.benificiaryRepository = benificiaryRepository;
// }

// private BeneficiaryDemographicsRepository beneficiaryDemographicsRepository;

// @Autowired
// public void setBeneficiaryDemographicsRepository(
// BeneficiaryDemographicsRepository beneficiaryDemographicsRepository) {
// this.beneficiaryDemographicsRepository = beneficiaryDemographicsRepository;
// }

// private BenPhoneMapRepository benPhoneMapRepository;

// @Autowired
// public void setBenPhoneMapRepository(BenPhoneMapRepository
// benPhoneMapRepository) {
// this.benPhoneMapRepository = benPhoneMapRepository;
// }

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 =
// identityMapper.BeneficiaryModelCommonIdentityDTO(benificiaryDetails);
// logger.info("identityDTO: "+identityDTO);
// commented below code as beneficiary has been removed from iemr
// Beneficiary savedBenificiaryDetails =
// benificiaryRepository.save(benificiaryDetails);
// if (benificiaryDetails.getI_bendemographics() != null) {
// benificiaryDetails.getI_bendemographics().setCreatedBy(savedBenificiaryDetails.getCreatedBy());
// benificiaryDetails.getI_bendemographics()
// .setBeneficiaryRegID(savedBenificiaryDetails.getBeneficiaryRegID());
// beneficiaryDemographicsRepository.save(benificiaryDetails.getI_bendemographics());
// }
// if (benificiaryDetails.getBenPhoneMaps() != null) {
// for (int idx = 0; idx < benificiaryDetails.getBenPhoneMaps().size(); idx++) {
// benificiaryDetails.getBenPhoneMaps().get(idx)
// .setBenificiaryRegID(savedBenificiaryDetails.getBeneficiaryRegID());
// if (benificiaryDetails.getBenPhoneMaps().get(idx).getParentBenRegID() ==
// null) {
// benificiaryDetails.getBenPhoneMaps().get(idx)
// .setParentBenRegID(savedBenificiaryDetails.getBeneficiaryRegID());
// }
// }
// benPhoneMapRepository.save(benificiaryDetails.getBenPhoneMaps());
// }
// benificiaryRepository.addBeneficiaryID(savedBenificiaryDetails.getBeneficiaryRegID()
// + "",
// savedBenificiaryDetails.getBeneficiaryRegID());
// updateBeneficiaryID(savedBenificiaryDetails.getBeneficiaryRegID() + "",
// savedBenificiaryDetails.getBeneficiaryRegID());

return new Beneficiary(); // savedBenificiaryDetails;
}

@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(),
//// 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.getIsHIVPos(), benificiaryDetails.getPlaceOfWork(),
//// benificiaryDetails.getRemarks(), benificiaryDetails.getSourceOfInformation());
// if (benificiaryDetails.getI_bendemographics() != null)
// {
// updatedRows = updateDemographics(benificiaryDetails.getI_bendemographics());
// }
// if (benificiaryDetails.getBenPhoneMaps() != null)
// {
// List<BenPhoneMapModel> benPhoneMaps = benificiaryDetails.getBenPhoneMaps();
//// for (BenPhoneMap benPhoneMap : benPhoneMaps)
//// {
//// logger.debug(benPhoneMap.toString());
//// if (benPhoneMap.getBenPhMapID() != null)
//// {
//// benPhoneMapRepository.update(benPhoneMap.getBenPhMapID(), benPhoneMap.getBenificiaryRegID(),
//// benPhoneMap.getParentBenRegID(), benPhoneMap.getBenRelationshipID(),
//// benPhoneMap.getPhoneNo(), benPhoneMap.getPhoneTypeID(), benPhoneMap.getDeleted());
//// } else
//// {
//// benPhoneMapRepository.save(new Gson().fromJson(benPhoneMap.toString(), BenPhoneMap.class));
//// }
//// }
// }
// } catch (Exception e)
// {
// logger.error("updateBenificiary failed with error " + e.getMessage(), e);
// }

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());
// updateBeneficiaryPreferredLanguage(identityEditDTO, auth);

// updateMCTSRecord(benificiaryDetails);

updatedRows = identityBeneficiaryService.editIdentityEditDTO(identityEditDTO, auth,
benificiaryDetails.getIs1097());

return updatedRows;
}

private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics)
{
private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics) {
int updatedRows = 0;
System.out.println(i_BenDemographics);
// if
// (beneficiaryDemographicsRepository.getBeneficiaryDemograhics(i_BenDemographics.getBeneficiaryRegID())
// .size() > 0) {
// updatedRows =
// beneficiaryDemographicsRepository.update(i_BenDemographics.getBeneficiaryRegID(),
// i_BenDemographics.getEducationID(), i_BenDemographics.getOccupationID(),
// i_BenDemographics.getIncomeStatusID(), i_BenDemographics.getCommunityID(),
// i_BenDemographics.getPreferredLangID(), i_BenDemographics.getReligionID(),
// i_BenDemographics.getIsPhoto(), i_BenDemographics.getPhotoFilePath(),
// i_BenDemographics.getIsBiometric(), i_BenDemographics.getBiometricFilePath(),
// i_BenDemographics.getAddressLine1(), i_BenDemographics.getAddressLine2(),
// i_BenDemographics.getAddressLine3(), i_BenDemographics.getAddressLine4(),
// i_BenDemographics.getAddressLine5(), i_BenDemographics.getCityID(),
// i_BenDemographics.getStateID(),
// i_BenDemographics.getCountryID(), i_BenDemographics.getPinCode(),
// i_BenDemographics.getIsAddPresent(), i_BenDemographics.getIsAddPermanent(),
// i_BenDemographics.getDeleted(), i_BenDemographics.getDistrictBranchID(),
// i_BenDemographics.getBlockID(), i_BenDemographics.getDistrictID());
// } else {
// i_BenDemographics.setCreatedBy("updateProcess");
// beneficiaryDemographicsRepository.save(i_BenDemographics);
// updatedRows++;
// }

return updatedRows;
}

@Override
public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception
{
public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception {

// logger.info("benificiaryDetails: " + beneficiaryModel);

Expand All @@ -265,128 +143,106 @@ 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)
// {
// identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(),
// 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<MctsOutboundCallDetail> mctsOutboundCallDetails = new ArrayList<MctsOutboundCallDetail>();

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;
String name = "";
if (lastName != null && !lastName.equalsIgnoreCase("")) {
name = firstName + " " + lastName;
} else {
name = firstName;
}
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<BeneficiaryGenModel> listBen = identityBeneficiaryService.generateBeneficiaryIDs(request,
servletRequest.getHeader("authorization"));

return listBen.toString();
}
}
Loading