Skip to content

Remove gps column #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vishwab1 merged 5 commits into from
Oct 14, 2026
Merged

Remove gps column #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5367efa
fix duplicate ben id issue
SauravBizbRolly Jun 16, 2026
effbfcc
Merge branch 'release-3.6.2' into release-3.9.0
SauravBizbRolly Jun 17, 2026
0644fbc
Merge branch 'release-3.9.0' of https://github.com/PSMRI/Identity-API…
SauravBizbRolly Sep 17, 2026
25dc90c
Merge branch 'release-3.9.0' of https://github.com/PSMRI/Identity-API…
SauravBizbRolly Oct 14, 2026
53af32e
remove gps column
SauravBizbRolly Oct 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
16 changes: 2 additions & 14 deletions src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/iemr/common/identity/domain/Address.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
12 changes: 3 additions & 9 deletions src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down
Loading