WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java

 import java.io.InputStream;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoField;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
+    }
-    private MarkDeliveredModel createMarkDeliveredModel(CSVRecord record) {
+    private MarkDeliveredModel createMarkDeliveredModel(CSVRecord record) throws ProfitMandiBusinessException {
         MarkDeliveredModel mdm = new MarkDeliveredModel();
         mdm.setAirwayBillNumber(record.get(0));
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
         LOGGER.info(record.get(1));
+        LocalDate dateTime;
+        try {
-        LocalDate dateTime = LocalDate.parse(record.get(1), formatter);
+            dateTime = LocalDate.parse(record.get(1), formatter);
+        } catch (DateTimeParseException e) {
+            throw new ProfitMandiBusinessException("Delivered Date", record.get(1),
+                    "AWB " + record.get(0) + ": delivered date '" + record.get(1) + "' must be dd-MM-yyyy (e.g. 16-10-2026)");
+        }
         mdm.setDeliveredOn(dateTime.atStartOfDay());
         mdm.setDeliveredBy(record.get(2));
         return mdm;
+    }

Subversion Repositories SmartDukaan