Skip to content

fix: allow reactivating legacy ASHA users with no facility mapped #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vishwab1 merged 1 commit into from
Aug 7, 2026
Merged

fix: allow reactivating legacy ASHA users with no facility mapped #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1848,6 +1848,10 @@ public String updateUserRoleMapping(@RequestBody String updateUserRoleMapping, H

M_UserServiceRoleMapping2 usrRole = employeeMasterInter.getDataUsrId(pre.getuSRMappingID());

// Fix 19: capture the DB deleted-flag BEFORE any mutation (this endpoint doesn't change
// it, but the flag must be read before mutation to be meaningful downstream)
boolean wasDeleted = Boolean.TRUE.equals(usrRole.getDeleted());

// 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
Expand Down Expand Up @@ -1886,7 +1890,7 @@ public String updateUserRoleMapping(@RequestBody String updateUserRoleMapping, H
usrRole.setOutbound(pre.getOutbound());
}

M_UserServiceRoleMapping2 savedata = employeeMasterInter.saveRoleMappingeditedData(usrRole,
M_UserServiceRoleMapping2 savedata = employeeMasterInter.saveRoleMappingeditedData(usrRole, wasDeleted,
request.getHeader("Authorization"));

response.setResponse(savedata.toString());
Expand Down Expand Up @@ -1916,11 +1920,16 @@ public String deleteUserRoleMapping(@RequestBody String deletedUserRoleMapping,

M_UserServiceRoleMapping2 usrRole = employeeMasterInter.getDataUsrId(pre.getuSRMappingID());

// Fix 19: capture the DB deleted-flag BEFORE any mutation, so saveRoleMappingeditedData
// can tell a reactivation apart from a fresh create/update without re-fetching (which
// would hit the JPA L1 cache and return this same already-mutated instance).
boolean wasDeleted = Boolean.TRUE.equals(usrRole.getDeleted());

// 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())
if (Boolean.TRUE.equals(pre.getDeleted()) && !wasDeleted
&& usrRole.getUserID() != null) {
logger.info("Fix2: cascading asha_supervisor_mapping soft-delete for userID={}, uSRMappingID={}",
usrRole.getUserID(), pre.getuSRMappingID());
Expand All @@ -1929,7 +1938,7 @@ public String deleteUserRoleMapping(@RequestBody String deletedUserRoleMapping,

usrRole.setDeleted(pre.getDeleted());

M_UserServiceRoleMapping2 savedata = employeeMasterInter.saveRoleMappingeditedData(usrRole,
M_UserServiceRoleMapping2 savedata = employeeMasterInter.saveRoleMappingeditedData(usrRole, wasDeleted,
request.getHeader("Authorization"));

response.setResponse(savedata.toString());
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterInter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@ Boolean checkingEmpDetails(String userName, String aadhaarNo, String getpAN, Str
M_UserServiceRoleMapping2 getDataUsrId(Integer uSRMappingID);

// M_UserServiceRoleMapping2 saveRoleMappingeditedData(M_UserServiceRoleMapping2 usrRole, String string);
public M_UserServiceRoleMapping2 saveRoleMappingeditedData(M_UserServiceRoleMapping2 usrRole, String authToken) throws JsonMappingException, JsonProcessingException;
// wasDeleted: the row's deleted flag as read from the DB BEFORE the caller mutated usrRole.
// Must be captured by the caller before mutation — a re-fetch here would hit the JPA L1 cache
// and return the already-mutated instance (Open-Session-In-View keeps one L1 cache per request).
public M_UserServiceRoleMapping2 saveRoleMappingeditedData(M_UserServiceRoleMapping2 usrRole, boolean wasDeleted, String authToken) throws JsonMappingException, JsonProcessingException;

// Fix 2: cascade soft-delete asha_supervisor_mapping rows when a user is deactivated
void cascadeDeleteAshaMappingsForUser(Integer userID);
Expand Down
20 changes: 15 additions & 5 deletions src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,16 +1043,26 @@
}

@Override
public M_UserServiceRoleMapping2 saveRoleMappingeditedData(M_UserServiceRoleMapping2 usrRole, String authToken) throws JsonMappingException, JsonProcessingException {

// Fix 4 + Fix 16 + Fix 17 + Fix 14: validate only on create/update, skip for deactivation
public M_UserServiceRoleMapping2 saveRoleMappingeditedData(M_UserServiceRoleMapping2 usrRole, boolean wasDeleted, String authToken) throws JsonMappingException, JsonProcessingException {

Check failure on line 1046 in src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor this method to reduce its Cognitive Complexity from 64 to the 15 allowed. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_Admin-API&issues=AZ_bdMAZRt4gBeCJa2WX&open=AZ_bdMAZRt4gBeCJa2WX&pullRequest=145

// Fix 4 + Fix 16 + Fix 17 + Fix 14: validate only on create/update, skip entirely for deactivation.
// Fix 19: on reactivation, waive ONLY Fix 4 (facility-mandatory) — legacy ASHA rows created
// before this rule existed may have no facility, and reactivation alone shouldn't be blocked
// by that. Fix 16/17 must still run whenever a facility IS present (reactivation or not), so
// a reactivated row can't silently resume pointing at a facility that went stale (soft-deleted,
// or no longer SC-level) while the user was inactive.
// wasDeleted is captured by the caller BEFORE usrRole is mutated — re-fetching it here via
// findById() would return the same JPA-managed instance as usrRole (Open-Session-In-View
// keeps one L1 cache per request), which already reflects the new (mutated) state.
M_Role role = null;
boolean isReactivation = usrRole.getuSRMappingID() != null && wasDeleted
&& Boolean.FALSE.equals(usrRole.getDeleted());
if (!Boolean.TRUE.equals(usrRole.getDeleted())) {
if (usrRole.getRoleID() != null) {
role = roleRepo.findByRoleID(usrRole.getRoleID());
// Fix 4: ASHA must have a facilityID
// Fix 4: ASHA must have a facilityID (waived on reactivation of a legacy row)
if (role != null && "asha".equalsIgnoreCase(role.getRoleName())
&& usrRole.getFacilityID() == null) {
&& usrRole.getFacilityID() == null && !isReactivation) {
throw new RuntimeException(
"Facility (SC) is mandatory for ASHA role. Please select a facility before saving.");
}
Expand Down
Loading