Skip to content

Removing duplicate fields in i_beneficiaryaddress table #186

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vishwab1 merged 2 commits into from
Aug 13, 2026
Merged

Removing duplicate fields in i_beneficiaryaddress table #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f88175
Merge pull request #184 from PSMRI/vb/release-3.8.3-van-env-fix
SauravBizbRolly Aug 9, 2026
048007c
Removing duplicate fields in i_beneficiaryaddress table
sehjotsinghunthinkable Aug 12, 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
18 changes: 0 additions & 18 deletions src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,24 +260,6 @@ public class MBeneficiaryaddress implements Serializable {

// END OF new column added for data sync

@Column(name = "gpsLatitude")
private Double gpsLatitude;

@Column(name = "gpsLongitude")
private Double gpsLongitude;

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

@Column(name = "gpsTimestamp")
private Timestamp gpsTimestamp;

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

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

public MBeneficiaryaddress setCurrentAddress(Address address) {
this.currAddrLine1 = address.getAddrLine1();
this.currAddrLine2 = address.getAddrLine2();
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,6 @@ MBeneficiaryfamilymapping identityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
@Mapping(target = "currentAddress.village", source = "map.MBeneficiaryaddress.currVillage")
@Mapping(target = "currentAddress.addressValue", source = "map.MBeneficiaryaddress.currAddressValue")
@Mapping(target = "currentAddress.pinCode", source = "map.MBeneficiaryaddress.currPinCode")
@Mapping(target = "currentAddress.gpsLatitude", source = "map.MBeneficiaryaddress.gpsLatitude")
@Mapping(target = "currentAddress.gpsLongitude", source = "map.MBeneficiaryaddress.gpsLongitude")
@Mapping(target = "currentAddress.digipin", source = "map.MBeneficiaryaddress.digipin")
@Mapping(target = "currentAddress.gpsTimestamp", source = "map.MBeneficiaryaddress.gpsTimestamp")
@Mapping(target = "currentAddress.isGpsUnavailable", source = "map.MBeneficiaryaddress.isGpsUnavailable")
@Mapping(target = "currentAddress.gpsUnavailableReason", source = "map.MBeneficiaryaddress.gpsUnavailableReason")
@Mapping(target = "emergencyAddress.addrLine1", source = "map.MBeneficiaryaddress.emerAddrLine1")
@Mapping(target = "emergencyAddress.addrLine2", source = "map.MBeneficiaryaddress.emerAddrLine2")
@Mapping(target = "emergencyAddress.addrLine3", source = "map.MBeneficiaryaddress.emerAddrLine3")
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/iemr/common/identity/service/IdentityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,12 +1839,6 @@ private MBeneficiaryaddress identityDTOToMBeneficiaryaddress(IdentityDTO dto) {
beneficiaryAddress.setCurrServicePointId(dto.getCurrentAddress().getServicePointID());
beneficiaryAddress.setCurrServicePoint(dto.getCurrentAddress().getServicePointName());
beneficiaryAddress.setCurrHabitation(dto.getCurrentAddress().getHabitation());
beneficiaryAddress.setGpsLatitude(dto.getCurrentAddress().getGpsLatitude());
beneficiaryAddress.setGpsLongitude(dto.getCurrentAddress().getGpsLongitude());
beneficiaryAddress.setDigipin(dto.getCurrentAddress().getDigipin());
beneficiaryAddress.setGpsTimestamp(dto.getCurrentAddress().getGpsTimestamp());
beneficiaryAddress.setIsGpsUnavailable(dto.getCurrentAddress().getIsGpsUnavailable());
beneficiaryAddress.setGpsUnavailableReason(dto.getCurrentAddress().getGpsUnavailableReason());
}
if (dto.getEmergencyAddress() != null) {
beneficiaryAddress.setEmerAddrLine1(dto.getEmergencyAddress().getAddrLine1());
Expand Down
Loading