map = new HashMap<>();
+ map.put(FlwConstants.STATE_ID, getStateId());
+ map.put(FlwConstants.DISTRICT_ID, getDistrictId());
+ map.put(FlwConstants.DISTRICT_NAME, getDistrictName());
+ map.put(FlwConstants.TALUKA_ID, getTalukaId());
+ map.put(FlwConstants.TALUKA_NAME, getTalukaName());
+ map.put(FlwConstants.HEALTH_BLOCK_ID, getHealthBlockId());
+ map.put(FlwConstants.HEALTH_BLOCK_NAME, getHealthBlockName());
+ map.put(FlwConstants.PHC_ID, getPhcId());
+ map.put(FlwConstants.PHC_NAME, getPhcName());
+ map.put(FlwConstants.SUB_CENTRE_ID, getSubCentreId());
+ map.put(FlwConstants.SUB_CENTRE_NAME, getSubCentreName());
+ map.put(FlwConstants.CENSUS_VILLAGE_ID, getVillageId());
+ map.put(FlwConstants.VILLAGE_NAME, getVillageName());
+ map.put(FlwConstants.GF_ID, getGfId() == null ? null : getGfId().toString());
+ map.put(FlwConstants.MOBILE_NO, getMobileNo() == null ? null : Long.parseLong(getMobileNo()));
+ map.put(FlwConstants.GF_NAME, getGfName());
+ map.put(FlwConstants.GF_TYPE, getGfType());
+ map.put(FlwConstants.EXEC_DATE, "".equals(getExecDate()) ? null : LocalDate.parse(getExecDate(), DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")));
+ map.put(FlwConstants.GF_STATUS, getGfStatus());
+ return map;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchChildRecord.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchChildRecord.java
new file mode 100644
index 000000000..6555bd6d3
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchChildRecord.java
@@ -0,0 +1,233 @@
+package org.motechproject.nms.kilkari.contract;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlType
+@XmlAccessorType(XmlAccessType.NONE)
+public class RchChildRecord {
+
+ private Long stateId;
+ private Long districtId;
+ private String districtName;
+ private String talukaId;
+ private String talukaName;
+ private Long healthBlockId;
+ private String healthBlockName;
+ private Long phcId;
+ private String phcName;
+ private Long subCentreId;
+ private String subCentreName;
+ private Long villageId;
+ private String villageName;
+ private String name;
+ private String mobileNo;
+ private String birthdate;
+ private String registrationNo;
+ private String motherRegistrationNo;
+ private Integer entryType;
+ private String mctsId;
+ private String mctsMotherIdNo;
+ private String execDate;
+
+ public Long getStateId() {
+ return stateId;
+ }
+
+
+ public String getDistrictName() {
+ return districtName;
+ }
+
+ @XmlElement(name = "District_Name")
+ public void setDistrictName(String districtName) {
+ this.districtName = districtName;
+ }
+
+ public String getTalukaId() {
+ return talukaId;
+ }
+
+ @XmlElement(name = "Taluka_ID")
+ public void setTalukaId(String talukaId) {
+ this.talukaId = talukaId;
+ }
+
+ @XmlElement(name = "StateID")
+ public void setStateId(Long stateId) {
+ this.stateId = stateId;
+ }
+
+ public Long getDistrictId() {
+ return districtId;
+ }
+
+ @XmlElement(name = "District_ID")
+ public void setDistrictId(Long districtId) {
+ this.districtId = districtId;
+ }
+
+ public String getTalukaName() {
+ return talukaName;
+ }
+
+ @XmlElement(name = "Taluka_Name")
+ public void setTalukaName(String talukaName) {
+ this.talukaName = talukaName;
+ }
+
+ public Long getHealthBlockId() {
+ return healthBlockId;
+ }
+
+ public String getSubCentreName() {
+ return subCentreName;
+ }
+
+ @XmlElement(name = "SubCentre_Name")
+ public void setSubCentreName(String subCentreName) {
+ this.subCentreName = subCentreName;
+ }
+
+ public Long getVillageId() {
+ return villageId;
+ }
+
+ public Long getSubCentreId() {
+ return subCentreId;
+ }
+
+ @XmlElement(name = "SubCentre_ID")
+ public void setSubCentreId(Long subCentreId) {
+ this.subCentreId = subCentreId;
+ }
+
+ @XmlElement(name = "Village_ID")
+ public void setVillageId(Long villageId) {
+ this.villageId = villageId;
+ }
+
+ @XmlElement(name = "HealthBlock_ID")
+ public void setHealthBlockId(Long healthBlockId) {
+ this.healthBlockId = healthBlockId;
+ }
+
+ public String getHealthBlockName() {
+ return healthBlockName;
+ }
+
+ @XmlElement(name = "HealthBlock_Name")
+ public void setHealthBlockName(String healthBlockName) {
+ this.healthBlockName = healthBlockName;
+ }
+
+ public Long getPhcId() {
+ return phcId;
+ }
+
+ @XmlElement(name = "PHC_ID")
+ public void setPhcId(Long phcId) {
+ this.phcId = phcId;
+ }
+
+ public String getPhcName() {
+ return phcName;
+ }
+
+ @XmlElement(name = "PHC_Name")
+ public void setPhcName(String phcName) {
+ this.phcName = phcName;
+ }
+
+ public String getVillageName() {
+ return villageName;
+ }
+
+ @XmlElement(name = "Village_Name")
+ public void setVillageName(String villageName) {
+ this.villageName = villageName;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @XmlElement(name = "Name")
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getMobileNo() {
+ return mobileNo;
+ }
+
+ @XmlElement(name = "Mobile_no")
+ public void setMobileNo(String mobileNo) {
+ this.mobileNo = mobileNo;
+ }
+
+ public String getBirthdate() {
+ return birthdate;
+ }
+
+ @XmlElement(name = "Birthdate")
+ public void setBirthdate(String birthdate) {
+ this.birthdate = birthdate;
+ }
+
+ public String getRegistrationNo() {
+ return registrationNo;
+ }
+
+ @XmlElement(name = "Registration_no")
+ public void setRegistrationNo(String registrationNo) {
+ this.registrationNo = registrationNo;
+ }
+
+ public String getMotherRegistrationNo() {
+ return motherRegistrationNo;
+ }
+
+ @XmlElement(name = "Mother_Registration_no")
+ public void setMotherRegistrationNo(String motherRegistrationNo) {
+ this.motherRegistrationNo = motherRegistrationNo;
+ }
+
+ public String getMctsId() {
+ return mctsId;
+ }
+
+ @XmlElement(name = "MCTS_ID_No")
+ public void setMctsId(String mctsId) {
+ this.mctsId = mctsId;
+ }
+
+ public String getMctsMotherIdNo() {
+ return mctsMotherIdNo;
+ }
+
+ @XmlElement(name = "MCTS_Mother_ID_No")
+ public void setMctsMotherIdNo(String mctsMotherIdNo) {
+ this.mctsMotherIdNo = mctsMotherIdNo;
+ }
+
+ public Integer getEntryType() {
+ return entryType;
+ }
+
+ @XmlElement(name = "Entry_Type")
+ public void setEntryType(Integer entryType) {
+ this.entryType = entryType;
+ }
+
+ public String getExecDate() {
+ return execDate;
+ }
+
+ @XmlElement(name = "Exec_Date")
+ public void setExecDate(String execDate) {
+ this.execDate = execDate;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchDistrictRecord.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchDistrictRecord.java
new file mode 100644
index 000000000..bb91ce4a6
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchDistrictRecord.java
@@ -0,0 +1,47 @@
+package org.motechproject.nms.kilkari.contract;
+
+import org.joda.time.DateTime;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Created by vishnu on 13/7/18.
+ */
+@XmlType
+@XmlAccessorType(XmlAccessType.NONE)
+public class RchDistrictRecord {
+
+ private Long districtCode;
+ private String districtName;
+ private DateTime execDate;
+
+ public Long getDistrictCode() {
+ return districtCode;
+ }
+
+ @XmlElement(name = "District_ID")
+ public void setDistrictCode(Long districtCode) {
+ this.districtCode = districtCode;
+ }
+
+ public String getDistrictName() {
+ return districtName;
+ }
+
+ @XmlElement(name = "District_Name")
+ public void setDistrictName(String districtName) {
+ this.districtName = districtName;
+ }
+
+ public DateTime getExecDate() {
+ return execDate;
+ }
+
+ @XmlElement(name = "Exec_Date")
+ public void setExecDate(DateTime execDate) {
+ this.execDate = execDate;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchHealthBlockRecord.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchHealthBlockRecord.java
new file mode 100644
index 000000000..64ad36761
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchHealthBlockRecord.java
@@ -0,0 +1,68 @@
+package org.motechproject.nms.kilkari.contract;
+
+import org.joda.time.DateTime;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Created by vishnu on 29/6/18.
+ */
+
+@XmlType
+@XmlAccessorType(XmlAccessType.NONE)
+public class RchHealthBlockRecord {
+
+ private Long districtCode;
+ private String talukaCode;
+ private Long healthBlockCode;
+ private String healthBlockName;
+ private DateTime execDate;
+
+ public String getHealthBlockName() {
+ return healthBlockName;
+ }
+
+ @XmlElement(name = "HealthBlock_Name")
+ public void setHealthBlockName(String healthBlockName) {
+ this.healthBlockName = healthBlockName;
+ }
+
+ public Long getDistrictCode() {
+ return districtCode;
+ }
+
+ public DateTime getExecDate() {
+ return execDate;
+ }
+
+ @XmlElement(name = "Exec_Date")
+ public void setExecDate(DateTime execDate) {
+ this.execDate = execDate;
+ }
+
+ @XmlElement(name = "District_ID")
+ public void setDistrictCode(Long districtCode) {
+ this.districtCode = districtCode;
+ }
+
+ public String getTalukaCode() {
+ return talukaCode;
+ }
+
+ @XmlElement(name = "Taluka_ID")
+ public void setTalukaCode(String talukaCode) {
+ this.talukaCode = talukaCode;
+ }
+
+ public Long getHealthBlockCode() {
+ return healthBlockCode;
+ }
+
+ @XmlElement(name = "HealthBlock_ID")
+ public void setHealthBlockCode(Long healthBlockCode) {
+ this.healthBlockCode = healthBlockCode;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchHealthFacilityRecord.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchHealthFacilityRecord.java
new file mode 100644
index 000000000..0e245fed2
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchHealthFacilityRecord.java
@@ -0,0 +1,79 @@
+package org.motechproject.nms.kilkari.contract;
+
+import org.joda.time.DateTime;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Created by vishnu on 13/7/18.
+ */
+
+@XmlType
+@XmlAccessorType(XmlAccessType.NONE)
+public class RchHealthFacilityRecord {
+
+ private Long districtCode;
+ private String talukaCode;
+ private Long healthBlockCode;
+ private Long healthFacilityCode;
+ private String healthFacilityName;
+ private DateTime execDate;
+
+ public Long getHealthBlockCode() {
+ return healthBlockCode;
+ }
+
+ @XmlElement(name = "HealthBlock_ID")
+ public void setHealthBlockCode(Long healthBlockCode) {
+ this.healthBlockCode = healthBlockCode;
+ }
+
+ public Long getHealthFacilityCode() {
+ return healthFacilityCode;
+ }
+
+ @XmlElement(name = "HealthFacility_ID")
+ public void setHealthFacilityCode(Long healthFacilityCode) {
+ this.healthFacilityCode = healthFacilityCode;
+ }
+
+ public String getHealthFacilityName() {
+ return healthFacilityName;
+ }
+
+ @XmlElement(name = "HealthFacility_Name")
+ public void setHealthFacilityName(String healthFacilityName) {
+ this.healthFacilityName = healthFacilityName;
+ }
+
+ public Long getDistrictCode() {
+ return districtCode;
+ }
+
+ @XmlElement(name = "District_ID")
+ public void setDistrictCode(Long districtCode) {
+ this.districtCode = districtCode;
+ }
+
+ public DateTime getExecDate() {
+ return execDate;
+ }
+
+ @XmlElement(name = "Exec_Date")
+ public void setExecDate(DateTime execDate) {
+ this.execDate = execDate;
+ }
+
+ public String getTalukaCode() {
+ return talukaCode;
+ }
+
+ @XmlElement(name = "Taluka_ID")
+ public void setTalukaCode(String talukaCode) {
+ this.talukaCode = talukaCode;
+ }
+
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchHealthSubFacilityRecord.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchHealthSubFacilityRecord.java
new file mode 100644
index 000000000..9b999a16d
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchHealthSubFacilityRecord.java
@@ -0,0 +1,80 @@
+package org.motechproject.nms.kilkari.contract;
+
+import org.joda.time.DateTime;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Created by beehyv on 18/7/18.
+ */
+@XmlType
+@XmlAccessorType(XmlAccessType.NONE)
+public class RchHealthSubFacilityRecord {
+
+ private Long districtCode;
+ private String talukaCode;
+ private Long healthFacilityCode;
+ private Long healthSubFacilityCode;
+ private String healthSubFacilityName;
+ private DateTime execDate;
+
+ public Long getDistrictCode() {
+ return districtCode;
+ }
+
+ @XmlElement(name = "District_ID")
+ public void setDistrictCode(Long districtCode) {
+ this.districtCode = districtCode;
+ }
+
+ public String getHealthSubFacilityName() {
+ return healthSubFacilityName;
+ }
+
+ @XmlElement(name = "HealthSubFacility_Name")
+ public void setHealthSubFacilityName(String healthSubFacilityName) {
+ this.healthSubFacilityName = healthSubFacilityName;
+ }
+
+ public Long getHealthSubFacilityCode() {
+ return healthSubFacilityCode;
+ }
+
+ @XmlElement(name = "HealthSubFacility_ID")
+ public void setHealthSubFacilityCode(Long healthSubFacilityCode) {
+ this.healthSubFacilityCode = healthSubFacilityCode;
+ }
+
+ public DateTime getExecDate() {
+ return execDate;
+ }
+
+ @XmlElement(name = "Exec_Date")
+ public void setExecDate(DateTime execDate) {
+ this.execDate = execDate;
+ }
+
+ public String getTalukaCode() {
+ return talukaCode;
+ }
+
+ @XmlElement(name = "Taluka_ID")
+ public void setTalukaCode(String talukaCode) {
+ this.talukaCode = talukaCode;
+ }
+
+ public Long getHealthFacilityCode() {
+ return healthFacilityCode;
+ }
+
+ @XmlElement(name = "HealthFacility_ID")
+ public void setHealthFacilityCode(Long healthFacilityCode) {
+ this.healthFacilityCode = healthFacilityCode;
+ }
+
+
+
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchMotherRecord.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchMotherRecord.java
new file mode 100644
index 000000000..bba33bcb2
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchMotherRecord.java
@@ -0,0 +1,253 @@
+package org.motechproject.nms.kilkari.contract;
+
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlElement;
+
+@XmlType
+@XmlAccessorType(XmlAccessType.NONE)
+public class RchMotherRecord {
+
+ private Long stateId;
+ private Long districtId;
+ private String districtName;
+ private String talukaId;
+ private String talukaName;
+ private Long healthBlockId;
+ private String healthBlockName;
+ private Long phcId;
+ private String phcName;
+ private Long subCentreId;
+ private String subCentreName;
+ private Long villageId;
+ private String villageName;
+ private String mctsIdNo;
+ private String registrationNo;
+ private Long caseNo;
+ private String name;
+ private String mobileNo;
+ private String lmpDate;
+ private String birthDate;
+ private String abortionType;
+ private String deliveryOutcomes;
+ private Integer entryType;
+ private String execDate;
+
+ public Long getStateId() {
+ return stateId;
+ }
+
+ @XmlElement(name = "StateID")
+ public void setStateId(Long stateId) {
+ this.stateId = stateId;
+ }
+
+ public Long getDistrictId() {
+ return districtId;
+ }
+
+ @XmlElement(name = "District_ID")
+ public void setDistrictId(Long districtId) {
+ this.districtId = districtId;
+ }
+
+ public Long getHealthBlockId() {
+ return healthBlockId;
+ }
+
+ @XmlElement(name = "HealthBlock_ID")
+ public void setHealthBlockId(Long healthBlockId) {
+ this.healthBlockId = healthBlockId;
+ }
+
+ public String getHealthBlockName() {
+ return healthBlockName;
+ }
+
+ @XmlElement(name = "HealthBlock_Name")
+ public void setHealthBlockName(String healthBlockName) {
+ this.healthBlockName = healthBlockName;
+ }
+
+ public Long getPhcId() {
+ return phcId;
+ }
+
+ public String getDistrictName() {
+ return districtName;
+ }
+
+ @XmlElement(name = "District_Name")
+ public void setDistrictName(String districtName) {
+ this.districtName = districtName;
+ }
+
+ public String getTalukaId() {
+ return talukaId;
+ }
+
+ @XmlElement(name = "Taluka_ID")
+ public void setTalukaId(String talukaId) {
+ this.talukaId = talukaId;
+ }
+
+ public String getTalukaName() {
+ return talukaName;
+ }
+
+ @XmlElement(name = "Taluka_Name")
+ public void setTalukaName(String talukaName) {
+ this.talukaName = talukaName;
+ }
+
+ @XmlElement(name = "PHC_ID")
+ public void setPhcId(Long phcId) {
+ this.phcId = phcId;
+ }
+
+ public String getPhcName() {
+ return phcName;
+ }
+
+ @XmlElement(name = "PHC_Name")
+ public void setPhcName(String phcName) {
+ this.phcName = phcName;
+ }
+
+ public Long getSubCentreId() {
+ return subCentreId;
+ }
+
+ @XmlElement(name = "SubCentre_ID")
+ public void setSubCentreId(Long subCentreId) {
+ this.subCentreId = subCentreId;
+ }
+
+ public String getSubCentreName() {
+ return subCentreName;
+ }
+
+ @XmlElement(name = "SubCentre_Name")
+ public void setSubCentreName(String subCentreName) {
+ this.subCentreName = subCentreName;
+ }
+
+ public Long getVillageId() {
+ return villageId;
+ }
+
+ @XmlElement(name = "Village_ID")
+ public void setVillageId(Long villageId) {
+ this.villageId = villageId;
+ }
+
+ public String getVillageName() {
+ return villageName;
+ }
+
+ @XmlElement(name = "Village_Name")
+ public void setVillageName(String villageName) {
+ this.villageName = villageName;
+ }
+
+ public String getMctsIdNo() {
+ return mctsIdNo;
+ }
+
+ @XmlElement(name = "MCTS_ID_No")
+ public void setMctsIdNo(String mctsIdNo) {
+ this.mctsIdNo = mctsIdNo;
+ }
+
+ public String getRegistrationNo() {
+ return registrationNo;
+ }
+
+ @XmlElement(name = "Registration_no")
+ public void setRegistrationNo(String registrationNo) {
+ this.registrationNo = registrationNo;
+ }
+
+ public Long getCaseNo() {
+ return caseNo;
+ }
+
+ @XmlElement(name = "Case_no")
+ public void setCaseNo(Long caseNo) {
+ this.caseNo = caseNo;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @XmlElement(name = "Name")
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getMobileNo() {
+ return mobileNo;
+ }
+
+ @XmlElement(name = "Mobile_no")
+ public void setMobileNo(String mobileNo) {
+ this.mobileNo = mobileNo;
+ }
+
+ public String getLmpDate() {
+ return lmpDate;
+ }
+
+ @XmlElement(name = "LMP_Date")
+ public void setLmpDate(String lmpDate) {
+ this.lmpDate = lmpDate;
+ }
+
+ public String getBirthDate() {
+ return birthDate;
+ }
+
+ @XmlElement(name = "Birthdate")
+ public void setBirthDate(String birthDate) {
+ this.birthDate = birthDate;
+ }
+
+ public String getAbortionType() {
+ return abortionType;
+ }
+
+ @XmlElement(name = "Abortion_Type")
+ public void setAbortionType(String abortionType) {
+ this.abortionType = abortionType;
+ }
+
+ public String getDeliveryOutcomes() {
+ return deliveryOutcomes;
+ }
+
+ @XmlElement(name = "Delivery_Outcomes")
+ public void setDeliveryOutcomes(String deliveryOutcomes) {
+ this.deliveryOutcomes = deliveryOutcomes;
+ }
+
+ public Integer getEntryType() {
+ return entryType;
+ }
+
+ @XmlElement(name = "Entry_Type")
+ public void setEntryType(Integer entryType) {
+ this.entryType = entryType;
+ }
+
+ public String getExecDate() {
+ return execDate;
+ }
+
+ @XmlElement(name = "Exec_Date")
+ public void setExecDate(String execDate) {
+ this.execDate = execDate;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchTalukaHealthBlockRecord.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchTalukaHealthBlockRecord.java
new file mode 100644
index 000000000..bcb751eef
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchTalukaHealthBlockRecord.java
@@ -0,0 +1,48 @@
+package org.motechproject.nms.kilkari.contract;
+
+import org.joda.time.DateTime;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Created by vishnu on 3/7/18.
+ */
+
+@XmlType
+@XmlAccessorType(XmlAccessType.NONE)
+public class RchTalukaHealthBlockRecord {
+
+ private String talukaCode;
+ private Long healthBlockCode;
+ private DateTime execDate;
+
+ public String getTalukaCode() {
+ return talukaCode;
+ }
+
+ @XmlElement(name = "Taluka_ID")
+ public void setTalukaCode(String talukaCode) {
+ this.talukaCode = talukaCode;
+ }
+
+ public Long getHealthBlockCode() {
+ return healthBlockCode;
+ }
+
+ @XmlElement(name = "HealthBlock_ID")
+ public void setHealthBlockCode(Long healthBlockCode) {
+ this.healthBlockCode = healthBlockCode;
+ }
+
+ public DateTime getExecDate() {
+ return execDate;
+ }
+
+ @XmlElement(name = "Exec_Date")
+ public void setExecDate(DateTime execDate) {
+ this.execDate = execDate;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchTalukaRecord.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchTalukaRecord.java
new file mode 100644
index 000000000..dc8b68e07
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchTalukaRecord.java
@@ -0,0 +1,57 @@
+package org.motechproject.nms.kilkari.contract;
+
+import org.joda.time.DateTime;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Created by vishnu on 27/6/18.
+ */
+@XmlType
+@XmlAccessorType(XmlAccessType.NONE)
+public class RchTalukaRecord {
+
+ private Long districtCode;
+ private String talukaCode;
+ private String talukaName;
+ private DateTime execDate;
+
+ public Long getDistrictCode() {
+ return districtCode;
+ }
+
+ @XmlElement(name = "District_ID")
+ public void setDistrictCode(Long districtCode) {
+ this.districtCode = districtCode;
+ }
+
+ public String getTalukaCode() {
+ return talukaCode;
+ }
+
+ @XmlElement(name = "Taluka_ID")
+ public void setTalukaCode(String talukaCode) {
+ this.talukaCode = talukaCode;
+ }
+
+ public String getTalukaName() {
+ return talukaName;
+ }
+
+ @XmlElement(name = "Taluka_Name")
+ public void setTalukaName(String talukaName) {
+ this.talukaName = talukaName;
+ }
+
+ public DateTime getExecDate() {
+ return execDate;
+ }
+
+ @XmlElement(name = "Exec_Date")
+ public void setExecDate(DateTime execDate) {
+ this.execDate = execDate;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchVillageHealthSubFacilityRecord.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchVillageHealthSubFacilityRecord.java
new file mode 100644
index 000000000..5f5042921
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchVillageHealthSubFacilityRecord.java
@@ -0,0 +1,57 @@
+package org.motechproject.nms.kilkari.contract;
+
+import org.joda.time.DateTime;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Created by beehyv on 18/7/18.
+ */
+@XmlType
+@XmlAccessorType(XmlAccessType.NONE)
+public class RchVillageHealthSubFacilityRecord {
+
+ private Long districtCode;
+ private Long villageCode;
+ private Long healthSubFacilityCode;
+ private DateTime execDate;
+
+ public Long getDistrictCode() {
+ return districtCode;
+ }
+
+ @XmlElement(name = "District_ID")
+ public void setDistrictCode(Long districtCode) {
+ this.districtCode = districtCode;
+ }
+
+ public Long getVillageCode() {
+ return villageCode;
+ }
+
+ @XmlElement(name = "Village_ID")
+ public void setVillageCode(Long villageCode) {
+ this.villageCode = villageCode;
+ }
+
+ public Long getHealthSubFacilityCode() {
+ return healthSubFacilityCode;
+ }
+
+ @XmlElement(name = "HealthSubFacility_ID")
+ public void setHealthSubFacilityCode(Long healthSubFacilityCode) {
+ this.healthSubFacilityCode = healthSubFacilityCode;
+ }
+
+ public DateTime getExecDate() {
+ return execDate;
+ }
+
+ @XmlElement(name = "Exec_Date")
+ public void setExecDate(DateTime execDate) {
+ this.execDate = execDate;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchVillageRecord.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchVillageRecord.java
new file mode 100644
index 000000000..713e5545d
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/contract/RchVillageRecord.java
@@ -0,0 +1,67 @@
+package org.motechproject.nms.kilkari.contract;
+
+import org.joda.time.DateTime;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Created by beehyv on 18/7/18.
+ */
+@XmlType
+@XmlAccessorType(XmlAccessType.NONE)
+public class RchVillageRecord {
+
+ private Long districtCode;
+ private String talukaCode;
+ private Long villageCode;
+ private String villageName;
+ private DateTime execDate;
+
+ public Long getDistrictCode() {
+ return districtCode;
+ }
+
+ @XmlElement(name = "District_ID")
+ public void setDistrictCode(Long districtCode) {
+ this.districtCode = districtCode;
+ }
+
+ public String getTalukaCode() {
+ return talukaCode;
+ }
+
+ @XmlElement(name = "Taluka_ID")
+ public void setTalukaCode(String talukaCode) {
+ this.talukaCode = talukaCode;
+ }
+
+ public Long getVillageCode() {
+ return villageCode;
+ }
+
+ @XmlElement(name = "Village_ID")
+ public void setVillageCode(Long villageCode) {
+ this.villageCode = villageCode;
+ }
+
+ public String getVillageName() {
+ return villageName;
+ }
+
+ @XmlElement(name = "Village_Name")
+ public void setVillageName(String villageName) {
+ this.villageName = villageName;
+ }
+
+ public DateTime getExecDate() {
+ return execDate;
+ }
+
+ @XmlElement(name = "Exec_Date")
+ public void setExecDate(DateTime execDate) {
+ this.execDate = execDate;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/DeactivatedBeneficiary.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/DeactivatedBeneficiary.java
new file mode 100644
index 000000000..64ed9b33e
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/DeactivatedBeneficiary.java
@@ -0,0 +1,92 @@
+package org.motechproject.nms.kilkari.domain;
+
+import org.joda.time.DateTime;
+import org.motechproject.mds.annotations.Entity;
+import org.motechproject.mds.annotations.Field;
+
+import javax.jdo.annotations.Column;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Record for users who are deactivated or completed their subscriptions.
+ *
+ * Created by ajai on 5/6/17.
+ */
+@Entity(tableName = "nms_deactivated_beneficiary")
+public class DeactivatedBeneficiary {
+
+
+ @Field
+ @NotNull
+ private String externalId;
+
+ @Field
+ @Column(allowsNull = "false")
+ @NotNull
+ private SubscriptionOrigin origin;
+
+ @Field
+ private DeactivationReason deactivationReason;
+
+ @Field
+ private boolean completedSubscription;
+
+ @Field
+ private DateTime serviceStartDate;
+
+ @Field
+ private DateTime deactivationDate;
+
+ public DeactivatedBeneficiary() {
+
+ }
+
+ public String getExternalId() {
+ return externalId;
+ }
+
+ public void setExternalId(String externalId) {
+ this.externalId = externalId;
+ }
+
+ public SubscriptionOrigin getOrigin() {
+ return origin;
+ }
+
+ public void setOrigin(SubscriptionOrigin origin) {
+ this.origin = origin;
+ }
+
+ public DeactivationReason getDeactivationReason() {
+ return deactivationReason;
+ }
+
+ public void setDeactivationReason(DeactivationReason deactivationReason) {
+ this.deactivationReason = deactivationReason;
+ }
+
+ public boolean isCompletedSubscription() {
+ return completedSubscription;
+ }
+
+ public void setCompletedSubscription(boolean completedSubscription) {
+ this.completedSubscription = completedSubscription;
+ }
+
+ public DateTime getServiceStartDate() {
+ return serviceStartDate;
+ }
+
+ public void setServiceStartDate(DateTime serviceStartDate) {
+ this.serviceStartDate = serviceStartDate;
+ }
+
+ public DateTime getDeactivationDate() {
+ return deactivationDate;
+ }
+
+ public void setDeactivationDate(DateTime deactivationDate) {
+ this.deactivationDate = deactivationDate;
+ }
+
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/MctsChild.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/MctsChild.java
index bfe9e1f4a..76c8f0e49 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/MctsChild.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/MctsChild.java
@@ -21,6 +21,10 @@ public MctsChild(String beneficiaryId) {
super(beneficiaryId);
}
+ public MctsChild(String rchId, String beneficiaryId) {
+ super(rchId, beneficiaryId);
+ }
+
public MctsChild(String beneficiaryId, String name, MctsMother mother) {
super(beneficiaryId, name);
this.mother = mother;
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/ReactivatedBeneficiaryAudit.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/ReactivatedBeneficiaryAudit.java
new file mode 100644
index 000000000..b68466a76
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/ReactivatedBeneficiaryAudit.java
@@ -0,0 +1,86 @@
+package org.motechproject.nms.kilkari.domain;
+
+import org.joda.time.DateTime;
+import org.motechproject.mds.annotations.Entity;
+import org.motechproject.mds.annotations.Field;
+
+import javax.jdo.annotations.Column;
+import javax.validation.constraints.NotNull;
+
+
+@Entity(tableName = "nms_reactivated_beneficiary")
+public class ReactivatedBeneficiaryAudit {
+
+
+ @Field
+ @NotNull
+ private String externalId;
+
+ @Field
+ @Column(allowsNull = "false")
+ private SubscriptionOrigin origin;
+
+ @Field
+ private DeactivationReason deactivationReason;
+
+ @Field
+ private DateTime serviceReactivationDate;
+
+ @Field
+ private SubscriptionPack subscriptionPack;
+
+ @Field
+ private DateTime deactivationDate;
+
+ public ReactivatedBeneficiaryAudit() {
+
+ }
+
+ public String getExternalId() {
+ return externalId;
+ }
+
+ public void setExternalId(String externalId) {
+ this.externalId = externalId;
+ }
+
+ public SubscriptionOrigin getOrigin() {
+ return origin;
+ }
+
+ public void setOrigin(SubscriptionOrigin origin) {
+ this.origin = origin;
+ }
+
+ public DeactivationReason getDeactivationReason() {
+ return deactivationReason;
+ }
+
+ public void setDeactivationReason(DeactivationReason deactivationReason) {
+ this.deactivationReason = deactivationReason;
+ }
+
+ public DateTime getServiceReactivationDate() {
+ return serviceReactivationDate;
+ }
+
+ public void setServiceReactivationDate(DateTime serviceReactivationDate) {
+ this.serviceReactivationDate = serviceReactivationDate;
+ }
+
+ public DateTime getDeactivationDate() {
+ return deactivationDate;
+ }
+
+ public void setDeactivationDate(DateTime deactivationDate) {
+ this.deactivationDate = deactivationDate;
+ }
+
+ public SubscriptionPack getSubscriptionPack() {
+ return subscriptionPack;
+ }
+
+ public void setSubscriptionPack(SubscriptionPack subscriptionPack) {
+ this.subscriptionPack = subscriptionPack;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/RejectionReasons.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/RejectionReasons.java
new file mode 100644
index 000000000..57abff7f5
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/RejectionReasons.java
@@ -0,0 +1,27 @@
+package org.motechproject.nms.kilkari.domain;
+
+/**
+ * Created by vishnu on 17/7/17.
+ */
+public enum RejectionReasons {
+ FLW_TYPE_NOT_ASHA,
+ INVALID_LOCATION,
+ MOBILE_NUMBER_ALREADY_IN_USE,
+ UPDATED_RECORD_ALREADY_EXISTS,
+ FLW_IMPORT_ERROR,
+ INVALID_LMP_DATE,
+ ACTIVE_CHILD_PRESENT,
+ INVALID_CASE_NO,
+ ALREADY_LINKED_WITH_A_DIFFERENT_MOTHER_ID,
+ INVALID_DOB,
+ GF_STATUS_INACTIVE,
+ MOBILE_NUMBER_ALREADY_SUBSCRIBED,
+ ABORT_STILLBIRTH_DEATH,
+ ALREADY_SUBSCRIBED,
+ DUPLICATE_MOBILE_NUMBER_IN_DATASET,
+ MOBILE_NUMBER_EMPTY_OR_WRONG_FORMAT,
+ GF_STATUS_EMPTY_OR_WRONG_FORMAT,
+ FIELD_NOT_PRESENT,
+ DATA_INTEGRITY_ERROR,
+ CHILD_DEATH
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/Subscriber.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/Subscriber.java
index e5a378ca9..84958c004 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/Subscriber.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/Subscriber.java
@@ -1,7 +1,9 @@
package org.motechproject.nms.kilkari.domain;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonManagedReference;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
import org.joda.time.DateTime;
import org.motechproject.mds.annotations.Entity;
import org.motechproject.mds.annotations.Field;
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriberMsisdnTracker.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriberMsisdnTracker.java
index 497d7234c..b5eefe2a5 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriberMsisdnTracker.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriberMsisdnTracker.java
@@ -19,7 +19,7 @@ public class SubscriberMsisdnTracker {
@Field
@Min(value = 1000000000L, message = "callingNumber must be 10 digits")
@Max(value = 9999999999L, message = "callingNumber must be 10 digits")
- @Column(length = 10, allowsNull = "false")
+ @Column(length = 10, allowsNull = "true")
private Long oldCallingNumber;
@Field
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/Subscription.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/Subscription.java
index 17bf028f8..d85c4fef6 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/Subscription.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/Subscription.java
@@ -1,6 +1,6 @@
package org.motechproject.nms.kilkari.domain;
-import org.codehaus.jackson.annotate.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
import org.joda.time.DateTime;
import org.joda.time.Days;
import org.motechproject.mds.annotations.Entity;
@@ -126,6 +126,10 @@ public void setStatus(SubscriptionStatus status) {
}
}
+ public void setReactivationStatus() {
+ this.status = SubscriptionStatus.ACTIVE;
+ }
+
public SubscriptionOrigin getOrigin() { return origin; }
public void setOrigin(SubscriptionOrigin origin) { this.origin = origin; }
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriptionPack.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriptionPack.java
index 873010daf..c74825527 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriptionPack.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriptionPack.java
@@ -109,9 +109,9 @@ public String isReferenceDateValidForPack(DateTime date) {
return String.format("Reference date is after now: %s", date.toString());
}
- int packLengthInDays = weeks * DAYS_IN_WEEK;
+ int packLengthInDays = weeks * DAYS_IN_WEEK; //72 weeks
int minDaysLeftInPack = MIN_MSG_WEEKS * DAYS_IN_WEEK; // BBC requirement to have at least 12 weeks of messages to send
- DateTime startDate = (type == SubscriptionPackType.PREGNANCY) ? date.plusDays(THREE_MONTHS) : date;
+ DateTime startDate = (type == SubscriptionPackType.PREGNANCY) ? date.plusDays(THREE_MONTHS) : date; //add 3 months to lmp
DateTime cutOff = DateUtil.now().plusDays(minDaysLeftInPack + 1); // plus 1 since we start calling people the next day
// Cutoff date is the minimum days left in pack for us to deliver 12 weeks worth of messages
@@ -123,6 +123,8 @@ public String isReferenceDateValidForPack(DateTime date) {
return "";
}
+
+
@Ignore
public boolean hasMessageWithWeekId(String weekId) {
for (SubscriptionPackMessage message : messages) {
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriptionRejectionReason.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriptionRejectionReason.java
index 85e8d12d5..8a96b16f7 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriptionRejectionReason.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/SubscriptionRejectionReason.java
@@ -16,5 +16,6 @@ public enum SubscriptionRejectionReason {
INVALID_CASE_NO,
WEEKLY_CALLS_NOT_ANSWERED,
ABORT_STILLBIRTH_DEATH,
- ACTIVE_CHILD_PRESENT;
+ ACTIVE_CHILD_PRESENT,
+ MSISDN_WITH_ONE_ACTIVE_SUBCRIPTION_PRESENT
}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/ThreadProcessorObject.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/ThreadProcessorObject.java
new file mode 100644
index 000000000..16fd90e25
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/domain/ThreadProcessorObject.java
@@ -0,0 +1,40 @@
+package org.motechproject.nms.kilkari.domain;
+
+import java.util.Map;
+
+/**
+ * Custom object used by each thread while processing a csv or xml.
+ * rejectedBeneficiaries is a map of RCH/MCTS id and rejected beneficiaries
+ * rejectionStatus is a map of RCH/MCTS id and rejection status of beneficiary
+ * Created by beehyv on 25/4/18.
+ */
+public class ThreadProcessorObject {
+
+ private Map rejectedBeneficiaries;
+ private Map rejectionStatus;
+ private Integer recordsProcessed;
+
+ public Map getRejectedBeneficiaries() {
+ return rejectedBeneficiaries;
+ }
+
+ public void setRejectedBeneficiaries(Map rejectedBeneficiaries) {
+ this.rejectedBeneficiaries = rejectedBeneficiaries;
+ }
+
+ public Map getRejectionStatus() {
+ return rejectionStatus;
+ }
+
+ public void setRejectionStatus(Map rejectionStatus) {
+ this.rejectionStatus = rejectionStatus;
+ }
+
+ public Integer getRecordsProcessed() {
+ return recordsProcessed;
+ }
+
+ public void setRecordsProcessed(Integer recordsProcessed) {
+ this.recordsProcessed = recordsProcessed;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/dto/CallSummaryRecordDto.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/dto/CallSummaryRecordDto.java
index 985741d52..a8dd8202e 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/dto/CallSummaryRecordDto.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/dto/CallSummaryRecordDto.java
@@ -35,6 +35,7 @@ public class CallSummaryRecordDto implements Serializable {
public CallSummaryRecordDto() { }
+ //CHECKSTYLE:OFF
public CallSummaryRecordDto(String subscriptionId, int statusCode, int finalStatus, String contentFileName,
String weekId, String languageCode, String circleName, String targetFileTimeStamp) {
this.subscriptionId = subscriptionId;
@@ -63,6 +64,7 @@ public CallSummaryRecordDto(Subscription subscription, StatusCode statusCode, Fi
);
}
+ //CHECKSTYLE:ON
public String getSubscriptionId() {
return subscriptionId;
}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/handler/SubscriptionManagerHandler.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/handler/SubscriptionManagerHandler.java
index 816abd5b0..fbbfc6b4e 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/handler/SubscriptionManagerHandler.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/handler/SubscriptionManagerHandler.java
@@ -77,7 +77,7 @@ public void upkeepSubscriptions(MotechEvent event) {
subscriptionService.completePastDueSubscriptions();
Timer timer = new Timer();
- subscriptionService.activatePendingSubscriptionsUpTo(tomorrow);
+ subscriptionService.activatePendingSubscriptionsUpTo(tomorrow, maxActiveSubscriptions);
LOGGER.debug("Activated all pending subscriptions up to {} in {}", tomorrow, timer.time());
subscriptionService.toggleMctsSubscriptionCreation(maxActiveSubscriptions);
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/repository/DeactivatedBeneficiaryDataService.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/repository/DeactivatedBeneficiaryDataService.java
new file mode 100644
index 000000000..4c6c28e88
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/repository/DeactivatedBeneficiaryDataService.java
@@ -0,0 +1,18 @@
+package org.motechproject.nms.kilkari.repository;
+
+import org.motechproject.mds.annotations.Lookup;
+import org.motechproject.mds.annotations.LookupField;
+import org.motechproject.mds.service.MotechDataService;
+import org.motechproject.nms.kilkari.domain.DeactivatedBeneficiary;
+
+import java.util.List;
+
+/**
+ * Created by ajai on 5/6/17.
+ */
+public interface DeactivatedBeneficiaryDataService extends MotechDataService {
+
+ @Lookup
+ List findByExternalId(@LookupField(name = "externalId") String externalId);
+
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/repository/MctsChildDataService.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/repository/MctsChildDataService.java
index 29f7ba0a4..a2b1f632f 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/repository/MctsChildDataService.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/repository/MctsChildDataService.java
@@ -10,4 +10,6 @@ public interface MctsChildDataService extends MotechDataService {
@Lookup
MctsChild findByBeneficiaryId(@LookupField(name = "beneficiaryId") String beneficiaryId);
+ @Lookup
+ MctsChild findByRchId(@LookupField(name = "rchId") String rchId);
}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/repository/ReactivatedBeneficiaryAuditDataService.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/repository/ReactivatedBeneficiaryAuditDataService.java
new file mode 100644
index 000000000..a76d3ee2c
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/repository/ReactivatedBeneficiaryAuditDataService.java
@@ -0,0 +1,8 @@
+package org.motechproject.nms.kilkari.repository;
+
+import org.motechproject.mds.service.MotechDataService;
+import org.motechproject.nms.kilkari.domain.ReactivatedBeneficiaryAudit;
+
+
+public interface ReactivatedBeneficiaryAuditDataService extends MotechDataService {
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/ActionFinderService.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/ActionFinderService.java
new file mode 100644
index 000000000..7d5cf2a69
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/ActionFinderService.java
@@ -0,0 +1,17 @@
+package org.motechproject.nms.kilkari.service;
+
+import org.motechproject.nms.kilkari.contract.ChildRecord;
+import org.motechproject.nms.kilkari.contract.MotherRecord;
+import org.motechproject.nms.kilkari.contract.RchMotherRecord;
+
+/**
+ * Created by beehyv on 25/7/17.
+ */
+public interface ActionFinderService {
+
+ String motherActionFinder(MotherRecord record);
+
+ String rchMotherActionFinder(RchMotherRecord record);
+
+ String childActionFinder(ChildRecord record);
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/ChildCsvThreadProcessor.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/ChildCsvThreadProcessor.java
new file mode 100644
index 000000000..5f83f5f8e
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/ChildCsvThreadProcessor.java
@@ -0,0 +1,108 @@
+package org.motechproject.nms.kilkari.service;
+
+import org.motechproject.metrics.service.Timer;
+import org.motechproject.nms.kilkari.domain.MctsChild;
+import org.motechproject.nms.kilkari.domain.RejectionReasons;
+import org.motechproject.nms.kilkari.domain.SubscriptionOrigin;
+import org.motechproject.nms.kilkari.domain.ThreadProcessorObject;
+import org.motechproject.nms.kilkari.utils.KilkariConstants;
+import org.motechproject.nms.region.domain.LocationFinder;
+import org.motechproject.nms.rejectionhandler.domain.ChildImportRejection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.childRejectionRch;
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.convertMapToRchChild;
+
+/**
+ * Created by beehyv on 25/4/18.
+ */
+ public class ChildCsvThreadProcessor implements Callable {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ChildCsvThreadProcessor.class);
+ private List> recordList;
+ private Boolean mctsImport;
+ private SubscriptionOrigin importOrigin;
+ private LocationFinder locationFinder;
+ private MctsBeneficiaryValueProcessor mctsBeneficiaryValueProcessor;
+ private MctsBeneficiaryImportService mctsBeneficiaryImportService;
+
+ public ChildCsvThreadProcessor(List> recordList, Boolean mctsImport,
+ SubscriptionOrigin importOrigin, LocationFinder locationFinder,
+ MctsBeneficiaryValueProcessor mctsBeneficiaryValueProcessor,
+ MctsBeneficiaryImportService mctsBeneficiaryImportService) {
+ this.recordList = recordList;
+ this.mctsImport = mctsImport;
+ this.importOrigin = importOrigin;
+ this.locationFinder = locationFinder;
+ this.mctsBeneficiaryValueProcessor = mctsBeneficiaryValueProcessor;
+ this.mctsBeneficiaryImportService = mctsBeneficiaryImportService;
+ }
+
+ @Override
+ public ThreadProcessorObject call() throws Exception { //NOPMD SignatureDeclareThrowsException
+ ThreadProcessorObject threadProcessorObject = new ThreadProcessorObject();
+ Map rejectedChilds = new HashMap<>();
+ Map rejectionStatus = new HashMap<>();
+ ChildImportRejection childImportRejection;
+
+ String id;
+ String contactNumber;
+ String childInstance;
+ if (mctsImport) {
+ id = KilkariConstants.BENEFICIARY_ID;
+ contactNumber = KilkariConstants.MSISDN;
+ childInstance = KilkariConstants.MCTS_CHILD;
+ } else {
+ id = KilkariConstants.RCH_ID;
+ contactNumber = KilkariConstants.MOBILE_NO;
+ childInstance = KilkariConstants.RCH_CHILD;
+ }
+ int count = 0;
+ Timer timer = new Timer("kid", "kids");
+ for(Map record : recordList) {
+ count++;
+ LOGGER.debug("Started child import for msisdn {} beneficiary_id {}", record.get(contactNumber), record.get(id));
+
+ MctsChild child = mctsImport ? mctsBeneficiaryValueProcessor.getOrCreateChildInstance((String) record.get(id)) : mctsBeneficiaryValueProcessor.getOrCreateRchChildInstance((String) record.get(id), (String) record.get(KilkariConstants.MCTS_ID));
+ if (child == null) {
+ ChildImportRejection childImportRejection1 = childRejectionRch(convertMapToRchChild(record), false, RejectionReasons.DATA_INTEGRITY_ERROR.toString(), KilkariConstants.CREATE);
+ rejectedChilds.put(childImportRejection1.getIdNo(), childImportRejection1);
+ rejectionStatus.put(childImportRejection1.getIdNo(), childImportRejection1.getAccepted());
+ LOGGER.error("RchId is empty while importing child at msisdn {} beneficiary_id {}", record.get(contactNumber), record.get(id));
+ continue;
+ }
+
+ String action = (child.getId() == null) ? KilkariConstants.CREATE : KilkariConstants.UPDATE;
+ record.put(KilkariConstants.ACTION, action);
+ record.put(childInstance, child);
+
+ try {
+ childImportRejection = mctsBeneficiaryImportService.importChildRecord(record, importOrigin, locationFinder);
+ if (childImportRejection != null) {
+ if (mctsImport) {
+ rejectedChilds.put(childImportRejection.getIdNo(), childImportRejection);
+ rejectionStatus.put(childImportRejection.getIdNo(), childImportRejection.getAccepted());
+ } else {
+ rejectedChilds.put(childImportRejection.getRegistrationNo(), childImportRejection);
+ rejectionStatus.put(childImportRejection.getRegistrationNo(), childImportRejection.getAccepted());
+ }
+ }
+ if (count % KilkariConstants.PROGRESS_INTERVAL == 0) {
+ LOGGER.debug(KilkariConstants.IMPORTED, timer.frequency(count));
+ }
+ } catch (RuntimeException e) {
+ LOGGER.error("Error while importing child at msisdn {} beneficiary_id {}", record.get(contactNumber), record.get(id), e);
+ }
+ }
+ threadProcessorObject.setRejectedBeneficiaries(rejectedChilds);
+ threadProcessorObject.setRejectionStatus(rejectionStatus);
+ threadProcessorObject.setRecordsProcessed(count);
+ return threadProcessorObject;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/DeactivatedBeneficiaryService.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/DeactivatedBeneficiaryService.java
new file mode 100644
index 000000000..e87daa0c5
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/DeactivatedBeneficiaryService.java
@@ -0,0 +1,13 @@
+package org.motechproject.nms.kilkari.service;
+
+import org.motechproject.nms.kilkari.domain.DeactivatedBeneficiary;
+
+import java.util.List;
+
+/**
+ * Created by vishnu on 12/4/18.
+ */
+public interface DeactivatedBeneficiaryService {
+
+ List findDeactivatedBeneficiariesOtherThanManualDeactivation(String externalId);
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryImportReaderService.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryImportReaderService.java
new file mode 100644
index 000000000..c69210f26
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryImportReaderService.java
@@ -0,0 +1,25 @@
+package org.motechproject.nms.kilkari.service;
+
+import org.motechproject.nms.kilkari.domain.SubscriptionOrigin;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.List;
+import java.util.Map;
+
+public interface MctsBeneficiaryImportReaderService {
+
+ int importChildData(Reader reader, SubscriptionOrigin origin) throws IOException;
+
+ int importMotherData(Reader reader, SubscriptionOrigin importOrigin) throws IOException;
+
+ List>> splitRecords(List> recordList, String contactNumber);
+
+ List> readCsv(BufferedReader bufferedReader, Map cellProcessorMapper) throws IOException;
+
+ List> sortByMobileNumber(List> recordList, Boolean mctsImport);
+
+ Map getRchChildProcessorMapping();
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryImportService.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryImportService.java
index 37ec163be..15682c853 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryImportService.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryImportService.java
@@ -1,9 +1,14 @@
package org.motechproject.nms.kilkari.service;
+import org.joda.time.DateTime;
import org.motechproject.nms.kilkari.domain.SubscriptionOrigin;
+import org.motechproject.nms.kilkari.domain.SubscriptionPackType;
+import org.motechproject.nms.region.domain.LocationFinder;
+import org.motechproject.nms.rejectionhandler.domain.ChildImportRejection;
+import org.motechproject.nms.rejectionhandler.domain.MotherImportRejection;
+import org.springframework.transaction.annotation.Transactional;
+import org.supercsv.cellprocessor.ift.CellProcessor;
-import java.io.IOException;
-import java.io.Reader;
import java.util.Map;
/**
@@ -11,11 +16,25 @@
*/
public interface MctsBeneficiaryImportService {
- int importMotherData(Reader reader, SubscriptionOrigin origin) throws IOException;
+ MotherImportRejection importMotherRecord(Map record, SubscriptionOrigin origin, LocationFinder locationFinder);
- int importChildData(Reader reader, SubscriptionOrigin origin) throws IOException;
+ ChildImportRejection importChildRecord(Map record, SubscriptionOrigin origin, LocationFinder locationFinder);
- boolean importMotherRecord(Map record, SubscriptionOrigin origin);
+ boolean validateReferenceDate(DateTime referenceDate, SubscriptionPackType packType, Long msisdn, String beneficiaryId, SubscriptionOrigin importOrigin);
- boolean importChildRecord(Map record, SubscriptionOrigin origin);
+ void createOrUpdateRchChildRejections(Map rejectedRecords, Map rejectionStatus);
+
+ void createOrUpdateMctsChildRejections(Map rejectedRecords, Map rejectionStatus);
+
+ @Transactional
+ void createOrUpdateRchMotherRejections(Map rejectedRecords, Map rejectionStatus);
+
+ @Transactional
+ void createOrUpdateMctsMotherRejections(Map rejectedRecords, Map rejectionStatus);
+
+ Map getMotherProcessorMapping();
+
+ Map getRchMotherProcessorMapping();
+
+ Map getRchAshaProcessorMapping();
}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryUpdateService.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryUpdateService.java
deleted file mode 100644
index 4b61148e8..000000000
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryUpdateService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.motechproject.nms.kilkari.service;
-
-import java.io.IOException;
-import java.io.Reader;
-
-/**
- * Service interface for updating MCTS-imported Kilkari subscribers
- */
-public interface MctsBeneficiaryUpdateService {
-
- void updateBeneficiaryData(Reader reader) throws IOException;
-
-}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryValueProcessor.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryValueProcessor.java
index 7a2aed28d..b122e2e46 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryValueProcessor.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MctsBeneficiaryValueProcessor.java
@@ -1,8 +1,15 @@
package org.motechproject.nms.kilkari.service;
import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.motechproject.nms.kilkari.domain.MctsBeneficiary;
import org.motechproject.nms.kilkari.domain.MctsChild;
import org.motechproject.nms.kilkari.domain.MctsMother;
+import org.motechproject.nms.region.domain.LocationFinder;
+import org.motechproject.nms.region.exception.InvalidLocationException;
+
+import java.util.Map;
+
public interface MctsBeneficiaryValueProcessor {
@@ -18,11 +25,17 @@ public interface MctsBeneficiaryValueProcessor {
Boolean getDeathFromString(String value);
- MctsChild getChildInstanceByString(String value);
+ MctsChild getOrCreateChildInstance(String value);
DateTime getDateByString(String value);
+ LocalDate getLocalDateByString(String value);
+
Long getCaseNoByString(String value);
Long getMsisdnByString(String value);
+
+ MctsChild getOrCreateRchChildInstance(String childId, String mctsId);
+
+ void setLocationFieldsCSV(LocationFinder locationFinder, Map record, MctsBeneficiary beneficiary) throws InvalidLocationException;
}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MotherCsvThreadProcessor.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MotherCsvThreadProcessor.java
new file mode 100644
index 000000000..44c869eac
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/MotherCsvThreadProcessor.java
@@ -0,0 +1,111 @@
+package org.motechproject.nms.kilkari.service;
+
+import org.motechproject.metrics.service.Timer;
+import org.motechproject.nms.kilkari.domain.MctsMother;
+import org.motechproject.nms.kilkari.domain.RejectionReasons;
+import org.motechproject.nms.kilkari.domain.SubscriptionOrigin;
+import org.motechproject.nms.kilkari.domain.ThreadProcessorObject;
+import org.motechproject.nms.kilkari.utils.KilkariConstants;
+import org.motechproject.nms.region.domain.LocationFinder;
+import org.motechproject.nms.rejectionhandler.domain.MotherImportRejection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.convertMapToRchMother;
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.motherRejectionRch;
+
+/**
+ * Created by beehyv on 8/5/18.
+ */
+public class MotherCsvThreadProcessor implements Callable {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(MotherCsvThreadProcessor.class);
+ private List> recordList;
+ private Boolean mctsImport;
+ private SubscriptionOrigin importOrigin;
+ private LocationFinder locationFinder;
+ private MctsBeneficiaryValueProcessor mctsBeneficiaryValueProcessor;
+ private MctsBeneficiaryImportService mctsBeneficiaryImportService;
+
+ public MotherCsvThreadProcessor(List> recordList, Boolean mctsImport,
+ SubscriptionOrigin importOrigin, LocationFinder locationFinder,
+ MctsBeneficiaryValueProcessor mctsBeneficiaryValueProcessor,
+ MctsBeneficiaryImportService mctsBeneficiaryImportService) {
+ this.recordList = recordList;
+ this.mctsImport = mctsImport;
+ this.importOrigin = importOrigin;
+ this.locationFinder = locationFinder;
+ this.mctsBeneficiaryValueProcessor = mctsBeneficiaryValueProcessor;
+ this.mctsBeneficiaryImportService = mctsBeneficiaryImportService;
+ }
+
+ @Override
+ public ThreadProcessorObject call() throws Exception { //NOPMD SignatureDeclareThrowsException
+
+ ThreadProcessorObject threadProcessorObject = new ThreadProcessorObject();
+ Map rejectedMothers = new HashMap<>();
+ Map rejectionStatus = new HashMap<>();
+ MotherImportRejection motherImportRejection;
+
+ String id;
+ String contactNumber;
+ String motherInstance;
+ if (mctsImport) {
+ id = KilkariConstants.BENEFICIARY_ID;
+ contactNumber = KilkariConstants.MSISDN;
+ motherInstance = KilkariConstants.MCTS_MOTHER;
+ } else {
+ id = KilkariConstants.RCH_ID;
+ contactNumber = KilkariConstants.MOBILE_NO;
+ motherInstance = KilkariConstants.RCH_MOTHER;
+ }
+ int count = 0;
+ Timer timer = new Timer("mom", "moms");
+ for (Map record : recordList) {
+ count++;
+ LOGGER.debug("Started mother import for msisdn {} beneficiary_id {}", record.get(contactNumber), record.get(id));
+
+ MctsMother mother = mctsImport ? mctsBeneficiaryValueProcessor.getOrCreateMotherInstance((String) record.get(id)) : mctsBeneficiaryValueProcessor.getOrCreateRchMotherInstance((String) record.get(id), (String) record.get(KilkariConstants.MCTS_ID));
+ if (mother == null) {
+ MotherImportRejection motherImportRejection1 = motherRejectionRch(convertMapToRchMother(record), false, RejectionReasons.DATA_INTEGRITY_ERROR.toString(), KilkariConstants.CREATE);
+ rejectedMothers.put(motherImportRejection1.getIdNo(), motherImportRejection1);
+ rejectionStatus.put(motherImportRejection1.getIdNo(), motherImportRejection1.getAccepted());
+ LOGGER.error("RchId is empty while importing mother at msisdn {} beneficiary_id {}", record.get(contactNumber), record.get(id));
+ continue;
+ }
+
+ String action = (mother.getId() == null) ? KilkariConstants.CREATE : KilkariConstants.UPDATE;
+ record.put(KilkariConstants.ACTION, action);
+ record.put(motherInstance, mother);
+
+ try {
+ LOGGER.debug("Calling Import Mother Record for" + count );
+ motherImportRejection = mctsBeneficiaryImportService.importMotherRecord(record, importOrigin, locationFinder);
+ LOGGER.debug("Completed Import Mother Record for" + count);
+ if (motherImportRejection != null) {
+ if (mctsImport) {
+ rejectedMothers.put(motherImportRejection.getIdNo(), motherImportRejection);
+ rejectionStatus.put(motherImportRejection.getIdNo(), motherImportRejection.getAccepted());
+ } else {
+ rejectedMothers.put(motherImportRejection.getRegistrationNo(), motherImportRejection);
+ rejectionStatus.put(motherImportRejection.getRegistrationNo(), motherImportRejection.getAccepted());
+ }
+ }
+ if (count % KilkariConstants.PROGRESS_INTERVAL == 0) {
+ LOGGER.debug(KilkariConstants.IMPORTED, timer.frequency(count));
+ }
+ } catch (RuntimeException e) {
+ LOGGER.error("Error while importing mother at msisdn {} beneficiary_id {}", record.get(contactNumber), record.get(id), e);
+ }
+ }
+ threadProcessorObject.setRejectedBeneficiaries(rejectedMothers);
+ threadProcessorObject.setRejectionStatus(rejectionStatus);
+ threadProcessorObject.setRecordsProcessed(count);
+ return threadProcessorObject;
+ }
+}
\ No newline at end of file
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/SubscriberService.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/SubscriberService.java
index a71a31c84..db70439f0 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/SubscriberService.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/SubscriberService.java
@@ -9,8 +9,10 @@
import org.motechproject.nms.kilkari.domain.Subscriber;
import org.motechproject.nms.kilkari.domain.Subscription;
import org.motechproject.nms.kilkari.domain.DeactivationReason;
+import org.motechproject.nms.rejectionhandler.domain.ChildImportRejection;
import java.util.List;
+import java.util.Map;
/**
* Service interface for managing Kilkari subscribers
@@ -60,7 +62,7 @@ public interface SubscriberService {
* @param lmp the reference date for the mother (last menstrual period)
* @return New or updated subscription, null if the creation/update fails
*/
- Subscription updateMotherSubscriber(Long msisdn, MctsMother mother, DateTime lmp);
+ Subscription updateMotherSubscriber(Long msisdn, MctsMother mother, DateTime lmp, Map record, String action);
/**
* Update the RCH mother subscriber with the msisdn and mother object
@@ -71,7 +73,7 @@ public interface SubscriberService {
* @param deactivate boolean to check if subscription needs to be deactivated due to abortion, stillbirth or death
* @return New or updated subscription, null if the creation/update fails
*/
- Subscription updateRchMotherSubscriber(Long msisdn, MctsMother mother, DateTime lmp, Long caseNo, Boolean deactivate);
+ Subscription updateRchMotherSubscriber(Long msisdn, MctsMother mother, DateTime lmp, Long caseNo, Boolean deactivate, Map record, String action);
/**
* Update the child subscriber with the msisdn and child object
@@ -80,7 +82,7 @@ public interface SubscriberService {
* @param dob the reference date for the child (date of birth)
* @return New or updated subscription, null if creation/update fails
*/
- Subscription updateChildSubscriber(Long msisdn, MctsChild child, DateTime dob);
+ ChildImportRejection updateChildSubscriber(Long msisdn, MctsChild child, DateTime dob, Map record, String action);
/**
* Lifecycle listener that verifies a subscriber can only be deleted if all of their subscriptions have
@@ -105,4 +107,12 @@ public interface SubscriberService {
*/
Subscriber getSubscriberByMother(long motherId);
+ /**
+ * Update the RCH child subscriber with msisdn and child object
+ * @param msisdn msisdn (to switch to) for new/existing child
+ * @param child child object to update
+ * @param dob reference date for the child
+ * @return new or updated subscription, null if create/update fails
+ */
+ ChildImportRejection updateRchChildSubscriber(Long msisdn, MctsChild child, DateTime dob, Map record, String action);
}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/SubscriptionService.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/SubscriptionService.java
index 4910d4081..b2c021fee 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/SubscriptionService.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/SubscriptionService.java
@@ -51,6 +51,7 @@ Subscription createSubscription(Subscriber subscriber, long callingNumber, Langu
* @param mode How the subscription originated -- via IVR or MCTS import
* @return The created subscription, or null if no subscription was created
*/
+
Subscription createSubscription(Subscriber subscriber, long callingNumber, Language language, Circle circle,
SubscriptionPack subscriptionPack, SubscriptionOrigin mode);
@@ -80,7 +81,7 @@ Subscription createSubscription(Subscriber subscriber, long callingNumber, Langu
* Activate the all pending subscriptions up to (but not including) the given date/time
* @param upToDateTime The date/time up to which all pending subscriptions will be activated
*/
- void activatePendingSubscriptionsUpTo(final DateTime upToDateTime);
+ Boolean activatePendingSubscriptionsUpTo(final DateTime upToDateTime, long maxActiveSubscriptions);
/**
* Based on the maxAllowed active subscriptions in the system, toggle mcts creation to true or false
@@ -102,6 +103,8 @@ Subscription createSubscription(Subscriber subscriber, long callingNumber, Langu
*/
void deactivateSubscription(Subscription subscription, DeactivationReason reason);
+ void deleteBlockedMsisdn(Long motherId, Long oldCallingNumber, Long newCallingNumber);
+
/**
* Get the subscription pack with the specified type
* @param type The type of the subscription pack to retrieve
@@ -124,6 +127,10 @@ Subscription createSubscription(Subscriber subscriber, long callingNumber, Langu
*/
Subscription getActiveSubscription(Subscriber subscriber, SubscriptionPackType type);
+ Subscription getLatestDeactivatedSubscription(Subscriber subscriber, SubscriptionPackType type);
+
+ List getActiveSubscriptionBySubscriber(Subscriber subscriber);
+
List getSubscriptionPacks();
/**
@@ -210,4 +217,10 @@ Subscription createSubscription(Subscriber subscriber, long callingNumber, Langu
*/
Subscription getIVRSubscription(Set subscriptions, SubscriptionPackType packType);
+ Boolean activeSubscriptionByMsisdnMcts(Long msisdn, SubscriptionPackType packType, String motherBeneficiaryId, String childBeneficiaryId);
+
+ Boolean activeSubscriptionByMsisdnRch(Long msisdn, SubscriptionPackType packType, String motherRchId, String childRchId);
+
+
+
}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/ActionFinderServiceImpl.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/ActionFinderServiceImpl.java
new file mode 100644
index 000000000..d382e5510
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/ActionFinderServiceImpl.java
@@ -0,0 +1,62 @@
+package org.motechproject.nms.kilkari.service.impl;
+
+import org.motechproject.nms.kilkari.repository.MctsChildDataService;
+import org.motechproject.nms.kilkari.repository.MctsMotherDataService;
+import org.motechproject.nms.kilkari.contract.ChildRecord;
+import org.motechproject.nms.kilkari.contract.MotherRecord;
+import org.motechproject.nms.kilkari.contract.RchMotherRecord;
+import org.motechproject.nms.kilkari.service.ActionFinderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by beehyv on 25/7/17.
+ */
+@Service("actionFinderService")
+public class ActionFinderServiceImpl implements ActionFinderService {
+
+ private static String create = "CREATE";
+ private static String update = "UPDATE";
+
+ @Autowired
+ private MctsMotherDataService mctsMotherDataService;
+
+ @Autowired
+ private MctsChildDataService mctsChildDataService;
+
+ @Override
+ public String motherActionFinder(MotherRecord record) {
+ if (record.getIdNo() == null || record.getIdNo().isEmpty() || "".equals(record.getIdNo())) {
+ return create;
+ }
+ if (mctsMotherDataService.findByBeneficiaryId(record.getIdNo()) == null) {
+ return create;
+ } else {
+ return update;
+ }
+ }
+
+ @Override
+ public String rchMotherActionFinder(RchMotherRecord record) {
+ if (record.getRegistrationNo() == null || record.getRegistrationNo().isEmpty() || "".equals(record.getRegistrationNo())) {
+ return create;
+ }
+ if (mctsMotherDataService.findByRchId(record.getRegistrationNo()) == null) {
+ return create;
+ } else {
+ return update;
+ }
+ }
+
+ @Override
+ public String childActionFinder(ChildRecord record) {
+ if (record.getIdNo() == null || record.getIdNo().isEmpty() || "".equals(record.getIdNo())) {
+ return create;
+ }
+ if (mctsChildDataService.findByBeneficiaryId(record.getIdNo()) == null) {
+ return create;
+ } else {
+ return update;
+ }
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/CsrServiceImpl.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/CsrServiceImpl.java
index 94d3cf592..3eaf6c0d1 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/CsrServiceImpl.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/CsrServiceImpl.java
@@ -17,6 +17,7 @@
import org.motechproject.nms.kilkari.exception.InvalidCallRecordDataException;
import org.motechproject.nms.kilkari.exception.NoSuchSubscriptionException;
import org.motechproject.nms.kilkari.repository.CallRetryDataService;
+import org.motechproject.nms.kilkari.repository.DeactivatedBeneficiaryDataService;
import org.motechproject.nms.kilkari.repository.SubscriptionDataService;
import org.motechproject.nms.kilkari.service.CsrService;
import org.motechproject.nms.kilkari.service.CsrVerifierService;
@@ -43,16 +44,19 @@ public class CsrServiceImpl implements CsrService {
private CallRetryDataService callRetryDataService;
private AlertService alertService;
private CsrVerifierService csrVerifierService;
+ private DeactivatedBeneficiaryDataService deactivatedBeneficiaryDataService;
@Autowired
public CsrServiceImpl(SubscriptionDataService subscriptionDataService, SubscriptionService subscriptionService,
CallRetryDataService callRetryDataService, AlertService alertService,
- CsrVerifierService csrVerifierService) {
+ CsrVerifierService csrVerifierService,
+ DeactivatedBeneficiaryDataService deactivatedBeneficiaryDataService) {
this.subscriptionDataService = subscriptionDataService;
this.subscriptionService = subscriptionService;
this.callRetryDataService = callRetryDataService;
this.alertService = alertService;
this.csrVerifierService = csrVerifierService;
+ this.deactivatedBeneficiaryDataService = deactivatedBeneficiaryDataService;
}
@@ -68,6 +72,7 @@ private void completeSubscriptionIfNeeded(Subscription subscription, String cont
// Mark the subscription completed
subscription.setStatus(SubscriptionStatus.COMPLETED);
subscriptionDataService.update(subscription);
+ SubscriptionServiceImpl.createDeactivatedUser(deactivatedBeneficiaryDataService, subscription, null, true);
}
@@ -120,6 +125,7 @@ private void doReschedule(Subscription subscription, CallRetry existingCallRetry
subscription.setStatus(SubscriptionStatus.DEACTIVATED);
subscription.setDeactivationReason(DeactivationReason.INVALID_NUMBER);
subscriptionDataService.update(subscription);
+ SubscriptionServiceImpl.createDeactivatedUser(deactivatedBeneficiaryDataService, subscription, DeactivationReason.INVALID_NUMBER, false);
}
callRetryDataService.delete(existingCallRetry);
@@ -220,4 +226,5 @@ private void resetWelcomeFlagInSubscription(Subscription subscription) {
subscriptionDataService.update(subscription);
}
}
+
}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/DeactivatedBeneficiaryServiceImpl.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/DeactivatedBeneficiaryServiceImpl.java
new file mode 100644
index 000000000..a6ba83636
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/DeactivatedBeneficiaryServiceImpl.java
@@ -0,0 +1,36 @@
+package org.motechproject.nms.kilkari.service.impl;
+
+import org.motechproject.nms.kilkari.domain.DeactivatedBeneficiary;
+import org.motechproject.nms.kilkari.domain.DeactivationReason;
+import org.motechproject.nms.kilkari.repository.DeactivatedBeneficiaryDataService;
+import org.motechproject.nms.kilkari.service.DeactivatedBeneficiaryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("deactivatedBeneficiaryService")
+public class DeactivatedBeneficiaryServiceImpl implements DeactivatedBeneficiaryService {
+
+ private DeactivatedBeneficiaryDataService deactivatedBeneficiaryDataService;
+
+ @Autowired
+ public DeactivatedBeneficiaryServiceImpl(DeactivatedBeneficiaryDataService deactivatedBeneficiaryDataService) {
+ this.deactivatedBeneficiaryDataService = deactivatedBeneficiaryDataService;
+ }
+
+ public List findDeactivatedBeneficiariesOtherThanManualDeactivation(String externalId) {
+ List deactivatedBeneficiaryWithSelectDeactivationReasons = new ArrayList<>();
+ List deactivatedBeneficiaries = deactivatedBeneficiaryDataService.findByExternalId(externalId);
+ if (deactivatedBeneficiaries != null && deactivatedBeneficiaries.size() != 0) {
+ for (DeactivatedBeneficiary deactivatedBeneficiary : deactivatedBeneficiaries
+ ) {
+ if (!DeactivationReason.LOW_LISTENERSHIP.equals(deactivatedBeneficiary.getDeactivationReason()) && !DeactivationReason.WEEKLY_CALLS_NOT_ANSWERED.equals(deactivatedBeneficiary.getDeactivationReason())) {
+ deactivatedBeneficiaryWithSelectDeactivationReasons.add(deactivatedBeneficiary);
+ }
+ }
+ }
+ return deactivatedBeneficiaryWithSelectDeactivationReasons;
+ }
+}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportReaderServiceImpl.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportReaderServiceImpl.java
new file mode 100644
index 000000000..525591c25
--- /dev/null
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportReaderServiceImpl.java
@@ -0,0 +1,380 @@
+package org.motechproject.nms.kilkari.service.impl;
+
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.motechproject.metrics.service.Timer;
+import org.motechproject.nms.csv.exception.CsvImportDataException;
+import org.motechproject.nms.csv.utils.ConstraintViolationUtils;
+import org.motechproject.nms.csv.utils.CsvImporterBuilder;
+import org.motechproject.nms.csv.utils.CsvMapImporter;
+import org.motechproject.nms.csv.utils.GetInstanceByString;
+import org.motechproject.nms.csv.utils.GetString;
+import org.motechproject.nms.kilkari.domain.MctsMother;
+import org.motechproject.nms.kilkari.domain.ThreadProcessorObject;
+import org.motechproject.nms.kilkari.domain.SubscriptionOrigin;
+import org.motechproject.nms.kilkari.service.ChildCsvThreadProcessor;
+import org.motechproject.nms.kilkari.service.MctsBeneficiaryImportReaderService;
+import org.motechproject.nms.kilkari.service.MctsBeneficiaryImportService;
+import org.motechproject.nms.kilkari.service.MctsBeneficiaryValueProcessor;
+import org.motechproject.nms.kilkari.service.MotherCsvThreadProcessor;
+import org.motechproject.nms.kilkari.utils.KilkariConstants;
+import org.motechproject.nms.kilkari.utils.MctsBeneficiaryUtils;
+import org.motechproject.nms.region.domain.LocationFinder;
+import org.motechproject.nms.region.service.LocationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.supercsv.cellprocessor.Optional;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+import org.supercsv.prefs.CsvPreference;
+
+import javax.validation.ConstraintViolationException;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+@Service("mctsBeneficiaryImportReaderService")
+public class MctsBeneficiaryImportReaderServiceImpl implements MctsBeneficiaryImportReaderService {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(MctsBeneficiaryImportReaderServiceImpl.class);
+
+ //Number of records to be processed by each thread
+ private static final int RECORDS_PART_SIZE = 10000;
+
+ private MctsBeneficiaryValueProcessor mctsBeneficiaryValueProcessor;
+ private MctsBeneficiaryImportService mctsBeneficiaryImportService;
+ private LocationService locationService;
+
+ @Autowired
+ public MctsBeneficiaryImportReaderServiceImpl(MctsBeneficiaryValueProcessor mctsBeneficiaryValueProcessor, MctsBeneficiaryImportService mctsBeneficiaryImportService, LocationService locationService) {
+ this.mctsBeneficiaryValueProcessor = mctsBeneficiaryValueProcessor;
+ this.mctsBeneficiaryImportService = mctsBeneficiaryImportService;
+ this.locationService = locationService;
+ }
+
+ @Override //NO CHECKSTYLE Cyclomatic Complexity
+ public int importChildData(Reader reader, SubscriptionOrigin importOrigin) throws IOException { //NOPMD NcssMethodCount
+ /**
+ * Count of all the records rejected for unknown exceptions. So, doesn't include the ones saved in nms_subscription_errors.
+ * This is used just for debugging purpose.
+ */
+ int rejectedWithException = 0;
+
+ BufferedReader bufferedReader = new BufferedReader(reader);
+ Map cellProcessorMapper;
+ String contactNumber;
+ final Boolean mctsImport = importOrigin.equals(SubscriptionOrigin.MCTS_IMPORT);
+
+ if (mctsImport) {
+ cellProcessorMapper = this.getChildProcessorMapping();
+ contactNumber = KilkariConstants.MSISDN;
+ } else {
+ cellProcessorMapper = this.getRchChildProcessorMapping();
+ contactNumber = KilkariConstants.MOBILE_NO;
+ }
+
+ List> recordList = this.readCsv(bufferedReader, cellProcessorMapper);
+
+ LocationFinder locationFinder = locationService.updateLocations(recordList);
+
+ recordList = this.sortByMobileNumber(recordList, mctsImport);
+
+ try {
+ Map rejectedChilds = new HashMap<>();
+ Map rejectionStatus = new HashMap<>();
+ Timer timer = new Timer("kid", "kids");
+
+ List>> recordListArray = this.splitRecords(recordList, contactNumber);
+
+ LOGGER.debug("Thread Processing Start");
+ Integer recordsProcessed = 0;
+ ExecutorService executor = Executors.newCachedThreadPool();
+ List> list = new ArrayList<>();
+
+ for (int i = 0; i < recordListArray.size(); i++) {
+ Callable callable = new ChildCsvThreadProcessor(recordListArray.get(i), mctsImport, importOrigin, locationFinder,
+ mctsBeneficiaryValueProcessor, mctsBeneficiaryImportService);
+ Future future = executor.submit(callable);
+ list.add(future);
+ }
+
+ for (Future fut : list) {
+ try {
+ ThreadProcessorObject threadProcessorObject = fut.get();
+ rejectedChilds.putAll(threadProcessorObject.getRejectedBeneficiaries());
+ rejectionStatus.putAll(threadProcessorObject.getRejectionStatus());
+ recordsProcessed += threadProcessorObject.getRecordsProcessed();
+ } catch (InterruptedException | ExecutionException e) {
+ LOGGER.error("Error while running thread", e);
+ }
+ }
+ executor.shutdown();
+ try {
+ executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+ } catch (InterruptedException e) {
+ LOGGER.error("Error while Terminating thread", e);
+ }
+ LOGGER.debug("Thread Processing End");
+ try {
+
+ if (!rejectedChilds.isEmpty()) {
+ if (mctsImport) {
+ mctsBeneficiaryImportService.createOrUpdateMctsChildRejections(rejectedChilds, rejectionStatus);
+ } else {
+ mctsBeneficiaryImportService.createOrUpdateRchChildRejections(rejectedChilds, rejectionStatus);
+ }
+
+
+
+ }
+ } catch (RuntimeException e) {
+ LOGGER.error("Error while bulk updating rejection records", e);
+
+ }
+
+ LOGGER.debug(KilkariConstants.IMPORTED, timer.frequency(recordsProcessed));
+ LOGGER.debug(KilkariConstants.REJECTED, timer.frequency(rejectedWithException));
+
+ } catch (ConstraintViolationException e) {
+ throw new CsvImportDataException(String.format("Child import error, constraints violated: %s",
+ ConstraintViolationUtils.toString(e.getConstraintViolations())), e);
+ }
+
+ return recordList.size();
+ }
+
+ /**
+ * Expected file format:
+ * - any number of empty lines
+ * - header lines in the following format: State Name : ACTUAL STATE_ID NAME
+ * - one empty line
+ * - CSV data (tab-separated)
+ */
+ @Override //NO CHECKSTYLE Cyclomatic Complexity
+ public int importMotherData(Reader reader, SubscriptionOrigin importOrigin) throws IOException { //NOPMD NcssMethodCount
+ /**
+ * Count of all the records rejected for unknown exceptions. So, doesn't include the ones saved in nms_subscription_errors.
+ * This is used just for debugging purpose.
+ */
+ int rejectedWithException = 0;
+
+ BufferedReader bufferedReader = new BufferedReader(reader);
+ Map cellProcessorMapper;
+ String contactNumber;
+ final Boolean mctsImport = importOrigin.equals(SubscriptionOrigin.MCTS_IMPORT);
+
+ if (mctsImport) {
+ cellProcessorMapper = mctsBeneficiaryImportService.getMotherProcessorMapping();
+ contactNumber = KilkariConstants.MSISDN;
+ } else {
+ cellProcessorMapper = mctsBeneficiaryImportService.getRchMotherProcessorMapping();
+ contactNumber = KilkariConstants.MOBILE_NO;
+ }
+
+ List> recordList = this.readCsv(bufferedReader, cellProcessorMapper);
+
+ LocationFinder locationFinder = locationService.updateLocations(recordList);
+
+ recordList = this.sortByMobileNumber(recordList, mctsImport);
+
+ try {
+ Map rejectedMothers = new HashMap<>();
+ Map rejectionStatus = new HashMap<>();
+ Timer timer = new Timer("mom", "moms");
+ List>> recordListArray = this.splitRecords(recordList, contactNumber);
+
+
+ Integer recordsProcessed = 0;
+ ExecutorService executor = Executors.newCachedThreadPool();
+ List> list = new ArrayList<>();
+
+ for (int i = 0; i < recordListArray.size(); i++) {
+ LOGGER.debug("Thread Processing Start" + i);
+ Callable callable = new MotherCsvThreadProcessor(recordListArray.get(i), mctsImport, importOrigin, locationFinder,
+ mctsBeneficiaryValueProcessor, mctsBeneficiaryImportService);
+ Future future = executor.submit(callable);
+ list.add(future);
+ }
+
+ for (Future fut : list) {
+ try {
+ ThreadProcessorObject threadProcessorObject = fut.get();
+ rejectedMothers.putAll(threadProcessorObject.getRejectedBeneficiaries());
+ rejectionStatus.putAll(threadProcessorObject.getRejectionStatus());
+ recordsProcessed += threadProcessorObject.getRecordsProcessed();
+ } catch (InterruptedException | ExecutionException e) {
+ LOGGER.error("Error while running thread", e);
+ }
+ }
+ executor.shutdown();
+ try {
+ executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+ } catch (InterruptedException e) {
+ LOGGER.error("Error while Terminating thread", e);
+ }
+ LOGGER.debug("Thread Processing End" );
+ try {
+ if (mctsImport) {
+ mctsBeneficiaryImportService.createOrUpdateMctsMotherRejections(rejectedMothers , rejectionStatus);
+ } else {
+ mctsBeneficiaryImportService.createOrUpdateRchMotherRejections(rejectedMothers , rejectionStatus);
+ }
+ } catch (RuntimeException e) {
+ LOGGER.error("Error while bulk updating rejection records", e);
+
+ }
+
+ LOGGER.debug(KilkariConstants.IMPORTED, timer.frequency(recordsProcessed));
+ LOGGER.debug(KilkariConstants.REJECTED, timer.frequency(rejectedWithException));
+
+ } catch (ConstraintViolationException e) {
+ throw new CsvImportDataException(String.format("Mother import error, constraints violated: %s",
+ ConstraintViolationUtils.toString(e.getConstraintViolations())), e);
+ }
+
+ return recordList.size();
+ }
+
+ @Override
+ public List>> splitRecords(List> recordList, String contactNumber) {
+ List>> recordListArray = new ArrayList<>();
+ int count = 0;
+ while (count < recordList.size()) {
+ List> recordListPart = new ArrayList<>();
+ while (recordListPart.size() < RECORDS_PART_SIZE && count < recordList.size()) {
+ recordListPart.add(recordList.get(count));
+ count++;
+ }
+ //Add all records with same contact number to the same part
+ while (count < recordList.size() && (recordList.get(count).get(contactNumber) == null ? "0": recordList.get(count).get(contactNumber))
+ .equals(recordListPart.get(recordListPart.size() - 1)
+ .get(contactNumber))) {
+ recordListPart.add(recordList.get(count));
+ count++;
+ }
+ LOGGER.debug("Added records to part {}", recordListArray.size() + 1);
+ recordListArray.add(recordListPart);
+ LOGGER.debug("Added recordListPart to recordListArray");
+ }
+ LOGGER.debug("Split {} records to {} parts", recordList.size(), recordListArray.size());
+ return recordListArray;
+ }
+
+ @Override
+ public List> readCsv(BufferedReader bufferedReader, Map cellProcessorMapper) throws IOException {
+ int count = 0;
+
+ CsvMapImporter csvImporter = new CsvImporterBuilder()
+ .setProcessorMapping(cellProcessorMapper)
+ .setPreferences(CsvPreference.TAB_PREFERENCE)
+ .createAndOpen(bufferedReader);
+
+ List> recordList = new ArrayList<>();
+ Map record;
+ while (null != (record = csvImporter.read())) {
+ recordList.add(record);
+ count++;
+ }
+ LOGGER.debug("{} records added to object", count);
+ return recordList;
+ }
+
+ @Override
+ public List> sortByMobileNumber(List> recordList, final Boolean mctsImport) {
+ Collections.sort(recordList, new Comparator>() {
+ public int compare(Map m1, Map m2) {
+ Object phoneM1 = m1.get(mctsImport ? KilkariConstants.MSISDN : KilkariConstants.MOBILE_NO);
+ Object phoneM2 = m2.get(mctsImport ? KilkariConstants.MSISDN : KilkariConstants.MOBILE_NO);
+ return ((Long) (phoneM1 == null ? 0L : phoneM1))
+ .compareTo((Long) (phoneM2 == null ? 0L : phoneM2)); //ascending order
+ }
+ });
+ return recordList;
+ }
+
+
+ private Map getChildProcessorMapping() {
+ Map mapping = new HashMap<>();
+ getChildMapping(mapping);
+
+ MctsBeneficiaryUtils.getBeneficiaryLocationMapping(mapping);
+
+ mapping.put(KilkariConstants.BENEFICIARY_ID, new Optional(new GetString()));
+ mapping.put(KilkariConstants.MOTHER_ID, new Optional(new GetInstanceByString() {
+ @Override
+ public MctsMother retrieve(String value) {
+ return mctsBeneficiaryValueProcessor.getMotherInstanceByBeneficiaryId(value);
+ }
+ }));
+ mapping.put(KilkariConstants.MSISDN, new Optional(new GetInstanceByString() {
+ @Override
+ public Long retrieve(String value) {
+ return mctsBeneficiaryValueProcessor.getMsisdnByString(value);
+ }
+ }));
+ mapping.put(KilkariConstants.LAST_UPDATE_DATE, new Optional(new GetInstanceByString() {
+ @Override
+ public LocalDate retrieve(String value) {
+ return (LocalDate) mctsBeneficiaryValueProcessor.getDateByString(value).toLocalDate();
+ }
+ }));
+ return mapping;
+ }
+
+ @Override
+ public Map getRchChildProcessorMapping() {
+ Map mapping = new HashMap<>();
+ getChildMapping(mapping);
+
+ MctsBeneficiaryUtils.getBeneficiaryLocationMapping(mapping);
+
+ mapping.put(KilkariConstants.MCTS_ID, new Optional(new GetString()));
+ mapping.put(KilkariConstants.MCTS_MOTHER_ID, new Optional(new GetString()));
+ mapping.put(KilkariConstants.MOBILE_NO, new Optional(new GetInstanceByString() {
+ @Override
+ public Long retrieve(String value) {
+ return mctsBeneficiaryValueProcessor.getMsisdnByString(value);
+ }
+ }));
+ mapping.put(KilkariConstants.RCH_ID, new Optional(new GetString()));
+ mapping.put(KilkariConstants.RCH_MOTHER_ID, new Optional(new GetString()));
+ mapping.put(KilkariConstants.EXECUTION_DATE, new Optional(new GetInstanceByString() {
+ @Override
+ public LocalDate retrieve(String value) {
+ return (LocalDate) mctsBeneficiaryValueProcessor.getDateByString(value).toLocalDate();
+ }
+ }));
+
+ return mapping;
+ }
+
+ private void getChildMapping(Map mapping) {
+ mapping.put(KilkariConstants.BENEFICIARY_NAME, new Optional(new GetString()));
+ mapping.put(KilkariConstants.DOB, new Optional(new GetInstanceByString() {
+ @Override
+ public DateTime retrieve(String value) {
+ return mctsBeneficiaryValueProcessor.getDateByString(value);
+ }
+ }));
+ mapping.put(KilkariConstants.DEATH, new Optional(new GetInstanceByString() {
+ @Override
+ public Boolean retrieve(String value) {
+ return mctsBeneficiaryValueProcessor.getDeathFromString(value);
+ }
+ }));
+ }
+}
+
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportServiceImpl.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportServiceImpl.java
index 405c2062e..d8a7ba08e 100644
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportServiceImpl.java
+++ b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportServiceImpl.java
@@ -2,35 +2,41 @@
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
-import org.motechproject.metrics.service.Timer;
-import org.motechproject.nms.csv.exception.CsvImportDataException;
-import org.motechproject.nms.csv.utils.ConstraintViolationUtils;
-import org.motechproject.nms.csv.utils.CsvImporterBuilder;
-import org.motechproject.nms.csv.utils.CsvMapImporter;
import org.motechproject.nms.csv.utils.GetInstanceByString;
+import org.motechproject.nms.csv.utils.GetLong;
import org.motechproject.nms.csv.utils.GetString;
-import org.motechproject.nms.kilkari.domain.SubscriptionOrigin;
+import org.motechproject.nms.kilkari.domain.DeactivatedBeneficiary;
import org.motechproject.nms.kilkari.domain.DeactivationReason;
import org.motechproject.nms.kilkari.domain.MctsChild;
import org.motechproject.nms.kilkari.domain.MctsMother;
-import org.motechproject.nms.kilkari.domain.Subscriber;
import org.motechproject.nms.kilkari.domain.Subscription;
+import org.motechproject.nms.kilkari.domain.SubscriptionPackType;
+import org.motechproject.nms.kilkari.domain.Subscriber;
+import org.motechproject.nms.kilkari.domain.SubscriptionOrigin;
import org.motechproject.nms.kilkari.domain.SubscriptionError;
import org.motechproject.nms.kilkari.domain.SubscriptionPack;
-import org.motechproject.nms.kilkari.domain.SubscriptionPackType;
import org.motechproject.nms.kilkari.domain.SubscriptionRejectionReason;
import org.motechproject.nms.kilkari.domain.SubscriptionStatus;
import org.motechproject.nms.kilkari.exception.MultipleSubscriberException;
+import org.motechproject.nms.kilkari.repository.MctsChildDataService;
import org.motechproject.nms.kilkari.repository.MctsMotherDataService;
import org.motechproject.nms.kilkari.repository.SubscriptionErrorDataService;
import org.motechproject.nms.kilkari.service.MctsBeneficiaryImportService;
import org.motechproject.nms.kilkari.service.MctsBeneficiaryValueProcessor;
import org.motechproject.nms.kilkari.service.SubscriberService;
import org.motechproject.nms.kilkari.service.SubscriptionService;
+import org.motechproject.nms.kilkari.service.ActionFinderService;
+import org.motechproject.nms.kilkari.service.DeactivatedBeneficiaryService;
+import org.motechproject.nms.kilkari.utils.FlwConstants;
import org.motechproject.nms.kilkari.utils.KilkariConstants;
import org.motechproject.nms.kilkari.utils.MctsBeneficiaryUtils;
+import org.motechproject.nms.kilkari.domain.RejectionReasons;
+import org.motechproject.nms.region.domain.LocationFinder;
import org.motechproject.nms.region.exception.InvalidLocationException;
-import org.motechproject.nms.region.service.LocationService;
+import org.motechproject.nms.rejectionhandler.domain.ChildImportRejection;
+import org.motechproject.nms.rejectionhandler.domain.MotherImportRejection;
+import org.motechproject.nms.rejectionhandler.service.ChildRejectionService;
+import org.motechproject.nms.rejectionhandler.service.MotherRejectionService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,15 +44,25 @@
import org.springframework.transaction.annotation.Transactional;
import org.supercsv.cellprocessor.Optional;
import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.prefs.CsvPreference;
-import javax.validation.ConstraintViolationException;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Set;
+import java.util.List;
import java.util.Map;
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.childRejectionMcts;
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.motherRejectionMcts;
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.convertMapToChild;
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.convertMapToMother;
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.childRejectionRch;
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.motherRejectionRch;
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.convertMapToRchChild;
+import static org.motechproject.nms.kilkari.utils.RejectedObjectConverter.convertMapToRchMother;
+
/**
* Implementation of the {@link MctsBeneficiaryImportService} interface.
*/
@@ -57,155 +73,69 @@ public class MctsBeneficiaryImportServiceImpl implements MctsBeneficiaryImportSe
private SubscriptionService subscriptionService;
private SubscriptionErrorDataService subscriptionErrorDataService;
- private LocationService locationService;
private SubscriberService subscriberService;
private MctsBeneficiaryValueProcessor mctsBeneficiaryValueProcessor;
private SubscriptionPack pregnancyPack;
private SubscriptionPack childPack;
private MctsMotherDataService mctsMotherDataService;
+ private MctsChildDataService mctsChildDataService;
+ private DeactivatedBeneficiaryService deactivatedBeneficiaryService;
+
+ // Number of rejected mother/children in a single query for bulk insert/update
+ private static final Integer REJECTION_PART_SIZE = 5000;
+ private static final String SUBSCRIPTION_COMPLETED = "Subscription completed";
+ private static final String USER_DEACTIVATED = "User deactivated";
+ private static final String GET_CREATION = "getCreationDate";
+ private static final String SET_CREATION = "setCreationDate";
+ private static final String GET_ID = "getId";
+ private static final String SET_ID = "setId";
+ private static final String IGNORE_CREATION_DATE = "Ignoring creation date and setting as now";
+ private static final String IMPORT_STATS_LOG = "Inserted {} and updated {} rejection records into database";
@Autowired
public MctsBeneficiaryImportServiceImpl(SubscriptionService subscriptionService,
SubscriptionErrorDataService subscriptionErrorDataService,
- LocationService locationService, SubscriberService subscriberService,
+ SubscriberService subscriberService,
MctsBeneficiaryValueProcessor mctsBeneficiaryValueProcessor,
- MctsMotherDataService mctsMotherDataService) {
+ MctsMotherDataService mctsMotherDataService,
+ MctsChildDataService mctsChildDataService,
+ DeactivatedBeneficiaryService deactivatedBeneficiaryService) {
this.subscriptionService = subscriptionService;
this.subscriptionErrorDataService = subscriptionErrorDataService;
- this.locationService = locationService;
this.subscriberService = subscriberService;
this.mctsBeneficiaryValueProcessor = mctsBeneficiaryValueProcessor;
this.mctsMotherDataService = mctsMotherDataService;
+ this.deactivatedBeneficiaryService = deactivatedBeneficiaryService;
+ this.mctsChildDataService = mctsChildDataService;
}
+ @Autowired
+ private MotherRejectionService motherRejectionService;
- /**
- * Expected file format:
- * - any number of empty lines
- * - header lines in the following format: State Name : ACTUAL STATE_ID NAME
- * - one empty line
- * - CSV data (tab-separated)
- */
- @Override
- @Transactional
- public int importMotherData(Reader reader, SubscriptionOrigin importOrigin) throws IOException {
- pregnancyPack = subscriptionService.getSubscriptionPack(SubscriptionPackType.PREGNANCY);
- int count = 0;
- /**
- * Count of all the records rejected for unknown exceptions. So, doesn't include the ones saved in nms_subscription_errors.
- * This is used just for debugging purpose.
- */
- int rejectedWithException = 0;
-
- BufferedReader bufferedReader = new BufferedReader(reader);
- Map cellProcessorMapper;
- String id;
- String contactNumber;
-
- if (importOrigin.equals(SubscriptionOrigin.MCTS_IMPORT)) {
- cellProcessorMapper = this.getMotherProcessorMapping();
- id = KilkariConstants.BENEFICIARY_ID;
- contactNumber = KilkariConstants.MSISDN;
- } else {
- cellProcessorMapper = this.getRchMotherProcessorMapping();
- id = KilkariConstants.RCH_ID;
- contactNumber = KilkariConstants.MOBILE_NO;
- }
-
- CsvMapImporter csvImporter = new CsvImporterBuilder()
- .setProcessorMapping(cellProcessorMapper)
- .setPreferences(CsvPreference.TAB_PREFERENCE)
- .createAndOpen(bufferedReader);
-
- try {
- Map record;
- Timer timer = new Timer("mom", "moms");
- while (null != (record = csvImporter.read())) {
- LOGGER.debug("Started import for msisdn {} beneficiary_id {}", record.get(contactNumber), record.get(id));
- try {
- importMotherRecord(record, importOrigin);
- count++;
- if (count % KilkariConstants.PROGRESS_INTERVAL == 0) {
- LOGGER.debug(KilkariConstants.IMPORTED, timer.frequency(count));
- }
- } catch (RuntimeException e) {
- LOGGER.error("Error at msisdn {} beneficiary_id {}", record.get(contactNumber), record.get(id), e);
- rejectedWithException++;
- }
- }
-
- LOGGER.debug(KilkariConstants.IMPORTED, timer.frequency(count));
- LOGGER.debug(KilkariConstants.REJECTED, timer.frequency(rejectedWithException));
-
- } catch (ConstraintViolationException e) {
- throw new CsvImportDataException(String.format("Mother import error, constraints violated: %s",
- ConstraintViolationUtils.toString(e.getConstraintViolations())), e);
- }
-
- return count;
- }
-
- @Transactional
- public int importChildData(Reader reader, SubscriptionOrigin importOrigin) throws IOException {
- childPack = subscriptionService.getSubscriptionPack(SubscriptionPackType.CHILD);
- int count = 0;
- /**
- * Count of all the records rejected for unknown exceptions. So, doesn't include the ones saved in nms_subscription_errors.
- * This is used just for debugging purpose.
- */
- int rejectedWithException = 0;
-
- BufferedReader bufferedReader = new BufferedReader(reader);
-
- CsvMapImporter csvImporter = new CsvImporterBuilder()
- .setProcessorMapping(getChildProcessorMapping())
- .setPreferences(CsvPreference.TAB_PREFERENCE)
- .createAndOpen(bufferedReader);
-
- try {
- Map record;
- Timer timer = new Timer("kid", "kids");
- while (null != (record = csvImporter.read())) {
- MctsChild child = (MctsChild) record.get(KilkariConstants.BENEFICIARY_ID);
- LOGGER.debug("Started import for msisdn {} beneficiary_id {}", record.get(KilkariConstants.MSISDN), child.getBeneficiaryId());
- try {
- importChildRecord(record, importOrigin);
- count++;
- if (count % KilkariConstants.PROGRESS_INTERVAL == 0) {
- LOGGER.debug(KilkariConstants.IMPORTED, timer.frequency(count));
- }
- } catch (RuntimeException e) {
- LOGGER.error("Error at msisdn {} beneficiary_id {}", record.get(KilkariConstants.MSISDN), child.getBeneficiaryId(), e);
- rejectedWithException++;
- }
- }
-
- LOGGER.debug(KilkariConstants.IMPORTED, timer.frequency(count));
- LOGGER.debug(KilkariConstants.REJECTED, timer.frequency(rejectedWithException));
+ @Autowired
+ private ChildRejectionService childRejectionService;
- } catch (ConstraintViolationException e) {
- throw new CsvImportDataException(String.format("MCTS child import error, constraints violated: %s",
- ConstraintViolationUtils.toString(e.getConstraintViolations())), e);
- }
+ @Autowired
+ private ActionFinderService actionFinderService;
- return count;
- }
@Override // NO CHECKSTYLE Cyclomatic Complexity
@Transactional
- public boolean importMotherRecord(Map record, SubscriptionOrigin importOrigin) { //NOPMD NcssMethodCount
+ public MotherImportRejection importMotherRecord(Map record, SubscriptionOrigin importOrigin, LocationFinder locationFinder) { //NOPMD NcssMethodCount
+ LOGGER.debug("MotherImportRejection::importMotherRecord Start ");
if (pregnancyPack == null) {
pregnancyPack = subscriptionService.getSubscriptionPack(SubscriptionPackType.PREGNANCY);
}
-
MctsMother mother;
Long msisdn;
Boolean abortion;
Boolean stillBirth;
LocalDate lastUpdatedDateNic;
String beneficiaryId;
-
+ String action = "";
+ Boolean flagForMcts = true;
if (importOrigin.equals(SubscriptionOrigin.MCTS_IMPORT)) {
+ action = actionFinderService.motherActionFinder(convertMapToMother(record));
beneficiaryId = (String) record.get(KilkariConstants.BENEFICIARY_ID);
mother = mctsBeneficiaryValueProcessor.getOrCreateMotherInstance(beneficiaryId);
msisdn = (Long) record.get(KilkariConstants.MSISDN);
@@ -213,6 +143,8 @@ public boolean importMotherRecord(Map record, SubscriptionOrigin
stillBirth = (Boolean) record.get(KilkariConstants.STILLBIRTH);
lastUpdatedDateNic = (LocalDate) record.get(KilkariConstants.LAST_UPDATE_DATE);
} else {
+ flagForMcts = false;
+ action = actionFinderService.rchMotherActionFinder((convertMapToRchMother(record)));
beneficiaryId = (String) record.get(KilkariConstants.RCH_ID);
String mctsId = (String) record.get(KilkariConstants.MCTS_ID);
mother = mctsBeneficiaryValueProcessor.getOrCreateRchMotherInstance(beneficiaryId, mctsId);
@@ -222,206 +154,329 @@ public boolean importMotherRecord(Map record, SubscriptionOrigin
lastUpdatedDateNic = (LocalDate) record.get(KilkariConstants.EXECUTION_DATE);
}
+ LOGGER.trace("MotherImportRejection::importMotherRecord Start " + beneficiaryId) ;
String name = (String) record.get(KilkariConstants.BENEFICIARY_NAME);
DateTime lmp = (DateTime) record.get(KilkariConstants.LMP);
DateTime motherDOB = (DateTime) record.get(KilkariConstants.MOTHER_DOB);
Boolean death = (Boolean) record.get(KilkariConstants.DEATH);
+ if (mother == null) {
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.DATA_INTEGRITY_ERROR, false);
+ }
+
+ boolean isInvalidLMP = (mother.getId() == null || (mother.getId() != null && mother.getLastMenstrualPeriod() == null)) && !validateReferenceDate(lmp, SubscriptionPackType.PREGNANCY, msisdn, beneficiaryId, importOrigin);
+
+ if (isInvalidLMP) {
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.INVALID_LMP_DATE, false);
+ }
+
// validate msisdn
- if (!validateMsisdn(msisdn, SubscriptionPackType.PREGNANCY, beneficiaryId, importOrigin)) {
- return false;
+ if (!validateMsisdn(msisdn)) {
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.MOBILE_NUMBER_EMPTY_OR_WRONG_FORMAT, false);
}
// validate lmp date. We do not sanitize for lmp in the future to be in sync with MCTS data
// NOTE: getId is a way to see if this is a new user. We only accept new users if they
// have 12 weeks left in the pack. For existing users, their lmp could be updated to
// an earlier date if it's an complete mother record(i.e not created through child import)
- if ((mother.getId() == null || (mother.getId() != null && mother.getLastMenstrualPeriod() == null)) && !validateReferenceDate(lmp, SubscriptionPackType.PREGNANCY, msisdn, beneficiaryId, importOrigin)) {
- return false;
- }
-
// validate and set location
+
try {
- MctsBeneficiaryUtils.setLocationFields(locationService.getLocations(record), mother);
+ mctsBeneficiaryValueProcessor.setLocationFieldsCSV(locationFinder, record, mother);
} catch (InvalidLocationException le) {
LOGGER.error(le.toString());
- subscriptionErrorDataService.create(new SubscriptionError(msisdn, beneficiaryId, SubscriptionRejectionReason.INVALID_LOCATION,
- SubscriptionPackType.PREGNANCY, le.getMessage(), importOrigin));
- return false;
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.INVALID_LOCATION, false);
}
//validate if it's an updated record compared to one from database
if (mother.getUpdatedDateNic() != null && (lastUpdatedDateNic == null || mother.getUpdatedDateNic().isAfter(lastUpdatedDateNic))) {
- subscriptionErrorDataService.create(new SubscriptionError(msisdn, beneficiaryId,
- SubscriptionRejectionReason.BENEFICIARY_ALREADY_SUBSCRIBED, SubscriptionPackType.PREGNANCY, "Updated Record exits", importOrigin));
- return false;
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.UPDATED_RECORD_ALREADY_EXISTS, false);
}
mother.setName(name);
mother.setDateOfBirth(motherDOB);
+ mother.setLastMenstrualPeriod(lmp);
mother.setUpdatedDateNic(lastUpdatedDateNic);
- Subscription subscription;
- if (importOrigin.equals(SubscriptionOrigin.MCTS_IMPORT)) {
- //validate if an ACTIVE child is already present for the mother. If yes, ignore the update
- if (childAlreadyPresent(beneficiaryId)) {
- subscriptionErrorDataService.create(new SubscriptionError(msisdn, beneficiaryId,
- SubscriptionRejectionReason.ACTIVE_CHILD_PRESENT, SubscriptionPackType.PREGNANCY, "Active child is present for this mother.", importOrigin));
- return false;
+
+ // Check if existing subscription needs to be deactivated
+ Boolean deactivate = ((abortion != null) && abortion) || ((stillBirth != null) && stillBirth) || ((death != null) && death); // NO CHECKSTYLE Boolean Expression Complexity
+ if (deactivate && (mother.getId() == null)) {
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.ABORT_STILLBIRTH_DEATH, false);
+ }
+
+ List deactivatedUsers = null;
+ synchronized (this) {
+ LOGGER.debug("MotherImportRejection::importMotherRecord Start synchronized block " + beneficiaryId);
+ deactivatedUsers = deactivatedBeneficiaryService.findDeactivatedBeneficiariesOtherThanManualDeactivation(beneficiaryId);
+ LOGGER.debug("MotherImportRejection::importMotherRecord Got deactived users " + beneficiaryId);
+ if (deactivatedUsers != null && deactivatedUsers.size() > 0) {
+ for (DeactivatedBeneficiary deactivatedUser : deactivatedUsers) {
+ if (deactivatedUser.getOrigin() == importOrigin) {
+ String message = deactivatedUser.isCompletedSubscription() ? SUBSCRIPTION_COMPLETED : USER_DEACTIVATED;
+ if (message.length() > 2) {
+ LOGGER.debug("MotherImportRejection::importMotherRecord End synchronized block" + beneficiaryId);
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.UPDATED_RECORD_ALREADY_EXISTS, false);
+ }
+ }
+ }
}
- subscription = subscriberService.updateMotherSubscriber(msisdn, mother, lmp);
- } else {
- Long caseNo = (Long) record.get(KilkariConstants.CASE_NO);
- // validate caseNo
- if (!validateCaseNo(caseNo, msisdn, mother, SubscriptionPackType.PREGNANCY, beneficiaryId, importOrigin)) {
- return false;
+
+ LOGGER.debug("MotherImportRejection::importMotherRecord Handled Deactived Users " + beneficiaryId);
+ Subscription subscription;
+ if (importOrigin.equals(SubscriptionOrigin.MCTS_IMPORT)) {
+ //validate if an ACTIVE child is already present for the mother. If yes, ignore the update
+ if (childAlreadyPresent(beneficiaryId, importOrigin)) {
+ LOGGER.debug("MotherImportRejection::importMotherRecord End synchronized block " + beneficiaryId);
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.ACTIVE_CHILD_PRESENT, false);
+ }
+ subscription = subscriberService.updateMotherSubscriber(msisdn, mother, lmp, record, action);
+ if (subscription == null) {
+ LOGGER.debug("MotherImportRejection::importMotherRecord End synchronized block " + beneficiaryId);
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.MOBILE_NUMBER_ALREADY_SUBSCRIBED, false);
+ }
+ } else {
+
+ if (childAlreadyPresent(beneficiaryId, importOrigin)) {
+ LOGGER.debug("MotherImportRejection::importMotherRecord End synchronized block " + beneficiaryId);
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.ACTIVE_CHILD_PRESENT, false);
+ }
+
+ Long caseNo = (Long) record.get(KilkariConstants.CASE_NO);
+ // validate caseNo
+ if (!validateCaseNo(caseNo, mother)) {
+ LOGGER.debug("MotherImportRejection::importMotherRecord End synchronized block " + beneficiaryId);
+ return motherRejectionRch(convertMapToRchMother(record), false, RejectionReasons.INVALID_CASE_NO.toString(), action);
+ }
+ subscription = subscriberService.updateRchMotherSubscriber(msisdn, mother, lmp, caseNo, deactivate, record, action);
+ if (subscription == null) {
+ LOGGER.debug("MotherImportRejection::importMotherRecord End synchronized block " + beneficiaryId);
+ return createUpdateMotherRejections(flagForMcts, record, action, RejectionReasons.MOBILE_NUMBER_ALREADY_SUBSCRIBED, false);
+ }
}
- Boolean deactivate = ((abortion != null) && abortion) || ((stillBirth != null) && stillBirth) || ((death != null) && death); // NO CHECKSTYLE Boolean Expression Complexity
- subscription = subscriberService.updateRchMotherSubscriber(msisdn, mother, lmp, caseNo, deactivate);
- }
- // We rejected the update/create for the subscriber
- if (subscription == null) {
- return false;
- }
+ LOGGER.debug("MotherImportRejection::importMotherRecord Handled Subscriptions " + beneficiaryId);
+ // We rejected the update/create for the subscriber
- if ((abortion != null) && abortion) {
- subscriptionService.deactivateSubscription(subscription, DeactivationReason.MISCARRIAGE_OR_ABORTION);
- return true;
- }
- if ((stillBirth != null) && stillBirth) {
- subscriptionService.deactivateSubscription(subscription, DeactivationReason.STILL_BIRTH);
- return true;
- }
- if ((death != null) && death) {
- subscriptionService.deactivateSubscription(subscription, DeactivationReason.MATERNAL_DEATH);
- }
+ if ((abortion != null) && abortion) {
+ subscriptionService.deactivateSubscription(subscription, DeactivationReason.MISCARRIAGE_OR_ABORTION);
+ }
- return true;
+ if ((stillBirth != null) && stillBirth) {
+ subscriptionService.deactivateSubscription(subscription, DeactivationReason.STILL_BIRTH);
+ }
+
+ if ((death != null) && death) {
+ subscriptionService.deactivateSubscription(subscription, DeactivationReason.MATERNAL_DEATH);
+ }
+ LOGGER.debug("MotherImportRejection::importMotherRecord Start synchronized block " + beneficiaryId);
+ return createUpdateMotherRejections(flagForMcts, record, action, null, true);
+
+ }
}
@Override // NO CHECKSTYLE Cyclomatic Complexity
@Transactional
- public boolean importChildRecord(Map record, SubscriptionOrigin importOrigin) {
+ public ChildImportRejection importChildRecord(Map record, SubscriptionOrigin importOrigin, LocationFinder locationFinder) { //NOPMD NcssMethodCount
if (childPack == null) {
childPack = subscriptionService.getSubscriptionPack(SubscriptionPackType.CHILD);
}
+ MctsChild child;
+ Long msisdn;
+ MctsMother mother;
+ LocalDate lastUpdateDateNic;
+ String childId;
+ String action = "";
+ Boolean flagForMcts = true;
+
+ if (importOrigin.equals(SubscriptionOrigin.MCTS_IMPORT)) {
+ action = actionFinderService.childActionFinder(convertMapToChild(record));
+ childId = (String) record.get(KilkariConstants.BENEFICIARY_ID);
+ child = mctsBeneficiaryValueProcessor.getOrCreateChildInstance(childId);
+ msisdn = (Long) record.get(KilkariConstants.MSISDN);
+ if (record.get(KilkariConstants.MOTHER_ID) != null) {
+ Object motherRecord = record.get(KilkariConstants.MOTHER_ID);
- MctsChild child = (MctsChild) record.get(KilkariConstants.BENEFICIARY_ID);
+ try {
+ MctsMother motherInstance = (MctsMother) motherRecord;
+ mother = mctsBeneficiaryValueProcessor.getMotherInstanceByBeneficiaryId(motherInstance.getBeneficiaryId());
+ } catch (Exception e) {
+ mother = mctsBeneficiaryValueProcessor.getMotherInstanceByBeneficiaryId(motherRecord.toString());
+ }
+
+ } else {
+ mother = null;
+ }
+ lastUpdateDateNic = (LocalDate) record.get(KilkariConstants.LAST_UPDATE_DATE);
+ } else {
+ flagForMcts = false;
+ action = (String) record.get(KilkariConstants.ACTION);
+ childId = (String) record.get(KilkariConstants.RCH_ID);
+ child = (MctsChild) record.get(KilkariConstants.RCH_CHILD);
+ msisdn = (Long) record.get(KilkariConstants.MOBILE_NO);
+ lastUpdateDateNic = (LocalDate) record.get(KilkariConstants.EXECUTION_DATE);
+ if (record.get(KilkariConstants.RCH_MOTHER_ID) != null || record.get(KilkariConstants.MCTS_MOTHER_ID) != null) {
+ String motherRchId = record.get(KilkariConstants.RCH_MOTHER_ID) == null || "".equals(record.get(KilkariConstants.RCH_MOTHER_ID)) || "0".equalsIgnoreCase(record.get(KilkariConstants.RCH_MOTHER_ID).toString()) ? null : record.get(KilkariConstants.RCH_MOTHER_ID).toString();
+ String motherMctsId = record.get(KilkariConstants.MCTS_MOTHER_ID) == null || "".equals(record.get(KilkariConstants.MCTS_MOTHER_ID)) || "0".equalsIgnoreCase(record.get(KilkariConstants.MCTS_MOTHER_ID).toString()) ? null : record.get(KilkariConstants.MCTS_MOTHER_ID).toString();
+ if ((motherRchId == null) && motherMctsId != null) {
+ mother = mctsBeneficiaryValueProcessor.getMotherInstanceByBeneficiaryId(motherMctsId);
+ } else if (motherRchId != null) {
+ mother = mctsBeneficiaryValueProcessor.getOrCreateRchMotherInstance(motherRchId, motherMctsId);
+ } else {
+ mother = null;
+ }
+ } else {
+ mother = null;
+ }
+ }
String name = (String) record.get(KilkariConstants.BENEFICIARY_NAME);
- Long msisdn = (Long) record.get(KilkariConstants.MSISDN);
- MctsMother mother = (MctsMother) record.get(KilkariConstants.MOTHER_ID);
DateTime dob = (DateTime) record.get(KilkariConstants.DOB);
Boolean death = (Boolean) record.get(KilkariConstants.DEATH);
- LocalDate mctsUpdatedDateNic = (LocalDate) record.get(KilkariConstants.LAST_UPDATE_DATE);
- String childId = child.getBeneficiaryId();
+ MctsChild childById = mctsChildDataService.findByBeneficiaryId(childId);
+
+ if ((child == null)) {
+ return createUpdateChildRejections(flagForMcts, record, action, RejectionReasons.DATA_INTEGRITY_ERROR, false);
+ }
+
+ boolean isInValidDOB = child.getId() == null && !validateReferenceDate(dob, SubscriptionPackType.CHILD, msisdn, childId, importOrigin);
+ if (isInValidDOB) {
+ return createUpdateChildRejections(flagForMcts, record, action, RejectionReasons.INVALID_DOB, false);
+ }
//validate mother
- if (!validateMother(mother, child, msisdn, importOrigin)) {
- return false;
+ if (!validateMother(mother, child)) {
+ return createUpdateChildRejections(flagForMcts, record, action, RejectionReasons.ALREADY_LINKED_WITH_A_DIFFERENT_MOTHER_ID, false);
}
// validate msisdn
- if (!validateMsisdn(msisdn, SubscriptionPackType.CHILD, childId, importOrigin)) {
- return false;
+ if (!validateMsisdn(msisdn)) {
+ return createUpdateChildRejections(flagForMcts, record, action, RejectionReasons.MOBILE_NUMBER_EMPTY_OR_WRONG_FORMAT, false);
}
// validate dob. We do not sanitize for dob in the future to be in sync with MCTS data
// NOTE: getId is a way to check for new user. We only accept new children if they have 12 weeks left
- // in the pack. Existing children could have their dob udpated to an earlier date
- if (child.getId() == null && !validateReferenceDate(dob, SubscriptionPackType.CHILD, msisdn, childId, importOrigin)) {
- return false;
- }
+ // in the pack. Existing children could have their dob updated to an earlier date
// validate and set location
try {
- MctsBeneficiaryUtils.setLocationFields(locationService.getLocations(record), child);
+ mctsBeneficiaryValueProcessor.setLocationFieldsCSV(locationFinder, record, child);
+ if (mother != null && mother.getLastMenstrualPeriod() == null) {
+ mctsBeneficiaryValueProcessor.setLocationFieldsCSV(locationFinder, record, mother);
+ }
} catch (InvalidLocationException le) {
LOGGER.error(le.toString());
- subscriptionErrorDataService.create(new SubscriptionError(msisdn, childId,
- SubscriptionRejectionReason.INVALID_LOCATION, SubscriptionPackType.CHILD, le.getMessage(), importOrigin));
- return false;
+ return createUpdateChildRejections(flagForMcts, record, action, RejectionReasons.INVALID_LOCATION, false);
}
//validate if it's an updated record compared to one from database
- if (child.getUpdatedDateNic() != null && (mctsUpdatedDateNic == null || child.getUpdatedDateNic().isAfter(mctsUpdatedDateNic))) {
- subscriptionErrorDataService.create(new SubscriptionError(msisdn, childId,
- SubscriptionRejectionReason.BENEFICIARY_ALREADY_SUBSCRIBED, SubscriptionPackType.CHILD, "Updated Record exits", importOrigin));
- return false;
+ LOGGER.debug("child.getUpdatedDateNic() : {}", child.getUpdatedDateNic());
+ LOGGER.debug("lastUpdateDateNic: {}", lastUpdateDateNic);
+ if (child.getUpdatedDateNic() != null && (lastUpdateDateNic == null || child.getUpdatedDateNic().isAfter(lastUpdateDateNic))) {
+ return createUpdateChildRejections(flagForMcts, record, action, RejectionReasons.UPDATED_RECORD_ALREADY_EXISTS, false);
}
- child.setName(name);
- child.setMother(mother);
- child.setUpdatedDateNic(mctsUpdatedDateNic);
+ //1.0.34 Bug child.getId() == null was not checked
+ if ((death != null) && death && (child.getId() == null)) {
+ return createUpdateChildRejections(flagForMcts, record, action, RejectionReasons.CHILD_DEATH, false);
+ }
- Subscription childSubscription = subscriberService.updateChildSubscriber(msisdn, child, dob);
- // child subscription create/update was rejected
- if (childSubscription == null) {
- return false;
+ child.setName(name);
+ if (child.getId() != null && mother == null) {
+ LOGGER.debug("Not updating the child with null mother.");
+ } else {
+ child.setMother(mother);
}
+ child.setDateOfBirth(dob);
+ child.setUpdatedDateNic(lastUpdateDateNic);
+
+ List deactivatedUsers = null;
+ synchronized(this) {
+ if (childById != null && subscriptionService.getActiveSubscription(subscriberService.getSubscriberByBeneficiary(childById), SubscriptionPackType.PREGNANCY) != null && subscriptionService.getActiveSubscription(subscriberService.getSubscriberByBeneficiary(childById), SubscriptionPackType.PREGNANCY).getStatus() == SubscriptionStatus.ACTIVE) {
+ LOGGER.debug("Active mother. We ignore the deactivated case scenario.");
+ } else {
+ deactivatedUsers = deactivatedBeneficiaryService.findDeactivatedBeneficiariesOtherThanManualDeactivation(childId);
+ if (deactivatedUsers != null && deactivatedUsers.size() > 0) {
+ for (DeactivatedBeneficiary deactivatedUser : deactivatedUsers) {
+ if (deactivatedUser.getOrigin() == importOrigin) {
+ String message = deactivatedUser.isCompletedSubscription() ? SUBSCRIPTION_COMPLETED : USER_DEACTIVATED;
+ if (message.length() > 2) {
+ return createUpdateChildRejections(flagForMcts, record, action, RejectionReasons.UPDATED_RECORD_ALREADY_EXISTS, false);
+ }
+ }
+ }
+ }
+ }
+
+ if (importOrigin.equals(SubscriptionOrigin.MCTS_IMPORT)) {
+ return subscriberService.updateChildSubscriber(msisdn, child, dob, record, action);
+ } else {
+ return subscriberService.updateRchChildSubscriber(msisdn, child, dob, record, action);
- // a new child subscription was created -- deactivate mother's pregnancy subscription if she has one
- Subscriber subscriber = childSubscription.getSubscriber();
- Subscription pregnancySubscription = subscriptionService.getActiveSubscription(subscriber,
- SubscriptionPackType.PREGNANCY);
- if (pregnancySubscription != null) {
- subscriptionService.deactivateSubscription(pregnancySubscription, DeactivationReason.LIVE_BIRTH);
+ }
}
+ }
+
+ // Create rejection records for all the invalid mothers
+ private MotherImportRejection createUpdateMotherRejections(Boolean isMcts, Map record, String action, RejectionReasons rejectionReason, Boolean accepted) {
+ String rejectReason = rejectionReason == null ? null : rejectionReason.toString();
+ if (isMcts) {
+ return motherRejectionMcts(convertMapToMother(record), accepted, rejectReason, action);
+
+ } else {
+ return motherRejectionRch(convertMapToRchMother(record), accepted, rejectReason, action);
- if ((death != null) && death) {
- subscriptionService.deactivateSubscription(childSubscription, DeactivationReason.CHILD_DEATH);
}
+ }
- return true;
+ // Create rejection records for all the invalid childs
+ private ChildImportRejection createUpdateChildRejections(Boolean isMcts, Map record, String action, RejectionReasons rejectionReason, Boolean accepted) {
+ String rejectReason = rejectionReason == null ? null : rejectionReason.toString();
+ if (isMcts) {
+ return childRejectionMcts(convertMapToChild(record), accepted, rejectReason, action);
+ } else {
+ return childRejectionRch(convertMapToRchChild(record), accepted, rejectReason, action);
+ }
}
- private boolean validateMother(MctsMother mother, MctsChild child, Long msisdn, SubscriptionOrigin importOrigin) {
- if (mother == null) {
- subscriptionErrorDataService.create(
- new SubscriptionError(msisdn, child.getBeneficiaryId(), SubscriptionRejectionReason.MISSING_MOTHER_ID, SubscriptionPackType.CHILD, "MotherId of child is missing", importOrigin));
- return false;
- } else if (mother != null && child.getMother() != null && !mother.equals(child.getMother())) {
- subscriptionErrorDataService.create(
- new SubscriptionError(msisdn, child.getBeneficiaryId(), SubscriptionRejectionReason.ALREADY_SUBSCRIBED, SubscriptionPackType.CHILD, "Child already registered with different Mother", importOrigin));
+ private boolean validateMother(MctsMother mother, MctsChild child) {
+ if (mother != null && child.getMother() != null && !mother.equals(child.getMother())) {
return false;
}
return true;
}
- private boolean validateMsisdn(Long msisdn, SubscriptionPackType packType, String beneficiaryId, SubscriptionOrigin importOrigin) {
- if (msisdn == null) {
- subscriptionErrorDataService.create(
- new SubscriptionError(-1, beneficiaryId, SubscriptionRejectionReason.MISSING_MSISDN, packType, "", importOrigin));
+ private boolean validateMsisdn(Long msisdn) {
+ if (msisdn == null || (msisdn.toString().length() != KilkariConstants.MSISDN_LENGTH)) {
return false;
}
return true;
}
- private boolean validateCaseNo(Long caseNo, Long msisdn, MctsMother mother, SubscriptionPackType packType, String beneficiaryId, SubscriptionOrigin importOrigin) {
+ private boolean validateCaseNo(Long caseNo, MctsMother mother) {
if (caseNo == null || (caseNo <= 0)) {
- subscriptionErrorDataService.create(
- new SubscriptionError(msisdn, beneficiaryId, SubscriptionRejectionReason.INVALID_CASE_NO, packType, "", importOrigin));
return false;
}
if (mother.getMaxCaseNo() != null && caseNo < mother.getMaxCaseNo()) {
- subscriptionErrorDataService.create(new SubscriptionError(msisdn, beneficiaryId,
- SubscriptionRejectionReason.INVALID_CASE_NO, SubscriptionPackType.PREGNANCY, "Case no is less than the maxCaseNo encountered so far", importOrigin));
return false;
}
return true;
}
- private boolean childAlreadyPresent(final String motherBenificiaryId) {
+ private boolean childAlreadyPresent(final String motherBenificiaryId, final SubscriptionOrigin importOrigin) {
//Found mother by beneficiary id. If there is no mother already present,then import will
//go to the next check. Else we get the subscriber by the mother id
//and check if the child subscription is ACTIVE. If yes we do not update the mother.
MctsMother mctsMother = null;
try {
- mctsMother = mctsMotherDataService.findByBeneficiaryId(motherBenificiaryId);
+ if (SubscriptionOrigin.MCTS_IMPORT.equals(importOrigin)) {
+ mctsMother = mctsMotherDataService.findByBeneficiaryId(motherBenificiaryId);
+ } else {
+ mctsMother = mctsMotherDataService.findByRchId(motherBenificiaryId);
+ }
if (mctsMother == null) {
return false;
@@ -432,11 +487,21 @@ private boolean childAlreadyPresent(final String motherBenificiaryId) {
return false;
} else {
for (Subscription subscription : subscriber.getAllSubscriptions()) {
- if (subscription.getSubscriptionPack().getType().equals(SubscriptionPackType.CHILD)
- && subscription.getStatus().equals(SubscriptionStatus.ACTIVE)
- && subscriber.getChild().getMother() != null
- && subscriber.getChild().getMother().getBeneficiaryId().equals(motherBenificiaryId)) {
- return true;
+ SubscriptionStatus status = subscription.getStatus();
+ if (SubscriptionOrigin.MCTS_IMPORT.equals(importOrigin)) {
+ if (subscription.getSubscriptionPack().getType().equals(SubscriptionPackType.CHILD)
+ && (SubscriptionStatus.ACTIVE.equals(status) || SubscriptionStatus.PENDING_ACTIVATION.equals(status) || SubscriptionStatus.HOLD.equals(status))
+ && subscriber.getChild().getMother() != null
+ && subscriber.getChild().getMother().getBeneficiaryId().equals(motherBenificiaryId)) {
+ return true;
+ }
+ } else {
+ if (subscription.getSubscriptionPack().getType().equals(SubscriptionPackType.CHILD)
+ && (SubscriptionStatus.ACTIVE.equals(status) || SubscriptionStatus.PENDING_ACTIVATION.equals(status) || SubscriptionStatus.HOLD.equals(status))
+ && subscriber.getChild().getMother() != null
+ && subscriber.getChild().getMother().getRchId().equals(motherBenificiaryId)) {
+ return true;
+ }
}
}
}
@@ -448,8 +513,14 @@ private boolean childAlreadyPresent(final String motherBenificiaryId) {
}
}
- private boolean validateReferenceDate(DateTime referenceDate, SubscriptionPackType packType, Long msisdn, String beneficiaryId, SubscriptionOrigin importOrigin) {
-
+ @Override
+ public boolean validateReferenceDate(DateTime referenceDate, SubscriptionPackType packType, Long msisdn, String beneficiaryId, SubscriptionOrigin importOrigin) {
+ if (pregnancyPack == null) {
+ pregnancyPack = subscriptionService.getSubscriptionPack(SubscriptionPackType.PREGNANCY);
+ }
+ if (childPack == null) {
+ childPack = subscriptionService.getSubscriptionPack(SubscriptionPackType.CHILD);
+ }
if (referenceDate == null) {
subscriptionErrorDataService.create(
new SubscriptionError(msisdn, beneficiaryId,
@@ -463,15 +534,11 @@ private boolean validateReferenceDate(DateTime referenceDate, SubscriptionPackTy
if (packType == SubscriptionPackType.PREGNANCY) {
String referenceDateValidationError = pregnancyPack.isReferenceDateValidForPack(referenceDate);
if (!referenceDateValidationError.isEmpty()) {
- subscriptionErrorDataService.create(
- new SubscriptionError(msisdn, beneficiaryId, SubscriptionRejectionReason.INVALID_LMP, SubscriptionPackType.PREGNANCY, referenceDateValidationError, importOrigin));
return false;
}
} else { // childPack
String referenceDateValidationError = childPack.isReferenceDateValidForPack(referenceDate);
if (!referenceDateValidationError.isEmpty()) {
- subscriptionErrorDataService.create(
- new SubscriptionError(msisdn, beneficiaryId, SubscriptionRejectionReason.INVALID_DOB, SubscriptionPackType.CHILD, referenceDateValidationError, importOrigin));
return false;
}
}
@@ -479,7 +546,286 @@ private boolean validateReferenceDate(DateTime referenceDate, SubscriptionPackTy
return true;
}
- private Map getMotherProcessorMapping() {
+ @Override
+ @Transactional
+ public void createOrUpdateRchChildRejections(Map rejectedRecords, Map rejectionStatus) {
+
+ // get rch Ids of all the rejected records
+ Set rchIds = rejectedRecords.keySet();
+ List updateObjects = new ArrayList<>();
+ List createObjects = new ArrayList<>();
+
+ if (!rchIds.isEmpty()) {
+ Map childRejects = childRejectionService.findChildRejectionByRchId(rchIds);
+ ChildImportRejection child;
+ for (String rchId : rchIds) {
+ child = (ChildImportRejection) rejectedRecords.get(rchId);
+ if (childRejects.get(rchId) != null) {
+ updateChildRejectionRecord(childRejects, rchId, child, updateObjects);
+ continue;
+ }
+ if (!(Boolean) rejectionStatus.get(rchId)) {
+ createObjects.add(child);
+ }
+ }
+
+ Long createdNo = (createObjects.size() == 0) ? 0 : rchChildBulkInsert(createObjects);
+ Long updatedNo = (updateObjects.size() == 0) ? 0 : rchChildBulkUpdate(updateObjects);
+ LOGGER.debug(IMPORT_STATS_LOG, createdNo, updatedNo);
+ } else {
+ LOGGER.debug("The set is empty!");
+ }
+
+ }
+
+ private void updateChildRejectionRecord(Map childRejects, String beneficiaryId, ChildImportRejection child, List updateObjects) {
+ ChildImportRejection dbChild = (ChildImportRejection) childRejects.get(beneficiaryId);
+ try {
+ Method method = dbChild.getClass().getMethod(GET_CREATION); // Get creationDate from db object and set it in the update object
+ DateTime dateTime = (DateTime) method.invoke(dbChild);
+
+ method = child.getClass().getMethod(SET_CREATION, DateTime.class);
+ method.invoke(child, dateTime);
+
+ method = dbChild.getClass().getMethod(GET_ID);
+ Long id = (Long) method.invoke(dbChild);
+ method = child.getClass().getMethod(SET_ID, Long.class);
+ method.invoke(child, id);
+ } catch (IllegalAccessException|SecurityException|IllegalArgumentException|NoSuchMethodException|
+ InvocationTargetException e) {
+ LOGGER.error("Ignoring creation date and setting as now: {}", e);
+
+ }
+ updateObjects.add(child);
+ }
+
+ private Long rchChildBulkInsert(List createObjects) {
+ int count = 0;
+ Long sqlCount = 0L;
+ while (count < createObjects.size()) {
+ List createObjectsPart = new ArrayList<>();
+ while (createObjectsPart.size() < REJECTION_PART_SIZE && count < createObjects.size()) {
+ createObjectsPart.add(createObjects.get(count));
+ count++;
+ }
+ sqlCount += childRejectionService.rchBulkInsert(createObjectsPart);
+ createObjectsPart.clear();
+ }
+ return sqlCount;
+ }
+
+ private Long rchChildBulkUpdate(List updateObjects) {
+ int count = 0;
+ Long sqlCount = 0L;
+ while (count < updateObjects.size()) {
+ List updateObjectsPart = new ArrayList<>();
+ while (updateObjectsPart.size() < REJECTION_PART_SIZE && count < updateObjects.size()) {
+ updateObjectsPart.add(updateObjects.get(count));
+ count++;
+ }
+ sqlCount += childRejectionService.rchBulkUpdate(updateObjectsPart);
+ updateObjectsPart.clear();
+ }
+ return sqlCount;
+ }
+
+ @Override
+ @Transactional
+ public void createOrUpdateMctsChildRejections(Map rejectedRecords, Map rejectionStatus) {
+
+ // get rch Ids of all the rejected records
+ Set mctsIds = rejectedRecords.keySet();
+ List updateObjects = new ArrayList<>();
+ List createObjects = new ArrayList<>();
+
+ Map childRejects = childRejectionService.findChildRejectionByMctsId(mctsIds);
+ ChildImportRejection child;
+ for (String mctsId : mctsIds) {
+ child = (ChildImportRejection) rejectedRecords.get(mctsId);
+ if (childRejects.get(mctsId) != null) {
+ updateChildRejectionRecord(childRejects, mctsId, child, updateObjects);
+ continue;
+ }
+ if (!(Boolean) rejectionStatus.get(mctsId)) {
+ createObjects.add(child);
+ }
+ }
+
+ Long createdNo = (createObjects.size() == 0) ? 0 : mctsChildBulkInsert(createObjects);
+ Long updatedNo = (updateObjects.size() == 0) ? 0 : mctsChildBulkUpdate(updateObjects);
+ LOGGER.debug(IMPORT_STATS_LOG, createdNo, updatedNo);
+ }
+
+
+ private Long mctsChildBulkInsert(List createObjects) {
+ int count = 0;
+ Long sqlCount = 0L;
+ while (count < createObjects.size()) {
+ List createObjectsPart = new ArrayList<>();
+ while (createObjectsPart.size() < REJECTION_PART_SIZE && count < createObjects.size()) {
+ createObjectsPart.add(createObjects.get(count));
+ count++;
+ }
+ sqlCount += childRejectionService.mctsBulkInsert(createObjectsPart);
+ createObjectsPart.clear();
+ }
+ return sqlCount;
+ }
+
+ private Long mctsChildBulkUpdate(List updateObjects) {
+ int count = 0;
+ Long sqlCount = 0L;
+ while (count < updateObjects.size()) {
+ List updateObjectsPart = new ArrayList<>();
+ while (updateObjectsPart.size() < REJECTION_PART_SIZE && count < updateObjects.size()) {
+ updateObjectsPart.add(updateObjects.get(count));
+ count++;
+ }
+ sqlCount += childRejectionService.mctsBulkUpdate(updateObjectsPart);
+ updateObjectsPart.clear();
+ }
+ return sqlCount;
+ }
+
+
+ @Override
+ @Transactional
+ public void createOrUpdateRchMotherRejections(Map rejectedRecords, Map rejectionStatus) {
+
+ // get rch Ids of all the rejected records
+ Set rchIds = rejectedRecords.keySet();
+ List updateObjects = new ArrayList<>();
+ List createObjects = new ArrayList<>();
+
+ Map motherRejects = motherRejectionService.findMotherRejectionByRchId(rchIds);
+ MotherImportRejection mother;
+ for (String rchId : rchIds) {
+ mother = (MotherImportRejection) rejectedRecords.get(rchId);
+ if (motherRejects.get(rchId) != null) {
+ updateMotherRejectionRecord(motherRejects, rchId, mother, updateObjects);
+ continue;
+ }
+ if (!(Boolean) rejectionStatus.get(rchId)) {
+ createObjects.add(mother);
+ }
+ }
+
+ Long createdNo = (createObjects.size() == 0) ? 0 : rchMotherBulkInsert(createObjects);
+ Long updatedNo = (updateObjects.size() == 0) ? 0 : rchMotherBulkUpdate(updateObjects);
+ LOGGER.debug(IMPORT_STATS_LOG, createdNo, updatedNo);
+ }
+
+ private void updateMotherRejectionRecord(Map motherRejects, String beneficiaryId, MotherImportRejection mother, List updateObjects) {
+ MotherImportRejection dbMother = (MotherImportRejection) motherRejects.get(beneficiaryId);
+ try {
+ Method method = dbMother.getClass().getMethod(GET_CREATION); // Get creationDate from db object and set it in the update object
+ DateTime dateTime = (DateTime) method.invoke(dbMother);
+
+ method = mother.getClass().getMethod(SET_CREATION, DateTime.class);
+ method.invoke(mother, dateTime);
+
+ method = dbMother.getClass().getMethod(GET_ID);
+ Long id = (Long) method.invoke(dbMother);
+ method = mother.getClass().getMethod(SET_ID, Long.class);
+ method.invoke(mother, id);
+ } catch (IllegalAccessException|SecurityException|IllegalArgumentException|NoSuchMethodException|
+ InvocationTargetException e) {
+ LOGGER.error(IGNORE_CREATION_DATE);
+
+ }
+ updateObjects.add(mother);
+ }
+
+ private Long rchMotherBulkInsert(List createObjects) {
+ int count = 0;
+ Long sqlCount = 0L;
+ while (count < createObjects.size()) {
+ List createObjectsPart = new ArrayList<>();
+ while (createObjectsPart.size() < REJECTION_PART_SIZE && count < createObjects.size()) {
+ createObjectsPart.add(createObjects.get(count));
+ count++;
+ }
+ sqlCount += motherRejectionService.rchBulkInsert(createObjectsPart);
+ createObjectsPart.clear();
+ }
+ return sqlCount;
+ }
+
+ private Long rchMotherBulkUpdate(List updateObjects) {
+ int count = 0;
+ Long sqlCount = 0L;
+ while (count < updateObjects.size()) {
+ List updateObjectsPart = new ArrayList<>();
+ while (updateObjectsPart.size() < REJECTION_PART_SIZE && count < updateObjects.size()) {
+ updateObjectsPart.add(updateObjects.get(count));
+ count++;
+ }
+ sqlCount += motherRejectionService.rchBulkUpdate(updateObjectsPart);
+ updateObjectsPart.clear();
+ }
+ return sqlCount;
+ }
+
+ @Override
+ @Transactional
+ public void createOrUpdateMctsMotherRejections(Map rejectedRecords, Map rejectionStatus) {
+
+ // get rch Ids of all the rejected records
+ Set mctsIds = rejectedRecords.keySet();
+ List updateObjects = new ArrayList<>();
+ List createObjects = new ArrayList<>();
+
+ Map motherRejects = motherRejectionService.findMotherRejectionByMctsId(mctsIds);
+ MotherImportRejection mother;
+ for (String mctsId : mctsIds) {
+ mother = (MotherImportRejection) rejectedRecords.get(mctsId);
+ if (motherRejects.get(mctsId) != null) {
+ updateMotherRejectionRecord(motherRejects, mctsId, mother, updateObjects);
+ continue;
+ }
+ if (!(Boolean) rejectionStatus.get(mctsId)) {
+ createObjects.add(mother);
+ }
+ }
+
+ Long createdNo = (createObjects.size() == 0) ? 0 : mctsMotherBulkInsert(createObjects);
+ Long updatedNo = (updateObjects.size() == 0) ? 0 : mctsMotherBulkUpdate(updateObjects);
+ LOGGER.debug(IMPORT_STATS_LOG, createdNo, updatedNo);
+ }
+
+ private Long mctsMotherBulkInsert(List createObjects) {
+ int count = 0;
+ Long sqlCount = 0L;
+ while (count < createObjects.size()) {
+ List createObjectsPart = new ArrayList<>();
+ while (createObjectsPart.size() < REJECTION_PART_SIZE && count < createObjects.size()) {
+ createObjectsPart.add(createObjects.get(count));
+ count++;
+ }
+ sqlCount += motherRejectionService.mctsBulkInsert(createObjectsPart);
+ createObjectsPart.clear();
+ }
+ return sqlCount;
+ }
+
+ private Long mctsMotherBulkUpdate(List updateObjects) {
+ int count = 0;
+ Long sqlCount = 0L;
+ while (count < updateObjects.size()) {
+ List updateObjectsPart = new ArrayList<>();
+ while (updateObjectsPart.size() < REJECTION_PART_SIZE && count < updateObjects.size()) {
+ updateObjectsPart.add(updateObjects.get(count));
+ count++;
+ }
+ sqlCount += motherRejectionService.mctsBulkUpdate(updateObjectsPart);
+ updateObjectsPart.clear();
+ }
+ return sqlCount;
+ }
+
+
+ @Override
+ public Map getMotherProcessorMapping() {
Map mapping = new HashMap<>();
MctsBeneficiaryUtils.getBeneficiaryLocationMapping(mapping);
@@ -536,7 +882,8 @@ public Boolean retrieve(String value) {
}));
}
- private Map getRchMotherProcessorMapping() {
+ @Override
+ public Map getRchMotherProcessorMapping() {
Map mapping = new HashMap<>();
MctsBeneficiaryUtils.getBeneficiaryLocationMapping(mapping);
@@ -577,48 +924,54 @@ public Long retrieve(String value) {
return mapping;
}
- private Map getChildProcessorMapping() {
+
+ @Override
+ public Map getRchAshaProcessorMapping() {
Map mapping = new HashMap<>();
+ mapping.put(FlwConstants.STATE_ID, new Optional(new GetLong()));
- MctsBeneficiaryUtils.getBeneficiaryLocationMapping(mapping);
+ mapping.put(FlwConstants.DISTRICT_ID, new Optional(new GetLong()));
+ mapping.put(FlwConstants.DISTRICT_NAME, new Optional(new GetString()));
- mapping.put(KilkariConstants.BENEFICIARY_ID, new GetInstanceByString() {
- @Override
- public MctsChild retrieve(String value) {
- return mctsBeneficiaryValueProcessor.getChildInstanceByString(value);
- }
- });
- mapping.put(KilkariConstants.BENEFICIARY_NAME, new Optional(new GetString()));
- mapping.put(KilkariConstants.MOTHER_ID, new Optional(new GetInstanceByString() {
- @Override
- public MctsMother retrieve(String value) {
- return mctsBeneficiaryValueProcessor.getMotherInstanceByBeneficiaryId(value);
- }
- }));
- mapping.put(KilkariConstants.MSISDN, new Optional(new GetInstanceByString() {
+ mapping.put(FlwConstants.TALUKA_ID, new Optional(new GetString()));
+ mapping.put(FlwConstants.TALUKA_NAME, new Optional(new GetString()));
+
+ mapping.put(FlwConstants.CENSUS_VILLAGE_ID, new Optional(new GetLong()));
+ mapping.put(FlwConstants.VILLAGE_NAME, new Optional(new GetString()));
+
+ mapping.put(FlwConstants.PHC_ID, new Optional(new GetLong()));
+ mapping.put(FlwConstants.PHC_NAME, new Optional(new GetString()));
+
+ mapping.put(FlwConstants.HEALTH_BLOCK_ID, new Optional(new GetLong()));
+ mapping.put(FlwConstants.HEALTH_BLOCK_NAME, new Optional(new GetString()));
+
+ mapping.put(FlwConstants.SUB_CENTRE_ID, new Optional(new GetLong()));
+ mapping.put(FlwConstants.SUB_CENTRE_NAME, new Optional(new GetString()));
+
+ mapping.put(FlwConstants.MOBILE_NO, new Optional(new GetInstanceByString() {
@Override
public Long retrieve(String value) {
return mctsBeneficiaryValueProcessor.getMsisdnByString(value);
}
}));
- mapping.put(KilkariConstants.DOB, new Optional(new GetInstanceByString() {
- @Override
- public DateTime retrieve(String value) {
- return mctsBeneficiaryValueProcessor.getDateByString(value);
- }
- }));
- mapping.put(KilkariConstants.DEATH, new Optional(new GetInstanceByString() {
- @Override
- public Boolean retrieve(String value) {
- return mctsBeneficiaryValueProcessor.getDeathFromString(value);
- }
- }));
- mapping.put(KilkariConstants.LAST_UPDATE_DATE, new Optional(new GetInstanceByString() {
+
+ mapping.put(FlwConstants.EXEC_DATE, new Optional(new GetInstanceByString() {
@Override
public LocalDate retrieve(String value) {
return (LocalDate) mctsBeneficiaryValueProcessor.getDateByString(value).toLocalDate();
}
}));
+
+ mapping.put(FlwConstants.GF_ID, new Optional(new GetLong()));
+ mapping.put(FlwConstants.GF_NAME, new Optional(new GetString()));
+
+ mapping.put(FlwConstants.GF_TYPE, new Optional(new GetString()));
+ mapping.put(FlwConstants.GF_STATUS, new Optional(new GetString()));
+
return mapping;
}
+
+
+
+
}
diff --git a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryUpdateServiceImpl.java b/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryUpdateServiceImpl.java
deleted file mode 100644
index 77ae4b9e6..000000000
--- a/kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryUpdateServiceImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package org.motechproject.nms.kilkari.service.impl;
-
-import org.joda.time.DateTime;
-import org.motechproject.nms.csv.exception.CsvImportDataException;
-import org.motechproject.nms.csv.utils.CsvImporterBuilder;
-import org.motechproject.nms.csv.utils.CsvMapImporter;
-import org.motechproject.nms.csv.utils.GetInstanceByString;
-import org.motechproject.nms.csv.utils.GetString;
-import org.motechproject.nms.kilkari.domain.MctsBeneficiary;
-import org.motechproject.nms.kilkari.domain.MctsMother;
-import org.motechproject.nms.kilkari.domain.SubscriptionOrigin;
-import org.motechproject.nms.kilkari.repository.MctsChildDataService;
-import org.motechproject.nms.kilkari.repository.MctsMotherDataService;
-import org.motechproject.nms.kilkari.service.MctsBeneficiaryImportService;
-import org.motechproject.nms.kilkari.service.MctsBeneficiaryUpdateService;
-import org.motechproject.nms.kilkari.service.MctsBeneficiaryValueProcessor;
-import org.motechproject.nms.kilkari.utils.KilkariConstants;
-import org.motechproject.nms.kilkari.utils.MctsBeneficiaryUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.supercsv.cellprocessor.Optional;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.prefs.CsvPreference;
-
-import javax.validation.ConstraintViolationException;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Implementation of the {@link MctsBeneficiaryUpdateService} interface.
- */
-@Service("mctsBeneficiaryUpdateService")
-public class MctsBeneficiaryUpdateServiceImpl implements MctsBeneficiaryUpdateService {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(MctsBeneficiaryUpdateServiceImpl.class);
-
- private MctsMotherDataService mctsMotherDataService;
- private MctsChildDataService mctsChildDataService;
- private MctsBeneficiaryValueProcessor mctsBeneficiaryValueProcessor;
- private MctsBeneficiaryImportService mctsBeneficiaryImportService;
-
- @Autowired
- public MctsBeneficiaryUpdateServiceImpl(MctsMotherDataService mctsMotherDataService,
- MctsChildDataService mctsChildDataService,
- MctsBeneficiaryValueProcessor mctsBeneficiaryValueProcessor,
- MctsBeneficiaryImportService mctsBeneficiaryImportService) {
-
- this.mctsMotherDataService = mctsMotherDataService;
- this.mctsChildDataService = mctsChildDataService;
- this.mctsBeneficiaryValueProcessor = mctsBeneficiaryValueProcessor;
- this.mctsBeneficiaryImportService = mctsBeneficiaryImportService;
- }
-
-
- @Override
- public void updateBeneficiaryData(Reader reader) throws IOException {
- BufferedReader bufferedReader = new BufferedReader(reader);
-
- CsvMapImporter csvImporter = new CsvImporterBuilder()
- .setProcessorMapping(getProcessorMapping())
- .setPreferences(CsvPreference.STANDARD_PREFERENCE)
- .createAndOpen(bufferedReader);
- int importCount = 0;
- try {
- Map record;
- while (null != (record = csvImporter.read())) {
- if (processRecord(record)) {
- importCount++;
- }
- }
- } catch (ConstraintViolationException e) {
- throw new CsvImportDataException(MctsBeneficiaryUtils.createErrorMessage(
- e.getConstraintViolations(), csvImporter.getRowNumber()), e);
- } catch (NumberFormatException e) {
- throw new CsvImportDataException(MctsBeneficiaryUtils.createErrorMessage(
- "Invalid number", csvImporter.getRowNumber()), e);
- }
- LOGGER.info("Imported {} beneficiaries", importCount);
- }
-
- /**
- * This method processes one CSV row (corresponding to an MCTS beneficiary) and potentially makes several types of
- * updates based on the fields provided:
- *
- * - Location update - if new location fields are provided, validate them and update the beneficiary.
- *
- * - Reference date update - if a new reference date (DOB/LMP) is provided, the status of the beneficiary's
- * subscription may change. Check for subscription state based on this new date and make the necessary updates
- * to the subscriber/subscription. This could result in an existing subscription being deactivated or an inactive
- * subscription being reactivated.
- *
- * - MSISDN update - if a new MSISDN is provided, update the subscriber unless the same MSISDN is already in use
- * for the same subscription pack. If the MSISDN is in use for a *different* subscription pack, the update is
- * allowed.
- *
- * @param record Data fields corresponding to one row of the CSV file
- * @return true if the record was successfully updated
- */
- private boolean processRecord(Map record) { //NO CHECKSTYLE CyclomaticComplexity
-
- // Step 1: find the beneficiary
- String mctsId = (String) record.get(KilkariConstants.UPDATE_MCTS_ID);
- String stateMctsId = (String) record.get(KilkariConstants.UPDATE_STATE_MCTS_ID);
-
- MctsBeneficiary beneficiary = beneficiaryFromId(mctsId, stateMctsId);
- if (beneficiary == null) {
- throw new CsvImportDataException(String.format("Unable to locate MCTS beneficiary: %s(%s), %s(%s)", KilkariConstants.UPDATE_MCTS_ID,
- mctsId, KilkariConstants.UPDATE_STATE_MCTS_ID, stateMctsId));
- }
-
- // Step 1.5: remap the headers to use standard field names from MCTS
- mapUpdateHeaders(record, beneficiary);
-
- // Step 2: Re-route and call the import service for the update
- return (beneficiary instanceof MctsMother) ?
- mctsBeneficiaryImportService.importMotherRecord(record, SubscriptionOrigin.MCTS_IMPORT) :
- mctsBeneficiaryImportService.importChildRecord(record, SubscriptionOrigin.MCTS_IMPORT);
- }
-
- private Map mapUpdateHeaders(Map updates, MctsBeneficiary beneficiary) {
- if (updates.containsKey(KilkariConstants.UPDATE_MSISDN)) {
- updates.put(KilkariConstants.MSISDN, updates.get(KilkariConstants.UPDATE_MSISDN));
- }
-
- if (updates.containsKey(KilkariConstants.UPDATE_DOB)) {
- updates.put(KilkariConstants.DOB, updates.get(KilkariConstants.UPDATE_DOB));
- }
-
- if (updates.containsKey(KilkariConstants.UPDATE_LMP)) {
- updates.put(KilkariConstants.LMP, updates.get(KilkariConstants.UPDATE_LMP));
- }
-
- if (updates.containsKey(KilkariConstants.UPDATE_MCTS_ID)) {
- updates.put(KilkariConstants.BENEFICIARY_ID, beneficiary);
- }
-
- return updates;
- }
-
- private Map