SNAP transmission changes

crontab

@@ -1,7 +1,2 @@
 # Run weekly on Wednesday at Noon PDT
 # 0 19 * * WED java -Dserver.port=9191 -jar /opt/form-flow-starter-app/app.jar transmit
-
-# Run every 5 minutes
-*/5 * * * * java -Dserver.port=9191 -jar /opt/form-flow-starter-app/app.jar transferSubmissions
-
-

src/main/java/org/ladocuploader/app/LaDocUploader.java

@@ -4,10 +4,12 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(scanBasePackages = {"org.ladocuploader.app", "formflow.library"})
 @EntityScan(basePackages = {"org.ladocuploader.app", "formflow.library"})
 @EnableConfigurationProperties
+@EnableScheduling
 public class LaDocUploader {
 
   public static void main(String[] args) {

src/main/java/org/ladocuploader/app/cli/FtpsClientImpl.java

@@ -35,9 +35,10 @@ public FtpsClientImpl(@Value("${ftps.username:}") String username, @Value("${ftp
   public void uploadFile(String zipFilename, byte[] data) throws IOException {
     FTPSClient ftp = new FTPSClient();
 
-    ftp.addProtocolCommandListener(new PrintCommandListener(new PrintWriter(System.out)));
-
     ftp.connect(uploadUrl);
+
+    ftp.addProtocolCommandListener(new PrintCommandListener(new PrintWriter(System.out)));
+
     int reply = ftp.getReplyCode();
     if (!FTPReply.isPositiveCompletion(reply)) {
       ftp.disconnect();

src/main/java/org/ladocuploader/app/cli/MockFtpsClientImpl.java

@@ -4,14 +4,33 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 @Slf4j
 @Component
 @Profile({"dev", "test", "demo"})
 public class MockFtpsClientImpl implements FtpsClient {
+  public static final String MOCK_SERVER_NAME = "mockTransferServer";
 
   @Override
   public void uploadFile(String zipFilename, byte[] data) {
-    // Do nothing
     log.info("Mock uploading file " + zipFilename);
+    try {
+      File dir = new File(MOCK_SERVER_NAME);
+      if (!dir.exists() && !dir.mkdir()) {
+        throw new IllegalStateException("Cannot make directory");
+      }
+      File file = new File(MOCK_SERVER_NAME + "/" + zipFilename);
+      if (!file.exists() && !file.createNewFile()) {
+        throw new IllegalStateException("Cannot create file");
+      }
+      FileOutputStream out = new FileOutputStream(file);
+      out.write(data);
+      out.close();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
   }
 }

src/main/java/org/ladocuploader/app/cli/MockPGPEncryptorImpl.java

@@ -10,7 +10,7 @@
 
 @Slf4j
 @Component
-@Profile({"dev", "test", "demo"})
+@Profile({"dev", "test"})
 public class MockPGPEncryptorImpl implements PGPEncryptor {
 
   @Override

src/main/java/org/ladocuploader/app/cli/PGPEncryptorImpl.java

@@ -21,7 +21,7 @@
 
 @Slf4j
 @Component
-@Profile({"production", "staging"})
+@Profile({"production", "staging", "demo"})
 public class PGPEncryptorImpl implements PGPEncryptor {
 
   @Value("${pgp.sigkey-password}")

src/main/java/org/ladocuploader/app/cli/SubmissionTransfer.java

@@ -14,11 +14,9 @@
 import org.ladocuploader.app.data.enums.TransmissionStatus;
 import org.ladocuploader.app.data.enums.TransmissionType;
 import org.ladocuploader.app.submission.StringEncryptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.data.domain.Sort;
-import org.springframework.shell.standard.ShellComponent;
-import org.springframework.shell.standard.ShellMethod;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -32,7 +30,7 @@
 import static org.ladocuploader.app.file.DocTypeEnum.*;
 
 @Slf4j
-@ShellComponent
+@Service
 public class SubmissionTransfer {
   private static final Map<String, String> DOCTYPE_FORMAT_MAP = new HashMap<>();
 
@@ -66,9 +64,6 @@ public class SubmissionTransfer {
   private final StringEncryptor encryptor;
   private final FtpsClient ftpsClient;
 
-  @Autowired
-  private ConfigurableApplicationContext context;
-
   public SubmissionTransfer(TransmissionRepository transmissionRepository, UserFileRepositoryService fileRepositoryService, CloudFileRepository fileRepository, PdfService pdfService, PGPEncryptor pgpEncryptor, StringEncryptor encryptor, FtpsClient ftpsClient) {
     this.transmissionRepository = transmissionRepository;
     this.fileRepositoryService = fileRepositoryService;
@@ -79,15 +74,14 @@ public SubmissionTransfer(TransmissionRepository transmissionRepository, UserFil
     this.ftpsClient = ftpsClient;
   }
 
-  @ShellMethod(key = "transferSubmissions")
+  @Scheduled(fixedRateString ="${transmissions.snap-transmission-rate}")
   public void transferSubmissions() {
     // Give a 2-hour wait for folks to upload documents
     OffsetDateTime submittedAtCutoff = OffsetDateTime.now().minusHours(TWO_HOURS);
     List<Submission> queuedSubmissions = transmissionRepository.submissionsToTransmit(Sort.unsorted(), TransmissionType.SNAP);
     int totalQueued = queuedSubmissions.size();
     if (queuedSubmissions.isEmpty()) {
       log.info("Nothing to transmit. Exiting.");
-      context.close();
       return;
     }
     log.info("Found %s queued transmissions".formatted(totalQueued));
@@ -97,7 +91,6 @@ public void transferSubmissions() {
     log.info("Excluding %s submitted within last 2 hours".formatted(totalQueued - queuedSubmissions.size()));
     if (queuedSubmissions.isEmpty()) {
       log.info("No submissions older than 2 hour to transmit. Exiting.");
-      context.close();
       return;
     }
     log.info("Found %s transmissions to transmit".formatted(queuedSubmissions.size()));
@@ -109,7 +102,6 @@ public void transferSubmissions() {
       transferSubmissionBatch(submissionBatch);
     }
     log.info("Done transmitting batches. Transmitted %s of %s batches. Exiting.".formatted(transmittedCount, submissionBatches.size()));
-    context.close();
   }
 
   private void transferSubmissionBatch(List<Submission> submissionsBatch) {

src/main/resources/application.yaml

@@ -111,6 +111,8 @@ server:
   servlet:
     session:
       persistent: true
+transmissions:
+  snap-transmission-rate: ${SNAP_TRANSMISSION_RATE:PT5M}
 ftps:
   username: ${FTPS_USERNAME:-""}
   password: ${FTPS_PASSWORD:-""}

src/main/resources/logback-spring.xml

@@ -16,13 +16,13 @@
     </layout>
   </appender>
 
-  <springProfile name="dev | test">
+  <springProfile name="dev | test | demo">
     <root level="INFO">
       <appender-ref ref="LocalConsole"/>
     </root>
   </springProfile>
 
-  <springProfile name="staging | demo | production">
+  <springProfile name="staging | production">
     <root level="INFO | WARN | ERROR">
       <appender-ref ref="JsonConsole"/>
     </root>

src/test/java/org/ladocuploader/app/cli/SubmissionTransferTest.java

@@ -8,7 +8,6 @@
 import formflow.library.file.CloudFileRepository;
 import formflow.library.pdf.PdfService;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.ladocuploader.app.data.Transmission;
 import org.ladocuploader.app.data.TransmissionRepository;
@@ -21,7 +20,6 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.time.OffsetDateTime;
 import java.util.*;
@@ -33,13 +31,12 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.ladocuploader.app.cli.MockFtpsClientImpl.MOCK_SERVER_NAME;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.when;
 
 @ActiveProfiles("test")
 @SpringBootTest
-@Disabled
 class SubmissionTransferTest {
 
   @Autowired
@@ -54,32 +51,22 @@ class SubmissionTransferTest {
   @Autowired
   UserFileRepository userFileRepository;
 
+  @Autowired
+  FtpsClient ftpsClient;
+
   @MockBean
   PdfService pdfService;
 
   @MockBean
   CloudFileRepository fileRepository;
 
-  @MockBean
-  FtpsClient ftpsClient;
-
   private Submission submissionWithDocs;
   private Submission submissionWithoutDocs;
   private Submission invalidSubmission;
   private Submission submittedBeforeDelayCutoff;
 
   @BeforeEach
   void setup() throws IOException {
-    doAnswer(args -> {
-      String zipfilename = (String) args.getArguments()[0];
-      String transmitlocation = "mocktransmit_" + args.getArguments()[0];
-      try (FileInputStream instream = new FileInputStream(zipfilename);
-           FileOutputStream outstream = new FileOutputStream(transmitlocation)) {
-        outstream.write(instream.readAllBytes());
-      }
-      return null;
-    }).when(ftpsClient).uploadFile(anyString(), any());
-
     submissionWithoutDocs = queueSubmissionWithoutDocs();
     submissionWithDocs = queueSubmissionWithDocs();
     invalidSubmission = queueInvalidSubmission();
@@ -94,11 +81,9 @@ void setup() throws IOException {
   public void transmitZipFile() throws IOException {
     submissionTransfer.transferSubmissions();
 
-    File zipFile = new File("mocktransmit_00050000000.zip");
+    File zipFile = new File(MOCK_SERVER_NAME + "/00050000000.zip.gpg");
     assertTrue(zipFile.exists());
 
-    verify(ftpsClient).uploadFile(any(), any());
-
     Transmission transmittedWithDocs = transmissionRepository.findBySubmissionAndTransmissionType(submissionWithDocs, TransmissionType.SNAP);
     assertThat(transmittedWithDocs.getStatus(), equalTo(TransmissionStatus.Complete));
     assertNull(transmittedWithDocs.getDocumentationErrors());
@@ -118,13 +103,13 @@ public void transmitZipFile() throws IOException {
     String destDir = "output";
     List<String> fileNames = unzip(zipFile.getPath(), destDir);
 
-    assertThat(fileNames, hasItem("output/1/"));
-    assertThat(fileNames, hasItem("output/1/SNAP_application.pdf"));
-    assertThat(fileNames, hasItem("output/2/"));
-    assertThat(fileNames, hasItem("output/2/SNAP_application.pdf"));
-    assertThat(fileNames, hasItem("output/2/originalFilename.png"));
-    assertThat(fileNames, hasItem("output/2/2_originalFilename.png"));
-    assertThat(fileNames, hasItem("output/2/weird/:\\filename.jpg"));
+    assertThat(fileNames, hasItem("output/00050000000/1/"));
+    assertThat(fileNames, hasItem("output/00050000000/1/SNAP_application.pdf"));
+    assertThat(fileNames, hasItem("output/00050000000/2/"));
+    assertThat(fileNames, hasItem("output/00050000000/2/SNAP_application.pdf"));
+    assertThat(fileNames, hasItem("output/00050000000/2/originalFilename.png"));
+    assertThat(fileNames, hasItem("output/00050000000/2/2_originalFilename.png"));
+    assertThat(fileNames, hasItem("output/00050000000/2/weird/:\\filename.jpg"));
     assertThat(fileNames, hasItem("output/00050000000.txt"));
     assertEquals(8, fileNames.size());