Merge to main release 3.12.0

pom.xml

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

src/main/environment/common_ci.properties

@@ -64,6 +64,7 @@ diagnostic.emrlite.xray.refresh-url=${diagnostic.emrlite.xray.base-url}/api/v1/i
 diagnostic.emrlite.xray.order-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/
 diagnostic.emrlite.xray.result-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/result/
 diagnostic.emrlite.xray.ping-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/ping/
+diagnostic.emrlite.xray.cancel-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/cancel/
 diagnostic.emrlite.xray.username=@env.DIAGNOSTIC_EMRLITE_XRAY_USERNAME@
 diagnostic.emrlite.xray.password=@env.DIAGNOSTIC_EMRLITE_XRAY_PASSWORD@
 
@@ -74,6 +75,7 @@ diagnostic.emrlite.truenat.refresh-url=${diagnostic.emrlite.truenat.base-url}/ap
 diagnostic.emrlite.truenat.order-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/
 diagnostic.emrlite.truenat.result-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/result/
 diagnostic.emrlite.truenat.ping-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/ping/
+diagnostic.emrlite.truenat.cancel-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/cancel/
 diagnostic.emrlite.truenat.username=@env.DIAGNOSTIC_EMRLITE_TRUENAT_USERNAME@
 diagnostic.emrlite.truenat.password=@env.DIAGNOSTIC_EMRLITE_TRUENAT_PASSWORD@
 

src/main/environment/common_docker.properties

@@ -70,6 +70,7 @@ diagnostic.emrlite.xray.refresh-url=${diagnostic.emrlite.xray.base-url}/api/v1/i
 diagnostic.emrlite.xray.order-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/
 diagnostic.emrlite.xray.result-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/result/
 diagnostic.emrlite.xray.ping-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/ping/
+diagnostic.emrlite.xray.cancel-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/cancel/
 diagnostic.emrlite.xray.username=${DIAGNOSTIC_EMRLITE_XRAY_USERNAME}
 diagnostic.emrlite.xray.password=${DIAGNOSTIC_EMRLITE_XRAY_PASSWORD}
 
@@ -80,6 +81,7 @@ diagnostic.emrlite.truenat.refresh-url=${diagnostic.emrlite.truenat.base-url}/ap
 diagnostic.emrlite.truenat.order-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/
 diagnostic.emrlite.truenat.result-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/result/
 diagnostic.emrlite.truenat.ping-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/ping/
+diagnostic.emrlite.truenat.cancel-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/cancel/
 diagnostic.emrlite.truenat.username=${DIAGNOSTIC_EMRLITE_TRUENAT_USERNAME}
 diagnostic.emrlite.truenat.password=${DIAGNOSTIC_EMRLITE_TRUENAT_PASSWORD}
 

src/main/environment/common_example.properties

@@ -2,7 +2,6 @@ server.port=8081
 # FHIR Config
 fhir-url=http://localhost:8093/
 
- # TM Config
 tm-url=http://localhost:8089/
 ##--------------------------------------------## Primary db-------------------------------------------------------------------
 
@@ -24,11 +23,17 @@ springdoc.swagger-ui.enabled=true
 logging.path=logs/
 logging.file.name=logs/flw-api.log
 
-jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
+jwt.secret=eefa40497bb9b2a8491b85069aff62e7596521c6816e471c464181b52eac7670ff91394a
 
 # Redis Config
 spring.redis.host=localhost
 
+# Stop TB: when true, saves fail with an error if camp (vanID) is not configured
+# instead of silently storing vanID=NULL (which then never gets synced to central)
+stoptb.enforce.vanid=false
+# Stop TB: this deployment's van/camp ID, replacing the old Redis camp:vanID lookup
+stoptb.van.id=0
+
 cors.allowed-origins=http://localhost:*
 
 source-address=
@@ -44,56 +49,46 @@ abha.client.secret=<your-abha-client-secret>
 abha.token.url=<abha-token-url>
 abha.xcmid=<sbx-or-prod>
 
-
-
-
-
-# Diagnostic providers
-
-# Provider names: use the values supported by your application
-diagnostic.provider.xray=<XRAY_PROVIDER>
-diagnostic.provider.truenat=<TRUENAT_PROVIDER>
-
-# EMR Lite - Xray (base URL without trailing slash)
-diagnostic.emrlite.xray.base-url=https://<EMRLITE_HOST>
+# GovThealth API Config
+govthealth.user.details.url=${GOVTHEALTH_USER_DETAILS_URL}
+govthealth.user.id=${GOVTHEALTH_USER_ID}
+govthealth.password=${GOVTHEALTH_PASSWORD}
+
+# ── Diagnostic Device Integration ────────────────────────────────────────────
+# diagnostic.provider.xray / diagnostic.provider.truenat select the vendor per orderType family
+# (XRAY_CHEST vs MTB/MTB_PLUS/MDR_RIF), each must be one of com.iemr.flw.masterEnum.DiagnosticProviderCode
+diagnostic.provider.xray=${DIAGNOSTIC_PROVIDER_XRAY}
+diagnostic.provider.truenat=${DIAGNOSTIC_PROVIDER_TRUENAT}
+
+# EMR Lite - xray group (same base-url as truenat for now; split so a distinct vendor/tenant can be
+# swapped in for either group later without a code change)
+diagnostic.emrlite.xray.base-url=${DIAGNOSTIC_EMRLITE_XRAY_BASE_URL}
 diagnostic.emrlite.xray.login-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/login/
 diagnostic.emrlite.xray.refresh-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/getAccessToken/
 diagnostic.emrlite.xray.order-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/
 diagnostic.emrlite.xray.result-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/result/
 diagnostic.emrlite.xray.ping-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/ping/
-diagnostic.emrlite.xray.username=<XRAY_USERNAME>
-diagnostic.emrlite.xray.password=<XRAY_PASSWORD>
+diagnostic.emrlite.xray.cancel-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/cancel/
+diagnostic.emrlite.xray.username=${DIAGNOSTIC_EMRLITE_XRAY_USERNAME}
+diagnostic.emrlite.xray.password=${DIAGNOSTIC_EMRLITE_XRAY_PASSWORD}
 
-# EMR Lite - Truenat
-diagnostic.emrlite.truenat.base-url=https://<EMRLITE_HOST>
+# EMR Lite - truenat group (MTB/MTB_PLUS/MDR_RIF); same value as xray for now
+diagnostic.emrlite.truenat.base-url=${DIAGNOSTIC_EMRLITE_TRUENAT_BASE_URL}
 diagnostic.emrlite.truenat.login-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/login/
 diagnostic.emrlite.truenat.refresh-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/getAccessToken/
 diagnostic.emrlite.truenat.order-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/
 diagnostic.emrlite.truenat.result-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/result/
 diagnostic.emrlite.truenat.ping-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/ping/
-diagnostic.emrlite.truenat.username=<TRUENAT_USERNAME>
-diagnostic.emrlite.truenat.password=<TRUENAT_PASSWORD>
-
-# Token TTL: replace with vendor-configured durations in seconds
-diagnostic.emrlite.refresh-ttl-seconds=86400
+diagnostic.emrlite.truenat.cancel-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/cancel/
+diagnostic.emrlite.truenat.username=${DIAGNOSTIC_EMRLITE_TRUENAT_USERNAME}
+diagnostic.emrlite.truenat.password=${DIAGNOSTIC_EMRLITE_TRUENAT_PASSWORD}
 
-# Example: polling every 60 seconds
-diagnostic.poll.xray.tick-ms=60000
-diagnostic.poll.truenat.tick-ms=60000
+diagnostic.emrlite.token-ttl-seconds=${DIAGNOSTIC_EMRLITE_TOKEN_TTL_SECONDS}
+diagnostic.emrlite.refresh-ttl-seconds=${DIAGNOSTIC_EMRLITE_REFRESH_TTL_SECONDS}
 
-# Example: daily expiry at 11:59 PM in scheduler timezone
-diagnostic.poll.expiry-cron=0 59 23 * * *
+diagnostic.poll.xray.tick-ms=${DIAGNOSTIC_POLL_XRAY_TICK_MS}
+diagnostic.poll.truenat.tick-ms=${DIAGNOSTIC_POLL_TRUENAT_TICK_MS}
+# Daily cutoff (cron expression) after which all outstanding PENDING/IN_PROGRESS orders are marked EXPIRED
+diagnostic.poll.expiry-cron=${DIAGNOSTIC_POLL_EXPIRY_CRON}
 
-# Local folder (Windows: use forward slashes)
-diagnostic.documents.storage-root=C:/amrit/diagnostic-documents
-stoptb.enforce.vanid=false
-# Stop TB: this deployment's van/camp ID, replacing the old Redis camp:vanID lookup
-stoptb.van.id=0
-
-
-
-# GovThealth API Config
-govthealth.user.details.url=@env.GOVTHEALTH_USER_DETAILS_URL@
-govthealth.user.id=@env.GOVTHEALTH_USER_ID@
-govthealth.password=@env.GOVTHEALTH_PASSWORD@
-common-api-base-url=
+diagnostic.documents.storage-root=${DIAGNOSTIC_DOCUMENTS_STORAGE_ROOT}

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

@@ -37,10 +37,11 @@ public DiagnosticOrderController(DiagnosticOrderService diagnosticOrderService)
 
     @PostMapping("/order/push")
     @Operation(summary = "Push a diagnostic order to the configured provider")
-    public String pushOrder(@RequestBody @Valid DiagnosticOrderRequestDto request) {
+    public String pushOrder(@RequestBody @Valid DiagnosticOrderRequestDto request,
+            @RequestHeader("JwtToken") String jwtToken) {
         OutputResponse response = new OutputResponse();
         try {
-            DiagnosticOrder order = diagnosticOrderService.createAndPushOrder(request);
+            DiagnosticOrder order = diagnosticOrderService.createAndPushOrderByUser(request, jwtToken);
             response.setResponse(new Gson().toJson(order));
         } catch (Exception e) {
             logger.error("Error in pushOrder: {}", e.getMessage());
@@ -128,14 +129,17 @@ public String pollOrder(@RequestParam Long beneficiaryId, @RequestParam String o
     }
 
     @PostMapping("/order/manualResult")
-    @Operation(summary = "Manually submit a diagnostic result for a beneficiary's latest order of the given "
-            + "type, for use when no vendor device is integrated. Stored as-is; tbPresence, tbConfidence, and "
-            + "drugResistancePresence are left null since nothing derives them. Rejected if that order is "
-            + "already COMPLETED.")
-    public String submitManualResult(@RequestBody @Valid ManualDiagnosticResultRequestDto request) {
+    @Operation(summary = "Exactly one of resultSummary/reasonToClose is required. resultSummary: manually submit "
+            + "a diagnostic result for a beneficiary's latest order of the given type, for use when no vendor "
+            + "device is integrated. Stored as-is; tbPresence, tbConfidence, and drugResistancePresence are left "
+            + "null since nothing derives them. Rejected if that order is already COMPLETED. reasonToClose: close "
+            + "the order instead (same behavior as reasonToClose on /order/push), sourcing patient/orderEvent "
+            + "from the beneficiary's existing order for this type.")
+    public String submitManualResult(@RequestBody @Valid ManualDiagnosticResultRequestDto request,
+            @RequestHeader("JwtToken") String jwtToken) {
         OutputResponse response = new OutputResponse();
         try {
-            DiagnosticOrderResultDto result = diagnosticOrderService.submitManualResult(request);
+            DiagnosticOrderResultDto result = diagnosticOrderService.submitManualResult(request, jwtToken);
             response.setResponse(new GsonBuilder().serializeNulls().create().toJson(result));
         } catch (Exception e) {
             logger.error("Error in submitManualResult: {}", e.getMessage());

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

@@ -22,6 +22,7 @@
 package com.iemr.flw.controller;
 
 import com.iemr.flw.dto.iemr.DynamicFormDTO;
+import com.iemr.flw.dto.iemr.LatestFormVersionDTO;
 import com.iemr.flw.service.DynamicFormDefinitionService;
 import com.iemr.flw.utils.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -35,6 +36,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * REST controller for dynamic form definition management.
  * All write operations use POST; all read operations use GET.
@@ -97,4 +100,10 @@ public ResponseEntity<ApiResponse> deactivateForm(
         return ResponseEntity.ok(new ApiResponse(true, "Form deactivated", null));
     }
 
+    @Operation(summary = "Get the latest version of each active form (formId, formUuid, formName, currentVersionNumber)")
+    @RequestMapping(value = "/getLatestFormVersions", method = RequestMethod.GET)
+    public ResponseEntity<ApiResponse> getLatestFormVersions() {
+        List<LatestFormVersionDTO> result = formService.getLatestFormVersions();
+        return ResponseEntity.ok(new ApiResponse(true, "Latest form versions fetched successfully", result));
+    }
 }

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

@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.iemr.flw.service.StopTBPrescriptionService;
 import com.iemr.flw.service.StopTBService;
 import com.iemr.flw.utils.response.OutputResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -51,7 +52,7 @@ public String getAllGeneralExaminations(@RequestBody Map<String, Object> body) {
             if (raw == null) throw new Exception("providerServiceMapID is required");
             Integer villageID = body.get("villageID") != null ? Integer.parseInt(body.get("villageID").toString()) : null;
             Map<String, Object> data = stopTBService.getAllGeneralExaminations(Integer.parseInt(raw.toString()), villageID);
-            response.setResponse(gson.toJson(data));
+            response.setResponse(gson.toJsonTree(data));
         } catch (Exception e) {
             logger.error("Error in getAllGeneralExaminations: " + e);
             response.setError(5000, "Error fetching general examinations: " + e.getMessage());
@@ -84,7 +85,7 @@ public String getAllNurseTBScreenings(@RequestBody Map<String, Object> body) {
             if (raw == null) throw new Exception("providerServiceMapID is required");
             Integer villageID = body.get("villageID") != null ? Integer.parseInt(body.get("villageID").toString()) : null;
             Map<String, Object> data = stopTBService.getAllNurseTBScreenings(Integer.parseInt(raw.toString()), villageID);
-            response.setResponse(gson.toJson(data));
+            response.setResponse(gson.toJsonTree(data));
         } catch (Exception e) {
             logger.error("Error in getAllNurseTBScreenings: " + e);
             response.setError(5000, "Error fetching TB screenings: " + e.getMessage());
@@ -101,6 +102,10 @@ public String saveGeneralOpd(@RequestBody List<Map<String, Object>> dataList) {
         try {
             List<Map<String, Object>> result = stopTBService.saveGeneralOpd(dataList);
             response.setResponse(gson.toJson(result));
+        } catch (StopTBPrescriptionService.InsufficientStockException e) {
+            // Nothing was saved; the app shows this and lets the nurse lower the quantity.
+            logger.warn("saveGeneralOpd rejected: " + e.getMessage());
+            response.setError(5000, e.getMessage());
         } catch (Exception e) {
             logger.error("Error in saveGeneralOpd: " + e);
             response.setError(5000, "Error saving general OPD: " + e.getMessage());
@@ -117,7 +122,7 @@ public String getAllGeneralOpd(@RequestBody Map<String, Object> body) {
             if (raw == null) throw new Exception("providerServiceMapID is required");
             Integer villageID = body.get("villageID") != null ? Integer.parseInt(body.get("villageID").toString()) : null;
             Map<String, Object> data = stopTBService.getAllGeneralOpd(Integer.parseInt(raw.toString()), villageID);
-            response.setResponse(gson.toJson(data));
+            response.setResponse(gson.toJsonTree(data));
         } catch (Exception e) {
             logger.error("Error in getAllGeneralOpd: " + e);
             response.setError(5000, "Error fetching general OPD records: " + e.getMessage());
@@ -150,7 +155,7 @@ public String getAllDiagnostics(@RequestBody Map<String, Object> body) {
             if (raw == null) throw new Exception("providerServiceMapID is required");
             Integer villageID = body.get("villageID") != null ? Integer.parseInt(body.get("villageID").toString()) : null;
             Map<String, Object> data = stopTBService.getAllDiagnostics(Integer.parseInt(raw.toString()), villageID);
-            response.setResponse(gson.toJson(data));
+            response.setResponse(gson.toJsonTree(data));
         } catch (Exception e) {
             logger.error("Error in getAllDiagnostics: " + e);
             response.setError(5000, "Error fetching diagnostics records: " + e.getMessage());

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

@@ -0,0 +1,77 @@
+package com.iemr.flw.controller;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.iemr.flw.service.StopTBSyncService;
+import com.iemr.flw.utils.JwtUtil;
+import com.iemr.flw.utils.response.OutputResponse;
+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.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/stoptb/sync")
+public class StopTBSyncController {
+
+    private final Logger logger = LoggerFactory.getLogger(StopTBSyncController.class);
+
+    private final Gson gson = new GsonBuilder().serializeNulls().create();
+
+    @Autowired
+    private StopTBSyncService stopTBSyncService;
+
+    @Autowired
+    private JwtUtil jwtUtil;
+
+    /**
+     * Headers: JwtToken (required; the user's role mappings decide the allowed service and villages).
+     * Body: { token: string|null, providerServiceMapID: int, villageIds: [int] (empty = all of the user's
+     * villages), types: [string], limit: int }.
+     * types: the record types the app applies (all when omitted); changing it requires a new snapshot.
+     * Response: { supported, serverId, snapshot, items: [{type, op, key, version, data}], nextToken, hasMore }.
+     * Call again with nextToken while hasMore is true. On a server without the change log (AMRIT-DB before V132) the
+     * response is { supported: false } and the app keeps using the getAll endpoints.
+     */
+    @PostMapping("/changes")
+    @Operation(summary = "STOP-TB records changed since the token (first call: everything in the villages)")
+    public String getChanges(@RequestBody Map<String, Object> body,
+                             @RequestHeader(value = "Authorization", required = false) String authorization,
+                             @RequestHeader(value = "JwtToken", required = false) String jwtToken) {
+        OutputResponse response = new OutputResponse();
+        try {
+            // The user decides which villages may be synced, so the JWT is required here even
+            // where the request filter would let a mobile request through without one.
+            if (jwtToken == null || jwtToken.isBlank()) throw new IllegalArgumentException("JwtToken header is required");
+            Integer userId = jwtUtil.extractUserId(jwtToken);
+            Object token = body.get("token");
+            Integer psm = body.get("providerServiceMapID") != null
+                    ? Integer.parseInt(body.get("providerServiceMapID").toString()) : null;
+            List<Integer> villageIds = new ArrayList<>();
+            if (body.get("villageIds") instanceof List) {
+                for (Object v : (List<?>) body.get("villageIds")) {
+                    if (v != null) villageIds.add((int) Double.parseDouble(v.toString()));
+                }
+            }
+            List<String> types = new ArrayList<>();
+            if (body.get("types") instanceof List) {
+                for (Object t : (List<?>) body.get("types")) {
+                    if (t != null) types.add(t.toString());
+                }
+            }
+            Integer limit = body.get("limit") != null ? (int) Double.parseDouble(body.get("limit").toString()) : null;
+            Map<String, Object> data = stopTBSyncService.getChanges(
+                    userId, token != null ? token.toString() : null, psm, villageIds, types, limit, authorization);
+            response.setResponse(gson.toJson(data));
+        } catch (Exception e) {
+            logger.error("Error in sync/changes: " + e);
+            response.setError(5000, "Error fetching changes: " + e.getMessage());
+        }
+        return response.toString();
+    }
+}