PSMRI · harimohanr · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023
diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -458,7 +458,6 @@ public class IdentityController {
 		}
 
 		IdentityEditDTO identity = InputMapper.getInstance().gson().fromJson(json, IdentityEditDTO.class);
-		// MBeneficiarymapping map;
 		try {
 			svc.editIdentity(identity);
 			String response = getSuccessResponseString("Updated successfully", 200, "success", "editIdentityByAgent");

diff --git a/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java b/src/main/java/com/iemr/common/identity/data/familyTagging/BenFamilyMapping.java
@@ -119,9 +119,6 @@ public class BenFamilyMapping {
 	@Transient
 	private Integer blockId;
 
-//	@Transient
-//	private BenFamilyMapping memberList[];
-
 	@Transient
 	private Long beneficiaryRegId;
 

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
@@ -353,12 +353,6 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Expose
 	@Transient
 	private String stateName;
-//	@Expose
-//	@Transient
-//	private Integer districtId;
-//	@Expose
-//	@Transient
-//	private String districtName;
 	@Expose
 	@Transient
 	private Integer blockId;

diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryAccount.java
@@ -31,7 +31,6 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.gson.annotations.Expose;
 
 import lombok.Data;

diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiaryfamilymapping.java
@@ -30,9 +30,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
 import com.google.gson.annotations.Expose;

diff --git a/src/main/java/com/iemr/common/identity/domain/Address.java b/src/main/java/com/iemr/common/identity/domain/Address.java
@@ -45,7 +45,6 @@
 	 */
 	private Integer zoneID;
 	private String zoneName;
-	// private Integer parkingPlaceID;
 	private String parkingPlaceName;
 	private Integer servicePointID;
 	private String servicePointName;

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java
@@ -92,8 +92,6 @@ public class MBeneficiaryAccount {
 	@Column(name = "VehicalNo", length = 30)
 	private String vehicleNo;
 
-	// @Column(name = "ParkingPlaceID")
-	// private Integer parkingPlaceID;
 
 	@Column(name = "SyncedBy", length = 30)
 	private String syncedBy;

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java
@@ -21,7 +21,6 @@
 */
 package com.iemr.common.identity.domain;
 
-import java.math.BigInteger;
 import java.sql.Timestamp;
 
 import javax.persistence.Column;
@@ -73,8 +72,6 @@ public class MBeneficiaryImage {
 
 	@Column(name = "VehicalNo")
 	private String vehicalNo;
-	// @Column(name = "ParkingPlaceID")
-	// private Integer parkingPlaceID;
 	@Column(name = "SyncedBy")
 	private String syncedBy;
 	@Column(name = "SyncedDate", unique = true, nullable = false)

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java
@@ -41,10 +41,6 @@
 
 import lombok.Data;
 
-/**
- * The persistent class for the m_beneficiarydetails database table.
- * 
- */
 @Entity
 @Table(name = "i_beneficiarydetails")
 @NamedQuery(name = "MBeneficiarydetail.findAll", query = "SELECT m FROM MBeneficiarydetail m order by beneficiaryDetailsId asc")
@@ -62,7 +58,6 @@ public class MBeneficiarydetail implements Serializable {
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(unique = true, nullable = false)
-	// @OrderBy(value = "beneficiaryDetailsId asc")
 	private BigInteger beneficiaryDetailsId;
 
 	private Integer areaId;
@@ -125,8 +120,6 @@ public class MBeneficiarydetail implements Serializable {
 	@Column(length = 50)
 	private String modifiedBy;
 
-	// private Integer parkingPlaceID;
-
 	private Integer occupationId;
 
 	@Column(length = 45)
@@ -238,21 +231,10 @@ public class MBeneficiarydetail implements Serializable {
 	@Column(name = "VanSerialNo", updatable = false)
 	private BigInteger vanSerialNo;
 
-//	@Expose
-//	@Column(name = "familyid", updatable = true)
-//	private String familyid;
-
-	// END OF new column added for data sync
-	/**
-	 * Default constructor
-	 */
 	public MBeneficiarydetail() {
 
 	}
 
-	/**
-	 * Constructor for retrieving partial beneficiary details
-	 */
 	public MBeneficiarydetail(BigInteger beneficiaryDetailsId, String firstName, String lastName, String middleName,
 			String fatherName, String spouseName) {
 
@@ -342,9 +324,4 @@ public static String getIsHIVPositive(Integer status) {
 		return isHIVPositive;
 	}
 
-	// public static void main(String[] args)
-	// {
-	// Timestamp dob = new Timestamp(10, 07, 10,0,0,0,0);
-	// System.out.println(calculateAge(dob));
-	// }
 }
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
@@ -94,11 +94,6 @@ public class MBeneficiaryfamilymapping implements Serializable {
 
 	private Timestamp reservedOn;
 
-	// commented, 28-09-2018
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/* fetch = FetchType.EAGER */)
-//	@JoinColumn(name = "BenMapId", insertable = false, updatable = false)
-//	private MBeneficiarymapping MBeneficiarymapping;
 
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
@@ -103,12 +103,6 @@ public class MBeneficiaryidentity implements Serializable {
 
 	private Timestamp reservedOn;
 
-	// commented, 28-09-2018, unidirectional
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/* fetch = FetchType.EAGER */) /* (fetch = FetchType.LAZY) */
-//	@JoinColumn(name = "BenMapId", insertable = false, updatable = false)
-//	private MBeneficiarymapping MBeneficiarymapping;
-
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
 

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java
@@ -162,18 +162,6 @@ public class MBeneficiarymapping implements Serializable {
 	@JoinColumn(referencedColumnName = "benMapId", name = "benMapId", insertable = false, updatable = false)
 	private List<TBendataaccess> tBendataaccesses;
 
-	// public MBeneficiarymapping(BigInteger benMapId, String firstName)
-	// {
-	// this.mBeneficiarydetail.setFirstName(firstName);
-	// this.mBeneficiarydetail.setFirstName(firstName);
-	// this.mBeneficiarydetail.setFirstName(firstName);
-	// }
-
-	// public MBeneficiarymapping()
-	// {
-	//
-	// }
-
 	/*
 	 * New columns added for MMU integration 11-04-2018
 	 */

diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java
@@ -80,32 +80,13 @@ public class MBeneficiaryregidmapping implements Serializable {
 	@Column(name = "VehicalNo")
 	private String vehicalNo;
 
-	// private Integer ParkingPlaceID;
 
 	private String syncedBy;
 
 	private Timestamp syncedDate;
 
 	private String reservedForChange;
 
-	// //bi-directional one-to-one association to MBeneficiarydetail
-	// @OneToOne(fetch=FetchType.LAZY)
-	// @JoinColumn(name="BenRegId", referencedColumnName="BeneficiaryRegID",
-	// nullable=false, insertable=false, updatable=false)
-	// private MBeneficiarydetail MBeneficiarydetail;
-	//
-	// //bi-directional one-to-one association to MBeneficiarymapping
-	// @OneToOne(fetch=FetchType.LAZY)
-	// @JoinColumn(name="BenRegId", referencedColumnName="BenRegId", nullable=false,
-	// insertable=false, updatable=false)
-	// private MBeneficiarymapping MBeneficiarymapping;
-	//
-	// //bi-directional many-to-one association to MBeneficiaryfamilymapping
-	// @OneToMany(mappedBy="MBeneficiaryregid")
-	// private List<MBeneficiaryfamilymapping> MBeneficiaryfamilymappings;
-
-	// new column added for data sync
-	// 17-06-2018
 	@Expose
 	@Column(name = "vanID")
 	private Integer vanID;
@@ -117,5 +98,4 @@ public class MBeneficiaryregidmapping implements Serializable {
 	@Column(name = "VanSerialNo")
 	private BigInteger vanSerialNo;
 
-	// END OF new column added for data sync
 }
diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java b/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
@@ -107,10 +107,6 @@ public class MBeneficiaryservicemapping implements Serializable {
 	@Column(length = 45)
 	private String stateName;
 
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/* fetch = FetchType.EAGER */) /* (fetch = FetchType.LAZY) */
-//	@JoinColumn(name = "BenMapId")
-//	private MBeneficiarymapping MBeneficiarymapping;
 
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;

diff --git a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java b/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
@@ -68,8 +68,6 @@ public class TBendataaccess implements Serializable
 	private String authId;
 
 	@Transient
-	// @Column(nullable=false, length=75) //SQL Error: 1054, SQLState: 42S22 Unknown column 'tbendataac0_.consentId' in
-	// 'field list'
 	private String consentId;
 
 	@Column(length = 4)
@@ -79,8 +77,6 @@ public class TBendataaccess implements Serializable
 	private Integer userAgentId;
 
 	@Transient
-	// @Column(nullable=false, length=20)// SQL Error: 1054, SQLState: 42S22 Unknown column
-	// 'tbendataac0_.userAgentIpAddr' in 'field list'
 	private String userAgentIpAddr;
 
 	@Column(nullable = false)
@@ -92,11 +88,6 @@ public class TBendataaccess implements Serializable
 	@Column(nullable = false)
 	private Integer userAgentServiceId;
 
-	// commented on 28-09-2018
-	// bi-directional many-to-one association to MBeneficiarymapping
-//	@ManyToOne(/*fetch = FetchType.EAGER*/) /* (fetch = FetchType.LAZY) */
-//	@JoinColumn(name = "BenMapId", nullable = false)
-//	private MBeneficiarymapping MBeneficiarymapping;
 	@Column(name = "BenMapId", insertable = true, updatable = true)
 	private BigInteger benMapId;
 

diff --git a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java b/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
@@ -97,7 +97,6 @@ public class V_BenAdvanceSearch {
 	@Column(name = "DOB")
 	private Timestamp dOB;
 
-	// new column added for D2D, 21-01-2021
 	@Expose
 	@Column(name = "houseoldId")
 	private Long houseHoldID;
@@ -144,7 +143,6 @@ public void setHouseHoldID(Long houseHoldID) {
 
 	public V_BenAdvanceSearch() {
 		super();
-		// TODO Auto-generated constructor stub
 	}
 
 	public BigInteger getBenMapID() {

diff --git a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
@@ -52,7 +52,6 @@ public class BeneficiariesDTO implements Comparable<BeneficiariesDTO> {
 	private String preferredEmailId; //
 	private BenDetailDTO beneficiaryDetails;
 	private List<BenFamilyDTO> beneficiaryFamilyTags;
-	// private List<BenFamilyDTO> benFamilyDTOs;
 	private List<BenIdentityDTO> beneficiaryIdentites;
 	private List<BenServiceDTO> beneficiaryServiceMap;
 	private List<Phone> contacts;
@@ -65,8 +64,6 @@ public int compareTo(BeneficiariesDTO ben) {
 		return this.benMapId.compareTo(ben.benMapId);
 	}
 
-	// Start Outreach
-	// New columns added for MMU integration 09-04-2018
 	private Timestamp marriageDate;
 	private Integer ageAtMarriage;
 	private String literacyStatus;

diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
@@ -28,15 +28,13 @@
 import com.iemr.common.identity.domain.Address;
 import com.iemr.common.identity.domain.Contact;
 import com.iemr.common.identity.domain.Identity;
-// import com.iemr.common.identity.domain.Phone;
 
 import lombok.Data;
 
 @Data
 public class IdentityDTO {
 
 	private String eventTypeName; // created, reserved, registered, modified,
-									// deleted
 	private Timestamp eventTypeDate;
 	private Integer agentId;
 	private String agentName;
@@ -50,7 +48,6 @@ public class IdentityDTO {
 	private String stateName;
 	private Integer providerServiceMapId;
 
-	// details
 	private Integer areaId;
 	private Integer beneficiaryId;
 	private Integer beneficiaryRegId;
@@ -91,7 +88,6 @@ public class IdentityDTO {
 	private String title;
 	private Integer zoneId;
 
-	// address
 	private Address currentAddress;
 	private Address permanentAddress;
 	private Address emergencyAddress;
@@ -101,28 +97,18 @@ public class IdentityDTO {
 	private Boolean isEmerAddrSameAsPermAddr;
 	private String addressType;
 
-	// contacts
 	private String preferredEmailId;
 	private Contact contact;
 
-	// family tagging
 	List<BenFamilyDTO> benFamilyDTOs;
-	// private Boolean isEmergencyContact;
-	// private String relationshipToSelf;
-	// private BigInteger associatedBenRegId;
 
-	// identities
 	private List<Identity> identities;
 
-	// Start 1097
 	private Integer sexualOrientationID;
 	private String sexualOrientationType;
 	private String isHIVPositive;
-	// End 1097
 
-	/*
-	 * New columns added for MMU integration 11-04-2018
-	 */
+
 	private String bankName;
 	private String branchName;
 	private String ifscCode;
@@ -133,14 +119,10 @@ public class IdentityDTO {
 	private Integer ageAtMarriage;
 	private Integer incomeStatusId;
 	private String incomeStatus;
-	// End
 
-	// new column added for data sync
-	// 17-06-2018
 	@Expose
 	private Integer vanID;
 
-	// END OF new column added for data sync
 
 	@Expose
 	private Boolean beneficiaryConsent;