Custom validations

Signed-off-by: Tom <[email protected]>
MobilityData · Jun 29, 2023 · 12da2eb · 12da2eb
1 parent e3d5f08
commit 12da2eb
Show file tree

Hide file tree

Showing 29 changed files with 2,123 additions and 202 deletions.
diff --git a/gbfs-validator/__test__/fixtures/conditionnal_no_vehicle_type_id.js b/gbfs-validator/__test__/fixtures/conditionnal_no_vehicle_type_id.js
@@ -1,5 +1,7 @@
 const fastify = require('fastify')
 
+const last_updated_fresh = Math.floor(Date.now() / 1000) - 30
+
 function build(opts = {}) {
   const app = fastify(opts)
 
@@ -49,7 +51,7 @@ function build(opts = {}) {
 
   app.get('/free_bike_status.json', async function(request, reply) {
     return {
-      last_updated: 1566224400,
+      last_updated: last_updated_fresh,
       ttl: 0,
       version: '2.2',
       data: {

diff --git a/gbfs-validator/__test__/fixtures/conditionnal_vehicle_type_id.js b/gbfs-validator/__test__/fixtures/conditionnal_vehicle_type_id.js
@@ -1,5 +1,7 @@
 const fastify = require('fastify')
 
+const last_updated_fresh = Math.floor(Date.now() / 1000) - 30
+
 function build(opts = {}) {
   const app = fastify(opts)
 
@@ -64,15 +66,12 @@ function build(opts = {}) {
             propulsion_type: 'human',
             name: 'Example Basic Bike',
             default_reserve_time: 30,
-            return_type: ['any_station', 'free_floating'],
             vehicle_assets: {
               icon_url: 'https://www.example.com/assets/icon_bicycle.svg',
               icon_url_dark:
                 'https://www.example.com/assets/icon_bicycle_dark.svg',
               icon_last_modified: '2021-06-15'
-            },
-            default_pricing_plan_id: 'bike_plan_1',
-            pricing_plan_ids: ['bike_plan_1', 'bike_plan_2', 'bike_plan_3']
+            }
           },
           {
             vehicle_type_id: 'efg456',
@@ -81,14 +80,11 @@ function build(opts = {}) {
             name: 'Example Electric Car',
             default_reserve_time: 30,
             max_range_meters: 100,
-            return_type: ['any_station', 'free_floating'],
             vehicle_assets: {
               icon_url: 'https://www.example.com/assets/icon_car.svg',
               icon_url_dark: 'https://www.example.com/assets/icon_car_dark.svg',
               icon_last_modified: '2021-06-15'
-            },
-            default_pricing_plan_id: 'car_plan_1',
-            pricing_plan_ids: ['car_plan_1', 'car_plan_2', 'car_plan_3']
+            }
           }
         ]
       }
@@ -97,7 +93,7 @@ function build(opts = {}) {
 
   app.get('/free_bike_status.json', async function(request, reply) {
     return {
-      last_updated: 1566224400,
+      last_updated: last_updated_fresh,
       ttl: 0,
       version: '2.2',
       data: {

diff --git a/gbfs-validator/__test__/fixtures/conditionnal_vehicle_types_available.js b/gbfs-validator/__test__/fixtures/conditionnal_vehicle_types_available.js
@@ -1,5 +1,7 @@
 const fastify = require('fastify')
 
+const last_updated_fresh = Math.floor(Date.now() / 1000) - 30
+
 function build(opts = {}) {
   const app = fastify(opts)
 
@@ -60,7 +62,6 @@ function build(opts = {}) {
             propulsion_type: 'human',
             name: 'Example Basic Bike',
             default_reserve_time: 30,
-            return_type: ['any_station', 'free_floating'],
             vehicle_assets: {
               icon_url: 'https://www.example.com/assets/icon_bicycle.svg',
               icon_url_dark:
@@ -77,7 +78,6 @@ function build(opts = {}) {
             name: 'Example Electric Car',
             default_reserve_time: 30,
             max_range_meters: 100,
-            return_type: ['any_station', 'free_floating'],
             vehicle_assets: {
               icon_url: 'https://www.example.com/assets/icon_car.svg',
               icon_url_dark: 'https://www.example.com/assets/icon_car_dark.svg',
@@ -93,7 +93,7 @@ function build(opts = {}) {
 
   app.get('/station_status.json', async function(request, reply) {
     return {
-      last_updated: 1566224400,
+      last_updated: last_updated_fresh,
       ttl: 0,
       version: '2.2',
       data: {

diff --git a/gbfs-validator/__test__/fixtures/missing_vehicle_types.js b/gbfs-validator/__test__/fixtures/missing_vehicle_types.js
@@ -1,5 +1,7 @@
 const fastify = require('fastify')
 
+const last_updated_fresh = Math.floor(Date.now() / 1000) - 30
+
 function build(opts = {}) {
   const app = fastify(opts)
 
@@ -49,7 +51,7 @@ function build(opts = {}) {
 
   app.get('/free_bike_status.json', async function(request, reply) {
     return {
-      last_updated: 1566224400,
+      last_updated: last_updated_fresh,
       ttl: 0,
       version: '2.2',
       data: {

diff --git a/gbfs-validator/__test__/fixtures/plan_id.js b/gbfs-validator/__test__/fixtures/plan_id.js
@@ -1,9 +1,11 @@
 const fastify = require('fastify')
 
+const last_updated_fresh = Math.floor(Date.now() / 1000) - 30
+
 function build(opts = {}) {
   const app = fastify(opts)
 
-  app.get('/gbfs.json', async function(request, reply) {
+  app.get('/gbfs.json', async function (request, reply) {
     return {
       last_updated: 1566224400,
       ttl: 0,
@@ -57,7 +59,7 @@ function build(opts = {}) {
 
   app.get('/free_bike_status.json', async function(request, reply) {
     return {
-      last_updated: 1566224400,
+      last_updated: last_updated_fresh,
       ttl: 0,
       version: '2.3',
       data: {
@@ -109,7 +111,7 @@ function build(opts = {}) {
             propulsion_type: 'human',
             name: 'Example Basic Bike',
             default_reserve_time: 30,
-            return_type: ['any_station', 'free_floating'],
+            return_constraint: 'any_station',
             vehicle_assets: {
               icon_url: 'https://www.example.com/assets/icon_bicycle.svg',
               icon_url_dark:
@@ -126,7 +128,7 @@ function build(opts = {}) {
             name: 'Example Electric Car',
             default_reserve_time: 30,
             max_range_meters: 100,
-            return_type: ['any_station', 'free_floating'],
+            return_constraint: 'free_floating',
             vehicle_assets: {
               icon_url: 'https://www.example.com/assets/icon_car.svg',
               icon_url_dark: 'https://www.example.com/assets/icon_car_dark.svg',

diff --git a/gbfs-validator/__test__/fixtures/v3.0-RC/default.js b/gbfs-validator/__test__/fixtures/v3.0-RC/default.js
@@ -116,15 +116,13 @@ class MockRequests {
               }
             ],
             default_reserve_time: 30,
-            return_type: ['any_station', 'free_floating'],
+            return_constraint: 'hybrid',
             vehicle_assets: {
               icon_url: 'https://www.example.com/assets/icon_bicycle.svg',
               icon_url_dark:
                 'https://www.example.com/assets/icon_bicycle_dark.svg',
               icon_last_modified: '2021-06-15'
-            },
-            default_pricing_plan_id: 'bike_plan_1',
-            pricing_plan_ids: ['bike_plan_1', 'bike_plan_2', 'bike_plan_3']
+            }
           },
           {
             vehicle_type_id: 'cartype1',
@@ -138,14 +136,12 @@ class MockRequests {
             ],
             default_reserve_time: 30,
             max_range_meters: 100,
-            return_type: ['any_station', 'free_floating'],
+            return_constraint: 'any_station',
             vehicle_assets: {
               icon_url: 'https://www.example.com/assets/icon_car.svg',
               icon_url_dark: 'https://www.example.com/assets/icon_car_dark.svg',
               icon_last_modified: '2021-06-15'
-            },
-            default_pricing_plan_id: 'car_plan_1',
-            pricing_plan_ids: ['car_plan_1', 'car_plan_2', 'car_plan_3']
+            }
           }
         ]
       }

diff --git a/gbfs-validator/__test__/fixtures/v3.0-RC/exaustive.js b/gbfs-validator/__test__/fixtures/v3.0-RC/exaustive.js
@@ -211,7 +211,7 @@ class MockRequests {
               }
             ],
             default_reserve_time: 30,
-            return_type: ['any_station', 'free_floating'],
+            return_constraint: 'free_floating',
             vehicle_assets: {
               icon_url: 'https://www.example.com/assets/icon_bicycle.svg',
               icon_url_dark:
@@ -243,7 +243,6 @@ class MockRequests {
             vehicle_accessories: ['automatic', 'air_conditioning'],
             g_CO2_km: 0,
             default_reserve_time: 30,
-            return_type: ['any_station', 'free_floating'],
             vehicle_image: 'https://www.example.com/assets/car.jpg',
             make: [
               {
@@ -267,7 +266,6 @@ class MockRequests {
             wheel_count: 4,
             max_permitted_speed: 200,
             rated_power: 100,
-            default_reserve_time: 30,
             return_constraint: 'hybrid',
             vehicle_assets: {
               icon_url: 'https://www.example.com/assets/icon_car.svg',
@@ -290,7 +288,20 @@ class MockRequests {
       data: {
         stations: [
           {
-            station_id: 'pga',
+            station_id: 'station1',
+            name: [
+              {
+                text: 'Station 1',
+                language: 'en'
+              }
+            ],
+            lat: 12.345578,
+            lon: 45.678801,
+            is_virtual_station: false,
+            capacity: 5
+          },
+          {
+            station_id: 'station2',
             name: [
               {
                 text: 'Parking garage A',
@@ -454,8 +465,7 @@ class MockRequests {
             rental_uris: {
               android:
                 'https://www.example.com/app?vehicle_id=973a5c94-c288-4a2b-afa6-de8aeb6ae2e5&platform=android&',
-              ios:
-                'https://www.example.com/app?vehicle_id=973a5c94-c288-4a2b-afa6-de8aeb6ae2e5&platform=ios',
+              ios: 'https://www.example.com/app?vehicle_id=973a5c94-c288-4a2b-afa6-de8aeb6ae2e5&platform=ios',
               web: 'https://www.example.com/app?sid=1234567890'
             },
             vehicle_type_id: 'biketype1',
@@ -584,7 +594,7 @@ class MockRequests {
                 language: 'en'
               }
             ],
-            currency: 'CAD',
+            currency: 'EUR',
             price: 3.0,
             reservation_price_flat_rate: 3.0,
             is_taxable: true,