Using HandlingEventRepository for tracking view.

dddsample/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java

@@ -8,10 +8,13 @@ import org.springframework.web.servlet.support.RequestContextUtils;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -33,6 +36,7 @@ import java.util.Map;
 public final class CargoTrackingController extends SimpleFormController {
 
   private CargoRepository cargoRepository;
+  private HandlingEventRepository handlingEventRepository;
 
   public CargoTrackingController() {
     setCommandClass(TrackCommand.class);
@@ -44,14 +48,16 @@ public final class CargoTrackingController extends SimpleFormController {
 
     final TrackCommand trackCommand = (TrackCommand) command;
     final String trackingIdString = trackCommand.getTrackingId();
-    
-    final Cargo cargo = cargoRepository.find(new TrackingId(trackingIdString));
 
-    final Map<String, CargoTrackingViewAdapter> model = new HashMap();
+    final TrackingId trackingId = new TrackingId(trackingIdString);
+    final Cargo cargo = cargoRepository.find(trackingId);
+
+    final Map<String, CargoTrackingViewAdapter> model = new HashMap<String, CargoTrackingViewAdapter>();
     if (cargo != null) {
       final MessageSource messageSource = getApplicationContext();
       final Locale locale = RequestContextUtils.getLocale(request);
-      model.put("cargo", new CargoTrackingViewAdapter(cargo, messageSource, locale));
+      final List<HandlingEvent> handlingEvents = handlingEventRepository.findEventsForCargo(trackingId);
+      model.put("cargo", new CargoTrackingViewAdapter(cargo, messageSource, locale, handlingEvents));
     } else {
       errors.rejectValue("trackingId", "cargo.unknown_id", new Object[]{trackCommand.getTrackingId()}, "Unknown tracking id");
     }
@@ -61,4 +67,9 @@ public final class CargoTrackingController extends SimpleFormController {
   public void setCargoRepository(CargoRepository cargoRepository) {
     this.cargoRepository = cargoRepository;
   }
+
+  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
+    this.handlingEventRepository = handlingEventRepository;
+  }
+
 }

dddsample/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java

@@ -29,13 +29,13 @@ public final class CargoTrackingViewAdapter {
    * @param cargo
    * @param messageSource
    * @param locale
+   * @param handlingEvents
    */
-  public CargoTrackingViewAdapter(Cargo cargo, MessageSource messageSource, Locale locale) {
+  public CargoTrackingViewAdapter(Cargo cargo, MessageSource messageSource, Locale locale, List<HandlingEvent> handlingEvents) {
     this.messageSource = messageSource;
     this.locale = locale;
     this.cargo = cargo;
 
-    final List<HandlingEvent> handlingEvents = cargo.delivery().history();
     this.events = new ArrayList<HandlingEventViewAdapter>(handlingEvents.size());
     for (HandlingEvent handlingEvent : handlingEvents) {
       events.add(new HandlingEventViewAdapter(handlingEvent));

dddsample/src/main/webapp/WEB-INF/dispatch-servlet.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-  <bean class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-    <property name="interceptors">
-      <list>
-        <ref bean="openSessionInViewInterceptor"/>
-      </list>
-    </property>
-  </bean>
-
-  <bean name="/cargo/track.html" class="se.citerus.dddsample.interfaces.tracking.CargoTrackingController">
-    <property name="sessionForm" value="true"/>
-    <property name="commandName" value="trackCommand"/>
-    <property name="formView" value="cargo/track"/>
-    <property name="successView" value="start"/>
-    <property name="cargoRepository" ref="cargoRepository"/>
-    <property name="validator" ref="trackCommandValidator"/>
-  </bean>
-
-  <bean id="trackCommandValidator" class="se.citerus.dddsample.interfaces.tracking.TrackCommandValidator"/>
-
-  <bean name="/admin/*" class="se.citerus.dddsample.interfaces.booking.web.CargoAdminController">
-    <property name="bookingServiceFacade" ref="bookingServiceFacade"/>
-  </bean>
-
-</beans>

dddsample/src/main/webapp/WEB-INF/tracking-servlet.xml

@@ -16,8 +16,9 @@
     <property name="commandName" value="trackCommand"/>
     <property name="formView" value="track"/>
     <property name="successView" value="start"/>
-    <property name="cargoRepository" ref="cargoRepository"/>
     <property name="validator" ref="trackCommandValidator"/>
+    <property name="cargoRepository" ref="cargoRepository"/>
+    <property name="handlingEventRepository" ref="handlingEventRepository"/>
   </bean>
 
   <bean id="trackCommandValidator" class="se.citerus.dddsample.interfaces.tracking.TrackCommandValidator"/>