Incentive changes 3.8.0

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.iemr.common.flw</groupId>
     <artifactId>flw-api</artifactId>
-    <version>3.7.0</version>
+    <version>3.8.0</version>
     <packaging>war</packaging>
 
     <name>FLW-API</name>

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

@@ -1,35 +1,21 @@
 package com.iemr.flw.controller;
 
 import com.iemr.flw.domain.iemr.AshaWorker;
-import com.iemr.flw.domain.iemr.M_User;
-import com.iemr.flw.dto.iemr.UserServiceRoleDTO;
-import com.iemr.flw.repo.iemr.UserServiceRoleRepo;
 import com.iemr.flw.service.AshaProfileService;
 import com.iemr.flw.service.EmployeeMasterInter;
-import com.iemr.flw.service.UserService;
 import io.lettuce.core.dynamic.annotation.Param;
 import com.iemr.flw.utils.JwtUtil;
-import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 
-import com.iemr.flw.utils.JwtAuthenticationUtil;
-import com.iemr.flw.utils.JwtUtil;
-import com.iemr.flw.utils.exception.IEMRException;
-import io.jsonwebtoken.Claims;
-import io.swagger.v3.oas.annotations.Operation;
-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.*;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 @RestController
 @RequestMapping(value = "/asha", produces = "application/json")

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

@@ -84,8 +84,8 @@ public String getCdrRecords(@RequestBody GetBenRequestHandler requestDTO,
             logger.info("fetching All CDR Details for user: " + requestDTO.getAshaId());
             if (requestDTO != null) {
                 List<CdrDTO> result = deathReportsService.getCdrRecords(requestDTO);
-                Gson gson = new GsonBuilder()
-                        .setDateFormat("MMM dd, yyyy h:mm:ss a") // Set the desired date format
+                Gson gson = new GsonBuilder()// Set the desired date format
+                        .setDateFormat("MMM dd, yyyy h:mm:ss a")
                         .create();
                 String s = gson.toJson(result);
                 if (s != null)
@@ -111,8 +111,8 @@ public String getMdsrRecords(@RequestBody GetBenRequestHandler requestDTO,
             logger.info("fetching All MDSR Details for user: " + requestDTO.getAshaId());
             if (requestDTO != null) {
                 List<MdsrDTO> result = deathReportsService.getMdsrRecords(requestDTO);
-                Gson gson = new GsonBuilder()
-                        .setDateFormat("MMM dd, yyyy h:mm:ss a") // Set the desired date format
+                Gson gson = new GsonBuilder()// Set the desired date format
+                        .setDateFormat("MMM dd, yyyy h:mm:ss a")
                         .create();
                 String s = gson.toJson(result);
                 if (s != null)

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

@@ -63,12 +63,12 @@ public ResponseEntity<Map<String, Object>> saveMalaria(@RequestBody MalariaDTO m
                  response.put("data", diseaseControlService.saveMalaria(malariaDTO));
              }else {
                  response.put("message", "Invalid request");
-                 response.put("statusCode", 400);
+                 response.put("statusCode", 5000);
              }
 
         } catch (Exception e) {
             response.put("status", "Error" + e.getMessage());
-            response.put("statusCode", 500);
+            response.put("statusCode", 5000);
         }
         return ResponseEntity.ok(response);
 
@@ -86,12 +86,12 @@ public ResponseEntity<Map<String, Object>> saveKalaAzar(@RequestBody KalaAzarDTO
                  response.put("data", diseaseControlService.saveKalaAzar(kalaAzarDTO));
              }else {
                  response.put("message", "Invalid request");
-                 response.put("statusCode", 400);
+                 response.put("statusCode", 5000);
              }
 
         } catch (Exception e) {
             response.put("status", "Error" + e.getMessage());
-            response.put("statusCode", 500);
+            response.put("statusCode", 5000);
         }
         return ResponseEntity.ok(response);
 
@@ -108,12 +108,12 @@ public ResponseEntity<Map<String, Object>> saveAESJE(@RequestBody AesJeDTO aesJe
                 response.put("data", diseaseControlService.saveAES(aesJeDTO));
             }else {
                 response.put("message", "Invalid request");
-                response.put("statusCode", 400);
+                response.put("statusCode", 5000);
             }
 
         } catch (Exception e) {
             response.put("status", "Error" + e.getMessage());
-            response.put("statusCode", 500);
+            response.put("statusCode", 5000);
         }
         return ResponseEntity.ok(response);
 
@@ -130,12 +130,12 @@ public ResponseEntity<Map<String, Object>> saveFilaria(@RequestBody FilariaDTO f
                 response.put("data", diseaseControlService.saveFilaria(filariaDTO));
             }else {
                 response.put("message", "Invalid request");
-                response.put("statusCode", 400);
+                response.put("statusCode", 5000);
             }
 
         } catch (Exception e) {
             response.put("status", "Error" + e.getMessage());
-            response.put("statusCode", 500);
+            response.put("statusCode", 5000);
         }
         return ResponseEntity.ok(response);
 
@@ -151,12 +151,12 @@ public ResponseEntity<Map<String, Object>> saveLeprosy(@RequestBody LeprosyDTO l
                 response.put("data", diseaseControlService.saveLeprosy(leprosyDTO));
             }else {
                 response.put("message", "Invalid request");
-                response.put("statusCode", 400);
+                response.put("statusCode", 5000);
             }
 
         } catch (Exception e) {
             response.put("status", "Error" + e.getMessage());
-            response.put("statusCode", 500);
+            response.put("statusCode", 5000);
         }
         return ResponseEntity.ok(response);
 
@@ -175,11 +175,11 @@ public ResponseEntity<Map<String, Object>> saveLeprosyFollowUP(@RequestBody List
                 response.put("message", "All follow-ups saved successfully");
             } else {
                 response.put("message", "Invalid request - no follow-up data");
-                response.put("statusCode", 400);
+                response.put("statusCode", 5000);
             }
         } catch (Exception e) {
             response.put("status", "Error: " + e.getMessage());
-            response.put("statusCode", 500);
+            response.put("statusCode", 5000);
         }
         return ResponseEntity.ok(response);
 
@@ -203,15 +203,15 @@ public ResponseEntity<Map<String, Object>> getAllLeprosy(
                     response.put("data", result); // ← Put list directly, no gson.toJson()
                 } else {
                     response.put("message", "No record found");
-                    response.put("statusCode", 404);
+                    response.put("statusCode", 5000);
                 }
             } else {
                 response.put("message", "Invalid request - userName required");
-                response.put("statusCode", 400);
+                response.put("statusCode", 5000);
             }
         } catch (Exception e) {
             response.put("status", "Error: " + e.getMessage());
-            response.put("statusCode", 500);
+            response.put("statusCode", 5000);
         }
         return ResponseEntity.ok(response); // ← Spring serializes the whole map
     }
@@ -233,15 +233,15 @@ public ResponseEntity<Map<String, Object>> getAllLeprosyFollowUp(
                     response.put("data", result); // ← Put list directly, no gson.toJson()
                 } else {
                     response.put("message", "No record found");
-                    response.put("statusCode", 404);
+                    response.put("statusCode", 5000);
                 }
             } else {
                 response.put("message", "Invalid request - userName required");
-                response.put("statusCode", 400);
+                response.put("statusCode", 5000);
             }
         } catch (Exception e) {
             response.put("status", "Error: " + e.getMessage());
-            response.put("statusCode", 500);
+            response.put("statusCode", 5000);
         }
         return ResponseEntity.ok(response); // ← Spring serializes the whole map
     }
@@ -257,7 +257,7 @@ public ResponseEntity<Map<String, Object>> getAllData(
 
         } catch (Exception e) {
             response.put("status", "Error" + e.getMessage());
-            response.put("statusCode", 500);
+            response.put("statusCode", 5000);
         }
         return ResponseEntity.ok(response);
     }

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

@@ -77,7 +77,7 @@ public ResponseEntity<Map<String, Object>> getBeneficiaryDataByAsha(@RequestBody
 
         } catch (Exception e) {
             logger.error("Error in get data : " + e);
-            response.put("status", 500);
+            response.put("statusCode", 5000);
             response.put("message", "Error in get data : " + e);
         }
         return ResponseEntity.ok(response);

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

@@ -4,6 +4,7 @@
 import com.iemr.flw.dto.iemr.IRSRoundDTO;
 import com.iemr.flw.dto.iemr.IRSRoundListDTO;
 import com.iemr.flw.service.IRSRoundService;
+import com.iemr.flw.utils.JwtUtil;
 import com.iemr.flw.utils.response.OutputResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -24,12 +25,19 @@ public class IRSRoundController {
     @Autowired
     private IRSRoundService irsRoundService;
 
+    @Autowired
+    private JwtUtil jwtUtil;
+
     @PostMapping(value = "/add")
-    public ResponseEntity<Map<String, Object>> addRound(@RequestBody IRSRoundListDTO dto) {
+    public ResponseEntity<Map<String, Object>> addRound(@RequestBody IRSRoundListDTO dto,@RequestHeader("jwtToken") String token) {
         Map<String, Object> response = new LinkedHashMap<>();
         try {
             if (dto.getRounds().size() != 0) {
-                List<IRSRound> s = irsRoundService.addRounds(dto.getRounds());
+                if(token==null){
+                    response.put("statusCode", 401);
+                    return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response) ;
+                }
+                List<IRSRound> s = irsRoundService.addRounds(dto.getRounds(),jwtUtil.extractUserId(token),jwtUtil.extractUsername(token));
                 if (s.size() != 0) {
                     Map<String, Object> data = new HashMap<>();
                                   data.put("entries", s);

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

@@ -29,6 +29,9 @@ public class IncentiveController {
     @Autowired
     IncentiveService incentiveService;
 
+    @Autowired
+    private JwtUtil jwtUtil;
+
     @Operation(summary = "save incentive master")
     @RequestMapping(value = {"/masterData/saveAll"}, method = {RequestMethod.POST})
     public String saveIncentiveMasterData(@RequestBody List<IncentiveActivityDTO> activityDTOS, @RequestHeader(value = "Authorization") String authorization, HttpServletRequest request) {
@@ -81,11 +84,17 @@ public String saveIncentiveMasterData(@RequestBody IncentiveRequestDTO incentive
     @Operation(summary = "get high risk assessment data of all beneficiaries registered with given user id")
     @RequestMapping(value = {"/fetchUserData"}, method = {RequestMethod.POST})
     public String getAllIncentivesByUserId(@RequestBody GetBenRequestHandler requestDTO,
-                                           @RequestHeader(value = "Authorization") String Authorization) {
+                                           @RequestHeader(value = "jwtToken") String token) {
         OutputResponse response = new OutputResponse();
         try {
 
             if (requestDTO != null) {
+
+                if(token!=null){
+                    requestDTO.setUserId(jwtUtil.extractUserId(token));
+                    requestDTO.setAshaId(jwtUtil.extractUserId(token));
+                    requestDTO.setUserName(jwtUtil.extractUsername(token));
+                }
                 logger.info("request object with timestamp : " + new Timestamp(System.currentTimeMillis()) + " "
                         + requestDTO);
                 String s = incentiveService.getAllIncentivesByUserId(requestDTO);
@@ -103,8 +112,8 @@ public String getAllIncentivesByUserId(@RequestBody GetBenRequestHandler request
         return response.toString();
     }
 
-    @RequestMapping(value = {"/update"}, method = RequestMethod.POST)
-    public String updateIncentive(@RequestBody PendingActivityDTO requestDTO) {
+    @RequestMapping(value = {"/update"}, method = RequestMethod.POST, consumes = {"multipart/form-data"})
+    public String updateIncentive(@ModelAttribute  PendingActivityDTO requestDTO) {
         OutputResponse response = new OutputResponse();
         try {
 
@@ -116,12 +125,12 @@ public String updateIncentive(@RequestBody PendingActivityDTO requestDTO) {
                 if (s != null)
                     response.setResponse(s);
                 else
-                    response.setError(5000, "No record found");
+                    response.setError(500, "No record found");
             } else
-                response.setError(5000, "Invalid/NULL request obj");
+                response.setError(500, "Invalid/NULL request obj");
         } catch (Exception e) {
             logger.error("Error in high risk assessment data : " + e);
-            response.setError(5000, "Error in high risk assessment data : " + e);
+            response.setError(500, "Error in high risk assessment data : " + e);
         }
         return response.toString();
 

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

@@ -78,7 +78,7 @@ public ResponseEntity<Map<String, Object>> getFollowUpsByUserId(@RequestBody Get
             }
         } catch (Exception e) {
             response.put("status", "Error: " + e.getMessage());
-            response.put("statusCode", 500);
+            response.put("statusCode", 5000);
         }
         return ResponseEntity.ok(response);
 

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

@@ -26,7 +26,7 @@
 import java.util.List;
 
 @RestController
-@RequestMapping(value = "/maternalCare", headers = "Authorization", consumes = "application/json", produces = "application/json")
+@RequestMapping(value = "/maternalCare", consumes = "application/json", produces = "application/json")
 public class MaternalHealthController {
 
     private final Logger logger = LoggerFactory.getLogger(CoupleController.class);
@@ -98,16 +98,19 @@ public String getPregnantWomanList(@RequestBody GetBenRequestHandler requestDTO,
     @Operation(summary = "save anc visit details")
     @RequestMapping(value = { "/ancVisit/saveAll" }, method = { RequestMethod.POST })
     public String saveANCVisit(@RequestBody List<ANCVisitDTO> ancVisitDTOs,
-            @RequestHeader(value = "Authorization") String Authorization) {
+            @RequestHeader(value = "jwtToken") String token) {
         OutputResponse response = new OutputResponse();
         try {
             if (ancVisitDTOs.size() != 0) {
                 logger.info("Saving ANC visits with timestamp : " + new Timestamp(System.currentTimeMillis()));
-                String s = maternalHealthService.saveANCVisit(ancVisitDTOs);
-                if (s != null)
-                    response.setResponse(s);
-                else
-                    response.setError(5000, "Saving anc data to db failed");
+                if(token!=null){
+                    String s = maternalHealthService.saveANCVisit(ancVisitDTOs,jwtUtil.extractUserId(token));
+                    if (s != null)
+                        response.setResponse(s);
+                    else
+                        response.setError(5000, "Saving anc data to db failed");
+                }
+
             } else
                 response.setError(5000, "Invalid/NULL request obj");
         } catch (Exception e) {
@@ -241,9 +244,9 @@ public String getDeliveryOutcome(@RequestBody GetBenRequestHandler requestDTO,
                 List<DeliveryOutcomeDTO> result = deliveryOutcomeService.getDeliveryOutcome(requestDTO);
                 Gson gson = new GsonBuilder().setDateFormat("MMM dd, yyyy h:mm:ss a").create();
                 String s = gson.toJson(result);
-                if (s != null)
-                    response.setResponse(s);
-                else
+                if (result != null && !result.isEmpty()) {
+                    response.setResponse(gson.toJson(result));
+                }else
                     response.setError(5000, "No record found");
             } else
                 response.setError(5000, "Invalid/NULL request obj");

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

@@ -17,7 +17,6 @@ public class DeliveryOutcome {
     @Column(name = "ben_id")
     private Long benId;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "MMM dd, yyyy, h:mm:ss a")
     @Column(name = "delivery_date")
     private Timestamp dateOfDelivery;
 
@@ -54,7 +53,6 @@ public class DeliveryOutcome {
     @Column(name = "still_birth")
     private Integer stillBirth;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "MMM dd, yyyy, h:mm:ss a")
     @Column(name = "discharge_date")
     private Timestamp dateOfDischarge;
 

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

@@ -53,7 +53,7 @@ public class HbycChildVisit {
     private String other_place_of_death;
 
     @Column(name = "baby_weight")
-    private BigDecimal baby_weight; // 0.5 - 7.0
+    private Integer baby_weight; // 0.5 - 7.0
 
     @Column(name = "is_child_sick")
     private Boolean is_child_sick;

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

@@ -28,4 +28,10 @@ public class IRSRound {
     @Column(name = "householdId")
     private Long householdId;
 
+    @Column(name = "created_by")
+    private String createdBy;
+
+    @Column(name = "user_id")
+    private Integer userId;
+
 }