Vb/release 3.9.0 merge

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.common.identity</groupId>
 	<artifactId>identity-api</artifactId>
-	<version>3.9.0</version>
+	<version>3.8.3</version>
 
 	<packaging>war</packaging>
 

src/main/environment/1097_ci.properties

@@ -34,3 +34,11 @@ elasticsearch.index.beneficiary=@env.ELASTICSEARCH_INDEX_BENEFICIARY@
 # Enable/Disable ES (for gradual rollout)
 elasticsearch.enabled=@env.ELASTICSEARCH_ENABLED@
 
+# Van/local-laptop deployments only. The 1097 service is not a van deployment, so this
+# stays false — but must still be set explicitly, since IdentityService.java (shared with
+# the common_* build) now requires this property with no inline default.
+stoptb.enforce.vanid=false
+# Same reasoning — not a van deployment, but RmnchDataSyncServiceImpl (shared with the
+# common_* build) now requires this property explicitly, no inline default.
+stoptb.van.id=0
+

src/main/environment/1097_docker.properties

@@ -34,3 +34,11 @@ elasticsearch.index.beneficiary=${ELASTICSEARCH_INDEX_BENEFICIARY}
 # Enable/Disable ES (for gradual rollout)
 elasticsearch.enabled=${ELASTICSEARCH_ENABLED}
 
+# Van/local-laptop deployments only. The 1097 service is not a van deployment, so this
+# stays false — but must still be set explicitly, since IdentityService.java (shared with
+# the common_* build) now requires this property with no inline default.
+stoptb.enforce.vanid=false
+# Same reasoning — not a van deployment, but RmnchDataSyncServiceImpl (shared with the
+# common_* build) now requires this property explicitly, no inline default.
+stoptb.van.id=0
+

src/main/environment/1097_example.properties

@@ -31,3 +31,11 @@ elasticsearch.index.beneficiary=beneficiary_index
 # Enable/Disable ES (for gradual rollout)
 elasticsearch.enabled=true
 
+# Van/local-laptop deployments only. The 1097 service is not a van deployment, so this
+# stays false — but must still be set explicitly, since IdentityService.java (shared with
+# the common_* build) now requires this property with no inline default.
+stoptb.enforce.vanid=false
+# Same reasoning — not a van deployment, but RmnchDataSyncServiceImpl (shared with the
+# common_* build) now requires this property explicitly, no inline default.
+stoptb.van.id=0
+

src/main/environment/common_ci.properties

@@ -22,6 +22,11 @@ fhir-url=@env.FHIR_API@
 # Redis Config
 spring.redis.host=@env.REDIS_HOST@
 
+# Stop TB: when true, RMNCH data sync fails with an error if camp (vanID) is not configured
+stoptb.enforce.vanid=@env.STOPTB_ENFORCE_VANID@
+# Stop TB: this deployment's van/camp ID, replacing the old Redis camp:vanID lookup
+stoptb.van.id=@env.STOPTB_VAN_ID@
+
 cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@
 
 # Elasticsearch Configuration

src/main/environment/common_docker.properties

@@ -22,6 +22,11 @@ fhir-url=${FHIR_API}
 # Redis Config
 spring.redis.host=${REDIS_HOST}
 
+# Stop TB: when true, RMNCH data sync fails with an error if camp (vanID) is not configured
+stoptb.enforce.vanid=${STOPTB_ENFORCE_VANID}
+# Stop TB: this deployment's van/camp ID, replacing the old Redis camp:vanID lookup
+stoptb.van.id=${STOPTB_VAN_ID}
+
 cors.allowed-origins=${CORS_ALLOWED_ORIGINS}
 
 # Elasticsearch Configuration

src/main/environment/common_example.properties

@@ -17,6 +17,13 @@ fhir-url=http://localhost:8093/
 
 # Redis Config
 spring.redis.host=localhost
+
+# Stop TB: when true, RMNCH data sync fails with an error if camp (vanID) is not
+# configured instead of silently skipping vanID stamping
+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:*
 
 # Elasticsearch Configuration

src/main/java/com/iemr/common/identity/controller/IdentityController.java

@@ -607,7 +607,12 @@ public String createIdentity(@Param(value = "{\r\n" + "  \"eventTypeName\": \"St
 			+ "  \"sexualOrientationType\": \"String\",\r\n" + "  \"vanID\": \"Integer\",\r\n"
 			+ "  \"createdDate\": \"Timestamp\"\r\n" + "  \"faceEmbedding\": [\"Float\"]\r\n" + "}") @RequestBody String identityData) throws IEMRException {
 		logger.info("IdentityController.createIdentity - start");
-
+
+		// Bare Gson matches Common-API's RegisterBenificiaryServiceImpl, which also
+		// serializes the outgoing identity payload with a bare new Gson(). dob relies
+		// on this symmetric default format; gpsTimestamp is still parsed correctly via
+		// its field-level @JsonAdapter(GpsTimestampAdapter.class) on Address, which
+		// works regardless of which Gson instance performs the parse.
 		IdentityDTO identity = new Gson().fromJson(identityData, IdentityDTO.class);
 		logger.info("identity hit: " + identity);
 		BeneficiaryCreateResp map;

src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java

@@ -59,12 +59,17 @@ public class RMNCHMobileAppController {
 
 	@PostMapping(value = "/syncDataToAmrit", consumes = "application/json", produces = "application/json")
 	@Operation(summary = "Sync data to AMRIT for already regestered beneficiary with AMRIT beneficiary id ")
-	public String syncDataToAmrit(@RequestBody String requestOBJ) {
+	public String syncDataToAmrit(@RequestBody String requestOBJ,@RequestHeader(value = "jwttoken") String authorization) {
 		OutputResponse response = new OutputResponse();
 		try {
 			if (requestOBJ != null) {
-				String s = rmnchDataSyncService.syncDataToAmrit(requestOBJ);
+
+				String s = rmnchDataSyncService.syncDataToAmrit(requestOBJ,authorization);
+				logger.info("syncDataToAmrit Response: {}", s);
+
 				response.setResponse(s);
+
+				logger.info(" syncDataToAmrit Final API Response: {}", response.toString());
 			} else
 				response.setError(5000, "Invalid/NULL request obj");
 		} catch (Exception e) {

src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java

@@ -34,6 +34,8 @@
 import jakarta.persistence.Transient;
 
 import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.JsonAdapter;
+import com.iemr.common.identity.mapper.GpsTimestampAdapter;
 
 import lombok.Data;
 
@@ -390,6 +392,9 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Expose
 	@Transient
 	private String addressLine3;
+	@Expose
+	@Transient
+	private String pinCode;
 
 	// ----------------------------------------------
 
@@ -527,6 +532,15 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Expose
 	private String  otherPlaceOfDeath;
 
+	@Expose
+	private String placeOfCurrentLiving;
+
+	@Expose
+	private String otherPlaceOfCurrentLiving;
+
+	@Expose
+	private String institutionName;
+
 	@Expose
 	private Boolean isSpouseAdded;
 
@@ -550,4 +564,52 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Expose
 	private Boolean isDeactivate;
 
+	@Expose
+	@Transient
+	private String abhaId;
+
+	@Expose
+	@Transient
+	private String familyId;
+
+	// Anthropometry fields sent by Stop TB mobile app via beneficiaryDetails payload.
+	// i_beneficiarydetails_rmnch has no these columns — stored in i_beneficiarydetails.otherFields instead.
+	@Expose
+	@Transient
+	private Double height;
+	@Expose
+	@Transient
+	private Double weight;
+	@Expose
+	@Transient
+	private Double bmi;
+	@Expose
+	@Transient
+	private Double temperature; // stored as "temperatureValue" in otherFields to match getBeneficiaryData key
+
+	@Expose
+	@Column(name = "gpsLatitude")
+	private Double gpsLatitude;
+
+	@Expose
+	@Column(name = "gpsLongitude")
+	private Double gpsLongitude;
+
+	@Expose
+	@Column(name = "digipin")
+	private String digipin;
+
+	@Expose
+	@Column(name = "gpsTimestamp")
+	@JsonAdapter(GpsTimestampAdapter.class)
+	private Timestamp gpsTimestamp;
+
+	@Expose
+	@Column(name = "isGpsUnavailable", nullable = false, columnDefinition = "TINYINT(1) DEFAULT 0")
+	private Boolean isGpsUnavailable = false;
+
+	@Expose
+	@Column(name = "gpsUnavailableReason")
+	private String gpsUnavailableReason;
+
 }

src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java

@@ -1,24 +1,24 @@
 /*
-* 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
+ * 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/.
+ */
 package com.iemr.common.identity.data.rmnch;
 
 import java.sql.Timestamp;
@@ -31,11 +31,14 @@
 import jakarta.persistence.Table;
 
 import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.iemr.common.identity.mapper.GpsTimestampAdapter;
 
 import lombok.Data;
 
 /**
- * 
+ *
  * @author de40034072
  *
  */
@@ -111,6 +114,23 @@ public class RMNCHHouseHoldDetails {
 	@Column(name = "familyName")
 	private String familyName;
 
+	@Expose
+	@SerializedName(value = "address", alternate = "Address")
+	@Column(name = "address")
+	private String address;
+
+	@Expose
+	@Column(name = "totalHhMembers")
+	private Integer totalHhMembers;
+
+	@Expose
+	@Column(name = "registeredAtCampSite")
+	private String registeredAtCampSite;
+
+	@Expose
+	@Column(name = "registeredAtCampSiteId")
+	private Integer registeredAtCampSiteId;
+
 	@Expose
 	@Column(name = "fuelUsed")
 	private String fuelUsed;
@@ -191,6 +211,7 @@ public class RMNCHHouseHoldDetails {
 	private String other_sourceofDrinkingWater;
 
 	@Expose
+	@SerializedName(value = "pincode", alternate = "Pincode")
 	@Column(name = "pincode")
 	private Integer pincode;
 
@@ -359,4 +380,31 @@ public class RMNCHHouseHoldDetails {
 	@Column(name = "mohallaName")
 	private String mohallaName;
 
+	@Expose
+	@SerializedName("latitude")
+	@Column(name = "gpsLatitude")
+	private Double gpsLatitude;
+
+	@Expose
+	@SerializedName("longitude")
+	@Column(name = "gpsLongitude")
+	private Double gpsLongitude;
+
+	@Expose
+	@Column(name = "digipin")
+	private String digipin;
+
+	@Expose
+	@Column(name = "gpsTimestamp")
+	@JsonAdapter(GpsTimestampAdapter.class)
+	private Timestamp gpsTimestamp;
+
+	@Expose
+	@Column(name = "isGpsUnavailable", nullable = false, columnDefinition = "TINYINT(1) DEFAULT 0")
+	private Boolean isGpsUnavailable = false;
+
+	@Expose
+	@Column(name = "gpsUnavailableReason")
+	private String gpsUnavailableReason;
+
 }

src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarydetail.java

@@ -214,4 +214,21 @@ public class RMNCHMBeneficiarydetail {
 	@Expose
 	@Transient
 	private Integer ProviderServiceMapID;
+
+	@Expose
+	@Transient
+	private String abhaId;
+
+	@Expose
+	@Column(name = "familyid")
+	private String familyId;
+
+	@Expose
+	private String placeOfCurrentLiving;
+
+	@Expose
+	private String otherPlaceOfCurrentLiving;
+
+	@Expose
+	private String institutionName;
 }

src/main/java/com/iemr/common/identity/domain/Address.java

@@ -23,6 +23,11 @@
 
 import lombok.Data;
 
+import java.sql.Timestamp;
+
+import com.google.gson.annotations.JsonAdapter;
+import com.iemr.common.identity.mapper.GpsTimestampAdapter;
+
 public @Data class Address {
 	private String addrLine1;
 	private String addrLine2;
@@ -51,4 +56,11 @@
 
 	private Integer vanID;
 	private Integer parkingPlaceID;
+	private Double gpsLatitude;
+	private Double gpsLongitude;
+	private String digipin;
+	@JsonAdapter(GpsTimestampAdapter.class)
+	private Timestamp gpsTimestamp;
+	private Boolean isGpsUnavailable;
+	private String gpsUnavailableReason;
 }