Change name of waitForProviderResponse flag and type to boolean (#711)

codeforamerica · Oct 21, 2024 · d80cbe3 · d80cbe3
1 parent a1e8224
commit d80cbe3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/src/main/java/org/ilgcc/app/config/DocumentTransferConfiguration.java b/src/main/java/org/ilgcc/app/config/DocumentTransferConfiguration.java
@@ -16,5 +16,5 @@ public class DocumentTransferConfiguration {
     public String authToken;
     public Long presignedUrlDuration;
     public String processingOrg;
-    public String waitForProviderResponse;
+    public boolean expandExistingProviderFlow;
 }
diff --git a/src/main/java/org/ilgcc/app/pdf/ProviderApplicationPreparer.java b/src/main/java/org/ilgcc/app/pdf/ProviderApplicationPreparer.java
@@ -19,7 +19,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
-@ConditionalOnProperty(name="il-gcc.dts.wait-for-provider-response", havingValue = "true")
+@ConditionalOnProperty(name="il-gcc.dts.expand-existing-provider-flow", havingValue = "true")
 @Component
 public class ProviderApplicationPreparer implements SubmissionFieldPreparer {
 

diff --git a/...main/java/org/ilgcc/app/submission/actions/SendUploadedFileToDocumentTransferService.java b/...main/java/org/ilgcc/app/submission/actions/SendUploadedFileToDocumentTransferService.java
@@ -19,24 +19,26 @@ public class SendUploadedFileToDocumentTransferService implements Action {
     private final UserFileRepositoryService userFileRepositoryService;
     private final UploadedDocumentTransmissionJob uploadedDocumentTransmissionJob;
     private final S3PresignService s3PresignService;
-    private final String waitForProviderResponseFlag;
+    private Boolean expandExistingProviderFlow;
 
     private final EnqueueDocumentTransfer enqueueDocumentTransfer;
 
     public SendUploadedFileToDocumentTransferService(UserFileRepositoryService userFileRepositoryService,
-            UploadedDocumentTransmissionJob uploadedDocumentTransmissionJob, S3PresignService s3PresignService, EnqueueDocumentTransfer enqueueDocumentTransfer,
-            @Value("${il-gcc.dts.wait-for-provider-response}") String waitForProviderResponseFlag) {
+            UploadedDocumentTransmissionJob uploadedDocumentTransmissionJob, S3PresignService s3PresignService,
+            EnqueueDocumentTransfer enqueueDocumentTransfer,
+            @Value("${il-gcc.dts.expand-existing-provider-flow}") Boolean expandExistingProviderFlow) {
         this.userFileRepositoryService = userFileRepositoryService;
         this.uploadedDocumentTransmissionJob = uploadedDocumentTransmissionJob;
         this.s3PresignService = s3PresignService;
         this.enqueueDocumentTransfer = enqueueDocumentTransfer;
-        this.waitForProviderResponseFlag=waitForProviderResponseFlag;
+        this.expandExistingProviderFlow = expandExistingProviderFlow;
     }
 
     @Override
     public void run(Submission submission) {
-        if (waitForProviderResponseFlag.equals("false")) {
-           enqueueDocumentTransfer.enqueueUploadedDocumentBySubmission(userFileRepositoryService, uploadedDocumentTransmissionJob, s3PresignService, submission);
+        if (!expandExistingProviderFlow) {
+            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
@@ -24,22 +24,22 @@ public class UploadSubmissionToS3 implements Action {
 
     private final EnqueueDocumentTransfer enqueueDocumentTransfer;
 
-    private final String waitForProviderResponseFlag;
+    private Boolean expandExistingProviderFlow;
 
     public UploadSubmissionToS3(PdfService pdfService, CloudFileRepository cloudFileRepository,
             PdfTransmissionJob pdfTransmissionJob,
             EnqueueDocumentTransfer enqueueDocumentTransfer,
-            @Value("${il-gcc.dts.wait-for-provider-response}") String waitForProviderResponseFlag) {
+            @Value("${il-gcc.dts.expand-existing-provider-flow}") Boolean expandExistingProviderFlow) {
         this.pdfService = pdfService;
         this.cloudFileRepository = cloudFileRepository;
         this.pdfTransmissionJob = pdfTransmissionJob;
         this.enqueueDocumentTransfer = enqueueDocumentTransfer;
-        this.waitForProviderResponseFlag = waitForProviderResponseFlag;
+        this.expandExistingProviderFlow = expandExistingProviderFlow;
     }
 
     @Override
     public void run(Submission submission) {
-        if (waitForProviderResponseFlag.equals("false")) {
+        if (!expandExistingProviderFlow) {
             enqueueDocumentTransfer.enqueuePDFDocumentBySubmission(pdfService, cloudFileRepository, pdfTransmissionJob,
                     submission, FileNameUtility.getFileNameForPdf(submission));
         }

diff --git a/src/main/java/org/ilgcc/jobs/TransmissionsRecurringJob.java b/src/main/java/org/ilgcc/jobs/TransmissionsRecurringJob.java
@@ -32,15 +32,15 @@ public class TransmissionsRecurringJob {
     private final UploadedDocumentTransmissionJob uploadedDocumentTransmissionJob;
     private final PdfService pdfService;
     private final CloudFileRepository cloudFileRepository;
-    private final String waitForProviderResponseFlag;
+    private Boolean expandExistingProviderFlow;
     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.expand-existing-provider-flow}") Boolean expandExistingProviderFlow,
             EnqueueDocumentTransfer enqueueDocumentTransfer) {
         this.s3PresignService = s3PresignService;
         this.transmissionRepositoryService = transmissionRepositoryService;
@@ -49,7 +49,7 @@ public TransmissionsRecurringJob(S3PresignService s3PresignService,
         this.pdfService = pdfService;
         this.cloudFileRepository = cloudFileRepository;
         this.pdfTransmissionJob = pdfTransmissionJob;
-        this.waitForProviderResponseFlag = waitForProviderResponseFlag;
+        this.expandExistingProviderFlow = expandExistingProviderFlow;
         this.enqueueDocumentTransfer = enqueueDocumentTransfer;
     }
 
@@ -63,7 +63,7 @@ public void noProviderResponseJob() {
 
         List<Submission> expiredSubmissionsWithNoTransmission = submissionsWithoutTransmissions.stream()
                 .filter(submission -> providerApplicationHasExpired(submission, todaysDate)).toList();
-        if (expiredSubmissionsWithNoTransmission.isEmpty() || waitForProviderResponseFlag.equals("false")) {
+        if (expiredSubmissionsWithNoTransmission.isEmpty() || !expandExistingProviderFlow) {
             return;
         } else {
             log.info(String.format("Running the 'No provider response job' for %s expired submissions",

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -118,4 +118,4 @@ il-gcc:
     consumer-id: ${DOCUMENT_TRANSFER_SERVICE_CONSUMER_ID}
     auth-token: ${DOCUMENT_TRANSFER_SERVICE_AUTH_TOKEN}
     presigned-url-Duration: 5 # Minutes
-    wait-for-provider-response: ${WAIT_FOR_PROVIDER_RESPONSE_FLAG:false}
+    expand-existing-provider-flow: ${WAIT_FOR_PROVIDER_RESPONSE_FLAG:false}
diff --git a/src/test/java/org/ilgcc/jobs/TransmissionsRecurringJobTest.java b/src/test/java/org/ilgcc/jobs/TransmissionsRecurringJobTest.java
@@ -82,7 +82,7 @@ void setUp() {
                 pdfService,
                 cloudFileRepository,
                 pdfTransmissionJob,
-                "true",
+                true,
                 enqueueDocumentTransfer
         );
     }
@@ -110,7 +110,7 @@ void enqueueDocumentTransferWillNotRunIfFlagIsOff() {
                 pdfService,
                 cloudFileRepository,
                 pdfTransmissionJob,
-                "false",
+                false,
                 enqueueDocumentTransfer
         );