Skip to content

code smell fixes #11

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
Anjana2310 merged 1 commit into from
Jun 20, 2023
Merged

code smell fixes #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions src/main/java/com/iemr/common/identity/data/rmnch/BenHealthIDDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,6 @@
*/
package com.iemr.common.identity.data.rmnch;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;

import com.google.gson.annotations.Expose;

public class BenHealthIDDetails {

Integer benHealthID;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +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;

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +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;

Expand Down
3 changes: 0 additions & 3 deletions src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +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;

Expand Down Expand Up @@ -107,7 +105,6 @@ public class MBeneficiaryservicemapping implements Serializable {
@Column(length = 45)
private String stateName;


@Column(name = "BenMapId", insertable = true, updatable = true)
private BigInteger benMapId;

Expand Down
5 changes: 1 addition & 4 deletions src/main/java/com/iemr/common/identity/domain/TBendataaccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +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 javax.persistence.Transient;
Expand All @@ -46,8 +44,7 @@
@Table(name = "t_bendataaccess")
@NamedQuery(name = "TBendataaccess.findAll", query = "SELECT t FROM TBendataaccess t")
@Data
public class TBendataaccess implements Serializable
{
public class TBendataaccess implements Serializable {
private static final long serialVersionUID = 1L;

@Id
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenConsentRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import com.iemr.common.identity.data.rmnch.RMNCHMBeneficiaryaddress;
import com.iemr.common.identity.data.rmnch.RMNCHMBeneficiaryconsent;

@Repository
Expand Down
26 changes: 0 additions & 26 deletions src/main/java/com/iemr/common/identity/security/Encryption.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions src/main/java/com/iemr/common/identity/security/Hash.java
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 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 @@ -125,8 +125,6 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {

try {
if (requestOBJ != null && !requestOBJ.isEmpty()) {
// JSONObject jsonOBJ = new JSONObject(requestOBJ);

JsonObject jsnOBJ = new JsonObject();
JsonParser jsnParser = new JsonParser();
JsonElement jsnElmnt = jsnParser.parse(requestOBJ);
Expand All @@ -147,15 +145,11 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {

if (benRegID != null) {
for (RMNCHBeneficiaryDetailsRmnch obj : benDetailsExtraList) {
// RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
// .getByIdAndVanID(obj.getId(), obj.getVanID());
obj.setBenRegId(benRegID);
RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(benRegID);
if (temp != null) {
obj.setBeneficiaryDetails_RmnchId(temp.getBeneficiaryDetails_RmnchId());
// obj.setModifiedBy(obj.getCreatedBy());
// obj.setLastModDate(new Timestamp(System.currentTimeMillis()));
}

if (obj.getRelatedBeneficiaryIds() != null
Expand Down Expand Up @@ -334,33 +328,6 @@ public String getBenDataByAsha(String requestOBJ, String authorisation) throws E
} else
throw new Exception("Invalid/missing village details");

// ------
// if (request != null && request.getVillageID() != null) {
// List<RMNCHMBeneficiaryaddress> resultSet;
// Integer pageSize = Integer.valueOf(door_to_door_page_size);
// if (request.getPageNo() != null) {
// PageRequest pr = new PageRequest(request.getPageNo(), pageSize);
// if (request.getFromDate() != null && request.getToDate() != null) {
// Page<RMNCHMBeneficiaryaddress> p = rMNCHBenAddressRepo.getBenDataFilteredWithDateRange(
// request.getVillageID(), request.getFromDate(), request.getToDate(), pr);
// resultSet = p.getContent();
// totalPage = p.getTotalPages();
// } else {
// Page<RMNCHMBeneficiaryaddress> p = rMNCHBenAddressRepo.getBenData(request.getVillageID(), pr);
// resultSet = p.getContent();
// totalPage = p.getTotalPages();
// }
// if (resultSet != null && resultSet.size() > 0) {
// outputResponse = getMappingsForAddressIDs(resultSet, totalPage, authorisation);
// }
// } else {
// // page no not invalid
// throw new Exception("Invalid page no");
// }
// } else {
// // missing village details : village ID
// throw new Exception("Invalid/missing village details");
// }
} catch (Exception e) {
throw new Exception(e.getMessage());
}
Expand Down Expand Up @@ -516,8 +483,6 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
if (benAddressOBJ.getPermAddrLine3() != null)
benDetailsRMNCH_OBJ.setAddressLine3(benAddressOBJ.getPermAddrLine3());

// -----------------------------------------------------------------------------

// related benids
if (benDetailsRMNCH_OBJ.getRelatedBeneficiaryIdsDB() != null) {

Expand All @@ -531,7 +496,6 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi

benDetailsRMNCH_OBJ.setRelatedBeneficiaryIds(relatedBenIDs);
}
// ------------------------------------------------------------------------------

if (benDetailsOBJ.getCommunity() != null)
benDetailsRMNCH_OBJ.setCommunity(benDetailsOBJ.getCommunity());
Expand Down Expand Up @@ -648,7 +612,6 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
resultMap.put("benficieryid", benDetailsRMNCH_OBJ.getBenficieryid());
resultMap.put("BenRegId", m.getBenRegId());


// adding asha id / created by - user id
if (benAddressOBJ.getCreatedBy() != null) {
Integer userID = rMNCHMBenMappingRepo.getUserIDByUserName(benAddressOBJ.getCreatedBy());
Expand Down Expand Up @@ -742,7 +705,6 @@ public NCD_TB_HRP_data getHRP_NCD_TB_SuspectedStatus(Long benRegID, String autho
response.setConfirmed_hrp(getConfirmedHRP(benRegID, visitCode, authorization, benDetails));
break;
case "ANC":
// response = getConfirmedNCD_TB_Common(benRegID, visitCode);
response.setConfirmed_hrp(getConfirmedHRP(benRegID, visitCode, authorization, benDetails));
break;
case "NCD care":
Expand Down Expand Up @@ -986,38 +948,4 @@ public NCD_TB_HRP_data getConfirmedNCD_TB_NCD_CARE(Long benRegID, Long visitCode
return response;
}

// String isTB = "no", isNCD = "no";
// Object obj = null;
// ArrayList<String> ncdList = new ArrayList<String>();
// if (visitCode != null && benRegID != null) {// add NCD care
// if (visitCategory.equalsIgnoreCase("PNC")) {
// obj=rMNCHCBACDetailsRepo.getDiagnosisProvidedPNC(benRegID,visitCode);
// } else
// obj = rMNCHCBACDetailsRepo.getDiagnosisProvidedExceptPNC(benRegID, visitCode);
// if (obj != null) {
// String diagnosis[] = ((String) obj).split("||");
// if (diagnosis.length > 0) {
// for (String s : diagnosis) {
// if (s.equalsIgnoreCase("Tuberculosis"))
// isTB = "yes";
// else if (s.equalsIgnoreCase("Diabetes mellitus") || s.equalsIgnoreCase("Hypertension")
// || s.equalsIgnoreCase("Breast cancer")
// || s.equalsIgnoreCase("Mental health disorder")) {
// isNCD = "yes";
// ncdList.add(s);
// }
//
// }
// }
// }
// }
// Map<String, String> res = new HashMap<String, String>();
// // return yes,no
// res.put("suspected_ncd", "isNCD");
// res.put("suspected_tb", "isTB");
// res.put("suspected_hrp", "isHRP");
// res.put("confirmed_ncd_diseases", "ncdList.toString()");
// return new Gson().toJson(res);
// }

}
Loading