Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add conditional requirement #63

Merged
merged 15 commits into from
Feb 21, 2022
Merged

Add conditional requirement #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0ff7f7d
Add conditional requirement
PierrickP Feb 1, 2022
2d269ee
Conditionnal validation
tdelmas Feb 2, 2022
4c0eb0c
Squashed 'gbfs-validator/versions/schemas/' changes from 4b1f5a4..90a…
tdelmas Feb 2, 2022
44531bb
Merge commit '4c0eb0c1b6396efe7123e7ceb1c7099cc33315d4' into better-c…
tdelmas Feb 2, 2022
3c9ce90
Clean & format
tdelmas Feb 2, 2022
be6a238
Add partials for 2.1 and 2.3-RC
tdelmas Feb 2, 2022
b98a17e
Fix $ref + clean
tdelmas Feb 3, 2022
19b0d4c
Conditionally REQUIRED `vehicle_types_available`
tdelmas Feb 3, 2022
94da94b
CHeck if `vehicle_type_id` value used in `station_status.json` exists…
tdelmas Feb 3, 2022
2b57aa0
Check `default_pricing_plan_id` value
tdelmas Feb 7, 2022
24f0650
Remove debug information
tdelmas Feb 8, 2022
adff7d5
Clean spacing
tdelmas Feb 8, 2022
0548f96
Fix partial source ref
PierrickP Feb 9, 2022
db7034e
Improve download schema UI
PierrickP Feb 9, 2022
a77e9ad
Optimise bootstrap build
PierrickP Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 82 additions & 0 deletions gbfs-validator/__test__/fixtures/conditionnal_no_vehicle_type_id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
const fastify = require('fastify')

function build(opts = {}) {
const app = fastify(opts)

app.get('/gbfs.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
en: {
feeds: [
{
name: 'system_information',
url: `http://${request.hostname}/system_information.json`
},
{
name: 'station_information',
url: `http://${request.hostname}/station_information.json`
},
{
name: 'station_status',
url: `http://${request.hostname}/station_status.json`
},
{
name: 'free_bike_status',
url: `http://${request.hostname}/free_bike_status.json`
}
]
}
}
}
})

app.get('/system_information.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
system_id: 'shared_bike',
language: 'en',
name: 'Shared Bike USA',
timezone: 'UTC'
}
}
})

app.get('/free_bike_status.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
bikes: [
{
bike_id: 'bike1',
last_reported: 1609866109,
lat: 12.345678,
lon: 56.789012,
is_reserved: false,
is_disabled: false
},
{
bike_id: 'bike2',
last_reported: 1609866109,
lat: 12.345678,
lon: 56.789012,
is_reserved: false,
is_disabled: false,
vehicle_type_id: 'abc123'
}
]
}
}
})

return app
}

module.exports = build
141 changes: 141 additions & 0 deletions gbfs-validator/__test__/fixtures/conditionnal_vehicle_type_id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
const fastify = require('fastify')

function build(opts = {}) {
const app = fastify(opts)

app.get('/gbfs.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
en: {
feeds: [
{
name: 'system_information',
url: `http://${request.hostname}/system_information.json`
},
{
name: 'station_information',
url: `http://${request.hostname}/station_information.json`
},
{
name: 'station_status',
url: `http://${request.hostname}/station_status.json`
},
{
name: 'free_bike_status',
url: `http://${request.hostname}/free_bike_status.json`
},
{
name: 'vehicle_types',
url: `http://${request.hostname}/vehicle_types.json`
}
]
}
}
}
})

app.get('/system_information.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
system_id: 'shared_bike',
language: 'en',
name: 'Shared Bike USA',
timezone: 'UTC'
}
}
})

app.get('/vehicle_types.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
vehicle_types: [
{
vehicle_type_id: 'abc123',
form_factor: 'bicycle',
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',
form_factor: 'car',
propulsion_type: 'electric',
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']
}
]
}
}
})

app.get('/free_bike_status.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
bikes: [
{
bike_id: 'bike1',
last_reported: 1609866109,
lat: 12.345678,
lon: 56.789012,
is_reserved: false,
is_disabled: false
// missing vehicle_type_id
},
{
bike_id: 'bike2',
last_reported: 1609866109,
lat: 12.345678,
lon: 56.789012,
is_reserved: false,
is_disabled: false,
vehicle_type_id: 'abc123'
},
{
bike_id: 'car1',
last_reported: 1609866109,
lat: 12.345678,
lon: 56.789012,
is_reserved: false,
is_disabled: false,
vehicle_type_id: 'efg456'
// missing current_range_meters
}
]
}
}
})

return app
}

module.exports = build
132 changes: 132 additions & 0 deletions gbfs-validator/__test__/fixtures/conditionnal_vehicle_types_available.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
const fastify = require('fastify')

function build(opts = {}) {
const app = fastify(opts)

app.get('/gbfs.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
en: {
feeds: [
{
name: 'system_information',
url: `http://${request.hostname}/system_information.json`
},
{
name: 'station_information',
url: `http://${request.hostname}/station_information.json`
},
{
name: 'station_status',
url: `http://${request.hostname}/station_status.json`
},
{
name: 'vehicle_types',
url: `http://${request.hostname}/vehicle_types.json`
}
]
}
}
}
})

app.get('/system_information.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
system_id: 'shared_bike',
language: 'en',
name: 'Shared Bike USA',
timezone: 'UTC'
}
}
})

app.get('/vehicle_types.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
vehicle_types: [
{
vehicle_type_id: 'abc123',
form_factor: 'bicycle',
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',
form_factor: 'car',
propulsion_type: 'electric',
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']
}
]
}
}
})

app.get('/station_status.json', async function(request, reply) {
return {
last_updated: 1566224400,
ttl: 0,
version: '2.2',
data: {
stations: [
{
station_id: 'abc123',
num_bikes_available: 0,
is_installed: true,
is_renting: true,
is_returning: true,
last_reported: 1566224400
// missing vehicle_types_available
},
{
station_id: 'abc123',
num_bikes_available: 0,
is_installed: true,
is_renting: true,
is_returning: true,
last_reported: 1566224400,
vehicle_types_available: [
{
vehicle_type_id: 'efg456',
count: 2
}
]
}
]
}
}
})

return app
}

module.exports = build
Loading