From 0facca42d32fc757f4f8cf3cdd62fd0237bed693 Mon Sep 17 00:00:00 2001 From: Ivor D'Souza Date: Mon, 2 Dec 2024 11:59:52 +0000 Subject: [PATCH 1/3] feat(elk-stack-setup): add logging.file.name ci env --- src/main/environment/common_ci.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index bb5665c..21c1dea 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -68,5 +68,5 @@ tcSpeclistWL=7 ### Redis IP spring.redis.host=localhost - - +#ELK logging file name +logging.file.name=@env.TM_API_LOGGING_FILE_NAME@ \ No newline at end of file From 6bc880886efe6100001c25a40987921f99814a7b Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Mon, 16 Dec 2024 16:39:14 +0530 Subject: [PATCH 2/3] GovtStateID,DistrictID changes --- .../java/com/iemr/tm/data/location/Districts.java | 13 +++++++++++++ src/main/java/com/iemr/tm/data/location/States.java | 11 ++++++++++- .../iemr/tm/repo/location/DistrictMasterRepo.java | 2 +- .../com/iemr/tm/repo/location/StateMasterRepo.java | 2 +- .../tm/service/location/LocationServiceImpl.java | 5 +++-- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/iemr/tm/data/location/Districts.java b/src/main/java/com/iemr/tm/data/location/Districts.java index 472b7d6..002a8e1 100644 --- a/src/main/java/com/iemr/tm/data/location/Districts.java +++ b/src/main/java/com/iemr/tm/data/location/Districts.java @@ -86,6 +86,13 @@ public Integer getStateID() { public void setStateID(Integer stateID) { this.stateID = stateID; } + @Column(name = "GovtStateID") + @Expose + private Integer govtLGDStateID; + + @Column(name = "GovtDistrictID") + @Expose + private Integer govtLGDDistrictID; public Boolean getDeleted() { return deleted; @@ -133,6 +140,12 @@ public Districts(Integer DistrictID, String DistrictName, Integer stateId, Strin this.districtID = DistrictID; this.districtName = DistrictName; } + public Districts(Integer districtID, String districtName, Integer govtLGDStateID, Integer govtLGDDistrictID) { + this.districtID = districtID; + this.districtName = districtName; + this.govtLGDStateID = govtLGDStateID; + this.govtLGDDistrictID = govtLGDDistrictID; + } public int getDistrictID() { return this.districtID.intValue(); diff --git a/src/main/java/com/iemr/tm/data/location/States.java b/src/main/java/com/iemr/tm/data/location/States.java index b4b2464..845ce95 100644 --- a/src/main/java/com/iemr/tm/data/location/States.java +++ b/src/main/java/com/iemr/tm/data/location/States.java @@ -43,6 +43,10 @@ public class States { @Column(name = "StateID") @Expose private Integer stateID; + + @Column(name = "GovtStateID") + @Expose + private Integer govtLGDStateID; @Column(name = "StateName") @Expose @@ -155,5 +159,10 @@ public String getStateName() { public void setStateName(String stateName) { this.stateName = stateName; } - + + public States(int StateID, String StateName, Integer govtLGDStateID) { + this.stateID = StateID; + this.stateName = StateName; + this.govtLGDStateID = govtLGDStateID; + } } diff --git a/src/main/java/com/iemr/tm/repo/location/DistrictMasterRepo.java b/src/main/java/com/iemr/tm/repo/location/DistrictMasterRepo.java index 3dfb371..6993e6a 100644 --- a/src/main/java/com/iemr/tm/repo/location/DistrictMasterRepo.java +++ b/src/main/java/com/iemr/tm/repo/location/DistrictMasterRepo.java @@ -34,7 +34,7 @@ @Repository public interface DistrictMasterRepo extends CrudRepository { - @Query(" SELECT d.districtID, d.districtName FROM Districts d " + " WHERE d.stateID = :stateID AND d.deleted != true ") + @Query(" SELECT d.districtID, d.districtName,d.govtLGDStateID,d.govtLGDDistrictID FROM Districts d " + " WHERE d.stateID = :stateID AND d.deleted != true ") public ArrayList getDistrictMaster(@Param("stateID") Integer stateID); } diff --git a/src/main/java/com/iemr/tm/repo/location/StateMasterRepo.java b/src/main/java/com/iemr/tm/repo/location/StateMasterRepo.java index 50a5b88..8a72ee4 100644 --- a/src/main/java/com/iemr/tm/repo/location/StateMasterRepo.java +++ b/src/main/java/com/iemr/tm/repo/location/StateMasterRepo.java @@ -33,6 +33,6 @@ @Repository public interface StateMasterRepo extends CrudRepository { - @Query(" SELECT stateID, stateName FROM States WHERE deleted != true ") + @Query(" SELECT stateID, stateName,govtLGDStateID FROM States WHERE deleted != true ") public ArrayList getStateMaster(); } diff --git a/src/main/java/com/iemr/tm/service/location/LocationServiceImpl.java b/src/main/java/com/iemr/tm/service/location/LocationServiceImpl.java index 395b02c..954e4b5 100644 --- a/src/main/java/com/iemr/tm/service/location/LocationServiceImpl.java +++ b/src/main/java/com/iemr/tm/service/location/LocationServiceImpl.java @@ -177,7 +177,8 @@ public String getDistrictList(Integer stateID) { ArrayList districtMasterList = districtMasterRepo.getDistrictMaster(stateID); if (districtMasterList != null && districtMasterList.size() > 0) { for (Object[] objArr : districtMasterList) { - Districts districtMaster = new Districts((Integer) objArr[0], (String) objArr[1]); + Districts districtMaster = new Districts((Integer) objArr[0], (String) objArr[1], (Integer) objArr[2], + (Integer) objArr[3]); districtList.add(districtMaster); } } @@ -237,7 +238,7 @@ public String getLocDetailsNew(Integer vanID, Integer spPSMID) { ArrayList stateMasterList = stateMasterRepo.getStateMaster(); if (stateMasterList != null && stateMasterList.size() > 0) { for (Object[] objArr : stateMasterList) { - States states = new States((Integer) objArr[0], (String) objArr[1]); + States states = new States((Integer) objArr[0], (String) objArr[1], (Integer) objArr[2]); stateList.add(states); } } From 7126972cef04b3e6be5580d73a50e11ccdeace40 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Mon, 16 Dec 2024 16:50:29 +0530 Subject: [PATCH 3/3] Http changes --- .../iemr/tm/utils/http/HTTPRequestInterceptor.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/tm/utils/http/HTTPRequestInterceptor.java b/src/main/java/com/iemr/tm/utils/http/HTTPRequestInterceptor.java index 6120f95..79fa6c8 100644 --- a/src/main/java/com/iemr/tm/utils/http/HTTPRequestInterceptor.java +++ b/src/main/java/com/iemr/tm/utils/http/HTTPRequestInterceptor.java @@ -33,15 +33,19 @@ import com.iemr.tm.utils.redis.RedisStorage; import com.iemr.tm.utils.response.OutputResponse; import com.iemr.tm.utils.sessionobject.SessionObject; +import com.iemr.tm.utils.validator.Validator; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @Component public class HTTPRequestInterceptor implements HandlerInterceptor { - + private Validator validator; Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - + @Autowired + public void setValidator(Validator validator) { + this.validator = validator; + } private SessionObject sessionObject; @Autowired @@ -86,6 +90,11 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons status = false; break; default: + String remoteAddress = request.getHeader("X-FORWARDED-FOR"); + if (remoteAddress == null || remoteAddress.trim().length() == 0) { + remoteAddress = request.getRemoteAddr(); + } + validator.checkKeyExists(authorization, remoteAddress); break; } } catch (Exception e) {