Skip to content

Add facility hierarchy creation with village and parent-child mapping #121

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 8 commits into from
Mar 2, 2026
Merged

Add facility hierarchy creation with village and parent-child mapping #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
97ca0ee
fix:changed the pom xml
vishwab1 Feb 17, 2026
0149762
fix: added facilty type master change
vishwab1 Feb 18, 2026
06419a0
feat: created facility creation
vishwab1 Feb 25, 2026
5229423
fix: rabiit review fix
vishwab1 Feb 26, 2026
3c27b2e
fix: rabiit review fix
vishwab1 Feb 26, 2026
5727f30
fix: rabiit review fix
vishwab1 Feb 26, 2026
705b656
Merge branch 'release-3.8.1' into vb/3.6.2
vishwab1 Feb 27, 2026
9ffb6a2
fix: pom version
vishwab1 Feb 27, 2026
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.iemr.admin</groupId>
<artifactId>admin-api</artifactId>
<version>3.6.2</version>
<version>3.8.1</version>
<packaging>war</packaging>
<name>Admin-API</name>
<description>Admin Page</description>
Expand Down
100 changes: 98 additions & 2 deletions src/main/java/com/iemr/admin/controller/facilitytype/FacilitytypeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.web.bind.annotation.GetMapping;
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.facilitytype.M_facilitytype;
import com.iemr.admin.data.store.M_FacilityLevel;
import com.iemr.admin.service.facilitytype.M_facilitytypeInter;
import com.iemr.admin.utils.mapper.InputMapper;
import com.iemr.admin.utils.response.OutputResponse;

import io.swagger.v3.oas.annotations.Operation;


@RestController
public class FacilitytypeController {
private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
Expand Down Expand Up @@ -186,4 +186,100 @@ public String checkFacilityTypeCode(@RequestBody String deleteManufacturer) {
return response.toString();

}

@Operation(summary = "Get facility types by rural/urban")
@RequestMapping(value = "/getFacilityTypesByRuralUrban", headers = "Authorization", method = {
RequestMethod.POST }, produces = { "application/json" })
public String getFacilityTypesByRuralUrban(@RequestBody String request) {

OutputResponse response = new OutputResponse();

try {

M_facilitytype facilityDetails = InputMapper.gson().fromJson(request, M_facilitytype.class);

ArrayList<M_facilitytype> facilityData = m_facilitytypeInter
.getFacilityTypesByRuralUrban(facilityDetails.getProviderServiceMapID(),
facilityDetails.getRuralUrban());

response.setResponse(facilityData.toString());

} catch (Exception e) {

logger.error("Unexpected error:", e);
response.setError(e);

}

return response.toString();
}

@Operation(summary = "Get all facility levels")
@RequestMapping(value = "/getFacilityLevels", headers = "Authorization", method = {
RequestMethod.GET }, produces = { "application/json" })
public String getFacilityLevels() {

OutputResponse response = new OutputResponse();
try {
ArrayList<M_FacilityLevel> data = m_facilitytypeInter.getFacilityLevels();
response.setResponse(data.toString());
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}

@Operation(summary = "Get facility types by block")
@RequestMapping(value = "/getFacilityTypesByBlock", headers = "Authorization", method = {
RequestMethod.POST }, produces = { "application/json" })
public String getFacilityTypesByBlock(@RequestBody String request) {

OutputResponse response = new OutputResponse();
try {
M_facilitytype facilityDetails = InputMapper.gson().fromJson(request, M_facilitytype.class);
ArrayList<M_facilitytype> data = m_facilitytypeInter.getFacilityTypesByBlock(facilityDetails.getBlockID());
response.setResponse(data.toString());
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}

@Operation(summary = "Get facility types by state")
@RequestMapping(value = "/getFacilityTypesByState", headers = "Authorization", method = {
RequestMethod.POST }, produces = { "application/json" })
public String getFacilityTypesByState(@RequestBody String request) {

OutputResponse response = new OutputResponse();
try {
M_facilitytype facilityDetails = InputMapper.gson().fromJson(request, M_facilitytype.class);
ArrayList<M_facilitytype> data = m_facilitytypeInter.getFacilityTypesByState(facilityDetails.getStateID());
response.setResponse(data.toString());
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}

@Operation(summary = "Check if facility type name exists in state")
@RequestMapping(value = "/checkFacilityTypeName", headers = "Authorization", method = {
RequestMethod.POST }, produces = { "application/json" })
public String checkFacilityTypeName(@RequestBody String request) {

OutputResponse response = new OutputResponse();
try {
M_facilitytype facilityDetails = InputMapper.gson().fromJson(request, M_facilitytype.class);
boolean exists = m_facilitytypeInter.checkFacilityTypeNameExists(
facilityDetails.getFacilityTypeName(), facilityDetails.getStateID());
response.setResponse(String.valueOf(exists));
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}

}
125 changes: 125 additions & 0 deletions src/main/java/com/iemr/admin/controller/store/StoreController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import com.iemr.admin.data.store.FacilityHierarchyRequest;
import com.iemr.admin.data.store.FacilityVillageMapping;
import com.iemr.admin.data.store.M_Facility;
import com.iemr.admin.data.store.M_facilityMap;
import com.iemr.admin.data.store.V_FetchFacility;
Expand Down Expand Up @@ -286,6 +288,23 @@ public String getMapStore(@RequestBody V_FetchFacility facilitymap) {

}

@Operation(summary = "Get facilities by block/taluk")
@RequestMapping(value = "/getFacilitiesByBlock", headers = "Authorization", method = { RequestMethod.POST }, produces = {
"application/json" })
public String getFacilitiesByBlock(@RequestBody String request) {

OutputResponse response = new OutputResponse();
try {
M_Facility facility = InputMapper.gson().fromJson(request, M_Facility.class);
ArrayList<M_Facility> data = storeService.getFacilitiesByBlock(facility.getBlockID());
response.setResponse(data.toString());
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}

@Operation(summary = "Check store code")
@RequestMapping(value = "/checkStoreCode", headers = "Authorization", method = { RequestMethod.POST }, produces = {
"application/json" })
Expand All @@ -311,4 +330,110 @@ public String checkStoreCode(@RequestBody String deleteManufacturer) {
return response.toString();

}

@Operation(summary = "Get facilities by block and facility level")
@RequestMapping(value = "/getFacilitiesByBlockAndLevel", headers = "Authorization", method = {
RequestMethod.POST }, produces = { "application/json" })
public String getFacilitiesByBlockAndLevel(@RequestBody String request) {

OutputResponse response = new OutputResponse();
try {
com.iemr.admin.data.facilitytype.M_facilitytype reqObj = InputMapper.gson().fromJson(request,
com.iemr.admin.data.facilitytype.M_facilitytype.class);
ArrayList<M_Facility> data = storeService.getFacilitiesByBlockAndLevel(reqObj.getBlockID(),
reqObj.getFacilityLevelID());
response.setResponse(data.toString());
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}

@Operation(summary = "Create facility with hierarchy mapping")
@RequestMapping(value = "/createFacilityWithHierarchy", headers = "Authorization", method = {
RequestMethod.POST }, produces = { "application/json" })
public String createFacilityWithHierarchy(@RequestBody String request) {

OutputResponse response = new OutputResponse();
try {
FacilityHierarchyRequest reqObj = InputMapper.gson().fromJson(request, FacilityHierarchyRequest.class);
M_Facility savedFacility = storeService.createFacilityWithHierarchy(reqObj.getFacility(),
reqObj.getVillageIDs(), reqObj.getChildFacilityIDs());
response.setResponse(savedFacility.toString());
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}

@Operation(summary = "Get village IDs already mapped to facilities in a block")
@RequestMapping(value = "/getMappedVillageIDs", headers = "Authorization", method = {
RequestMethod.POST }, produces = { "application/json" })
public String getMappedVillageIDs(@RequestBody String request) {

OutputResponse response = new OutputResponse();
try {
M_Facility facility = InputMapper.gson().fromJson(request, M_Facility.class);
List<Integer> mappedIDs = storeService.getMappedVillageIDs(facility.getBlockID());
response.setResponse(mappedIDs.toString());
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}

@Operation(summary = "Get village mappings for a facility")
@RequestMapping(value = "/getVillageMappingsByFacility", headers = "Authorization", method = {
RequestMethod.POST }, produces = { "application/json" })
public String getVillageMappingsByFacility(@RequestBody String request) {

OutputResponse response = new OutputResponse();
try {
M_Facility facility = InputMapper.gson().fromJson(request, M_Facility.class);
ArrayList<FacilityVillageMapping> mappings = storeService.getVillageMappingsByFacility(facility.getFacilityID());
response.setResponse(mappings.toString());
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}

@Operation(summary = "Get child facilities by parent facility ID")
@RequestMapping(value = "/getChildFacilitiesByParent", headers = "Authorization", method = {
RequestMethod.POST }, produces = { "application/json" })
public String getChildFacilitiesByParent(@RequestBody String request) {

OutputResponse response = new OutputResponse();
try {
M_Facility facility = InputMapper.gson().fromJson(request, M_Facility.class);
ArrayList<M_Facility> children = storeService.getChildFacilitiesByParent(facility.getFacilityID());
response.setResponse(children.toString());
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}

@Operation(summary = "Update facility with hierarchy mapping")
@RequestMapping(value = "/updateFacilityWithHierarchy", headers = "Authorization", method = {
RequestMethod.POST }, produces = { "application/json" })
public String updateFacilityWithHierarchy(@RequestBody String request) {

OutputResponse response = new OutputResponse();
try {
FacilityHierarchyRequest reqObj = InputMapper.gson().fromJson(request, FacilityHierarchyRequest.class);
M_Facility updatedFacility = storeService.updateFacilityWithHierarchy(reqObj.getFacility(),
reqObj.getVillageIDs(), reqObj.getChildFacilityIDs());
response.setResponse(updatedFacility.toString());
} catch (Exception e) {
logger.error("Unexpected error:", e);
response.setError(e);
}
return response.toString();
}
}
Loading
Loading