Merge branch 'develop' into jwt-api

PSMRI · Dec 24, 2024 · 12cbd71 · 12cbd71
2 parents a6327a4 + abee571
commit 12cbd71
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 7 deletions.
diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
@@ -70,3 +70,6 @@ spring.redis.host=localhost
 jwt.secret=@env.JWT_SECRET_KEY@
 
 
+#ELK logging file name
+logging.file.name=@env.TM_API_LOGGING_FILE_NAME@
+
diff --git 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
@@ -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
@@ -34,7 +34,7 @@
 @Repository
 
 public interface DistrictMasterRepo extends CrudRepository<Districts, Integer> {
-	@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<Object[]> 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
@@ -33,6 +33,6 @@
 @Repository
 
 public interface StateMasterRepo extends CrudRepository<States, Integer> {
-	@Query(" SELECT stateID, stateName FROM States WHERE deleted != true ")
+	@Query(" SELECT stateID, stateName,govtLGDStateID FROM States WHERE deleted != true ")
 	public ArrayList<Object[]> 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
@@ -177,7 +177,8 @@ public String getDistrictList(Integer stateID) {
 		ArrayList<Object[]> 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<Object[]> 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);
 			}
 		}

diff --git 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) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -70,3 +70,6 @@ spring.redis.host=localhost
		jwt.secret=@env.JWT_SECRET_KEY@


		#ELK logging file name
		logging.file.name=@env.TM_API_LOGGING_FILE_NAME@