Skip to content

fix: Stop TB bulk user upload district validation and qualification c… #140

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
SauravBizbRolly merged 1 commit into from
Aug 3, 2026
Merged

fix: Stop TB bulk user upload district validation and qualification c… #140

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
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/admin/repository/provideronboard/M_ProviderServiceMappingRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,7 @@ public interface M_ProviderServiceMappingRepo extends CrudRepository<M_ProviderS
@Query("SELECT u FROM M_ProviderServiceMapping u where u.serviceProviderID = :serviceProviderID AND deleted=false")
M_ProviderServiceMapping getPSMapIDByServiceProviderID(@Param ("serviceProviderID") Integer serviceProviderID);

@Query("SELECT COUNT(u) > 0 FROM M_ProviderServiceMapping u WHERE u.serviceProviderID = :serviceProviderID AND u.serviceID = :serviceID AND deleted=false")
boolean existsByServiceProviderIDAndServiceID(@Param("serviceProviderID") Integer serviceProviderID, @Param("serviceID") Integer serviceID);

}
71 changes: 66 additions & 5 deletions src/main/java/com/iemr/admin/service/bulkRegistration/BulkRegistrationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@
import com.iemr.admin.data.bulkuser.EmployeeList;
import com.iemr.admin.data.employeemaster.*;
import com.iemr.admin.data.locationmaster.M_District;
import com.iemr.admin.data.nikshay.NikshayDistrict;
import com.iemr.admin.data.nikshay.NikshayState;
import com.iemr.admin.data.rolemaster.StateMasterForRole;
import com.iemr.admin.repo.employeemaster.V_ShowuserRepo;
import com.iemr.admin.repo.nikshay.NikshayDistrictRepo;
import com.iemr.admin.repo.nikshay.NikshayStateRepo;
import com.iemr.admin.repository.provideronboard.M_ProviderServiceMappingRepo;
import com.iemr.admin.service.employeemaster.EmployeeMasterInter;
import com.iemr.admin.service.locationmaster.LocationMasterServiceInter;
import com.iemr.admin.service.rolemaster.Role_MasterInter;
Expand Down Expand Up @@ -60,6 +65,20 @@
@Autowired
EmployeeXmlService employeeXmlService;

@Autowired
private NikshayStateRepo nikshayStateRepo;
@Autowired
private NikshayDistrictRepo nikshayDistrictRepo;
@Autowired
private M_ProviderServiceMappingRepo providerServiceMappingRepo;

// ServiceID for "Stop TB" in m_servicemaster. Stop TB users' District is
// resolved against Nikshay's own district master (m_nikshay_district) instead
// of AMRIT's m_District, because AMRIT's district data is stale for several
// states post the 2022 district reorganizations while Nikshay's is current.
// Every other service line is unaffected and keeps using m_District as before.
private static final Integer STOP_TB_SERVICE_ID = 12;

public ArrayList<String> errorLogs = new ArrayList<>();
public ArrayList<M_User1> m_bulkUser = new ArrayList<>();
public ArrayList<M_UserDemographics> m_UserDemographics = new ArrayList<>();
Expand Down Expand Up @@ -101,6 +120,7 @@


private void saveUserUser(Employee employee, Integer row, String authorization, String createdBy, Integer serviceProviderID) throws Exception {
boolean isStopTB = providerServiceMappingRepo.existsByServiceProviderIDAndServiceID(serviceProviderID, STOP_TB_SERVICE_ID);
List<String> validationErrors = new ArrayList<>();
BulkRegistrationError bulkRegistrationErrors_ = new BulkRegistrationError();
M_User1 mUser = new M_User1();
Expand Down Expand Up @@ -232,6 +252,12 @@
validationErrors.add("Qualification is missing");

}
if (!employee.getQualification().isEmpty()) {
if (getQualificationId(employee.getQualification()) == 0) {

Check warning on line 256 in src/main/java/com/iemr/admin/service/bulkRegistration/BulkRegistrationServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Merge this if statement with the enclosing one. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_Admin-API&issues=AZ_IDPyHvDhZrzQ7FO3N&open=AZ_IDPyHvDhZrzQ7FO3N&pullRequest=140
validationErrors.add("Qualification is invalid.");

}
}

if (employee.getState().isEmpty()) {
validationErrors.add("Current State is missing.");
Expand All @@ -246,7 +272,9 @@
validationErrors.add("Current District is missing.");
}
if (!employee.getDistrict().isEmpty()) {
if (getDistrictId(employee.getDistrict()) == 0) {
int districtId = isStopTB ? getNikshayDistrictId(employee.getState(), employee.getDistrict())
: getDistrictId(employee.getDistrict());
if (districtId == 0) {
validationErrors.add("Current District is invalid.");

}
Expand All @@ -266,7 +294,9 @@
}

if (!employee.getPermanentDistrict().isEmpty()) {
if (getDistrictId(employee.getPermanentDistrict()) == 0) {
int permDistrictId = isStopTB ? getNikshayDistrictId(employee.getPermanentState(), employee.getPermanentDistrict())
: getDistrictId(employee.getPermanentDistrict());
if (permDistrictId == 0) {
validationErrors.add("Permanent District is invalid.");

}
Expand Down Expand Up @@ -299,7 +329,7 @@

// showLogger(employee);

if (!employee.getTitle().isEmpty() && !employee.getFirstName().isEmpty() && !employee.getLastName().isEmpty() && !employee.getContactNo().isEmpty() && !employee.getEmergencyContactNo().isEmpty() && !employee.getDob().isEmpty() && !employee.getUserName().isEmpty() && !employee.getPassword().isEmpty() && !employee.getState().isEmpty() && !employee.getDistrict().isEmpty() && !employee.getPermanentState().isEmpty() && !employee.getPermanentDistrict().isEmpty() && !employee.getGender().isEmpty() && !employee.getQualification().isEmpty() && isValidDate(convertStringIntoDate(employee.getDob()).toString()) && isValidDate(convertStringIntoDate(employee.getDateOfJoining()).toString())) {
if (validationErrors.isEmpty()) {
try {

mUser.setTitleID(getTitleId(employee.getTitle()));
Expand Down Expand Up @@ -372,7 +402,9 @@

}
if (!employee.getPermanentDistrict().isEmpty()) {
mUserDemographics.setPermDistrictID(getDistrictId(employee.getPermanentDistrict()));
mUserDemographics.setPermDistrictID(isStopTB
? getNikshayDistrictId(employee.getPermanentState(), employee.getPermanentDistrict())
: getDistrictId(employee.getPermanentDistrict()));

}
mUserDemographics.setIsPermanent(false);
Expand All @@ -399,7 +431,9 @@
}
mUserDemographics.setIsPresent(false);
if (!employee.getDistrict().isEmpty()) {
mUserDemographics.setDistrictID(getDistrictId(employee.getDistrict()));
mUserDemographics.setDistrictID(isStopTB
? getNikshayDistrictId(employee.getState(), employee.getDistrict())
: getDistrictId(employee.getDistrict()));

}
if (!employee.getPincode().isEmpty()) {
Expand Down Expand Up @@ -645,6 +679,33 @@

}

// Stop TB-only equivalent of getDistrictId(): resolves against Nikshay's own
// district master (m_nikshay_district) instead of AMRIT's m_District, since
// Nikshay's data reflects current district boundaries (e.g. post-2022 AP
// reorganization) while m_District does not. Not used for any other service
// line.
public int getNikshayDistrictId(String stateName, String districtName) {
if (stateName == null || stateName.isEmpty() || districtName == null || districtName.isEmpty()) {
return 0;
}

int nikshayStateId = nikshayStateRepo.findAllActive().stream()
.filter(s -> s.getStateName().equalsIgnoreCase(stateName))
.map(NikshayState::getNikshayStateID)
.findFirst()
.orElse(0);

if (nikshayStateId == 0) {
return 0;
}

return nikshayDistrictRepo.findByStateID(nikshayStateId).stream()
.filter(d -> d.getDistrictName().equalsIgnoreCase(districtName))
.map(NikshayDistrict::getNikshayDistrictID)
.findFirst()
.orElse(0);
}


public ArrayList<StateMasterForRole> getAllState() {
return roleMasterInter.getAllState();
Expand Down
Loading