This commit is contained in:
David Arranz 2019-07-09 19:39:52 +02:00
parent 8cff7c6e01
commit 050a41f0b3
8 changed files with 92 additions and 9 deletions

View File

@ -107,7 +107,7 @@ function extractParamsFromRequest(req, res, extraParams = {}) {
const result = {};
result.params = (req && req.params) ? req.params : null;
result.query = (req && req.query) ? req.params : null;
result.query = (req && req.query) ? req.query : null;
if (res && res.locals) {
Object.keys(res.locals).forEach(key => {

View File

@ -21,6 +21,7 @@ const extraControllers = {
}
},
//findComments: as
};

View File

@ -95,6 +95,9 @@ module.exports = function (sequelize, DataTypes) {
Event.Venue = Event.belongsTo(models.Venue, { foreignKey: 'venueId' });
Event.Schedule = Event.hasMany(models.EventSchedule, { foreignKey: 'eventId' });
Event.EventReservations = Event.hasMany(models.EventReservation, { foreignKey: 'eventId' });
Event.EventInscriptions = Event.hasMany(models.EventInscription, { foreignKey: 'eventId' });
Event.EventQuestions = Event.hasMany(models.EventQuestion, { foreignKey: 'eventId' });

View File

@ -22,9 +22,9 @@ routes.get('/events',
routes.get('/events/next',
//isLoggedUser,
FieldMiddleware.middleware({
/*FieldMiddleware.middleware({
invalidFields: ['user', 'createdAt']
}),
}), */
PaginateMiddleware.middleware(),
SortMiddleware.middleware({ default: "init_avalible_date" }),
eventController.findNext
@ -32,23 +32,32 @@ routes.get('/events/next',
routes.get('/events/pass',
//isLoggedUser,
PaginateMiddleware.middleware(),
SortMiddleware.middleware({ default: "-date" }),
eventController.find
);
routes.get('/events/current',
//isLoggedUser,
PaginateMiddleware.middleware(),
SortMiddleware.middleware({ default: "init_avalible_date" }),
eventController.find
);
/*routes.get('/events/:id',
isLoggedUser,
routes.get('/events/:id',
//isLoggedUser,
FieldMiddleware.middleware({
invalidFields: ['updatedAt', 'createdAt']
invalidFields: ['createdAt']
}),
eventController.findOne
);
routes.get('/events/:id/comments',
//isLoggedUser,
//eventController.findComments
);
eventController.finOne
);*/
//routes.get('/venues', isLoggedUser, SortMiddleware.middleware({ default: "name" }), venueController.find);
//routes.get('/venues/:id', isLoggedUser, venueController.findOne);

View File

@ -0,0 +1,14 @@
'use strict';
const generateControllers = require('../../core/controllers');
const multimediaService = require('./multimedia.service');
// Module Name
const MODULE_NAME = '[multimedia.controller]';
const controllerOptions = { MODULE_NAME };
const extraControllers = {};
module.exports = generateControllers(multimediaService, extraControllers, controllerOptions);

View File

@ -33,6 +33,7 @@ module.exports = function (sequelize, DataTypes) {
case 'post':
modelName = 'Post';
break;
case 'speaker':
modelName = 'Speaker'
break;
@ -45,7 +46,7 @@ module.exports = function (sequelize, DataTypes) {
break;
}
return sequelize.models[modelName].findOne(id);
return sequelize.models[modelName].findByPk(id);
}
}
}, {

View File

@ -0,0 +1,45 @@
const routes = require('express').Router();
const { isAdministratorUser, isLoggedUser } = require('../../middlewares/accessValidator');
//const SchemaValidator = require('../../middlewares/schemaValidator');
const PaginateMiddleware = require('../../middlewares/paginate');
//const FieldMiddleware = require('../../middlewares/fields');
const SortMiddleware = require('../../middlewares/sort');
//const VenueValidation = require('./venue.validations');
const multimediaController = require('./multimedia.controller');
routes.get('/multimedias',
PaginateMiddleware.middleware(),
//SortMiddleware.middleware({ default: "init_avalible_date" }),
multimediaController.find
);
routes.get('/multimedias/:id',
//PaginateMiddleware.middleware(),
//SortMiddleware.middleware({ default: "init_avalible_date" }),
multimediaController.findOne
);
routes.get('/multimedias/:entityId',
//PaginateMiddleware.middleware(),
//SortMiddleware.middleware({ default: "init_avalible_date" }),
multimediaController.find
);
//routes.get('/venues', true, SortMiddleware.middleware({ default: "name" }), venueController.find);
//routes.get('/venues', isLoggedUser, SortMiddleware.middleware({ default: "name" }), venueController.find);
//routes.get('/venues/:id', isLoggedUser, venueController.findOne);
//routes.put('/venues/:id', isAdministratorUser, venueController.update);
//routes.delete('/venues/:id', isAdministratorUser, venueController.delete);
module.exports = routes;

View File

@ -0,0 +1,10 @@
/* global Venue */
'use strict';
const _ = require('lodash');
const { generateService, parseParamsToFindOptions } = require('../../helpers/service.helper');
const models = require('../../core/models');
const extraMethods = {};
module.exports = generateService(models.Multimedia, extraMethods);