Added Location to HandlingEvent

dddsample/src/main/java/se/citerus/dddsample/domain/Cargo.java

@@ -48,6 +48,13 @@ public class Cargo {
     return currentLocation().equals(finalDestination);
   }
 
+  /**
+   * Returns the last known Location or Location.UNKOWN if no HandlingEvent history can be found for this Cargo
+   * 
+   * TODO: Rename this to lastKnownLocation. 
+   * 
+   * @return The last known location
+   */
   public Location currentLocation() {
     HandlingEvent lastEvent = history.lastEvent();
     
@@ -57,13 +64,6 @@ public class Cargo {
     }
    
     Location location = lastEvent.location();
-    
-    // If the last handling event has no idea of where the cargo is due to lack of CarrierMovement (like for CLAIM or RECEIVE events)
-    // location must be calculated based on event type and origin or final destination
-    // TODO: Maybe we need to refactor HandlingEvent.
-    if (location == Location.UNKNOWN){
-      location = (lastEvent.type() == HandlingEvent.Type.CLAIM) ? finalDestination : origin;
-    }
       
     return location;
   }

dddsample/src/main/java/se/citerus/dddsample/domain/HandlingEvent.java

@@ -3,6 +3,7 @@ package se.citerus.dddsample.domain;
 import org.apache.commons.lang.builder.EqualsBuilder;
 
 import javax.persistence.*;
+
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -32,6 +33,9 @@ public class HandlingEvent {
   private Date timeOccurred;
 
   private Date timeRegistered;
+  
+  @ManyToOne
+  private Location location;
 
   @Transient // TODO: cargo-event relation should not be bidirectional
   private Set<Cargo> cargos;
@@ -40,17 +44,18 @@ public class HandlingEvent {
     LOAD, UNLOAD, RECEIVE, CLAIM
   }
 
-  public HandlingEvent(Date timeOccurred, Date timeRegistered, Type type) {
-    this(timeOccurred, timeRegistered, type, null);
+  public HandlingEvent(Date timeOccurred, Date timeRegistered, Type type, Location location) {
+    this(timeOccurred, timeRegistered, type, location, null);
   }
 
-  public HandlingEvent(Date timeOccurred, Date timeRegistered, Type type, CarrierMovement carrierMovement) {
+  public HandlingEvent(Date timeOccurred, Date timeRegistered, Type type, Location location, CarrierMovement carrierMovement) {
     this.id = UUID.randomUUID();
     this.timeRegistered = timeRegistered;
     this.timeOccurred = timeOccurred;
     this.type = type;
     this.carrierMovement = carrierMovement;
     this.cargos = new HashSet<Cargo>();
+    this.location = location;
   }
 
   /**
@@ -87,52 +92,34 @@ public class HandlingEvent {
   }
 
   /**
-   * Returns the Location of the Cargo. The location is calculated based on the following rules:
-   * <br>For
-   * <ul>
-   * <li> RECEIVE events: Location.UNKNOWN is returned. This basically means that the cargo is at its origin but not yet loaded on a CarrierMovment
-   * <li> CLAIM events: Location.UNKNOWN is returned. This means that the cargo is at its final destination and has been unloaded and claimed by the customer.
-   * <li> LOAD events: The from Location is returned.
-   * <li> UNLOAD events: The to Location is returned.
-   * </ul> 
+   * Returns the Location of the HandlingEvent
    * 
    * @return The Location
    */
-  public Location location() {
-    Location location = Location.UNKNOWN;
-    
-    //My gosh! A switch statement....
-    switch (type) {
-      case LOAD:
-        location = carrierMovement.from();
-      break;
-
-      case UNLOAD:
-        location = carrierMovement.to();
-      break;
-      
-      default: 
-        // for others (RECEIVE, CLAIM) Location.NULL is fine...
-      break;
-    }
-    
+  public Location location() {    
     return location;
   }
 
 
   /**
-   * Register a set of Cargos
+   * Add a Cargo to this HandlingEvent
    * 
-   * @param cargosToRegister
+   * @param cargo
    */
-  public void register(Set<Cargo> cargosToRegister) {
-    this.cargos.addAll(cargosToRegister);
+  public void add(Cargo cargo) {
+    this.cargos.add(cargo);
   }
   
-  public Set<Cargo> registerdCargos(){
+  /**
+   * Returns a Set of Cargos associated with this HandlingEvent
+   * 
+   * @return The associated Cargos
+   */
+  public Set<Cargo> cargos(){
     return cargos;
   }
 
+
   @Override
   public boolean equals(Object obj) {
     if (!(obj instanceof HandlingEvent)) {

dddsample/src/main/java/se/citerus/dddsample/repository/HandlingEventRepositoryInMem.java

@@ -34,63 +34,53 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
     
     // CargoXYZ
     final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
-    registerEvent(cargoXYZ, "2007-11-30", HandlingEvent.Type.RECEIVE, null);
+    registerEvent(cargoXYZ, "2007-11-30", HandlingEvent.Type.RECEIVE, new Location("SESTO"), null);
 
     final CarrierMovement stockholmToHamburg = carrierMovementRepository.find(new CarrierId("SESTO_DEHAM"));
-    registerEvent(cargoXYZ, "2007-12-01", HandlingEvent.Type.LOAD, stockholmToHamburg);
-    registerEvent(cargoXYZ, "2007-12-02", HandlingEvent.Type.UNLOAD, stockholmToHamburg);
+    registerEvent(cargoXYZ, "2007-12-01", HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg);
+    registerEvent(cargoXYZ, "2007-12-02", HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg);
     
     final CarrierMovement hamburgToHongKong = carrierMovementRepository.find(new CarrierId("DEHAM_CNHKG"));
-    registerEvent(cargoXYZ, "2007-12-03", HandlingEvent.Type.LOAD, hamburgToHongKong);
-    registerEvent(cargoXYZ, "2007-12-05", HandlingEvent.Type.UNLOAD, hamburgToHongKong);
+    registerEvent(cargoXYZ, "2007-12-03", HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong);
+    registerEvent(cargoXYZ, "2007-12-05", HandlingEvent.Type.UNLOAD, new Location("CNHKG"), hamburgToHongKong);
     
     //CargoZYX
     final Cargo cargoZYX = new Cargo(new TrackingId("ZYX"), new Location("AUMEL"), new Location("SESTO"));
-    registerEvent(cargoZYX, "2007-12-09", HandlingEvent.Type.RECEIVE, null);
+    registerEvent(cargoZYX, "2007-12-09", HandlingEvent.Type.RECEIVE, new Location("AUMEL"), null);
     
     final CarrierMovement melbourneToTokyo = carrierMovementRepository.find(new CarrierId("AUMEL_JPTOK"));
-    registerEvent(cargoZYX, "2007-12-10", HandlingEvent.Type.LOAD, melbourneToTokyo);
-    registerEvent(cargoZYX, "2007-12-12", HandlingEvent.Type.UNLOAD, melbourneToTokyo);
+    registerEvent(cargoZYX, "2007-12-10", HandlingEvent.Type.LOAD, new Location("AUMEL"), melbourneToTokyo);
+    registerEvent(cargoZYX, "2007-12-12", HandlingEvent.Type.UNLOAD, new Location("JPTOK"), melbourneToTokyo);
     
     final CarrierMovement tokyoToLosAngeles = carrierMovementRepository.find(new CarrierId("JPTOK_USLA"));
-    registerEvent(cargoZYX, "2007-12-13", HandlingEvent.Type.LOAD, tokyoToLosAngeles);
+    registerEvent(cargoZYX, "2007-12-13", HandlingEvent.Type.LOAD, new Location("JPTOK"), tokyoToLosAngeles);
  
     //CargoABC
     final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new Location("SESTO"), new Location("FIHEL"));
-    registerEvent(cargoABC, "2008-01-01", HandlingEvent.Type.RECEIVE, null);
+    registerEvent(cargoABC, "2008-01-01", HandlingEvent.Type.RECEIVE, new Location("SESTO"), null);
     
     final CarrierMovement stockholmToHelsinki = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("FIHEL"));
 
-    registerEvent(cargoABC, "2008-01-02", HandlingEvent.Type.LOAD, stockholmToHelsinki);
-    registerEvent(cargoABC, "2008-01-03", HandlingEvent.Type.UNLOAD, stockholmToHelsinki);
-    registerEvent(cargoABC, "2008-01-05", HandlingEvent.Type.CLAIM, null);
+    registerEvent(cargoABC, "2008-01-02", HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHelsinki);
+    registerEvent(cargoABC, "2008-01-03", HandlingEvent.Type.UNLOAD, new Location("FIHEL"), stockholmToHelsinki);
+    registerEvent(cargoABC, "2008-01-05", HandlingEvent.Type.CLAIM, new Location("FIHEL"), null);
 
     //CargoCBA
     final Cargo cargoCBA = new Cargo(new TrackingId("CBA"), new Location("FIHEL"), new Location("SESTO"));
-    registerEvent(cargoCBA, "2008-01-10", HandlingEvent.Type.RECEIVE, null);
+    registerEvent(cargoCBA, "2008-01-10", HandlingEvent.Type.RECEIVE, new Location("FIHEL"), null);
   }
 
   
-  private void registerEvent(Cargo cargo, String date, Type type, CarrierMovement carrierMovement) throws ParseException{
-    HandlingEvent ev= new HandlingEvent(getDate(date), new Date(), type, carrierMovement);
-    ev.register(toSet(cargo));
+  private void registerEvent(Cargo cargo, String date, Type type, Location location, CarrierMovement carrierMovement) throws ParseException{
+    HandlingEvent ev= new HandlingEvent(getDate(date), new Date(), type, location, carrierMovement);
+    ev.add(cargo);
     String id = cargo.trackingId() + "_" + type + "_" + date;
     
     logger.debug("Adding event " + id + "(" + ev + ")");
     eventDB.put(id, ev);
   }
   
-  
-  private Set<Cargo> toSet(Cargo... cargoArgs) {
-    Set<Cargo> cargos = new HashSet<Cargo>();
-    for (Cargo cargo : cargoArgs) {
-      cargos.add(cargo);
-    }
-    
-    return cargos;
-  }
-
   /**
    * Parse an ISO 8601 (YYYY-MM-DD) String to Date
    * 
@@ -111,7 +101,7 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
 
   public void save(HandlingEvent event) {
     // Mimmick saving to database
-    for (Cargo cargo : event.registerdCargos()) {
+    for (Cargo cargo : event.cargos()) {
       cargo.handle(event);
     }
   }
@@ -120,7 +110,7 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
   public Set<HandlingEvent> findByTrackingId(final TrackingId trackingId) {
     Set<HandlingEvent> events = new HashSet<HandlingEvent>();
     for (HandlingEvent event : eventDB.values()) {
-      for (Cargo cargo : event.registerdCargos()) {
+      for (Cargo cargo : event.cargos()) {
         if (cargo.trackingId().equals(trackingId)) {
           events.add(event);
           break;

dddsample/src/main/java/se/citerus/dddsample/service/HandlingEventService.java

@@ -2,6 +2,8 @@ package se.citerus.dddsample.service;
 
 import java.util.Date;
 
+import se.citerus.dddsample.domain.Location;
+
 
 public interface HandlingEventService {
 
@@ -12,9 +14,10 @@ public interface HandlingEventService {
    * 
    * @param date
    * @param type
+   * @param location TODO
    * @param carrierId
-   * @param trackIds
+   * @param trackId
    */
-  public abstract void register(Date date, String type, String carrierId, String[] trackIds);
+  public abstract void register(Date date, String type, Location location, String carrierId, String trackId);
 
 }

dddsample/src/main/java/se/citerus/dddsample/service/HandlingEventServiceImpl.java

@@ -1,16 +1,20 @@
 package se.citerus.dddsample.service;
 
+import java.util.Date;
+
 import org.apache.commons.lang.Validate;
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.*;
+
+import se.citerus.dddsample.domain.Cargo;
+import se.citerus.dddsample.domain.CarrierId;
+import se.citerus.dddsample.domain.CarrierMovement;
+import se.citerus.dddsample.domain.HandlingEvent;
+import se.citerus.dddsample.domain.Location;
+import se.citerus.dddsample.domain.TrackingId;
 import se.citerus.dddsample.repository.CargoRepository;
 import se.citerus.dddsample.repository.CarrierMovementRepository;
 import se.citerus.dddsample.repository.HandlingEventRepository;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
 public class HandlingEventServiceImpl implements HandlingEventService {
   private CargoRepository cargoRepository;
   private CarrierMovementRepository carrierMovementRepository;
@@ -18,27 +22,15 @@ public class HandlingEventServiceImpl implements HandlingEventService {
 
 
   @Transactional(readOnly = false)
-  public void register(Date date, String type, String carrierId, String[] trackingIds) {
+  public void register(Date date, String type, Location location, String carrierId, String trackingId) {
     CarrierMovement cm = findCarrier(new CarrierId(carrierId));
-    HandlingEvent event = new HandlingEvent(date, new Date(), HandlingEvent.parseType(type), cm);
-    Set<Cargo> cargos = findCargos(trackingIds);
-    event.register(cargos);
+    HandlingEvent event = new HandlingEvent(date, new Date(), HandlingEvent.parseType(type), location, cm);
+    Cargo cargo = findCargo(trackingId);
+    event.add(cargo);
     
     handlingEventRepository.save(event);
   }
 
-
-  private Set<Cargo> findCargos(String[] trackingIds) {
-    Set<Cargo> cargos = new HashSet<Cargo>();
-    
-    for (String trackingId : trackingIds) {
-      cargos.add(findCargo(trackingId));
-    }
-    
-    return cargos;
-  }
-
-
   private Cargo findCargo(String trackingId) {
     Cargo cargo = cargoRepository.find(new TrackingId(trackingId));
     Validate.notNull(cargo, "Cargo is not found. Tracking ID=" + trackingId);

dddsample/src/test/java/se/citerus/dddsample/domain/CargoTest.java

@@ -68,7 +68,7 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoReceivedStockholm() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, null));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, new Location("SESTO")));
 
     return cargo;
   }
@@ -76,7 +76,7 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoClaimedMelbourne() throws Exception {
     final Cargo cargo = populateCargoOffMelbourne();
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-09"), new Date(), HandlingEvent.Type.CLAIM, null));
+    cargo.handle(new HandlingEvent(getDate("2007-12-09"), new Date(), HandlingEvent.Type.CLAIM, new Location("AUMEL")));
     
     return cargo;
   }
@@ -88,14 +88,14 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
-    cargo.handle(new HandlingEvent(getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, new Location("CNHGK"), hamburgToHongKong));
 
     return cargo;
   }
@@ -106,13 +106,13 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong));
 
     return cargo;
   }
@@ -123,20 +123,20 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
-    cargo.handle(new HandlingEvent(getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, new Location("CNHGK"), hamburgToHongKong));
 
     final CarrierMovement hongKongToMelbourne = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("CNHGK"), new Location("AUMEL"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, hongKongToMelbourne));
-    cargo.handle(new HandlingEvent(getDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, hongKongToMelbourne));
+    cargo.handle(new HandlingEvent(getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, new Location("CNHGK"), hongKongToMelbourne));
+    cargo.handle(new HandlingEvent(getDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, new Location("AUMEL"), hongKongToMelbourne));
 
     return cargo;
   }
@@ -147,19 +147,19 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
-    cargo.handle(new HandlingEvent(getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, new Location("CNHGK"), hamburgToHongKong));
 
     final CarrierMovement hongKongToMelbourne = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("CNHGK"), new Location("AUMEL"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, hongKongToMelbourne));
+    cargo.handle(new HandlingEvent(getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, new Location("CNHGK"), hongKongToMelbourne));
 
     return cargo;
   }

dddsample/src/test/java/se/citerus/dddsample/domain/DeliveryHistoryTest.java

@@ -14,10 +14,10 @@ public class DeliveryHistoryTest extends TestCase {
     assertTrue(dh.eventsOrderedByTime().isEmpty());
 
     DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-    HandlingEvent he1 = new HandlingEvent(df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE);
-    HandlingEvent he2 = new HandlingEvent(df.parse("2010-01-01"), new Date(), HandlingEvent.Type.LOAD);
-    HandlingEvent he3 = new HandlingEvent(df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM);
-    HandlingEvent he4 = new HandlingEvent(df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD);
+    HandlingEvent he1 = new HandlingEvent(df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE, new Location("a"));
+    HandlingEvent he2 = new HandlingEvent(df.parse("2010-01-01"), new Date(), HandlingEvent.Type.LOAD, new Location("b"));
+    HandlingEvent he3 = new HandlingEvent(df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM, new Location("c"));
+    HandlingEvent he4 = new HandlingEvent(df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("d"));
     dh.addEvent(he1, he2, he3, he4);
 
     List<HandlingEvent> orderEvents = dh.eventsOrderedByTime();

dddsample/src/test/java/se/citerus/dddsample/domain/HandlingEventTest.java

@@ -6,38 +6,31 @@ import se.citerus.dddsample.domain.HandlingEvent.Type;
 import java.util.Date;
 
 public class HandlingEventTest extends TestCase {
-  public void testCurrentLocationLoadEvent() throws Exception {
+  public void testCurrentLocation() throws Exception {
     Location locationAAA = new Location("AAA");
     Location locationBBB = new Location("BBB");
     CarrierId carrierId = new CarrierId("CAR_001");
     CarrierMovement cm = new CarrierMovement(carrierId, locationAAA, locationBBB);
     
-    HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.LOAD, cm);
+    Date timeOccured = new Date();
+    Date timeRegistrated = new Date();
+    HandlingEvent ev = new HandlingEvent(timeOccured, timeRegistrated, HandlingEvent.Type.LOAD, locationAAA, cm);
     
     assertEquals(locationAAA, ev.location());
   }
   
-  public void testCurrentLocationUnloadEvent() throws Exception {
+  public void testCurrentLocationMisdirectedCargo() throws Exception {
     Location locationAAA = new Location("AAA");
     Location locationBBB = new Location("BBB");
+    Location locationCCC = new Location("CCC");
     CarrierId carrierId = new CarrierId("CAR_001");
     CarrierMovement cm = new CarrierMovement(carrierId, locationAAA, locationBBB);
     
-    HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.UNLOAD, cm);
+    HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.UNLOAD, locationCCC, cm);
     
-    assertEquals(locationBBB, ev.location());
+    assertEquals(locationCCC, ev.location());
   }
   
-  public void testCurrentLocationReceivedEvent() throws Exception {
-    HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.RECEIVE, null);
-
-    assertEquals(Location.UNKNOWN, ev.location());
-  }
-  public void testCurrentLocationClaimedEvent() throws Exception {
-    HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.CLAIM, null);
-
-    assertEquals(Location.UNKNOWN, ev.location());
-  }
   
   public void testParseType() throws Exception {
     assertEquals(Type.CLAIM, HandlingEvent.parseType("CLAIM"));
@@ -63,8 +56,8 @@ public class HandlingEventTest extends TestCase {
     CarrierId carrierId = new CarrierId("CAR_001");
     CarrierMovement cm = new CarrierMovement(carrierId, locationAAA, locationBBB);
 
-    HandlingEvent ev1 = new HandlingEvent(timeOccured, timeRegistered, HandlingEvent.Type.LOAD, cm);
-    HandlingEvent ev2 = new HandlingEvent(timeOccured, timeRegistered, HandlingEvent.Type.LOAD, cm);
+    HandlingEvent ev1 = new HandlingEvent(timeOccured, timeRegistered, HandlingEvent.Type.LOAD, locationAAA, cm);
+    HandlingEvent ev2 = new HandlingEvent(timeOccured, timeRegistered, HandlingEvent.Type.LOAD, locationAAA, cm);
 
     // They are the same real-world event
     assertTrue(ev1.sameAs(ev2));

dddsample/src/test/java/se/citerus/dddsample/domain/TrackingScenarioTest.java

@@ -33,14 +33,14 @@ public class TrackingScenarioTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
-    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, new Location("SESTO"), stockholmToHamburg));
+    cargo.handle(new HandlingEvent(getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, new Location("DEHAM"), stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierId("CAR_002"), new Location("DEHAM"), new Location("CNHKG"));
 
-    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
-    cargo.handle(new HandlingEvent(getDate("2007-12-05"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, new Location("DEHAM"), hamburgToHongKong));
+    cargo.handle(new HandlingEvent(getDate("2007-12-05"), new Date(), HandlingEvent.Type.UNLOAD, new Location("CNHKG"), hamburgToHongKong));
 
     return cargo;
   }

dddsample/src/test/java/se/citerus/dddsample/service/CargoServiceTest.java

@@ -70,7 +70,7 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
         Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("ORIG"), new Location("DEST"));
         CarrierMovement cm = new CarrierMovement(new CarrierId("CAR_001"), new Location("FROM"), new Location("TO"));
         cargo.deliveryHistory().addEvent(
-                new HandlingEvent(new Date(10L), new Date(20L), HandlingEvent.Type.CLAIM, cm)
+                new HandlingEvent(new Date(10L), new Date(20L), HandlingEvent.Type.CLAIM, new Location("TO"), cm)
         );
         return cargo;
       }
@@ -87,12 +87,12 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
     assertEquals("XYZ", cargoDTO.getTrackingId());
     assertEquals("ORIG", cargoDTO.getOrigin());
     assertEquals("DEST", cargoDTO.getFinalDestination());
-    assertEquals("DEST", cargoDTO.getCurrentLocation());
+    assertEquals("TO", cargoDTO.getCurrentLocation());
 
     List<HandlingEventDTO> events = cargoDTO.getEvents();
     assertEquals(1, events.size());
     HandlingEventDTO eventDTO = events.get(0);
-    assertEquals(Location.UNKNOWN.unlocode(), eventDTO.getLocation());
+    assertEquals("TO", eventDTO.getLocation());
     assertEquals("CLAIM", eventDTO.getType());
     assertEquals("CAR_001", eventDTO.getCarrier());    
     assertEquals(new Date(10), eventDTO.getTime());

dddsample/src/test/java/se/citerus/dddsample/service/HandlingEventServiceTest.java

@@ -17,7 +17,6 @@ public class HandlingEventServiceTest extends TestCase {
   private HandlingEventRepository handlingEventRepository;
   
   private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new Location("ABCFROM"), new Location("ABCTO"));
-  private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new Location("XYZFROM"), new Location("XYZTO"));
   private final CarrierMovement cmAAA_BBB = new CarrierMovement(
           new CarrierId("CAR_001"), new Location("AAA"), new Location("BBB"));
 
@@ -34,12 +33,11 @@ public class HandlingEventServiceTest extends TestCase {
 
   public void testRegisterEvent() throws Exception {
     String carrierId = "AAA_BBB";
-    final String[] trackIds = { "ABC", "XYZ" };
+    final String trackId = "ABC";
     Date date = Calendar.getInstance().getTime();
     String type = "UNLOAD";
     
     expect(cargoRepository.find(new TrackingId("ABC"))).andReturn(cargoABC);
-    expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(cargoXYZ);
     expect(carrierMovementRepository.find(new CarrierId("AAA_BBB"))).andReturn(cmAAA_BBB);
 
     // TODO: does not inspect the handling event instance in a sufficient way
@@ -47,24 +45,23 @@ public class HandlingEventServiceTest extends TestCase {
     
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     
-    service.register(date, type, carrierId, trackIds);
+    service.register(date, type, new Location("ABCTO"), carrierId, trackId);
     
     verify(cargoRepository, carrierMovementRepository, handlingEventRepository);
   }
   
   public void testRegisterEventInvalidCarrier() throws Exception {
-    final String[] trackIds = { "ABC", "XYZ" };
+    final String trackId = "ABC";
     Date date = Calendar.getInstance().getTime();
     String type = "UNLOAD";
     
     expect(cargoRepository.find(new TrackingId("ABC"))).andReturn(cargoABC);
-    expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(cargoXYZ);
     expect(carrierMovementRepository.find(new CarrierId("AAA_BBB"))).andReturn(null);
     
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     
     try {
-      service.register(date, type, "AAA_BBB", trackIds);
+      service.register(date, type, new Location("BBB"), "AAA_BBB", trackId);
       assertFalse(true);
     } catch (IllegalArgumentException e) {
       // Expected IllegalArgumentExecption
@@ -72,18 +69,17 @@ public class HandlingEventServiceTest extends TestCase {
   }
   
   public void testRegisterEventInvalidCargo() throws Exception {
-    final String[] trackIds = { "ABC", "XYZ" };
+    final String trackId =  "XYZ";
     Date date = Calendar.getInstance().getTime();
     String type = "UNLOAD";
     
-    expect(cargoRepository.find(new TrackingId("ABC"))).andReturn(cargoABC);
     expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(null);
     expect(carrierMovementRepository.find(new CarrierId("AAA_BBB"))).andReturn(cmAAA_BBB);
     
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     
     try {
-      service.register(date, type, "AAA_BBB", trackIds);
+      service.register(date, type,  new Location("BBB"), "AAA_BBB", trackId);
       assertFalse(true);
     } catch (IllegalArgumentException e) {
       // Expected IllegalArgumentExecption

dddsample/src/test/java/se/citerus/dddsample/web/CargoTrackingControllerTest.java

@@ -44,7 +44,7 @@ public class CargoTrackingControllerTest extends TestCase {
     return new CargoService() {
       public CargoWithHistoryDTO find(String trackingId) {
         Cargo cargo = new Cargo(new TrackingId(trackingId), new Location("AAA"), new Location("BBB"));
-        HandlingEvent event = new HandlingEvent(new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE);
+        HandlingEvent event = new HandlingEvent(new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE, new Location("AAA"));
         cargo.deliveryHistory().addEvent(event);
 
         // TODO: use DTO assemblers