From b8d680f178a75a919324e059fffabe873754e9d5 Mon Sep 17 00:00:00 2001 From: VishnuVimal Date: Tue, 22 Jan 2019 13:46:01 +0530 Subject: [PATCH 1/5] scp retry code --- .../service/impl/RchWebServiceFacadeImpl.java | 1342 ++++++++++------- .../it/rch/RchWebServiceFacadeBundleIT.java | 32 + 2 files changed, 804 insertions(+), 570 deletions(-) diff --git a/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java b/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java index f12f57630..a9634d896 100644 --- a/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java +++ b/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java @@ -174,7 +174,8 @@ public class RchWebServiceFacadeImpl implements RchWebServiceFacade { private static final String QUOTATION = "'"; private static final String SQL_QUERY_LOG = "SQL QUERY: {}"; private static final String FROM_DATE_LOG = "fromdate {}"; - private static final String SCP_ERROR = "error copying file to remote server."; + private static final String SCP_ERROR_REMOTE = "error copying file to remote server."; + private static final String SCP_ERROR_LOCAL = "error copying file to local server."; private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormat.forPattern("dd-MM-yyyy"); private static final String SCP_TIMEOUT_SETTING = "rch.scp_timeout"; @@ -246,6 +247,182 @@ private String createErrorMessage(String message, Exception e) { return message + StringUtils.substring(e.getMessage(), START, END); } + class ScpRunnable implements Runnable { + String name; + String remoteLocation; + LocalDate from; + LocalDate to; + Long stateId; + RchUserType userType; + int trialCount; + + public ScpRunnable(String name, String remoteLocation, LocalDate from, LocalDate to, Long stateId, RchUserType userType, int trialCount) { + this.name=name; + this.remoteLocation = remoteLocation; + this.from = from; + this.to= to; + this.stateId = stateId; + this.userType = userType; + this.trialCount = trialCount; + } + + public void run() { + try { + Thread.sleep(120000L); + trialCount++; + LOGGER.error("Error in SCP for %d for type %s", trialCount, userType); + if (trialCount <= 3) { + if (remoteLocation == null) { + retryScpAndAudit(name, from, to, stateId, userType, trialCount); + } else { + retryScpFromRemoteToLocal(name, remoteLocation, from, to, stateId, userType, trialCount); + } + } + } catch (InterruptedException e) { + LOGGER.error(e.getMessage(), e); + } + } + + } + private boolean retryScpAndAudit(String name, LocalDate from, LocalDate to, Long stateId, RchUserType userType, int trialCount) { + try { + scpResponseToRemote(name); + LOGGER.info("RCH mother response file successfully copied to remote server"); + + RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(name, from, to, stateId, userType, LocalDate.now()); + rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); + return true; + + } catch (ExecutionException e) { + if(trialCount < 3) { + Runnable scpRunnable = new ScpRunnable(name, null, from, to, stateId, userType, trialCount); + scpRunnable.run(); + } else { + LOGGER.error(SCP_ERROR_REMOTE, e); + } + } catch (RchFileManipulationException e) { + LOGGER.error("invalid file name", e); + } + return false; + } + + private void retryScpFromRemoteToLocal(String name, String remoteLocation, LocalDate from, LocalDate to, Long stateId, RchUserType userType, int trialCount) { + try { + List rchImportFacilitatorTypes = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), userType); + File localResponseFile ; + if (rchImportFacilitatorTypes.isEmpty()) { + localResponseFile = scpResponseToLocal(name, remoteLocation); + String result = readResponsesFromXml(localResponseFile); + State importState = stateDataService.findByCode(stateId); + String stateName = importState.getName(); + Long stateCode = importState.getCode(); + + LocalDate startReferenceDate = to; + LocalDate endReferenceDate = from; + processByUserType(name, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate, userType); + } else { + for (RchImportFacilitator rchImportFacilitatorType: rchImportFacilitatorTypes + ) { + if (name == null) { + localResponseFile = scpResponseToLocal(rchImportFacilitatorType.getFileName(), remoteLocation); + } else { + localResponseFile = scpResponseToLocal(name, remoteLocation); + } + if (localResponseFile != null) { + String result = readResponsesFromXml(localResponseFile); + State importState = stateDataService.findByCode(stateId); + String stateName = importState.getName(); + Long stateCode = importState.getCode(); + LocalDate startReferenceDate = rchImportFacilitatorType.getStartDate(); + LocalDate endReferenceDate = rchImportFacilitatorType.getEndDate(); + processByUserType(name, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate, userType); + } + } + } + } catch (ExecutionException e) { + if(trialCount < 3) { + Runnable scpRunnable = new ScpRunnable(name, remoteLocation, from, to, stateId, userType, trialCount); + scpRunnable.run(); + } else { + LOGGER.error(SCP_ERROR_LOCAL, e); + } + } catch (RchFileManipulationException e) { + + } finally { + Map eventParams = new HashMap<>(); + eventParams.put(Constants.STATE_ID_PARAM, stateId); + eventParams.put(Constants.REMOTE_LOCATION, null); + eventParams.put(Constants.FILE_NAME, null); + eventByUserType(eventParams, userType); + } + } + + private void eventByUserType(Map eventParams, RchUserType userType) { + switch (userType) { + case DISTRICT: + eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_TALUKA_READ_SUBJECT, eventParams)); + break; + case TALUKA: + eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHBLOCK_READ_SUBJECT, eventParams)); + break; + case HEALTHBLOCK: + eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_TALUKA_HEALTHBLOCK_READ_SUBJECT, eventParams)); + break; + case TALUKAHEALTHBLOCK: + eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHFACILITY_READ_SUBJECT, eventParams)); + break; + case HEALTHFACILITY: + eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHSUBFACILITY_READ_SUBJECT, eventParams)); + break; + case HEALTHSUBFACILITY: + eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_VILLAGE_READ_SUBJECT, eventParams)); + break; + case VILLAGE: + eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_VILLAGE_HEALTHSUBFACILITY_READ_SUBJECT, eventParams)); + break; + default: + return; + } + } + + private void processByUserType(String name, String result, Long stateId, String stateName, Long stateCode, LocalDate startReferenceDate, LocalDate endReferenceDate, RchUserType rchUserType) { + switch (rchUserType) { + case MOTHER: + motherFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + case CHILD: + childFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + case ASHA: + ashaFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + case DISTRICT: + districtFileProcess(name, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + case TALUKA: + talukaFileProcess(name, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + case HEALTHBLOCK: + healthblockFileProcess(name, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + case TALUKAHEALTHBLOCK: + tHFileProcess(name, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + case HEALTHFACILITY: + healthFacilityFileProcess(name, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + case HEALTHSUBFACILITY: + healthsubfacilityFileProcess(name, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + case VILLAGE: + villageFileProcess(name, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + case VILLAGEHEALTHSUBFACILITY: + vhsfFileProcess(name, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); + break; + } + } + @Override public boolean getMothersData(LocalDate from, LocalDate to, URL endpoint, Long stateId) { DS_DataResponseDS_DataResult result; @@ -265,19 +442,23 @@ public boolean getMothersData(LocalDate from, LocalDate to, URL endpoint, Long s File responseFile = generateResponseFile(result, RchUserType.MOTHER, stateId); if (responseFile != null) { LOGGER.info("RCH mother response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH mother response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.MOTHER, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR, e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file name", e); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.MOTHER, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH mother response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.MOTHER, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR, e); +// +// +// +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file name", e); +// } } else { LOGGER.error("Error writing response to file."); } @@ -303,19 +484,20 @@ public boolean getDistrictData(LocalDate from, LocalDate to, URL endpoint, Long File responseFile = generateResponseFile(result, RchUserType.DISTRICT, stateId); if (responseFile != null) { LOGGER.info("RCH district response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH district response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.DISTRICT, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR, e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file name", e); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.DISTRICT, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH district response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.DISTRICT, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR, e); +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file name", e); +// } } else { LOGGER.error("Error writing response to file."); } @@ -341,19 +523,20 @@ public boolean getTalukasData(LocalDate from, LocalDate to, URL endpoint, Long s File responseFile = generateResponseFile(result, RchUserType.TALUKA, stateId); if (responseFile != null) { LOGGER.info("RCH taluka response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH taluka response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.TALUKA, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR, e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file name", e); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.TALUKA, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH taluka response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.TALUKA, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR, e); +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file name", e); +// } } else { LOGGER.error("Error writing response to file."); } @@ -379,19 +562,20 @@ public boolean getVillagesData(LocalDate from, LocalDate to, URL endpoint, Long File responseFile = generateResponseFile(result, RchUserType.VILLAGE, stateId); if (responseFile != null) { LOGGER.info("RCH Village response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH Village response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.VILLAGE, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR, e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file name", e); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.VILLAGE, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH Village response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.VILLAGE, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR, e); +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file name", e); +// } } else { LOGGER.error("Error writing response to file."); } @@ -428,47 +612,48 @@ public void readDistrictResponseFromFile(MotechEvent event) throws RchFileManipu LocalDate startDate = (LocalDate) event.getParameters().get(Constants.START_DATE_PARAM); LOGGER.info("RCH District file import entry point"); LOGGER.info("Copying RCH District response file from remote server to local directory."); - try { - List rchImportFacilitatorDistricts = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.DISTRICT); - File localResponseFile ; - if (rchImportFacilitatorDistricts.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - districtFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorDistrict: rchImportFacilitatorDistricts - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorDistrict.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorDistrict.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorDistrict.getEndDate(); - districtFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } finally { - Map eventParams = new HashMap<>(); - eventParams.put(Constants.STATE_ID_PARAM, stateId); - eventParams.put(Constants.REMOTE_LOCATION, null); - eventParams.put(Constants.FILE_NAME, null); - eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_TALUKA_READ_SUBJECT, eventParams)); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.DISTRICT, 0); +// try { +// List rchImportFacilitatorDistricts = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.DISTRICT); +// File localResponseFile ; +// if (rchImportFacilitatorDistricts.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// districtFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorDistrict: rchImportFacilitatorDistricts +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorDistrict.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorDistrict.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorDistrict.getEndDate(); +// districtFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } finally { +// Map eventParams = new HashMap<>(); +// eventParams.put(Constants.STATE_ID_PARAM, stateId); +// eventParams.put(Constants.REMOTE_LOCATION, null); +// eventParams.put(Constants.FILE_NAME, null); +// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_TALUKA_READ_SUBJECT, eventParams)); +// } } private void districtFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -555,47 +740,48 @@ public void readTalukaResponseFromFile(MotechEvent event) throws RchFileManipula LocalDate startDate = (LocalDate) event.getParameters().get(Constants.START_DATE_PARAM); LOGGER.info("RCH Taluka file import entry point"); LOGGER.info("Copying RCH Taluka response file from remote server to local directory."); - try { - List rchImportFacilitatorTalukas = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.TALUKA); - File localResponseFile ; - if (rchImportFacilitatorTalukas.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - talukaFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorTaluka: rchImportFacilitatorTalukas - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorTaluka.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorTaluka.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorTaluka.getEndDate(); - talukaFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } finally { - Map eventParams = new HashMap<>(); - eventParams.put(Constants.STATE_ID_PARAM, stateId); - eventParams.put(Constants.REMOTE_LOCATION, null); - eventParams.put(Constants.FILE_NAME, null); - eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHBLOCK_READ_SUBJECT, eventParams)); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.TALUKA, 0); +// try { +// List rchImportFacilitatorTalukas = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.TALUKA); +// File localResponseFile ; +// if (rchImportFacilitatorTalukas.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// talukaFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorTaluka: rchImportFacilitatorTalukas +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorTaluka.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorTaluka.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorTaluka.getEndDate(); +// talukaFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } finally { +// Map eventParams = new HashMap<>(); +// eventParams.put(Constants.STATE_ID_PARAM, stateId); +// eventParams.put(Constants.REMOTE_LOCATION, null); +// eventParams.put(Constants.FILE_NAME, null); +// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHBLOCK_READ_SUBJECT, eventParams)); +// } } private void talukaFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -680,47 +866,48 @@ public void readVillageResponseFromFile(MotechEvent event) throws RchFileManipul LocalDate startDate = (LocalDate) event.getParameters().get(Constants.START_DATE_PARAM); LOGGER.info("RCH village file import entry point"); LOGGER.info("Copying RCH village response file from remote server to local directory."); - try { - List rchImportFacilitatorvillages = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.VILLAGE); - File localResponseFile ; - if (rchImportFacilitatorvillages.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - villageFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorvillage: rchImportFacilitatorvillages - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorvillage.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorvillage.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorvillage.getEndDate(); - villageFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } finally { - Map eventParams = new HashMap<>(); - eventParams.put(Constants.STATE_ID_PARAM, stateId); - eventParams.put(Constants.REMOTE_LOCATION, null); - eventParams.put(Constants.FILE_NAME, null); - eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_VILLAGE_HEALTHSUBFACILITY_READ_SUBJECT, eventParams)); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.VILLAGE, 0); +// try { +// List rchImportFacilitatorvillages = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.VILLAGE); +// File localResponseFile ; +// if (rchImportFacilitatorvillages.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// villageFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorvillage: rchImportFacilitatorvillages +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorvillage.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorvillage.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorvillage.getEndDate(); +// villageFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } finally { +// Map eventParams = new HashMap<>(); +// eventParams.put(Constants.STATE_ID_PARAM, stateId); +// eventParams.put(Constants.REMOTE_LOCATION, null); +// eventParams.put(Constants.FILE_NAME, null); +// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_VILLAGE_HEALTHSUBFACILITY_READ_SUBJECT, eventParams)); +// } } private void villageFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -819,41 +1006,42 @@ public void readMotherResponseFromFile(MotechEvent event) throws RchFileManipula 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."); - try { - List rchImportFacilitatorMothers = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.MOTHER); - File localResponseFile ; - if (rchImportFacilitatorMothers.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - motherFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorMother: rchImportFacilitatorMothers - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorMother.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorMother.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorMother.getEndDate(); - motherFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.MOTHER, 0); +// try { +// List rchImportFacilitatorMothers = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.MOTHER); +// File localResponseFile ; +// if (rchImportFacilitatorMothers.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// motherFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorMother: rchImportFacilitatorMothers +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorMother.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorMother.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorMother.getEndDate(); +// motherFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } } private void motherFileProcess(String result, Long stateId, String stateName, Long stateCode, LocalDate startReferenceDate, LocalDate endReferenceDate) { @@ -927,18 +1115,19 @@ public boolean getChildrenData(LocalDate from, LocalDate to, URL endpoint, Long File responseFile = generateResponseFile(result, RchUserType.CHILD, stateId); if (responseFile != null) { LOGGER.info("RCH children response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH children response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.CHILD, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR, e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file error"); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.CHILD, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH children response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.CHILD, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR, e); +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file error"); +// } } else { LOGGER.error("Error writing response to file."); @@ -976,41 +1165,42 @@ public void readChildResponseFromFile(MotechEvent event) throws RchFileManipulat 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."); - try { - List rchImportFacilitatorChildren = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.CHILD); - File localResponseFile ; - if (rchImportFacilitatorChildren.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - childFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorChild: rchImportFacilitatorChildren - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorChild.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorChild.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorChild.getEndDate(); - childFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.CHILD, 0); +// try { +// List rchImportFacilitatorChildren = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.CHILD); +// File localResponseFile ; +// if (rchImportFacilitatorChildren.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// childFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorChild: rchImportFacilitatorChildren +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorChild.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorChild.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorChild.getEndDate(); +// childFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } } private void childFileProcess(String result, Long stateId, String stateName, Long stateCode, LocalDate startReferenceDate, LocalDate endReferenceDate) { @@ -1084,18 +1274,19 @@ public boolean getAnmAshaData(LocalDate from, LocalDate to, URL endpoint, Long s File responseFile = generateResponseFile(result, RchUserType.ASHA, stateId); if (responseFile != null) { LOGGER.info("RCH asha response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH asha response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.ASHA, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR,e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file error",e); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.ASHA, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH asha response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.ASHA, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR,e); +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file error",e); +// } } else { LOGGER.error("Error writing response to file."); } @@ -1132,42 +1323,43 @@ public void readAshaResponseFromFile(MotechEvent event) throws RchFileManipulati 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."); - try { - List rchImportFacilitatorAshas = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.ASHA); - File localResponseFile ; - if (rchImportFacilitatorAshas.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - ashaFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorAsha: rchImportFacilitatorAshas - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorAsha.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorAsha.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorAsha.getEndDate(); - ashaFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.ASHA, 0); +// try { +// List rchImportFacilitatorAshas = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.ASHA); +// File localResponseFile ; +// if (rchImportFacilitatorAshas.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// ashaFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorAsha: rchImportFacilitatorAshas +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorAsha.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorAsha.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorAsha.getEndDate(); +// ashaFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } } private void ashaFileProcess(String result, Long stateId, String stateName, Long stateCode, LocalDate startReferenceDate, LocalDate endReferenceDate) { @@ -1241,19 +1433,20 @@ public boolean getHealthBlockData(LocalDate from, LocalDate to, URL endpoint, Lo File responseFile = generateResponseFile(result, RchUserType.HEALTHBLOCK, stateId); if (responseFile != null) { LOGGER.info("RCH healthblock response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH healthblock response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.HEALTHBLOCK, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR, e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file name", e); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.HEALTHBLOCK, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH healthblock response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.HEALTHBLOCK, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR, e); +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file name", e); +// } } else { LOGGER.error("Error writing response to file."); } @@ -1275,47 +1468,48 @@ public void readHealthBlockResponseFromFile(MotechEvent event) throws RchFileMan LocalDate startDate = (LocalDate) event.getParameters().get(Constants.START_DATE_PARAM); LOGGER.info("RCH Healthblock file import entry point"); LOGGER.info("Copying RCH Healthblock response file from remote server to local directory."); - try { - List rchImportFacilitatorHealthblocks = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.HEALTHBLOCK); - File localResponseFile ; - if (rchImportFacilitatorHealthblocks.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - healthblockFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorHealthblock: rchImportFacilitatorHealthblocks - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorHealthblock.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorHealthblock.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorHealthblock.getEndDate(); - healthblockFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } finally { - Map eventParams = new HashMap<>(); - eventParams.put(Constants.STATE_ID_PARAM, stateId); - eventParams.put(Constants.REMOTE_LOCATION, null); - eventParams.put(Constants.FILE_NAME, null); - eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_TALUKA_HEALTHBLOCK_READ_SUBJECT, eventParams)); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.HEALTHBLOCK, 0); +// try { +// List rchImportFacilitatorHealthblocks = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.HEALTHBLOCK); +// File localResponseFile ; +// if (rchImportFacilitatorHealthblocks.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// healthblockFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorHealthblock: rchImportFacilitatorHealthblocks +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorHealthblock.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorHealthblock.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorHealthblock.getEndDate(); +// healthblockFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } finally { +// Map eventParams = new HashMap<>(); +// eventParams.put(Constants.STATE_ID_PARAM, stateId); +// eventParams.put(Constants.REMOTE_LOCATION, null); +// eventParams.put(Constants.FILE_NAME, null); +// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_TALUKA_HEALTHBLOCK_READ_SUBJECT, eventParams)); +// } } private void healthblockFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -1400,19 +1594,20 @@ public boolean getTalukaHealthBlockData(LocalDate from, LocalDate to, URL endpoi File responseFile = generateResponseFile(result, RchUserType.TALUKAHEALTHBLOCK, stateId); if (responseFile != null) { LOGGER.info("RCH taluka-healthblock response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH taluka-healthBlock response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.TALUKAHEALTHBLOCK, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR, e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file name", e); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.TALUKAHEALTHBLOCK, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH taluka-healthBlock response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.TALUKAHEALTHBLOCK, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR, e); +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file name", e); +// } } else { LOGGER.error("Error writing response to file."); } @@ -1434,47 +1629,48 @@ public void readTalukaHealthBlockResponseFromFile(MotechEvent event) throws RchF LocalDate startDate = (LocalDate) event.getParameters().get(Constants.START_DATE_PARAM); LOGGER.info("RCH TalukaHealthblock file import entry point"); LOGGER.info("Copying RCH TalukaHealthblock response file from remote server to local directory."); - try { - List rchImportFacilitatorTalukaHealthblocks = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.TALUKAHEALTHBLOCK); - File localResponseFile ; - if (rchImportFacilitatorTalukaHealthblocks.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - tHFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorTalukaHealthblock: rchImportFacilitatorTalukaHealthblocks - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorTalukaHealthblock.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorTalukaHealthblock.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorTalukaHealthblock.getEndDate(); - tHFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } finally { - Map eventParams = new HashMap<>(); - eventParams.put(Constants.STATE_ID_PARAM, stateId); - eventParams.put(Constants.REMOTE_LOCATION, null); - eventParams.put(Constants.FILE_NAME, null); - eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHFACILITY_READ_SUBJECT, eventParams)); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.TALUKAHEALTHBLOCK, 0); +// try { +// List rchImportFacilitatorTalukaHealthblocks = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.TALUKAHEALTHBLOCK); +// File localResponseFile ; +// if (rchImportFacilitatorTalukaHealthblocks.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// tHFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorTalukaHealthblock: rchImportFacilitatorTalukaHealthblocks +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorTalukaHealthblock.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorTalukaHealthblock.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorTalukaHealthblock.getEndDate(); +// tHFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } finally { +// Map eventParams = new HashMap<>(); +// eventParams.put(Constants.STATE_ID_PARAM, stateId); +// eventParams.put(Constants.REMOTE_LOCATION, null); +// eventParams.put(Constants.FILE_NAME, null); +// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHFACILITY_READ_SUBJECT, eventParams)); +// } } private void tHFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -1560,19 +1756,20 @@ public boolean getHealthFacilityData(LocalDate from, LocalDate to, URL endpoint, File responseFile = generateResponseFile(result, RchUserType.HEALTHFACILITY, stateId); if (responseFile != null) { LOGGER.info("RCH healthfacility response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH healthfacility response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.HEALTHFACILITY, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR, e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file name", e); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.HEALTHFACILITY, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH healthfacility response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.HEALTHFACILITY, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR, e); +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file name", e); +// } } else { LOGGER.error("Error writing response to file."); } @@ -1598,19 +1795,20 @@ public boolean getHealthSubFacilityData(LocalDate from, LocalDate to, URL endpoi File responseFile = generateResponseFile(result, RchUserType.HEALTHSUBFACILITY, stateId); if (responseFile != null) { LOGGER.info("RCH healthsubfacility response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH healthsubfacility response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.HEALTHSUBFACILITY, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR, e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file name", e); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.HEALTHSUBFACILITY, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH healthsubfacility response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.HEALTHSUBFACILITY, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR, e); +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file name", e); +// } } else { LOGGER.error("Error writing response to file."); } @@ -1636,19 +1834,20 @@ public boolean getVillageHealthSubFacilityData(LocalDate from, LocalDate to, URL File responseFile = generateResponseFile(result, RchUserType.VILLAGEHEALTHSUBFACILITY, stateId); if (responseFile != null) { LOGGER.info("RCH villagehealthfacility response successfully written to file. Copying to remote directory."); - try { - scpResponseToRemote(responseFile.getName()); - LOGGER.info("RCH villagehealthfacility response file successfully copied to remote server"); - - RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.VILLAGEHEALTHSUBFACILITY, LocalDate.now()); - rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); - status = true; - - } catch (ExecutionException e) { - LOGGER.error(SCP_ERROR, e); - } catch (RchFileManipulationException e) { - LOGGER.error("invalid file name", e); - } + status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.VILLAGEHEALTHSUBFACILITY, 0); +// try { +// scpResponseToRemote(responseFile.getName()); +// LOGGER.info("RCH villagehealthfacility response file successfully copied to remote server"); +// +// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.VILLAGEHEALTHSUBFACILITY, LocalDate.now()); +// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); +// status = true; +// +// } catch (ExecutionException e) { +// LOGGER.error(SCP_ERROR, e); +// } catch (RchFileManipulationException e) { +// LOGGER.error("invalid file name", e); +// } } else { LOGGER.error("Error writing response to file."); } @@ -1670,47 +1869,48 @@ public void readHealthFacilityResponseFromFile(MotechEvent event) throws RchFile LocalDate startDate = (LocalDate) event.getParameters().get(Constants.START_DATE_PARAM); LOGGER.info("RCH Healthfacility file import entry point"); LOGGER.info("Copying RCH Healthfacility response file from remote server to local directory."); - try { - List rchImportFacilitatorHealthfacilities = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.HEALTHFACILITY); - File localResponseFile ; - if (rchImportFacilitatorHealthfacilities.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - healthFacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorHealthfacility: rchImportFacilitatorHealthfacilities - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorHealthfacility.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorHealthfacility.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorHealthfacility.getEndDate(); - healthFacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } finally { - Map eventParams = new HashMap<>(); - eventParams.put(Constants.STATE_ID_PARAM, stateId); - eventParams.put(Constants.REMOTE_LOCATION, null); - eventParams.put(Constants.FILE_NAME, null); - eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHSUBFACILITY_READ_SUBJECT, eventParams)); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.HEALTHFACILITY, 0); +// try { +// List rchImportFacilitatorHealthfacilities = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.HEALTHFACILITY); +// File localResponseFile ; +// if (rchImportFacilitatorHealthfacilities.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// healthFacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorHealthfacility: rchImportFacilitatorHealthfacilities +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorHealthfacility.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorHealthfacility.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorHealthfacility.getEndDate(); +// healthFacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } finally { +// Map eventParams = new HashMap<>(); +// eventParams.put(Constants.STATE_ID_PARAM, stateId); +// eventParams.put(Constants.REMOTE_LOCATION, null); +// eventParams.put(Constants.FILE_NAME, null); +// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHSUBFACILITY_READ_SUBJECT, eventParams)); +// } } private void healthFacilityFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -1792,47 +1992,48 @@ public void readHealthSubFacilityResponseFromFile(MotechEvent event) throws RchF LocalDate startDate = (LocalDate) event.getParameters().get(Constants.START_DATE_PARAM); LOGGER.info("RCH Healthsubfacility file import entry point"); LOGGER.info("Copying RCH Healthsubfacility response file from remote server to local directory."); - try { - List rchImportFacilitatorHealthsubfacilities = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.HEALTHSUBFACILITY); - File localResponseFile ; - if (rchImportFacilitatorHealthsubfacilities.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - healthsubfacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorHealthsubfacility: rchImportFacilitatorHealthsubfacilities - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorHealthsubfacility.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorHealthsubfacility.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorHealthsubfacility.getEndDate(); - healthsubfacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } finally { - Map eventParams = new HashMap<>(); - eventParams.put(Constants.STATE_ID_PARAM, stateId); - eventParams.put(Constants.REMOTE_LOCATION, null); - eventParams.put(Constants.FILE_NAME, null); - eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_VILLAGE_READ_SUBJECT, eventParams)); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.HEALTHSUBFACILITY, 0); +// try { +// List rchImportFacilitatorHealthsubfacilities = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.HEALTHSUBFACILITY); +// File localResponseFile ; +// if (rchImportFacilitatorHealthsubfacilities.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// healthsubfacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorHealthsubfacility: rchImportFacilitatorHealthsubfacilities +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorHealthsubfacility.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorHealthsubfacility.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorHealthsubfacility.getEndDate(); +// healthsubfacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } finally { +// Map eventParams = new HashMap<>(); +// eventParams.put(Constants.STATE_ID_PARAM, stateId); +// eventParams.put(Constants.REMOTE_LOCATION, null); +// eventParams.put(Constants.FILE_NAME, null); +// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_VILLAGE_READ_SUBJECT, eventParams)); +// } } private void healthsubfacilityFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -1907,41 +2108,42 @@ public void readVillageHealthSubFacilityResponseFromFile(MotechEvent event) thro LocalDate startDate = (LocalDate) event.getParameters().get(Constants.START_DATE_PARAM); LOGGER.info("RCH villagehealthsubfacility file import entry point"); LOGGER.info("Copying RCH villagehealthsubfacility response file from remote server to local directory."); - try { - List rchImportFacilitatorvillagehealthsubfacilities = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.VILLAGEHEALTHSUBFACILITY); - File localResponseFile ; - if (rchImportFacilitatorvillagehealthsubfacilities.isEmpty()) { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - - LocalDate startReferenceDate = startDate; - LocalDate endReferenceDate = endDate; - vhsfFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } else { - for (RchImportFacilitator rchImportFacilitatorvillagehealthsubfacility: rchImportFacilitatorvillagehealthsubfacilities - ) { - if (fileName == null) { - localResponseFile = scpResponseToLocal(rchImportFacilitatorvillagehealthsubfacility.getFileName(), remoteLocation); - } else { - localResponseFile = scpResponseToLocal(fileName, remoteLocation); - } - if (localResponseFile != null) { - String result = readResponsesFromXml(localResponseFile); - State importState = stateDataService.findByCode(stateId); - String stateName = importState.getName(); - Long stateCode = importState.getCode(); - LocalDate startReferenceDate = rchImportFacilitatorvillagehealthsubfacility.getStartDate(); - LocalDate endReferenceDate = rchImportFacilitatorvillagehealthsubfacility.getEndDate(); - vhsfFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); - } - } - } - } catch (ExecutionException e) { - LOGGER.error("Failed to copy response file from remote server to local directory."); - } + retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.VILLAGEHEALTHSUBFACILITY, 0); +// try { +// List rchImportFacilitatorvillagehealthsubfacilities = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.VILLAGEHEALTHSUBFACILITY); +// File localResponseFile ; +// if (rchImportFacilitatorvillagehealthsubfacilities.isEmpty()) { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// +// LocalDate startReferenceDate = startDate; +// LocalDate endReferenceDate = endDate; +// vhsfFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } else { +// for (RchImportFacilitator rchImportFacilitatorvillagehealthsubfacility: rchImportFacilitatorvillagehealthsubfacilities +// ) { +// if (fileName == null) { +// localResponseFile = scpResponseToLocal(rchImportFacilitatorvillagehealthsubfacility.getFileName(), remoteLocation); +// } else { +// localResponseFile = scpResponseToLocal(fileName, remoteLocation); +// } +// if (localResponseFile != null) { +// String result = readResponsesFromXml(localResponseFile); +// State importState = stateDataService.findByCode(stateId); +// String stateName = importState.getName(); +// Long stateCode = importState.getCode(); +// LocalDate startReferenceDate = rchImportFacilitatorvillagehealthsubfacility.getStartDate(); +// LocalDate endReferenceDate = rchImportFacilitatorvillagehealthsubfacility.getEndDate(); +// vhsfFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); +// } +// } +// } +// } catch (ExecutionException e) { +// LOGGER.error("Failed to copy response file from remote server to local directory."); +// } } diff --git a/testing/src/test/java/org/motechproject/nms/testing/it/rch/RchWebServiceFacadeBundleIT.java b/testing/src/test/java/org/motechproject/nms/testing/it/rch/RchWebServiceFacadeBundleIT.java index 23c225ae3..9be7f3504 100644 --- a/testing/src/test/java/org/motechproject/nms/testing/it/rch/RchWebServiceFacadeBundleIT.java +++ b/testing/src/test/java/org/motechproject/nms/testing/it/rch/RchWebServiceFacadeBundleIT.java @@ -336,4 +336,36 @@ public void testAshaRCHImport() throws IOException{ assertEquals(2, frontLineWorkers.size()); } + @Test + public void testAshaRandomPathCheck() throws IOException { + String response = RchImportTestHelper.getAnmAshaResponseData(); + String remoteLocation = "/home/beehyv/nms-nmsbugfix/testing/src/test/resources/rch"; + String fileName = "rch-anm-asha-data.xml"; //done by vishnu + SimpleHttpServer simpleServer = SimpleHttpServer.getInstance(); + String url = simpleServer.start("ashendpoint", 200, response); + URL endpoint = new URL(url); + LocalDate lastDateToCheck = DateUtil.today().minusDays(1); + LocalDate yesterday = DateUtil.today().minusDays(1); + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + Thread.currentThread().setContextClassLoader(rchWsImportService.getClass().getClassLoader()); + Map params = new HashMap<>(); + params.put(Constants.START_DATE_PARAM, lastDateToCheck); + params.put(Constants.END_DATE_PARAM, yesterday); + params.put(Constants.STATE_ID_PARAM, 21L); + params.put(Constants.ENDPOINT_PARAM, endpoint); + params.put(Constants.REMOTE_LOCATION, remoteLocation); + params.put(Constants.FILE_NAME, fileName); + MotechEvent event1 = new MotechEvent(org.motechproject.nms.rch.utils.Constants.RCH_ASHA_READ, params); + try { + rchWebServiceFacade.readAshaResponseFromFile(event1); + } catch (Exception e) { + e.printStackTrace(); + } + Thread.currentThread().setContextClassLoader(cl); + List flwImportRejectionList = flwImportRejectionDataService.retrieveAll(); + assertEquals(1, flwImportRejectionList.size()); + List frontLineWorkers = frontLineWorkerDataService.retrieveAll(); + assertEquals(2, frontLineWorkers.size()); + } + } From 60478e720f15a9b62a4c93146d7bb477bc83259a Mon Sep 17 00:00:00 2001 From: VishnuVimal Date: Tue, 22 Jan 2019 15:05:06 +0530 Subject: [PATCH 2/5] scp retry bug fix --- .../nms/rch/service/impl/RchWebServiceFacadeImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java b/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java index a9634d896..3af0bba96 100644 --- a/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java +++ b/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java @@ -270,9 +270,9 @@ public void run() { try { Thread.sleep(120000L); trialCount++; - LOGGER.error("Error in SCP for %d for type %s", trialCount, userType); + LOGGER.error("Error in SCP for {} for type {}", trialCount, userType); if (trialCount <= 3) { - if (remoteLocation == null) { + if ("empty".equals(remoteLocation)) { retryScpAndAudit(name, from, to, stateId, userType, trialCount); } else { retryScpFromRemoteToLocal(name, remoteLocation, from, to, stateId, userType, trialCount); @@ -295,7 +295,7 @@ private boolean retryScpAndAudit(String name, LocalDate from, LocalDate to, Long } catch (ExecutionException e) { if(trialCount < 3) { - Runnable scpRunnable = new ScpRunnable(name, null, from, to, stateId, userType, trialCount); + Runnable scpRunnable = new ScpRunnable(name, "empty", from, to, stateId, userType, trialCount); scpRunnable.run(); } else { LOGGER.error(SCP_ERROR_REMOTE, e); From 5988ade74d9de162a2ca3bd2fdc126f10cabbe3a Mon Sep 17 00:00:00 2001 From: VishnuVimal Date: Tue, 22 Jan 2019 15:47:02 +0530 Subject: [PATCH 3/5] adding stateId to logs --- .../nms/rch/service/impl/RchWebServiceFacadeImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java b/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java index 3af0bba96..c64ee5c2f 100644 --- a/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java +++ b/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java @@ -270,7 +270,7 @@ public void run() { try { Thread.sleep(120000L); trialCount++; - LOGGER.error("Error in SCP for {} for type {}", trialCount, userType); + LOGGER.error("Error in SCP for {} time for state {} for type {}", trialCount, stateId, userType); if (trialCount <= 3) { if ("empty".equals(remoteLocation)) { retryScpAndAudit(name, from, to, stateId, userType, trialCount); From f8a940e5e60c67570f815957f731bd04789f9706 Mon Sep 17 00:00:00 2001 From: VishnuVimal Date: Tue, 22 Jan 2019 15:47:56 +0530 Subject: [PATCH 4/5] removing test case --- .../it/rch/RchWebServiceFacadeBundleIT.java | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/testing/src/test/java/org/motechproject/nms/testing/it/rch/RchWebServiceFacadeBundleIT.java b/testing/src/test/java/org/motechproject/nms/testing/it/rch/RchWebServiceFacadeBundleIT.java index 9be7f3504..23c225ae3 100644 --- a/testing/src/test/java/org/motechproject/nms/testing/it/rch/RchWebServiceFacadeBundleIT.java +++ b/testing/src/test/java/org/motechproject/nms/testing/it/rch/RchWebServiceFacadeBundleIT.java @@ -336,36 +336,4 @@ public void testAshaRCHImport() throws IOException{ assertEquals(2, frontLineWorkers.size()); } - @Test - public void testAshaRandomPathCheck() throws IOException { - String response = RchImportTestHelper.getAnmAshaResponseData(); - String remoteLocation = "/home/beehyv/nms-nmsbugfix/testing/src/test/resources/rch"; - String fileName = "rch-anm-asha-data.xml"; //done by vishnu - SimpleHttpServer simpleServer = SimpleHttpServer.getInstance(); - String url = simpleServer.start("ashendpoint", 200, response); - URL endpoint = new URL(url); - LocalDate lastDateToCheck = DateUtil.today().minusDays(1); - LocalDate yesterday = DateUtil.today().minusDays(1); - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader(rchWsImportService.getClass().getClassLoader()); - Map params = new HashMap<>(); - params.put(Constants.START_DATE_PARAM, lastDateToCheck); - params.put(Constants.END_DATE_PARAM, yesterday); - params.put(Constants.STATE_ID_PARAM, 21L); - params.put(Constants.ENDPOINT_PARAM, endpoint); - params.put(Constants.REMOTE_LOCATION, remoteLocation); - params.put(Constants.FILE_NAME, fileName); - MotechEvent event1 = new MotechEvent(org.motechproject.nms.rch.utils.Constants.RCH_ASHA_READ, params); - try { - rchWebServiceFacade.readAshaResponseFromFile(event1); - } catch (Exception e) { - e.printStackTrace(); - } - Thread.currentThread().setContextClassLoader(cl); - List flwImportRejectionList = flwImportRejectionDataService.retrieveAll(); - assertEquals(1, flwImportRejectionList.size()); - List frontLineWorkers = frontLineWorkerDataService.retrieveAll(); - assertEquals(2, frontLineWorkers.size()); - } - } From cc38821af767dcbe7e321a0f764cc69ccd5e0562 Mon Sep 17 00:00:00 2001 From: VishnuVimal Date: Tue, 22 Jan 2019 16:04:22 +0530 Subject: [PATCH 5/5] removing commented code --- .../service/impl/RchWebServiceFacadeImpl.java | 579 +----------------- 1 file changed, 3 insertions(+), 576 deletions(-) diff --git a/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java b/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java index c64ee5c2f..b277f7730 100644 --- a/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java +++ b/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java @@ -186,6 +186,7 @@ public class RchWebServiceFacadeImpl implements RchWebServiceFacade { private static final String FILES_MISSING_ON_A = "No files saved a due to "; private static final String FILES_MISSING_ON_B = "No files saved b due to "; private static final String FILES_MISSING_ON_C = "No files saved c due to "; + private static final String SCP_LOCAL_TO_REMOTE_REMOTELOCATION = "empty"; @Autowired @@ -272,7 +273,7 @@ public void run() { trialCount++; LOGGER.error("Error in SCP for {} time for state {} for type {}", trialCount, stateId, userType); if (trialCount <= 3) { - if ("empty".equals(remoteLocation)) { + if (SCP_LOCAL_TO_REMOTE_REMOTELOCATION.equals(remoteLocation)) { retryScpAndAudit(name, from, to, stateId, userType, trialCount); } else { retryScpFromRemoteToLocal(name, remoteLocation, from, to, stateId, userType, trialCount); @@ -295,7 +296,7 @@ private boolean retryScpAndAudit(String name, LocalDate from, LocalDate to, Long } catch (ExecutionException e) { if(trialCount < 3) { - Runnable scpRunnable = new ScpRunnable(name, "empty", from, to, stateId, userType, trialCount); + Runnable scpRunnable = new ScpRunnable(name, SCP_LOCAL_TO_REMOTE_REMOTELOCATION, from, to, stateId, userType, trialCount); scpRunnable.run(); } else { LOGGER.error(SCP_ERROR_REMOTE, e); @@ -443,22 +444,6 @@ public boolean getMothersData(LocalDate from, LocalDate to, URL endpoint, Long s if (responseFile != null) { LOGGER.info("RCH mother response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.MOTHER, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH mother response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.MOTHER, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR, e); -// -// -// -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file name", e); -// } } else { LOGGER.error("Error writing response to file."); } @@ -485,19 +470,6 @@ public boolean getDistrictData(LocalDate from, LocalDate to, URL endpoint, Long if (responseFile != null) { LOGGER.info("RCH district response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.DISTRICT, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH district response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.DISTRICT, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR, e); -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file name", e); -// } } else { LOGGER.error("Error writing response to file."); } @@ -524,19 +496,6 @@ public boolean getTalukasData(LocalDate from, LocalDate to, URL endpoint, Long s if (responseFile != null) { LOGGER.info("RCH taluka response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.TALUKA, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH taluka response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.TALUKA, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR, e); -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file name", e); -// } } else { LOGGER.error("Error writing response to file."); } @@ -563,19 +522,6 @@ public boolean getVillagesData(LocalDate from, LocalDate to, URL endpoint, Long if (responseFile != null) { LOGGER.info("RCH Village response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.VILLAGE, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH Village response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.VILLAGE, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR, e); -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file name", e); -// } } else { LOGGER.error("Error writing response to file."); } @@ -613,47 +559,6 @@ public void readDistrictResponseFromFile(MotechEvent event) throws RchFileManipu LOGGER.info("RCH District file import entry point"); LOGGER.info("Copying RCH District response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.DISTRICT, 0); -// try { -// List rchImportFacilitatorDistricts = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.DISTRICT); -// File localResponseFile ; -// if (rchImportFacilitatorDistricts.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// districtFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorDistrict: rchImportFacilitatorDistricts -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorDistrict.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorDistrict.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorDistrict.getEndDate(); -// districtFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } finally { -// Map eventParams = new HashMap<>(); -// eventParams.put(Constants.STATE_ID_PARAM, stateId); -// eventParams.put(Constants.REMOTE_LOCATION, null); -// eventParams.put(Constants.FILE_NAME, null); -// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_TALUKA_READ_SUBJECT, eventParams)); -// } } private void districtFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -741,47 +646,6 @@ public void readTalukaResponseFromFile(MotechEvent event) throws RchFileManipula LOGGER.info("RCH Taluka file import entry point"); LOGGER.info("Copying RCH Taluka response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.TALUKA, 0); -// try { -// List rchImportFacilitatorTalukas = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.TALUKA); -// File localResponseFile ; -// if (rchImportFacilitatorTalukas.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// talukaFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorTaluka: rchImportFacilitatorTalukas -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorTaluka.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorTaluka.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorTaluka.getEndDate(); -// talukaFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } finally { -// Map eventParams = new HashMap<>(); -// eventParams.put(Constants.STATE_ID_PARAM, stateId); -// eventParams.put(Constants.REMOTE_LOCATION, null); -// eventParams.put(Constants.FILE_NAME, null); -// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHBLOCK_READ_SUBJECT, eventParams)); -// } } private void talukaFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -867,47 +731,6 @@ public void readVillageResponseFromFile(MotechEvent event) throws RchFileManipul LOGGER.info("RCH village file import entry point"); LOGGER.info("Copying RCH village response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.VILLAGE, 0); -// try { -// List rchImportFacilitatorvillages = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.VILLAGE); -// File localResponseFile ; -// if (rchImportFacilitatorvillages.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// villageFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorvillage: rchImportFacilitatorvillages -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorvillage.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorvillage.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorvillage.getEndDate(); -// villageFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } finally { -// Map eventParams = new HashMap<>(); -// eventParams.put(Constants.STATE_ID_PARAM, stateId); -// eventParams.put(Constants.REMOTE_LOCATION, null); -// eventParams.put(Constants.FILE_NAME, null); -// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_VILLAGE_HEALTHSUBFACILITY_READ_SUBJECT, eventParams)); -// } } private void villageFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -1007,41 +830,6 @@ public void readMotherResponseFromFile(MotechEvent event) throws RchFileManipula LOGGER.info("RCH Asha file import entry point"); LOGGER.info("Copying RCH Asha response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.MOTHER, 0); -// try { -// List rchImportFacilitatorMothers = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.MOTHER); -// File localResponseFile ; -// if (rchImportFacilitatorMothers.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// motherFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorMother: rchImportFacilitatorMothers -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorMother.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorMother.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorMother.getEndDate(); -// motherFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } } private void motherFileProcess(String result, Long stateId, String stateName, Long stateCode, LocalDate startReferenceDate, LocalDate endReferenceDate) { @@ -1116,19 +904,6 @@ public boolean getChildrenData(LocalDate from, LocalDate to, URL endpoint, Long if (responseFile != null) { LOGGER.info("RCH children response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.CHILD, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH children response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.CHILD, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR, e); -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file error"); -// } - } else { LOGGER.error("Error writing response to file."); } @@ -1166,41 +941,6 @@ public void readChildResponseFromFile(MotechEvent event) throws RchFileManipulat LOGGER.info("RCH Asha file import entry point"); LOGGER.info("Copying RCH Asha response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.CHILD, 0); -// try { -// List rchImportFacilitatorChildren = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.CHILD); -// File localResponseFile ; -// if (rchImportFacilitatorChildren.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// childFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorChild: rchImportFacilitatorChildren -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorChild.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorChild.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorChild.getEndDate(); -// childFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } } private void childFileProcess(String result, Long stateId, String stateName, Long stateCode, LocalDate startReferenceDate, LocalDate endReferenceDate) { @@ -1275,18 +1015,6 @@ public boolean getAnmAshaData(LocalDate from, LocalDate to, URL endpoint, Long s if (responseFile != null) { LOGGER.info("RCH asha response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.ASHA, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH asha response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.ASHA, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR,e); -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file error",e); -// } } else { LOGGER.error("Error writing response to file."); } @@ -1324,42 +1052,6 @@ public void readAshaResponseFromFile(MotechEvent event) throws RchFileManipulati LOGGER.info("RCH Asha file import entry point"); LOGGER.info("Copying RCH Asha response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.ASHA, 0); -// try { -// List rchImportFacilitatorAshas = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.ASHA); -// File localResponseFile ; -// if (rchImportFacilitatorAshas.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// ashaFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorAsha: rchImportFacilitatorAshas -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorAsha.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorAsha.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorAsha.getEndDate(); -// ashaFileProcess(result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } } private void ashaFileProcess(String result, Long stateId, String stateName, Long stateCode, LocalDate startReferenceDate, LocalDate endReferenceDate) { @@ -1434,19 +1126,6 @@ public boolean getHealthBlockData(LocalDate from, LocalDate to, URL endpoint, Lo if (responseFile != null) { LOGGER.info("RCH healthblock response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.HEALTHBLOCK, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH healthblock response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.HEALTHBLOCK, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR, e); -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file name", e); -// } } else { LOGGER.error("Error writing response to file."); } @@ -1469,47 +1148,6 @@ public void readHealthBlockResponseFromFile(MotechEvent event) throws RchFileMan LOGGER.info("RCH Healthblock file import entry point"); LOGGER.info("Copying RCH Healthblock response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.HEALTHBLOCK, 0); -// try { -// List rchImportFacilitatorHealthblocks = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.HEALTHBLOCK); -// File localResponseFile ; -// if (rchImportFacilitatorHealthblocks.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// healthblockFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorHealthblock: rchImportFacilitatorHealthblocks -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorHealthblock.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorHealthblock.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorHealthblock.getEndDate(); -// healthblockFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } finally { -// Map eventParams = new HashMap<>(); -// eventParams.put(Constants.STATE_ID_PARAM, stateId); -// eventParams.put(Constants.REMOTE_LOCATION, null); -// eventParams.put(Constants.FILE_NAME, null); -// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_TALUKA_HEALTHBLOCK_READ_SUBJECT, eventParams)); -// } } private void healthblockFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -1595,19 +1233,6 @@ public boolean getTalukaHealthBlockData(LocalDate from, LocalDate to, URL endpoi if (responseFile != null) { LOGGER.info("RCH taluka-healthblock response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.TALUKAHEALTHBLOCK, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH taluka-healthBlock response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.TALUKAHEALTHBLOCK, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR, e); -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file name", e); -// } } else { LOGGER.error("Error writing response to file."); } @@ -1630,47 +1255,6 @@ public void readTalukaHealthBlockResponseFromFile(MotechEvent event) throws RchF LOGGER.info("RCH TalukaHealthblock file import entry point"); LOGGER.info("Copying RCH TalukaHealthblock response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.TALUKAHEALTHBLOCK, 0); -// try { -// List rchImportFacilitatorTalukaHealthblocks = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.TALUKAHEALTHBLOCK); -// File localResponseFile ; -// if (rchImportFacilitatorTalukaHealthblocks.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// tHFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorTalukaHealthblock: rchImportFacilitatorTalukaHealthblocks -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorTalukaHealthblock.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorTalukaHealthblock.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorTalukaHealthblock.getEndDate(); -// tHFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } finally { -// Map eventParams = new HashMap<>(); -// eventParams.put(Constants.STATE_ID_PARAM, stateId); -// eventParams.put(Constants.REMOTE_LOCATION, null); -// eventParams.put(Constants.FILE_NAME, null); -// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHFACILITY_READ_SUBJECT, eventParams)); -// } } private void tHFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -1757,19 +1341,6 @@ public boolean getHealthFacilityData(LocalDate from, LocalDate to, URL endpoint, if (responseFile != null) { LOGGER.info("RCH healthfacility response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.HEALTHFACILITY, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH healthfacility response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.HEALTHFACILITY, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR, e); -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file name", e); -// } } else { LOGGER.error("Error writing response to file."); } @@ -1796,19 +1367,6 @@ public boolean getHealthSubFacilityData(LocalDate from, LocalDate to, URL endpoi if (responseFile != null) { LOGGER.info("RCH healthsubfacility response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.HEALTHSUBFACILITY, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH healthsubfacility response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.HEALTHSUBFACILITY, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR, e); -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file name", e); -// } } else { LOGGER.error("Error writing response to file."); } @@ -1835,19 +1393,6 @@ public boolean getVillageHealthSubFacilityData(LocalDate from, LocalDate to, URL if (responseFile != null) { LOGGER.info("RCH villagehealthfacility response successfully written to file. Copying to remote directory."); status = retryScpAndAudit(responseFile.getName(), from, to, stateId, RchUserType.VILLAGEHEALTHSUBFACILITY, 0); -// try { -// scpResponseToRemote(responseFile.getName()); -// LOGGER.info("RCH villagehealthfacility response file successfully copied to remote server"); -// -// RchImportFacilitator rchImportFacilitator = new RchImportFacilitator(responseFile.getName(), from, to, stateId, RchUserType.VILLAGEHEALTHSUBFACILITY, LocalDate.now()); -// rchImportFacilitatorService.createImportFileAudit(rchImportFacilitator); -// status = true; -// -// } catch (ExecutionException e) { -// LOGGER.error(SCP_ERROR, e); -// } catch (RchFileManipulationException e) { -// LOGGER.error("invalid file name", e); -// } } else { LOGGER.error("Error writing response to file."); } @@ -1870,47 +1415,6 @@ public void readHealthFacilityResponseFromFile(MotechEvent event) throws RchFile LOGGER.info("RCH Healthfacility file import entry point"); LOGGER.info("Copying RCH Healthfacility response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.HEALTHFACILITY, 0); -// try { -// List rchImportFacilitatorHealthfacilities = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.HEALTHFACILITY); -// File localResponseFile ; -// if (rchImportFacilitatorHealthfacilities.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// healthFacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorHealthfacility: rchImportFacilitatorHealthfacilities -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorHealthfacility.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorHealthfacility.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorHealthfacility.getEndDate(); -// healthFacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } finally { -// Map eventParams = new HashMap<>(); -// eventParams.put(Constants.STATE_ID_PARAM, stateId); -// eventParams.put(Constants.REMOTE_LOCATION, null); -// eventParams.put(Constants.FILE_NAME, null); -// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_HEALTHSUBFACILITY_READ_SUBJECT, eventParams)); -// } } private void healthFacilityFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -1993,47 +1497,6 @@ public void readHealthSubFacilityResponseFromFile(MotechEvent event) throws RchF LOGGER.info("RCH Healthsubfacility file import entry point"); LOGGER.info("Copying RCH Healthsubfacility response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.HEALTHSUBFACILITY, 0); -// try { -// List rchImportFacilitatorHealthsubfacilities = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.HEALTHSUBFACILITY); -// File localResponseFile ; -// if (rchImportFacilitatorHealthsubfacilities.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// healthsubfacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorHealthsubfacility: rchImportFacilitatorHealthsubfacilities -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorHealthsubfacility.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorHealthsubfacility.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorHealthsubfacility.getEndDate(); -// healthsubfacilityFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } finally { -// Map eventParams = new HashMap<>(); -// eventParams.put(Constants.STATE_ID_PARAM, stateId); -// eventParams.put(Constants.REMOTE_LOCATION, null); -// eventParams.put(Constants.FILE_NAME, null); -// eventRelay.sendEventMessage(new MotechEvent(Constants.RCH_VILLAGE_READ_SUBJECT, eventParams)); -// } } private void healthsubfacilityFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) { @@ -2109,42 +1572,6 @@ public void readVillageHealthSubFacilityResponseFromFile(MotechEvent event) thro LOGGER.info("RCH villagehealthsubfacility file import entry point"); LOGGER.info("Copying RCH villagehealthsubfacility response file from remote server to local directory."); retryScpFromRemoteToLocal(fileName, remoteLocation, endDate, startDate, stateId, RchUserType.VILLAGEHEALTHSUBFACILITY, 0); -// try { -// List rchImportFacilitatorvillagehealthsubfacilities = rchImportFacilitatorService.findByImportDateStateIdAndRchUserType(stateId, LocalDate.now(), RchUserType.VILLAGEHEALTHSUBFACILITY); -// File localResponseFile ; -// if (rchImportFacilitatorvillagehealthsubfacilities.isEmpty()) { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// -// LocalDate startReferenceDate = startDate; -// LocalDate endReferenceDate = endDate; -// vhsfFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } else { -// for (RchImportFacilitator rchImportFacilitatorvillagehealthsubfacility: rchImportFacilitatorvillagehealthsubfacilities -// ) { -// if (fileName == null) { -// localResponseFile = scpResponseToLocal(rchImportFacilitatorvillagehealthsubfacility.getFileName(), remoteLocation); -// } else { -// localResponseFile = scpResponseToLocal(fileName, remoteLocation); -// } -// if (localResponseFile != null) { -// String result = readResponsesFromXml(localResponseFile); -// State importState = stateDataService.findByCode(stateId); -// String stateName = importState.getName(); -// Long stateCode = importState.getCode(); -// LocalDate startReferenceDate = rchImportFacilitatorvillagehealthsubfacility.getStartDate(); -// LocalDate endReferenceDate = rchImportFacilitatorvillagehealthsubfacility.getEndDate(); -// vhsfFileProcess(fileName, result, stateId, stateName, stateCode, startReferenceDate, endReferenceDate); -// } -// } -// } -// } catch (ExecutionException e) { -// LOGGER.error("Failed to copy response file from remote server to local directory."); -// } - } private void vhsfFileProcess(String fileName, String result, Long stateId, String stateName, Long stateCode, LocalDate startDate, LocalDate endDate) {