Merge Release-3.8.1 to Main

.gitignore

@@ -40,4 +40,7 @@ mvnw.cmd
 # Properties
 src/main/environment/admin_local.properties
 
-node_modules
+node_modules
+
+# Logs
+logs/

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.admin</groupId>
 	<artifactId>admin-api</artifactId>
-	<version>3.6.1</version>
+	<version>3.8.1</version>
 	<packaging>war</packaging>
 	<name>Admin-API</name>
 	<description>Admin Page</description>

src/main/java/com/iemr/admin/controller/bulkRegistration/BulkRegistrationController.java

@@ -44,25 +44,7 @@ public class BulkRegistrationController {
     public ResponseEntity<Map<String, Object>> registerBulkUser(@RequestBody String m_user, @RequestHeader String authorization, @RequestParam String userName,
                                                                 HttpServletRequest request, @RequestParam Integer serviceProviderID
     ) {
-        String jwtToken = null;
-
-        Cookie[] cookies = request.getCookies();
-        if (cookies != null) {
-            for (Cookie cookie : cookies) {
-                if ("jwt".equalsIgnoreCase(cookie.getName())) {   // Cookie name == jwt
-                    jwtToken = cookie.getValue();
-                    break;
-                }
-            }
-        }
-
-        logger.info("JWT Token From Cookie: " + jwtToken);
-        logger.info("M_user Request: " + m_user);
-
-        String authHeader = request.getHeader("Authorization");
-        logger.info("Authorization Token: " + authHeader);
 
-        logger.info("M_user Request: " + m_user);
         bulkRegistrationServiceimpl.bulkRegistrationErrors.clear();
         logger.info("Bulk registration request received. Request payload is omitted from logs.");
         try {

src/main/java/com/iemr/admin/controller/employeemaster/AshaSupervisorMappingController.java

@@ -0,0 +1,234 @@
+/*
+* 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.admin.controller.employeemaster;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iemr.admin.data.employeemaster.AshaSupervisorMapping;
+import com.iemr.admin.data.employeemaster.M_UserServiceRoleMapping2;
+import com.iemr.admin.data.store.M_Facility;
+import com.iemr.admin.repo.employeemaster.EmployeeMasterRepo;
+import com.iemr.admin.repository.store.MainStoreRepo;
+import com.iemr.admin.service.employeemaster.AshaSupervisorMappingService;
+import com.iemr.admin.utils.mapper.InputMapper;
+import com.iemr.admin.utils.response.OutputResponse;
+
+import io.swagger.v3.oas.annotations.Operation;
+
+@RestController
+public class AshaSupervisorMappingController {
+
+	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
+
+	@Autowired
+	private AshaSupervisorMappingService ashaSupervisorMappingService;
+
+	@Autowired
+	private EmployeeMasterRepo employeeMasterRepo;
+
+	@Autowired
+	private MainStoreRepo mainStoreRepo;
+
+	@Operation(summary = "Get ASHA users by facility IDs")
+	@RequestMapping(value = "/userFacilityMapping/getAshasByFacility", headers = "Authorization", method = {
+			RequestMethod.POST }, produces = { "application/json" })
+	public String getAshasByFacility(@RequestBody String request) {
+		OutputResponse response = new OutputResponse();
+		try {
+			AshaSupervisorMapping reqObj = InputMapper.gson().fromJson(request, AshaSupervisorMapping.class);
+			List<Integer> facilityIDs = reqObj.getFacilityIDs();
+			if (facilityIDs == null || facilityIDs.isEmpty()) {
+				if (reqObj.getFacilityID() != null) {
+					facilityIDs = Arrays.asList(reqObj.getFacilityID());
+				}
+			}
+			ArrayList<M_UserServiceRoleMapping2> ashaUsers = ashaSupervisorMappingService
+					.getAshasByFacility(facilityIDs);
+			response.setResponse(ashaUsers.toString());
+		} catch (Exception e) {
+			logger.error("Unexpected error:", e);
+			response.setError(e);
+		}
+		return response.toString();
+	}
+
+	@Operation(summary = "Save ASHA supervisor mappings")
+	@RequestMapping(value = "/userFacilityMapping/ashaSupervisorMapping/save", headers = "Authorization", method = {
+			RequestMethod.POST }, produces = { "application/json" })
+	public String saveAshaSupervisorMapping(@RequestBody String request) {
+		OutputResponse response = new OutputResponse();
+		try {
+			AshaSupervisorMapping[] reqArray = InputMapper.gson().fromJson(request, AshaSupervisorMapping[].class);
+			List<AshaSupervisorMapping> mappings = Arrays.asList(reqArray);
+			ArrayList<AshaSupervisorMapping> savedMappings = ashaSupervisorMappingService
+					.saveAshaSupervisorMappings(mappings);
+			response.setResponse(savedMappings.toString());
+		} catch (Exception e) {
+			logger.error("Unexpected error:", e);
+			response.setError(e);
+		}
+		return response.toString();
+	}
+
+	@Operation(summary = "Get supervisor mappings by facility ID")
+	@RequestMapping(value = "/userFacilityMapping/ashaSupervisorMapping/getByFacility", headers = "Authorization", method = {
+			RequestMethod.POST }, produces = { "application/json" })
+	public String getSupervisorMappingByFacility(@RequestBody String request) {
+		OutputResponse response = new OutputResponse();
+		try {
+			AshaSupervisorMapping reqObj = InputMapper.gson().fromJson(request, AshaSupervisorMapping.class);
+			ArrayList<AshaSupervisorMapping> mappings = ashaSupervisorMappingService
+					.getSupervisorMappingByFacility(reqObj.getFacilityID());
+			response.setResponse(mappings.toString());
+		} catch (Exception e) {
+			logger.error("Unexpected error:", e);
+			response.setError(e);
+		}
+		return response.toString();
+	}
+
+	@Operation(summary = "Delete ASHA supervisor mappings by supervisor and facility IDs")
+	@RequestMapping(value = "/userFacilityMapping/ashaSupervisorMapping/delete", headers = "Authorization", method = {
+			RequestMethod.POST }, produces = { "application/json" })
+	public String deleteAshaSupervisorMapping(@RequestBody String request) {
+		OutputResponse response = new OutputResponse();
+		try {
+			AshaSupervisorMapping reqObj = InputMapper.gson().fromJson(request, AshaSupervisorMapping.class);
+			Integer supervisorUserID = reqObj.getSupervisorUserID();
+			List<Integer> facilityIDs = reqObj.getFacilityIDs();
+			if (supervisorUserID != null && facilityIDs != null && !facilityIDs.isEmpty()) {
+				ashaSupervisorMappingService.deleteBySupervisorAndFacilities(supervisorUserID, facilityIDs, "Admin");
+				response.setResponse("Deleted successfully");
+			} else {
+				response.setError(5000, "supervisorUserID and facilityIDs are required");
+			}
+		} catch (Exception e) {
+			logger.error("Unexpected error:", e);
+			response.setError(e);
+		}
+		return response.toString();
+	}
+
+	@Operation(summary = "Atomically delete old and save new ASHA supervisor mappings (Fix 7)")
+	@RequestMapping(value = "/userFacilityMapping/ashaSupervisorMapping/updateAtomically", headers = "Authorization", method = {
+			RequestMethod.POST }, produces = { "application/json" })
+	public String updateAshaSupervisorMappingAtomically(@RequestBody String request) {
+		OutputResponse response = new OutputResponse();
+		try {
+			com.google.gson.JsonObject reqObj = InputMapper.gson().fromJson(request, com.google.gson.JsonObject.class);
+			Integer supervisorUserID = reqObj.get("supervisorUserID").getAsInt();
+			String modifiedBy = reqObj.has("modifiedBy") ? reqObj.get("modifiedBy").getAsString() : "Admin";
+			List<Integer> facilityIDs = new ArrayList<>();
+			if (reqObj.has("facilityIDs")) {
+				for (com.google.gson.JsonElement el : reqObj.getAsJsonArray("facilityIDs")) {
+					facilityIDs.add(el.getAsInt());
+				}
+			}
+			List<AshaSupervisorMapping> newMappings = new ArrayList<>();
+			if (reqObj.has("newMappings")) {
+				AshaSupervisorMapping[] arr = InputMapper.gson().fromJson(
+						reqObj.getAsJsonArray("newMappings").toString(), AshaSupervisorMapping[].class);
+				newMappings = Arrays.asList(arr);
+			}
+			ArrayList<AshaSupervisorMapping> saved = ashaSupervisorMappingService
+					.updateAshaMappingsAtomically(supervisorUserID, facilityIDs, newMappings, modifiedBy);
+			response.setResponse(saved.toString());
+		} catch (Exception e) {
+			logger.error("Unexpected error:", e);
+			response.setError(e);
+		}
+		return response.toString();
+	}
+
+	@Operation(summary = "Restore soft-deleted ASHA supervisor mappings by IDs")
+	@RequestMapping(value = "/userFacilityMapping/ashaSupervisorMapping/restore", headers = "Authorization", method = {
+			RequestMethod.POST }, produces = { "application/json" })
+	public String restoreAshaSupervisorMapping(@RequestBody String request) {
+		OutputResponse response = new OutputResponse();
+		try {
+			AshaSupervisorMapping reqObj = InputMapper.gson().fromJson(request, AshaSupervisorMapping.class);
+			List<Long> ids = reqObj.getIds();
+			if (ids != null && !ids.isEmpty()) {
+				ashaSupervisorMappingService.restoreMappings(ids, "Admin");
+				response.setResponse("Restored successfully");
+			} else {
+				response.setError(5000, "ids are required");
+			}
+		} catch (Exception e) {
+			logger.error("Unexpected error:", e);
+			response.setError(e);
+		}
+		return response.toString();
+	}
+
+	@Operation(summary = "Get facility details by USR mapping ID")
+	@RequestMapping(value = "/userFacilityMapping/getFacilityByMappingID", headers = "Authorization", method = {
+			RequestMethod.POST }, produces = { "application/json" })
+	public String getFacilityByMappingID(@RequestBody String request) {
+		OutputResponse response = new OutputResponse();
+		try {
+			M_UserServiceRoleMapping2 reqObj = InputMapper.gson().fromJson(request, M_UserServiceRoleMapping2.class);
+			Integer mappingID = reqObj.getuSRMappingID();
+			if (mappingID != null) {
+				M_UserServiceRoleMapping2 mapping = employeeMasterRepo.findById(mappingID).orElse(null);
+				// Skip if mapping is soft-deleted or has no facility
+				if (mapping != null && Boolean.TRUE.equals(mapping.getDeleted())) {
+					mapping = null;
+				}
+				if (mapping != null && mapping.getFacilityID() != null) {
+					// Use deleted filter to exclude soft-deleted facilities
+					M_Facility facility = mainStoreRepo.findByFacilityIDAndDeleted(mapping.getFacilityID(), false);
+					StringBuilder json = new StringBuilder("{");
+					json.append("\"facilityID\": ").append(mapping.getFacilityID());
+					if (facility != null) {
+						json.append(", \"facilityName\": \"").append(facility.getFacilityName() != null ? facility.getFacilityName() : "").append("\"");
+						json.append(", \"facilityTypeID\": ").append(facility.getFacilityTypeID());
+						json.append(", \"ruralUrban\": \"").append(facility.getRuralUrban() != null ? facility.getRuralUrban() : "").append("\"");
+					} else {
+						// Facility was deleted — return null so frontend knows
+						json = new StringBuilder("{\"facilityID\": null, \"facilityDeleted\": true");
+					}
+					json.append("}");
+					response.setResponse(json.toString());
+				} else {
+					response.setResponse("{\"facilityID\": null}");
+				}
+			} else {
+				response.setResponse("{\"facilityID\": null}");
+			}
+		} catch (Exception e) {
+			logger.error("Unexpected error:", e);
+			response.setError(e);
+		}
+		return response.toString();
+	}
+}

src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java

@@ -1804,12 +1804,15 @@ public String UserRoleMappings(@RequestBody String userRoleMapping, HttpServletR
 					resDataMap1.setUserID(employeeMaster.get(x).getUserID());
 					resDataMap1.setProviderServiceMapID(previl.getProviderServiceMapID());
 					resDataMap1.setWorkingLocationID(previl.getWorkingLocationID());
+					resDataMap1.setStateID(previl.getStateID());
+					resDataMap1.setDistrictID(previl.getDistrictID());
 					resDataMap1.setCreatedBy(employeeMaster.get(x).getCreatedBy());
 					resDataMap1.setServiceProviderID(employeeMaster.get(x).getServiceProviderID());
 					resDataMap1.setBlockID(previl.getBlockID());
 					resDataMap1.setBlockName(previl.getBlockName());
 					resDataMap1.setVillageID(previl.getVillageID());
 					resDataMap1.setVillageName(previl.getVillageName());
+					resDataMap1.setFacilityID(previl.getFacilityID());
 					resList1.add(resDataMap1);
 
 				}
@@ -1845,16 +1848,32 @@ public String updateUserRoleMapping(@RequestBody String updateUserRoleMapping, H
 
 			M_UserServiceRoleMapping2 usrRole = employeeMasterInter.getDataUsrId(pre.getuSRMappingID());
 
+			// Fix 1/3: cascade asha_supervisor_mapping BEFORE modifying entity to avoid JPA L1 cache issue
+			if (usrRole != null && usrRole.getUserID() != null) {
+				boolean roleChanged = pre.getRoleID() != null && usrRole.getRoleID() != null
+						&& !usrRole.getRoleID().equals(pre.getRoleID());
+				boolean facilityChanged = usrRole.getFacilityID() != null && pre.getFacilityID() != null
+						&& !usrRole.getFacilityID().equals(pre.getFacilityID());
+				if (roleChanged || facilityChanged) {
+					logger.info("Fix1/3: cascading asha_supervisor_mapping for userID={}, roleChanged={}, facilityChanged={}",
+							usrRole.getUserID(), roleChanged, facilityChanged);
+					employeeMasterInter.cascadeDeleteAshaMappingsForUser(usrRole.getUserID());
+				}
+			}
+
 			usrRole.setUserID(pre.getUserID());
 			usrRole.setRoleID(pre.getRoleID());
 			usrRole.setAgentPassword(pre.getAgentPassword());
 			usrRole.setProviderServiceMapID(pre.getProviderServiceMapID());
 			usrRole.setWorkingLocationID(pre.getWorkingLocationID());
+			usrRole.setStateID(pre.getStateID());
+			usrRole.setDistrictID(pre.getDistrictID());
 			usrRole.setModifiedBy(pre.getModifiedBy());
 			usrRole.setBlockID(pre.getBlockID());
 			usrRole.setBlockName(pre.getBlockName());
 			usrRole.setVillageID(pre.getVillageID());
 			usrRole.setVillageName(pre.getVillageName());
+			usrRole.setFacilityID(pre.getFacilityID());
 
 			if (pre.getTeleConsultation() != null) {
 				usrRole.setTeleConsultation(pre.getTeleConsultation());
@@ -1897,6 +1916,17 @@ public String deleteUserRoleMapping(@RequestBody String deletedUserRoleMapping,
 
 			M_UserServiceRoleMapping2 usrRole = employeeMasterInter.getDataUsrId(pre.getuSRMappingID());
 
+			// Fix 2: cascade asha_supervisor_mapping BEFORE setDeleted() to avoid JPA L1 cache issue.
+			// After setDeleted(true), findById() in saveRoleMappingeditedData hits the L1 cache
+			// returning the already-modified entity, so the "old vs new deleted" check always fails.
+			// For ASHA Supervisor with multiple facilities: only delete mappings for this facilityID
+			if (Boolean.TRUE.equals(pre.getDeleted()) && !Boolean.TRUE.equals(usrRole.getDeleted())
+					&& usrRole.getUserID() != null) {
+				logger.info("Fix2: cascading asha_supervisor_mapping soft-delete for userID={}, uSRMappingID={}",
+						usrRole.getUserID(), pre.getuSRMappingID());
+				employeeMasterInter.cascadeDeleteAshaMappingsForDeactivation(usrRole);
+			}
+
 			usrRole.setDeleted(pre.getDeleted());
 
 			M_UserServiceRoleMapping2 savedata = employeeMasterInter.saveRoleMappingeditedData(usrRole,