lqdvi/app2-api
2
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api

Browse Source
This commit is contained in:
David Arranz 2019-08-15 19:54:23 +02:00
commit 1a06f442c5
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/controllers/index.js
View File

@ -71,27 +71,15 @@ const generateControllers = (service, extraControllers = {}, options = {}) => {
} }
} }
}, },
/*
create: async (req, res, next) => {
try {
console.log(req.body);
const result = await service.create(req.body, buildContext(req, res));
return handleResultResponse(result, null, null, res, httpStatus.CREATED)
} catch (error) {
handleErrorResponse(_options.MODULE_NAME, 'create', error, res)
}
},
*/
create: (config) => { create: (config) => {
console.log('CREAAAAAAAAAAAAAAATE'); console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
return async (req, res, next) => { return async (req, res, next) => {
try { try {
console.log('CREAAAAAAAAAAAAAAATE22222'); console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa2');
const result = await service.create(req.body, buildContext(req, config)); const result = await service.create(req.body, buildContext(req, config));
return handleResultResponse(result, null, null, res, httpStatus.CREATED) return handleResultResponse(result, null, null, res, httpStatus.CREATED)
} catch (error) { } catch (error) {
console.log('CREAAAAAAAAAAAAAAAT333333333333333332');
return handleErrorResponse(_options.MODULE_NAME, 'create', error, res) return handleErrorResponse(_options.MODULE_NAME, 'create', error, res)
} }
}; };

8
modules/events/event.routes.js
View File

@ -316,15 +316,17 @@ routes.get('/admin/events/:id',
); );
routes.get('/admin/events/:id/partners', routes.get('/admin/events/:id/partners',
isAdministratorUser, // isAdministratorUser,
eventController.findPartners, eventController.findPartners,
); );
routes.post('/admin/reservations', routes.post('/admin/reservations',
// isAdministratorUser, // isAdministratorUser,
// SchemaValidator(VenueValidation.VenueInputType, true), //SchemaValidator(eventValidation.ReservationInputType, true),
eventReservationController.create); eventReservationController.create(),
);
/*// Un ponente /*// Un ponente
routes.get('/admin/speakers/:id', routes.get('/admin/speakers/:id',

10
modules/events/event.validations.js
View File

@ -14,6 +14,16 @@ const webInscriptionInputType = Joi.object().keys({
phone: Joi.string().optional() phone: Joi.string().optional()
}); });
const ReservationInputType = Joi.object().keys({
// id: Joi.string().required(),
reservation_code: Joi.string().required(),
color: Joi.string().required(),
state: Joi.string().required(),
description: Joi.string().required(),
init_available_date: Joi.date().optional(),
end_available_date: Joi.date().optional(),
});
/* /*
const EventsListOutputType = Joi.object().keys({ const EventsListOutputType = Joi.object().keys({

5
modules/events/events_reservations.service.js
View File

@ -18,8 +18,9 @@ const extraMethods = {
}, },
_getPartners: (eventId) => { _getPartners: (eventId) => {
return models.EventReservation.findAndCountAll({ return models.EventReservation.findAll({
//attributes: [ [Sequelize.fn('DISTINCT', Sequelize.col('events_reservations.entityId'), Sequelize.col('events_reservations.eventId')), 'entities']], // attributes: [ [Sequelize.fn('DISTINCT', Sequelize.col('events_reservations.entityId'), Sequelize.col('events_reservations.eventId')), 'entities']],
attributes: ['entityId','eventId', 'state'],
where: { eventId: eventId }, where: { eventId: eventId },
include: [{ model: models.Entity }], include: [{ model: models.Entity }],
}) })