From 8cbf24aab04e41ac78d1f57b44fa3716d38b494f Mon Sep 17 00:00:00 2001
From: Sree P <sprasad@codeforamerica.org>
Date: Thu, 25 Jan 2024 13:18:47 -0800
Subject: [PATCH] Couple fixes - FTP encoding fix - was using ascii by default
 - Handle NPE for snap apps

---
 .../java/org/ladocuploader/app/cli/FtpsClientImpl.java     | 2 ++
 .../ladocuploader/app/preparers/ExpeditedSnapPreparer.java | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/ladocuploader/app/cli/FtpsClientImpl.java b/src/main/java/org/ladocuploader/app/cli/FtpsClientImpl.java
index 7ffc30248..65255e9a1 100644
--- a/src/main/java/org/ladocuploader/app/cli/FtpsClientImpl.java
+++ b/src/main/java/org/ladocuploader/app/cli/FtpsClientImpl.java
@@ -2,6 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.net.PrintCommandListener;
+import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPReply;
 import org.apache.commons.net.ftp.FTPSClient;
 import org.springframework.beans.factory.annotation.Value;
@@ -50,6 +51,7 @@ public void uploadFile(String zipFilename, byte[] data) throws IOException {
     ftp.execPBSZ(0);
     ftp.execPROT("P");
     ftp.enterLocalPassiveMode();
+    ftp.setFileType(FTP.BINARY_FILE_TYPE);
     ftp.pasv();
     InputStream local = new ByteArrayInputStream(data);
     boolean isComplete = ftp.storeFile(zipFilename, local);
diff --git a/src/main/java/org/ladocuploader/app/preparers/ExpeditedSnapPreparer.java b/src/main/java/org/ladocuploader/app/preparers/ExpeditedSnapPreparer.java
index ee78417d1..96d1f3a42 100644
--- a/src/main/java/org/ladocuploader/app/preparers/ExpeditedSnapPreparer.java
+++ b/src/main/java/org/ladocuploader/app/preparers/ExpeditedSnapPreparer.java
@@ -1,15 +1,14 @@
 package org.ladocuploader.app.preparers;
 
-import static java.util.Collections.emptyList;
-
 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 org.springframework.stereotype.Component;
+
 import java.util.HashMap;
 import java.util.Map;
-import org.springframework.stereotype.Component;
 
 @Component
 public class ExpeditedSnapPreparer implements SubmissionFieldPreparer {
@@ -18,7 +17,7 @@ public class ExpeditedSnapPreparer implements SubmissionFieldPreparer {
   public Map<String, SubmissionField> prepareSubmissionFields(Submission submission, PdfMap pdfMap) {
     Map<String, SubmissionField> results = new HashMap<>();
 
-    String isEligibleForExpeditedSnap = submission.getInputData().get("isEligibleForExpeditedSnap").toString();
+    var isEligibleForExpeditedSnap = submission.getInputData().getOrDefault("isEligibleForExpeditedSnap", "false");
     if (isEligibleForExpeditedSnap.equals("true")) {
       String householdIncomeLast30Days = submission.getInputData().getOrDefault("householdIncomeLast30Days", "0").toString();
       results.put("expeditedSnapIncome", new SingleField("expeditedSnapIncome", householdIncomeLast30Days, null));