diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index fd1ad73..d977fa3 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -77,7 +77,7 @@ const extraControllers = { }, - findOne: async (req, res, next) => { + findOne2: async (req, res, next) => { const params = extractParamsFromRequest(req, res, { includeAll: false }); try { diff --git a/modules/events/event.model.js b/modules/events/event.model.js index 3dfd955..e84d222 100644 --- a/modules/events/event.model.js +++ b/modules/events/event.model.js @@ -160,7 +160,17 @@ module.exports = function (sequelize, DataTypes) { where: { 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, + }] + }] + }] }] } }) diff --git a/modules/events/event.routes.js b/modules/events/event.routes.js index dc09d46..6876852 100644 --- a/modules/events/event.routes.js +++ b/modules/events/event.routes.js @@ -51,7 +51,7 @@ routes.get('/events/past', PaginateMiddleware.middleware(), SortMiddleware.middleware({ default: "-init_date" }), eventController.find({ - scopes: ['defaultScope', 'past', 'includeVenue', 'includeDetails'], + scopes: ['defaultScope', 'past', 'includeVenue', 'includeSpeakers'], }), // eventController.findPass @@ -64,19 +64,26 @@ routes.get('/events/current', }), PaginateMiddleware.middleware(), SortMiddleware.middleware({ default: "init_available_date" }), - eventController.findCurrent + eventController.find({ + scopes: ['defaultScope', 'current', 'includeVenue', 'includeSpeakers'], + }), ); routes.get('/events/:id', - isLoggedUser, + //isLoggedUser, FieldMiddleware.middleware({ invalidFields: generalInvalidFields }), - FieldMiddleware.middleware({ - invalidFields: ['createdAt'] - }), eventController.findOne + + + +// eventController.find({ +// scopes: ['defaultScope', 'next', 'includeVenue', 'includeSpeakers'], +// }), + + ); // Comentarios