Skip to content

Merge main to3.9.0 #208

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 13 commits into from
Oct 30, 2026
Merged

Merge main to3.9.0 #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fc931e8
fix: edit in ES (#185)
vanitha1822 Aug 10, 2026
cadf4d8
fix: benregid null issue in i_beneficiarydetails table (#188)
vanitha1822 Aug 20, 2026
a87adf0
fix: load beneficiary mapping associations lazily (#189)
vanitha1822 Sep 3, 2026
77b3849
Vb/release 3.9.0 merge (#190)
vishwab1 Sep 3, 2026
33abfc8
fix: edit in ES (#193)
vanitha1822 Sep 11, 2026
d4078d1
Vb/release 3.9.0 fix (#195)
vishwab1 Sep 11, 2026
acbd7a6
Fix edit fields for benficiary (#196)
vishwab1 Sep 11, 2026
0644fbc
Merge branch 'release-3.9.0' of https://github.com/PSMRI/Identity-API…
SauravBizbRolly Sep 17, 2026
367d924
fix: benregid null issue in i_beneficiarydetails table (#194)
vanitha1822 Sep 24, 2026
25dc90c
Merge branch 'release-3.9.0' of https://github.com/PSMRI/Identity-API…
SauravBizbRolly Oct 14, 2026
7e5d457
Remove gps column (#205)
SauravBizbRolly Oct 14, 2026
6bf0546
Merge branch 'release-3.9.0' of https://github.com/PSMRI/Identity-API…
SauravBizbRolly Oct 30, 2026
18872ce
Merge remote-tracking branch 'upstream/main' into release-3.9.0
SauravBizbRolly Oct 30, 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
15 changes: 15 additions & 0 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,6 +379,21 @@
@Expose
@Column(name = "mohallaName")
private String mohallaName;


@Expose
@Column(name = "digipin")
private String digipin;

Check warning on line 386 in src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename "digipin" which hides the field declared at line 408. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_Identity-API&issues=AaGLjHAuKxFu2gu0gHHU&open=AaGLjHAuKxFu2gu0gHHU&pullRequest=208



@Expose
@Column(name = "isGpsUnavailable", nullable = false, columnDefinition = "TINYINT(1) DEFAULT 0")
private Boolean isGpsUnavailable = false;

Check warning on line 392 in src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename "isGpsUnavailable" which hides the field declared at line 417. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_Identity-API&issues=AaGLjHAuKxFu2gu0gHHV&open=AaGLjHAuKxFu2gu0gHHV&pullRequest=208

@Expose
@Column(name = "gpsUnavailableReason")
private String gpsUnavailableReason;

Check warning on line 396 in src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename "gpsUnavailableReason" which hides the field declared at line 421. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_Identity-API&issues=AaGLjHAuKxFu2gu0gHHW&open=AaGLjHAuKxFu2gu0gHHW&pullRequest=208

@Expose
@SerializedName("latitude")
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