VehicleTypesCapacity and vehicleDocksCapacity

src/main/java/org/entur/lamassu/mapper/entitymapper/StationMapper.java

@@ -32,9 +32,11 @@
 import org.entur.lamassu.model.entities.Station;
 import org.entur.lamassu.model.entities.System;
 import org.entur.lamassu.model.entities.VehicleDocksAvailability;
+import org.entur.lamassu.model.entities.VehicleDocksCapacity;
 import org.entur.lamassu.model.entities.VehicleType;
 import org.entur.lamassu.model.entities.VehicleTypeAvailability;
 import org.entur.lamassu.model.entities.VehicleTypeCapacity;
+import org.entur.lamassu.model.entities.VehicleTypesCapacity;
 import org.jetbrains.annotations.NotNull;
 import org.mobilitydata.gbfs.v3_0.station_information.GBFSName;
 import org.mobilitydata.gbfs.v3_0.station_information.GBFSShortName;
@@ -121,6 +123,7 @@ public Station mapStation(
     station.setCapacity(
       stationInformation.getCapacity() != null ? stationInformation.getCapacity() : null
     );
+
     station.setVehicleCapacity(
       stationInformation.getVehicleTypesCapacity() != null
         ? mapVehicleCapacities(
@@ -129,6 +132,15 @@ public Station mapStation(
         )
         : null
     );
+    station.setVehicleTypesCapacity(
+      stationInformation.getVehicleTypesCapacity() != null
+        ? mapVehicleTypesCapacity(
+          stationInformation.getVehicleTypesCapacity(),
+          mapVehicleTypes(vehicleTypesFeed, pricingPlans, language)
+        )
+        : null
+    );
+
     station.setVehicleTypeCapacity(
       stationInformation.getVehicleDocksCapacity() != null
         ? mapVehicleTypeCapacities(
@@ -137,6 +149,15 @@ public Station mapStation(
         )
         : null
     );
+    station.setVehicleDocksCapacity(
+      stationInformation.getVehicleDocksCapacity() != null
+        ? mapVehicleDocksCapacityToVehicleTypeCapacity(
+          stationInformation.getVehicleDocksCapacity(),
+          mapVehicleTypes(vehicleTypesFeed, pricingPlans, language)
+        )
+        : null
+    );
+
     station.setValetStation(stationInformation.getIsValetStation());
     station.setChargingStation(stationInformation.getIsChargingStation());
     station.setRentalUris(
@@ -292,10 +313,29 @@ private List<VehicleTypeCapacity> mapVehicleCapacities(
     mapped.setVehicleType(
       vehicleTypes.get(vehicleCapacity.getVehicleTypeIds().getFirst())
     );
+    mapped.setCount(vehicleCapacity.getCount());
+    return mapped;
+  }
+
+  private List<VehicleTypesCapacity> mapVehicleTypesCapacity(
+    List<GBFSVehicleTypesCapacity> vehicleTypesCapacity,
+    Map<String, VehicleType> vehicleTypes
+  ) {
+    return vehicleTypesCapacity
+      .stream()
+      .map(v -> mapVehicleTypeCapacity(v, vehicleTypes))
+      .toList();
+  }
+
+  private VehicleTypesCapacity mapVehicleTypeCapacity(
+    GBFSVehicleTypesCapacity vehicleTypesCapacity,
+    Map<String, VehicleType> vehicleTypes
+  ) {
+    var mapped = new VehicleTypesCapacity();
     mapped.setVehicleTypes(
-      vehicleCapacity.getVehicleTypeIds().stream().map(vehicleTypes::get).toList()
+      vehicleTypesCapacity.getVehicleTypeIds().stream().map(vehicleTypes::get).toList()
     );
-    mapped.setCount(vehicleCapacity.getCount());
+    mapped.setCount(vehicleTypesCapacity.getCount());
     return mapped;
   }
 
@@ -305,18 +345,37 @@ private List<VehicleTypeCapacity> mapVehicleTypeCapacities(
   ) {
     return vehicleCapacity
       .stream()
-      .map(entry -> mapVehicleDocksCapacity(entry, vehicleTypes))
+      .map(entry -> mapVehicleDocksCapacityToVehicleTypeCapacity(entry, vehicleTypes))
       .toList();
   }
 
-  private VehicleTypeCapacity mapVehicleDocksCapacity(
+  private VehicleTypeCapacity mapVehicleDocksCapacityToVehicleTypeCapacity(
     GBFSVehicleDocksCapacity vehicleDocksCapacity,
     Map<String, VehicleType> vehicleTypes
   ) {
     var mapped = new VehicleTypeCapacity();
     mapped.setVehicleType(
       vehicleTypes.get(vehicleDocksCapacity.getVehicleTypeIds().getFirst())
     );
+    mapped.setCount(vehicleDocksCapacity.getCount());
+    return mapped;
+  }
+
+  private List<VehicleDocksCapacity> mapVehicleDocksCapacityToVehicleTypeCapacity(
+    List<GBFSVehicleDocksCapacity> vehicleDocksCapacity,
+    Map<String, VehicleType> vehicleTypes
+  ) {
+    return vehicleDocksCapacity
+      .stream()
+      .map(v -> mapVehicleDocksCapacity(v, vehicleTypes))
+      .toList();
+  }
+
+  private VehicleDocksCapacity mapVehicleDocksCapacity(
+    GBFSVehicleDocksCapacity vehicleDocksCapacity,
+    Map<String, VehicleType> vehicleTypes
+  ) {
+    var mapped = new VehicleDocksCapacity();
     mapped.setVehicleTypes(
       vehicleDocksCapacity.getVehicleTypeIds().stream().map(vehicleTypes::get).toList()
     );

src/main/java/org/entur/lamassu/model/entities/Station.java

@@ -40,7 +40,9 @@ public class Station implements LocationEntity {
   private String contactPhone;
   private Integer capacity;
   private List<VehicleTypeCapacity> vehicleCapacity;
+  private List<VehicleDocksCapacity> vehicleDocksCapacity;
   private List<VehicleTypeCapacity> vehicleTypeCapacity;
+  private List<VehicleTypesCapacity> vehicleTypesCapacity;
   private Boolean isValetStation;
   private Boolean isChargingStation;
   private RentalUris rentalUris;
@@ -198,6 +200,14 @@ public void setVehicleCapacity(List<VehicleTypeCapacity> vehicleCapacity) {
     this.vehicleCapacity = vehicleCapacity;
   }
 
+  public List<VehicleDocksCapacity> getVehicleDocksCapacity() {
+    return vehicleDocksCapacity;
+  }
+
+  public void setVehicleDocksCapacity(List<VehicleDocksCapacity> vehicleDocksCapacity) {
+    this.vehicleDocksCapacity = vehicleDocksCapacity;
+  }
+
   public List<VehicleTypeCapacity> getVehicleTypeCapacity() {
     return vehicleTypeCapacity;
   }
@@ -206,6 +216,14 @@ public void setVehicleTypeCapacity(List<VehicleTypeCapacity> vehicleTypeCapacity
     this.vehicleTypeCapacity = vehicleTypeCapacity;
   }
 
+  public List<VehicleTypesCapacity> getVehicleTypesCapacity() {
+    return vehicleTypesCapacity;
+  }
+
+  public void setVehicleTypesCapacity(List<VehicleTypesCapacity> vehicleTypesCapacity) {
+    this.vehicleTypesCapacity = vehicleTypesCapacity;
+  }
+
   public Boolean getValetStation() {
     return isValetStation;
   }

src/main/java/org/entur/lamassu/model/entities/VehicleDocksCapacity.java

@@ -0,0 +1,43 @@
+/*
+ *
+ *
+ *  * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by
+ *  * the European Commission - subsequent versions of the EUPL (the "Licence");
+ *  * You may not use this work except in compliance with the Licence.
+ *  * You may obtain a copy of the Licence at:
+ *  *
+ *  *   https://joinup.ec.europa.eu/software/page/eupl
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the Licence is distributed on an "AS IS" basis,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the Licence for the specific language governing permissions and
+ *  * limitations under the Licence.
+ *
+ */
+
+package org.entur.lamassu.model.entities;
+
+import java.util.List;
+
+public class VehicleDocksCapacity {
+
+  private List<VehicleType> vehicleTypes;
+  private Integer count;
+
+  public List<VehicleType> getVehicleTypes() {
+    return vehicleTypes;
+  }
+
+  public void setVehicleTypes(List<VehicleType> vehicleTypes) {
+    this.vehicleTypes = vehicleTypes;
+  }
+
+  public Integer getCount() {
+    return count;
+  }
+
+  public void setCount(Integer count) {
+    this.count = count;
+  }
+}

src/main/java/org/entur/lamassu/model/entities/VehicleTypeCapacity.java

@@ -19,14 +19,11 @@
 package org.entur.lamassu.model.entities;
 
 import java.io.Serializable;
-import java.util.List;
 
 public class VehicleTypeCapacity implements Serializable {
 
   private VehicleType vehicleType;
 
-  private List<VehicleType> vehicleTypes;
-
   private Integer count;
 
   public VehicleType getVehicleType() {
@@ -37,14 +34,6 @@ public void setVehicleType(VehicleType vehicleType) {
     this.vehicleType = vehicleType;
   }
 
-  public List<VehicleType> getVehicleTypes() {
-    return vehicleTypes;
-  }
-
-  public void setVehicleTypes(List<VehicleType> vehicleTypes) {
-    this.vehicleTypes = vehicleTypes;
-  }
-
   public Integer getCount() {
     return count;
   }

src/main/java/org/entur/lamassu/model/entities/VehicleTypesCapacity.java

@@ -0,0 +1,43 @@
+/*
+ *
+ *
+ *  * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by
+ *  * the European Commission - subsequent versions of the EUPL (the "Licence");
+ *  * You may not use this work except in compliance with the Licence.
+ *  * You may obtain a copy of the Licence at:
+ *  *
+ *  *   https://joinup.ec.europa.eu/software/page/eupl
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the Licence is distributed on an "AS IS" basis,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the Licence for the specific language governing permissions and
+ *  * limitations under the Licence.
+ *
+ */
+
+package org.entur.lamassu.model.entities;
+
+import java.util.List;
+
+public class VehicleTypesCapacity {
+
+  private List<VehicleType> vehicleTypes;
+  private Integer count;
+
+  public List<VehicleType> getVehicleTypes() {
+    return vehicleTypes;
+  }
+
+  public void setVehicleTypes(List<VehicleType> vehicleTypes) {
+    this.vehicleTypes = vehicleTypes;
+  }
+
+  public Integer getCount() {
+    return count;
+  }
+
+  public void setCount(Integer count) {
+    this.count = count;
+  }
+}

src/main/resources/graphql/schema.graphqls

@@ -228,8 +228,10 @@ type Station {
     parkingHoop: Boolean
     contactPhone: String
     capacity: Int
-    vehicleCapacity: [VehicleTypeCapacity]
-    vehicleTypeCapacity: [VehicleTypeCapacity]
+    vehicleCapacity: [VehicleTypeCapacity] @deprecated(reason: "Use vehicleTypesCapacity")
+    vehicleTypesCapacity: [VehicleTypesCapacity]
+    vehicleTypeCapacity: [VehicleTypeCapacity] @deprecated(reason: "Use vehicleDocksCapacity")
+    vehicleDocksCapacity: [VehicleDocksCapacity]
     isValetStation: Boolean
     isChargingStation: Boolean
     rentalUris: RentalUris
@@ -327,7 +329,16 @@ type Operator {
 }
 
 type VehicleTypeCapacity {
-    vehicleType: VehicleType! @deprecated(reason: "Use vehicleTypes instead")
+    vehicleType: VehicleType!
+    count: Int!
+}
+
+type VehicleDocksCapacity {
+    vehicleTypes: [VehicleType!]!
+    count: Int!
+}
+
+type VehicleTypesCapacity {
     vehicleTypes: [VehicleType!]!
     count: Int!
 }