This commit is contained in:
David Arranz 2019-07-17 17:34:54 +02:00
parent fe60bad86e
commit 3cd26f9031
3 changed files with 25 additions and 8 deletions

View File

@ -77,7 +77,7 @@ const extraControllers = {
}, },
findOne: async (req, res, next) => { findOne2: async (req, res, next) => {
const params = extractParamsFromRequest(req, res, { includeAll: false }); const params = extractParamsFromRequest(req, res, { includeAll: false });
try { try {

View File

@ -160,7 +160,17 @@ module.exports = function (sequelize, DataTypes) {
where: { where: {
type: 'speaker' type: 'speaker'
}, },
include: [{ model: sequelize.models.Speaker, as: 'speaker' }] include: [{
model: sequelize.models.Speaker,
as: 'speaker',
include : [{
model: sequelize.models.Multimedia,
as: 'multimedias',
include: [{
model: sequelize.models.MultimediaFile,
}]
}]
}]
}] }]
} }
}) })

View File

@ -51,7 +51,7 @@ routes.get('/events/past',
PaginateMiddleware.middleware(), PaginateMiddleware.middleware(),
SortMiddleware.middleware({ default: "-init_date" }), SortMiddleware.middleware({ default: "-init_date" }),
eventController.find({ eventController.find({
scopes: ['defaultScope', 'past', 'includeVenue', 'includeDetails'], scopes: ['defaultScope', 'past', 'includeVenue', 'includeSpeakers'],
}), }),
// eventController.findPass // eventController.findPass
@ -64,19 +64,26 @@ routes.get('/events/current',
}), }),
PaginateMiddleware.middleware(), PaginateMiddleware.middleware(),
SortMiddleware.middleware({ default: "init_available_date" }), SortMiddleware.middleware({ default: "init_available_date" }),
eventController.findCurrent eventController.find({
scopes: ['defaultScope', 'current', 'includeVenue', 'includeSpeakers'],
}),
); );
routes.get('/events/:id', routes.get('/events/:id',
isLoggedUser, //isLoggedUser,
FieldMiddleware.middleware({ FieldMiddleware.middleware({
invalidFields: generalInvalidFields invalidFields: generalInvalidFields
}), }),
FieldMiddleware.middleware({
invalidFields: ['createdAt']
}),
eventController.findOne eventController.findOne
// eventController.find({
// scopes: ['defaultScope', 'next', 'includeVenue', 'includeSpeakers'],
// }),
); );
// Comentarios // Comentarios