From 262d000a6d31a258662ab89c9f6e57045489977a Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Thu, 26 Sep 2024 17:31:54 +0530 Subject: [PATCH 1/4] Abdm facility fetch changes --- .../abdmfacility/AbdmFacilityController.java | 50 +++++++++++++++++++ .../users/ProviderServiceAddressMapping.java | 9 ++++ .../abdmfacility/AbdmFacilityRepository.java | 17 +++++++ .../abdmfacility/AbdmFacilityService.java | 7 +++ .../abdmfacility/AbdmFacilityServiceImpl.java | 22 ++++++++ 5 files changed, 105 insertions(+) create mode 100644 src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java create mode 100644 src/main/java/com/iemr/common/repository/abdmfacility/AbdmFacilityRepository.java create mode 100644 src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityService.java create mode 100644 src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java diff --git a/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java b/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java new file mode 100644 index 00000000..81221850 --- /dev/null +++ b/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java @@ -0,0 +1,50 @@ +package com.iemr.common.controller.abdmfacility; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.iemr.common.service.abdmfacility.AbdmFacilityService; +import com.iemr.common.utils.response.OutputResponse; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.parameters.RequestBody; + +@RequestMapping({ "/facility" }) +@RestController +public class AbdmFacilityController { + + private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + + @Autowired + private AbdmFacilityService abdmFacilityService; + + @CrossOrigin + @Operation(summary = "Get Abdm facility mapped to worklocation") + @GetMapping(value = { "/getWorklocationMappedAbdmFacility/{workLocationId}" }) + public String getStoreStockDetails(@PathVariable int workLocationId, @RequestHeader(value = "Authorization") String Authorization) { + + OutputResponse response = new OutputResponse(); + + try { + + String resp = abdmFacilityService.getMappedAbdmFacility(workLocationId); + + response.setResponse(resp); + + } catch (Exception e) { + + response.setError(5000, e.getMessage()); + logger.error(e.getMessage()); + } + logger.info("Get ABDM Registered facilities API response" + response.toString()); + return response.toString(); + } + +} diff --git a/src/main/java/com/iemr/common/data/users/ProviderServiceAddressMapping.java b/src/main/java/com/iemr/common/data/users/ProviderServiceAddressMapping.java index 4a94c33d..df4384b1 100644 --- a/src/main/java/com/iemr/common/data/users/ProviderServiceAddressMapping.java +++ b/src/main/java/com/iemr/common/data/users/ProviderServiceAddressMapping.java @@ -81,6 +81,14 @@ public class ProviderServiceAddressMapping @Expose @Column(name = "LocationName") private String locationName; + + @Expose + @Column(name = "AbdmFacilityID") + private String abdmFacilityID; + + @Expose + @Column(name = "AbdmFacilityName") + private String abdmFacilityName; // public ProviderServiceAddressMapping() // { @@ -149,4 +157,5 @@ public String getLocationName() { return locationName; } + } diff --git a/src/main/java/com/iemr/common/repository/abdmfacility/AbdmFacilityRepository.java b/src/main/java/com/iemr/common/repository/abdmfacility/AbdmFacilityRepository.java new file mode 100644 index 00000000..6f4c6bc2 --- /dev/null +++ b/src/main/java/com/iemr/common/repository/abdmfacility/AbdmFacilityRepository.java @@ -0,0 +1,17 @@ +package com.iemr.common.repository.abdmfacility; + +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import com.iemr.common.data.users.ProviderServiceAddressMapping; + +@Repository +public interface AbdmFacilityRepository extends CrudRepository { + + @Query("SELECT v from ProviderServiceAddressMapping v where v.pSAddMapID=:pssmID order by 1 desc") + ProviderServiceAddressMapping getAbdamFacility(@Param("pssmID") int pssmID); + +} + \ No newline at end of file diff --git a/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityService.java b/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityService.java new file mode 100644 index 00000000..997e6735 --- /dev/null +++ b/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityService.java @@ -0,0 +1,7 @@ +package com.iemr.common.service.abdmfacility; + +public interface AbdmFacilityService { + + public String getMappedAbdmFacility(int psmId); + +} diff --git a/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java b/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java new file mode 100644 index 00000000..1e8be8c7 --- /dev/null +++ b/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java @@ -0,0 +1,22 @@ +package com.iemr.common.service.abdmfacility; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.iemr.common.data.users.ProviderServiceAddressMapping; +import com.iemr.common.repository.abdmfacility.AbdmFacilityRepository; + +@Service +public class AbdmFacilityServiceImpl implements AbdmFacilityService{ + + @Autowired + private AbdmFacilityRepository abdmFacilityRepo; + + @Override + public String getMappedAbdmFacility(int psmId) { + ProviderServiceAddressMapping res = abdmFacilityRepo.getAbdamFacility(psmId); + return res.toString(); + + } + +} From e97530529ba5a416da8f22fdf2ef8e86b2cd6637 Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:57:03 +0530 Subject: [PATCH 2/4] changed the method name according to suggestion --- .../common/controller/abdmfacility/AbdmFacilityController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java b/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java index 81221850..9ec79f65 100644 --- a/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java +++ b/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java @@ -28,7 +28,7 @@ public class AbdmFacilityController { @CrossOrigin @Operation(summary = "Get Abdm facility mapped to worklocation") @GetMapping(value = { "/getWorklocationMappedAbdmFacility/{workLocationId}" }) - public String getStoreStockDetails(@PathVariable int workLocationId, @RequestHeader(value = "Authorization") String Authorization) { + public String getAbdmFacilityDetails(@PathVariable int workLocationId, @RequestHeader(value = "Authorization") String Authorization) { OutputResponse response = new OutputResponse(); From 60937ed6f361499b0660cdb82725c779c3d6cbfe Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Sun, 8 Dec 2024 00:57:39 +0530 Subject: [PATCH 3/4] updating repo name type mistake Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .../repository/abdmfacility/AbdmFacilityRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/common/repository/abdmfacility/AbdmFacilityRepository.java b/src/main/java/com/iemr/common/repository/abdmfacility/AbdmFacilityRepository.java index 6f4c6bc2..2b461399 100644 --- a/src/main/java/com/iemr/common/repository/abdmfacility/AbdmFacilityRepository.java +++ b/src/main/java/com/iemr/common/repository/abdmfacility/AbdmFacilityRepository.java @@ -10,8 +10,8 @@ @Repository public interface AbdmFacilityRepository extends CrudRepository { - @Query("SELECT v from ProviderServiceAddressMapping v where v.pSAddMapID=:pssmID order by 1 desc") - ProviderServiceAddressMapping getAbdamFacility(@Param("pssmID") int pssmID); + @Query("SELECT v from ProviderServiceAddressMapping v where v.pSAddMapID = :pssmID") + ProviderServiceAddressMapping getAbdmFacility(@Param("pssmID") int pssmID); } \ No newline at end of file From c5c73cf5f8aeaabda87f8fe6a43d7dedaccddc52 Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Sun, 8 Dec 2024 01:05:45 +0530 Subject: [PATCH 4/4] Update AbdmFacilityServiceImpl.java --- .../common/service/abdmfacility/AbdmFacilityServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java b/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java index 1e8be8c7..e6da2522 100644 --- a/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java +++ b/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java @@ -14,7 +14,7 @@ public class AbdmFacilityServiceImpl implements AbdmFacilityService{ @Override public String getMappedAbdmFacility(int psmId) { - ProviderServiceAddressMapping res = abdmFacilityRepo.getAbdamFacility(psmId); + ProviderServiceAddressMapping res = abdmFacilityRepo.getAbdmFacility(psmId); return res.toString(); }