Removes static type for Enqueue Document transfer methods

codeforamerica · Oct 15, 2024 · 226630e · 226630e
1 parent ca72da8
commit 226630e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/...main/java/org/ilgcc/app/submission/actions/SendUploadedFileToDocumentTransferService.java b/...main/java/org/ilgcc/app/submission/actions/SendUploadedFileToDocumentTransferService.java
@@ -22,21 +22,24 @@ public class SendUploadedFileToDocumentTransferService implements Action {
  private final String enableBackgroundJobs;
  private final String waitForProviderResponseFlag;
 
+ private final EnqueueDocumentTransfer enqueueDocumentTransfer;
+
  public SendUploadedFileToDocumentTransferService(UserFileRepositoryService userFileRepositoryService,
- UploadedDocumentTransmissionJob uploadedDocumentTransmissionJob, S3PresignService s3PresignService,
+ 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("true") && waitForProviderResponseFlag.equals("false")) {
- EnqueueDocumentTransfer.enqueueUploadedDocumentBySubmission(userFileRepositoryService, uploadedDocumentTransmissionJob, s3PresignService, submission);
+ enqueueDocumentTransfer.enqueueUploadedDocumentBySubmission(userFileRepositoryService, uploadedDocumentTransmissionJob, s3PresignService, submission);
  }
  }
 }

diff --git a/src/main/java/org/ilgcc/app/submission/actions/UploadSubmissionToS3.java b/src/main/java/org/ilgcc/app/submission/actions/UploadSubmissionToS3.java
@@ -22,25 +22,29 @@ public class UploadSubmissionToS3 implements Action {
 
  private final PdfTransmissionJob pdfTransmissionJob;
 
+ private final EnqueueDocumentTransfer enqueueDocumentTransfer;
+
  private final String enableBackgroundJobs;
 
  private final String waitForProviderResponseFlag;
 
  public UploadSubmissionToS3(PdfService pdfService, CloudFileRepository cloudFileRepository,
  PdfTransmissionJob pdfTransmissionJob,
+ 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) {
  if (enableBackgroundJobs.equals("true") && waitForProviderResponseFlag.equals("false")) {
- EnqueueDocumentTransfer.enqueuePDFDocumentBySubmission(pdfService, cloudFileRepository, pdfTransmissionJob, submission, FileNameUtility.getFileNameForPdf(submission));
+ enqueueDocumentTransfer.enqueuePDFDocumentBySubmission(pdfService, cloudFileRepository, pdfTransmissionJob, submission, FileNameUtility.getFileNameForPdf(submission));
  }
  }
 }
diff --git a/src/main/java/org/ilgcc/jobs/EnqueueDocumentTransfer.java b/src/main/java/org/ilgcc/jobs/EnqueueDocumentTransfer.java
@@ -22,7 +22,7 @@
 public class EnqueueDocumentTransfer {
  private final static String CONTENT_TYPE = "application/pdf";
 
- public static void enqueuePDFDocumentBySubmission(PdfService pdfService, CloudFileRepository cloudFileRepository,
+ public void enqueuePDFDocumentBySubmission(PdfService pdfService, CloudFileRepository cloudFileRepository,
  PdfTransmissionJob pdfTransmissionJob, Submission submission, String fileNameForPdf) {
  try {
  byte[] pdfFile = pdfService.getFilledOutPDF(submission);
@@ -54,7 +54,7 @@ public static void enqueuePDFDocumentBySubmission(PdfService pdfService, CloudFi
 
  }
 
- public static void enqueueUploadedDocumentBySubmission(UserFileRepositoryService userFileRepositoryService,
+ public void enqueueUploadedDocumentBySubmission(UserFileRepositoryService userFileRepositoryService,
  UploadedDocumentTransmissionJob uploadedDocumentTransmissionJob, S3PresignService s3PresignService, Submission submission) {
  log.info("Sending uploaded files to document transfer service for submission with ID: {}", submission.getId());
  List<UserFile> userFiles = userFileRepositoryService.findAllBySubmission(submission);

diff --git a/src/main/java/org/ilgcc/jobs/TransmissionsRecurringJob.java b/src/main/java/org/ilgcc/jobs/TransmissionsRecurringJob.java
@@ -34,14 +34,15 @@ public class TransmissionsRecurringJob {
  private final CloudFileRepository cloudFileRepository;
  private final String waitForProviderResponseFlag;
  private final PdfTransmissionJob pdfTransmissionJob;
+ private final EnqueueDocumentTransfer enqueueDocumentTransfer;
 
  public TransmissionsRecurringJob(
  S3PresignService s3PresignService,
  TransmissionRepositoryService transmissionRepositoryService,
  UserFileRepositoryService userFileRepositoryService, UploadedDocumentTransmissionJob uploadedDocumentTransmissionJob,
  PdfService pdfService,
  CloudFileRepository cloudFileRepository, PdfTransmissionJob pdfTransmissionJob,
- @Value("${il-gcc.dts.wait-for-provider-response}") String waitForProviderResponseFlag) {
+ @Value("${il-gcc.dts.wait-for-provider-response}") String waitForProviderResponseFlag, EnqueueDocumentTransfer enqueueDocumentTransfer) {
  this.s3PresignService = s3PresignService;
  this.transmissionRepositoryService = transmissionRepositoryService;
  this.userFileRepositoryService = userFileRepositoryService;
@@ -50,6 +51,7 @@ public TransmissionsRecurringJob(
  this.cloudFileRepository = cloudFileRepository;
  this.pdfTransmissionJob = pdfTransmissionJob;
  this.waitForProviderResponseFlag = waitForProviderResponseFlag;
+ this.enqueueDocumentTransfer=enqueueDocumentTransfer;
  }
 
  @Recurring(id = "no-provider-response-job", cron = "0 * * * *")
@@ -64,8 +66,8 @@ public void noProviderResponseJob() {
  ZonedDateTime todaysDate = OffsetDateTime.now().atZoneSameInstant(chicagoTimeZone);
  for (Submission submission : submissionsWithoutTransmissions) {
  if (!hasProviderResponse(submission) && providerApplicationHasExpired(submission, todaysDate)) {
- EnqueueDocumentTransfer.enqueuePDFDocumentBySubmission(pdfService, cloudFileRepository, pdfTransmissionJob, submission, FileNameUtility.getFileNameForPdf(submission, "No-Provider-Response"));
- EnqueueDocumentTransfer.enqueueUploadedDocumentBySubmission(userFileRepositoryService, uploadedDocumentTransmissionJob, s3PresignService, submission);
+ enqueueDocumentTransfer.enqueuePDFDocumentBySubmission(pdfService, cloudFileRepository, pdfTransmissionJob, submission, FileNameUtility.getFileNameForPdf(submission, "No-Provider-Response"));
+ enqueueDocumentTransfer.enqueueUploadedDocumentBySubmission(userFileRepositoryService, uploadedDocumentTransmissionJob, s3PresignService, submission);
  } else if (hasProviderResponse(submission) && providerApplicationHasExpired(submission, todaysDate)) {
  log.error(String.format(
  "The provider response exists but the provider response expired. Check submission: %s", submission.getId()));