This commit is contained in:
David Arranz 2019-07-23 13:35:20 +02:00
parent d2cdbdfaac
commit a7240c7a6f
2 changed files with 51 additions and 14 deletions

View File

@ -253,7 +253,7 @@ module.exports = function (sequelize, DataTypes) {
},
});
Event.addScope('current', {
Event.addScope('today', {
where: {
init_date: {
[Sequelize.Op.gte]: moment().startOf('day').utc(),
@ -262,6 +262,17 @@ module.exports = function (sequelize, DataTypes) {
}
});
Event.addScope('current', {
where: {
init_date: {
[Sequelize.Op.lte]: moment().utc(),
},
end_date:{
[Sequelize.Op.gt]: moment().utc(),
},
}
});
Event.addScope('past', {
where: {
init_date: {
@ -270,5 +281,16 @@ module.exports = function (sequelize, DataTypes) {
}
});
Event.addScope('withOpenInscriptions', {
where: {
init_available_date: {
[Sequelize.Op.lte]: moment().utc()
},
end_available_date: {
[Sequelize.Op.gt]: moment().utc()
}
},
});
return Event;
};

View File

@ -42,18 +42,6 @@ routes.get('/events/next',
}),
);
routes.get('/web/events/next',
// isLoggedUser,
FieldMiddleware.middleware({
validFields: ['id', 'name']
}),
// PaginateMiddleware.middleware(),
// SortMiddleware.middleware({ default: "init_available_date" }),
eventController.find({
scopes: ['defaultScope', 'next']
}),
);
routes.get('/events/past',
isLoggedUser,
FieldMiddleware.middleware({
@ -66,6 +54,18 @@ routes.get('/events/past',
}),
);
routes.get('/events/today',
isLoggedUser,
FieldMiddleware.middleware({
invalidFields: generalInvalidFields
}),
PaginateMiddleware.middleware(),
SortMiddleware.middleware({ default: "-init_date" }),
eventController.find({
scopes: ['defaultScope', 'today', 'includeVenue', 'includeMultimedias', 'includeSpeakers'],
}),
);
routes.get('/events/current',
isLoggedUser,
FieldMiddleware.middleware({
@ -78,7 +78,6 @@ routes.get('/events/current',
}),
);
routes.get('/events/:id',
isLoggedUser,
FieldMiddleware.middleware({
@ -149,6 +148,22 @@ routes.get('/events/:id/reservations/:encodedInvitationCode',
eventController.checkReservationCode
);
//WEB
//Eventos con inscripciones abiertas para la web
routes.get('/web/events',
// isLoggedUser,
FieldMiddleware.middleware({
validFields: ['id', 'name']
}),
// PaginateMiddleware.middleware(),
// SortMiddleware.middleware({ default: "init_available_date" }),
eventController.find({
scopes: ['defaultScope', 'withOpenInscriptions']
}),
);
/*
routes.get('/tickets/:id/',
isLoggedUser,