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

.

Browse Source
This commit is contained in:
David Arranz 2019-08-14 22:50:04 +02:00
parent 80db8afaeb
commit 86446f2bd3
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/events/event.controller.js
View File

@ -119,7 +119,7 @@ const extraControllers = {
const result = await eventReservationService._getPartners(params.params.id);
console.log('xxxxxx2');
console.log(result)
return handleResultResponse({ count: result }, null, params, res, httpStatus.OK);
return handleResultResponse(result, result.count, params, res, httpStatus.OK);
} catch (error) {
console.log('xxxxxxxx3');
return handleErrorResponse(MODULE_NAME, 'findPartners', error, res)

25
modules/events/event.model.js
View File

@ -202,7 +202,9 @@ module.exports = function (sequelize, DataTypes) {
// required: false });
Event.Type = Event.belongsTo(models.EventType, { foreignKey: 'typeId', as: "type" });
Event.UserCreate = Event.belongsTo(models.User, { foreignKey: 'userId', as: "user" });
Event.Venue = Event.belongsTo(models.Venue, { foreignKey: 'venueId', as: "venue" });
Event.Venue = Event.belongsTo(models.Venue, { foreignKey: 'venueId', as: "venue",
required: false,
});
Event.Details = Event.hasMany(models.EventDetail, { foreignKey: 'eventId', as: "details" });
@ -213,17 +215,28 @@ module.exports = function (sequelize, DataTypes) {
scope: {
entityName: 'event'
},
as: "comments"
as: "comments",
required: false,
});
Event.Multimedias = Event.hasMany(models.Multimedia, {
foreignKey: 'entityId',
as: { singular: 'multimedia', plural: 'multimedias' }
as: { singular: 'multimedia', plural: 'multimedias' },
required: false,
});
Event.Reservations = Event.hasMany(models.EventReservation, { foreignKey: 'eventId', as: "reservations" });
Event.Inscriptions = Event.hasMany(models.EventInscription, { foreignKey: 'eventId', as: "inscriptions" });
Event.Questions = Event.hasMany(models.EventQuestion, { foreignKey: 'eventId', as: "questions" });
Event.Reservations = Event.hasMany(models.EventReservation, {
foreignKey: 'eventId', as: "reservations",
required: false,
});
Event.Inscriptions = Event.hasMany(models.EventInscription, {
foreignKey: 'eventId', as: "inscriptions",
required: false,
});
Event.Questions = Event.hasMany(models.EventQuestion, {
foreignKey: 'eventId', as: "questions" ,
required: false,
});
};
Event.addScope('includeVenue', () => {

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

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