From 2367b55c7b5822bcf06f4785a14df245de8c150a Mon Sep 17 00:00:00 2001 From: david Date: Thu, 25 Jul 2019 19:21:26 +0200 Subject: [PATCH] . --- config/environments/development.js | 2 +- config/environments/production.js | 2 +- modules/events/event.model.js | 6 ++++-- modules/multimedia/multimedia.model.js | 6 ------ modules/multimedia/multimedia_file.model.js | 4 ++-- modules/multimedia/multimedia_file.routes.js | 4 ++-- modules/speakers/speaker.model.js | 3 ++- modules/speakers/speaker.service.js | 8 ++++---- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/config/environments/development.js b/config/environments/development.js index 4883003..b468fd0 100644 --- a/config/environments/development.js +++ b/config/environments/development.js @@ -29,6 +29,6 @@ module.exports = { vimeo: { CLIENT_ID: '9581f2d0ed211dc1e31b5c825117dc1f00d77ba0', CLIENT_SECRET: '3kf0hQ63OXSPm7z2X1qyOV4iH57Xha0cyRXn0VJneq8zHbWKjfB1/9H8KcgBgzgkzw0Y9x/xFLUAauuHLEkqHxLBw8QueanCgIZev1L5xoksrKuKX7gMvErqqP+uFNnA', - ACCESS_TOKEN: '2843aed2064f8148d74074dff7807d92' + ACCESS_TOKEN: 'fcc7b31fe690a768efa920e13d750449' } } diff --git a/config/environments/production.js b/config/environments/production.js index a62b311..0d820f0 100644 --- a/config/environments/production.js +++ b/config/environments/production.js @@ -37,6 +37,6 @@ module.exports = { vimeo: { CLIENT_ID: '9581f2d0ed211dc1e31b5c825117dc1f00d77ba0', CLIENT_SECRET: '3kf0hQ63OXSPm7z2X1qyOV4iH57Xha0cyRXn0VJneq8zHbWKjfB1/9H8KcgBgzgkzw0Y9x/xFLUAauuHLEkqHxLBw8QueanCgIZev1L5xoksrKuKX7gMvErqqP+uFNnA', - ACCESS_TOKEN: '2843aed2064f8148d74074dff7807d92' + ACCESS_TOKEN: 'fcc7b31fe690a768efa920e13d750449' } } diff --git a/modules/events/event.model.js b/modules/events/event.model.js index 01ae06d..b0c12e7 100644 --- a/modules/events/event.model.js +++ b/modules/events/event.model.js @@ -200,10 +200,11 @@ module.exports = function (sequelize, DataTypes) { return { include: [{ model: sequelize.models.Multimedia, - as: 'multimedias', + as: { singular: 'multimedia', plural: 'multimedias' }, required: false, include : [{ model: sequelize.models.MultimediaFile, + as: "multimediaFile" }] }, ] @@ -234,10 +235,11 @@ module.exports = function (sequelize, DataTypes) { required: false, include : [{ model: sequelize.models.Multimedia, - as: 'multimedias', + as: { singular: 'multimedia', plural: 'multimedias' }, required: false, include: [{ model: sequelize.models.MultimediaFile, + as: "multimediaFile" }] }] }] diff --git a/modules/multimedia/multimedia.model.js b/modules/multimedia/multimedia.model.js index 7795bd4..cbfc091 100644 --- a/modules/multimedia/multimedia.model.js +++ b/modules/multimedia/multimedia.model.js @@ -70,12 +70,6 @@ module.exports = function (sequelize, DataTypes) { Multimedia.associate = function (models) { Multimedia.MultimediaFile = Multimedia.belongsTo(models.MultimediaFile, { foreignKey: 'multimediafileId', as: "multimediaFile" }); - - Multimedia.Speaker = Multimedia.hasOne(models.Speaker, { - foreignKey: 'entityId', - as: 'speaker' - }); - }; return Multimedia; diff --git a/modules/multimedia/multimedia_file.model.js b/modules/multimedia/multimedia_file.model.js index 240e6d9..cbc16ae 100644 --- a/modules/multimedia/multimedia_file.model.js +++ b/modules/multimedia/multimedia_file.model.js @@ -37,13 +37,13 @@ module.exports = function (sequelize, DataTypes) { MultimediaFile.associate = function (models) { MultimediaFile.UserCreate = MultimediaFile.belongsTo(models.User, { foreignKey: 'userId' }); - MultimediaFile.Multimedias = MultimediaFile.hasMany(models.Multimedia, { foreignKey: 'multimediafileId', as: "multimedias" }); + MultimediaFile.Multimedias = MultimediaFile.hasMany(models.Multimedia, { foreignKey: 'multimediafileId', as: { singular: 'multimedia', plural: 'multimedias' } }); }; MultimediaFile.addScope('includeMultimedias', () => { return { include: [ - { model: sequelize.models.Multimedia, as: 'multimedias' } + { model: sequelize.models.Multimedia, as: { singular: 'multimedia', plural: 'multimedias' } } ] } }); diff --git a/modules/multimedia/multimedia_file.routes.js b/modules/multimedia/multimedia_file.routes.js index 42fefa0..f1be5bc 100644 --- a/modules/multimedia/multimedia_file.routes.js +++ b/modules/multimedia/multimedia_file.routes.js @@ -14,7 +14,7 @@ const generalInvalidFields = [ 'userId', 'createdAt', 'updatedAt', ]; -routes.get('/multimediafiles', //cacheSuccesses, +routes.get('/multimediafiles', cacheSuccesses, FieldMiddleware.middleware({ invalidFields: generalInvalidFields }), @@ -25,7 +25,7 @@ routes.get('/multimediafiles', //cacheSuccesses, }) ); -routes.get('/multimediafiles/:id', //cacheSuccesses, +routes.get('/multimediafiles/:id', cacheSuccesses, FieldMiddleware.middleware({ invalidFields: generalInvalidFields }), diff --git a/modules/speakers/speaker.model.js b/modules/speakers/speaker.model.js index b03ecb9..5f3e86d 100644 --- a/modules/speakers/speaker.model.js +++ b/modules/speakers/speaker.model.js @@ -114,10 +114,11 @@ module.exports = function (sequelize, DataTypes) { return { include: [{ model: sequelize.models.Multimedia, - as: 'multimedias', + as: { singular: 'multimedia', plural: 'multimedias' }, required: false, include: [{ model: sequelize.models.MultimediaFile, + as: "multimediaFile" }] }, ] diff --git a/modules/speakers/speaker.service.js b/modules/speakers/speaker.service.js index aa21006..82f49c3 100644 --- a/modules/speakers/speaker.service.js +++ b/modules/speakers/speaker.service.js @@ -10,14 +10,14 @@ const cdnHelper = require('../../helpers/cdn.helper'); const multimediaComposer = (multimedias) => multimedias.map(multimedia => ({ ...multimedia, - ...multimedia.MultimediaFile, + ...multimedia.multimediaFile, type: multimedia.type, - media_type: multimedia.MultimediaFile.type, - MultimediaFile: undefined, + media_type: multimedia.multimediaFile.type, + multimediaFile: undefined, createdAt: undefined, updatedAt: undefined, userId: undefined, - url: (multimedia.MultimediaFile.provider === 'cdn') ? cdnHelper.getCDNMediaUrl(multimedia.MultimediaFile.url) : multimedia.MultimediaFile.url, + url: (multimedia.multimediaFile.provider === 'cdn') ? cdnHelper.getCDNMediaUrl(multimedia.multimediaFile.url) : multimedia.multimediaFile.url, })); const valuesComposer = (values) => values.map(value => ({