[CCAP-349] - send app when no response

src/main/java/org/ilgcc/app/data/TransmissionRepository.java

@@ -2,13 +2,22 @@
 
 import formflow.library.data.Submission;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface TransmissionRepository extends JpaRepository<Transmission, UUID> {
-
+ @Query(value =
+ "SELECT s FROM Submission s " +
+ "LEFT JOIN Transmission t ON t.submissionId = s " +
+ "WHERE s.submittedAt IS NOT NULL " +
+ "AND s.flow = 'gcc' " + 
+ "AND t.transmissionId IS NULL " +
+ "ORDER BY s.updatedAt ASC")
+
+ List<Submission> findSubmissionsWithoutTransmission();
+
  List<Transmission> findAllBySubmissionId(Submission submission);
 }

src/main/java/org/ilgcc/app/data/TransmissionRepositoryService.java

@@ -12,25 +12,29 @@
 @Service
 @Transactional
 public class TransmissionRepositoryService {
- 
+
  TransmissionRepository transmissionRepository;
- 
+
  public TransmissionRepositoryService(TransmissionRepository transmissionRepository) {
  this.transmissionRepository = transmissionRepository;
  }
 
  public Transmission save(Transmission transmission) {
  return transmissionRepository.save(transmission);
  }
- 
+
  public Transmission findById(UUID id) {
  return this.transmissionRepository.findById(id).orElse(null);
  }
 
  public List<Transmission> findAllBySubmissionId(Submission submission) {
  return this.transmissionRepository.findAllBySubmissionId(submission);
  }
-
+
+ public List<Submission> findSubmissionsWithoutTransmission(){
+ return this.transmissionRepository.findSubmissionsWithoutTransmission();
+ }
+
  public void updateStatus(Transmission transmission, TransmissionStatus status) {
  transmission.setStatus(status);
  this.transmissionRepository.save(transmission);

src/main/java/org/ilgcc/app/pdf/ProviderApplicationPreparer.java

@@ -0,0 +1,46 @@
+package org.ilgcc.app.pdf;
+
+import static org.ilgcc.app.utils.SubmissionUtilities.formatToStringFromLocalDate;
+
+import formflow.library.data.Submission;
+import formflow.library.pdf.PdfMap;
+import formflow.library.pdf.SingleField;
+import formflow.library.pdf.SubmissionField;
+import formflow.library.pdf.SubmissionFieldPreparer;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import org.ilgcc.app.utils.PreparerUtilities;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+
+@ConditionalOnProperty(name="il-gcc.dts.wait-for-provider-response", havingValue = "true")
+@Component
+public class ProviderApplicationPreparer implements SubmissionFieldPreparer {
+
+ @Override
+ public Map<String, SubmissionField> prepareSubmissionFields(Submission submission, PdfMap pdfMap) {
+ var results = new HashMap<String, SubmissionField>();
+ var inputData = submission.getInputData();
+
+ boolean hasProviderResponse = inputData.containsKey("providerResponseSubmissionId");
+
+ if(!hasProviderResponse){
+ results.put("providerNameCorporate",
+ new SingleField("providerNameCorporate", inputData.getOrDefault("familyIntendedProviderName", "").toString(), null));
+ results.put("providerPhoneNumber",
+ new SingleField("providerPhoneNumber", inputData.getOrDefault("familyIntendedProviderPhoneNumber", "").toString(), null));
+ results.put("providerEmail",
+ new SingleField("providerEmail", inputData.getOrDefault("familyIntendedProviderEmail", "").toString(), null));
+ results.put("providerResponse",
+ new SingleField("providerResponse", "No response from provider", null));
+ }
+
+ return results;
+ }
+}

src/main/java/org/ilgcc/app/submission/actions/CheckClientSubmissionForProvider.java

@@ -1,18 +1,20 @@
 package org.ilgcc.app.submission.actions;
 
-import static java.time.temporal.ChronoUnit.DAYS;
 
 import formflow.library.config.submission.Action;
 import formflow.library.data.Submission;
 import formflow.library.data.SubmissionRepositoryService;
 import jakarta.servlet.http.HttpSession;
 import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.ilgcc.app.utils.ChildCareProvider;
-import org.ilgcc.app.utils.ProviderSubmissionUtilities;
+import static org.ilgcc.app.utils.ProviderSubmissionUtilities.providerApplicationHasExpired;
 import org.ilgcc.app.utils.enums.ProviderSubmissionStatus;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -61,12 +63,12 @@ public void run(Submission submission) {
  if (submittedAtDate == null) {
  log.warn("No submittedAt date found for submission " + submission.getId());
  }
-
- LocalDate todaysDate = LocalDate.now();
- if (submittedAtDate != null && DAYS.between(ProviderSubmissionUtilities.threeBusinessDaysFromSubmittedAtDate(submittedAtDate), todaysDate) > 0) {
+ ZoneId chicagoTimeZone = ZoneId.of("America/Chicago");
+ ZonedDateTime todaysDate = OffsetDateTime.now().atZoneSameInstant(chicagoTimeZone);
+ if (providerApplicationHasExpired(clientSubmissionInfo, todaysDate)) {
  httpSession.setAttribute(SESSION_KEY_CLIENT_SUBMISSION_STATUS, ProviderSubmissionStatus.EXPIRED.name());
  } else {
- boolean hasResponse = false;
+  boolean hasResponse = false;
  if (clientSubmissionInfo.getInputData().get("providerResponseSubmissionId") != null) {
  // The above value should be set on the client submission whenever a provider first submits
  // their response.

src/main/java/org/ilgcc/app/submission/actions/SendUploadedFileToDocumentTransferService.java

@@ -1,16 +1,12 @@
 package org.ilgcc.app.submission.actions;
 
-import com.google.common.io.Files;
 import formflow.library.config.submission.Action;
 import formflow.library.data.Submission;
-import formflow.library.data.UserFile;
 import formflow.library.data.UserFileRepositoryService;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.ilgcc.app.file_transfer.S3PresignService;
-import org.ilgcc.app.utils.enums.FileNameUtility;
+import org.ilgcc.jobs.EnqueueDocumentTransfer;
 import org.ilgcc.jobs.UploadedDocumentTransmissionJob;
 
 import org.springframework.beans.factory.annotation.Value;
@@ -23,41 +19,27 @@ public class SendUploadedFileToDocumentTransferService implements Action {
  private final UserFileRepositoryService userFileRepositoryService;
  private final UploadedDocumentTransmissionJob uploadedDocumentTransmissionJob;
  private final S3PresignService s3PresignService;
-
  private final String enableBackgroundJobs;
+ private final String waitForProviderResponseFlag;
+
+ private final EnqueueDocumentTransfer enqueueDocumentTransfer;
 
  public SendUploadedFileToDocumentTransferService(UserFileRepositoryService userFileRepositoryService,
- UploadedDocumentTransmissionJob uploadedDocumentTransmissionJob, S3PresignService s3PresignService,
- @Value("${il-gcc.dts.enable-background-jobs}") String enableBackgroundJobs) {
+ UploadedDocumentTransmissionJob uploadedDocumentTransmissionJob, S3PresignService s3PresignService, EnqueueDocumentTransfer enqueueDocumentTransfer,
+ @Value("${il-gcc.dts.enable-background-jobs}") String enableBackgroundJobs,
+ @Value("${il-gcc.dts.wait-for-provider-response}") String waitForProviderResponseFlag) {
  this.userFileRepositoryService = userFileRepositoryService;
  this.uploadedDocumentTransmissionJob = uploadedDocumentTransmissionJob;
  this.s3PresignService = s3PresignService;
+ this.enqueueDocumentTransfer = enqueueDocumentTransfer;
  this.enableBackgroundJobs = enableBackgroundJobs;
+ this.waitForProviderResponseFlag=waitForProviderResponseFlag;
  }
 
  @Override
  public void run(Submission submission) {
- if (!enableBackgroundJobs.equals("false")) {
- log.info("Sending uploaded files to document transfer service for submission with ID: {}", submission.getId());
- List<UserFile> userFiles = userFileRepositoryService.findAllBySubmission(submission);
- if (!userFiles.isEmpty()) {
- for (int i = 0; i < userFiles.size(); i++) {
- UserFile userFile = userFiles.get(i);
- String fileExtension = Files.getFileExtension(userFile.getOriginalName());
- String fileName = FileNameUtility.getFileNameForUploadedDocument(submission, i + 1, userFiles.size(), fileExtension);
- CompletableFuture<Boolean> scannedAndCleanFuture = s3PresignService.isObjectScannedAndClean(userFile.getRepositoryPath());
- int currentFileIndex = i;
- scannedAndCleanFuture.thenAccept(scannedAndClean -> {
- if (scannedAndClean) {
- log.info("Sending file {} of {} to document transfer service for submission with ID: {}", currentFileIndex + 1, userFiles.size(), submission.getId());
- uploadedDocumentTransmissionJob.enqueueUploadedDocumentTransmissionJob(submission, userFile, fileName);
- }
- }).exceptionally(e -> {
- log.error("There was an error when attempting to send uploaded file with id: {} in submission with id: {} to the document transfer service. It's possible the file had a virus, or could not be scanned.", userFile.getFileId(), submission.getId(), e);
- return null;
- });
- }
- }
+ if (enableBackgroundJobs.equals("true") && waitForProviderResponseFlag.equals("false")) {
+ enqueueDocumentTransfer.enqueueUploadedDocumentBySubmission(userFileRepositoryService, uploadedDocumentTransmissionJob, s3PresignService, submission);
  }
  }
 }

src/main/java/org/ilgcc/app/submission/actions/UploadSubmissionToS3.java

@@ -5,72 +5,47 @@
 import formflow.library.data.Submission;
 import formflow.library.file.CloudFileRepository;
 import formflow.library.pdf.PdfService;
-import java.util.concurrent.CompletableFuture;
 import lombok.extern.slf4j.Slf4j;
-import org.ilgcc.app.utils.ByteArrayMultipartFile;
-import org.ilgcc.app.utils.SubmissionUtilities;
 import org.ilgcc.app.utils.enums.FileNameUtility;
+import org.ilgcc.jobs.EnqueueDocumentTransfer;
 import org.ilgcc.jobs.PdfTransmissionJob;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
 
 @Slf4j
 @Component
 public class UploadSubmissionToS3 implements Action {
 
  private final PdfService pdfService;
  private final CloudFileRepository cloudFileRepository;
- 
+
  private final PdfTransmissionJob pdfTransmissionJob;
- private final String CONTENT_TYPE = "application/pdf";
-
+
+ private final EnqueueDocumentTransfer enqueueDocumentTransfer;
+
  private final String enableBackgroundJobs;
 
+ private final String waitForProviderResponseFlag;
 
  public UploadSubmissionToS3(PdfService pdfService, CloudFileRepository cloudFileRepository,
  PdfTransmissionJob pdfTransmissionJob,
- @Value("${il-gcc.dts.enable-background-jobs}") String enableBackgroundJobs) {
+ EnqueueDocumentTransfer enqueueDocumentTransfer,
+ @Value("${il-gcc.dts.enable-background-jobs}") String enableBackgroundJobs,
+ @Value("${il-gcc.dts.wait-for-provider-response}") String waitForProviderResponseFlag) {
  this.pdfService = pdfService;
  this.cloudFileRepository = cloudFileRepository;
  this.pdfTransmissionJob = pdfTransmissionJob;
+ this.enqueueDocumentTransfer = enqueueDocumentTransfer;
  this.enableBackgroundJobs = enableBackgroundJobs;
+ this.waitForProviderResponseFlag = waitForProviderResponseFlag;
  }
 
  @Override
  public void run(Submission submission) {
-
- try {
- byte[] pdfFile = pdfService.getFilledOutPDF(submission);
- String pdfFileName = String.format(FileNameUtility.getFileNameForPdf(submission));
- MultipartFile multipartFile = new ByteArrayMultipartFile(pdfFile, pdfFileName, CONTENT_TYPE);
- String s3ZipPath = SubmissionUtilities.generatePdfPath(submission);
-
- CompletableFuture.runAsync(() -> {
- try {
- cloudFileRepository.upload(s3ZipPath, multipartFile);
- } catch (IOException | InterruptedException e) {
- log.error("Error uploading submission to S3", e);
- throw new RuntimeException(e);
- }
- }).thenRun(() -> {
- try {
- if (enableBackgroundJobs.equals("true")) {
- pdfTransmissionJob.enqueuePdfTransmissionJob(s3ZipPath, submission);
- }
- } catch (IOException e) {
- log.error("An error occurred when enqueuing a job with the document transfer service.", e);
- }
- }).exceptionally(e -> {
- log.error("Error uploading submission to S3 for submission with ID: {}", submission.getId(), e);
- return null;
- });
-
- } catch (IOException e) {
- log.error("Error uploading submission to S3 for submission with ID: {}", submission.getId(), e);
+ if (enableBackgroundJobs.equals("true") && waitForProviderResponseFlag.equals("false")) {
+ enqueueDocumentTransfer.enqueuePDFDocumentBySubmission(pdfService, cloudFileRepository, pdfTransmissionJob,
+ submission, FileNameUtility.getFileNameForPdf(submission));
  }
  }
 }

src/main/java/org/ilgcc/app/utils/ProviderSubmissionUtilities.java

@@ -1,10 +1,15 @@
 package org.ilgcc.app.utils;
 
+import static java.time.temporal.ChronoUnit.DAYS;
+import static java.time.temporal.ChronoUnit.MINUTES;
 import static org.ilgcc.app.utils.SubmissionUtilities.MM_DD_YYYY;
 
 import formflow.library.data.Submission;
 import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.time.Period;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -102,8 +107,14 @@ private static String hoursRequested(Map<String, Object> child) {
  return String.join("", dateString);
  }
 
- public static LocalDate threeBusinessDaysFromSubmittedAtDate(LocalDate submittedAtDate) {
- Integer dayOffset = weekWithOffset.get(submittedAtDate.getDayOfWeek().toString());
- return submittedAtDate.plusDays(dayOffset);
+ public static ZonedDateTime threeBusinessDaysFromSubmittedAtDate(OffsetDateTime submittedAtDate) {
+ ZoneId chicagoTimeZone = ZoneId.of("America/Chicago");
+ ZonedDateTime submissionInChicagoTime = submittedAtDate.atZoneSameInstant(chicagoTimeZone);
+ Integer dayOffset = weekWithOffset.get(submissionInChicagoTime.getDayOfWeek().toString());
+ return submissionInChicagoTime.plusDays(dayOffset);
+ }
+
+ public static boolean providerApplicationHasExpired(Submission submission, ZonedDateTime todaysDate){
+ return submission.getSubmittedAt() != null && MINUTES.between(ProviderSubmissionUtilities.threeBusinessDaysFromSubmittedAtDate(submission.getSubmittedAt()), todaysDate) > 0;
  }
 }

src/main/java/org/ilgcc/app/utils/enums/FileNameUtility.java

@@ -21,6 +21,13 @@ public static String getFileNameForPdf(Submission submission) {
  return String.format("%s-%s-CCAP-Application-Form.pdf", formattedApplicantName, dashFormattedSubmittedAtDate);
  }
 
+ public static String getFileNameForPdf(Submission submission, String suffix) {
+ String applicantNameLastToFirst = SubmissionUtilities.getApplicantNameLastToFirst(submission);
+ String formattedApplicantName = formatApplicantNameForFileName(applicantNameLastToFirst);
+ String dashFormattedSubmittedAtDate = SubmissionUtilities.getDashFormattedSubmittedAtDate(submission);
+ return String.format("%s-%s-CCAP-Application-Form-%s.pdf", formattedApplicantName, dashFormattedSubmittedAtDate, suffix);
+ }
+
  public static String getFileNameForUploadedDocument(Submission submission, int fileNumber, int totalFiles, String fileExtension) {
  String applicantNameLastToFirst = SubmissionUtilities.getApplicantNameLastToFirst(submission);
  String formattedApplicantName = formatApplicantNameForFileName(applicantNameLastToFirst);