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

Jump to bottom

Vehicle entries #852

Merged
merged 3 commits into from
Apr 13, 2018
Merged

Vehicle entries #852

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efe9cad
fixed syntax error
achieven Apr 13, 2018
1c0b09a
fixed syntax error
achieven Apr 13, 2018
08b9c9b
finished api, code not perfect
achieven Apr 13, 2018
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
30 changes: 17 additions & 13 deletions routes/api/api_gate_routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ var Event = require('../../models/event').Event;
var UsersGroup = require('../../models/user').UsersGroup;
var UsersGroupMembership = require('../../models/user').UsersGroupMembership;

// const constants = require('../../models/constants');
const constants = require('../../models/constants');
// const volunteersAPI = require('../../libs/volunteers')();

const ERRORS = {
GATE_CODE_MISSING: 'gate_code is missing or incorrect',
Expand Down Expand Up @@ -245,29 +246,29 @@ router.post('/tickets-counter', async function (req, res) {
});

router.post(
'/vehicle-action/:direction',
async function (req, res) {
if (!constants..includes(req.params.direction)) {
'/vehicle-action/:event_id/:direction',
async function (req, res) {
if (!constants.VEHICLE_ENTRY_DIRECTION.includes(req.params.direction)) {
return sendError(res, 500, "INVALID_VEHICLE_DIRECTION");
}
try {
let direction = 'arrival' === req.params.direction ? 1 : 0;
await knex('vehicle_entries').insert({timestamp: new Date().getTime(), direction: direction});
const direction = 'arrival' === req.params.direction ? 1 : 0;
await knex('vehicle_entries').insert({timestamp: new Date(), direction: direction, event_id: req.params.event_id});
return res.status(200).json({
message: "Vehicle action completed"
});
} catch (errorObj) {
return sendError(res, 500, errorObj);
}
}
});
}
);

router.get(
'/vehicle-counter',
'/vehicle-counter/:event_id',
async function (req, res) {
try {
let vehicleEntries = await knex('vehicle_entries').count().where('direction', '=', 1);
let vehicleExits = await knex('vehicle_entries').count().where('direction', '=', 0);
let vehicleEntries = (await knex('vehicle_entries').count().where('direction', '=', 1))[0]['count(*)'];
let vehicleExits = (await knex('vehicle_entries').count().where('direction', '=', 0))[0]['count(*)'];
return res.status(200).json({
vehicleCount: vehicleEntries - vehicleExits
});
Expand All @@ -278,10 +279,13 @@ router.get(
);

router.get(
'all-vehicle-actions/:dateFrom/:dateTo',
'/all-vehicle-actions/:event_id/:dateFrom/:dateTo',
async function (req, res) {
try {
let vehicleTimestamps = await knex('vehicle_entries').where('timestamp', '>', req.params.dateFrom).where('timestamp', '<', req.params.dateTo);
let vehicleTimestamps = await knex('vehicle_entries')
.where('event_id', '=', req.params.event_id)
.where('timestamp', '>', new Date(parseInt(req.params.dateFrom)))
.where('timestamp', '<', new Date(parseInt(req.params.dateTo)));
return res.status(200).json({
vehicleTimestamps: vehicleTimestamps
});
Expand Down