fix - update check string

VitaDairy · Oct 14, 2024 · 48cff04 · 48cff04
1 parent e36d4e6
commit 48cff04
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/com/vitadairy/libraries/importexport/processor/ReadRowProcessor.java b/src/main/java/com/vitadairy/libraries/importexport/processor/ReadRowProcessor.java
@@ -25,7 +25,7 @@ public Map<Integer, CellMetaData> readMetaData(Sheet sheet) {
         Iterator<Cell> iterator = sheet.getRow(0).cellIterator();
         while (iterator.hasNext()) {
             Cell cell = iterator.next();
-            String cellName = cell.getStringCellValue();
+            String cellName = cell.getStringCellValue().trim();
             CellMetaData cellMetaData = columnMetaData.get(cellName);
             if (cellMetaData != null) {
                 metadata.put(cell.getColumnIndex(), cellMetaData);

diff --git a/src/main/java/com/vitadairy/libraries/importexport/service/ParseCellDateService.java b/src/main/java/com/vitadairy/libraries/importexport/service/ParseCellDateService.java
@@ -1,6 +1,7 @@
 package com.vitadairy.libraries.importexport.service;
 
 import com.vitadairy.libraries.importexport.helper.ILogger;
+import com.vitadairy.libraries.importexport.utils.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 
 import java.text.SimpleDateFormat;
@@ -32,6 +33,9 @@ public ParseCellDateService(String dateFormat, ILogger logger) {
     @Override
     public Date parseCellValue(Cell cell) {
         String date = cell.getStringCellValue();
+        if (StringUtils.isEmpty(date)) {
+            return null;
+        }
         try {
             return sdf.parse(date);
         } catch (Exception e) {

diff --git a/src/main/java/com/vitadairy/libraries/importexport/utils/StringUtils.java b/src/main/java/com/vitadairy/libraries/importexport/utils/StringUtils.java
@@ -38,4 +38,8 @@ public static String snakeToCamel(String str, boolean firstCharUpperCase) {
         String snakeToCamel = snakeToCamel(str);
         return snakeToCamel.substring(0, 1).toLowerCase() + snakeToCamel.substring(1);
     }
+
+    public static boolean isEmpty(String str) {
+        return str == null || str.isEmpty();
+    }
 }