diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java index b41c7ecc..06022622 100644 --- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java +++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java @@ -611,22 +611,12 @@ public class RMNCHBeneficiaryDetailsRmnch { @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") diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java index 471bdaa6..32afd975 100644 --- a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java +++ b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java @@ -379,25 +379,13 @@ public class RMNCHHouseHoldDetails { @Expose @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") diff --git a/src/main/java/com/iemr/common/identity/domain/Address.java b/src/main/java/com/iemr/common/identity/domain/Address.java index f355cbc8..7f7e716b 100644 --- a/src/main/java/com/iemr/common/identity/domain/Address.java +++ b/src/main/java/com/iemr/common/identity/domain/Address.java @@ -56,11 +56,9 @@ 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; } diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java index 6201d6a3..715458e0 100644 --- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java +++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java @@ -212,14 +212,10 @@ public String syncDataToAmrit(String requestOBJ, String authorization) throws Ex // Extract GPS from i_bendemographics JsonObject demog = benGpsMap.get(obj.getBenficieryid()); if (demog != null) { - if (demog.has("latitude") && !demog.get("latitude").isJsonNull()) - obj.setGpsLatitude(demog.get("latitude").getAsDouble()); - if (demog.has("longitude") && !demog.get("longitude").isJsonNull()) - obj.setGpsLongitude(demog.get("longitude").getAsDouble()); + if (demog.has("digipin") && !demog.get("digipin").isJsonNull()) obj.setDigipin(demog.get("digipin").getAsString()); - if (demog.has("gpsTimestamp") && !demog.get("gpsTimestamp").isJsonNull()) - obj.setGpsTimestamp(new Timestamp(demog.get("gpsTimestamp").getAsLong())); + if (demog.has("isGpsUnavailable") && !demog.get("isGpsUnavailable").isJsonNull()) obj.setIsGpsUnavailable(demog.get("isGpsUnavailable").getAsBoolean()); // STOP-444 followup fix: same source object, previously never read for @@ -331,7 +327,6 @@ public String syncDataToAmrit(String requestOBJ, String authorization) throws Ex rmnchmBeneficiarydetail.setMaritalstatusId(obj.getMaritalstatusId()); rmnchmBeneficiarydetail.setPlaceOfCurrentLiving(obj.getPlaceOfCurrentLiving()); rmnchmBeneficiarydetail.setOtherPlaceOfCurrentLiving(obj.getOtherPlaceOfCurrentLiving()); - rmnchmBeneficiarydetail.setInstitutionName(obj.getInstitutionName()); // STOP-444 followup fix: these were previously never re-synced on an edit of an // existing beneficiary, so any change to them from the app was silently dropped. if (obj.getCommunity() != null) { @@ -506,8 +501,7 @@ public String syncDataToAmrit(String requestOBJ, String authorization) throws Ex .getByHouseHoldID(obj.getHouseoldId()).get(0); if (temp != null) obj.setHouseHoldDetailsId(temp.getHouseHoldDetailsId()); - if (hhTimestampMap.containsKey(obj.getHouseoldId())) - obj.setGpsTimestamp(new Timestamp(hhTimestampMap.get(obj.getHouseoldId()))); + } // Set VanID/ParkingPlaceID for both NEW and existing households — this must // stay OUTSIDE the "household already exists" block above (it's regressed