Initial support for rescheduling a voyage and updating an itinerary to reflect schedule changes.

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Itinerary.java

@@ -3,8 +3,10 @@ package se.citerus.dddsample.domain.model.cargo;
 import org.apache.commons.lang.Validate;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.Location;
+import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.shared.ValueObject;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -29,6 +31,10 @@ public class Itinerary implements ValueObject<Itinerary> {
     Validate.notEmpty(legs);
     Validate.noNullElements(legs);
 
+    // TODO
+    // Validate that legs are in proper order, connected
+    // and that load/unload times are doable?
+
     this.legs = legs;
   }
 
@@ -144,6 +150,24 @@ public class Itinerary implements ValueObject<Itinerary> {
   }
 
   /**
+   * @param rescheduledVoyage the voyage that has been rescheduled
+   * @return A new itinerary which is a copy of the old one, adjusted for the delay of the given voyage.
+   */
+  public Itinerary withRescheduledVoyage(final Voyage rescheduledVoyage) {
+    final List<Leg> newLegsList = new ArrayList<Leg>(this.legs.size());
+
+    for (Leg leg : this.legs) {
+      if (leg.voyage().sameIdentityAs(rescheduledVoyage)) {
+        newLegsList.add(leg.withRescheduledVoyage(rescheduledVoyage));
+      } else {
+        newLegsList.add(leg);
+      }
+    }
+
+    return new Itinerary(newLegsList);
+  }
+
+  /**
    * @param other itinerary to compare
    * @return <code>true</code> if the legs in this and the other itinerary are all equal.
    */

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Leg.java

@@ -4,6 +4,7 @@ import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.domain.model.location.Location;
+import se.citerus.dddsample.domain.model.voyage.CarrierMovement;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.shared.ValueObject;
 
@@ -30,6 +31,32 @@ public class Leg implements ValueObject<Leg> {
     this.unloadTime = unloadTime;
   }
 
+  public Leg(final Voyage voyage, final Location loadLocation, final Location unloadLocation) {
+    Validate.notNull(voyage, "Voyage is required");
+    Validate.notNull(loadLocation, "Load location is required");
+    Validate.notNull(unloadLocation, "Unload location is required");
+    Validate.isTrue(!loadLocation.sameIdentityAs(unloadLocation));
+
+    CarrierMovement loadCm = null, unloadCm = null;
+    for (CarrierMovement carrierMovement : voyage.schedule().carrierMovements()) {
+      if (unloadCm == null && carrierMovement.departureLocation().sameIdentityAs(loadLocation)) {
+        loadCm = carrierMovement;
+      }
+      if (loadCm != null && carrierMovement.arrivalLocation().sameIdentityAs(unloadLocation)) {
+        unloadCm = carrierMovement;
+      }
+    }
+
+    Validate.notNull(loadCm, "Load location is not valid for this voyage");
+    Validate.notNull(unloadCm, "Unload location is not valid for this voyage");
+
+    this.voyage = voyage;
+    this.loadLocation = loadCm.departureLocation();
+    this.loadTime = loadCm.departureTime();
+    this.unloadLocation = unloadCm.arrivalLocation();
+    this.unloadTime = unloadCm.arrivalTime();
+  }
+
   public Voyage voyage() {
     return voyage;
   }
@@ -50,6 +77,14 @@ public class Leg implements ValueObject<Leg> {
     return new Date(unloadTime.getTime());
   }
 
+  /**
+   * @param voyage voyage
+   * @return A new leg with the same load and unload locations, but with updated load/unload times.
+   */
+  Leg withRescheduledVoyage(final Voyage voyage) {
+    return new Leg(voyage, loadLocation, unloadLocation);
+  }
+
   @Override
   public boolean sameValueAs(final Leg other) {
     return other != null && new EqualsBuilder().
@@ -82,6 +117,12 @@ public class Leg implements ValueObject<Leg> {
       toHashCode();
   }
 
+  @Override
+  public String toString() {
+    return "Load in " + loadLocation + " at " + loadTime +
+           ", unload in " + unloadLocation + " at " + unloadTime;
+  }
+
   Leg() {
     // Needed by Hibernate
   }

dddsample/src/main/java/se/citerus/dddsample/domain/model/voyage/CarrierMovement.java

@@ -73,6 +73,19 @@ public final class CarrierMovement implements ValueObject<CarrierMovement> {
     return new Date(arrivalTime.getTime());
   }
 
+  /**
+   * @param newDepartureTime new departure time
+   * @return A new CarrierMovement which is a copy of the old one but with a new departure time
+   */
+  CarrierMovement withDepartureTime(final Date newDepartureTime) {
+    return new CarrierMovement(
+      departureLocation,
+      arrivalLocation,
+      newDepartureTime,
+      arrivalTime
+    );
+  }
+
   @Override
   public boolean equals(final Object o) {
     if (this == o) return true;
@@ -109,5 +122,4 @@ public final class CarrierMovement implements ValueObject<CarrierMovement> {
 
   // Auto-generated surrogate key
   private Long id;
-
 }

dddsample/src/main/java/se/citerus/dddsample/domain/model/voyage/Voyage.java

@@ -43,6 +43,25 @@ public class Voyage implements Entity<Voyage> {
     return schedule;
   }
 
+  /**
+   * @param location location from where the rescheduled departure happens.
+   * @param newDepartureTime new departure time
+   */
+  public void departureRescheduled(final Location location, final Date newDepartureTime) {
+    final int size = schedule.carrierMovements().size();
+    final List<CarrierMovement> carrierMovements = new ArrayList<CarrierMovement>(size);
+
+    for (CarrierMovement carrierMovement : schedule.carrierMovements()) {
+      if (carrierMovement.departureLocation().sameIdentityAs(location)) {
+        carrierMovements.add(carrierMovement.withDepartureTime(newDepartureTime));
+      } else {
+        carrierMovements.add(carrierMovement);
+      }
+    }
+
+    this.schedule = new Schedule(carrierMovements);
+  }
+
   @Override
   public int hashCode() {
     return voyageNumber.hashCode();
@@ -76,6 +95,7 @@ public class Voyage implements Entity<Voyage> {
   // Needed by Hibernate
   private Long id;
 
+
   /**
    * Builder pattern is used for incremental construction
    * of a Voyage aggregate. This serves as an aggregate factory. 

dddsample/src/test/java/se/citerus/dddsample/domain/model/cargo/ItineraryTest.java

@@ -3,7 +3,6 @@ package se.citerus.dddsample.domain.model.cargo;
 import junit.framework.TestCase;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-import se.citerus.dddsample.domain.model.voyage.CarrierMovement;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
 
@@ -13,10 +12,7 @@ import java.util.Date;
 import java.util.List;
 
 public class ItineraryTest extends TestCase {
-  private final CarrierMovement abc = new CarrierMovement(SHANGHAI, ROTTERDAM, new Date(), new Date());
-  private final CarrierMovement def = new CarrierMovement(ROTTERDAM, GOTHENBURG, new Date(), new Date());
-  private final CarrierMovement ghi = new CarrierMovement(ROTTERDAM, NEWYORK, new Date(), new Date());
-  private final CarrierMovement jkl = new CarrierMovement(SHANGHAI, HELSINKI, new Date(), new Date());
+
 
   Voyage voyage, wrongVoyage;
 
@@ -92,10 +88,6 @@ public class ItineraryTest extends TestCase {
     
   }
 
-  public void testNextExpectedEvent() throws Exception {
-
-  }
-
   public void testCreateItinerary() throws Exception {
     try {
       new Itinerary(new ArrayList<Leg>());

dddsample/src/test/java/se/citerus/dddsample/domain/model/cargo/LegTest.java

@@ -1,13 +1,54 @@
 package se.citerus.dddsample.domain.model.cargo;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.NEW_YORK_TO_DALLAS;
+import se.citerus.dddsample.domain.model.voyage.Voyage;
 
-public class LegTest extends TestCase {
+public class LegTest {
 
+  final Voyage voyage = NEW_YORK_TO_DALLAS;
+
+  @Test(expected = IllegalArgumentException.class)
   public void testConstructor() throws Exception {
-    try {
-      new Leg(null,null,null,null,null);
-      fail("Should not accept null constructor arguments");
-    } catch (IllegalArgumentException expected) {}
+    new Leg(null, null, null);
+  }
+
+  @Test
+  public void legThatFollowsPartOfAVoyage() {
+    Leg chicagoToDallas = new Leg(voyage, CHICAGO, DALLAS);
+
+    assertEquals(chicagoToDallas.loadTime(), toDate("2008-10-24", "21:25"));
+    assertEquals(chicagoToDallas.loadLocation(), CHICAGO);
+    assertEquals(chicagoToDallas.unloadTime(), toDate("2008-10-25", "19:30"));
+    assertEquals(chicagoToDallas.unloadLocation(), DALLAS);
+  }
+
+  @Test
+  public void legThatFollowsAnEntireVoyage() {
+    Leg chicagoToDallas = new Leg(voyage, NEWYORK, DALLAS);
+
+    assertEquals(chicagoToDallas.loadTime(), toDate("2008-10-24", "07:00"));
+    assertEquals(chicagoToDallas.loadLocation(), NEWYORK);
+    assertEquals(chicagoToDallas.unloadTime(), toDate("2008-10-25", "19:30"));
+    assertEquals(chicagoToDallas.unloadLocation(), DALLAS);
   }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void locationsInWrongOrder() {
+    new Leg(voyage, DALLAS, CHICAGO);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void endLocationNotOnVoyage() {
+    new Leg(voyage, CHICAGO, HELSINKI);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void startLocationNotOnVoyage() {
+    new Leg(voyage, HONGKONG, DALLAS);
+  }
+
 }

dddsample/src/test/java/se/citerus/dddsample/scenario/VoyageRescheduledScenarioTest.java

@@ -0,0 +1,49 @@
+/**
+ * Purpose
+ * @author peter
+ * @created 2009-aug-05
+ * $Id$
+ */
+package se.citerus.dddsample.scenario;
+
+import junit.framework.TestCase;
+import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
+import se.citerus.dddsample.domain.model.cargo.Itinerary;
+import se.citerus.dddsample.domain.model.cargo.Leg;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.*;
+import se.citerus.dddsample.domain.model.voyage.Voyage;
+import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
+
+import static java.util.Arrays.asList;
+import java.util.Date;
+
+public class VoyageRescheduledScenarioTest extends TestCase {
+
+  public void testVoyageRescheduled() throws Exception {
+    // Creating new voyages to avoid rescheduling shared ones, breaking other tests
+    Voyage voyage1 = new Voyage(new VoyageNumber("V1"), HONGKONG_TO_NEW_YORK.schedule());
+    Voyage voyage2 = new Voyage(new VoyageNumber("V2"), NEW_YORK_TO_DALLAS.schedule());
+    Voyage voyage3 = new Voyage(new VoyageNumber("V3"), DALLAS_TO_HELSINKI.schedule());
+
+    Itinerary itinerary = new Itinerary(asList(
+      new Leg(voyage1, HANGZOU, NEWYORK),
+      new Leg(voyage2, NEWYORK, DALLAS),
+      new Leg(voyage3, DALLAS, STOCKHOLM)
+    ));
+
+    Date oldDepartureTime = toDate("2008-10-24", "07:00");
+
+    assertEquals(itinerary.legs().get(1).loadTime(), oldDepartureTime);
+    assertEquals(voyage2.schedule().carrierMovements().get(0).departureTime(), oldDepartureTime);
+
+    Date newDepartureTime = toDate("2008-10-24", "18:00");
+
+    voyage2.departureRescheduled(NEWYORK, newDepartureTime);
+    Itinerary newItinerary = itinerary.withRescheduledVoyage(voyage2);
+
+    assertEquals(voyage2.schedule().carrierMovements().get(0).departureTime(), newDepartureTime);
+    assertEquals(newItinerary.legs().get(1).loadTime(), newDepartureTime);
+  }
+
+}