Make filter behavior configurable

entur · Jan 24, 2025 · 6c66619 · 6c66619
1 parent 18c093f
commit 6c66619
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/main/java/org/entur/lamassu/leader/entityupdater/VehicleFilter.java b/src/main/java/org/entur/lamassu/leader/entityupdater/VehicleFilter.java
@@ -26,6 +26,7 @@
 import org.mobilitydata.gbfs.v3_0.vehicle_status.GBFSVehicle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -37,6 +38,11 @@ class VehicleFilter implements Predicate<GBFSVehicle> {
   private final EntityCache<VehicleType> vehicleTypeCache;
   private final EntityCache<Station> stationCache;
 
+  @Value(
+    "#{new Boolean('${org.entur.lamssu.vehicle-filter.include-vehicles-assigned-to-non-virtual-stations:false}')}"
+  )
+  private Boolean includeVehiclesAssignedToNonVirtualStations;
+
   public VehicleFilter(
     EntityCache<PricingPlan> pricingPlanCache,
     EntityCache<VehicleType> vehicleTypeCache,
@@ -51,7 +57,11 @@ public VehicleFilter(
   public boolean test(GBFSVehicle vehicle) {
     if (vehicle.getStationId() != null) {
       var station = stationCache.get(vehicle.getStationId());
-      if (station != null && !station.getVirtualStation()) {
+      if (
+        station != null &&
+        !station.getVirtualStation() &&
+        !includeVehiclesAssignedToNonVirtualStations
+      ) {
         logger.info(
           "Skipping vehicle {} currently assigned to non-virtual station {}",
           vehicle.getVehicleId(),

diff --git a/src/test/java/org/entur/lamassu/leader/entityupdater/VehicleFilterTest.java b/src/test/java/org/entur/lamassu/leader/entityupdater/VehicleFilterTest.java
@@ -31,7 +31,11 @@ public void testVehicleWithoutPricingPlanButDefaultPricingPlanIsntSkipped() {
 
     vehicleTypeCache.updateAll(vehicleTypesWithPricingPlan("pricingPlanId"), 0, null);
 
-    VehicleFilter filter = new VehicleFilter(pricingPlanCache, vehicleTypeCache, stationCache);
+    VehicleFilter filter = new VehicleFilter(
+      pricingPlanCache,
+      vehicleTypeCache,
+      stationCache
+    );
 
     GBFSVehicle vehicle = new GBFSVehicle();
     vehicle.setVehicleId("VehicleWithoutPricingPlan");
@@ -48,7 +52,11 @@ public void testVehicleWithoutPricingPlanAndWithoutDefaultPricingPlanIsSkipped()
 
     vehicleTypeCache.updateAll(vehicleTypesWithPricingPlan(null), 0, null);
 
-    VehicleFilter filter = new VehicleFilter(pricingPlanCache, vehicleTypeCache, stationCache);
+    VehicleFilter filter = new VehicleFilter(
+      pricingPlanCache,
+      vehicleTypeCache,
+      stationCache
+    );
 
     GBFSVehicle vehicle = new GBFSVehicle();
     vehicle.setVehicleId("VehicleWithoutPricingPlan");