Skip to content

Commit 8dd19e1

Browse files
vanitha1822vanitha1822
committed
fix: fetch from .env (#369)
1 parent c0fe9c6 commit 8dd19e1

1 file changed

Lines changed: 46 additions & 21 deletions

File tree

‎src/main/java/com/iemr/common/service/cti/CTIServiceImpl.java‎

Lines changed: 46 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;
2828
import org.springframework.beans.factory.annotation.Autowired;
29+
import org.springframework.beans.factory.annotation.Value;
2930
import org.springframework.scheduling.annotation.Async;
3031
import org.springframework.stereotype.Service;
3132

@@ -95,6 +96,9 @@ public class CTIServiceImpl implements CTIService {
9596
@Autowired
9697
private CTIService ctiService;
9798

99+
@Value("${cti-server-ip}")
100+
private String serverURL;
101+
98102
@Autowired
99103
private IEMRCalltypeRepositoryImplCustom iemrCalltypeRepositoryImplCustom;
100104

@@ -116,7 +120,8 @@ public OutputResponse addUpdateAgentSkills(String request, String ipAddress) thr
116120
ObjectMapper objectMapper = new ObjectMapper();
117121
logger.debug("addUpdateAgentSkills input is " + request);
118122
String ctiURI = ConfigProperties.getPropertyByName("add-update-agent-skills-URL");
119-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
123+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
124+
120125
AgentSkills agentSkills = objectMapper.readValue(request, AgentSkills.class);
121126

122127
String agentID = (agentSkills.getAgentID() != null) ? agentSkills.getAgentID() : "";
@@ -148,7 +153,8 @@ public OutputResponse getCampaignSkills(String request, String ipAddress) throws
148153
OutputResponse output = new OutputResponse();
149154
ObjectMapper objectMapper = new ObjectMapper();
150155
String ctiURI = ConfigProperties.getPropertyByName("get-campaign-skills-URL");
151-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
156+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
157+
152158
CampaignSkills agentState = objectMapper.readValue(request, CampaignSkills.class);
153159
ctiURI = ctiURI.replace("CTI_SERVER", serverURL);
154160
ctiURI = ctiURI.replace("CAMPAIGN_NAME",
@@ -175,7 +181,8 @@ public OutputResponse getAgentState(String request, String ipAddress) throws IEM
175181
OutputResponse output = new OutputResponse();
176182
ObjectMapper objectMapper = new ObjectMapper();
177183
String ctiURI = ConfigProperties.getPropertyByName("get-agent-status-URL");
178-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
184+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
185+
179186
AgentState agentState = objectMapper.readValue(request, AgentState.class);
180187

181188
String agentID = (agentState.getAgent_id() != null) ? agentState.getAgent_id() : "";
@@ -205,7 +212,8 @@ public OutputResponse getAgentCallStats(String request, String ipAddress) throws
205212
OutputResponse output = new OutputResponse();
206213
ObjectMapper objectMapper = new ObjectMapper();
207214
String ctiURI = ConfigProperties.getPropertyByName("get-agent-call-stats-URL");
208-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
215+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
216+
209217
AgentCallStats agentState = objectMapper.readValue(request, AgentCallStats.class);
210218

211219
String agentID = (agentState.getAgentID() != null) ? agentState.getAgentID() : "";
@@ -237,7 +245,8 @@ public OutputResponse getCampaignNames(String request, String ipAddress) throws
237245
OutputResponse output = new OutputResponse();
238246
ObjectMapper objectMapper = new ObjectMapper();
239247
String ctiURI = ConfigProperties.getPropertyByName("get-campaign-name-URL");
240-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
248+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
249+
241250
CampaignNames agentState = objectMapper.readValue(request, CampaignNames.class);
242251
ctiURI = ctiURI.replace("CTI_SERVER", serverURL);
243252
ctiURI = ctiURI.replace("SEARCH_KEY", (agentState.getServiceName() != null) ? agentState.getServiceName() : "");
@@ -264,7 +273,8 @@ public OutputResponse doAgentLogin(String request, String ipAddress) throws IEMR
264273
OutputResponse output = new OutputResponse();
265274
ObjectMapper objectMapper = new ObjectMapper();
266275
String ctiURI = ConfigProperties.getPropertyByName("do-agent-login-URL");
267-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
276+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
277+
268278
AgentState agentState = objectMapper.readValue(request, AgentState.class);
269279

270280
String agentID = (agentState.getAgent_id() != null) ? agentState.getAgent_id() : "";
@@ -294,7 +304,8 @@ public OutputResponse getLoginKey(String request, String ipAddress) throws IEMRE
294304
OutputResponse output = new OutputResponse();
295305
ObjectMapper objectMapper = new ObjectMapper();
296306
String ctiURI = ConfigProperties.getPropertyByName("get-login-key-URL");
297-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
307+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
308+
298309
AgentLoginKey agentState = objectMapper.readValue(request, AgentLoginKey.class);
299310

300311
String decryptPassword = null;
@@ -327,7 +338,8 @@ public OutputResponse agentLogout(String request, String ipAddress) throws IEMRE
327338
OutputResponse output = new OutputResponse();
328339
ObjectMapper objectMapper = new ObjectMapper();
329340
String ctiURI = ConfigProperties.getPropertyByName("do-agent-logout-URL");
330-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
341+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
342+
331343
AgentState agentState = objectMapper.readValue(request, AgentState.class);
332344

333345
String agentID = (agentState.getAgent_id() != null) ? agentState.getAgent_id() : "";
@@ -359,7 +371,8 @@ public OutputResponse getOnlineAgents(String request, String ipAddress) throws I
359371
OutputResponse output = new OutputResponse();
360372
ObjectMapper objectMapper = new ObjectMapper();
361373
String ctiURI = ConfigProperties.getPropertyByName("do-online-agent-URL");
362-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
374+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
375+
363376
AgentState agentState = objectMapper.readValue(request, AgentState.class);
364377

365378
String agentID = (agentState.getAgent_id() != null) ? agentState.getAgent_id() : "";
@@ -390,7 +403,8 @@ public OutputResponse callBeneficiary(String request, String ipAddress) throws I
390403
OutputResponse output = new OutputResponse();
391404
ObjectMapper objectMapper = new ObjectMapper();
392405
String ctiURI = ConfigProperties.getPropertyByName("call-beneficiary-URL");
393-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
406+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
407+
394408
CallBeneficiary agentState = objectMapper.readValue(request, CallBeneficiary.class);
395409

396410
String agentID = (agentState.getAgent_id() != null) ? agentState.getAgent_id() : "";
@@ -431,7 +445,8 @@ public OutputResponse addUpdateUserData(String request, String ipAddress) throws
431445
* SESSION_TIMEOUT&designation=DESIGNATION&resFormat=3
432446
*/
433447

434-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
448+
// String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
449+
435450
CTIUser ctiUser = objectMapper.readValue(request, CTIUser.class);
436451
ctiURI = ctiURI.replace("CTI_SERVER", serverURL);
437452
ctiURI = ctiURI.replace("USERNAME", (ctiUser.getUsername() != null) ? ctiUser.getUsername() : "");
@@ -463,7 +478,8 @@ public OutputResponse getTransferCampaigns(String request, String ipAddress) thr
463478
OutputResponse output = new OutputResponse();
464479
ObjectMapper objectMapper = new ObjectMapper();
465480
String ctiURI = ConfigProperties.getPropertyByName("fetch-transferrable-campaigns-URL");
466-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
481+
// String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
482+
467483
CTICampaigns agentState = objectMapper.readValue(request, CTICampaigns.class);
468484

469485
String agentID = (agentState.getAgent_id() != null) ? agentState.getAgent_id() : "";
@@ -495,7 +511,8 @@ public OutputResponse getCampaignRoles(String request, String remoteAddr) throws
495511
OutputResponse output = new OutputResponse();
496512
ObjectMapper objectMapper = new ObjectMapper();
497513
String ctiURI = ConfigProperties.getPropertyByName("get-campaign-roles-URL");
498-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
514+
// String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
515+
499516
CampaignRole campaign = objectMapper.readValue(request, CampaignRole.class);
500517
ctiURI = ctiURI.replace("CTI_SERVER", serverURL);
501518
ctiURI = ctiURI.replace("CAMPAIGN_NAME", (campaign.getCampaign() != null) ? campaign.getCampaign() : "");
@@ -527,7 +544,8 @@ public OutputResponse setCallDisposition(String request, String remoteAddr) thro
527544
String agentIP = !agentIPResp.equals(DEFAULT_IP) ? agentIPResp : remoteAddr;
528545

529546
String ctiURI = ConfigProperties.getPropertyByName("update-call-disposition-URL");
530-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
547+
// String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
548+
531549
ctiURI = ctiURI.replace("CTI_SERVER", serverURL);
532550
ctiURI = ctiURI.replace("AGENT_ID", agentID);
533551
ctiURI = ctiURI.replace("AGENT_IP", agentIP);
@@ -555,7 +573,8 @@ public OutputResponse createVoiceFile(String request, String remoteAddr) throws
555573
ObjectMapper objectMapper = new ObjectMapper();
556574
CTIVoiceFile disposition = objectMapper.readValue(request, CTIVoiceFile.class);
557575
String ctiURI = ConfigProperties.getPropertyByName("mix-voice-file-URL");
558-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
576+
// String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
577+
559578
ctiURI = ctiURI.replace("CTI_SERVER", serverURL);
560579
ctiURI = ctiURI.replace("AGENT_ID", (disposition.getAgent_id() != null) ? disposition.getAgent_id() : "");
561580
// ctiURI = ctiURI.replace("AGENT_IP", remoteAddr);
@@ -580,7 +599,8 @@ public OutputResponse getVoiceFile(String request, String remoteAddr) throws IEM
580599
ObjectMapper objectMapper = new ObjectMapper();
581600
CTIVoiceFile disposition = objectMapper.readValue(request, CTIVoiceFile.class);
582601
String ctiURI = ConfigProperties.getPropertyByName("get-voice-file-URL");
583-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
602+
// String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
603+
584604
ctiURI = ctiURI.replace("CTI_SERVER", serverURL);
585605
ctiURI = ctiURI.replace("AGENT_ID", (disposition.getAgent_id() != null) ? disposition.getAgent_id() : "");
586606
// ctiURI = ctiURI.replace("AGENT_IP", remoteAddr);
@@ -606,7 +626,8 @@ public OutputResponse getVoiceFileNew(String request, String remoteAddr) throws
606626
OutputResponse output = new OutputResponse();
607627
CTIVoiceFile disposition = InputMapper.gson().fromJson(request, CTIVoiceFile.class);
608628
String ctiURI = ConfigProperties.getPropertyByName("get-voice-file-URL-New");
609-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
629+
// String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
630+
610631
ctiURI = ctiURI.replace("CTI_SERVER", serverURL);
611632
ctiURI = ctiURI.replace("AGENT_ID", (disposition.getAgent_id() != null) ? disposition.getAgent_id() : "");
612633
// ctiURI = ctiURI.replace("AGENT_IP", remoteAddr);
@@ -975,7 +996,8 @@ public OutputResponse addAutoDialNumbers(String request, String ipAddress) throw
975996
OutputResponse result = new OutputResponse();
976997
logger.debug("addUpdateAgentSkills input is " + request);
977998
String ctiURI = ConfigProperties.getPropertyByName("add-auto-dail-numbers-URL");
978-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
999+
// String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
1000+
9791001
ObjectMapper objectMapper = new ObjectMapper();
9801002
AutoPreviewDial[] autoPreviewDialArray = objectMapper.readValue(request, AutoPreviewDial[].class);
9811003

@@ -1016,7 +1038,8 @@ public OutputResponse setAutoDialNumbers(String request, String ipAddress) throw
10161038
OutputResponse result = new OutputResponse();
10171039
logger.debug("setAutoDialNumbers input is " + request);
10181040
String ctiURI = ConfigProperties.getPropertyByName("set-auto-dail-numbers-URL");
1019-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
1041+
// String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
1042+
10201043
ObjectMapper objectMapper = new ObjectMapper();
10211044
AutoPreviewDial autoPreviewDial = objectMapper.readValue(request, AutoPreviewDial.class);
10221045

@@ -1059,7 +1082,8 @@ public OutputResponse getIVRSPathDetails(String request, String remoteAddress) t
10591082
OutputResponse result = new OutputResponse();
10601083
logger.debug("getZoneDetails input is " + request);
10611084
String ctiURI = ConfigProperties.getPropertyByName("agent-ivrs-path-URL");
1062-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
1085+
// String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
1086+
10631087
ObjectMapper objectMapper = new ObjectMapper();
10641088
AgentState zoneData = objectMapper.readValue(request, AgentState.class);
10651089

@@ -1095,7 +1119,8 @@ public OutputResponse getDispositionCount(String request, String ipAddress) thro
10951119
OutputResponse output = new OutputResponse();
10961120
ObjectMapper objectMapper = new ObjectMapper();
10971121
String ctiURI = ConfigProperties.getPropertyByName("get-disposition-count-URL");
1098-
String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
1122+
// // String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
1123+
10991124
DispositionCountRequest dispositionRequest = objectMapper.readValue(request, DispositionCountRequest.class);
11001125

11011126
ctiURI = ctiURI.replace("CTI_SERVER", serverURL);

0 commit comments

Comments
 (0)