Optmize/incentive apis response time

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

@@ -0,0 +1,108 @@
+package com.iemr.flw.controller;
+
+import com.iemr.flw.dto.iemr.BadgeEarnedPushDTO;
+import com.iemr.flw.service.BadgeService;
+import com.iemr.flw.utils.JwtUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+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.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Badges API consumed by the SAKHI app's BadgeSyncWorker:
+ *   GET  /badges/config   -> { "config": { key: value } }
+ *   GET  /badges/freezes  -> { "freezes": [ { badgeId, startDate, endDate } ] }
+ *   GET  /badges/earned   -> { "earned":  [ { badgeId, level, earnedAt } ] }
+ *   POST /badges/earned   <- { userId, badges: [ { badgeId, level, earnedAt } ] }
+ * The ASHA is always identified from the JWT, never from the payload.
+ */
+@RestController
+@RequestMapping(value = "/badges", produces = "application/json")
+public class BadgeController {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
+    private final BadgeService badgeService;
+    private final JwtUtil jwtUtil;
+
+    public BadgeController(BadgeService badgeService, JwtUtil jwtUtil) {
+        this.badgeService = badgeService;
+        this.jwtUtil = jwtUtil;
+    }
+
+    @GetMapping("/config")
+    public ResponseEntity<Map<String, Object>> getConfig() {
+        Map<String, Object> response = ok();
+        try {
+            response.put("config", badgeService.getConfig());
+            return ResponseEntity.ok(response);
+        } catch (Exception e) {
+            return error(e);
+        }
+    }
+
+    @GetMapping("/freezes")
+    public ResponseEntity<Map<String, Object>> getFreezes(
+            @RequestHeader(value = "JwtToken") String jwtToken) {
+        Map<String, Object> response = ok();
+        try {
+            Integer userId = jwtUtil.extractUserId(jwtToken);
+            response.put("freezes", badgeService.getFreezes(userId));
+            return ResponseEntity.ok(response);
+        } catch (Exception e) {
+            return error(e);
+        }
+    }
+
+    @GetMapping("/earned")
+    public ResponseEntity<Map<String, Object>> getEarned(
+            @RequestHeader(value = "JwtToken") String jwtToken) {
+        Map<String, Object> response = ok();
+        try {
+            Integer userId = jwtUtil.extractUserId(jwtToken);
+            response.put("earned", badgeService.getEarned(userId));
+            return ResponseEntity.ok(response);
+        } catch (Exception e) {
+            return error(e);
+        }
+    }
+
+    @PostMapping(value = "/earned", consumes = "application/json")
+    public ResponseEntity<Map<String, Object>> postEarned(
+            @RequestHeader(value = "JwtToken") String jwtToken,
+            @RequestBody BadgeEarnedPushDTO body) {
+        Map<String, Object> response = ok();
+        try {
+            Integer userId = jwtUtil.extractUserId(jwtToken);
+            int inserted = badgeService.saveEarned(userId, body == null ? null : body.getBadges());
+            response.put("inserted", inserted);
+            return ResponseEntity.ok(response);
+        } catch (Exception e) {
+            return error(e);
+        }
+    }
+
+    private Map<String, Object> ok() {
+        Map<String, Object> response = new HashMap<>();
+        response.put("statusCode", 200);
+        response.put("status", "Success");
+        return response;
+    }
+
+    private ResponseEntity<Map<String, Object>> error(Exception e) {
+        logger.error("Badges API error:", e);
+        Map<String, Object> response = new HashMap<>();
+        response.put("statusCode", 500);
+        response.put("status", "Error");
+        response.put("errorMessage", e.getMessage());
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+    }
+}

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

@@ -49,6 +49,9 @@ public class DiseaseControlController {
     @Autowired
     private DiseaseControlService diseaseControlService;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
 
     @RequestMapping(value = "malaria/saveAll", method = RequestMethod.POST, consumes = "application/json", produces = "application/json",headers = "Authorization")
     public ResponseEntity<Map<String, Object>> saveMalaria(@RequestBody MalariaDTO malariaDTO) {
@@ -375,4 +378,72 @@ public ResponseEntity<Map<String, Object>> getVisitDetails(
     }
 
 
+    @RequestMapping(value = "generalCheckUp/getAll", method = RequestMethod.POST)
+    public ResponseEntity<Map<String, Object>> getGeneralCheckUp(@RequestBody GetBenRequestHandler getBenRequestHandler,@RequestHeader(value = "JwtToken") String token) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+
+        try {
+            List<GeneralCheckUpDto> result =
+                    diseaseControlService.getGeneralCheckUp(token);
+
+            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);
+        }
+    }
+
+
+    @RequestMapping(value = "generalCheckUp/saveAll", method = RequestMethod.POST)
+    public ResponseEntity<Map<String, Object>> savGeneralCheckUp(
+            @RequestBody List<GeneralCheckUpDto> requestList,@RequestHeader(value = "JwtToken") String token) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+        logger.info("####################################################");
+        try {
+            logger.info("General Checkup Save Request: {}",
+                    objectMapper.writerWithDefaultPrettyPrinter()
+                            .writeValueAsString(requestList));
+        } catch (Exception e) {
+            logger.error("Failed to convert request to JSON", e);
+        }
+        logger.info("####################################################");
+
+        try {
+            List<GeneralCheckUpDto> savedList =
+                    diseaseControlService.saveGeneralCheckUp(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);
+        }
+    }
+
+
+
 }

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

@@ -0,0 +1,121 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology
+* Integrated EHR (Electronic Health Records) Solution
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute"
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology
+*/
+package com.iemr.flw.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iemr.flw.dto.identity.GetBenRequestHandler;
+import com.iemr.flw.dto.iemr.*;
+import com.iemr.flw.service.DiseaseControlService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/generalCheckUpFollowUp",headers = "Authorization")
+public class GeneralCheckUpFollowUpController {
+    private final Logger logger = LoggerFactory.getLogger(GeneralCheckUpFollowUpController.class);
+
+    @Autowired
+    private DiseaseControlService diseaseControlService;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+
+
+        @RequestMapping(value = "getAll", method = RequestMethod.POST)
+    public ResponseEntity<Map<String, Object>> getGeneralCheckUpFollowUp(@RequestBody GetBenRequestHandler getBenRequestHandler,@RequestHeader(value = "JwtToken") String token) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+
+        try {
+            List<GeneralCheckUpFollowUpDto> result =
+                    diseaseControlService.getGeneralCheckUpFollowUp(token);
+
+            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);
+        }
+    }
+
+
+    @RequestMapping(value = "saveAll", method = RequestMethod.POST)
+    public ResponseEntity<Map<String, Object>> savGeneralCheckUpFollowUp(
+            @RequestBody List<GeneralCheckUpFollowUpDto> requestList,@RequestHeader(value = "JwtToken") String token) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+        logger.info("####################################################");
+        try {
+            logger.info("General Checkup Save Request: {}",
+                    objectMapper.writerWithDefaultPrettyPrinter()
+                            .writeValueAsString(requestList));
+        } catch (Exception e) {
+            logger.error("Failed to convert request to JSON", e);
+        }
+        logger.info("####################################################");
+
+        try {
+            List<GeneralCheckUpFollowUpDto> savedList =
+                    diseaseControlService.saveGeneralCheckUpFollowUp(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);
+        }
+    }
+
+}

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

@@ -26,11 +26,13 @@ public class AHDForm {
     @Column(name = "ahd_date")
     private String ahdDate;
 
+    @Lob
     @Column(name = "image1")
-    private String image1;
+    private byte[] image1;
 
+    @Lob
     @Column(name = "image2")
-    private String image2;
+    private byte[] image2;
 
     @Column(name = "user_id")
     private Long userId;

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

@@ -0,0 +1,28 @@
+package com.iemr.flw.domain.iemr;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Badge tuning as key/value rows (Badge LLD §5.2). Overrides the app's
+ * compiled defaults without a release, e.g. "milestones.steady_syncer" -> "2,4,6,8".
+ */
+@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "badge_config", schema = "db_iemr")
+public class BadgeConfig {
+
+    @Id
+    @Column(name = "config_key", length = 100)
+    private String key;
+
+    @Column(name = "config_value", length = 500, nullable = false)
+    private String value;
+}