peter_backlund 17 lat temu
rodzic
commit
dec035ecde

+ 3
- 1
dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/handling/file/UploadDirectoryScanner.java Wyświetl plik

7
 import se.citerus.dddsample.tracking.core.application.handling.HandlingEventService;
7
 import se.citerus.dddsample.tracking.core.application.handling.HandlingEventService;
8
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
8
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
9
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
9
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
10
+import se.citerus.dddsample.tracking.core.domain.model.handling.OperatorCode;
10
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
11
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
11
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
12
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
12
 import static se.citerus.dddsample.tracking.core.interfaces.handling.HandlingReportParser.*;
13
 import static se.citerus.dddsample.tracking.core.interfaces.handling.HandlingReportParser.*;
93
     final VoyageNumber voyageNumber = parseVoyageNumber(voyageNumberStr, errors);
94
     final VoyageNumber voyageNumber = parseVoyageNumber(voyageNumberStr, errors);
94
     final HandlingEvent.Type eventType = parseEventType(eventTypeStr, errors);
95
     final HandlingEvent.Type eventType = parseEventType(eventTypeStr, errors);
95
     final UnLocode unLocode = parseUnLocode(unLocodeStr, errors);
96
     final UnLocode unLocode = parseUnLocode(unLocodeStr, errors);
97
+    final OperatorCode operatorCode = parseOperatorCode();
96
 
98
 
97
     if (errors.isEmpty()) {
99
     if (errors.isEmpty()) {
98
-      handlingEventService.registerHandlingEvent(date, trackingId, voyageNumber, unLocode, eventType);
100
+      handlingEventService.registerHandlingEvent(date, trackingId, voyageNumber, unLocode, eventType, operatorCode);
99
     } else {
101
     } else {
100
       throw new Exception(errors.toString());
102
       throw new Exception(errors.toString());
101
     }
103
     }

+ 3
- 1
dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/handling/ws/HandlingReportWebService.java Wyświetl plik

11
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
11
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
12
 import se.citerus.dddsample.tracking.core.domain.model.handling.CannotCreateHandlingEventException;
12
 import se.citerus.dddsample.tracking.core.domain.model.handling.CannotCreateHandlingEventException;
13
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
13
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
14
+import se.citerus.dddsample.tracking.core.domain.model.handling.OperatorCode;
14
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
15
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
15
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
16
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
16
 import static se.citerus.dddsample.tracking.core.interfaces.handling.HandlingReportParser.*;
17
 import static se.citerus.dddsample.tracking.core.interfaces.handling.HandlingReportParser.*;
39
     final VoyageNumber voyageNumber = parseVoyageNumber(handlingReport.getVoyageNumber(), validationErrors);
40
     final VoyageNumber voyageNumber = parseVoyageNumber(handlingReport.getVoyageNumber(), validationErrors);
40
     final HandlingEvent.Type type = parseEventType(handlingReport.getType(), validationErrors);
41
     final HandlingEvent.Type type = parseEventType(handlingReport.getType(), validationErrors);
41
     final UnLocode unLocode = parseUnLocode(handlingReport.getUnLocode(), validationErrors);
42
     final UnLocode unLocode = parseUnLocode(handlingReport.getUnLocode(), validationErrors);
43
+    final OperatorCode operatorCode = parseOperatorCode();
42
 
44
 
43
     final Map<String, String> allErrors = new HashMap<String, String>();
45
     final Map<String, String> allErrors = new HashMap<String, String>();
44
     for (String trackingIdStr : handlingReport.getTrackingIds()) {
46
     for (String trackingIdStr : handlingReport.getTrackingIds()) {
46
 
48
 
47
       if (validationErrors.isEmpty()) {
49
       if (validationErrors.isEmpty()) {
48
         try {
50
         try {
49
-          handlingEventService.registerHandlingEvent(completionTime, trackingId, voyageNumber, unLocode, type);
51
+          handlingEventService.registerHandlingEvent(completionTime, trackingId, voyageNumber, unLocode, type, operatorCode);
50
         } catch (CannotCreateHandlingEventException e) {
52
         } catch (CannotCreateHandlingEventException e) {
51
           logger.error(e, e);
53
           logger.error(e, e);
52
           allErrors.put(trackingIdStr, e.getMessage());
54
           allErrors.put(trackingIdStr, e.getMessage());