From 356b7b78a9d7ebb5989e2ea9e29e43334d3e6f1b Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Wed, 12 Mar 2025 12:10:38 +0530 Subject: [PATCH 1/2] AMM-1204 --- .../service/associate/CallClosureImpl.java | 45 +++++++++++-------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/iemr/ecd/service/associate/CallClosureImpl.java b/src/main/java/com/iemr/ecd/service/associate/CallClosureImpl.java index c203378..41f3e5c 100644 --- a/src/main/java/com/iemr/ecd/service/associate/CallClosureImpl.java +++ b/src/main/java/com/iemr/ecd/service/associate/CallClosureImpl.java @@ -22,10 +22,12 @@ package com.iemr.ecd.service.associate; import java.sql.Timestamp; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Calendar; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -401,8 +403,10 @@ private String createEcdCallRecordsInOutboundCalls(CallClosureDTO request, continue; Timestamp callEndDate = null; - if (callStartDate == null) - callStartDate = motherRecord.getLmpDate(); + if (callStartDate == null) { + callStartDate = getCallDateStartFormat(motherRecord.getLmpDate()); + } + callStartDate = getCallDateStartFormat(callStartDate); outboundCalls.setCallDateFrom(callStartDate); if (callConfiguration.getConfigTerms() != null @@ -411,8 +415,7 @@ private String createEcdCallRecordsInOutboundCalls(CallClosureDTO request, Calendar cal = Calendar.getInstance(); cal.setTime(motherRecord.getLmpDate()); cal.add(Calendar.DAY_OF_WEEK, callConfiguration.getTermRange()); - - callEndDate = new Timestamp(cal.getTime().getTime()); + callEndDate = getCallDateEndFormat(new Timestamp(cal.getTime().getTime())); } else if (callConfiguration.getConfigTerms() != null && callConfiguration.getConfigTerms().equalsIgnoreCase("months")) { @@ -420,8 +423,7 @@ private String createEcdCallRecordsInOutboundCalls(CallClosureDTO request, Calendar cal = Calendar.getInstance(); cal.setTime(motherRecord.getLmpDate()); cal.add(Calendar.DAY_OF_WEEK, callConfiguration.getTermRange() * 30); - - callEndDate = new Timestamp(cal.getTime().getTime()); + callEndDate = getCallDateEndFormat(new Timestamp(cal.getTime().getTime())); } if (callEndDate != null) @@ -430,7 +432,7 @@ private String createEcdCallRecordsInOutboundCalls(CallClosureDTO request, Calendar cal = Calendar.getInstance(); cal.setTime(callEndDate); cal.add(Calendar.DAY_OF_WEEK, 1); - callStartDate = new Timestamp(cal.getTime().getTime()); + callStartDate = getCallDateStartFormat(new Timestamp(cal.getTime().getTime())); } else if (childRecord != null && childRecord.getDob() != null) { if (callConfiguration.getBaseLine().equalsIgnoreCase("LMP")) @@ -438,8 +440,10 @@ private String createEcdCallRecordsInOutboundCalls(CallClosureDTO request, Timestamp callEndDate = null; - if (callStartDate == null) + if (callStartDate == null) { callStartDate = childRecord.getDob(); + callStartDate = getCallDateStartFormat(callStartDate); + } outboundCalls.setCallDateFrom(callStartDate); if (callConfiguration.getConfigTerms() != null @@ -448,8 +452,7 @@ private String createEcdCallRecordsInOutboundCalls(CallClosureDTO request, Calendar cal = Calendar.getInstance(); cal.setTime(childRecord.getDob()); cal.add(Calendar.DAY_OF_WEEK, callConfiguration.getTermRange()); - - callEndDate = new Timestamp(cal.getTime().getTime()); + callEndDate = getCallDateEndFormat(new Timestamp(cal.getTime().getTime())); } else if (callConfiguration.getConfigTerms() != null && callConfiguration.getConfigTerms().equalsIgnoreCase("months")) { @@ -457,8 +460,7 @@ private String createEcdCallRecordsInOutboundCalls(CallClosureDTO request, Calendar cal = Calendar.getInstance(); cal.setTime(childRecord.getDob()); cal.add(Calendar.DAY_OF_WEEK, callConfiguration.getTermRange() * 30); - - callEndDate = new Timestamp(cal.getTime().getTime()); + callEndDate = getCallDateEndFormat(new Timestamp(cal.getTime().getTime())); } if (callEndDate != null) @@ -467,11 +469,9 @@ private String createEcdCallRecordsInOutboundCalls(CallClosureDTO request, Calendar cal = Calendar.getInstance(); cal.setTime(callEndDate); cal.add(Calendar.DAY_OF_WEEK, 1); - callStartDate = new Timestamp(cal.getTime().getTime()); + callStartDate = getCallDateStartFormat(new Timestamp(cal.getTime().getTime())); } - outboundCalls.setPhoneNumberType(phoneNoType); - // from request if (request.getBeneficiaryRegId() != null) outboundCalls.setBeneficiaryRegId(request.getBeneficiaryRegId()); @@ -501,15 +501,24 @@ private String createEcdCallRecordsInOutboundCalls(CallClosureDTO request, outboundCallsList.add(outboundCalls); } outboundCallsRepo.saveAll(outboundCallsList); - } - } - return "created"; } catch (Exception e) { throw new ECDException(e); } } + private Timestamp getCallDateEndFormat(Timestamp callEndDate) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd 23:59:59"); + String time = format.format(callEndDate); + return Timestamp.valueOf(time); + } + + private Timestamp getCallDateStartFormat(Timestamp callStartDate) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd 00:00:00"); + String time = format.format(callStartDate); + return Timestamp.valueOf(time); + } + } From 724763bf724d8e84d44cc1b8d757fc6e5392741b Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Mon, 7 Apr 2025 14:41:36 +0530 Subject: [PATCH 2/2] AMM-1340 --- src/main/resources/application.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4108e06..eb51598 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -50,3 +50,5 @@ spring.redis.port=6379 iemr.session.expiry.time.sec=7200 +spring.main.allow-bean-definition-overriding=true +spring.main.allow-circular-references=true \ No newline at end of file