From c22a469ae51230eb032d6df2b205083336718643 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 13 Jun 2022 16:01:42 +0200 Subject: [PATCH] .inscripciones online --- modules/events/events_inscriptions.service.js | 3 +- .../events_inscriptions_online.model.js | 33 +++++++++++++------ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/modules/events/events_inscriptions.service.js b/modules/events/events_inscriptions.service.js index 235fa0b..21e0e44 100644 --- a/modules/events/events_inscriptions.service.js +++ b/modules/events/events_inscriptions.service.js @@ -61,9 +61,10 @@ const extraMethods = { }, _getInscriptionOnlineByEvent: (eventId) => { - return models.EventInscription.scope("defaultScope").findAll({ + return models.EventInscriptionOnline.scope("defaultScope").findAll({ where: { eventId: eventId, + //type: ["online", "online group"], }, }); }, diff --git a/modules/events/events_inscriptions_online.model.js b/modules/events/events_inscriptions_online.model.js index 63cddfa..55497da 100644 --- a/modules/events/events_inscriptions_online.model.js +++ b/modules/events/events_inscriptions_online.model.js @@ -39,33 +39,46 @@ module.exports = function (sequelize, DataTypes) { email: { type: DataTypes.STRING, allowNull: false, - // defaultValue: "regular", //grupal, invitacion-regular, invitation-grupal, online, online group, onsite, onsite group + }, + name: { + type: DataTypes.STRING, + allowNull: false, + }, + surname: { + type: DataTypes.STRING, + }, + entity_name: { + type: DataTypes.STRING, }, assistants: { type: DataTypes.INTEGER, }, + profile: { + type: DataTypes.STRING, + }, + }, { tableName: "v_events_inscriptions_online", freezeTableName: true, - timestamps: true, + timestamps: false, defaultScope: { order: [["date", "DESC"]], - include: [ - { - model: sequelize.models.User, - as: "user", - include: [{ model: sequelize.models.Entity, attributes: ["id", "name"], required: false }], - }, - ], + // include: [ + // { + // model: sequelize.models.User, + // as: "user", + // include: [{ model: sequelize.models.Entity, attributes: ["id", "name"], required: false }], + // }, + // ], }, } ); EventInscriptionOnline.associate = function (models) { EventInscriptionOnline.Event = EventInscriptionOnline.belongsTo(models.Event, { foreignKey: "eventId", as: "event" }); - EventInscriptionOnline.User = EventInscriptionOnline.belongsTo(models.User, { foreignKey: "userId", as: "user" }); + // EventInscriptionOnline.User = EventInscriptionOnline.belongsTo(models.User, { foreignKey: "userId", as: "user" }); }; return EventInscriptionOnline;