From 1b6d989e152e7c0fa6a4d48641f6f66baf0a205e Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Wed, 28 May 2025 18:31:39 +0530 Subject: [PATCH 1/5] Jwttoken add in header --- .../iemr/admin/utils/RestTemplateUtil.java | 23 +++++++++++++++++++ .../com/iemr/admin/utils/http/HttpUtils.java | 8 +++++++ 2 files changed, 31 insertions(+) diff --git a/src/main/java/com/iemr/admin/utils/RestTemplateUtil.java b/src/main/java/com/iemr/admin/utils/RestTemplateUtil.java index 820ca4b..65ce277 100644 --- a/src/main/java/com/iemr/admin/utils/RestTemplateUtil.java +++ b/src/main/java/com/iemr/admin/utils/RestTemplateUtil.java @@ -49,4 +49,27 @@ public static HttpEntity createRequestEntity(Object body, String authori return new HttpEntity<>(body, headers); } + public static void getJwttokenFromHeaders(HttpHeaders headers) { + ServletRequestAttributes servletRequestAttributes = ((ServletRequestAttributes) RequestContextHolder + .getRequestAttributes()); + + HttpServletRequest requestHeader = servletRequestAttributes.getRequest(); + String jwtTokenFromCookie = null; + try { + jwtTokenFromCookie = CookieUtil.getJwtTokenFromCookie(requestHeader); + + } catch (Exception e) { + logger.error("Error while getting jwtToken from Cookie" + e.getMessage()); + } + if (null != UserAgentContext.getUserAgent()) { + headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent()); + } + if (null != jwtTokenFromCookie) { + headers.add(Constants.JWT_TOKEN, jwtTokenFromCookie); + } else if (null != requestHeader.getHeader(Constants.JWT_TOKEN)) { + headers.add(Constants.JWT_TOKEN, requestHeader.getHeader(Constants.JWT_TOKEN)); + } + + } + } \ No newline at end of file diff --git a/src/main/java/com/iemr/admin/utils/http/HttpUtils.java b/src/main/java/com/iemr/admin/utils/http/HttpUtils.java index 818b441..849843a 100644 --- a/src/main/java/com/iemr/admin/utils/http/HttpUtils.java +++ b/src/main/java/com/iemr/admin/utils/http/HttpUtils.java @@ -37,6 +37,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; +import com.iemr.admin.utils.RestTemplateUtil; import com.sun.jersey.multipart.FormDataBodyPart; import com.sun.jersey.multipart.FormDataMultiPart; @@ -76,6 +77,7 @@ public HttpUtils() { public String get(String uri) { String body; + RestTemplateUtil.getJwttokenFromHeaders(headers); HttpEntity requestEntity = new HttpEntity("", headers); ResponseEntity responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class); setStatus((HttpStatus) responseEntity.getStatusCode()); @@ -98,6 +100,7 @@ public String get(String uri, HashMap header) { } else { headers.add("Content-Type", MediaType.APPLICATION_JSON); } + RestTemplateUtil.getJwttokenFromHeaders(headers); HttpEntity requestEntity = new HttpEntity("", headers); ResponseEntity responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class); setStatus((HttpStatus) responseEntity.getStatusCode()); @@ -107,6 +110,7 @@ public String get(String uri, HashMap header) { public String post(String uri, String json) { String body; + RestTemplateUtil.getJwttokenFromHeaders(headers); HttpEntity requestEntity = new HttpEntity(json, headers); ResponseEntity responseEntity = rest.exchange(uri, HttpMethod.POST, requestEntity, String.class); setStatus((HttpStatus) responseEntity.getStatusCode()); @@ -126,6 +130,7 @@ public String post(String uri, String data, HashMap header) { if (header.containsKey("X-APIkey-Header")) { headers.add("X-APIkey-Header", header.get("X-APIkey-Header").toString()); } + RestTemplateUtil.getJwttokenFromHeaders(headers); // headers.add("Content-Type", MediaType.APPLICATION_JSON); ResponseEntity responseEntity = new ResponseEntity(HttpStatus.BAD_REQUEST); HttpEntity requestEntity; @@ -137,6 +142,7 @@ public String post(String uri, String data, HashMap header) { } public String put(String uri, String json) { String body; + RestTemplateUtil.getJwttokenFromHeaders(headers); HttpEntity requestEntity = new HttpEntity(json, headers); ResponseEntity responseEntity = rest.exchange(uri, HttpMethod.PUT, requestEntity, String.class); setStatus((HttpStatus) responseEntity.getStatusCode()); @@ -159,6 +165,7 @@ public String put(String uri, String data, HashMap header) { // headers.add("Content-Type", MediaType.APPLICATION_JSON); ResponseEntity responseEntity = new ResponseEntity(HttpStatus.BAD_REQUEST); HttpEntity requestEntity; + RestTemplateUtil.getJwttokenFromHeaders(headers); requestEntity = new HttpEntity(data, headers); responseEntity = rest.exchange(uri, HttpMethod.PUT, requestEntity, String.class); setStatus((HttpStatus) responseEntity.getStatusCode()); @@ -188,6 +195,7 @@ public String uploadFile(String uri, String data, HashMap header multiPart.bodyPart(filePart); multiPart.field("docPath", data); headers.add("Content-Type", MediaType.APPLICATION_JSON); + RestTemplateUtil.getJwttokenFromHeaders(headers); requestEntity = new HttpEntity(multiPart, headers);// new // HttpEntity(multiPart, // headers); From b115e60c6755f9dd29576101261a95950bb39773 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Wed, 28 May 2025 18:59:38 +0530 Subject: [PATCH 2/5] Code rabbit comments addressed --- .../iemr/admin/utils/RestTemplateUtil.java | 34 ++++++++++--------- .../com/iemr/admin/utils/http/HttpUtils.java | 6 ++-- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/iemr/admin/utils/RestTemplateUtil.java b/src/main/java/com/iemr/admin/utils/RestTemplateUtil.java index 65ce277..e116057 100644 --- a/src/main/java/com/iemr/admin/utils/RestTemplateUtil.java +++ b/src/main/java/com/iemr/admin/utils/RestTemplateUtil.java @@ -25,14 +25,9 @@ public static HttpEntity createRequestEntity(Object body, String authori return new HttpEntity<>(body, headers); } HttpServletRequest requestHeader = servletRequestAttributes.getRequest(); - String jwtTokenFromCookie = null; - try { - jwtTokenFromCookie = CookieUtil.getJwtTokenFromCookie(requestHeader); - - } catch (Exception e) { - logger.error("Error while getting jwtToken from Cookie" + e.getMessage() ); - } - + + String jwtTokenFromCookie = extractJwttoken(requestHeader); + MultiValueMap headers = new LinkedMultiValueMap<>(); headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8"); if(null != UserAgentContext.getUserAgent()) { @@ -49,23 +44,30 @@ public static HttpEntity createRequestEntity(Object body, String authori return new HttpEntity<>(body, headers); } - public static void getJwttokenFromHeaders(HttpHeaders headers) { - ServletRequestAttributes servletRequestAttributes = ((ServletRequestAttributes) RequestContextHolder - .getRequestAttributes()); - - HttpServletRequest requestHeader = servletRequestAttributes.getRequest(); + private static String extractJwttoken(HttpServletRequest requestHeader) { String jwtTokenFromCookie = null; try { jwtTokenFromCookie = CookieUtil.getJwtTokenFromCookie(requestHeader); - + } catch (Exception e) { - logger.error("Error while getting jwtToken from Cookie" + e.getMessage()); + logger.error("Error while getting jwtToken from Cookie" + e.getMessage() ); } + return jwtTokenFromCookie; + } + + public static void getJwttokenFromHeaders(HttpHeaders headers) { + ServletRequestAttributes servletRequestAttributes = ((ServletRequestAttributes) RequestContextHolder + .getRequestAttributes()); + if(servletRequestAttributes == null) { + return; + } + HttpServletRequest requestHeader = servletRequestAttributes.getRequest(); + String jwtTokenFromCookie = extractJwttoken(requestHeader); if (null != UserAgentContext.getUserAgent()) { headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent()); } if (null != jwtTokenFromCookie) { - headers.add(Constants.JWT_TOKEN, jwtTokenFromCookie); + headers.add(HttpHeaders.COOKIE, Constants.JWT_TOKEN+"="+jwtTokenFromCookie); } else if (null != requestHeader.getHeader(Constants.JWT_TOKEN)) { headers.add(Constants.JWT_TOKEN, requestHeader.getHeader(Constants.JWT_TOKEN)); } diff --git a/src/main/java/com/iemr/admin/utils/http/HttpUtils.java b/src/main/java/com/iemr/admin/utils/http/HttpUtils.java index 849843a..25d3d08 100644 --- a/src/main/java/com/iemr/admin/utils/http/HttpUtils.java +++ b/src/main/java/com/iemr/admin/utils/http/HttpUtils.java @@ -77,8 +77,10 @@ public HttpUtils() { public String get(String uri) { String body; - RestTemplateUtil.getJwttokenFromHeaders(headers); - HttpEntity requestEntity = new HttpEntity("", headers); + HttpHeaders localheaders = new HttpHeaders(); + localheaders.add("Content-Type", "application/json"); + RestTemplateUtil.getJwttokenFromHeaders(localheaders); + HttpEntity requestEntity = new HttpEntity("", localheaders); ResponseEntity responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class); setStatus((HttpStatus) responseEntity.getStatusCode()); // if (status == HttpStatus.OK){ From 04b53dd531e6f23504a0e9e52dd687398c57f600 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Mon, 16 Jun 2025 18:33:20 +0530 Subject: [PATCH 3/5] teleconsultation added --- .../employeemaster/EmployeeMasterController.java | 8 ++++---- .../employeemaster/M_UserServiceRoleMapping2.java | 4 ++-- .../data/employeemaster/V_Userservicerolemapping.java | 9 +++++++-- .../employeemaster/EmployeeMasterServiceImpl.java | 9 ++++----- .../admin/to/employeemaster/Priveleges1097_2.java | 11 ++++++----- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java index 701d68c..0e46fcc 100644 --- a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java +++ b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java @@ -1845,8 +1845,8 @@ public String UserRoleMappings(@RequestBody String userRoleMapping, HttpServletR resDataMap1.setRoleID(previl1.getRoleID()); resDataMap1.setInbound(previl1.getInbound()); resDataMap1.setOutbound(previl1.getOutbound()); - if(previl1.getIsSanjeevani() != null) { - resDataMap1.setIsSanjeevani(previl1.getIsSanjeevani()); + if(previl1.getTeleConsultation() != null) { + resDataMap1.setTeleConsultation(previl1.getTeleConsultation()); } } resDataMap1.setUserID(employeeMaster.get(x).getUserID()); @@ -1905,8 +1905,8 @@ public String updateUserRoleMapping(@RequestBody String updateUserRoleMapping, H usrRole.setVillageID(pre.getVillageID()); usrRole.setVillageName(pre.getVillageName()); - if(pre.getIsSanjeevani() != null) { - usrRole.setIsSanjeevani(pre.getIsSanjeevani()); + if (pre.getTeleConsultation() != null) { + usrRole.setTeleConsultation(pre.getTeleConsultation()); } if (pre.getInbound() != null) { diff --git a/src/main/java/com/iemr/admin/data/employeemaster/M_UserServiceRoleMapping2.java b/src/main/java/com/iemr/admin/data/employeemaster/M_UserServiceRoleMapping2.java index d2afbdb..23c115e 100644 --- a/src/main/java/com/iemr/admin/data/employeemaster/M_UserServiceRoleMapping2.java +++ b/src/main/java/com/iemr/admin/data/employeemaster/M_UserServiceRoleMapping2.java @@ -107,8 +107,8 @@ public class M_UserServiceRoleMapping2 { private Boolean deleted=false; @Expose - @Column(name = "isSanjeevani") - private Boolean isSanjeevani; + @Column(name = "teleConsultation") + private String teleConsultation; @Expose @Column(name = "CreatedBy") diff --git a/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java b/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java index 1738dce..666c348 100644 --- a/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java +++ b/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java @@ -147,9 +147,14 @@ public class V_Userservicerolemapping { @Transient private String[] villageName; + /* + * @Expose + * + * @Column(name="isSanjeevani") private Boolean isSanjeevani; + */ @Expose - @Column(name="isSanjeevani") - private Boolean isSanjeevani; + @Column(name="teleConsultation") + private String teleConsultation; public Integer getProviderServiceMapID() { return providerServiceMapID; diff --git a/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java b/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java index 23e9680..19032d6 100644 --- a/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java +++ b/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java @@ -992,13 +992,12 @@ public ArrayList getMappedRole(Integer serviceProvider } else { mapping.setVillageName(new String[0]); } - if (mapping.getServiceID()!=null) { + if (mapping.getServiceID() != null) { mapping.setBlockID(mapping.getBlockID()); mapping.setBlockName(mapping.getBlockName()); mapping.setVillageID(mapping.getVillageID()); mapping.setVillageName(mapping.getVillageName()); - if(null != mapping.getIsSanjeevani()) - mapping.setIsSanjeevani(mapping.getIsSanjeevani()); + } else { mapping.setBlockID(null); mapping.setBlockName(null); @@ -1006,9 +1005,9 @@ public ArrayList getMappedRole(Integer serviceProvider mapping.setVillageName(null); mapping.setVillageidDb(null); mapping.setVillageNameDb(null); - mapping.setIsSanjeevani(false); - } + if(null != mapping.getTeleConsultation()) + mapping.setTeleConsultation(mapping.getTeleConsultation()); mappedRoles.add(mapping); } } diff --git a/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java b/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java index 1205fde..c1b5b71 100644 --- a/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java +++ b/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java @@ -26,7 +26,8 @@ public class Priveleges1097_2 { private Integer roleID; private Boolean inbound; private Boolean outbound; - private Boolean isSanjeevani; + //private Boolean isSanjeevani; + private String teleConsultation; public Integer getRoleID() { return roleID; @@ -46,11 +47,11 @@ public Boolean getOutbound() { public void setOutbound(Boolean outbound) { this.outbound = outbound; } - public Boolean getIsSanjeevani() { - return isSanjeevani; + public String getTeleConsultation() { + return teleConsultation; } - public void setIsSanjeevani(Boolean isSanjeevani) { - this.isSanjeevani = isSanjeevani; + public void setTeleConsultation(String teleConsultation) { + this.teleConsultation = teleConsultation; } From f40ce749388374dcad274303a97ae0e43ac6df45 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Tue, 17 Jun 2025 11:49:11 +0530 Subject: [PATCH 4/5] Coderabbit comments updated --- .../admin/data/employeemaster/V_Userservicerolemapping.java | 5 ----- .../com/iemr/admin/to/employeemaster/Priveleges1097_2.java | 1 - 2 files changed, 6 deletions(-) diff --git a/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java b/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java index 666c348..7b4b266 100644 --- a/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java +++ b/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java @@ -147,11 +147,6 @@ public class V_Userservicerolemapping { @Transient private String[] villageName; - /* - * @Expose - * - * @Column(name="isSanjeevani") private Boolean isSanjeevani; - */ @Expose @Column(name="teleConsultation") private String teleConsultation; diff --git a/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java b/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java index c1b5b71..b1ec127 100644 --- a/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java +++ b/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java @@ -26,7 +26,6 @@ public class Priveleges1097_2 { private Integer roleID; private Boolean inbound; private Boolean outbound; - //private Boolean isSanjeevani; private String teleConsultation; public Integer getRoleID() { From 64cc5b58a3a0cd8cf7af6a91ba7cdae93ef4f4cf Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Tue, 17 Jun 2025 14:52:27 +0530 Subject: [PATCH 5/5] indent format corrected --- .../controller/employeemaster/EmployeeMasterController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java index 0e46fcc..09b7ab4 100644 --- a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java +++ b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java @@ -1845,10 +1845,10 @@ public String UserRoleMappings(@RequestBody String userRoleMapping, HttpServletR resDataMap1.setRoleID(previl1.getRoleID()); resDataMap1.setInbound(previl1.getInbound()); resDataMap1.setOutbound(previl1.getOutbound()); - if(previl1.getTeleConsultation() != null) { - resDataMap1.setTeleConsultation(previl1.getTeleConsultation()); - } + if (previl1.getTeleConsultation() != null) { + resDataMap1.setTeleConsultation(previl1.getTeleConsultation()); } + } resDataMap1.setUserID(employeeMaster.get(x).getUserID()); resDataMap1.setProviderServiceMapID(previl.getProviderServiceMapID()); resDataMap1.setWorkingLocationID(previl.getWorkingLocationID());