Skip to content

Commit

Permalink
Add conditional requirement
Browse files Browse the repository at this point in the history 
On `free_bike_status.json`
+ `vehicle_type_id` if has a `vehicle_types.json`
+ `current_range_meters` if the vehicle_type_id has not the `human` propulsion

Set `vehicle_types.json` required if `free_bike_status.json` has `vehicle_type_id`

issue MobilityData#54
  • Loading branch information
@PierrickP @tdelmas
PierrickP authored and tdelmas committed Feb 1, 2022
1 parent 8e78190 commit 0ff7f7d
Show file tree
Hide file tree
Showing 11 changed files with 857 additions and 100 deletions.
1 change: 1 addition & 0 deletions functions/validator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ exports.handler = function(event, context, callback) {
})
})
.catch(err => {
console.error(err)
callback(null, {
statusCode: 500,
body: JSON.stringify(err.message)
Expand Down
82 changes: 82 additions & 0 deletions gbfs-validator/__test__/fixtures/conditionnal_no_vehicle_type_id.js
View file
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
140 changes: 140 additions & 0 deletions gbfs-validator/__test__/fixtures/conditionnal_vehicle_type_id.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
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,
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
74 changes: 74 additions & 0 deletions gbfs-validator/__test__/fixtures/missing_vehicle_types.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
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: 'ghi789',
last_reported: 1609866109,
lat: 12.345678,
lon: 56.789012,
is_reserved: false,
is_disabled: false,
vehicle_type_id: 'abc123'
}
]
}
}
})

return app
}

module.exports = build
Loading

0 comments on commit 0ff7f7d

Please sign in to comment.