Release 3.8.2 to main

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.iemr.common-API</groupId>
 	<artifactId>common-api</artifactId>
-	<version>3.8.1</version>
+	<version>3.8.2</version>
 	<packaging>war</packaging>
 
 	<name>Common-API</name>

src/main/environment/common_docker.properties

@@ -218,4 +218,4 @@ otp.ratelimit.enabled=${OTP_RATELIMIT_ENABLED}
 otp.ratelimit.minute-limit=${OTP_RATELIMIT_MINUTE_LIMIT}
 otp.ratelimit.hour-limit=${OTP_RATELIMIT_HOUR_LIMIT}
 otp.ratelimit.day-limit=${OTP_RATELIMIT_DAY_LIMIT}
-generateBeneficiaryIDs-api-url={GEN_BENEFICIARY_IDS_API_URL}
+generateBeneficiaryIDs-api-url=${GEN_BENEFICIARY_IDS_API_URL}

src/main/java/com/iemr/common/controller/connect/ConnectController.java

@@ -0,0 +1,57 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology
+* Integrated EHR (Electronic Health Records) Solution
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute"
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.controller.connect;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iemr.common.utils.NetworkUtil;
+
+import io.swagger.v3.oas.annotations.Operation;
+
+/**
+ * Exposes the server's LAN address so a mobile device on the same wifi
+ * network can connect to this API.
+ */
+@RestController
+@RequestMapping(value = "/public/connect")
+public class ConnectController {
+
+	@Value("${server.port:8080}")
+	private int serverPort;
+
+	@Operation(summary = "Get the server's LAN IP address and port")
+	@GetMapping(value = "/info", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> getConnectInfo() {
+		Map<String, Object> response = new LinkedHashMap<>();
+		response.put("ip", NetworkUtil.getLanIPAddress());
+		response.put("port", serverPort);
+		return ResponseEntity.ok(response);
+	}
+}

src/main/java/com/iemr/common/controller/users/IEMRAdminController.java

@@ -82,6 +82,7 @@
 	private static final String USER_ID_FIELD = "userId";
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 	private InputMapper inputMapper = new InputMapper();
+	private static final Set<String> CONCURRENT_SESSION_EXEMPT_ROLES = Set.of("provideradmin", "superadmin");
 
 //	@Value("${captcha.enable-captcha}")
 	private boolean enableCaptcha =false;
@@ -172,7 +173,17 @@
 			}
 
 			String decryptPassword = aesUtil.decrypt("Piramal12Piramal", m_User.getPassword());
-			List<User> mUser = iemrAdminUserServiceImpl.userAuthenticate(m_User.getUserName(), decryptPassword);
+
+
+			List<User> mUser = iemrAdminUserServiceImpl
+					.userAuthenticate(m_User.getUserName(), decryptPassword);
+
+
+			User loggedInUser = mUser.get(0);
+
+			loggedInUser.setFailedAttempt(0);
+
+			iemrAdminUserServiceImpl.save(loggedInUser);
 			JSONObject resMap = new JSONObject();
 			JSONObject serviceRoleMultiMap = new JSONObject();
 			JSONObject serviceRoleMap = new JSONObject();
@@ -181,11 +192,22 @@
 			if (m_User.getUserName() != null
 					    && (m_User.getDoLogout() == null || !m_User.getDoLogout())
 					    && (m_User.getWithCredentials() != null && m_User.getWithCredentials())) {
-				String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser(
-						m_User.getUserName().trim().toLowerCase());
-				if (tokenFromRedis != null) {
-					throw new IEMRException(
-							"You are already logged in,please confirm to logout from other device and login again");
+				String userRole = "";
+				if (mUser.size() == 1 && mUser.get(0).getM_UserServiceRoleMapping() != null) {
+					for (UserServiceRoleMapping usrm : mUser.get(0).getM_UserServiceRoleMapping()) {
+						if (usrm.getM_Role() != null && usrm.getM_Role().getRoleName() != null) {
+							userRole = usrm.getM_Role().getRoleName();
+							break;
+						}
+					}
+				}
+				if (!CONCURRENT_SESSION_EXEMPT_ROLES.contains(userRole.trim().toLowerCase())) {
+					String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser(
+							m_User.getUserName().trim().toLowerCase());
+					if (tokenFromRedis != null) {
+						throw new IEMRException(
+								"You are already logged in,please confirm to logout from other device and login again");
+					}
 				}
 			} else if (m_User.getUserName() != null && m_User.getDoLogout() != null && m_User.getDoLogout() == true) {
 				deleteSessionObject(m_User.getUserName().trim().toLowerCase());
@@ -254,7 +276,6 @@
 			// Facility data for ALL users - common pattern, empty if not applicable
 			try {
 				if (mUser.size() == 1) {
-					User loggedInUser = mUser.get(0);
 					String userRoleName = "";
 					if (loggedInUser.getM_UserServiceRoleMapping() != null) {
 						for (UserServiceRoleMapping usrm : loggedInUser.getM_UserServiceRoleMapping()) {
@@ -413,16 +434,28 @@
 						deleteSessionObjectByGettingSessionDetails(previousTokenFromRedis);
 						sessionObject.deleteSessionObject(previousTokenFromRedis);
 
-						// Denylist the active JWT so System 1's requests are immediately rejected
-						String usernameKey = mUsers.get(0).getUserName().trim().toLowerCase();
-						String jtiData = stringRedisTemplate.opsForValue().get("jti:" + usernameKey);
-						if (jtiData != null) {
-							String[] parts = jtiData.split("\\|", 2);
-							tokenDenylist.addTokenToDenylist(parts[0], jwtUtil.getAccessTokenExpiration());
-							if (parts.length > 1) {
-								redisTemplate.delete("user_" + parts[1]);
+						String userRole = "";
+						if (mUsers.get(0).getM_UserServiceRoleMapping() != null) {
+							for (UserServiceRoleMapping usrm : mUsers.get(0).getM_UserServiceRoleMapping()) {
+								if (usrm.getM_Role() != null && usrm.getM_Role().getRoleName() != null) {
+									userRole = usrm.getM_Role().getRoleName();
+									break;
+								}
+							}
+						}
+						if (!CONCURRENT_SESSION_EXEMPT_ROLES.contains(userRole.trim().toLowerCase())) {
+							// Denylist the active JWT so the first system's requests are immediately rejected
+							String usernameKey = mUsers.get(0).getUserName().trim().toLowerCase();
+							String jtiData = stringRedisTemplate.opsForValue().get("jti:" + usernameKey);
+							if (jtiData != null) {
+								String[] parts = jtiData.split("\\|", 2);
+								String jti = parts[0];
+								tokenDenylist.addTokenToDenylist(jti, jwtUtil.getAccessTokenExpiration());
+								if (parts.length > 1) {
+									redisTemplate.delete("user_" + parts[1]);
+								}
+								stringRedisTemplate.delete("jti:" + usernameKey);
 							}
-							stringRedisTemplate.delete("jti:" + usernameKey);
 						}
 
 						response.setResponse("User successfully logged out");
@@ -537,11 +570,13 @@
 			String refreshToken = null;
 			boolean isMobile = false;
 			if (m_User.getUserName() != null && (m_User.getDoLogout() == null || m_User.getDoLogout() == false)) {
-				String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser(
-						m_User.getUserName().trim().toLowerCase());
-				if (tokenFromRedis != null) {
-					throw new IEMRException(
-							"You are already logged in,please confirm to logout from other device and login again");
+				if (!CONCURRENT_SESSION_EXEMPT_ROLES.contains(m_User.getUserName().trim().toLowerCase())) {
+					String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser(
+							m_User.getUserName().trim().toLowerCase());
+					if (tokenFromRedis != null) {
+						throw new IEMRException(
+								"You are already logged in,please confirm to logout from other device and login again");
+					}
 				}
 			} else if (m_User.getUserName() != null && m_User.getDoLogout() != null && m_User.getDoLogout() == true) {
 				deleteSessionObject(m_User.getUserName().trim().toLowerCase());
@@ -1000,6 +1035,13 @@
 		try {
 			deleteSessionObjectByGettingSessionDetails(request.getHeader("Authorization"));
 			sessionObject.deleteSessionObject(request.getHeader("Authorization"));
+			try {
+				stringRedisTemplate.delete("camp:vanID");
+				stringRedisTemplate.delete("camp:parkingPlaceID");
+				logger.info("Camp config cleared from Redis on MMU logout");
+			} catch (Exception redisEx) {
+				logger.warn("Failed to clear camp Redis keys on logout: {}", redisEx.getMessage());
+			}
 			response.setResponse("Success");
 		} catch (Exception e) {
 			response.setError(e);

src/main/java/com/iemr/common/data/dynamic_from/FormFieldOption.java

@@ -27,6 +27,9 @@ public class FormFieldOption {
     @Column(name = "label_as")
     private String labelAs;
 
+    @Column(name = "label_bn")
+    private String labelBn;
+
     @Column(name = "sort_order")
     private Integer sortOrder;
 

src/main/java/com/iemr/common/data/translation/Translation.java

@@ -20,6 +20,8 @@ public class Translation {
     private String hindiTranslation;
     @Column(name = "assamese_translation")
     private String assameseTranslation;
+    @Column(name = "bengali_translation")
+    private String bengaliTranslation;
     @Column(name = "is_active")
     private Boolean isActive;
 

src/main/java/com/iemr/common/dto/identity/Address.java

@@ -52,6 +52,12 @@
 	private String parkingPlaceName;
 	private Integer servicePointID;
 	private String servicePointName;
+	private Double gpsLatitude;
+	private Double gpsLongitude;
+	private String digipin;
+	private Long gpsTimestamp;
+	private Boolean isGpsUnavailable;
+	private String gpsUnavailableReason;
 
 	public static Address bendemographicsAddressMapper(BeneficiaryDemographicsModel i_bendemographics) {
 		Address address = new Address();
@@ -87,6 +93,12 @@ public static Address bendemographicsAddressMapper(BeneficiaryDemographicsModel
 		address.setSubDistrictId(i_bendemographics.getBlockID());
 		address.setVillageId(i_bendemographics.getDistrictBranchID());
 		address.setPinCode(i_bendemographics.getPinCode());
+		address.setGpsLatitude(i_bendemographics.getLatitude());
+		address.setGpsLongitude(i_bendemographics.getLongitude());
+		address.setDigipin(i_bendemographics.getDigipin());
+		address.setGpsTimestamp(i_bendemographics.getGpsTimestamp());
+		address.setIsGpsUnavailable(i_bendemographics.getIsGpsUnavailable());
+		address.setGpsUnavailableReason(i_bendemographics.getGpsUnavailableReason());
 
 		return address;
 	}

src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java

@@ -158,6 +158,12 @@ public BeneficiaryDemographicsModel createBenDemographicsModel(BeneficiariesDTO
 		demographicsModel.setServicePointID(address.getServicePointID());
 		demographicsModel.setServicePointName(address.getServicePointName());
 		demographicsModel.setHabitation(address.getHabitation());
+		demographicsModel.setLatitude(address.getGpsLatitude());
+		demographicsModel.setLongitude(address.getGpsLongitude());
+		demographicsModel.setDigipin(address.getDigipin());
+		demographicsModel.setGpsTimestamp(address.getGpsTimestamp());
+		demographicsModel.setIsGpsUnavailable(address.getIsGpsUnavailable());
+		demographicsModel.setGpsUnavailableReason(address.getGpsUnavailableReason());
 		}
 		demographicsModel.setHealthCareWorkerID(benDetails.getHealthCareWorkerId());
 		demographicsModel.setPreferredLangID(beneficiariesDTO.getBeneficiaryDetails().getPreferredLanguageId());
@@ -216,6 +222,12 @@ protected Address beneficiaryDemographicsModelToAddress(BeneficiaryDemographicsM
 			address.setSubDistrict(
 					blockMapper.districtBlockToModelByID(beneficiaryDemographicsModel.getBlockID()).getBlockName());
 		}
+		address.setGpsLatitude(beneficiaryDemographicsModel.getLatitude());
+		address.setGpsLongitude(beneficiaryDemographicsModel.getLongitude());
+		address.setDigipin(beneficiaryDemographicsModel.getDigipin());
+		address.setGpsTimestamp(beneficiaryDemographicsModel.getGpsTimestamp());
+		address.setIsGpsUnavailable(beneficiaryDemographicsModel.getIsGpsUnavailable());
+		address.setGpsUnavailableReason(beneficiaryDemographicsModel.getGpsUnavailableReason());
 
 		return address;
 	}

src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java

@@ -248,6 +248,12 @@ protected Address beneficiaryDemographicsModelToAddress(BeneficiaryDemographicsM
 			address.setSubDistrict(
 					blockMapper.districtBlockToModelByID(beneficiaryDemographicsModel.getBlockID()).getBlockName());
 		}
+		address.setGpsLatitude(beneficiaryDemographicsModel.getLatitude());
+		address.setGpsLongitude(beneficiaryDemographicsModel.getLongitude());
+		address.setDigipin(beneficiaryDemographicsModel.getDigipin());
+		address.setGpsTimestamp(beneficiaryDemographicsModel.getGpsTimestamp());
+		address.setIsGpsUnavailable(beneficiaryDemographicsModel.getIsGpsUnavailable());
+		address.setGpsUnavailableReason(beneficiaryDemographicsModel.getGpsUnavailableReason());
 
 		return address;
 	}

src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java

@@ -107,6 +107,12 @@ protected Address beneficiaryDemographicsModelToAddress(BeneficiaryDemographicsM
 			address.setSubDistrict(
 					blockMapper.districtBlockToModelByID(beneficiaryDemographicsModel.getBlockID()).getBlockName());
 		}
+		address.setGpsLatitude(beneficiaryDemographicsModel.getLatitude());
+		address.setGpsLongitude(beneficiaryDemographicsModel.getLongitude());
+		address.setDigipin(beneficiaryDemographicsModel.getDigipin());
+		address.setGpsTimestamp(beneficiaryDemographicsModel.getGpsTimestamp());
+		address.setIsGpsUnavailable(beneficiaryDemographicsModel.getIsGpsUnavailable());
+		address.setGpsUnavailableReason(beneficiaryDemographicsModel.getGpsUnavailableReason());
 
 		return address;
 	}

src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java

@@ -173,6 +173,19 @@ public class BeneficiaryDemographicsModel {
 	@Expose
 	private String habitation;
 
+	@Expose
+	private Double latitude;
+	@Expose
+	private Double longitude;
+	@Expose
+	private String digipin;
+	@Expose
+	private Long gpsTimestamp;
+	@Expose
+	private Boolean isGpsUnavailable = false;
+	@Expose
+	private String gpsUnavailableReason;
+
 	@Expose
 	private String occupation;
 	@Expose

src/main/java/com/iemr/common/service/dynamicForm/FormMasterServiceImpl.java

@@ -160,6 +160,9 @@ public FormResponseDTO getStructuredFormByFormId(String formId, String lang, Str
                             } else if ("en".equalsIgnoreCase(lang)) {
                                 translatedLabel = label.getEnglish();
 
+                            }else if ("bn".equalsIgnoreCase(lang)) {
+                                translatedLabel = label.getBengaliTranslation();
+
                             }
                         }
 
@@ -171,6 +174,9 @@ public FormResponseDTO getStructuredFormByFormId(String formId, String lang, Str
                             } else if ("en".equalsIgnoreCase(lang)) {
                                 translatedPlaceHolder = placeHolder.getEnglish();
 
+                            } else if ("bn".equalsIgnoreCase(lang)) {
+                                translatedPlaceHolder = placeHolder.getBengaliTranslation();
+
                             }
                         }
 
@@ -203,7 +209,8 @@ public FormResponseDTO getStructuredFormByFormId(String formId, String lang, Str
                                             map.put("value", opt.getValue());
                                             if ("hi".equalsIgnoreCase(lang))      map.put("label", opt.getLabelHi());
                                             else if ("as".equalsIgnoreCase(lang)) map.put("label", opt.getLabelAs());
-                                            else                                   map.put("label", opt.getLabelEn());
+                                            else if("en".equals(lang))            map.put("label", opt.getLabelEn());
+                                            else if("bn".equals(lang))            map.put("label", opt.getLabelBn());
                                             return map;
                                         })
                                         .collect(Collectors.toList());

src/main/java/com/iemr/common/service/health/HealthService.java

@@ -72,7 +72,6 @@ public class HealthService {
     private static final String STATUS_VALUE = "Value";
     private static final String STATUS_UP     = "UP";
     private static final String STATUS_DOWN   = "DOWN";
-    private static final String STATUS_DEGRADED = "DEGRADED";
     private static final String STATUS_NOT_CONFIGURED = "NOT_CONFIGURED";
 
     // Thresholds
@@ -183,9 +182,11 @@ private Map<String, Object> checkDatabaseConnectivity() {
             stmt.setQueryTimeout(3); // Bounds only the SELECT 1 execution
             stmt.execute("SELECT 1");
 
-            // If SELECT 1 succeeds, use cached severity from background diagnostics
+            // SELECT 1 succeeded, so connectivity is UP regardless of background severity.
+            // Severity is a separate capacity/performance signal (pool usage, long transactions,
+            // etc.) — it must not be reported as a connectivity outage.
             String severity = cachedDbSeverity.get();
-            result.put(FIELD_STATUS,   resolveDatabaseStatus(severity));
+            result.put(FIELD_STATUS,   STATUS_UP);
             result.put(FIELD_SEVERITY, severity);
 
         } catch (Exception e) {
@@ -402,13 +403,6 @@ private String performConnectionUsageCheck(Connection conn) {
         }
         return SEVERITY_OK;
     }
-    private String resolveDatabaseStatus(String severity) {
-        return switch (severity) {
-            case SEVERITY_CRITICAL -> STATUS_DOWN;
-            case SEVERITY_WARNING  -> STATUS_DEGRADED;
-            default                -> STATUS_UP;
-        };
-    }
     private String escalate(String current, String candidate) {
         return severityRank(candidate) > severityRank(current) ? candidate : current;
     }

src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java

@@ -133,4 +133,5 @@ public List<ServiceRoleScreenMapping> getUserServiceRoleMappingForProvider(Integ
 
 	boolean hasAdminPrivileges(Long userId) throws IEMRException;
 
+	User save(User loggedInUser);
 }