Feature/incentive changes 3.8.2

src/main/environment/common_ci.properties

@@ -43,3 +43,10 @@ abha.client.id=@env.ABHA_CLIENT_ID@
 abha.client.secret=@env.ABHA_CLIENT_SECRET@
 abha.token.url=@env.ABHA_TOKEN_URL@
 abha.xcmid=@env.ABHA_XCM_ID@
+
+# GovThealth API Config
+govthealth.user.details.url=@env.GOVTHEALTH_USER_DETAILS_URL@
+govthealth.user.id=@env.GOVTHEALTH_USER_ID@
+govthealth.password=@env.GOVTHEALTH_PASSWORD@
+
+

src/main/environment/common_docker.properties

@@ -43,5 +43,10 @@ abha.client.secret=${ABHA_CLIENT_SECRET}
 abha.token.url=${ABHA_TOKEN_URL}
 abha.xcmid=${ABHA_XCM_ID}
 
+# GovThealth API Config
+govthealth.user.details.url=${GOVTHEALTH_USER_DETAILS_URL}
+govthealth.user.id=${GOVTHEALTH_USER_ID}
+govthealth.password=${GOVTHEALTH_PASSWORD}
+
 
 

src/main/java/com/iemr/flw/controller/AbhaBeneficiaryController.java

@@ -0,0 +1,54 @@
+package com.iemr.flw.controller;
+
+import com.iemr.flw.domain.iemr.AdolescentHealth;
+import com.iemr.flw.dto.abhaBeneficiary.AbhaBeneficiaryDTO;
+import com.iemr.flw.dto.identity.GetBenRequestHandler;
+import com.iemr.flw.dto.iemr.AbhaRequestDTO;
+import com.iemr.flw.service.AbhaBeneficiaryService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+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 java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/UserRegistration")
+public class AbhaBeneficiaryController {
+    @Autowired
+    private AbhaBeneficiaryService abhaBeneficiaryService;
+
+    private final org.slf4j.Logger logger = LoggerFactory.getLogger(AbhaBeneficiaryController.class);
+
+
+
+    @RequestMapping(value = "/GetUserDetailsByAyushmanCardNo",method = RequestMethod.POST)
+    public ResponseEntity<Map<String,Object>> getAllAdolescentHealth(@RequestBody AbhaRequestDTO request ) {
+        Map<String,Object> response = new HashMap<>();
+        try {
+            if(request.getCardNo()!=null){
+                Object abhaBeneficiaryDTOList = abhaBeneficiaryService.getBeneficiaryByAbha(request);
+
+                if (abhaBeneficiaryDTOList != null ) {
+                    response.put("statusCode",200);
+                    response.put("data", abhaBeneficiaryDTOList);
+                } else {
+                    response.put("statusCode", 5000);
+                    response.put("error", "Invalid/NULL request obj");
+                }
+            }
+
+        } catch (Exception e) {
+            logger.error("Error in get data : " + e);
+            response.put("statusCode",5000);
+            response.put("error","Error in get data : " + e);
+
+        }
+        return ResponseEntity.ok(response);
+    }
+}

src/main/java/com/iemr/flw/controller/ChildCareController.java

@@ -7,9 +7,12 @@
 import com.iemr.flw.domain.iemr.HbncVisit;
 import com.iemr.flw.domain.iemr.IfaDistribution;
 import com.iemr.flw.domain.iemr.SamVisitResponseDTO;
+import com.iemr.flw.domain.iemr.UserServiceRole;
 import com.iemr.flw.dto.identity.GetBenRequestHandler;
 import com.iemr.flw.dto.iemr.*;
+import com.iemr.flw.repo.iemr.UserServiceRoleRepo;
 import com.iemr.flw.service.ChildCareService;
+import com.iemr.flw.service.UserService;
 import com.iemr.flw.utils.JwtUtil;
 import com.iemr.flw.utils.response.OutputResponse;
 
@@ -39,9 +42,14 @@ public class ChildCareController {
     @Autowired
     private ChildCareService childCareService;
 
+    @Autowired
+    private UserService userService;
+
     @Autowired
     private JwtUtil jwtUtil;
 
+    @Autowired
+    private UserServiceRoleRepo userServiceRoleRepo;
     @Operation(summary = "save HBYC details")
     @RequestMapping(value = {"/hbycVisit/saveAll"}, method = {RequestMethod.POST})
     public String saveHbycRecords(@RequestBody List<HbycRequestDTO> hbycDTOs,
@@ -117,7 +125,7 @@ public String saveHBNCVisit(@RequestBody List<HbncRequestDTO> hbncRequestDTOs,
             }
         } catch (Exception e) {
             logger.error("Error saving HBNC visit: ", e);
-            response.setError(500, "Server error: " + e.getMessage());
+            response.setError(5000, "Server error: " + e.getMessage());
         }
         return response.toString();
     }
@@ -153,7 +161,7 @@ public ResponseEntity<StandardResponse<List<HbncVisitResponseDTO>>> getHBNCVisit
         } catch (Exception e) {
             logger.error("Exception in fetching HBNC visits", e);
 
-            response.setStatusCode(500);
+            response.setStatusCode(5000);
             response.setStatus("Failed");
             response.setErrorMessage("Internal Server Error: " + e.getMessage());
             response.setData(null);
@@ -249,7 +257,7 @@ public ResponseEntity<?> saveSevereAcuteMalnutrition(@RequestBody List<SamDTO> s
 
             if(token!=null){
                 Integer userId = jwtUtil.extractUserId(token);
-                String userName = jwtUtil.extractUsername(token);
+                String userName = userService.getUserDetail(userId).getUserName();
                 String responseObject = childCareService.saveSamDetails(samRequest,userId,userName);
 
                 if (responseObject != null) {
@@ -270,7 +278,7 @@ public ResponseEntity<?> saveSevereAcuteMalnutrition(@RequestBody List<SamDTO> s
 
         } catch (Exception e) {
             logger.error("Error saving SAM details:", e);
-            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("statusCode",5000);
             response.put("errorMessage", e.getMessage());
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
         }
@@ -295,7 +303,7 @@ public ResponseEntity<?> getAllSevereAcuteMalnutrition(@RequestBody GetBenReques
 
         } catch (Exception e) {
             logger.error("Error fetching SAM records:", e);
-            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("statusCode", 5000);
             response.put("errorMessage", e.getMessage());
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
         }
@@ -313,9 +321,8 @@ public ResponseEntity<?> saveOrsDistribution(@RequestBody List<OrsDistributionDT
                 response.put("message", "Request body cannot be empty");
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
             }
-           if(token!=null){
-               Integer userId = jwtUtil.extractUserId(token);
-               String responseObject = childCareService.saveOrsDistributionDetails(orsDistributionDTOS,userId);
+           if(!orsDistributionDTOS.isEmpty()){
+               String responseObject = childCareService.saveOrsDistributionDetails(orsDistributionDTOS);
 
                if (responseObject != null) {
                    response.put("statusCode", HttpStatus.OK.value());
@@ -336,7 +343,7 @@ public ResponseEntity<?> saveOrsDistribution(@RequestBody List<OrsDistributionDT
 
         } catch (Exception e) {
             logger.error("Error saving ORS:", e);
-            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("statusCode", 5000);
             response.put("errorMessage", e.getMessage());
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
         }
@@ -355,14 +362,14 @@ public ResponseEntity<?> getAllOrDistribution(@RequestBody GetBenRequestHandler
                 response.put("data", responseObject);
                 return ResponseEntity.ok(response);
             } else {
-                response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+                response.put("statusCode", 5000);
                 response.put("message", "No ORS records found");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
             }
 
         } catch (Exception e) {
             logger.error("Error fetching ORS records:", e);
-            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("statusCode", 5000);
             response.put("errorMessage", e.getMessage());
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
         }
@@ -402,7 +409,7 @@ public ResponseEntity<?> saveIfDistribution(@RequestBody List<IfaDistributionDTO
 
         } catch (Exception e) {
             logger.error("Error saving IFA:", e);
-            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("statusCode", 5000);
             response.put("errorMessage", e.getMessage());
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
         }
@@ -428,7 +435,7 @@ public ResponseEntity<?> getIfaDistribution(@RequestBody GetBenRequestHandler re
 
         } catch (Exception e) {
             logger.error("Error fetching IFA records:", e);
-            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("statusCode", 5000);
             response.put("errorMessage", e.getMessage());
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
         }

src/main/java/com/iemr/flw/controller/DiseaseControlController.java

@@ -210,6 +210,8 @@ public ResponseEntity<Map<String, Object>> getAllLeprosy(
                 response.put("statusCode", 5000);
             }
         } catch (Exception e) {
+            logger.info("Fail leprosy: "+e.getMessage());
+            logger.info("Fail leprosy full error: "+e);
             response.put("status", "Error: " + e.getMessage());
             response.put("statusCode", 5000);
         }
@@ -240,6 +242,8 @@ public ResponseEntity<Map<String, Object>> getAllLeprosyFollowUp(
                 response.put("statusCode", 5000);
             }
         } catch (Exception e) {
+            logger.info("Fail leprosy followUp: "+e.getMessage());
+            logger.info("Fail leprosy  full error: "+e);
             response.put("status", "Error: " + e.getMessage());
             response.put("statusCode", 5000);
         }
@@ -256,6 +260,8 @@ public ResponseEntity<Map<String, Object>> getAllData(
             response.put("data", diseaseControlService.getAllScreeningData(getDiseaseRequestHandler));
 
         } catch (Exception e) {
+            logger.info("getAllDisease "+e.getMessage());
+            logger.info("Fail getAllDisease  full error: "+e);
             response.put("status", "Error" + e.getMessage());
             response.put("statusCode", 5000);
         }

src/main/java/com/iemr/flw/controller/IRSRoundController.java

@@ -5,6 +5,7 @@
 import com.iemr.flw.dto.iemr.IRSRoundListDTO;
 import com.iemr.flw.repo.iemr.UserServiceRoleRepo;
 import com.iemr.flw.service.IRSRoundService;
+import com.iemr.flw.service.UserService;
 import com.iemr.flw.utils.JwtUtil;
 import com.iemr.flw.utils.response.OutputResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@ public class IRSRoundController {
     private JwtUtil jwtUtil;
 
     @Autowired
-    private UserServiceRoleRepo userServiceRoleRepo;
+    private UserService userService;
 
     @PostMapping(value = "/add")
     public ResponseEntity<Map<String, Object>> addRound(@RequestBody IRSRoundListDTO dto,@RequestHeader("jwtToken") String token) {
@@ -42,7 +43,7 @@ public ResponseEntity<Map<String, Object>> addRound(@RequestBody IRSRoundListDTO
                     return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response) ;
                 }
                 Integer userId = jwtUtil.extractUserId(token);
-                List<IRSRound> s = irsRoundService.addRounds(dto.getRounds(), userId, userServiceRoleRepo.getUserNamedByUserId(userId));
+                List<IRSRound> s = irsRoundService.addRounds(dto.getRounds(), userId, userService.getUserDetail(userId).getUserName());
                 if (s.size() != 0) {
                     Map<String, Object> data = new HashMap<>();
                                   data.put("entries", s);

src/main/java/com/iemr/flw/controller/IncentiveController.java

@@ -67,7 +67,7 @@ public String saveIncentiveMasterData(@RequestBody IncentiveRequestDTO incentive
             // add logic for different state or district
             if (incentiveRequestDTO != null) {
                 String s = incentiveService.getIncentiveMaster(incentiveRequestDTO);
-                logger.info("All incentives" + s);
+              //  logger.info("All incentives" + s);
 
                 if (s != null)
                     response.setResponse(s);
@@ -94,7 +94,7 @@ public String getAllIncentivesByUserId(@RequestBody GetBenRequestHandler request
                 logger.info("request object with timestamp : " + new Timestamp(System.currentTimeMillis()) + " "
                         + requestDTO);
                 String s = incentiveService.getAllIncentivesByUserId(requestDTO);
-                logger.info("User Incentive:" + s);
+                //logger.info("User Incentive:" + s);
                 if (s != null)
                     response.setResponse(s);
                 else

src/main/java/com/iemr/flw/controller/MalariaFollowUpController.java

@@ -29,6 +29,8 @@
 import com.iemr.flw.dto.iemr.MalariaFollowUpDTO;
 import com.iemr.flw.service.MalariaFollowUpService;
 import com.iemr.flw.utils.JwtUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -40,6 +42,7 @@
 @RestController
 @RequestMapping(value = "/follow-up", headers = "Authorization")
 public class MalariaFollowUpController {
+    private final Logger logger = LoggerFactory.getLogger(MalariaFollowUpController.class);
 
     @Autowired
     private JwtUtil jwtUtil;
@@ -88,6 +91,8 @@ public ResponseEntity<Map<String, Object>> getFollowUpsByUserId(@RequestBody Get
             }
 
         } catch (Exception e) {
+            logger.info("Fail Malaria followUp: "+e.getMessage());
+            logger.info("Fail Malaria  full error: "+e);
             response.put("status", "Error: " + e.getMessage());
             response.put("statusCode", 5000);
         }

src/main/java/com/iemr/flw/domain/iemr/AbhaApiResponse.java

@@ -0,0 +1,21 @@
+package com.iemr.flw.domain.iemr;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.iemr.flw.dto.abhaBeneficiary.AbhaBeneficiaryDTO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AbhaApiResponse {
+
+    @JsonProperty("status_code")
+    private String statusCode;
+
+    private String message;
+
+    @JsonProperty("data")
+    @JsonAlias("object_data")
+    private List<AbhaBeneficiaryDTO> data;
+}

src/main/java/com/iemr/flw/dto/abhaBeneficiary/AbhaBeneficiaryDTO.java

@@ -0,0 +1,65 @@
+package com.iemr.flw.dto.abhaBeneficiary;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class AbhaBeneficiaryDTO {
+    @JsonProperty("personName")
+    private String personName;
+
+    private String firstName;
+
+    private String lastName;
+
+    @JsonProperty("age")
+    private String age;
+
+    @JsonProperty("address")
+    private String address;
+
+    @JsonProperty("district")
+    private String district;
+
+    @JsonProperty("mobileNo")
+    private String mobileNo;
+
+    @JsonProperty("block")
+    private String block;
+
+    @JsonProperty("cardNo")
+    private String cardNo;
+
+    @JsonProperty("villagename")
+    private String villagename;
+
+    @JsonProperty("gender")
+    private String gender;
+
+    @JsonProperty("district_Code")
+    private String districtCode;
+
+    @JsonProperty("block_Code")
+    private String blockCode;
+
+    @JsonProperty("village_Code")
+    private String villageCode;
+
+    @JsonProperty("rural_Urban")
+    private String ruralUrban;
+
+    @JsonProperty("abhaId")
+    private String abhaId;
+
+    @JsonProperty("vvs")
+    private String vvs;
+
+    @JsonProperty("familyid")
+    private String familyid;
+
+    @JsonProperty("dob")
+    @JsonAlias("dob_secc")
+    private String dob;
+
+}