Skip to content

Commit 95399d5

Browse files
authored
Update the response format for video link (#238)
* (fix):Add ? to the url and value to fetch values from env * Change the variable to store the url * (fix):Json parsing for response
1 parent 139c933 commit 95399d5

3 files changed

Lines changed: 23 additions & 16 deletions

File tree

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,13 @@ public String sendSMS(
207207
}
208208
logger.debug("sendSMS sending response " + response);
209209
logger.info("sendSMS sending response");
210-
return response.toString();
210+
String respStr = response.toString();
211+
respStr = respStr.replace("\\u003d", "=")
212+
.replace("\\u003c", "<")
213+
.replace("\\u003e", ">")
214+
.replace("\\u0026", "&");
215+
return respStr;
216+
211217
}
212218

213219
}

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,15 @@ public String getSMSTemplates(SMSRequest smsRequest) throws Exception {
194194

195195
@Override
196196
public String updateSMSTemplate(UpdateSMSRequest smsRequest) throws Exception {
197-
SMSTemplate smsTemplate = null;
198-
SMSTemplate request = smsMapper.updateRequestToSMSTemplate(smsRequest);
199-
int updateCount = smsTemplateRepository.updateSMSTemplate(request.getSmsTemplateID(), request.getDeleted());
200-
if (updateCount > 0) {
201-
smsTemplate = smsTemplateRepository.findBySmsTemplateID(request.getSmsTemplateID());
202-
} else {
203-
throw new Exception("Failed to update the result");
204-
}
205-
return OutputMapper.gsonWithoutExposeRestriction().toJson(smsMapper.smsTemplateToResponse(smsTemplate));
197+
SMSTemplate smsTemplate = null;
198+
SMSTemplate request = smsMapper.updateRequestToSMSTemplate(smsRequest);
199+
int updateCount = smsTemplateRepository.updateSMSTemplate(request.getSmsTemplateID(), request.getDeleted());
200+
if (updateCount > 0) {
201+
smsTemplate = smsTemplateRepository.findBySmsTemplateID(request.getSmsTemplateID());
202+
} else {
203+
throw new Exception("Failed to update the result");
204+
}
205+
return OutputMapper.gsonWithoutExposeRestriction().toJson(smsMapper.smsTemplateToResponse(smsTemplate));
206206
}
207207

208208
@Override
@@ -347,18 +347,17 @@ public SMSNotification prepareVideoCallSMS(SMSRequest request, VideoCallParamete
347347
sms.setPhoneNo(request.getFacilityPhoneNo());
348348
}
349349
}
350-
351350
sms.setSms(smsToSend);
352-
return smsNotification.save(sms);
351+
return smsNotification.save(sms);
353352
}
354353

355354

356355
public String getVideoCallData(String methodName, VideoCallParameters videoCall) throws Exception {
357356
String variableValue = "";
358357
switch (methodName.toLowerCase()) {
359358
case "videoconsultationlink":
360-
variableValue = videoCall.getMeetingLink() != null ? videoCall.getMeetingLink() : "";
361-
break;
359+
variableValue = videoCall.getMeetingLink() != null ? videoCall.getMeetingLink() : "";
360+
break;
362361
case "consultationdate":
363362
if (videoCall.getDateOfCall() != null) {
364363
SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -377,7 +376,6 @@ public String getVideoCallData(String methodName, VideoCallParameters videoCall)
377376
variableValue = result != null ? result.toString() : "";
378377
break;
379378
}
380-
381379
return variableValue.trim();
382380
}
383381

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ public String sendMeetingLink(VideoCallRequest request) throws Exception {
7575
response.setResponse(responseData.toJson());
7676

7777
return OutputMapper.gsonWithoutExposeRestriction()
78-
.toJson(response);
78+
.toJson(response) .replace("\\u003d", "=")
79+
.replace("\\u003c", "<")
80+
.replace("\\u003e", ">")
81+
.replace("\\u0026", "&");
7982
}
8083

8184
@Override

0 commit comments

Comments
 (0)