Merge pull request #11 from Contargo/direct-truck-feature

Introduce new connection type: DTRUCK

Author: sandra-thieme

src/main/java/net/contargo/iris/co2/advice/Co2PartDtruckStrategy.java

@@ -0,0 +1,36 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.co2.advice.Co2PartTruckStrategy.CO2_TRUCK_EMPTY;
+import static net.contargo.iris.co2.advice.Co2PartTruckStrategy.CO2_TRUCK_FULL;
+import static net.contargo.iris.container.ContainerState.FULL;
+
+
+/**
+ * @author  Ben Antony - antony@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class Co2PartDtruckStrategy implements Co2PartStrategy {
+
+    @Override
+    public BigDecimal getEmissionForRoutePart(RoutePart routePart) {
+
+        RoutePartData routePartData = routePart.getData();
+
+        BigDecimal co2Factor;
+
+        if (FULL == routePart.getContainerState()) {
+            co2Factor = CO2_TRUCK_FULL;
+        } else {
+            co2Factor = CO2_TRUCK_EMPTY;
+        }
+
+        BigDecimal distance = routePartData.getDtruckDistance();
+
+        return distance.multiply(co2Factor);
+    }
+}

src/main/java/net/contargo/iris/co2/advice/Co2PartStrategyAdvisor.java

@@ -2,6 +2,12 @@
 
 import net.contargo.iris.route.RouteType;
 
+import static net.contargo.iris.route.RouteType.BARGE;
+import static net.contargo.iris.route.RouteType.BARGE_RAIL;
+import static net.contargo.iris.route.RouteType.DTRUCK;
+import static net.contargo.iris.route.RouteType.RAIL;
+import static net.contargo.iris.route.RouteType.TRUCK;
+
 
 /**
  * @author  Oliver Messner - messner@synyx.de
@@ -12,6 +18,7 @@ public class Co2PartStrategyAdvisor {
     private Co2PartStrategy railStrategy;
     private Co2PartStrategy truckStrategy;
     private Co2PartStrategy bargeRailStrategy;
+    private Co2PartStrategy dtruckStrategy;
 
     Co2PartStrategyAdvisor() {
 
@@ -20,12 +27,13 @@ public class Co2PartStrategyAdvisor {
 
 
     public Co2PartStrategyAdvisor(Co2PartStrategy bargeStrategy, Co2PartStrategy railStrategy,
-        Co2PartStrategy truckStrategy, Co2PartStrategy bargeRailStrategy) {
+        Co2PartStrategy truckStrategy, Co2PartStrategy bargeRailStrategy, Co2PartStrategy dtruckStrategy) {
 
         this.bargeStrategy = bargeStrategy;
         this.railStrategy = railStrategy;
         this.truckStrategy = truckStrategy;
         this.bargeRailStrategy = bargeRailStrategy;
+        this.dtruckStrategy = dtruckStrategy;
     }
 
     void setBargeStrategy(Co2PartStrategy bargeStrategy) {
@@ -52,24 +60,34 @@ void setBargeRailStrategy(Co2PartStrategy bargeRailStrategy) {
     }
 
 
+    public void setDtruckStrategy(Co2PartStrategy dtruckStrategy) {
+
+        this.dtruckStrategy = dtruckStrategy;
+    }
+
+
     public Co2PartStrategy advice(RouteType routeType) {
 
-        if (routeType == RouteType.BARGE) {
+        if (routeType == BARGE) {
             return bargeStrategy;
         }
 
-        if (routeType == RouteType.RAIL) {
+        if (routeType == RAIL) {
             return railStrategy;
         }
 
-        if (routeType == RouteType.TRUCK) {
+        if (routeType == TRUCK) {
             return truckStrategy;
         }
 
-        if (routeType == RouteType.BARGE_RAIL) {
+        if (routeType == BARGE_RAIL) {
             return bargeRailStrategy;
         }
 
+        if (routeType == DTRUCK) {
+            return dtruckStrategy;
+        }
+
         throw new IllegalStateException("Cannot determine co2 for route part of type " + routeType);
     }
 }

src/main/java/net/contargo/iris/co2/advice/Co2PartTruckStrategy.java

@@ -9,11 +9,13 @@
 
 /**
  * @author  Oliver Messner - messner@synyx.de
+ * @author  Ben Antony - antony@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
  */
 class Co2PartTruckStrategy implements Co2PartStrategy {
 
-    private static final BigDecimal CO2_TRUCK_FULL = BigDecimal.valueOf(0.88);
-    private static final BigDecimal CO2_TRUCK_EMPTY = BigDecimal.valueOf(0.73);
+    static final BigDecimal CO2_TRUCK_FULL = BigDecimal.valueOf(0.88);
+    static final BigDecimal CO2_TRUCK_EMPTY = BigDecimal.valueOf(0.73);
 
     @Override
     public BigDecimal getEmissionForRoutePart(RoutePart routePart) {

src/main/java/net/contargo/iris/connection/MainRunConnection.java

@@ -3,8 +3,14 @@
 import net.contargo.iris.route.RouteType;
 import net.contargo.iris.seaport.Seaport;
 import net.contargo.iris.terminal.Terminal;
+
 import net.contargo.validation.bigdecimal.BigDecimalValidate;
 
+import java.math.BigDecimal;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -16,10 +22,8 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
+
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
 
 import static net.contargo.iris.route.RouteType.BARGE_RAIL;
 
@@ -30,6 +34,8 @@
  * @author  Aljona Murygina - murygina@synyx.de
  * @author  Vincent Potucek - potucek@synyx.de
  * @author  Oliver Messner - messner@synyx.de
+ * @author  Ben Antony - antony@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
  */
 @Entity
 @Table(
@@ -64,6 +70,10 @@ public class MainRunConnection {
     @BigDecimalValidate(minValue = 0, minDecimalPlaces = 1L, maxDecimalPlaces = TEN, maxFractionalPlaces = TEN)
     private BigDecimal railElectricDistance;
 
+    @NotNull
+    @BigDecimalValidate(minValue = 0, minDecimalPlaces = 1L, maxDecimalPlaces = TEN, maxFractionalPlaces = TEN)
+    private BigDecimal roadDistance;
+
     @NotNull
     @Enumerated(EnumType.STRING)
     private RouteType routeType;
@@ -238,6 +248,18 @@ public void setSubConnections(List<AbstractSubConnection> subConnections) {
     }
 
 
+    public BigDecimal getRoadDistance() {
+
+        return roadDistance;
+    }
+
+
+    public void setRoadDistance(BigDecimal roadDistance) {
+
+        this.roadDistance = roadDistance;
+    }
+
+
     /**
      * Checks whether this {@link MainRunConnection} is enabled along with its {@link Seaport} and {@link Terminal} and
      * all its {@link AbstractSubConnection}s.
@@ -277,6 +299,7 @@ public String toString() {
             + ", location=" + terminal + ", bargeDieselDistance=" + bargeDieselDistance + ", railDieselDistance="
             + railDieselDistance
             + ", railElectricDistance=" + railElectricDistance
+            + ", roadDistance=" + roadDistance
             + ", routeType=" + routeType + "]";
     }
 }

src/main/java/net/contargo/iris/connection/api/MainRunConnectionApiController.java

@@ -7,10 +7,12 @@
 import net.contargo.iris.connection.dto.MainRunConnectionDtoService;
 import net.contargo.iris.connection.dto.SimpleMainRunConnectionDto;
 import net.contargo.iris.connection.service.DuplicateMainRunConnectionException;
+import net.contargo.iris.route.RouteType;
 
 import org.slf4j.Logger;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
@@ -34,9 +36,16 @@
 import java.net.URI;
 
 import java.util.Collection;
+import java.util.Map;
+import java.util.TreeMap;
 
 import javax.validation.Valid;
 
+import static net.contargo.iris.route.RouteType.BARGE;
+import static net.contargo.iris.route.RouteType.BARGE_RAIL;
+import static net.contargo.iris.route.RouteType.DTRUCK;
+import static net.contargo.iris.route.RouteType.RAIL;
+
 import static org.slf4j.LoggerFactory.getLogger;
 
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
@@ -54,6 +63,7 @@
  * @author  Sandra Thieme - thieme@synyx.de
  * @author  Oliver Messner - messner@synyx.de
  * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Ben Antony - antony@synyx.de
  */
 @Controller
 @RequestMapping(value = "/connections")
@@ -63,10 +73,14 @@ public class MainRunConnectionApiController {
 
     private final MainRunConnectionDtoService connectionApiDtoService;
 
+    private final boolean isDtruckFeatureActive;
+
     @Autowired
-    public MainRunConnectionApiController(MainRunConnectionDtoService connectionApiDtoService) {
+    public MainRunConnectionApiController(MainRunConnectionDtoService connectionApiDtoService,
+        @Value("${feature.dtruck}") boolean isDtruckFeatureActive) {
 
         this.connectionApiDtoService = connectionApiDtoService;
+        this.isDtruckFeatureActive = isDtruckFeatureActive;
     }
 
     @ApiOperation(
@@ -108,10 +122,10 @@ public ResponseEntity createConnection(@Valid @RequestBody MainRunConnectionDto
         MainRunConnectionDto savedDto = connectionApiDtoService.save(dto);
 
         URI location = ServletUriComponentsBuilder.fromCurrentServletMapping()
-            .path("/../web/connections/{id}")
-            .build()
-            .expand(savedDto.getId())
-            .toUri();
+                .path("/../web/connections/{id}")
+                .build()
+                .expand(savedDto.getId())
+                .toUri();
 
         HttpHeaders headers = new HttpHeaders();
         headers.setLocation(location);
@@ -138,6 +152,23 @@ public ResponseEntity<MainRunConnectionDto> updateConnection(@Valid @RequestBody
     }
 
 
+    @RequestMapping(value = "/types", method = GET)
+    public ResponseEntity<Map<RouteType, String>> getTypes() {
+
+        Map<RouteType, String> types = new TreeMap<>();
+
+        types.put(BARGE, "Barge");
+        types.put(RAIL, "Rail");
+        types.put(BARGE_RAIL, "Barge-Rail");
+
+        if (isDtruckFeatureActive) {
+            types.put(DTRUCK, "Direct Truck");
+        }
+
+        return new ResponseEntity<>(types, OK);
+    }
+
+
     @ExceptionHandler(DuplicateMainRunConnectionException.class)
     ResponseEntity<RestApiErrorDto> handleDuplicateMainRunConnectionException(DuplicateMainRunConnectionException e) {
 

src/main/java/net/contargo/iris/connection/api/SeaportConnectionApiController.java

@@ -10,6 +10,7 @@
 import org.slf4j.Logger;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 
 import org.springframework.stereotype.Controller;
 
@@ -19,19 +20,27 @@
 
 import java.lang.invoke.MethodHandles;
 
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
+import static net.contargo.iris.route.RouteCombo.ALL;
+import static net.contargo.iris.route.RouteType.DTRUCK;
+
 import static org.slf4j.LoggerFactory.getLogger;
 
 import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
 import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
 
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
+import static java.util.Arrays.asList;
+
 
 /**
  * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Ben Antony - antony@synyx.de
  */
 @Controller
 @RequestMapping(value = "/connections")
@@ -41,10 +50,14 @@ public class SeaportConnectionApiController {
 
     private final SeaportTerminalConnectionDtoService seaportTerminalConnectionDtoService;
 
+    private final boolean dtruckActive;
+
     @Autowired
-    public SeaportConnectionApiController(SeaportTerminalConnectionDtoService seaportTerminalConnectionDtoService) {
+    public SeaportConnectionApiController(SeaportTerminalConnectionDtoService seaportTerminalConnectionDtoService,
+        @Value("${feature.dtruck}") boolean dtruckActive) {
 
         this.seaportTerminalConnectionDtoService = seaportTerminalConnectionDtoService;
+        this.dtruckActive = dtruckActive;
     }
 
     @ApiOperation(
@@ -62,8 +75,20 @@ public SeaportsResponse getSeaportsInConnections(
 
         Set<SeaportDto> ports = new HashSet<>();
 
-        for (RouteType t : routeCombo.getRouteTypes()) {
-            ports.addAll(seaportTerminalConnectionDtoService.findSeaportsConnectedByRouteType(t));
+        List<RouteType> routeTypes = new ArrayList<>(asList(routeCombo.getRouteTypes()));
+
+        if (routeCombo == ALL) {
+            routeTypes.add(DTRUCK);
+        }
+
+        for (RouteType t : routeTypes) {
+            if (t == DTRUCK) {
+                if (dtruckActive) {
+                    ports.addAll(seaportTerminalConnectionDtoService.findSeaportsConnectedByRouteType(t));
+                }
+            } else {
+                ports.addAll(seaportTerminalConnectionDtoService.findSeaportsConnectedByRouteType(t));
+            }
         }
 
         response.setSeaports(ports);