xslx support in bulk import

impactupgrade · Jul 18, 2023 · 84fd361 · 84fd361
1 parent 27ac4ce
commit 84fd361
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 27 deletions.
diff --git a/src/main/java/com/impactupgrade/nucleus/controller/CrmController.java b/src/main/java/com/impactupgrade/nucleus/controller/CrmController.java
@@ -123,19 +123,7 @@ public Response bulkImport(
     SecurityUtil.verifyApiKey(env);
 
     // Important to do this outside of the new thread -- ensures the InputStream is still open.
-    CSVParser csvParser = CSVParser.parse(
-        inputStream,
-        Charset.defaultCharset(),
-        CSVFormat.DEFAULT
-            .withFirstRecordAsHeader()
-            .withIgnoreHeaderCase()
-            .withTrim()
-    );
-    List<Map<String, String>> data = new ArrayList<>();
-    for (CSVRecord csvRecord : csvParser) {
-      data.add(csvRecord.toMap());
-    }
-
+    List<Map<String, String>> data = toListOfMap(inputStream, fileDisposition);
     List<CrmImportEvent> importEvents = CrmImportEvent.fromGeneric(data);
 
     Runnable thread = () -> {
@@ -201,19 +189,7 @@ public Response bulkImportFBFundraisers(
     SecurityUtil.verifyApiKey(env);
 
     // Important to do this outside of the new thread -- ensures the InputStream is still open.
-    CSVParser csvParser = CSVParser.parse(
-        inputStream,
-        Charset.defaultCharset(),
-        CSVFormat.DEFAULT
-            .withFirstRecordAsHeader()
-            .withIgnoreHeaderCase()
-            .withTrim()
-    );
-    List<Map<String, String>> data = new ArrayList<>();
-    for (CSVRecord csvRecord : csvParser) {
-      data.add(csvRecord.toMap());
-    }
-
+    List<Map<String, String>> data = toListOfMap(inputStream, fileDisposition);
     List<CrmImportEvent> importEvents = CrmImportEvent.fromFBFundraiser(data);
 
     Runnable thread = () -> {
@@ -247,7 +223,7 @@ public Response bulkImportGreaterGiving(
     // Important to do this outside of the new thread -- ensures the InputStream is still open.
     // Excel is expected. Greater Giving has an Excel report export purpose built for SFDC.
     // TODO: But, what if a different CRM is targeted?
-    List<Map<String, String>> data = Utils.getExcelData(inputStream);
+    List<Map<String, String>> data = toListOfMap(inputStream, fileDisposition);
 
     List<CrmImportEvent> importEvents = CrmImportEvent.fromGreaterGiving(data);
 
@@ -436,4 +412,29 @@ public Response getContactFields(
 
     return Response.status(200).entity(filteredList).build();
   }
+
+  private static List<Map<String, String>> toListOfMap(InputStream inputStream, FormDataContentDisposition fileDisposition) throws Exception {
+    String fileExtension = Utils.getFileExtension(fileDisposition.getFileName());
+    List<Map<String, String>> data = new ArrayList<>();
+
+    if ("csv".equals(fileExtension)) {
+      CSVParser csvParser = CSVParser.parse(
+          inputStream,
+          Charset.defaultCharset(),
+          CSVFormat.DEFAULT
+              .withFirstRecordAsHeader()
+              .withIgnoreHeaderCase()
+              .withTrim()
+      );
+      data = new ArrayList<>();
+      for (CSVRecord csvRecord : csvParser) {
+        data.add(csvRecord.toMap());
+      }
+    } else if ("xlsx".equals(fileExtension)) {
+      data = Utils.getExcelData(inputStream, 0);
+    } else {
+      log.warn("Unsupported file extension '{}'!", fileExtension);
+    }
+    return data;
+  }
 }
diff --git a/src/main/java/com/impactupgrade/nucleus/util/Utils.java b/src/main/java/com/impactupgrade/nucleus/util/Utils.java
@@ -266,4 +266,16 @@ public static String formatDuration(Duration duration) {
         (absSeconds % 3600) / 60);
     return seconds < 0 ? "-" + positive : positive;
   }
+
+  public static String getFileExtension(String fileName) {
+    if (Strings.isNullOrEmpty(fileName)) {
+      return null;
+    }
+    String extension = "";
+    int index = fileName.lastIndexOf('.');
+    if (index > 0) {
+      extension = fileName.substring(index + 1);
+    }
+    return extension;
+  }
 }