Added fromDTO to ItineraryCandidateDTOAssembler, using that in CargoServiceImpl.

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

@@ -8,9 +8,12 @@ import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
 import se.citerus.dddsample.repository.CarrierMovementRepository;
 import se.citerus.dddsample.repository.LocationRepository;
-import se.citerus.dddsample.service.dto.*;
+import se.citerus.dddsample.service.dto.CargoRoutingDTO;
+import se.citerus.dddsample.service.dto.CargoTrackingDTO;
+import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.service.dto.assembler.CargoRoutingDTOAssembler;
 import se.citerus.dddsample.service.dto.assembler.CargoTrackingDTOAssembler;
+import se.citerus.dddsample.service.dto.assembler.ItineraryCandidateDTOAssembler;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -110,29 +113,27 @@ public final class CargoServiceImpl implements CargoService {
   }
 
   @Transactional(readOnly = false)
-  public void assignItinerary(final TrackingId trackingId, final ItineraryCandidateDTO itinerary) {
+  public void assignItinerary(final TrackingId trackingId, final ItineraryCandidateDTO dto) {
     Validate.notNull(trackingId);
-    Validate.notNull(itinerary);
+    Validate.notNull(dto);
 
     final Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) {
       throw new IllegalArgumentException("Can't assign itinerary to non-existing cargo " + trackingId);
     }
 
-    final List<Leg> legs = new ArrayList<Leg>(itinerary.getLegs().size());
-    for (LegDTO legDTO : itinerary.getLegs()) {
-      final CarrierMovementId carrierMovementId = new CarrierMovementId(legDTO.getCarrierMovementId());
-      final CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
-      final Location from = locationRepository.find(new UnLocode(legDTO.getFrom()));
-      final Location to = locationRepository.find(new UnLocode(legDTO.getTo()));
-      legs.add(new Leg(carrierMovement, from, to));
-    }
-    // TODO: delete orphaned itineraries.
-    // Can't cascade delete-orphan for many-to-one using mapping directives.
-    cargo.setItinerary(new Itinerary(legs));
+    final ItineraryCandidateDTOAssembler itineraryCandidateDTOAssembler = new ItineraryCandidateDTOAssembler();
+    final Itinerary newItinerary = itineraryCandidateDTOAssembler.fromDTO(dto, carrierMovementRepository, locationRepository);
+
+    /* TODO: delete orphaned itinerary
+    final Itinerary oldItinerary = cargo.itinerary();
+    cargoRepository.deleteItinerary(oldItinerary);
+    */
+    cargo.setItinerary(newItinerary);
     cargoRepository.save(cargo);
   }
 
+
   public void setCargoRepository(final CargoRepository cargoRepository) {
     this.cargoRepository = cargoRepository;
   }

dddsample/src/main/java/se/citerus/dddsample/service/dto/assembler/ItineraryCandidateDTOAssembler.java

@@ -1,9 +1,8 @@
 package se.citerus.dddsample.service.dto.assembler;
 
-import se.citerus.dddsample.domain.CarrierMovementId;
-import se.citerus.dddsample.domain.Itinerary;
-import se.citerus.dddsample.domain.Leg;
-import se.citerus.dddsample.domain.UnLocode;
+import se.citerus.dddsample.domain.*;
+import se.citerus.dddsample.repository.CarrierMovementRepository;
+import se.citerus.dddsample.repository.LocationRepository;
 import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.service.dto.LegDTO;
 
@@ -14,7 +13,7 @@ import java.util.List;
  * Assembler class for the ItineraryCandidateDTO.
  */
 public class ItineraryCandidateDTOAssembler {
-
+  
   public ItineraryCandidateDTO toDTO(final Itinerary itinerary) {
     final List<LegDTO> legDTOs = new ArrayList<LegDTO>(itinerary.legs().size());
     for (Leg leg : itinerary.legs()) {
@@ -30,4 +29,15 @@ public class ItineraryCandidateDTOAssembler {
     return new LegDTO(carrierMovementId.idString(), from.idString(), to.idString());
   }
 
+  public Itinerary fromDTO(ItineraryCandidateDTO itineraryCandidateDTO, CarrierMovementRepository carrierMovementRepository, LocationRepository locationRepository) {
+    final List<Leg> legs = new ArrayList<Leg>(itineraryCandidateDTO.getLegs().size());
+    for (LegDTO legDTO : itineraryCandidateDTO.getLegs()) {
+      final CarrierMovementId carrierMovementId = new CarrierMovementId(legDTO.getCarrierMovementId());
+      final CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
+      final Location from = locationRepository.find(new UnLocode(legDTO.getFrom()));
+      final Location to = locationRepository.find(new UnLocode(legDTO.getTo()));
+      legs.add(new Leg(carrierMovement, from, to));
+    }
+    return new Itinerary(legs);
+  }
 }

dddsample/src/test/java/se/citerus/dddsample/service/dto/assembler/ItineraryCandidateDTOAssemblerTest.java

@@ -1,11 +1,17 @@
 package se.citerus.dddsample.service.dto.assembler;
 
 import junit.framework.TestCase;
+import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.domain.*;
 import static se.citerus.dddsample.domain.SampleLocations.*;
+import se.citerus.dddsample.repository.CarrierMovementRepository;
+import se.citerus.dddsample.repository.LocationRepository;
 import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.service.dto.LegDTO;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ItineraryCandidateDTOAssemblerTest extends TestCase {
 
   public void testToDTO() throws Exception {
@@ -35,4 +41,49 @@ public class ItineraryCandidateDTOAssemblerTest extends TestCase {
     assertEquals("NLRTM", legDTO.getFrom());
     assertEquals("AUMEL", legDTO.getTo());
   }
+
+  public void testFromDTO() throws Exception {
+    final ItineraryCandidateDTOAssembler assembler = new ItineraryCandidateDTOAssembler();
+
+    final List<LegDTO> legs = new ArrayList<LegDTO>();
+    legs.add(new LegDTO("CM1", "AAAAA", "BBBBB"));
+    legs.add(new LegDTO("CM2", "BBBBB", "CCCCC"));
+
+    final LocationRepository locationRepository = createMock(LocationRepository.class);
+    expect(locationRepository.find(new UnLocode("AAAAA"))).andReturn(HONGKONG);
+    expect(locationRepository.find(new UnLocode("BBBBB"))).andReturn(TOKYO).times(2);
+    expect(locationRepository.find(new UnLocode("CCCCC"))).andReturn(CHICAGO);
+
+    final CarrierMovementRepository carrierMovementRepository = createMock(CarrierMovementRepository.class);
+    final CarrierMovementId cmId1 = new CarrierMovementId("CM1");
+    final CarrierMovementId cmId2 = new CarrierMovementId("CM2");
+    final CarrierMovement cm1 = new CarrierMovement(cmId1, HONGKONG, TOKYO);
+    final CarrierMovement cm2 = new CarrierMovement(cmId2, TOKYO, CHICAGO);
+
+    expect(carrierMovementRepository.find(cmId1)).andReturn(cm1);
+    expect(carrierMovementRepository.find(cmId2)).andReturn(cm2);
+
+    replay(locationRepository, carrierMovementRepository);
+
+
+    // Tested call
+    final Itinerary itinerary = assembler.fromDTO(new ItineraryCandidateDTO(legs), carrierMovementRepository, locationRepository);
+
+    
+    assertNotNull(itinerary);
+    assertNotNull(itinerary.legs());
+    assertEquals(2, itinerary.legs().size());
+
+    final Leg leg1 = itinerary.legs().get(0);
+    assertNotNull(leg1);
+    assertEquals(HONGKONG, leg1.from());
+    assertEquals(TOKYO, leg1.to());
+    assertEquals(cm1, leg1.carrierMovement());
+
+    final Leg leg2 = itinerary.legs().get(1);
+    assertNotNull(leg2);
+    assertEquals(TOKYO, leg2.from());
+    assertEquals(CHICAGO, leg2.to());
+    assertEquals(cm2, leg2.carrierMovement());
+  }
 }