From e540bf7b31f99444ae33e94510f83644944a664b Mon Sep 17 00:00:00 2001 From: vicent Date: Fri, 25 Nov 2022 09:38:34 +0100 Subject: [PATCH] feat: inserta en la nueva tabla ticketSms --- db/changes/10503-november/00-ticketSms.sql | 10 +++++++ modules/client/back/model-config.json | 3 ++ modules/client/back/models/ticket-sms.json | 28 +++++++++++++++++++ modules/ticket/back/methods/ticket/sendSms.js | 12 ++++++-- 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 db/changes/10503-november/00-ticketSms.sql create mode 100644 modules/client/back/models/ticket-sms.json diff --git a/db/changes/10503-november/00-ticketSms.sql b/db/changes/10503-november/00-ticketSms.sql new file mode 100644 index 0000000000..8ebaedb30e --- /dev/null +++ b/db/changes/10503-november/00-ticketSms.sql @@ -0,0 +1,10 @@ +CREATE TABLE `vn`.`ticketSms` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `ticketFk` int(11) DEFAULT NULL, + `smsFk` mediumint(8) unsigned DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `ticketSms_FK` (`ticketFk`), + KEY `ticketSms_FK_1` (`smsFk`), + CONSTRAINT `ticketSms_FK` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON UPDATE CASCADE, + CONSTRAINT `ticketSms_FK_1` FOREIGN KEY (`smsFk`) REFERENCES `sms` (`id`) ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci diff --git a/modules/client/back/model-config.json b/modules/client/back/model-config.json index 4ef34ca3a6..b466aa5a13 100644 --- a/modules/client/back/model-config.json +++ b/modules/client/back/model-config.json @@ -104,6 +104,9 @@ "SageTransactionType": { "dataSource": "vn" }, + "TicketSms": { + "dataSource": "vn" + }, "TpvError": { "dataSource": "vn" }, diff --git a/modules/client/back/models/ticket-sms.json b/modules/client/back/models/ticket-sms.json new file mode 100644 index 0000000000..1787ba17c2 --- /dev/null +++ b/modules/client/back/models/ticket-sms.json @@ -0,0 +1,28 @@ +{ + "name": "TicketSms", + "base": "VnModel", + "options": { + "mysql": { + "table": "ticketSms" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + } + }, + "relations": { + "ticket": { + "type": "belongsTo", + "model": "Ticket", + "foreignKey": "ticketFk" + }, + "sms": { + "type": "belongsTo", + "model": "Sms", + "foreignKey": "smsFk" + } + } +} diff --git a/modules/ticket/back/methods/ticket/sendSms.js b/modules/ticket/back/methods/ticket/sendSms.js index a0adcae076..2336ae8595 100644 --- a/modules/ticket/back/methods/ticket/sendSms.js +++ b/modules/ticket/back/methods/ticket/sendSms.js @@ -31,6 +31,7 @@ module.exports = Self => { }); Self.sendSms = async(ctx, id, destination, message, options) => { + const models = Self.app.models; const myOptions = {}; let tx; @@ -45,7 +46,14 @@ module.exports = Self => { const userId = ctx.req.accessToken.userId; try { - const sms = await Self.app.models.Sms.send(ctx, destination, message); + const sms = await models.Sms.send(ctx, destination, message); + + const newTicketSms = { + ticketFk: id, + smsFk: sms.id + }; + await models.TicketSms.create(newTicketSms); + const logRecord = { originFk: id, userFk: userId, @@ -60,7 +68,7 @@ module.exports = Self => { } }; - const ticketLog = await Self.app.models.TicketLog.create(logRecord, myOptions); + const ticketLog = await models.TicketLog.create(logRecord, myOptions); sms.logId = ticketLog.id;