Merge pull request #36 from PSMRI/develop

latest pull

Author: srishtigrp78

src/main/environment/common_ci.properties

@@ -54,10 +54,14 @@ start-email-scheduler=true
 cron-scheduler-email=0 0/1 * * * ? *
 
 ###cti data check with call detail report Scheduler
-#Runs at everyday 12:10AM 
-start-ctidatacheck-scheduler=true
-cron-scheduler-ctidatacheck=0 10 00 * * *
-
+start-ctidatacheck-scheduler=@env.START_CTIDATACHECK_SCHEDULER@
+cron-scheduler-ctidatacheck=0 00 02 * * *
+##-------------------------------###cti data sync Scheduler configurations------------------------------------------------------
+start-ctidatasync-scheduler=@env.START_CTIDATASYNC_SCHEDULER@
+cron-scheduler-ctidatasync=0 30 01 * * ? *
+##-----------------------------------------------#NHM data dashboard schedular----------------------------------------------------------------
+start-nhmdashboard-scheduler=@env.START_NHMDASHBOARD_SCHEDULER@
+cron-scheduler-nhmdashboard=0 30 0 * * ? *
 ### generate Beneficiary Config
 genben-api= @env.BEN_GEN_API_URL@
 
@@ -170,7 +174,7 @@ springdoc.swagger-ui.enabled=false
 isProduction=@env.IS_PRODUCTION@
 grievanceAllocationRetryConfiguration=3
 
-start-grievancedatasync-scheduler=true
+start-grievancedatasync-scheduler=@env.START_GRIEVANCEDATASYNC_SCHEDULER@
 cron-scheduler-grievancedatasync=0 0/2 * * * ?
 
 captcha.secret-key=@env.CAPTCHA_SECRET_KEY@

src/main/environment/common_docker.properties

@@ -55,9 +55,14 @@ cron-scheduler-email=0 0/1 * * * ? *
 
 ###cti data check with call detail report Scheduler
 #Runs at everyday 12:10AM 
-start-ctidatacheck-scheduler=true
-cron-scheduler-ctidatacheck=0 10 00 * * *
-
+start-ctidatacheck-scheduler=${START_CTIDATACHECK_SCHEDULER}
+cron-scheduler-ctidatacheck=0 00 02 * * *
+##-------------------------------###cti data sync Scheduler configurations------------------------------------------------------
+start-ctidatasync-scheduler=${START_CTIDATASYNC_SCHEDULER}
+cron-scheduler-ctidatasync=0 30 01 * * ? *
+##-----------------------------------------------#NHM data dashboard schedular----------------------------------------------------------------
+start-nhmdashboard-scheduler=${START_NHMDASHBOARD_SCHEDULER}
+cron-scheduler-nhmdashboard=0 30 0 * * ? *
 ### generate Beneficiary Config
 genben-api= ${BEN_GEN_API_URL}
 
@@ -171,7 +176,7 @@ springdoc.swagger-ui.enabled=false
 isProduction=${IS_PRODUCTION}
 grievanceAllocationRetryConfiguration=3
 
-start-grievancedatasync-scheduler=false
+start-grievancedatasync-scheduler=${START_GRIEVANCEDATASYNC_SCHEDULER}
 cron-scheduler-grievancedatasync=0 0/2 * * * ?
 
 captcha.secret-key=${CAPTCHA_SECRET_KEY}

src/main/environment/common_example.properties

@@ -64,13 +64,13 @@ cron-scheduler-email=0 0/1 * * * ? *
 ##-------------------------------###cti data sync Scheduler configurations------------------------------------------------------
 
 start-ctidatasync-scheduler=false
-cron-scheduler-ctidatasync=0 0 2 */2 * ?
+cron-scheduler-ctidatasync=0 30 01 * * ? *
 
 ##-------------------------------###cti data check with call detail report Scheduler------------------------------------------------------
 
 #Runs at everyday 12:10AM 
-start-ctidatacheck-scheduler=true
-cron-scheduler-ctidatacheck=0 10 00 * * *
+start-ctidatacheck-scheduler=false
+cron-scheduler-ctidatacheck=0 00 02 * * *
 
 ##---------------------------------#### Registration schedular for Avni------------------------------------------------------------------------------
 
@@ -198,7 +198,7 @@ grievanceAllocationRetryConfiguration=3
 logging.path=logs/
 logging.file.name=logs/common-api.log
 
-video-call-url=https://vc.piramalswasthya.org/
+video-call-url=https://vc.piramalswasthya.org/?
 jibri.output.path=/srv/jibri/recordings
 video.recording.path=/srv/recordings
 

src/main/java/com/iemr/common/controller/sms/SMSController.java

@@ -207,7 +207,13 @@ public String sendSMS(
 		}
 		logger.debug("sendSMS sending response " + response);
 		logger.info("sendSMS sending response");
-		return response.toString();
+		String respStr = response.toString();
+		respStr = respStr.replace("\\u003d", "=")
+                 .replace("\\u003c", "<")
+                 .replace("\\u003e", ">")
+                 .replace("\\u0026", "&");
+		return respStr;
+
 	}
 
 }

src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java

@@ -194,15 +194,15 @@ public String getSMSTemplates(SMSRequest smsRequest) throws Exception {
 
 	@Override
 	public String updateSMSTemplate(UpdateSMSRequest smsRequest) throws Exception {
-		SMSTemplate smsTemplate = null;
-		SMSTemplate request = smsMapper.updateRequestToSMSTemplate(smsRequest);
-		int updateCount = smsTemplateRepository.updateSMSTemplate(request.getSmsTemplateID(), request.getDeleted());
-		if (updateCount > 0) {
-			smsTemplate = smsTemplateRepository.findBySmsTemplateID(request.getSmsTemplateID());
-		} else {
-			throw new Exception("Failed to update the result");
-		}
-		return OutputMapper.gsonWithoutExposeRestriction().toJson(smsMapper.smsTemplateToResponse(smsTemplate));
+    	SMSTemplate smsTemplate = null;
+    	SMSTemplate request = smsMapper.updateRequestToSMSTemplate(smsRequest);
+    	int updateCount = smsTemplateRepository.updateSMSTemplate(request.getSmsTemplateID(), request.getDeleted());
+    	if (updateCount > 0) {
+      	  smsTemplate = smsTemplateRepository.findBySmsTemplateID(request.getSmsTemplateID());
+    	} else {
+        throw new Exception("Failed to update the result");
+    	}
+    	return OutputMapper.gsonWithoutExposeRestriction().toJson(smsMapper.smsTemplateToResponse(smsTemplate));
 	}
 
 	@Override
@@ -347,18 +347,17 @@ public SMSNotification prepareVideoCallSMS(SMSRequest request, VideoCallParamete
             sms.setPhoneNo(request.getFacilityPhoneNo());
         }
     }
-
     sms.setSms(smsToSend);
-    return smsNotification.save(sms);  
+	return smsNotification.save(sms);  
 }
 
 
 	public String getVideoCallData(String methodName, VideoCallParameters videoCall) throws Exception {
 	    String variableValue = "";
 	    switch (methodName.toLowerCase()) {
 	        case "videoconsultationlink":
-	            variableValue = videoCall.getMeetingLink() != null ? videoCall.getMeetingLink() : "";
-	            break;
+				variableValue = videoCall.getMeetingLink() != null ? videoCall.getMeetingLink() : "";
+				break;
 	        case "consultationdate":
 				if (videoCall.getDateOfCall() != null) {
         			SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -377,7 +376,6 @@ public String getVideoCallData(String methodName, VideoCallParameters videoCall)
 	            variableValue = result != null ? result.toString() : "";
 	            break;
 	    }
-
 	    return variableValue.trim();
 	}
 

src/main/java/com/iemr/common/service/videocall/VideoCallServiceImpl.java

@@ -33,20 +33,23 @@ public class VideoCallServiceImpl implements VideoCallService {
 	@Autowired
     private VideoCallMapper videoCallMapper;
 
-    @Value("${video-call-url}")
     private String meetingLink;
 
     private boolean isLinkSent = false;
     private String consultationStatus = "Not Initiated";
+
+    @Value("${video-call-url}")
     private String jitsiLink;
+
     public VideoCallServiceImpl() {
         // this.jitsiLink = ConfigProperties.getPropertyByName("video-call-url");
         // logger.info("Jitsi Link fetched: " + this.jitsiLink);
     }
 
     @Override
     public String generateMeetingLink() {
-        meetingLink=jitsiLink+RandomStringUtils.randomAlphanumeric(8);
+        logger.info("Jitsi Link: " + jitsiLink);
+        meetingLink=jitsiLink+"m="+RandomStringUtils.randomAlphanumeric(8);
         logger.info("Meeting link: " + meetingLink);
         return meetingLink;
     }
@@ -72,7 +75,10 @@ public String sendMeetingLink(VideoCallRequest request) throws Exception {
     response.setResponse(responseData.toJson());
 
     return OutputMapper.gsonWithoutExposeRestriction()
-        .toJson(response);
+        .toJson(response) .replace("\\u003d", "=")
+    .replace("\\u003c", "<")
+    .replace("\\u003e", ">")
+    .replace("\\u0026", "&");
     }
 
 @Override