Bug/kala azar change desease

pom.xml

@@ -420,4 +420,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
+</project>

src/main/environment/common_ci.properties

@@ -35,3 +35,5 @@ source-address=@env.SMS_CONSENT_SOURCE_ADDRESS@
 sms-username=@env.SMS_USERNAME@
 sms-password=@env.SMS_PASSWORD@
 send-message-url=@env.SMS_MESSAGE_URL@
+
+#crash.logs.base.path=@env.CRASH_LOGS_PATH@

src/main/environment/common_docker.properties

@@ -1,5 +1,5 @@
-fhir-url = ${FHIR_URL}
-tm-url = ${TM_URL}
+fhir-url = ${FHIR_API}
+tm-url = ${TM_API}
 
 ##--------------------------------------------## Primary db-------------------------------------------------------------------
 
@@ -34,3 +34,8 @@ sms-username=${SMS_USERNAME}
 sms-password=${SMS_PASSWORD}
 
 send-message-url=${SMS_MESSAGE_URL}
+
+#crash.logs.base.path=${CRASH_LOGS_PATH}
+
+
+

src/main/environment/common_example.properties

@@ -36,6 +36,8 @@ sms-username=
 sms-password=
 send-message-url=
 
+crash.logs.base.path=<path used>
+
 
 
 

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

@@ -40,7 +40,7 @@ public class ChildCareController {
     @Operation(summary = "save HBYC details")
     @RequestMapping(value = {"/hbycVisit/saveAll"}, method = {RequestMethod.POST})
     public String saveHbycRecords(@RequestBody List<HbycRequestDTO> hbycDTOs,
-                                  @RequestHeader(value = "Authorization") String Authorization) {
+                                  @RequestHeader(value = "JwtToken") String token) {
         ObjectMapper mapper = new ObjectMapper();
         mapper.enable(SerializationFeature.INDENT_OUTPUT); // Pretty print
 

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

@@ -0,0 +1,63 @@
+package com.iemr.flw.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iemr.flw.dto.crashlogs.CrashLogRequest;
+import com.iemr.flw.service.CrashLogService;
+import com.iemr.flw.utils.JwtUtil;
+import com.iemr.flw.utils.response.OutputResponse;
+
+@RestController
+@RequestMapping(value = "/crash-logs", headers = "Authorization")
+public class CrashLogController {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Autowired
+    private CrashLogService crashLogService;
+
+    @Autowired
+    private JwtUtil jwtUtil;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @PostMapping(value = "/upload", consumes = "multipart/form-data")
+    public String uploadCrashLog(
+            @RequestHeader(value = "JwtToken") String jwtToken, // Changed from Authorization
+            @RequestParam("file") MultipartFile file,
+            @RequestParam("metadata") String metadataJson) {
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            // No need to remove "Bearer " prefix - JwtToken header contains raw JWT
+            Integer userId = jwtUtil.extractUserId(jwtToken);
+
+            // Parse metadata JSON
+            CrashLogRequest request = objectMapper.readValue(metadataJson, CrashLogRequest.class);
+
+            // Save crash log file
+            String filePath = crashLogService.saveCrashLog(request, userId, file);
+
+            // Build success response
+            response.setResponse("Crash log saved successfully. File path: " + filePath);
+            logger.info("Crash log uploaded successfully for userId: " + userId);
+
+        } catch (Exception e) {
+            logger.error("Error uploading crash log: " + e.getMessage(), e);
+            response.setError(e);
+        }
+
+        return response.toString();
+    }
+}

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

@@ -34,11 +34,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -314,5 +310,63 @@ public ResponseEntity<Map<String, Object>> getAllMobilizationMosquitoNet(@Reques
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
         }
     }
+    @RequestMapping(value = "cdtfVisit/saveAll", method = RequestMethod.POST)
+    public ResponseEntity<Map<String, Object>> saveVisit(
+            @RequestBody List<ChronicDiseaseVisitDTO> requestList,@RequestHeader(value = "JwtToken") String token) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+        logger.info("Chronic Disease Visit Save Request: {}", requestList);
+
+        try {
+            List<ChronicDiseaseVisitDTO> savedList =
+                    diseaseControlService.saveChronicDiseaseVisit(requestList,token);
+
+            if (savedList != null && !savedList.isEmpty()) {
+                response.put("statusCode", HttpStatus.OK.value());
+                response.put("message", "Data saved successfully");
+                response.put("data", savedList);
+                return ResponseEntity.ok(response);
+            } else {
+                response.put("statusCode", HttpStatus.BAD_REQUEST.value());
+                response.put("message", "No data saved");
+                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
+            }
+
+        } catch (Exception e) {
+            logger.error("Error saving Chronic Disease Visit :", e);
+            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("errorMessage", e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+        }
+    }
+
+    @RequestMapping(value = "cdtfVisit/getAll", method = RequestMethod.POST)
+    public ResponseEntity<Map<String, Object>> getVisitDetails(
+            @RequestBody GetBenRequestHandler getBenRequestHandler) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+
+        try {
+            List<ChronicDiseaseVisitDTO> result =
+                    diseaseControlService.getCdtfVisits(getBenRequestHandler);
+
+            if (result != null && !result.isEmpty()) {
+                response.put("statusCode", HttpStatus.OK.value());
+                response.put("data", result);
+                return ResponseEntity.ok(response);
+            } else {
+                response.put("statusCode", HttpStatus.NOT_FOUND.value());
+                response.put("message", "No records found");
+                return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response);
+            }
+
+        } catch (Exception e) {
+            logger.error("Error fetching Chronic Disease Visit :", e);
+            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("errorMessage", e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+        }
+    }
+
 
 }

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

@@ -3,6 +3,7 @@
 import com.iemr.flw.dto.identity.GetBenRequestHandler;
 import com.iemr.flw.dto.iemr.IncentiveActivityDTO;
 import com.iemr.flw.dto.iemr.IncentiveRequestDTO;
+import com.iemr.flw.dto.iemr.PendingActivityDTO;
 import com.iemr.flw.service.IncentiveService;
 import com.iemr.flw.utils.JwtUtil;
 import com.iemr.flw.utils.response.OutputResponse;
@@ -29,8 +30,8 @@ public class IncentiveController {
     IncentiveService incentiveService;
 
     @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) {
+    @RequestMapping(value = {"/masterData/saveAll"}, method = {RequestMethod.POST})
+    public String saveIncentiveMasterData(@RequestBody List<IncentiveActivityDTO> activityDTOS, @RequestHeader(value = "Authorization") String authorization, HttpServletRequest request) {
         OutputResponse response = new OutputResponse();
         try {
             logger.info("Saving All incentives");
@@ -50,9 +51,9 @@ public String saveIncentiveMasterData(@RequestBody List<IncentiveActivityDTO> ac
     }
 
     @Operation(summary = "get incentive master")
-    @RequestMapping(value = { "/masterData/getAll" }, method = { RequestMethod.POST })
+    @RequestMapping(value = {"/masterData/getAll"}, method = {RequestMethod.POST})
     public String saveIncentiveMasterData(@RequestBody IncentiveRequestDTO incentiveRequestDTO,
-            @RequestHeader(value = "Authorization") String Authorization) {
+                                          @RequestHeader(value = "Authorization") String Authorization) {
         OutputResponse response = new OutputResponse();
         try {
 
@@ -61,7 +62,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);
@@ -77,21 +78,18 @@ 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 })
+    @RequestMapping(value = {"/fetchUserData"}, method = {RequestMethod.POST})
     public String getAllIncentivesByUserId(@RequestBody GetBenRequestHandler requestDTO,
-            @RequestHeader(value = "Authorization") String Authorization) {
+                                           @RequestHeader(value = "Authorization") String Authorization) {
         OutputResponse response = new OutputResponse();
         try {
 
             if (requestDTO != null) {
                 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
@@ -105,4 +103,29 @@ public String getAllIncentivesByUserId(@RequestBody GetBenRequestHandler request
         return response.toString();
     }
 
+    @RequestMapping(value = {"/update"}, method = RequestMethod.POST, consumes = {"multipart/form-data"})
+    public String updateIncentive(@ModelAttribute  PendingActivityDTO requestDTO) {
+        OutputResponse response = new OutputResponse();
+        try {
+
+            if (requestDTO != null) {
+                logger.info("request object with timestamp : " + new Timestamp(System.currentTimeMillis()) + " "
+                        + requestDTO);
+                String s = incentiveService.updateIncentive(requestDTO);
+                logger.info("User Incentive:" + s);
+                if (s != null)
+                    response.setResponse(s);
+                else
+                    response.setError(500, "No record found");
+            } else
+                response.setError(500, "Invalid/NULL request obj");
+        } catch (Exception e) {
+            logger.error("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/MaaMeetingController.java

@@ -35,6 +35,62 @@ public MaaMeetingController(MaaMeetingService service) {
 
     @PostMapping(value = "/saveAll", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<?> saveMeeting(
+
+            @RequestPart(value = "villageName", required = false) String villageName,
+            @RequestPart(value = "noOfPragnentWoment", required = false) String noOfPragnentWomen,
+            @RequestPart(value = "noOfLactingMother", required = false) String noOfLactingMother,
+            @RequestPart(value = "mitaninActivityCheckList", required = false) String mitaninActivityCheckList,
+            @RequestPart(value = "meetingDate") String meetingDate,
+            @RequestPart(value = "place", required = false) String place,
+            @RequestPart(value = "participants") String participants,
+            @RequestPart(value = "ashaId", required = false) String ashaId,
+            @RequestPart(value = "createdBy", required = false) String createdBy,
+            @RequestPart(value = "meetingImages", required = false) List<MultipartFile> meetingImages
+    ) {
+        try {
+            MaaMeetingRequestDTO dto = new MaaMeetingRequestDTO();
+
+            if (meetingDate != null && !meetingDate.isEmpty()) {
+                dto.setMeetingDate(LocalDate.parse(meetingDate));
+            }
+
+            dto.setPlace(place);
+            dto.setVillageName(villageName);
+            dto.setMitaninActivityCheckList(mitaninActivityCheckList);
+            dto.setCreatedBY(createdBy);
+
+            if (participants != null && !participants.isEmpty()) {
+                dto.setParticipants(Integer.parseInt(participants));
+            }
+
+            if (ashaId != null && !ashaId.isEmpty()) {
+                dto.setAshaId(Integer.parseInt(ashaId));
+            }
+
+            if (noOfLactingMother != null && !noOfLactingMother.isEmpty()) {
+                dto.setNoOfLactingMother(Integer.parseInt(noOfLactingMother));
+            }
+
+            if (noOfPragnentWomen != null && !noOfPragnentWomen.isEmpty()) {
+                dto.setNoOfPragnentWomen(Integer.parseInt(noOfPragnentWomen));
+            }
+
+            if (meetingImages != null && !meetingImages.isEmpty()) {
+                dto.setMeetingImages(meetingImages.toArray(new MultipartFile[0]));
+            }
+
+            service.saveMeeting(dto);
+
+            return ResponseEntity.ok("Saved Successfully");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
+    }
+
+    @PostMapping(value = "/update", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseEntity<?> updateMeeting(
             @RequestPart("meetingDate") String meetingDate,
             @RequestPart("place") String place,
             @RequestPart("participants") String participants,
@@ -43,14 +99,34 @@ public ResponseEntity<?> saveMeeting(
             @RequestPart(value = "meetingImages", required = false) List<MultipartFile> meetingImages) {
         try {
             MaaMeetingRequestDTO dto = new MaaMeetingRequestDTO();
-            dto.setMeetingDate(LocalDate.parse(meetingDate));
-            dto.setPlace(place);
-            dto.setParticipants(Integer.parseInt(participants));
-            dto.setAshaId(Integer.parseInt(ashaId));
-            dto.setCreatedBY(createdBy);
-            dto.setMeetingImages(meetingImages != null ? meetingImages.toArray(new MultipartFile[0]) : null);
+            if (meetingDate != null) {
+                dto.setMeetingDate(LocalDate.parse(meetingDate));
 
-            service.saveMeeting(dto);
+            }
+            if (place != null) {
+                dto.setPlace(place);
+
+            }
+            if (participants != null) {
+                dto.setParticipants(Integer.parseInt(participants));
+
+            }
+            if (ashaId != null) {
+                dto.setAshaId(Integer.parseInt(ashaId));
+
+            }
+            if (createdBy != null) {
+                dto.setCreatedBY(createdBy);
+
+            }
+            if (meetingImages != null) {
+                dto.setMeetingImages(meetingImages != null ? meetingImages.toArray(new MultipartFile[0]) : null);
+
+            }
+            if (dto != null) {
+                service.updateMeeting(dto);
+
+            }
             return ResponseEntity.ok("Saved Successfully");
         } catch (Exception e) {
             return ResponseEntity.badRequest().body(e.getMessage());