From c7f6b3d948b9125263cbdacf8fb866fefb528dd8 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 18 Jul 2019 18:39:07 +0200 Subject: [PATCH] . --- modules/events/event.routes.js | 2 +- modules/events/event.service.js | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/modules/events/event.routes.js b/modules/events/event.routes.js index c7401cb..f4b9499 100644 --- a/modules/events/event.routes.js +++ b/modules/events/event.routes.js @@ -41,7 +41,7 @@ routes.get('/events/next', }), ); -routes.get('/events/pass', +routes.get('/events/past', //isLoggedUser, FieldMiddleware.middleware({ invalidFields: generalInvalidFields diff --git a/modules/events/event.service.js b/modules/events/event.service.js index 047ef57..86b5424 100644 --- a/modules/events/event.service.js +++ b/modules/events/event.service.js @@ -7,6 +7,17 @@ const { generateService, parseParamsToFindOptions } = require('../../helpers/ser const Sequelize = require('sequelize'); const models = require('../../core/models'); +const XXX = (multimedias) => multimedias.map(multimedia => ({ + ...multimedia, + ...multimedia.MultimediaFile, + type: multimedia.type, + media_type: multimedia.MultimediaFile.type, + MultimediaFile: undefined, + createdAt: undefined, + updatedAt: undefined, + userId: undefined, +})); + const extraMethods = { afterFetchAll: (result, params, context) => { @@ -19,15 +30,15 @@ const extraMethods = { if (context.scopes.includes('includeSpeakers')) { rows = rows.map(event => Object.assign({}, event, + { multimedias: XXX(event.multimedias) }, { details: undefined }, - { speakers: event.details.map((details) => { - const multimedias = details.speaker.multimedias.map((multimedias) => { - return {...multimedias, ...multimedias.MultimediaFile, MultimediaFile: undefined }; - }); - const data = { ...details.speaker, order: details.order, multimedias: multimedias }; - return data; - } ) } - )); + { speakers: event.details.map((detail) => ({ + ...detail.speaker, + order: detail.order, + //...XXX(detail.speaker.multimedias) + multimedias: XXX(detail.speaker.multimedias), + }))} + )) } return {