Arrival deadline date is now passed as parameter into booking facade (not read from request parameter yet though).

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/BookingServiceFacade.java

@@ -6,6 +6,7 @@ import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -14,7 +15,7 @@ import java.util.List;
  */
 public interface BookingServiceFacade extends Remote {
 
-  String bookNewCargo(String origin, String destination) throws RemoteException;
+  String bookNewCargo(String origin, String destination, Date arrivalDeadline) throws RemoteException;
 
   CargoRoutingDTO loadCargoForRouting(String trackingId) throws RemoteException;
 

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/internal/BookingServiceFacadeImpl.java

@@ -29,7 +29,6 @@ import java.util.List;
  * service and for keeping the OR-mapper unit-of-work open during DTO assembly,
  * analogous to the view rendering for web interfaces.
  *
- * See context-remote.xml.  
  */
 public class BookingServiceFacadeImpl implements BookingServiceFacade {
 
@@ -45,10 +44,12 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
     return assembler.toDTOList(allLocations);
   }
 
-  public String bookNewCargo(String origin, String destination) {
-    // TODO push date to parameter
-    Date arrivalDeadline = new Date();
-    TrackingId trackingId = bookingService.bookNewCargo(new UnLocode(origin), new UnLocode(destination), arrivalDeadline);
+  public String bookNewCargo(String origin, String destination, Date arrivalDeadline) {
+    TrackingId trackingId = bookingService.bookNewCargo(
+      new UnLocode(origin), 
+      new UnLocode(destination),
+      arrivalDeadline
+    );
     return trackingId.idString();
   }
 

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java

@@ -9,10 +9,7 @@ import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Handles cargo booking and routing. Operates against a dedicated remoting service facade,
@@ -46,9 +43,9 @@ public final class CargoAdminController extends MultiActionController {
 
   public void register(final HttpServletRequest request, final HttpServletResponse response,
                        final RegistrationCommand command) throws Exception {
-
+    // TODO get date from command    
     final String trackingId = bookingServiceFacade.bookNewCargo(
-      command.getOriginUnlocode(), command.getDestinationUnlocode()
+      command.getOriginUnlocode(), command.getDestinationUnlocode(), new Date()
     );
     response.sendRedirect("show.html?trackingId=" + trackingId);
   }

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/web/RegistrationCommand.java

@@ -7,6 +7,7 @@ public final class RegistrationCommand {
 
   private String originUnlocode;
   private String destinationUnlocode;
+  private String arrivalDeadline;
 
   public String getOriginUnlocode() {
     return originUnlocode;
@@ -24,4 +25,11 @@ public final class RegistrationCommand {
     this.destinationUnlocode = destinationUnlocode;
   }
 
+  public String getArrivalDeadline() {
+    return arrivalDeadline;
+  }
+
+  public void setArrivalDeadline(String arrivalDeadline) {
+    this.arrivalDeadline = arrivalDeadline;
+  }
 }