Vehicle rental overlay graphql migration

__tests__/test-utils/mock-data/empty-string.js

@@ -0,0 +1 @@
+module.exports = ''

example/example-config.yml

@@ -383,12 +383,8 @@ itinerary:
   fillModeIcons: true
   # Allow user to collapse alerts in itinerary body
   allowUserAlertCollapsing: true
-  # If multiple fares are returned by OTP, assign names to the fare keys here
-  #fareKeyNameMap:
-  #  regular: "Transit Fare"
-  #  electronicRegular: "SmartCard Fare"
-  #  student: "Student Fare"
-  # One fare will always be shown by default
+  # The medium and rider category selected here will be used to render the total itinerary fare
+  # when there is only room to display a single fare.
   defaultFareType: { mediumId: null, riderCategoryId: null }
 
   # List of OTP2 errors to not display. Can be a list

i18n/en-US.yml

@@ -115,6 +115,7 @@ common:
     "yes": "Yes"
   itineraryDescriptions:
     fareUnknown: No fare information
+    noDefaultFareTypeConfigured: Multiple fares apply
     noItineraryToDisplay: No itinerary to display.
     relativeCo2: |
       {co2} {isMore, select, true {more} other {less} } CO₂ than driving alone

i18n/fr.yml

@@ -124,6 +124,7 @@ common:
     "yes": Oui
   itineraryDescriptions:
     fareUnknown: Tarif inconnu
+    noDefaultFareTypeConfigured: Multiple fares apply
     noItineraryToDisplay: Aucun trajet à afficher.
     relativeCo2: |
       {co2} de CO₂ en {isMore, select, true {plus} other {moins} } qu'en voiture

lib/actions/api.js

@@ -317,50 +317,19 @@ export function parkAndRideQuery(
 
 // bike rental station query
 
-export const bikeRentalError = createAction('BIKE_RENTAL_ERROR')
-export const bikeRentalResponse = createAction('BIKE_RENTAL_RESPONSE')
-
-export function bikeRentalQuery(
-  params,
-  responseAction = bikeRentalResponse,
-  errorAction = bikeRentalError,
-  options = {}
-) {
-  const paramsString = qs.stringify(params)
-  const endpoint = `bike_rental${paramsString ? `?${paramsString}` : ''}`
-  return createQueryAction(endpoint, responseAction, errorAction, options)
+export function bikeRentalQuery() {
+  return executeOTPAction('findBikeRentalStations')
 }
 
 // Car rental (e.g. car2go) locations lookup query
 
-export const carRentalResponse = createAction('CAR_RENTAL_RESPONSE')
-export const carRentalError = createAction('CAR_RENTAL_ERROR')
-
-export function carRentalQuery(params) {
-  return createQueryAction('car_rental', carRentalResponse, carRentalError)
+export function carRentalQuery() {
+  return executeOTPAction('findCarRentalStations')
 }
 
-// Vehicle rental locations lookup query. For now, there are 3 separate
-// "vehicle" rental endpoints - 1 for cars, 1 for bicycle rentals and another
-// for micromobility. In the future, the hope is to consolidate these 3
-// endpoints into one.
-
-export const vehicleRentalResponse = createAction('VEHICLE_RENTAL_RESPONSE')
-export const vehicleRentalError = createAction('VEHICLE_RENTAL_ERROR')
-
-export function vehicleRentalQuery(
-  params,
-  responseAction = vehicleRentalResponse,
-  errorAction = vehicleRentalError,
-  options = {}
-) {
-  return executeOTPAction(
-    'vehicleRentalQuery',
-    params,
-    responseAction,
-    errorAction,
-    options
-  )
+// Free-floating rental vehicles lookup query
+export function rentalVehicleQuery() {
+  return executeOTPAction('findRentalVehicles')
 }
 
 // Nearby view lookup query

lib/actions/apiV2.js

@@ -184,60 +184,6 @@ const findTrip = (params) =>
     }
   )
 
-export const vehicleRentalQuery = (
-  params,
-  responseAction,
-  errorAction,
-  options
-) =>
-  // TODO: ErrorsByNetwork is missing
-  createGraphQLQueryAction(
-    `{
-    rentalVehicles {
-      vehicleId
-      id
-      name
-      lat
-      lon
-      allowPickupNow
-      vehicleType {
-        formFactor
-      }
-      network
-    }
-  }
-  `,
-    {},
-    responseAction,
-    errorAction,
-    {
-      noThrottle: true,
-      postprocess: (payload, dispatch) => {
-        if (payload.errors) {
-          return errorAction(payload.errors)
-        }
-      },
-      // TODO: most of this rewrites the OTP2 response to match OTP1.
-      // we should re-write the rest of the UI to match OTP's behavior instead
-      rewritePayload: (payload) => {
-        return {
-          stations: payload?.data?.rentalVehicles?.map((vehicle) => {
-            return {
-              allowPickup: vehicle.allowPickupNow,
-              id: vehicle.vehicleId,
-              isFloatingBike: vehicle?.vehicleType?.formFactor === 'BICYCLE',
-              isFloatingVehicle: vehicle?.vehicleType?.formFactor === 'SCOOTER',
-              name: vehicle.name,
-              networks: [vehicle.network],
-              x: vehicle.lon,
-              y: vehicle.lat
-            }
-          })
-        }
-      }
-    }
-  )
-
 // TODO: numberOfDepartures needs to come from config!
 const stopTimeGraphQLQuery = `
 stopTimes: stoptimesForPatterns(numberOfDepartures: 3) {
@@ -687,6 +633,127 @@ const getVehiclePositionsForRoute = (routeId) =>
     )
   }
 
+const vehicleRentalStationsQuery = `
+        query VehicleRentalStations {
+          vehicleRentalStations {
+            id
+            name
+            lat
+            lon
+            allowDropoff
+            allowPickup
+            rentalNetwork {
+			        networkId
+            }
+            availableVehicles {
+              total
+              byType {
+                vehicleType {
+                  formFactor
+                }
+              }
+            }
+            availableSpaces {
+              total
+              byType {
+                vehicleType {
+                  formFactor
+                }
+              }
+            }
+            realtime
+          }
+        }`
+
+const vehicleRentalStationFilter = (formFactor) => (station) =>
+  (station.availableVehicles &&
+    station.availableVehicles.byType.some(
+      (av) => av.vehicleType.formFactor === formFactor
+    )) ||
+  (station.availableSpaces &&
+    station.availableSpaces.byType.some(
+      (as) => as.vehicleType.formFactor === formFactor
+    ))
+
+const bikeRentalError = createAction('BIKE_RENTAL_ERROR')
+const bikeRentalResponse = createAction('BIKE_RENTAL_RESPONSE')
+
+export function findBikeRentalStations() {
+  return function (dispatch) {
+    dispatch(
+      createGraphQLQueryAction(
+        vehicleRentalStationsQuery,
+        {},
+        bikeRentalResponse,
+        bikeRentalError,
+        {
+          rewritePayload: (payload) =>
+            payload.data.vehicleRentalStations.filter(
+              vehicleRentalStationFilter('BICYCLE')
+            )
+        }
+      )
+    )
+  }
+}
+
+export const carRentalResponse = createAction('CAR_RENTAL_RESPONSE')
+export const carRentalError = createAction('CAR_RENTAL_ERROR')
+
+export function findCarRentalStations() {
+  return function (dispatch) {
+    dispatch(
+      createGraphQLQueryAction(
+        vehicleRentalStationsQuery,
+        {},
+        carRentalResponse,
+        carRentalError,
+        {
+          rewritePayload: (payload) =>
+            payload.data.vehicleRentalStations.filter(
+              vehicleRentalStationFilter('CAR')
+            )
+        }
+      )
+    )
+  }
+}
+
+const rentalVehiclesQuery = `
+        query RentalVehicles {
+          rentalVehicles {
+            allowPickupNow
+            id
+            lat
+            lon
+            name
+            operative
+            rentalNetwork {
+              networkId
+            }
+            vehicleType {
+              formFactor
+            }
+          }
+        }`
+
+const vehicleRentalResponse = createAction('VEHICLE_RENTAL_RESPONSE')
+const vehicleRentalError = createAction('VEHICLE_RENTAL_ERROR')
+
+export function findRentalVehicles() {
+  return function (dispatch) {
+    dispatch(
+      createGraphQLQueryAction(
+        rentalVehiclesQuery,
+        {},
+        vehicleRentalResponse,
+        vehicleRentalError,
+        {}
+      )
+    )
+  }
+}
+
 export const findRoute = (params) =>
   function (dispatch, getState) {
     const { routeId } = params
@@ -1355,15 +1422,17 @@ const retrieveServiceTimeRangeIfNeeded = () =>
 
 export default {
   fetchNearby,
+  findBikeRentalStations,
+  findCarRentalStations,
   findFeeds,
   findPatternsForRoute,
+  findRentalVehicles,
   findRoute,
   findRoutes,
   findStopsWithinBBox,
   findStopTimesForStop,
   findTrip,
   getVehiclePositionsForRoute,
   retrieveServiceTimeRangeIfNeeded,
-  routingQuery,
-  vehicleRentalQuery
+  routingQuery
 }