a
This commit is contained in:
parent
99ae109865
commit
fe60bad86e
@ -156,11 +156,9 @@ module.exports = function (sequelize, DataTypes) {
|
||||
return {
|
||||
include: [{
|
||||
model: sequelize.models.EventDetail,
|
||||
as: 'eventdetail',
|
||||
as: 'details',
|
||||
where: {
|
||||
speakerId: {
|
||||
[Sequelize.Op.ne]: null
|
||||
}
|
||||
type: 'speaker'
|
||||
},
|
||||
include: [{ model: sequelize.models.Speaker, as: 'speaker' }]
|
||||
}]
|
||||
@ -169,7 +167,7 @@ module.exports = function (sequelize, DataTypes) {
|
||||
|
||||
Event.addScope('next', {
|
||||
where: {
|
||||
date: {
|
||||
init_date: {
|
||||
[Sequelize.Op.gte]: moment().add(1, 'days').startOf('day').utc()
|
||||
}
|
||||
},
|
||||
@ -177,7 +175,7 @@ module.exports = function (sequelize, DataTypes) {
|
||||
|
||||
Event.addScope('current', {
|
||||
where: {
|
||||
date: {
|
||||
init_date: {
|
||||
[Sequelize.Op.gte]: moment().startOf('day').utc(),
|
||||
[Sequelize.Op.lt]: moment().add(1, 'days').startOf('day').utc(),
|
||||
}
|
||||
@ -186,7 +184,7 @@ module.exports = function (sequelize, DataTypes) {
|
||||
|
||||
Event.addScope('past', {
|
||||
where: {
|
||||
date: {
|
||||
init_date: {
|
||||
[Sequelize.Op.lt]: moment().startOf('day').utc()
|
||||
}
|
||||
}
|
||||
|
||||
@ -35,22 +35,26 @@ routes.get('/events/next',
|
||||
PaginateMiddleware.middleware(),
|
||||
SortMiddleware.middleware({ default: "init_available_date" }),
|
||||
eventController.find({
|
||||
scopes: ['defaultScope', 'next', 'includeVenue', 'includeDetails', 'includeSpeakers'],
|
||||
scopes: ['defaultScope', 'next', 'includeVenue', 'includeSpeakers'],
|
||||
}),
|
||||
//eventController.find
|
||||
//eventController.find , 'includeSpeakers'
|
||||
// model.scope('next').findAll();
|
||||
///SchemaValidator(eventValidation.EventsListOutputType, true),
|
||||
|
||||
);
|
||||
|
||||
routes.get('/events/pass',
|
||||
routes.get('/events/past',
|
||||
isLoggedUser,
|
||||
FieldMiddleware.middleware({
|
||||
invalidFields: generalInvalidFields
|
||||
}),
|
||||
PaginateMiddleware.middleware(),
|
||||
SortMiddleware.middleware({ default: "-date" }),
|
||||
eventController.findPass
|
||||
SortMiddleware.middleware({ default: "-init_date" }),
|
||||
eventController.find({
|
||||
scopes: ['defaultScope', 'past', 'includeVenue', 'includeDetails'],
|
||||
}),
|
||||
|
||||
// eventController.findPass
|
||||
);
|
||||
|
||||
routes.get('/events/current',
|
||||
|
||||
@ -73,6 +73,16 @@ where videoId in (select id from lqdvi_v2.multimedia_files);
|
||||
Cargar
|
||||
script-carga-bd-events_details.sql
|
||||
|
||||
|
||||
update lqdvi_v2.events_details
|
||||
set type = 'speaker'
|
||||
where description like'%conference-speaker%';
|
||||
|
||||
update lqdvi_v2.events_details
|
||||
set type = 'info'
|
||||
where type is null;
|
||||
|
||||
|
||||
//Modificamos la tabla para crear otro campo autoinc que nos rellene el order
|
||||
/*
|
||||
insert into lqdvi_v2.events_schedules (id, eventId, speakerId, description, createdAt, updatedAt)
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user