dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/handling/file/UploadDirectoryScanner.java

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.InitializingBean;
 import se.citerus.dddsample.tracking.core.application.handling.HandlingEventService;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.tracking.core.domain.model.handling.OperatorCode;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 import static se.citerus.dddsample.tracking.core.interfaces.handling.HandlingReportParser.*;
@@ -93,9 +94,10 @@ public class UploadDirectoryScanner extends TimerTask implements InitializingBea
     final VoyageNumber voyageNumber = parseVoyageNumber(voyageNumberStr, errors);
     final HandlingEvent.Type eventType = parseEventType(eventTypeStr, errors);
     final UnLocode unLocode = parseUnLocode(unLocodeStr, errors);
+    final OperatorCode operatorCode = parseOperatorCode();
 
     if (errors.isEmpty()) {
-      handlingEventService.registerHandlingEvent(date, trackingId, voyageNumber, unLocode, eventType);
+      handlingEventService.registerHandlingEvent(date, trackingId, voyageNumber, unLocode, eventType, operatorCode);
     } else {
       throw new Exception(errors.toString());
     }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/handling/ws/HandlingReportWebService.java

@@ -11,6 +11,7 @@ import se.citerus.dddsample.tracking.core.application.handling.HandlingEventServ
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.handling.CannotCreateHandlingEventException;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.tracking.core.domain.model.handling.OperatorCode;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 import static se.citerus.dddsample.tracking.core.interfaces.handling.HandlingReportParser.*;
@@ -39,6 +40,7 @@ public class HandlingReportWebService implements HandlingReportService {
     final VoyageNumber voyageNumber = parseVoyageNumber(handlingReport.getVoyageNumber(), validationErrors);
     final HandlingEvent.Type type = parseEventType(handlingReport.getType(), validationErrors);
     final UnLocode unLocode = parseUnLocode(handlingReport.getUnLocode(), validationErrors);
+    final OperatorCode operatorCode = parseOperatorCode();
 
     final Map<String, String> allErrors = new HashMap<String, String>();
     for (String trackingIdStr : handlingReport.getTrackingIds()) {
@@ -46,7 +48,7 @@ public class HandlingReportWebService implements HandlingReportService {
 
       if (validationErrors.isEmpty()) {
         try {
-          handlingEventService.registerHandlingEvent(completionTime, trackingId, voyageNumber, unLocode, type);
+          handlingEventService.registerHandlingEvent(completionTime, trackingId, voyageNumber, unLocode, type, operatorCode);
         } catch (CannotCreateHandlingEventException e) {
           logger.error(e, e);
           allErrors.put(trackingIdStr, e.getMessage());