Merge pull request #786 from motech-implementations/motherUpdateException

mother and child update error check

Author: gudipatiharitha

kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportServiceImpl.java

@@ -197,7 +197,9 @@ public MotherImportRejection importMotherRecord(Map<String, Object> record, Subs
         mother.setDateOfBirth(motherDOB);
         mother.setLastMenstrualPeriod(lmp);
         mother.setUpdatedDateNic(lastUpdatedDateNic);
-        mctsMotherDataService.update(mother);
+        if (mother.getId() != null) {
+            mctsMotherDataService.update(mother);
+        }
 
 
         // Check if existing subscription needs to be deactivated
@@ -390,7 +392,9 @@ public ChildImportRejection importChildRecord(Map<String, Object> record, Subscr
         }
         child.setDateOfBirth(dob);
         child.setUpdatedDateNic(lastUpdateDateNic);
-        mctsChildDataService.update(child);
+        if (child.getId() != null) {
+            mctsChildDataService.update(child);
+        }
 
         List<DeactivatedBeneficiary> deactivatedUsers = null;
         synchronized(this) {
@@ -535,9 +539,7 @@ public boolean validateReferenceDate(DateTime referenceDate, SubscriptionPackTyp
         }
 
         if (packType == SubscriptionPackType.PREGNANCY) {
-            LOGGER.debug("here2");
             String referenceDateValidationError = pregnancyPack.isReferenceDateValidForPack(referenceDate);
-            LOGGER.debug("Result: {}", referenceDateValidationError);
             if (!referenceDateValidationError.isEmpty()) {
                 return false;
             }

rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java

@@ -828,8 +828,8 @@ public void readMotherResponseFromFile(MotechEvent event) throws RchFileManipula
         String fileName = (String) event.getParameters().get(Constants.FILE_NAME);
         LocalDate endDate = (LocalDate) event.getParameters().get(Constants.END_DATE_PARAM);
         LocalDate startDate = (LocalDate)   event.getParameters().get(Constants.START_DATE_PARAM);
-        LOGGER.info("RCH Asha file import entry point");
-        LOGGER.info("Copying RCH Asha response file from remote server to local directory.");
+        LOGGER.info("RCH Mother file import entry point");
+        LOGGER.info("Copying RCH Mother response file from remote server to local directory.");
         retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.MOTHER, 0);
     }
 
@@ -939,8 +939,8 @@ public void readChildResponseFromFile(MotechEvent event) throws RchFileManipulat
         String fileName = (String) event.getParameters().get(Constants.FILE_NAME);
         LocalDate endDate = (LocalDate) event.getParameters().get(Constants.END_DATE_PARAM);
         LocalDate startDate = (LocalDate)   event.getParameters().get(Constants.START_DATE_PARAM);
-        LOGGER.info("RCH Asha file import entry point");
-        LOGGER.info("Copying RCH Asha response file from remote server to local directory.");
+        LOGGER.info("RCH Child file import entry point");
+        LOGGER.info("Copying RCH Child response file from remote server to local directory.");
         retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.CHILD, 0);
     }