Moved enum and logic into the domain model.

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

@@ -66,4 +66,41 @@ public class DeliveryHistory {
   // Needed by Hibernate
   DeliveryHistory() {}
 
+  public StatusCode status() {
+    if (lastEvent() == null)
+      return StatusCode.notReceived;
+
+    HandlingEvent.Type type = lastEvent().type();
+    if (type == HandlingEvent.Type.LOAD)
+      return StatusCode.onBoardCarrier;
+
+    if (type == HandlingEvent.Type.UNLOAD)
+      return StatusCode.inPort;
+
+    if (type == HandlingEvent.Type.RECEIVE)
+      return StatusCode.inPort;
+
+    if (type == HandlingEvent.Type.CLAIM)
+      return StatusCode.claimed;
+
+
+    return null;
+  }
+
+  public Location currentLocation() {
+    if (status().equals(StatusCode.inPort)) {
+      return lastEvent().location();
+    } else {
+      return null;
+    }
+  }
+
+  public CarrierMovement currentCarrierMovement() {
+    if (status().equals(StatusCode.onBoardCarrier)) {
+      return lastEvent().carrierMovement();
+    } else {
+      return null;
+    }
+  }
+  
 }

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

@@ -0,0 +1,8 @@
+package se.citerus.dddsample.domain;
+
+/**
+ *
+ */
+public enum StatusCode {
+  notReceived, inPort, onBoardCarrier, claimed
+}

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

@@ -1,10 +1,7 @@
 package se.citerus.dddsample.service;
 
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.CarrierMovement;
-import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
 import se.citerus.dddsample.service.dto.CargoWithHistoryDTO;
 import se.citerus.dddsample.service.dto.HandlingEventDTO;
@@ -22,30 +19,22 @@ public class CargoServiceImpl implements CargoService {
       return null;
     }
 
-    HandlingEvent lastEvent = cargo.deliveryHistory().lastEvent();
+    DeliveryHistory deliveryHistory = cargo.deliveryHistory();
 
     //CargoWithHistoryDTO
 
-    String currentLocationId = null;
-    String carrierMovementId = null;
-
-    if (lastEvent.type() == HandlingEvent.Type.UNLOAD || lastEvent.type() == HandlingEvent.Type.RECEIVE)
-      currentLocationId = cargo.lastKnownLocation().unLocode().idString();
-
-    if (lastEvent.type() == HandlingEvent.Type.LOAD)
-      carrierMovementId = lastEvent.carrierMovement().carrierId().idString();
-
-
+    Location currentLocation = deliveryHistory.currentLocation();
+    CarrierMovement currentCarrierMovement = deliveryHistory.currentCarrierMovement();
     final CargoWithHistoryDTO dto = new CargoWithHistoryDTO(
             cargo.trackingId().idString(),
             cargo.origin().toString(),
             cargo.finalDestination().toString(),
-            statusForLastEvent(lastEvent),
-            currentLocationId,
-            carrierMovementId
+            deliveryHistory.status(),
+            currentLocation == null ? null : currentLocation.unLocode().idString(),
+            currentCarrierMovement == null ? null : currentCarrierMovement.carrierId().idString()
     );
 
-    final List<HandlingEvent> events = cargo.deliveryHistory().eventsOrderedByCompletionTime();
+    final List<HandlingEvent> events = deliveryHistory.eventsOrderedByCompletionTime();
     for (HandlingEvent event : events) {
       CarrierMovement cm = event.carrierMovement();
       String carrierIdString = (cm == null) ? "" : cm.carrierId().idString();
@@ -64,25 +53,4 @@ public class CargoServiceImpl implements CargoService {
     this.cargoRepository = cargoRepository;
   }
 
-  public CargoWithHistoryDTO.StatusCode statusForLastEvent(HandlingEvent lastEvent) {
-
-    if (lastEvent == null)
-      return CargoWithHistoryDTO.StatusCode.notReceived;
-
-    HandlingEvent.Type type = lastEvent.type();
-    if (type == HandlingEvent.Type.LOAD)
-      return CargoWithHistoryDTO.StatusCode.onBoardCarrier;
-
-    if (type == HandlingEvent.Type.UNLOAD)
-      return CargoWithHistoryDTO.StatusCode.inPort;
-
-    if (type == HandlingEvent.Type.RECEIVE)
-      return CargoWithHistoryDTO.StatusCode.inPort;
-
-    if (type == HandlingEvent.Type.CLAIM)
-      return CargoWithHistoryDTO.StatusCode.claimed;
-
-
-    return null;
-  }
 }

dddsample/src/main/java/se/citerus/dddsample/service/dto/CargoWithHistoryDTO.java

@@ -1,5 +1,7 @@
 package se.citerus.dddsample.service.dto;
 
+import se.citerus.dddsample.domain.StatusCode;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,7 +19,6 @@ public class CargoWithHistoryDTO implements Serializable {
   String currentLocationId;
   List<HandlingEventDTO> events;
   String carrierMovementId;
-  String locationId;
   StatusCode statusCode;
 
   public CargoWithHistoryDTO(String trackingId, String origin, String finalDestination,
@@ -64,11 +65,4 @@ public class CargoWithHistoryDTO implements Serializable {
     return carrierMovementId;
   }
 
-  public String getLocationId() {
-    return locationId;
-  }
-
-  public enum StatusCode {
-    notReceived, inPort, onBoardCarrier, claimed
-  }
 }

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

@@ -9,6 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 public class DeliveryHistoryTest extends TestCase {
+  private Location ham = new Location(new UnLocode("DE", "HAM"), "Hamburg");
 
   public void testEvensOrderedByTimeOccured() throws Exception {
     DeliveryHistory dh = new DeliveryHistory();
@@ -32,5 +33,36 @@ public class DeliveryHistoryTest extends TestCase {
     assertSame(he3, orderEvents.get(3));
   }
 
-  
+  public void testCargoStatusFromLastHandlingEvent() {
+    DeliveryHistory deliveryHistory = new DeliveryHistory();
+
+    assertEquals(StatusCode.notReceived, deliveryHistory.status());
+
+    deliveryHistory.addEvent(new HandlingEvent(null, new Date(10), null, HandlingEvent.Type.RECEIVE, ham));
+    assertEquals(StatusCode.inPort, deliveryHistory.status());
+
+    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), ham, ham);
+    deliveryHistory.addEvent(new HandlingEvent(null, new Date(20), null, HandlingEvent.Type.LOAD, ham, carrierMovement));
+    assertEquals(StatusCode.onBoardCarrier, deliveryHistory.status());
+
+    deliveryHistory.addEvent(new HandlingEvent(null, new Date(30), null, HandlingEvent.Type.UNLOAD, ham, carrierMovement));
+    assertEquals(StatusCode.inPort, deliveryHistory.status());
+
+    deliveryHistory.addEvent(new HandlingEvent(null, new Date(40), null, HandlingEvent.Type.CLAIM, ham));
+    assertEquals(StatusCode.claimed, deliveryHistory.status());
+  }
+
+  public void testCurrentLocation() throws Exception {
+    DeliveryHistory deliveryHistory = new DeliveryHistory();
+
+    assertNull(deliveryHistory.currentLocation());
+
+    deliveryHistory.addEvent(new HandlingEvent(null, new Date(10), null, HandlingEvent.Type.RECEIVE, ham));
+    assertEquals(ham, deliveryHistory.currentLocation());
+
+    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), ham, ham);
+    deliveryHistory.addEvent(new HandlingEvent(null, new Date(20), null, HandlingEvent.Type.LOAD, ham, carrierMovement));
+    assertNull(deliveryHistory.currentLocation());
+  }
+
 }

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

@@ -1,32 +1,7 @@
 package se.citerus.dddsample.service;
 
 import junit.framework.TestCase;
-import se.citerus.dddsample.domain.*;
-import se.citerus.dddsample.service.dto.CargoWithHistoryDTO;
 
 public class CargoServiceImplTest extends TestCase {
 
-  public void testCargoStatusFromLastHandlingEvent() {
-
-    CargoServiceImpl cargoServiceImpl = new CargoServiceImpl();
-
-    HandlingEvent lastEvent = null;
-    assertEquals(CargoWithHistoryDTO.StatusCode.notReceived, cargoServiceImpl.statusForLastEvent(lastEvent));
-
-    Location ham = new Location(new UnLocode("DE", "HAM"), "Hamburg");
-    lastEvent = new HandlingEvent(null, null, null, HandlingEvent.Type.RECEIVE, ham);
-    assertEquals(CargoWithHistoryDTO.StatusCode.inPort, cargoServiceImpl.statusForLastEvent(lastEvent));
-
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), ham, ham);
-    lastEvent = new HandlingEvent(null, null, null, HandlingEvent.Type.LOAD, ham, carrierMovement);
-    assertEquals(CargoWithHistoryDTO.StatusCode.onBoardCarrier, cargoServiceImpl.statusForLastEvent(lastEvent));
-
-    lastEvent = new HandlingEvent(null, null, null, HandlingEvent.Type.UNLOAD, ham, carrierMovement);
-    assertEquals(CargoWithHistoryDTO.StatusCode.inPort, cargoServiceImpl.statusForLastEvent(lastEvent));
-
-    lastEvent = new HandlingEvent(null, null, null, HandlingEvent.Type.CLAIM, ham);
-    assertEquals(CargoWithHistoryDTO.StatusCode.claimed, cargoServiceImpl.statusForLastEvent(lastEvent));
-
-  }
-
 }

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

@@ -51,7 +51,7 @@ public class CargoTrackingControllerTest extends TestCase {
                 cargo.trackingId().idString(),
                 cargo.origin().unLocode().idString(),
                 cargo.finalDestination().unLocode().idString(),
-                CargoWithHistoryDTO.StatusCode.claimed, 
+                StatusCode.claimed,
                 "AAAAA",
                 "BALO");
         cargoDTO.addEvent(new HandlingEventDTO(