diff --git a/core/controllers/index.js b/core/controllers/index.js index 20b3bdd..fe9842f 100644 --- a/core/controllers/index.js +++ b/core/controllers/index.js @@ -117,7 +117,8 @@ console.log('paraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaams'); delete: (config) => { return async (req, res, next) => { try { - const result = await service.delete(req.params, buildContext(req, config)); + const params = extractParamsFromRequest(req, res, _options.params.delete); + const result = await service.delete(params, buildContext(req, config)); return handleResultResponse(result, null, req.params, res, httpStatus.NO_CONTENT); } catch (error) { return handleErrorResponse(_options.MODULE_NAME, 'delete', error, res) diff --git a/modules/events/event.routes.js b/modules/events/event.routes.js index 4516cec..85f41fa 100644 --- a/modules/events/event.routes.js +++ b/modules/events/event.routes.js @@ -346,7 +346,7 @@ routes.put('/admin/reservations/:id', eventReservationController.update(), ); -// Borrar ponente +// Borrar reserva routes.delete('/admin/reservations/:id', // isAdministratorUser, eventReservationController.delete() diff --git a/modules/events/events_inscriptions.model.js b/modules/events/events_inscriptions.model.js index d5ae4c6..d076c43 100644 --- a/modules/events/events_inscriptions.model.js +++ b/modules/events/events_inscriptions.model.js @@ -72,7 +72,7 @@ module.exports = function (sequelize, DataTypes) { EventInscription.associate = function (models) { EventInscription.Event = EventInscription.belongsTo(models.Event, { foreignKey: 'eventId', as: 'event' }); - EventInscription.Reservation = EventInscription.belongsTo(models.EventReservation, { foreignKey: 'reservationId', as: 'reservation' }); + EventInscription.Reservation = EventInscription.belongsTo(models.EventReservation, { foreignKey: 'reservationId', as: 'reservation', onDelete: 'set null' }); EventInscription.User = EventInscription.belongsTo(models.User, { foreignKey: 'userId', as: 'user' }); EventInscription.UserValidate = EventInscription.belongsTo(models.User, { foreignKey: 'validateUserId' }); }; diff --git a/modules/events/events_reservations.model.js b/modules/events/events_reservations.model.js index c1e13ab..7f1dd4e 100644 --- a/modules/events/events_reservations.model.js +++ b/modules/events/events_reservations.model.js @@ -101,23 +101,24 @@ module.exports = function (sequelize, DataTypes) { foreignKey: 'overflow_reservationId' }); EventReservation.Entity = EventReservation.belongsTo(models.Entity, { foreignKey: 'entityId' }); EventReservation.Event = EventReservation.belongsTo(models.Event, { foreignKey: 'eventId' }); - EventReservation.Inscriptions = EventReservation.hasMany(models.EventInscription, { foreignKey: 'reservationId' }); + EventReservation.Inscriptions = EventReservation.hasMany(models.EventInscription, { foreignKey: 'reservationId', as: 'inscriptions' }); EventReservation.UserCreate = EventReservation.belongsTo(models.User, { foreignKey: 'userId' }); }; EventReservation.addScope('includeEvent', () => { return { - include: [ - { model: sequelize.models.Event} - ] + include: [{ + model: sequelize.models.Event + }] } }); EventReservation.addScope('includeInscriptions', () => { return { - include: [ - { model: sequelize.models.EventInscription } - ] + include: [{ + model: sequelize.models.EventInscription, + as: 'inscriptions' + }] } }); return EventReservation;