From 7895decf4eea09243c552d6cd94ad3d9d7ffae78 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 19 Jul 2022 15:17:22 +0200 Subject: [PATCH 01/19] feat(notification): create models --- back/methods/notification/clean.js | 0 back/methods/notification/send.js | 18 ++++++ back/models/notifcation.json | 22 +++++++ back/models/notifcationAcl.json | 21 +++++++ back/models/notifcationConfig.json | 19 ++++++ back/models/notifcationQueue.json | 37 ++++++++++++ back/models/notification.js | 4 ++ back/models/notificationSubscription.json | 21 +++++++ db/dump/fixtures.sql | 5 +- db/dump/structure.sql | 71 ++++++++++++++++++++++- 10 files changed, 214 insertions(+), 4 deletions(-) create mode 100644 back/methods/notification/clean.js create mode 100644 back/methods/notification/send.js create mode 100644 back/models/notifcation.json create mode 100644 back/models/notifcationAcl.json create mode 100644 back/models/notifcationConfig.json create mode 100644 back/models/notifcationQueue.json create mode 100644 back/models/notification.js create mode 100644 back/models/notificationSubscription.json diff --git a/back/methods/notification/clean.js b/back/methods/notification/clean.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/back/methods/notification/send.js b/back/methods/notification/send.js new file mode 100644 index 0000000000..bb2d79f2a2 --- /dev/null +++ b/back/methods/notification/send.js @@ -0,0 +1,18 @@ +module.exports = Self => { + Self.remoteMethod('send', { + description: 'Send notifications from queue', + accessType: 'WRITE', + returns: { + type: 'object', + root: true + }, + http: { + path: `/send`, + verb: 'POST' + } + }); + + Self.send = async() => { + + }; +}; diff --git a/back/models/notifcation.json b/back/models/notifcation.json new file mode 100644 index 0000000000..e4f0be17e0 --- /dev/null +++ b/back/models/notifcation.json @@ -0,0 +1,22 @@ +{ + "name": "Notificacion", + "base": "VnModel", + "options": { + "mysql": { + "table": "notificacion" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "name": { + "type": "string" + }, + "description": { + "type": "string" + } + } +} \ No newline at end of file diff --git a/back/models/notifcationAcl.json b/back/models/notifcationAcl.json new file mode 100644 index 0000000000..f5861943f7 --- /dev/null +++ b/back/models/notifcationAcl.json @@ -0,0 +1,21 @@ +{ + "name": "NotificacionAcl", + "base": "VnModel", + "options": { + "mysql": { + "table": "notificacionAcl" + } + }, + "relations": { + "notificacion": { + "type": "belongsTo", + "model": "Notificacion", + "foreignKey": "notificacionFk" + }, + "role": { + "type": "belongsTo", + "model": "Role", + "foreignKey": "roleFk" + } + } +} \ No newline at end of file diff --git a/back/models/notifcationConfig.json b/back/models/notifcationConfig.json new file mode 100644 index 0000000000..73882b6b7a --- /dev/null +++ b/back/models/notifcationConfig.json @@ -0,0 +1,19 @@ +{ + "name": "NotificationConfig", + "base": "VnModel", + "options": { + "mysql": { + "table": "notificationConfig" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "cleanDays": { + "type": "number" + } + } +} \ No newline at end of file diff --git a/back/models/notifcationQueue.json b/back/models/notifcationQueue.json new file mode 100644 index 0000000000..7a9199bc0f --- /dev/null +++ b/back/models/notifcationQueue.json @@ -0,0 +1,37 @@ +{ + "name": "NotificacionQueue", + "base": "VnModel", + "options": { + "mysql": { + "table": "notificacionQueue" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "params": { + "type": "string" + }, + "status": { + "type": "string" + }, + "created": { + "type": "date" + } + }, + "relations": { + "notificacion": { + "type": "belongsTo", + "model": "Notificacion", + "foreignKey": "notificacionFk" + }, + "author": { + "type": "belongsTo", + "model": "User", + "foreignKey": "authorFk" + } + } +} \ No newline at end of file diff --git a/back/models/notification.js b/back/models/notification.js new file mode 100644 index 0000000000..da766d4424 --- /dev/null +++ b/back/models/notification.js @@ -0,0 +1,4 @@ +module.exports = Self => { + require('../methods/notification/send')(Self); + require('../methods/notification/clear')(Self); +}; diff --git a/back/models/notificationSubscription.json b/back/models/notificationSubscription.json new file mode 100644 index 0000000000..ed8bb1907d --- /dev/null +++ b/back/models/notificationSubscription.json @@ -0,0 +1,21 @@ +{ + "name": "NotificationSubscription", + "base": "VnModel", + "options": { + "mysql": { + "table": "notificationSubscription" + } + }, + "relations": { + "notificacion": { + "type": "belongsTo", + "model": "Notificacion", + "foreignKey": "notificacionFk" + }, + "user": { + "type": "belongsTo", + "model": "User", + "foreignKey": "userFk" + } + } +} \ No newline at end of file diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 0609a6a6ab..dabc731394 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2610,4 +2610,7 @@ INSERT INTO `vn`.`sectorCollectionSaleGroup` (`sectorCollectionFk`, `saleGroupFk INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`, `shortWeekBreak`, `longWeekBreak`, `weekScope`, `mailPass`, `mailHost`, `mailSuccessFolder`, `mailErrorFolder`, `mailUser`, `minHoursToBreak`, `breakHours`, `hoursCompleteWeek`, `startNightlyHours`, `endNightlyHours`, `maxTimePerDay`, `breakTime`, `timeToBreakTime`, `dayMaxTime`, `shortWeekDays`, `longWeekDays`) VALUES - (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13); \ No newline at end of file + (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13); + +INSERT INTO `util`.`notificationConfig` + SET `cleanDays` = 90; \ No newline at end of file diff --git a/db/dump/structure.sql b/db/dump/structure.sql index 2c0e8231af..9238557620 100644 --- a/db/dump/structure.sql +++ b/db/dump/structure.sql @@ -20849,9 +20849,74 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `util` /*!40100 DEFAULT CHARACTER SET u USE `util`; --- --- Table structure for table `config` --- +CREATE TABLE notification( + id INT PRIMARY KEY, + `name` VARCHAR(255) UNIQUE, + `description` VARCHAR(255) +); + +CREATE TABLE notificationAcl ( + notificationFk INT(11), + roleFk INT(10) unsigned, + PRIMARY KEY(notificationFk, roleFk), + CONSTRAINT `notificationAcl_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `notificationAcl_ibfk_2` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE notificationSubscription( + notificationFk INT, + userFk INT(10) unsigned, + PRIMARY KEY(notificationFk, userFk), + CONSTRAINT `notificationSubscription_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `notificationSubscription_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE notificationQueue( + id INT PRIMARY KEY AUTO_INCREMENT, + notificationFk VARCHAR(255), + params TEXT, + authorFk INT(10) unsigned NULL, + `status` ENUM('pending', 'sent', 'error') NOT NULL DEFAULT 'pending', + created DATETIME DEFAULT CURRENT_TIMESTAMP, + INDEX(notificationFk), + INDEX(authorFk), + INDEX(status), + CONSTRAINT `notificationQueue_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`name`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `notificationQueue_ibfk_2` FOREIGN KEY (`authorFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE notificationConfig( + id INT PRIMARY KEY AUTO_INCREMENT, + cleanDays MEDIUMINT +); + +DROP FUNCTION IF EXISTS util.notification_send; +DELIMITER $$ +CREATE FUNCTION util.notification_send(vNotificationName VARCHAR(255), vParams TEXT, vAuthorFk INT) + RETURNS INT +BEGIN +/** + * Sends a notification. + * + * @param vNotificationName The notification name + * @param vParams The notification parameters formatted as JSON + * @param vAuthorFk The notification author or %NULL if there is no author + * @return The notification id + */ + DECLARE vNotificationFk INT; + + SELECT id INTO vNotificationFk + FROM `notification` + WHERE `name` = vNotificationName; + + INSERT INTO notificationQueue + SET notificationFk = vNotificationFk, + params = vParams, + authorFk = vAuthorFk; + + RETURN LAST_INSERT_ID(); +END$$ +DELIMITER ; DROP TABLE IF EXISTS `config`; /*!40101 SET @saved_cs_client = @@character_set_client */; From 9b48cbb07866be87502d33cee7d6648243606a0d Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 20 Jul 2022 14:54:50 +0200 Subject: [PATCH 02/19] feat(notification): send --- back/methods/notification/send.js | 19 ++++++++++++++++++- back/model-config.json | 15 +++++++++++++++ back/models/notification.js | 1 - .../{notifcation.json => notification.json} | 4 ++-- ...tifcationAcl.json => notificationAcl.json} | 10 +++++----- ...ionConfig.json => notificationConfig.json} | 2 +- ...ationQueue.json => notificationQueue.json} | 10 +++++----- back/models/notificationSubscription.json | 8 ++++---- .../10490-goldenSummer/00-aclNotification.sql | 3 +++ db/dump/fixtures.sql | 18 +++++++++++++++++- 10 files changed, 70 insertions(+), 20 deletions(-) rename back/models/{notifcation.json => notification.json} (84%) rename back/models/{notifcationAcl.json => notificationAcl.json} (59%) rename back/models/{notifcationConfig.json => notificationConfig.json} (88%) rename back/models/{notifcationQueue.json => notificationQueue.json} (76%) create mode 100644 db/changes/10490-goldenSummer/00-aclNotification.sql diff --git a/back/methods/notification/send.js b/back/methods/notification/send.js index bb2d79f2a2..d5149fc59b 100644 --- a/back/methods/notification/send.js +++ b/back/methods/notification/send.js @@ -1,7 +1,7 @@ module.exports = Self => { Self.remoteMethod('send', { description: 'Send notifications from queue', - accessType: 'WRITE', + accessType: 'READ', returns: { type: 'object', root: true @@ -13,6 +13,23 @@ module.exports = Self => { }); Self.send = async() => { + const status = 'pending'; + const myOptions = {}; + let tx; + + if (!myOptions.transaction) { + tx = await Self.beginTransaction({}); + myOptions.transaction = tx; + } + + const notificationQueue = await Self.app.models.NotificationQueue.find({ + where: {code: status}, + include: [{ + relation: 'notificationSubscription' + }] + }, myOptions); + + console.log(notificationQueue); }; }; diff --git a/back/model-config.json b/back/model-config.json index 3432103832..755f449de7 100644 --- a/back/model-config.json +++ b/back/model-config.json @@ -77,6 +77,21 @@ "Module": { "dataSource": "vn" }, + "Notification": { + "dataSource": "vn" + }, + "NotificationAcl": { + "dataSource": "vn" + }, + "NotificationConfig": { + "dataSource": "vn" + }, + "NotificationQueue": { + "dataSource": "vn" + }, + "NotificationSubscription": { + "dataSource": "vn" + }, "Province": { "dataSource": "vn" }, diff --git a/back/models/notification.js b/back/models/notification.js index da766d4424..46378bd027 100644 --- a/back/models/notification.js +++ b/back/models/notification.js @@ -1,4 +1,3 @@ module.exports = Self => { require('../methods/notification/send')(Self); - require('../methods/notification/clear')(Self); }; diff --git a/back/models/notifcation.json b/back/models/notification.json similarity index 84% rename from back/models/notifcation.json rename to back/models/notification.json index e4f0be17e0..9422d03b37 100644 --- a/back/models/notifcation.json +++ b/back/models/notification.json @@ -1,9 +1,9 @@ { - "name": "Notificacion", + "name": "Notification", "base": "VnModel", "options": { "mysql": { - "table": "notificacion" + "table": "util.notification" } }, "properties": { diff --git a/back/models/notifcationAcl.json b/back/models/notificationAcl.json similarity index 59% rename from back/models/notifcationAcl.json rename to back/models/notificationAcl.json index f5861943f7..e3e97f52de 100644 --- a/back/models/notifcationAcl.json +++ b/back/models/notificationAcl.json @@ -1,16 +1,16 @@ { - "name": "NotificacionAcl", + "name": "NotificationAcl", "base": "VnModel", "options": { "mysql": { - "table": "notificacionAcl" + "table": "util.notificationAcl" } }, "relations": { - "notificacion": { + "notification": { "type": "belongsTo", - "model": "Notificacion", - "foreignKey": "notificacionFk" + "model": "Notification", + "foreignKey": "notificationFk" }, "role": { "type": "belongsTo", diff --git a/back/models/notifcationConfig.json b/back/models/notificationConfig.json similarity index 88% rename from back/models/notifcationConfig.json rename to back/models/notificationConfig.json index 73882b6b7a..b00ed3675b 100644 --- a/back/models/notifcationConfig.json +++ b/back/models/notificationConfig.json @@ -3,7 +3,7 @@ "base": "VnModel", "options": { "mysql": { - "table": "notificationConfig" + "table": "util.notificationConfig" } }, "properties": { diff --git a/back/models/notifcationQueue.json b/back/models/notificationQueue.json similarity index 76% rename from back/models/notifcationQueue.json rename to back/models/notificationQueue.json index 7a9199bc0f..122d3816d3 100644 --- a/back/models/notifcationQueue.json +++ b/back/models/notificationQueue.json @@ -1,9 +1,9 @@ { - "name": "NotificacionQueue", + "name": "NotificationQueue", "base": "VnModel", "options": { "mysql": { - "table": "notificacionQueue" + "table": "util.notificationQueue" } }, "properties": { @@ -23,10 +23,10 @@ } }, "relations": { - "notificacion": { + "notification": { "type": "belongsTo", - "model": "Notificacion", - "foreignKey": "notificacionFk" + "model": "Notification", + "foreignKey": "notificationFk" }, "author": { "type": "belongsTo", diff --git a/back/models/notificationSubscription.json b/back/models/notificationSubscription.json index ed8bb1907d..14b305ca8c 100644 --- a/back/models/notificationSubscription.json +++ b/back/models/notificationSubscription.json @@ -3,14 +3,14 @@ "base": "VnModel", "options": { "mysql": { - "table": "notificationSubscription" + "table": "util.notificationSubscription" } }, "relations": { - "notificacion": { + "notification": { "type": "belongsTo", - "model": "Notificacion", - "foreignKey": "notificacionFk" + "model": "Notification", + "foreignKey": "notificationFk" }, "user": { "type": "belongsTo", diff --git a/db/changes/10490-goldenSummer/00-aclNotification.sql b/db/changes/10490-goldenSummer/00-aclNotification.sql new file mode 100644 index 0000000000..aa4e32cee4 --- /dev/null +++ b/db/changes/10490-goldenSummer/00-aclNotification.sql @@ -0,0 +1,3 @@ +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES + ('Notification', '*', 'READ', 'ALLOW', 'ROLE', 'developer'); diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index dabc731394..f73210a960 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2613,4 +2613,20 @@ INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`, (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13); INSERT INTO `util`.`notificationConfig` - SET `cleanDays` = 90; \ No newline at end of file + SET `cleanDays` = 90; + +INSERT INTO `util`.`notification` (`id`, `name`, `description`) + VALUES + (1, 'notification one', 'notification fixture one'); + +INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`) + VALUES + (1, 9); + +INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`) + VALUES + (1, 'notification one', 'randomParams', 9, 'pending', util.VN_CURDATE()); + +INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`) + VALUES + (1, 1110); \ No newline at end of file From 8048d4ce90d22d08ffa8e24bd8671f5497baee8d Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 25 Jul 2022 08:25:10 +0200 Subject: [PATCH 03/19] feat(notification): basic functionality and test --- back/methods/notification/clean.js | 46 ++++++++++++++ back/methods/notification/send.js | 63 ++++++++++++++++--- back/methods/notification/specs/clean.spec.js | 42 +++++++++++++ back/methods/notification/specs/send.spec.js | 33 ++++++++++ back/models/notification.js | 1 + back/models/notification.json | 10 ++- back/models/notificationQueue.json | 5 +- back/models/notificationSubscription.json | 14 ++++- .../10490-goldenSummer/00-aclNotification.sql | 2 +- db/dump/fixtures.sql | 4 +- 10 files changed, 205 insertions(+), 15 deletions(-) create mode 100644 back/methods/notification/specs/clean.spec.js create mode 100644 back/methods/notification/specs/send.spec.js diff --git a/back/methods/notification/clean.js b/back/methods/notification/clean.js index e69de29bb2..e6da58af8b 100644 --- a/back/methods/notification/clean.js +++ b/back/methods/notification/clean.js @@ -0,0 +1,46 @@ +module.exports = Self => { + Self.remoteMethod('clean', { + description: 'clean notifications from queue', + accessType: 'WRITE', + returns: { + type: 'object', + root: true + }, + http: { + path: `/clean`, + verb: 'POST' + } + }); + + Self.clean = async options => { + const models = Self.app.models; + const status = ['sent', 'error']; + + const myOptions = {}; + let tx; + + if (typeof options == 'object') + Object.assign(myOptions, options); + + if (!myOptions.transaction) { + tx = await Self.beginTransaction({}); + myOptions.transaction = tx; + } + + try { + const config = await models.NotificationConfig.findOne({}, myOptions); + const cleanDate = new Date(); + cleanDate.setDate(cleanDate.getDate() - config.cleanDays); + + await models.NotificationQueue.destroyAll({ + where: {status: {inq: status}}, + created: {lt: cleanDate} + }, myOptions); + + if (tx) await tx.commit(); + } catch (e) { + if (tx) await tx.rollback(); + throw e; + } + }; +}; diff --git a/back/methods/notification/send.js b/back/methods/notification/send.js index d5149fc59b..b56d9d6c03 100644 --- a/back/methods/notification/send.js +++ b/back/methods/notification/send.js @@ -1,7 +1,9 @@ +const axios = require('axios'); + module.exports = Self => { Self.remoteMethod('send', { description: 'Send notifications from queue', - accessType: 'READ', + accessType: 'WRITE', returns: { type: 'object', root: true @@ -12,24 +14,69 @@ module.exports = Self => { } }); - Self.send = async() => { + Self.send = async options => { + // const headers = ctx.req.headers; + // const origin = headers.origin || 'http://' + headers.host; + // const auth = ctx.req.accessToken; + // console.log(origin); + + const models = Self.app.models; const status = 'pending'; const myOptions = {}; let tx; + if (typeof options == 'object') + Object.assign(myOptions, options); + if (!myOptions.transaction) { tx = await Self.beginTransaction({}); myOptions.transaction = tx; } - const notificationQueue = await Self.app.models.NotificationQueue.find({ - where: {code: status}, - include: [{ - relation: 'notificationSubscription' - }] + const notificationQueue = await models.NotificationQueue.find({ + where: {status: status}, + include: [ + { + relation: 'notification', + scope: { + include: { + relation: 'subscription', + scope: { + include: { + relation: 'user', + scope: { + fields: ['name'] + } + } + } + } + } + + } + ] }, myOptions); - console.log(notificationQueue); + const statusSent = 'sent'; + const statusError = 'error'; + for (const queue of notificationQueue) { + // console.log(queue); + // console.log(origin); + // console.log(auth); + // console.log(queue.notification().name); + // console.log(queue.params); + + // const queueParams = Object.assign({}, JSON.parse(queue.params)); + // queueParams.authorization = auth.id; + + try { + // await print axios.get(`print`, queueParams) + await queue.updateAttribute('status', statusSent); + } catch (error) { + await queue.updateAttribute('status', statusError); + } + } + + return notificationQueue; }; }; diff --git a/back/methods/notification/specs/clean.spec.js b/back/methods/notification/specs/clean.spec.js new file mode 100644 index 0000000000..c9441a98be --- /dev/null +++ b/back/methods/notification/specs/clean.spec.js @@ -0,0 +1,42 @@ +const models = require('vn-loopback/server/server').models; + +fdescribe('Notification Clean()', () => { + it('should delete old rows with error', async() => { + const userId = 9; + const status = 'error'; + const tx = await models.NotificationQueue.beginTransaction({}); + const options = {transaction: tx}; + + const notification = await models.Notification.findOne({}, options); + const notificationConfig = await models.NotificationConfig.findOne({}); + + const cleanDate = new Date(); + cleanDate.setDate(cleanDate.getDate() - (notificationConfig.cleanDays + 1)); + + let before; + let after; + + try { + const notificationDelete = await models.NotificationQueue.create({ + notificationFk: notification.name, + authorFk: userId, + status: status, + created: cleanDate + }, options); + + before = await models.NotificationQueue.findById(notificationDelete.id, null, options); + + await models.Notification.clean(options); + + after = await models.NotificationQueue.findById(notificationDelete.id, null, options); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + + expect(before.notificationFk).toEqual(notification.name); + expect(after).toBe(null); + }); +}); diff --git a/back/methods/notification/specs/send.spec.js b/back/methods/notification/specs/send.spec.js new file mode 100644 index 0000000000..ce03b4f3ff --- /dev/null +++ b/back/methods/notification/specs/send.spec.js @@ -0,0 +1,33 @@ +const models = require('vn-loopback/server/server').models; + +fdescribe('Notification Send()', () => { + it('should send notification', async() => { + const statusPending = 'pending'; + const tx = await models.NotificationQueue.beginTransaction({}); + const options = {transaction: tx}; + const filter = { + where: { + status: statusPending + } + }; + + let before; + let after; + + try { + before = await models.NotificationQueue.find(filter, options); + + await models.Notification.send(options); + + after = await models.NotificationQueue.find(filter, options); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + + expect(before.length).toEqual(1); + expect(after.length).toEqual(0); + }); +}); diff --git a/back/models/notification.js b/back/models/notification.js index 46378bd027..65e82e3c7a 100644 --- a/back/models/notification.js +++ b/back/models/notification.js @@ -1,3 +1,4 @@ module.exports = Self => { require('../methods/notification/send')(Self); + require('../methods/notification/clean')(Self); }; diff --git a/back/models/notification.json b/back/models/notification.json index 9422d03b37..56f66bf1de 100644 --- a/back/models/notification.json +++ b/back/models/notification.json @@ -13,10 +13,18 @@ "description": "Identifier" }, "name": { - "type": "string" + "type": "string", + "required": true }, "description": { "type": "string" } + }, + "relations": { + "subscription": { + "type": "hasMany", + "model": "NotificationSubscription", + "foreignKey": "notificationFk" + } } } \ No newline at end of file diff --git a/back/models/notificationQueue.json b/back/models/notificationQueue.json index 122d3816d3..9790ea595c 100644 --- a/back/models/notificationQueue.json +++ b/back/models/notificationQueue.json @@ -26,11 +26,12 @@ "notification": { "type": "belongsTo", "model": "Notification", - "foreignKey": "notificationFk" + "foreignKey": "notificationFk", + "primaryKey": "name" }, "author": { "type": "belongsTo", - "model": "User", + "model": "Account", "foreignKey": "authorFk" } } diff --git a/back/models/notificationSubscription.json b/back/models/notificationSubscription.json index 14b305ca8c..43fa6db274 100644 --- a/back/models/notificationSubscription.json +++ b/back/models/notificationSubscription.json @@ -6,6 +6,18 @@ "table": "util.notificationSubscription" } }, + "properties": { + "notificationFk": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "userFk": { + "type": "number", + "id": true, + "description": "Identifier" + } + }, "relations": { "notification": { "type": "belongsTo", @@ -14,7 +26,7 @@ }, "user": { "type": "belongsTo", - "model": "User", + "model": "Account", "foreignKey": "userFk" } } diff --git a/db/changes/10490-goldenSummer/00-aclNotification.sql b/db/changes/10490-goldenSummer/00-aclNotification.sql index aa4e32cee4..51d6b24714 100644 --- a/db/changes/10490-goldenSummer/00-aclNotification.sql +++ b/db/changes/10490-goldenSummer/00-aclNotification.sql @@ -1,3 +1,3 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES - ('Notification', '*', 'READ', 'ALLOW', 'ROLE', 'developer'); + ('Notification', '*', 'WRITE', 'ALLOW', 'ROLE', 'developer'); diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index f73210a960..7731755e40 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2617,7 +2617,7 @@ INSERT INTO `util`.`notificationConfig` INSERT INTO `util`.`notification` (`id`, `name`, `description`) VALUES - (1, 'notification one', 'notification fixture one'); + (1, 'invoice', 'notification fixture one'); INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`) VALUES @@ -2625,7 +2625,7 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`) INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`) VALUES - (1, 'notification one', 'randomParams', 9, 'pending', util.VN_CURDATE()); + (1, 'invoice', '{"invoiceId": 1}', 9, 'pending', util.VN_CURDATE()); INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`) VALUES From 2b19688ca4a9e0d6bcb9cad1fb2e330a33877755 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 25 Jul 2022 08:25:46 +0200 Subject: [PATCH 04/19] quit focus --- back/methods/notification/specs/clean.spec.js | 2 +- back/methods/notification/specs/send.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/back/methods/notification/specs/clean.spec.js b/back/methods/notification/specs/clean.spec.js index c9441a98be..4c9dc563d0 100644 --- a/back/methods/notification/specs/clean.spec.js +++ b/back/methods/notification/specs/clean.spec.js @@ -1,6 +1,6 @@ const models = require('vn-loopback/server/server').models; -fdescribe('Notification Clean()', () => { +describe('Notification Clean()', () => { it('should delete old rows with error', async() => { const userId = 9; const status = 'error'; diff --git a/back/methods/notification/specs/send.spec.js b/back/methods/notification/specs/send.spec.js index ce03b4f3ff..015d1cb4d0 100644 --- a/back/methods/notification/specs/send.spec.js +++ b/back/methods/notification/specs/send.spec.js @@ -1,6 +1,6 @@ const models = require('vn-loopback/server/server').models; -fdescribe('Notification Send()', () => { +describe('Notification Send()', () => { it('should send notification', async() => { const statusPending = 'pending'; const tx = await models.NotificationQueue.beginTransaction({}); From d040ecb743b0c80ca38ccaf98814f4cca39343d8 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 1 Aug 2022 07:59:04 +0200 Subject: [PATCH 05/19] feat(ticket): getVideo from shinobi --- .../10480-june/00-packingSiteConfig.sql | 16 +++++ front/core/lib/lilium.js | 12 ++++ .../ticket/back/methods/boxing/getVideo.js | 65 +++++++++++++++++ .../back/methods/boxing/specs/getVideo.js | 69 +++++++++++++++++++ modules/ticket/back/model-config.json | 6 ++ modules/ticket/back/models/boxing.js | 3 + modules/ticket/back/models/boxing.json | 12 ++++ .../ticket/back/models/packingSiteConfig.json | 25 +++++++ modules/ticket/front/boxing/index.html | 2 + modules/ticket/front/boxing/index.js | 32 +++++++++ modules/ticket/front/index.js | 1 + modules/ticket/front/routes.json | 16 ++++- 12 files changed, 256 insertions(+), 3 deletions(-) create mode 100644 db/changes/10480-june/00-packingSiteConfig.sql create mode 100644 front/core/lib/lilium.js create mode 100644 modules/ticket/back/methods/boxing/getVideo.js create mode 100644 modules/ticket/back/methods/boxing/specs/getVideo.js create mode 100644 modules/ticket/back/models/boxing.js create mode 100644 modules/ticket/back/models/boxing.json create mode 100644 modules/ticket/back/models/packingSiteConfig.json create mode 100644 modules/ticket/front/boxing/index.html create mode 100644 modules/ticket/front/boxing/index.js diff --git a/db/changes/10480-june/00-packingSiteConfig.sql b/db/changes/10480-june/00-packingSiteConfig.sql new file mode 100644 index 0000000000..b32bc115e2 --- /dev/null +++ b/db/changes/10480-june/00-packingSiteConfig.sql @@ -0,0 +1,16 @@ +CREATE TABLE `vn`.`packingSiteConfig` ( + `id` INT(11) NOT NULL AUTO_INCREMENT, + `shinobiUrl` varchar(255) NOT NULL, + `shinobiGroupKey` varchar(255) NOT NULL, + `avgBoxingTime` INT(3) NULL, + PRIMARY KEY (`id`) + ); + +INSERT INTO `vn`.`packingSiteConfig` SET + shinobiUrl = 'https://shinobi.verdnatura.es/', + shinobiGroupKey = 'xVqft9LFXg', + avgBoxingTime = 30; + +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES + ('Boxing', '*', '*', 'ALLOW', 'ROLE', 'employee'); diff --git a/front/core/lib/lilium.js b/front/core/lib/lilium.js new file mode 100644 index 0000000000..ca10d3511b --- /dev/null +++ b/front/core/lib/lilium.js @@ -0,0 +1,12 @@ + +export default function lilium(route) { + const env = process.env.NODE_ENV; + let newRoute = 'https://localhost:8080/#/' + route; + + if (env == 'test') + newRoute = 'https://test-lilium.verdnatura.es/#/' + route; + if (env == 'producction') + newRoute = 'https://lilium.verdnatura.es/#/' + route; + + return newRoute; +} diff --git a/modules/ticket/back/methods/boxing/getVideo.js b/modules/ticket/back/methods/boxing/getVideo.js new file mode 100644 index 0000000000..851e4cfaca --- /dev/null +++ b/modules/ticket/back/methods/boxing/getVideo.js @@ -0,0 +1,65 @@ +const axios = require('axios'); + +module.exports = Self => { + Self.remoteMethod('getVideo', { + description: 'Get packing video of ticketId', + accessType: 'READ', + accepts: [ + { + arg: 'id', + type: 'number', + required: true, + description: 'Ticket id' + }, + { + arg: 'time', + type: 'number', + required: true, + description: 'Time to add' + } + ], + returns: { + type: ['object'], + root: true, + }, + http: { + path: `/getVideo`, + verb: 'GET', + }, + }); + + Self.getVideo = async(id, time, options) => { + const models = Self.app.models; + const myOptions = {}; + + if (typeof options == 'object') + Object.assign(myOptions, options); + + const expedition = await models.Expedition.findById(id, null, myOptions); + const packingSiteConfig = await models.PackingSiteConfig.findOne({}, myOptions); + const token = await Self.getToken(packingSiteConfig); + const monitorId = 'xVqft9LFXg'; + + const start = new Date(expedition.created); + const end = start.setTime(start.getTime() + (time ? time : packingSiteConfig.avgBoxingTime)); + + const videoUrl = `${token}/videos/${packingSiteConfig}/${monitorId}?start=${start}&end=${end}`; + const videos = await axios.post(`${packingSiteConfig.shinobiUrl}${videoUrl}`, { + mail: packingSiteConfig.mail, + pass: packingSiteConfig.pass + }); + + console.log(videos); + return videos.data; + }; + + Self.getToken = async function getToken(packingSiteConfig) { + const response = await axios.post(`${packingSiteConfig.shinobiUrl}?json=true`, { + machineID: 1, + ke: 'hola', + }); + + console.log(response); + return response.data; + }; +}; diff --git a/modules/ticket/back/methods/boxing/specs/getVideo.js b/modules/ticket/back/methods/boxing/specs/getVideo.js new file mode 100644 index 0000000000..ad5295f0c9 --- /dev/null +++ b/modules/ticket/back/methods/boxing/specs/getVideo.js @@ -0,0 +1,69 @@ +const models = require('vn-loopback/server/server').models; + +xdescribe('sale canEdit()', () => { + it('should return true if the role is production regardless of the saleTrackings', async() => { + const tx = await models.Sale.beginTransaction({}); + + try { + const options = {transaction: tx}; + + const productionUserID = 49; + const ctx = {req: {accessToken: {userId: productionUserID}}}; + + const sales = [{id: 3}]; + + const result = await models.Sale.canEdit(ctx, sales, options); + + expect(result).toEqual(true); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); + + it('should return true if the role is not production and none of the sales has saleTracking', async() => { + const tx = await models.Sale.beginTransaction({}); + + try { + const options = {transaction: tx}; + + const salesPersonUserID = 18; + const ctx = {req: {accessToken: {userId: salesPersonUserID}}}; + + const sales = [{id: 10}]; + + const result = await models.Sale.canEdit(ctx, sales, options); + + expect(result).toEqual(true); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); + + it('should return false if any of the sales has a saleTracking record', async() => { + const tx = await models.Sale.beginTransaction({}); + + try { + const options = {transaction: tx}; + + const salesPersonUserID = 18; + const ctx = {req: {accessToken: {userId: salesPersonUserID}}}; + + const sales = [{id: 3}]; + + const result = await models.Sale.canEdit(ctx, sales, options); + + expect(result).toEqual(false); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); +}); diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json index 8a6ac0c004..21e800b361 100644 --- a/modules/ticket/back/model-config.json +++ b/modules/ticket/back/model-config.json @@ -5,6 +5,9 @@ "AnnualAverageInvoiced": { "dataSource": "vn" }, + "Boxing": { + "dataSource": "vn" + }, "Component": { "dataSource": "vn" }, @@ -20,6 +23,9 @@ "Packaging": { "dataSource": "vn" }, + "PackingSiteConfig": { + "dataSource": "vn" + }, "PrintServerQueue": { "dataSource": "vn" }, diff --git a/modules/ticket/back/models/boxing.js b/modules/ticket/back/models/boxing.js new file mode 100644 index 0000000000..81732d17ac --- /dev/null +++ b/modules/ticket/back/models/boxing.js @@ -0,0 +1,3 @@ +module.exports = Self => { + require('../methods/boxing/getVideo')(Self); +}; diff --git a/modules/ticket/back/models/boxing.json b/modules/ticket/back/models/boxing.json new file mode 100644 index 0000000000..5aecbcabe1 --- /dev/null +++ b/modules/ticket/back/models/boxing.json @@ -0,0 +1,12 @@ +{ + "name": "Boxing", + "base": "PersistedModel", + "acls": [ + { + "accessType": "READ", + "principalType": "ROLE", + "principalId": "$everyone", + "permission": "ALLOW" + } + ] +} diff --git a/modules/ticket/back/models/packingSiteConfig.json b/modules/ticket/back/models/packingSiteConfig.json new file mode 100644 index 0000000000..7e4699c71a --- /dev/null +++ b/modules/ticket/back/models/packingSiteConfig.json @@ -0,0 +1,25 @@ +{ + "name": "PackingSiteConfig", + "base": "VnModel", + "options": { + "mysql": { + "table": "packingSiteConfig" + } + }, + "properties": { + "id": { + "id": true, + "type": "number", + "description": "Identifier" + }, + "shinobiUrl": { + "type": "string" + }, + "shinobiGroupKey":{ + "type":"string" + }, + "avgBoxingTime":{ + "type":"number" + } + } +} diff --git a/modules/ticket/front/boxing/index.html b/modules/ticket/front/boxing/index.html new file mode 100644 index 0000000000..7fb3b870e0 --- /dev/null +++ b/modules/ticket/front/boxing/index.html @@ -0,0 +1,2 @@ + + diff --git a/modules/ticket/front/boxing/index.js b/modules/ticket/front/boxing/index.js new file mode 100644 index 0000000000..6a1d4b4d31 --- /dev/null +++ b/modules/ticket/front/boxing/index.js @@ -0,0 +1,32 @@ +import ngModule from '../module'; +import Section from 'salix/components/section'; + +class Controller extends Section { + constructor($element, $) { + super($element, $); + } + + $onInit() { + window.location.href = this.lilium('dashboard'); + } + + lilium(route) { + const env = process.env.NODE_ENV; + let newRoute = 'http://localhost:8080/#/' + route; + + if (env == 'test') + newRoute = 'https://test-lilium.verdnatura.es/#/' + route; + if (env == 'producction') + newRoute = 'https://lilium.verdnatura.es/#/' + route; + + return newRoute; + } +} + +ngModule.vnComponent('vnTicketBoxing', { + template: require('./index.html'), + controller: Controller, + bindings: { + ticket: '<' + } +}); diff --git a/modules/ticket/front/index.js b/modules/ticket/front/index.js index 85a03ffb63..0558d251d1 100644 --- a/modules/ticket/front/index.js +++ b/modules/ticket/front/index.js @@ -33,3 +33,4 @@ import './dms/index'; import './dms/create'; import './dms/edit'; import './sms'; +import './boxing'; diff --git a/modules/ticket/front/routes.json b/modules/ticket/front/routes.json index ba7cfa8875..4be8e2183e 100644 --- a/modules/ticket/front/routes.json +++ b/modules/ticket/front/routes.json @@ -24,7 +24,8 @@ {"state": "ticket.card.saleChecked", "icon": "assignment"}, {"state": "ticket.card.components", "icon": "icon-components"}, {"state": "ticket.card.saleTracking", "icon": "assignment"}, - {"state": "ticket.card.dms.index", "icon": "cloud_download"} + {"state": "ticket.card.dms.index", "icon": "cloud_download"}, + {"state": "ticket.card.boxing", "icon": "science"} ] }, "keybindings": [ @@ -66,7 +67,7 @@ "abstract": true, "params": { "ticket": "$ctrl.ticket" - } + } }, { "url" : "/step-one", @@ -273,6 +274,15 @@ "params": { "ticket": "$ctrl.ticket" } + }, + { + "url": "/boxing", + "state": "ticket.card.boxing", + "component": "vn-ticket-boxing", + "description": "Boxing", + "params": { + "ticket": "$ctrl.ticket" + } } ] -} \ No newline at end of file +} From 7d4dd7bb52751dc442f489e2d057b25f047288c4 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 1 Aug 2022 15:03:17 +0200 Subject: [PATCH 06/19] feat(boxing): return stream video --- .../10480-june/00-packingSiteConfig.sql | 2 +- .../ticket/back/methods/boxing/getVideo.js | 48 ++++++++++--------- modules/ticket/front/boxing/index.html | 3 ++ modules/ticket/front/boxing/index.js | 2 +- 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/db/changes/10480-june/00-packingSiteConfig.sql b/db/changes/10480-june/00-packingSiteConfig.sql index b32bc115e2..879896f418 100644 --- a/db/changes/10480-june/00-packingSiteConfig.sql +++ b/db/changes/10480-june/00-packingSiteConfig.sql @@ -7,7 +7,7 @@ CREATE TABLE `vn`.`packingSiteConfig` ( ); INSERT INTO `vn`.`packingSiteConfig` SET - shinobiUrl = 'https://shinobi.verdnatura.es/', + shinobiUrl = 'http://shinobi.verdnatura.es', shinobiGroupKey = 'xVqft9LFXg', avgBoxingTime = 30; diff --git a/modules/ticket/back/methods/boxing/getVideo.js b/modules/ticket/back/methods/boxing/getVideo.js index 851e4cfaca..4e2a4b12c9 100644 --- a/modules/ticket/back/methods/boxing/getVideo.js +++ b/modules/ticket/back/methods/boxing/getVideo.js @@ -8,13 +8,13 @@ module.exports = Self => { { arg: 'id', type: 'number', - required: true, + required: false, description: 'Ticket id' }, { arg: 'time', type: 'number', - required: true, + required: false, description: 'Time to add' } ], @@ -31,35 +31,37 @@ module.exports = Self => { Self.getVideo = async(id, time, options) => { const models = Self.app.models; const myOptions = {}; - + console.log('ENTRY'); if (typeof options == 'object') Object.assign(myOptions, options); const expedition = await models.Expedition.findById(id, null, myOptions); const packingSiteConfig = await models.PackingSiteConfig.findOne({}, myOptions); - const token = await Self.getToken(packingSiteConfig); - const monitorId = 'xVqft9LFXg'; + const token = 'BW4o7FZyJ85she1hlRDe6QnwW3jwEP'; + const groupKey = 'xVqft9LFXg'; + const monitorId = 'VbiUcajdaT';// 'xVqft9LFXg'; - const start = new Date(expedition.created); - const end = start.setTime(start.getTime() + (time ? time : packingSiteConfig.avgBoxingTime)); + const start = '2022-07-27T09:00:00';// new Date('2022-07-27'); // new Date(expedition.created); + const end = '2022-07-27T09:15:00';// start.setTime(start.getTime() + (time ? time : packingSiteConfig.avgBoxingTime)); - const videoUrl = `${token}/videos/${packingSiteConfig}/${monitorId}?start=${start}&end=${end}`; - const videos = await axios.post(`${packingSiteConfig.shinobiUrl}${videoUrl}`, { - mail: packingSiteConfig.mail, - pass: packingSiteConfig.pass - }); + const videoUrl = `/${token}/videos/${groupKey}/${monitorId}?start=${start}&end=${end}`; + const url = `${packingSiteConfig.shinobiUrl}${videoUrl}`; + const data = await axios.post(url); - console.log(videos); - return videos.data; - }; + console.log(data.data.videos); + console.log('-----------------------'); + console.log('-----------------------'); + console.log('-----------------------'); + console.log('-----------------------'); - Self.getToken = async function getToken(packingSiteConfig) { - const response = await axios.post(`${packingSiteConfig.shinobiUrl}?json=true`, { - machineID: 1, - ke: 'hola', - }); - - console.log(response); - return response.data; + axios({ + method: 'get', + url: `${packingSiteConfig.shinobiUrl}${data.data.videos[0].href}`, + responseType: 'stream' + }) + .then(response => { + console.log(response); + return response; + }); }; }; diff --git a/modules/ticket/front/boxing/index.html b/modules/ticket/front/boxing/index.html index 7fb3b870e0..e47976cd79 100644 --- a/modules/ticket/front/boxing/index.html +++ b/modules/ticket/front/boxing/index.html @@ -1,2 +1,5 @@ + diff --git a/modules/ticket/front/boxing/index.js b/modules/ticket/front/boxing/index.js index 6a1d4b4d31..722301963d 100644 --- a/modules/ticket/front/boxing/index.js +++ b/modules/ticket/front/boxing/index.js @@ -7,7 +7,7 @@ class Controller extends Section { } $onInit() { - window.location.href = this.lilium('dashboard'); + // window.location.href = this.lilium('dashboard'); } lilium(route) { From 8a08b6f3996e388a624ec7acf001a2c9affc7283 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 2 Aug 2022 15:15:05 +0200 Subject: [PATCH 07/19] feat(ticket_boxing): return video stream --- .../10480-june/00-packingSiteConfig.sql | 9 + .../10480-june/00-packingSiteUpdate.sql | 56 ++++ db/dump/fixtures.sql | 287 +++++++++--------- .../ticket/back/methods/boxing/getVideo.js | 65 ++-- .../ticket/back/models/packingSiteConfig.json | 3 + modules/ticket/front/boxing/index.html | 4 +- 6 files changed, 258 insertions(+), 166 deletions(-) create mode 100644 db/changes/10480-june/00-packingSiteUpdate.sql diff --git a/db/changes/10480-june/00-packingSiteConfig.sql b/db/changes/10480-june/00-packingSiteConfig.sql index 879896f418..28e685eb69 100644 --- a/db/changes/10480-june/00-packingSiteConfig.sql +++ b/db/changes/10480-june/00-packingSiteConfig.sql @@ -1,16 +1,25 @@ CREATE TABLE `vn`.`packingSiteConfig` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `shinobiUrl` varchar(255) NOT NULL, + `shinobiToken` varchar(255) NOT NULL, `shinobiGroupKey` varchar(255) NOT NULL, `avgBoxingTime` INT(3) NULL, PRIMARY KEY (`id`) ); + INSERT INTO `vn`.`packingSiteConfig` SET shinobiUrl = 'http://shinobi.verdnatura.es', + shinobiToken = 'BW4o7FZyJ85she1hlRDe6QnwW3jwEP', shinobiGroupKey = 'xVqft9LFXg', avgBoxingTime = 30; INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Boxing', '*', '*', 'ALLOW', 'ROLE', 'employee'); + +SELECT e.id expeditionFk, e.ticketFk, ps.code, ps.monitorId + FROM expedition e + JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk + JOIN packingSite ps ON ps.hostFk = h.id + WHERE e.ticketFk = 1; diff --git a/db/changes/10480-june/00-packingSiteUpdate.sql b/db/changes/10480-june/00-packingSiteUpdate.sql new file mode 100644 index 0000000000..14313fd529 --- /dev/null +++ b/db/changes/10480-june/00-packingSiteUpdate.sql @@ -0,0 +1,56 @@ +ALTER TABLE `vn`.`packingSite` ADD monitorId varchar(255) NULL; + +UPDATE `vn`.`packingSite` + SET monitorId = 'VbiUcajdaT' + WHERE code = 'h1'; +UPDATE `vn`.`packingSite` + SET monitorId = 'qKMPn9aaVe' + WHERE code = 'h2'; +UPDATE `vn`.`packingSite` + SET monitorId = '3CtdIAGPAv' + WHERE code = 'h3'; +UPDATE `vn`.`packingSite` + SET monitorId = 'Xme2hiqz1f' + WHERE code = 'h4'; +UPDATE `vn`.`packingSite` + SET monitorId = 'aulxefgfJU' + WHERE code = 'h5'; +UPDATE `vn`.`packingSite` + SET monitorId = '6Ou0D1bhBw' + WHERE code = 'h6'; +UPDATE `vn`.`packingSite` + SET monitorId = 'eVUvnE6pNw' + WHERE code = 'h7'; +UPDATE `vn`.`packingSite` + SET monitorId = '0wsmSvqmrs' + WHERE code = 'h8'; +UPDATE `vn`.`packingSite` + SET monitorId = 'r2l2RyyF4I' + WHERE code = 'h9'; +UPDATE `vn`.`packingSite` + SET monitorId = 'EdjHLIiDVD' + WHERE code = 'h10'; +UPDATE `vn`.`packingSite` + SET monitorId = 'czC45kmwqI' + WHERE code = 'h11'; +UPDATE `vn`.`packingSite` + SET monitorId = 'PNsmxPaCwQ' + WHERE code = 'h12'; +UPDATE `vn`.`packingSite` + SET monitorId = 'agVssO0FDC' + WHERE code = 'h13'; +UPDATE `vn`.`packingSite` + SET monitorId = 'f2SPNENHPo' + WHERE code = 'h14'; +UPDATE `vn`.`packingSite` + SET monitorId = '6UR7gUZxks' + WHERE code = 'h15'; +UPDATE `vn`.`packingSite` + SET monitorId = 'bOB0f8WZ2V' + WHERE code = 'h16'; +UPDATE `vn`.`packingSite` + SET monitorId = 'MIR1nXaL0n' + WHERE code = 'h17'; +UPDATE `vn`.`packingSite` + SET monitorId = '0Oj9SgGTXR' + WHERE code = 'h18'; diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index f6583f1bb7..f67db0b200 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -1,7 +1,7 @@ CREATE SCHEMA IF NOT EXISTS `vn2008`; CREATE SCHEMA IF NOT EXISTS `tmp`; -UPDATE `util`.`config` +UPDATE `util`.`config` SET `environment`= 'test'; ALTER TABLE `vn`.`itemTaxCountry` AUTO_INCREMENT = 1; @@ -9,11 +9,11 @@ ALTER TABLE `vn`.`address` AUTO_INCREMENT = 1; ALTER TABLE `vn`.`zoneGeo` AUTO_INCREMENT = 1; ALTER TABLE `vn`.`ticket` AUTO_INCREMENT = 1; -INSERT INTO `salix`.`AccessToken` (`id`, `ttl`, `created`, `userId`) - VALUES +INSERT INTO `salix`.`AccessToken` (`id`, `ttl`, `created`, `userId`) + VALUES ('DEFAULT_TOKEN', '1209600', util.VN_CURDATE(), 66); -INSERT INTO `vn`.`ticketConfig` (`id`, `scopeDays`) +INSERT INTO `vn`.`ticketConfig` (`id`, `scopeDays`) VALUES ('1', '6'); @@ -22,11 +22,11 @@ INSERT INTO `vn`.`bionicConfig` (`generalInflationCoeficient`, `minimumDensityVo (1.30, 167.00, 138000, 71); INSERT INTO `vn`.`chatConfig` (`host`, `api`) - VALUES + VALUES ('https://chat.verdnatura.es', 'https://chat.verdnatura.es/api/v1'); -INSERT IGNORE INTO `vn`.`greugeConfig`(`id`, `freightPickUpPrice`) - VALUES +INSERT IGNORE INTO `vn`.`greugeConfig`(`id`, `freightPickUpPrice`) + VALUES ('1', '11'); INSERT INTO `vn`.`packagingConfig`(`upperGap`) @@ -52,11 +52,11 @@ INSERT INTO `account`.`account`(`id`) INSERT INTO `vn`.`educationLevel` (`id`, `name`) VALUES (1, 'ESTUDIOS PRIMARIOS COMPLETOS'), - (2, 'ENSEÑANZAS DE BACHILLERATO'); + (2, 'ENSEÑANZAS DE BACHILLERATO'); INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `userFk`, `bossFk`) SELECT id,UPPER(LPAD(role, 3, '0')), name, name, id, 9 - FROM `vn`.`user`; + FROM `vn`.`user`; UPDATE `vn`.`worker` SET bossFk = NULL WHERE id = 20; UPDATE `vn`.`worker` SET bossFk = 20 WHERE id = 1 OR id = 9; @@ -69,7 +69,7 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType` (1, 978, 1, 0, 2000, 9, 0); INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`) - VALUES + VALUES (1101, 'BruceWayne', 'Bruce Wayne', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@mydomain.com', 'es', 'e7723f0b24ff05b32ed09d95196f2f29'), (1102, 'PetterParker', 'Petter Parker', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@mydomain.com', 'en', 'e7723f0b24ff05b32ed09d95196f2f29'), (1103, 'ClarkKent', 'Clark Kent', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@mydomain.com', 'fr', 'e7723f0b24ff05b32ed09d95196f2f29'), @@ -113,7 +113,7 @@ INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossF (1107, 'ANT', 'Hank' , 'Pym' , 1107, 19, 432978107, NULL, 1), (1108, 'DCX', 'Charles' , 'Xavier', 1108, 19, 432978108, 1, NULL), (1109, 'HLK', 'Bruce' , 'Banner', 1109, 19, 432978109, 1, 2), - (1110, 'JJJ', 'Jessica' , 'Jones' , 1110, 19, 432978110, 2, 1); + (1110, 'JJJ', 'Jessica' , 'Jones' , 1110, 19, 432978110, 2, 1); INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`) VALUES @@ -123,7 +123,7 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`) (4, 'JPY', 'Yen Japones', 1); INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `politicalCountryFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`) - VALUES + VALUES (1, 'España', 1, 'ES', 1, 1, 24, 4, 0, 1), (2, 'Italia', 1, 'IT', 1, 2, 27, 4, 0, 1), (3, 'Alemania', 1, 'DE', 1, 3, 22, 4, 0, 1), @@ -153,19 +153,19 @@ INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `isPreviousPrepare (1, 'First sector', 1, 1, 'FIRST'), (2, 'Second sector', 2, 0, 'SECOND'); -INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`) - VALUES +INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`) + VALUES ('1', '700', '01', '1', '700-01', '70001'), ('2', '700', '02', '2', '700-02', '70002'); -INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `parked`, `userFk`) - VALUES +INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `parked`, `userFk`) + VALUES ('GVC', 1, 0, 1, 0, 1106), ('HEJ', 2, 0, 1, 0, 1106), ('UXN', 1, 0, 1, 0, 1106); INSERT INTO `vn`.`accountingType`(`id`, `description`, `receiptDescription`,`code`, `maxAmount`, `daysInFuture`) - VALUES + VALUES (1, 'CC and credit policies', 'Transfers', 'wireTransfer', NULL, 1), (2, 'Cash', 'Cash', 'cash', 1000, 0), (3, 'Credit card', 'Credit Card', 'creditCard', NULL, 0), @@ -180,8 +180,8 @@ INSERT INTO `vn`.`bankEntity`(`id`, `countryFk`, `name`, `bic`) (128, 1, 'The Best Bank', 'BBKKESMMMMMM'), (2100, 1, 'Caixa Bank', 'CAIXESBB'); -INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`, `currencyFk`) - VALUES +INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`, `currencyFk`) + VALUES (1, 'Pay on receipt', '5720000001', 3, 128, 1, 1), (2, 'Cash', '5700000001', 2, 128, 1, 1), (3, 'Compensation', '4000000000', 8, 128, 1, 1), @@ -235,7 +235,7 @@ UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com' UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE `id` = 23; INSERT INTO `vn`.`payMethod`(`id`,`code`, `name`, `graceDays`, `outstandingDebt`, `isIbanRequiredForClients`, `isIbanRequiredForSuppliers`, `hasVerified`) - VALUES + VALUES (1, NULL, 'PayMethod one', 0, 001, 0, 0, 0), (2, NULL, 'PayMethod two', 10, 001, 0, 0, 1), (3, 'compensation', 'PayMethod three', 0, 001, 0, 0, 0), @@ -244,7 +244,7 @@ INSERT INTO `vn`.`payMethod`(`id`,`code`, `name`, `graceDays`, `outstandingDebt (8,'wireTransfer', 'WireTransfer', 5, 001, 1, 1, 0); INSERT INTO `vn`.`payDem`(`id`, `payDem`) - VALUES + VALUES (1, 10), (2, 20); @@ -273,7 +273,7 @@ INSERT INTO `vn`.`town`(`id`, `name`, `provinceFk`) (5, 'Quito', 5); INSERT INTO `vn`.`postCode`(`code`, `townFk`, `geoFk`) - VALUES + VALUES ('46000', 1, 6), ('46460', 2, 6), ('46680', 3, 6), @@ -481,7 +481,7 @@ INSERT INTO `vn`.`supplierActivity`(`code`, `name`) ('complements', 'Other complements'), ('flowerPlants', 'Wholesale of flowers and plants'), ('vegetablesFruits', 'Fruit and vegetable trade'); - + INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`) VALUES (1, 'Plants SL', 'Plants nick', 4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'), @@ -498,7 +498,7 @@ INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, (442 , 'VNL', 241, 30, 2 , 1, NULL, 2, 'VNL Company - Plant passport'), (567 , 'VNH', NULL, 30, NULL, 4, NULL, 1, 'VNH Company - Plant passport'), (791 , 'FTH', NULL, 30, NULL, 3, '2015-11-30', 1, NULL), - (1381, 'ORN', NULL, 30, NULL, 7, NULL, 1, 'ORN Company - Plant passport'); + (1381, 'ORN', NULL, 30, NULL, 7, NULL, 1, 'ORN Company - Plant passport'); INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`) VALUES @@ -519,7 +519,7 @@ INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaF INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`) VALUES (1, 'T', 1014.24, util.VN_CURDATE(), 1101, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), - (2, 'T', 121.36, util.VN_CURDATE(), 1102, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), + (2, 'T', 121.36, util.VN_CURDATE(), 1102, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), (3, 'T', 8.88, util.VN_CURDATE(), 1103, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), (4, 'T', 8.88, util.VN_CURDATE(), 1103, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), (5, 'A', 8.88, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 442, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 0); @@ -531,7 +531,7 @@ UPDATE `vn`.`invoiceOut` SET ref = 'T4444444' WHERE id = 4; UPDATE `vn`.`invoiceOut` SET ref = 'A1111111' WHERE id = 5; INSERT INTO `vn`.`invoiceOutTax` (`invoiceOutFk`, `taxableBase`, `vat`, `pgcFk`) - VALUES + VALUES (1, 895.76, 89.58, 4722000010), (1, 33.80, 7.10, 4722000021), (2, 110.33, 11.03, 4770000010), @@ -552,7 +552,7 @@ INSERT INTO `vn`.`expence`(`id`, `taxTypeFk`, `name`, `isWithheld`) (7001000000, 1, 'Mercaderia', 0), (7050000000, 1, 'Prestacion de servicios', 1); - + INSERT INTO `vn`.`invoiceOutExpence`(`id`, `invoiceOutFk`, `amount`, `expenceFk`, `created`) VALUES (1, 1, 813.06, 2000000000, util.VN_CURDATE()), @@ -564,7 +564,7 @@ INSERT INTO `vn`.`invoiceOutExpence`(`id`, `invoiceOutFk`, `amount`, `expenceFk` (7, 5, 8.07, 2000000000, util.VN_CURDATE()); INSERT INTO `vn`.`zone` (`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`, `price`, `bonus`, `itemMaxSize`) - VALUES + VALUES (1, 'Zone pickup A', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1, 0, 0, 0, 100), (2, 'Zone pickup B', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1, 0, 0, 0, 100), (3, 'Zone 247 A', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7, 1, 2, 0, 100), @@ -580,7 +580,7 @@ INSERT INTO `vn`.`zone` (`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`, (13, 'Zone quantum break', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5, 0, 0, 0, 100); INSERT INTO `vn`.`zoneWarehouse` (`id`, `zoneFk`, `warehouseFk`) - VALUES + VALUES (1, 1, 1), (2, 2, 2), (3, 3, 1), @@ -596,7 +596,7 @@ INSERT INTO `vn`.`zoneWarehouse` (`id`, `zoneFk`, `warehouseFk`) (13, 13, 5); INSERT INTO `vn`.`zoneClosure` (`zoneFk`, `dated`, `hour`) - VALUES + VALUES (1, util.VN_CURDATE(), '23:59'), (2, util.VN_CURDATE(), '23:59'), (3, util.VN_CURDATE(), '23:59'), @@ -668,7 +668,7 @@ INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `des (11, 24, 4, 'Reclama ticket: 7'), (12, 11, 3, 'Delivery after 10am'); --- FIX for state hours on local, inter_afterInsert +-- FIX for state hours on local, inter_afterInsert UPDATE vncontrol.inter SET odbc_date = DATE_ADD(util.VN_CURDATE(), INTERVAL -10 SECOND); INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `workerFk`, `created`) @@ -764,7 +764,7 @@ INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`, `icon`, `code` INSERT INTO `vn`.`temperature`(`code`, `name`, `description`) VALUES ('warm', 'Warm', 'Warm'), - ('cool', 'Cool', 'Cool'); + ('cool', 'Cool', 'Cool'); INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `warehouseFk`, `life`,`workerFk`, `isPackaging`, `temperatureFk`) VALUES @@ -818,7 +818,7 @@ INSERT INTO `vn`.`taxClassCode`(`taxClassFk`, `effectived`, `taxCodeFk`) (1, util.VN_CURDATE(), 1), (1, util.VN_CURDATE(), 21), (2, util.VN_CURDATE(), 2); - + INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`) VALUES (05080000, 'Coral y materiales similares', 2, 2), @@ -830,7 +830,7 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`) ('SER', 'Services'), ('VT', 'Sales'); -INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`, +INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`, `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`) VALUES (1, 2, 70, 'YEL', 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '1', NULL, 0, 1, 'VT', 0, NULL, 'V', 0, 15), @@ -883,18 +883,18 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`) (3, 'Perdida', 'LOST'); -INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`) +INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`) VALUES - (1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 15, 1, 18, 'UR9000006041', 94, 1), - (2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 16, 2, 18, 'UR9000006041', 94, 1), - (3, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL, 3, 18, 'UR9000006041', 94, 2), - (4, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL, 4, 18, 'UR9000006041', 94, 2), - (5, 1, 2, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL, 1, 18, NULL, 94, 3), - (6, 7, 3, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), NULL, 1, 18, NULL, 94, 3), - (7, 2, 4, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), NULL, 1, 18, NULL, 94, NULL), - (8, 3, 5, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), NULL, 1, 18, NULL, 94, 1), - (9, 3, 6, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL, 1, 18, NULL, 94, 2), - (10, 7, 7, 71, NOW(), NULL, 1, 18, NULL, 94, 3); + (1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 15, 1, 18, 'UR9000006041', 94, 1, 'pc1'), + (2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 16, 2, 18, 'UR9000006041', 94, 1, NULL), + (3, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL, 3, 18, 'UR9000006041', 94, 2, NULL), + (4, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL, 4, 18, 'UR9000006041', 94, 2, NULL), + (5, 1, 2, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL, 1, 18, NULL, 94, 3, NULL), + (6, 7, 3, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), NULL, 1, 18, NULL, 94, 3, NULL), + (7, 2, 4, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), NULL, 1, 18, NULL, 94, NULL,NULL), + (8, 3, 5, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), NULL, 1, 18, NULL, 94, 1, NULL), + (9, 3, 6, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL, 1, 18, NULL, 94, 2, NULL), + (10, 7, 7, 71, NOW(), NULL, 1, 18, NULL, 94, 3, NULL); INSERT INTO `vn`.`expeditionState`(`id`, `created`, `expeditionFk`, `typeFk`, `userFk`) @@ -966,7 +966,7 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`) (3, 39, 0.994), (4, 28, 1.25), (4, 29, 0.42), - (4, 39, 0.017), + (4, 39, 0.017), (5, 17, 9.94), (5, 28, 50), (5, 29, 49.4), @@ -988,8 +988,8 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`) (9, 15, 3.0949), (9, 21, 0.001), (9, 28, 53), - (9, 29, 46.4), - (9, 39, 0.994), + (9, 29, 46.4), + (9, 39, 0.994), (10, 15, 0.0199), (10, 28, 7), (10, 29, 0), @@ -1088,14 +1088,14 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`) (32, 36, -92.324), (32, 39, 0.994); -INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `shelve`, `visible`, `grouping`, `packing`, `userFk`) - VALUES +INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `shelve`, `visible`, `grouping`, `packing`, `userFk`) + VALUES (2, 'GVC', 'A', 1, 1, 1, 1106), (4, 'HEJ', 'A', 1, 1, 1, 1106), (1, 'UXN', 'A', 2, 12, 12, 1106); -INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`) - VALUES +INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`) + VALUES ('1', '1', '1', '', '1106'), ('2', '2', '5', '', '1106'), ('1', '7', '1', '', '1106'), @@ -1137,8 +1137,8 @@ INSERT INTO `vn`.`ticketCollection`(`ticketFk`, `collectionFk`, `level`) (3, 2, NULL), (23, 1, NULL); -INSERT INTO `vn`.`parking` (`column`, `row`, `sectorFk`, `code`, `pickingOrder`) - VALUES +INSERT INTO `vn`.`parking` (`column`, `row`, `sectorFk`, `code`, `pickingOrder`) + VALUES ('100', '01', 1, '100-01', 1); INSERT INTO `vn`.`genus`(`id`, `name`) @@ -1292,7 +1292,7 @@ INSERT INTO `vn`.`itemTypeTag`(`id`, `itemTypeFk`, `tagFk`, `priority`) CALL `vn`.`itemRefreshTags`(NULL); INSERT INTO `vn`.`itemLog` (`id`, `originFk`, `userFk`, `action`, `description`) - VALUES + VALUES ('1', '1', '1', 'insert', 'We made a change!'); INSERT INTO `vn`.`recovery`(`id`, `clientFk`, `started`, `finished`, `amount`, `period`) @@ -1484,8 +1484,8 @@ INSERT INTO `hedera`.`orderRowComponent`(`rowFk`, `componentFk`, `price`) (4, 21, -0.001), (4, 28, 20.72), (4, 29, -19.72), - (4, 37, 2), - (4, 39, 0.01), + (4, 37, 2), + (4, 39, 0.01), (5, 15, 0.58), (5, 23, 6.5), (5, 28, 20.72), @@ -1704,7 +1704,7 @@ INSERT INTO `vn`.`workerManaExcluded`(`workerFk`) La otra manera es poner el calculo con los 2 trabajadores que utilizamos ahora mismo para los tickets */ -call vn.manaSpellersRequery(19); +call vn.manaSpellersRequery(19); call vn.manaSpellersRequery(18); INSERT INTO `vn`.`clientSample`(`id`, `clientFk`, `typeFk`, `created`, `workerFk`, `userFk`, `companyFk`) @@ -1772,8 +1772,8 @@ INSERT INTO `hedera`.`tpvMerchant`(`id`, `description`, `companyFk`, `bankFk`, ` (1, 'Arkham Bank', 442, 1, 'h12387193H10238'), (2, 'NewYork Bank', 442, 1, '7981ugsgd1hsdad'); -INSERT INTO `hedera`.`tpvTransaction`(`id`,`merchantFk`, `clientFk`,`receiptFk`, `amount`, `response`, `errorCode`, `status`, `created`) - VALUES +INSERT INTO `hedera`.`tpvTransaction`(`id`,`merchantFk`, `clientFk`,`receiptFk`, `amount`, `response`, `errorCode`, `status`, `created`) + VALUES (1, 1, 1101, NULL, 2000, NULL, 'SIS0042', 'ok', util.VN_CURDATE()), (2, 1, 1101, NULL, 1000, NULL, 'SIS0051', 'started', util.VN_CURDATE()), (3, 2, 1101, NULL, 7268, NULL, NULL, 'ok', util.VN_CURDATE()), @@ -1787,32 +1787,32 @@ INSERT INTO `vn`.`orderTicket`(`orderFk`, `ticketFk`) (2, 2), (3, 3), (4, 4), - (5, 5), - (6, 6), - (7, 7), - (8, 8), - (9, 9), - (10, 10), - (11, 11), - (12, 12), - (13, 13), - (14, 14), + (5, 5), + (6, 6), + (7, 7), + (8, 8), + (9, 9), + (10, 10), + (11, 11), + (12, 12), + (13, 13), + (14, 14), (15, 15), (16, 16), (17, 17), (18, 18), (19, 19), - (20, 20), - (21, 21), + (20, 20), + (21, 21), (22, 22); -INSERT INTO `vn`.`userConfig` (`userFk`, `warehouseFk`, `companyFk`) +INSERT INTO `vn`.`userConfig` (`userFk`, `warehouseFk`, `companyFk`) VALUES (1, 1, 69), - (5, 1, 442), + (5, 1, 442), (9, 1, 442), (18, 3, 567); - + INSERT INTO `vn`.`receipt`(`id`, `invoiceFk`, `amountPaid`, `payed`, `workerFk`, `bankFk`, `clientFk`, `created`, `companyFk`, `isConciliate`) VALUES (1, 'Cobro web', 100.50, util.VN_CURDATE(), 9, 1, 1101, util.VN_CURDATE(), 442, 1), @@ -1895,14 +1895,14 @@ INSERT INTO `postgresql`.`business_labour` (`business_id`, `notes`, `department_ VALUES (1111, NULL, 23, 1, 0.0, 1, 1, 1, 1); -UPDATE `postgresql`.`business_labour` bl +UPDATE `postgresql`.`business_labour` bl JOIN `postgresql`.`business` b ON b.business_id = bl.business_id JOIN `postgresql`.`profile` pr ON pr.profile_id = b.client_id JOIN `postgresql`.`person` p ON p.person_id = pr.person_id SET bl.`professional_category_id` = 31 WHERE p.`Id_trabajador` = 1110; -UPDATE `postgresql`.`business_labour` bl +UPDATE `postgresql`.`business_labour` bl SET bl.`department_id` = 43 WHERE business_id IN(18, 19); @@ -1917,18 +1917,18 @@ INSERT INTO `postgresql`.`profile_media`(`profile_media_id`, `profile_id`, `medi (2, 1107, 2); INSERT INTO `vn`.`workCenterHoliday` (`workCenterFk`, `days`, `year`) - VALUES + VALUES ('1', '27.5', YEAR(util.VN_CURDATE())), ('5', '22', YEAR(util.VN_CURDATE())), - ('1', '24.5', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR))), + ('1', '24.5', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR))), ('5', '23', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR))); -INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlementRate`, `discountRate`) - VALUES +INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlementRate`, `discountRate`) + VALUES (1, 'Holidays', '#FF4444', 'holiday', 0, 0), (2, 'Leave of absence', '#C71585', 'absence', 0, 1), (6, 'Half holiday', '#E65F00', 'halfHoliday', 0, 0.5), - (15, 'Half Paid Leave', '#5151c0', 'halfPaidLeave', 0, 1), + (15, 'Half Paid Leave', '#5151c0', 'halfPaidLeave', 0, 1), (20, 'Furlough', '#97B92F', 'furlough', 1, 1), (21, 'Furlough half day', '#778899', 'halfFurlough', 0.5, 1); @@ -1945,10 +1945,10 @@ INSERT INTO `postgresql`.`business_labour_payroll` (`business_id`, `cod_tarifa`, (1, 7, 12, 100, 900.50), (1106, 7, 12, 100, 1263.03), (1107, 7, 12, 100, 2000), - (1108, 7, 12, 100, 1500); + (1108, 7, 12, 100, 1500); -INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id`, `date`) - VALUES +INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id`, `date`) + VALUES (1, 6, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))), (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))), (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -11 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 11 DAY))), @@ -1966,8 +1966,8 @@ INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id` (1107, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 7 DAY))), (1107, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL - 16 DAY)); -INSERT INTO `vn`.`smsConfig` (`id`, `uri`, `title`, `apiKey`) - VALUES +INSERT INTO `vn`.`smsConfig` (`id`, `uri`, `title`, `apiKey`) + VALUES ('1', 'https://api.gateway360.com/api/3.0/sms/send', 'Verdnatura', '5715476da95b46d686a5a255e6459523'); INSERT INTO `vn`.`sharingClient`(`id`, `workerFk`, `started`, `ended`, `clientFk`) @@ -1983,37 +1983,37 @@ CALL `vn`.zoneGeo_calcTree(); -- this is an auto calculate for table vn.zoneGeo, INSERT INTO `vn`.`zoneIncluded` (`zoneFk`, `geoFk`, `isIncluded`) VALUES - (1, 3, 0), - (1, 4, 0), - (1, 5, 0), + (1, 3, 0), + (1, 4, 0), + (1, 5, 0), (1, 1, 1), - (2, 3, 0), - (2, 4, 0), - (2, 5, 0), + (2, 3, 0), + (2, 4, 0), + (2, 5, 0), (2, 1, 1), - (3, 3, 0), - (3, 4, 0), - (3, 5, 0), + (3, 3, 0), + (3, 4, 0), + (3, 5, 0), (3, 1, 1), - (4, 3, 0), - (4, 4, 0), - (4, 5, 0), + (4, 3, 0), + (4, 4, 0), + (4, 5, 0), (4, 1, 1), - (5, 3, 1), - (5, 4, 0), - (5, 5, 1), + (5, 3, 1), + (5, 4, 0), + (5, 5, 1), (5, 1, 1), - (6, 3, 1), - (6, 4, 0), - (6, 5, 1), + (6, 3, 1), + (6, 4, 0), + (6, 5, 1), (6, 1, 1), - (7, 3, 0), - (7, 4, 0), - (7, 5, 0), + (7, 3, 0), + (7, 4, 0), + (7, 5, 0), (7, 1, 1), - (8, 3, 0), - (8, 4, 0), - (8, 5, 0), + (8, 3, 0), + (8, 4, 0), + (8, 5, 0), (8, 1, 1), (10, 14, 1); @@ -2226,12 +2226,12 @@ INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `dated`) (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY)); INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `weekDays`) - VALUES + VALUES (8, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun'), (10, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun'); INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`) - VALUES + VALUES (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR)); INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`) @@ -2294,8 +2294,8 @@ INSERT INTO `vn`.`workerDocument`(`id`, `worker`, `document`,`isReadableByWorker (1, 1106, 4, TRUE), (2, 1107, 3, FALSE); -INSERT INTO `vn`.`device` (`sn`, `model`, `userFk`) - VALUES +INSERT INTO `vn`.`device` (`sn`, `model`, `userFk`) + VALUES ('aaa', 'android', '9'); INSERT INTO `vn`.`queuePriority`(`id`, `priority`) @@ -2309,7 +2309,7 @@ INSERT INTO `vn`.`workerTimeControlParams` (`id`, `dayBreak`, `weekBreak`, `week (1, 43200, 129600, 734400, 43200, 50400, 259200, 1296000, 36000); INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1', '11'); - + INSERT INTO `vn`.`thermograph`(`id`, `model`) VALUES ('TMM190901395', 'TEMPMATE'), @@ -2327,21 +2327,21 @@ INSERT INTO `vn`.`travelThermograph`(`thermographFk`, `created`, `warehouseFk`, ('138350-0', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 'WARM', NULL, 5), ('138350-0', util.VN_CURDATE(), 1, NULL, 'COOL', NULL, NULL); -REPLACE INTO `vn`.`incoterms`(`code`, `name`) - VALUES +REPLACE INTO `vn`.`incoterms`(`code`, `name`) + VALUES ('FAS', 'Free Alongside Ship'); -REPLACE INTO `vn`.`customsAgent`(`id`, `fiscalName`, `street`, `nif`, `phone`, `email`) - VALUES +REPLACE INTO `vn`.`customsAgent`(`id`, `fiscalName`, `street`, `nif`, `phone`, `email`) + VALUES (1, 'Agent one', '1007 Mountain Drive, Gotham', 'N1111111111', '111111111', 'agentone@gotham.com'), (2, 'Agent two', '1007 Mountain Drive, Gotham', 'N2222222222', '222222222', 'agenttwo@gotham.com'); -INSERT INTO `vn`.`tablet`(`uuid`, `name`, `place`, `macwifi`) - VALUES +INSERT INTO `vn`.`tablet`(`uuid`, `name`, `place`, `macwifi`) + VALUES ('1', 'TEST', 'ON THE FIXTURES', '0'), ('2', 'DEV', 'OTHER TABLET', '0'); -INSERT INTO `vn`.`tabletDepartment`(`tabletFk`, `departmentFk`) +INSERT INTO `vn`.`tabletDepartment`(`tabletFk`, `departmentFk`) VALUES (1, 23), (2, 1); @@ -2374,8 +2374,8 @@ INSERT INTO `vn`.`rate`(`dated`, `warehouseFk`, `rate0`, `rate1`, `rate2`, `rate (DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), 1, 10, 15, 20, 25), (util.VN_CURDATE(), 1, 12, 17, 22, 27); -INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk) - VALUES +INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk) + VALUES (1, '07546501420', 67, 671, util.VN_CURDATE(), 1761, 1, 1), (2, '07546491421', 252, 2769, util.VN_CURDATE(), 5231, 1, 1), (3, '07546500823', 102, 1495, util.VN_CURDATE(), 3221, 1, 1), @@ -2387,8 +2387,8 @@ INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk (9, '99610289193', 302, 2972, util.VN_CURDATE(), 3871, 442, 1), (10, '07546500856', 185, 2364, util.VN_CURDATE(), 5321, 442, 1); -INSERT INTO `vn`.`dua` (id, code, awbFk, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk) - VALUES +INSERT INTO `vn`.`dua` (id, code, awbFk, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk) + VALUES (1, '19ES0028013A481523', 1, util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 11276.95, 442), (2, '21ES00280136115760', 2, util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1376.20, 442), (3, '19ES00280131956004', 3, util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 3, 14268.50, 442), @@ -2435,8 +2435,8 @@ INSERT INTO `vn`.`duaInvoiceIn`(`id`, `duaFk`, `invoiceInFk`) (4, 4, 4), (5, 5, 5), (6, 6, 6), - (7, 7, 7), - (8, 8, 8), + (7, 7, 7), + (8, 8, 8), (9, 9, 9), (10, 10, 10); @@ -2446,7 +2446,7 @@ INSERT INTO `vn`.`invoiceInTax` (`invoiceInFk`, `taxableBase`, `expenceFk`, `for (2, 999.99, '2000000000', null, null, null), (3, 1000.50, '2000000000', null, null, null), (4, 0.50, '2000000000', null, null, null), - (5, 150.50, '2000000000', null, null, null), + (5, 150.50, '2000000000', null, null, null), (1, 252.25, '4751000000', NULL, 7, 61), (2, 223.17, '6210000567', NULL, 8, 20), (3, 95.60, '7001000000', NULL, 8, 35), @@ -2461,9 +2461,9 @@ INSERT INTO `vn`.`invoiceInIntrastat` (`invoiceInFk`, `net`, `intrastatFk`, `amo (1, 10, 6021010, 20.00, 205, 5), (2, 13.20, 5080000, 15.00, 580, 5), (2, 16.10, 6021010, 25.00, 80, 5); - + INSERT INTO `vn`.`ticketRecalc`(`ticketFk`) - SELECT `id` + SELECT `id` FROM `vn`.`ticket` t LEFT JOIN vn.ticketRecalc tr ON tr.ticketFk = t.id WHERE tr.ticketFk IS NULL; @@ -2478,7 +2478,7 @@ INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`) (4, 7, 1); INSERT INTO `vn`.`expeditionTruck` (`id`, `ETD`, `description`) - VALUES + VALUES (1, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL +3 YEAR))), 'Best truck in fleet'); INSERT INTO `vn`.`expeditionPallet` (`id`, `truckFk`, `built`, `position`, `isPrint`) @@ -2486,7 +2486,7 @@ INSERT INTO `vn`.`expeditionPallet` (`id`, `truckFk`, `built`, `position`, `isPr (1, 1, util.VN_CURDATE(), 1, 1); INSERT INTO `vn`.`expeditionScan` (`id`, `expeditionFk`, `scanned`, `palletFk`) - VALUES + VALUES (1, 1, util.VN_CURDATE(), 1), (2, 2, util.VN_CURDATE(), 1), (3, 3, util.VN_CURDATE(), 1), @@ -2521,7 +2521,7 @@ UPDATE `vn`.`route` INSERT INTO `bs`.`salesPerson` (`workerFk`, `year`, `month`, `portfolioWeight`) VALUES (18, YEAR(util.VN_CURDATE()), MONTH(util.VN_CURDATE()), 807.23), - (19, YEAR(util.VN_CURDATE()), MONTH(util.VN_CURDATE()), 34.40); + (19, YEAR(util.VN_CURDATE()), MONTH(util.VN_CURDATE()), 34.40); INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`, `typeFk`, `clientFk`) VALUES @@ -2550,14 +2550,14 @@ INSERT INTO `vn`.`calendarHolidaysType` (`id`, `name`, `hexColour`) INSERT INTO `vn`.`calendarHolidays` (`id`, `calendarHolidaysTypeFk`, `dated`, `calendarHolidaysNameFk`, `workCenterFk`) VALUES (1, 1, CONCAT(YEAR(util.VN_CURDATE()), '-12-09'), 1, 1); - + INSERT INTO `vn`.`supplierAgencyTerm` (`agencyFk`, `supplierFk`, `minimumPackages`, `kmPrice`, `packagePrice`, `routePrice`, `minimumKm`, `minimumM3`, `m3Price`) VALUES (1, 1, 0, 0.00, 0.00, NULL, 0, 0.00, 23), (2, 1, 60, 0.00, 0.00, NULL, 0, 5.00, 33), (3, 2, 0, 15.00, 0.00, NULL, 0, 0.00, 0), (4, 2, 0, 20.00, 0.00, NULL, 0, 0.00, 0), - (5, 442, 0, 0.00, 3.05, NULL, 0, 0.00, 0); + (5, 442, 0, 0.00, 3.05, NULL, 0, 0.00, 0); INSERT INTO `vn`.`chat` (`senderFk`, `recipient`, `dated`, `checkUserStatus`, `message`, `status`, `attempts`) VALUES @@ -2607,7 +2607,16 @@ INSERT INTO `vn`.`sectorCollection` (`userFk`, `sectorFk`) INSERT INTO `vn`.`sectorCollectionSaleGroup` (`sectorCollectionFk`, `saleGroupFk`) VALUES (1, 1); - + INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`, `shortWeekBreak`, `longWeekBreak`, `weekScope`, `mailPass`, `mailHost`, `mailSuccessFolder`, `mailErrorFolder`, `mailUser`, `minHoursToBreak`, `breakHours`, `hoursCompleteWeek`, `startNightlyHours`, `endNightlyHours`, `maxTimePerDay`, `breakTime`, `timeToBreakTime`, `dayMaxTime`, `shortWeekDays`, `longWeekDays`) VALUES - (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13); \ No newline at end of file + (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13); + +INSERT INTO `vn`.`host` (`id`, `code`, `description`, `warehouseFk`, `bankFk`) + VALUES + (1, 'pc1', 'pc host', 1, 1); + +INSERT INTO `vn`.`packingSite` (`id`, `code`, `hostFk`, `monitorId`) + VALUES + (1, 'h1', 1, 'VbiUcajdaT'); + diff --git a/modules/ticket/back/methods/boxing/getVideo.js b/modules/ticket/back/methods/boxing/getVideo.js index 4e2a4b12c9..bdd0107f3c 100644 --- a/modules/ticket/back/methods/boxing/getVideo.js +++ b/modules/ticket/back/methods/boxing/getVideo.js @@ -18,10 +18,23 @@ module.exports = Self => { description: 'Time to add' } ], - returns: { - type: ['object'], - root: true, - }, + returns: [ + { + arg: 'body', + type: 'file', + root: true + }, + { + arg: 'Content-Type', + type: 'String', + http: {target: 'header'} + }, + { + arg: 'Content-Disposition', + type: 'String', + http: {target: 'header'} + } + ], http: { path: `/getVideo`, verb: 'GET', @@ -37,31 +50,33 @@ module.exports = Self => { const expedition = await models.Expedition.findById(id, null, myOptions); const packingSiteConfig = await models.PackingSiteConfig.findOne({}, myOptions); - const token = 'BW4o7FZyJ85she1hlRDe6QnwW3jwEP'; - const groupKey = 'xVqft9LFXg'; - const monitorId = 'VbiUcajdaT';// 'xVqft9LFXg'; + const monitorId = 'VbiUcajdaT'; + console.log(packingSiteConfig); - const start = '2022-07-27T09:00:00';// new Date('2022-07-27'); // new Date(expedition.created); - const end = '2022-07-27T09:15:00';// start.setTime(start.getTime() + (time ? time : packingSiteConfig.avgBoxingTime)); + const addTime = (time ? time : packingSiteConfig.avgBoxingTime) * 1000; + const start = new Date(expedition.created);// '2022-07-27T09:00:00';// new Date('2022-07-27'); // + const end = new Date(start.getTime() + addTime); + console.log(addTime); + console.log(start.toISOString().split('.')[0]); + console.log(end.toISOString().split('.')[0]); - const videoUrl = `/${token}/videos/${groupKey}/${monitorId}?start=${start}&end=${end}`; - const url = `${packingSiteConfig.shinobiUrl}${videoUrl}`; - const data = await axios.post(url); + const videoUrl = `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${monitorId}`; + const timeUrl = `?start=${start.toISOString().split('.')[0]}&end=${end.toISOString().split('.')[0]}`; + const url = `${packingSiteConfig.shinobiUrl}${videoUrl}${timeUrl}&endIsStartTo`; - console.log(data.data.videos); - console.log('-----------------------'); - console.log('-----------------------'); - console.log('-----------------------'); - console.log('-----------------------'); - - axios({ + console.log(url); + const videoList = await axios.post(url); + console.log(videoList.data); + const lastVideo = videoList.data.videos[videoList.data.videos.length - 1].href; + console.log(lastVideo); + const stream = await axios({ method: 'get', - url: `${packingSiteConfig.shinobiUrl}${data.data.videos[0].href}`, + url: `${packingSiteConfig.shinobiUrl}${lastVideo}`, responseType: 'stream' - }) - .then(response => { - console.log(response); - return response; - }); + }).then(response => { + return response.data; + }); + + return [stream, 'video/mp4', `filename="${id}.mp4"`]; }; }; diff --git a/modules/ticket/back/models/packingSiteConfig.json b/modules/ticket/back/models/packingSiteConfig.json index 7e4699c71a..8f0032d41f 100644 --- a/modules/ticket/back/models/packingSiteConfig.json +++ b/modules/ticket/back/models/packingSiteConfig.json @@ -18,6 +18,9 @@ "shinobiGroupKey":{ "type":"string" }, + "shinobiToken":{ + "type":"string" + }, "avgBoxingTime":{ "type":"number" } diff --git a/modules/ticket/front/boxing/index.html b/modules/ticket/front/boxing/index.html index e47976cd79..17b2b475ae 100644 --- a/modules/ticket/front/boxing/index.html +++ b/modules/ticket/front/boxing/index.html @@ -1,5 +1,5 @@ - From b4b6d61460e347e8abc68b706968ed315e560072 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 3 Aug 2022 14:57:39 +0200 Subject: [PATCH 08/19] feat(ticket_boxing): fix getVideo --- .../ticket/back/methods/boxing/getVideo.js | 77 +++++++++++-------- modules/ticket/front/boxing/index.js | 2 +- 2 files changed, 45 insertions(+), 34 deletions(-) diff --git a/modules/ticket/back/methods/boxing/getVideo.js b/modules/ticket/back/methods/boxing/getVideo.js index bdd0107f3c..91d538782e 100644 --- a/modules/ticket/back/methods/boxing/getVideo.js +++ b/modules/ticket/back/methods/boxing/getVideo.js @@ -1,4 +1,5 @@ const axios = require('axios'); +const https = require('https'); module.exports = Self => { Self.remoteMethod('getVideo', { @@ -16,23 +17,16 @@ module.exports = Self => { type: 'number', required: false, description: 'Time to add' - } - ], - returns: [ - { - arg: 'body', - type: 'file', - root: true }, { - arg: 'Content-Type', - type: 'String', - http: {target: 'header'} + arg: 'req', + type: 'object', + http: {source: 'req'} }, { - arg: 'Content-Disposition', - type: 'String', - http: {target: 'header'} + arg: 'res', + type: 'object', + http: {source: 'res'} } ], http: { @@ -41,42 +35,59 @@ module.exports = Self => { }, }); - Self.getVideo = async(id, time, options) => { + Self.getVideo = async(id, time, req, res, options) => { const models = Self.app.models; const myOptions = {}; - console.log('ENTRY'); + // console.log('ENTRY'); if (typeof options == 'object') Object.assign(myOptions, options); const expedition = await models.Expedition.findById(id, null, myOptions); const packingSiteConfig = await models.PackingSiteConfig.findOne({}, myOptions); - const monitorId = 'VbiUcajdaT'; - console.log(packingSiteConfig); + const monitorId = 'Xme2hiqz1f'; + // console.log(packingSiteConfig); const addTime = (time ? time : packingSiteConfig.avgBoxingTime) * 1000; const start = new Date(expedition.created);// '2022-07-27T09:00:00';// new Date('2022-07-27'); // const end = new Date(start.getTime() + addTime); - console.log(addTime); - console.log(start.toISOString().split('.')[0]); - console.log(end.toISOString().split('.')[0]); + // console.log(addTime); + // console.log(start.toString().split('.')[0]); + // console.log(end.toString().split('.')[0]); const videoUrl = `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${monitorId}`; - const timeUrl = `?start=${start.toISOString().split('.')[0]}&end=${end.toISOString().split('.')[0]}`; + const timeUrl = `?start=${start.toString().split('.')[0]}&end=${end.toString().split('.')[0]}`; const url = `${packingSiteConfig.shinobiUrl}${videoUrl}${timeUrl}&endIsStartTo`; - console.log(url); + // console.log(url); const videoList = await axios.post(url); - console.log(videoList.data); - const lastVideo = videoList.data.videos[videoList.data.videos.length - 1].href; - console.log(lastVideo); - const stream = await axios({ - method: 'get', - url: `${packingSiteConfig.shinobiUrl}${lastVideo}`, - responseType: 'stream' - }).then(response => { - return response.data; - }); + // console.log('videoList.data', videoList.data); + // console.log(videoList.data.videos); + // console.log(videoList.data.videos.length); + const length = videoList.data.videos.length; + // console.log(length); + if (!length) return []; - return [stream, 'video/mp4', `filename="${id}.mp4"`]; + const lastVideo = videoList.data.videos[length - 1].href; + + const headers = Object.assign({}, req.headers, { + host: 'shinobi.verdnatura.es' + }); + const httpOptions = { + host: 'shinobi.verdnatura.es', + path: '/BW4o7FZyJ85she1hlRDe6QnwW3jwEP/videos/xVqft9LFXg/Xme2hiqz1f/2022-08-02T11-45-01.mp4', + port: 443, + headers + }; + + return new Promise((resolve, reject) => { + const req = https.request(httpOptions, + shinobiRes => { + shinobiRes.pause(); + res.writeHeader(shinobiRes.statusCode, shinobiRes.headers); + shinobiRes.pipe(res); + resolve(); + }); + req.end(); + }); }; }; diff --git a/modules/ticket/front/boxing/index.js b/modules/ticket/front/boxing/index.js index 722301963d..686bf7d01f 100644 --- a/modules/ticket/front/boxing/index.js +++ b/modules/ticket/front/boxing/index.js @@ -7,7 +7,7 @@ class Controller extends Section { } $onInit() { - // window.location.href = this.lilium('dashboard'); + window.location.href = this.lilium(`ticket/${this.ticket.id}/boxing`); } lilium(route) { From 43df1e7e102000214bb89b94c17a33e3354de164 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 5 Sep 2022 12:06:14 +0200 Subject: [PATCH 09/19] refactor(boxing): refactor getVideo --- .../00-packingSiteConfig.sql | 3 +- .../00-packingSiteUpdate.sql | 0 .../ticket/back/methods/boxing/getVideo.js | 72 +++++++++---------- .../back/methods/boxing/getVideoList.js | 17 ++--- modules/ticket/back/models/boxing.js | 1 + 5 files changed, 47 insertions(+), 46 deletions(-) rename db/changes/{10480-june => 10490-august}/00-packingSiteConfig.sql (94%) rename db/changes/{10480-june => 10490-august}/00-packingSiteUpdate.sql (100%) diff --git a/db/changes/10480-june/00-packingSiteConfig.sql b/db/changes/10490-august/00-packingSiteConfig.sql similarity index 94% rename from db/changes/10480-june/00-packingSiteConfig.sql rename to db/changes/10490-august/00-packingSiteConfig.sql index 28e685eb69..bbd0b32def 100644 --- a/db/changes/10480-june/00-packingSiteConfig.sql +++ b/db/changes/10490-august/00-packingSiteConfig.sql @@ -7,9 +7,8 @@ CREATE TABLE `vn`.`packingSiteConfig` ( PRIMARY KEY (`id`) ); - INSERT INTO `vn`.`packingSiteConfig` SET - shinobiUrl = 'http://shinobi.verdnatura.es', + shinobiUrl = 'https://shinobi.verdnatura.es', shinobiToken = 'BW4o7FZyJ85she1hlRDe6QnwW3jwEP', shinobiGroupKey = 'xVqft9LFXg', avgBoxingTime = 30; diff --git a/db/changes/10480-june/00-packingSiteUpdate.sql b/db/changes/10490-august/00-packingSiteUpdate.sql similarity index 100% rename from db/changes/10480-june/00-packingSiteUpdate.sql rename to db/changes/10490-august/00-packingSiteUpdate.sql diff --git a/modules/ticket/back/methods/boxing/getVideo.js b/modules/ticket/back/methods/boxing/getVideo.js index 91d538782e..8cecbad4d3 100644 --- a/modules/ticket/back/methods/boxing/getVideo.js +++ b/modules/ticket/back/methods/boxing/getVideo.js @@ -9,13 +9,13 @@ module.exports = Self => { { arg: 'id', type: 'number', - required: false, + required: true, description: 'Ticket id' }, { - arg: 'time', - type: 'number', - required: false, + arg: 'filename', + type: 'string', + required: true, description: 'Time to add' }, { @@ -35,58 +35,58 @@ module.exports = Self => { }, }); - Self.getVideo = async(id, time, req, res, options) => { + Self.getVideo = async(id, filename, req, res, options) => { const models = Self.app.models; const myOptions = {}; - // console.log('ENTRY'); + + console.log('getFile', filename); if (typeof options == 'object') Object.assign(myOptions, options); - const expedition = await models.Expedition.findById(id, null, myOptions); const packingSiteConfig = await models.PackingSiteConfig.findOne({}, myOptions); - const monitorId = 'Xme2hiqz1f'; - // console.log(packingSiteConfig); - const addTime = (time ? time : packingSiteConfig.avgBoxingTime) * 1000; - const start = new Date(expedition.created);// '2022-07-27T09:00:00';// new Date('2022-07-27'); // - const end = new Date(start.getTime() + addTime); - // console.log(addTime); - // console.log(start.toString().split('.')[0]); - // console.log(end.toString().split('.')[0]); + const query = ` + SELECT + e.id, + ps.monitorId, + e.created + FROM expedition e + JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk + JOIN packingSite ps ON ps.hostFk = h.id + WHERE e.id = ?;`; + const [expedition] = await models.Expedition.rawSql(query, [id]); - const videoUrl = `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${monitorId}`; - const timeUrl = `?start=${start.toString().split('.')[0]}&end=${end.toString().split('.')[0]}`; - const url = `${packingSiteConfig.shinobiUrl}${videoUrl}${timeUrl}&endIsStartTo`; + const monitorId = '6Ou0D1bhBw'; // expedition.monitorId - // console.log(url); - const videoList = await axios.post(url); - // console.log('videoList.data', videoList.data); - // console.log(videoList.data.videos); - // console.log(videoList.data.videos.length); - const length = videoList.data.videos.length; - // console.log(length); - if (!length) return []; - - const lastVideo = videoList.data.videos[length - 1].href; + const videoUrl = + `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${monitorId}/${filename}`; const headers = Object.assign({}, req.headers, { host: 'shinobi.verdnatura.es' }); const httpOptions = { host: 'shinobi.verdnatura.es', - path: '/BW4o7FZyJ85she1hlRDe6QnwW3jwEP/videos/xVqft9LFXg/Xme2hiqz1f/2022-08-02T11-45-01.mp4', + path: videoUrl, port: 443, headers }; + console.log('shinobi.verdnatura.es' + videoUrl); return new Promise((resolve, reject) => { - const req = https.request(httpOptions, - shinobiRes => { - shinobiRes.pause(); - res.writeHeader(shinobiRes.statusCode, shinobiRes.headers); - shinobiRes.pipe(res); - resolve(); - }); + const req = https.request(httpOptions, shinobiRes => { + console.log('entry'); + shinobiRes.pause(); + res.writeHeader(shinobiRes.statusCode, shinobiRes.headers); + shinobiRes.pipe(res); + }); + + req.on('error', error => { + console.error(error); + }); + + req.on('end', res => { + resolve(); + }); req.end(); }); }; diff --git a/modules/ticket/back/methods/boxing/getVideoList.js b/modules/ticket/back/methods/boxing/getVideoList.js index cdc3555a74..4e74f76ecd 100644 --- a/modules/ticket/back/methods/boxing/getVideoList.js +++ b/modules/ticket/back/methods/boxing/getVideoList.js @@ -33,7 +33,7 @@ module.exports = Self => { Self.getVideoList = async(id, from, to, options) => { const myOptions = {}; - console.log(id); + if (typeof options == 'object') Object.assign(myOptions, options); @@ -67,14 +67,15 @@ module.exports = Self => { const videoUrl = `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${monitorId}`; const timeUrl = `?start=${start.toISOString().split('.')[0]}&end=${end.toISOString().split('.')[0]}`; const url = `${packingSiteConfig.shinobiUrl}${videoUrl}${timeUrl}`; - console.log(url); - console.log('try get'); - const response = await axios(url).then(res => { - return res; - }); - console.log('finish get'); + let response; - console.log(response); + try { + response = await axios.get(url); + } catch (e) { + console.log(e); + return []; + } + return response.data.videos.map(video => video.filename); }; }; diff --git a/modules/ticket/back/models/boxing.js b/modules/ticket/back/models/boxing.js index 81732d17ac..c251ea0e43 100644 --- a/modules/ticket/back/models/boxing.js +++ b/modules/ticket/back/models/boxing.js @@ -1,3 +1,4 @@ module.exports = Self => { require('../methods/boxing/getVideo')(Self); + require('../methods/boxing/getVideoList')(Self); }; From 8dd02ab6ee2707ce1ebdfabb6020a22bcf3d16eb Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 6 Sep 2022 15:08:28 +0200 Subject: [PATCH 10/19] quit console.logs --- modules/ticket/back/methods/boxing/getVideo.js | 13 ++++--------- modules/ticket/back/methods/boxing/getVideoList.js | 11 ++++------- modules/ticket/front/boxing/index.html | 3 --- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/modules/ticket/back/methods/boxing/getVideo.js b/modules/ticket/back/methods/boxing/getVideo.js index 8cecbad4d3..cdd46b2574 100644 --- a/modules/ticket/back/methods/boxing/getVideo.js +++ b/modules/ticket/back/methods/boxing/getVideo.js @@ -1,4 +1,3 @@ -const axios = require('axios'); const https = require('https'); module.exports = Self => { @@ -39,7 +38,6 @@ module.exports = Self => { const models = Self.app.models; const myOptions = {}; - console.log('getFile', filename); if (typeof options == 'object') Object.assign(myOptions, options); @@ -55,8 +53,7 @@ module.exports = Self => { JOIN packingSite ps ON ps.hostFk = h.id WHERE e.id = ?;`; const [expedition] = await models.Expedition.rawSql(query, [id]); - - const monitorId = '6Ou0D1bhBw'; // expedition.monitorId + const monitorId = expedition.monitorId; const videoUrl = `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${monitorId}/${filename}`; @@ -70,21 +67,19 @@ module.exports = Self => { port: 443, headers }; - console.log('shinobi.verdnatura.es' + videoUrl); return new Promise((resolve, reject) => { const req = https.request(httpOptions, shinobiRes => { - console.log('entry'); shinobiRes.pause(); res.writeHeader(shinobiRes.statusCode, shinobiRes.headers); shinobiRes.pipe(res); }); - req.on('error', error => { - console.error(error); + req.on('error', () => { + reject(); }); - req.on('end', res => { + req.on('end', () => { resolve(); }); req.end(); diff --git a/modules/ticket/back/methods/boxing/getVideoList.js b/modules/ticket/back/methods/boxing/getVideoList.js index 4e74f76ecd..be6d48c46b 100644 --- a/modules/ticket/back/methods/boxing/getVideoList.js +++ b/modules/ticket/back/methods/boxing/getVideoList.js @@ -1,5 +1,4 @@ const axios = require('axios'); -const https = require('https'); const models = require('vn-loopback/server/server').models; module.exports = Self => { @@ -49,9 +48,7 @@ module.exports = Self => { JOIN packingSite ps ON ps.hostFk = h.id WHERE e.id = ?;`; const [expedition] = await models.PackingSiteConfig.rawSql(query, [id]); - - const monitorId = '6Ou0D1bhBw'; - console.log(id, expedition); + console.log(expedition); if (!from && !expedition) return []; let start = new Date(expedition.created); let end = new Date(start.getTime() + (packingSiteConfig.avgBoxingTime * 1000)); @@ -63,8 +60,9 @@ module.exports = Self => { const offset = start.getTimezoneOffset(); start = new Date(start.getTime() - (offset * 60 * 1000)); end = new Date(end.getTime() - (offset * 60 * 1000)); - console.log(start, end); - const videoUrl = `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${monitorId}`; + + const videoUrl = + `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${expedition.monitorId}`; const timeUrl = `?start=${start.toISOString().split('.')[0]}&end=${end.toISOString().split('.')[0]}`; const url = `${packingSiteConfig.shinobiUrl}${videoUrl}${timeUrl}`; @@ -73,7 +71,6 @@ module.exports = Self => { try { response = await axios.get(url); } catch (e) { - console.log(e); return []; } return response.data.videos.map(video => video.filename); diff --git a/modules/ticket/front/boxing/index.html b/modules/ticket/front/boxing/index.html index 17b2b475ae..7fb3b870e0 100644 --- a/modules/ticket/front/boxing/index.html +++ b/modules/ticket/front/boxing/index.html @@ -1,5 +1,2 @@ - From c06d2970ae91a3e4e3f44ec3d4d2c4de4721d86b Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 7 Sep 2022 13:58:39 +0200 Subject: [PATCH 11/19] test(boxing): getVideoList --- .../ticket/back/methods/boxing/getVideo.js | 2 +- .../back/methods/boxing/getVideoList.js | 4 +- .../back/methods/boxing/specs/getVideo.js | 69 ------------------- .../back/methods/boxing/specs/getVideoList.js | 35 ++++++++++ 4 files changed, 38 insertions(+), 72 deletions(-) delete mode 100644 modules/ticket/back/methods/boxing/specs/getVideo.js create mode 100644 modules/ticket/back/methods/boxing/specs/getVideoList.js diff --git a/modules/ticket/back/methods/boxing/getVideo.js b/modules/ticket/back/methods/boxing/getVideo.js index cdd46b2574..6f471e837f 100644 --- a/modules/ticket/back/methods/boxing/getVideo.js +++ b/modules/ticket/back/methods/boxing/getVideo.js @@ -2,7 +2,7 @@ const https = require('https'); module.exports = Self => { Self.remoteMethod('getVideo', { - description: 'Get packing video of ticketId', + description: 'Get packing video', accessType: 'READ', accepts: [ { diff --git a/modules/ticket/back/methods/boxing/getVideoList.js b/modules/ticket/back/methods/boxing/getVideoList.js index be6d48c46b..3d45a720d9 100644 --- a/modules/ticket/back/methods/boxing/getVideoList.js +++ b/modules/ticket/back/methods/boxing/getVideoList.js @@ -21,7 +21,7 @@ module.exports = Self => { required: false, } ], returns: { - type: ['Object'], + type: ['object'], root: true }, http: { @@ -48,7 +48,7 @@ module.exports = Self => { JOIN packingSite ps ON ps.hostFk = h.id WHERE e.id = ?;`; const [expedition] = await models.PackingSiteConfig.rawSql(query, [id]); - console.log(expedition); + if (!from && !expedition) return []; let start = new Date(expedition.created); let end = new Date(start.getTime() + (packingSiteConfig.avgBoxingTime * 1000)); diff --git a/modules/ticket/back/methods/boxing/specs/getVideo.js b/modules/ticket/back/methods/boxing/specs/getVideo.js deleted file mode 100644 index ad5295f0c9..0000000000 --- a/modules/ticket/back/methods/boxing/specs/getVideo.js +++ /dev/null @@ -1,69 +0,0 @@ -const models = require('vn-loopback/server/server').models; - -xdescribe('sale canEdit()', () => { - it('should return true if the role is production regardless of the saleTrackings', async() => { - const tx = await models.Sale.beginTransaction({}); - - try { - const options = {transaction: tx}; - - const productionUserID = 49; - const ctx = {req: {accessToken: {userId: productionUserID}}}; - - const sales = [{id: 3}]; - - const result = await models.Sale.canEdit(ctx, sales, options); - - expect(result).toEqual(true); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return true if the role is not production and none of the sales has saleTracking', async() => { - const tx = await models.Sale.beginTransaction({}); - - try { - const options = {transaction: tx}; - - const salesPersonUserID = 18; - const ctx = {req: {accessToken: {userId: salesPersonUserID}}}; - - const sales = [{id: 10}]; - - const result = await models.Sale.canEdit(ctx, sales, options); - - expect(result).toEqual(true); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); - - it('should return false if any of the sales has a saleTracking record', async() => { - const tx = await models.Sale.beginTransaction({}); - - try { - const options = {transaction: tx}; - - const salesPersonUserID = 18; - const ctx = {req: {accessToken: {userId: salesPersonUserID}}}; - - const sales = [{id: 3}]; - - const result = await models.Sale.canEdit(ctx, sales, options); - - expect(result).toEqual(false); - - await tx.rollback(); - } catch (e) { - await tx.rollback(); - throw e; - } - }); -}); diff --git a/modules/ticket/back/methods/boxing/specs/getVideoList.js b/modules/ticket/back/methods/boxing/specs/getVideoList.js new file mode 100644 index 0000000000..e703f4c035 --- /dev/null +++ b/modules/ticket/back/methods/boxing/specs/getVideoList.js @@ -0,0 +1,35 @@ +const models = require('vn-loopback/server/server').models; +const axios = require('axios'); + +describe('boxing getVideoList()', () => { + it('should return data', async() => { + const tx = await models.PackingSiteConfig.beginTransaction({}); + + try { + const options = {transaction: tx}; + + const params = { + id: 1, + from: 1, + to: 2 + }; + + const response = { + data: { + pipe: () => {}, + on: () => {}, + } + }; + spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(response))); + + const result = await models.Sale.canEdit(params, options); + + expect(result).toEqual([]); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); +}); From 2c691eb796b29fed91d2a96ed8dbcc57bccde866 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 26 Sep 2022 14:49:11 +0200 Subject: [PATCH 12/19] feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList --- back/model-config.json | 3 ++ back/models/url.json | 25 ++++++++++++ .../10490-august/00-packingSiteConfig.sql | 2 +- db/changes/10490-august/00-salix_url.sql | 33 +++++++++++++++ front/core/services/app.js | 17 ++++++++ .../methods/boxing/specs/getVideo.spec.js | 40 +++++++++++++++++++ .../{getVideoList.js => getVideoList.spec.js} | 21 +++++----- modules/ticket/front/boxing/index.js | 17 ++------ 8 files changed, 133 insertions(+), 25 deletions(-) create mode 100644 back/models/url.json create mode 100644 db/changes/10490-august/00-salix_url.sql create mode 100644 modules/ticket/back/methods/boxing/specs/getVideo.spec.js rename modules/ticket/back/methods/boxing/specs/{getVideoList.js => getVideoList.spec.js} (58%) diff --git a/back/model-config.json b/back/model-config.json index f4adc954b0..5f1c0bbe2e 100644 --- a/back/model-config.json +++ b/back/model-config.json @@ -101,6 +101,9 @@ "Town": { "dataSource": "vn" }, + "Url": { + "dataSource": "vn" + }, "UserConfig": { "dataSource": "vn" }, diff --git a/back/models/url.json b/back/models/url.json new file mode 100644 index 0000000000..8610ff28b6 --- /dev/null +++ b/back/models/url.json @@ -0,0 +1,25 @@ +{ + "name": "Url", + "base": "VnModel", + "options": { + "mysql": { + "table": "salix.url" + } + }, + "properties": { + "appName": { + "type": "string", + "required": true, + "id": 1 + }, + "environment": { + "type": "string", + "required": true, + "id": 2 + }, + "url": { + "type": "string", + "required": true + } + } +} diff --git a/db/changes/10490-august/00-packingSiteConfig.sql b/db/changes/10490-august/00-packingSiteConfig.sql index bbd0b32def..dc5e4c5cfc 100644 --- a/db/changes/10490-august/00-packingSiteConfig.sql +++ b/db/changes/10490-august/00-packingSiteConfig.sql @@ -11,7 +11,7 @@ INSERT INTO `vn`.`packingSiteConfig` SET shinobiUrl = 'https://shinobi.verdnatura.es', shinobiToken = 'BW4o7FZyJ85she1hlRDe6QnwW3jwEP', shinobiGroupKey = 'xVqft9LFXg', - avgBoxingTime = 30; + avgBoxingTime = 6000; INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES diff --git a/db/changes/10490-august/00-salix_url.sql b/db/changes/10490-august/00-salix_url.sql new file mode 100644 index 0000000000..ea5c3b6064 --- /dev/null +++ b/db/changes/10490-august/00-salix_url.sql @@ -0,0 +1,33 @@ +CREATE TABLE `salix`.`url` ( + `appName` varchar(100) NOT NULL, + `environment` varchar(100) NOT NULL, + `url` varchar(255) NOT NULL, + PRIMARY KEY (`appName`,`environment`) +); + +INSERT INTO `salix`.`url` (`appName`, `environment`, `url`) + VALUES + ('salix', 'production', 'https://salix.verdnatura.es/#!/'); +INSERT INTO `salix`.`url` (`appName`, `environment`, `url`) + VALUES + ('salix', 'test', 'https://test-salix.verdnatura.es/#!/'); +INSERT INTO `salix`.`url` (`appName`, `environment`, `url`) + VALUES + ('salix', 'dev', 'http://localhost:5000/#!/'); +INSERT INTO `salix`.`url` (`appName`, `environment`, `url`) + VALUES + ('lilium', 'production', 'https://lilium.verdnatura.es/#/'); +INSERT INTO `salix`.`url` (`appName`, `environment`, `url`) + VALUES + ('lilium', 'test', 'https://test-lilium.verdnatura.es/#/'); +INSERT INTO `salix`.`url` (`appName`, `environment`, `url`) + VALUES + ('lilium', 'dev', 'http://localhost:8080/#/'); + +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES + ('Url', '*', 'READ', 'ALLOW', 'ROLE', 'employee'); + +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES + ('Url', '*', 'WRITE', 'ALLOW', 'ROLE', 'it'); diff --git a/front/core/services/app.js b/front/core/services/app.js index 889b24d01b..37bddeca04 100644 --- a/front/core/services/app.js +++ b/front/core/services/app.js @@ -54,6 +54,23 @@ export default class App { localStorage.setItem('salix-version', newVersion); } } + + getUrl(route, appName) { + if (!appName) appName = 'lilium'; + + const env = process.env.NODE_ENV; + const filter = { + where: {and: [ + {appName: appName}, + {environment: env} + ]} + }; + + return this.logger.$http.get('Urls/findOne', {filter}) + .then(res => { + return res.data.url + route; + }); + } } ngModule.service('vnApp', App); diff --git a/modules/ticket/back/methods/boxing/specs/getVideo.spec.js b/modules/ticket/back/methods/boxing/specs/getVideo.spec.js new file mode 100644 index 0000000000..8e8cdc5b98 --- /dev/null +++ b/modules/ticket/back/methods/boxing/specs/getVideo.spec.js @@ -0,0 +1,40 @@ +const models = require('vn-loopback/server/server').models; +const https = require('https'); + +xdescribe('boxing getVideo()', () => { + it('should return data', async() => { + const tx = await models.PackingSiteConfig.beginTransaction({}); + + try { + const options = {transaction: tx}; + + const id = 1; + const video = 'video.mp4'; + + const response = { + pipe: () => {}, + on: () => {}, + end: () => {}, + }; + + const req = { + headers: 'apiHeader', + data: { + pipe: () => {}, + on: () => {}, + } + }; + + spyOn(https, 'request').and.returnValue(response); + + const result = await models.Boxing.getVideo(id, video, req, null, options); + + expect(result[0]).toEqual(response.data.videos[0].filename); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); +}); diff --git a/modules/ticket/back/methods/boxing/specs/getVideoList.js b/modules/ticket/back/methods/boxing/specs/getVideoList.spec.js similarity index 58% rename from modules/ticket/back/methods/boxing/specs/getVideoList.js rename to modules/ticket/back/methods/boxing/specs/getVideoList.spec.js index e703f4c035..c6d1a3e07c 100644 --- a/modules/ticket/back/methods/boxing/specs/getVideoList.js +++ b/modules/ticket/back/methods/boxing/specs/getVideoList.spec.js @@ -2,29 +2,30 @@ const models = require('vn-loopback/server/server').models; const axios = require('axios'); describe('boxing getVideoList()', () => { - it('should return data', async() => { + it('should return video list', async() => { const tx = await models.PackingSiteConfig.beginTransaction({}); try { const options = {transaction: tx}; - const params = { - id: 1, - from: 1, - to: 2 - }; + const id = 1; + const from = 1; + const to = 2; const response = { data: { - pipe: () => {}, - on: () => {}, + videos: [{ + id: 1, + filename: 'video1.mp4' + }] } }; + spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(response))); - const result = await models.Sale.canEdit(params, options); + const result = await models.Boxing.getVideoList(id, from, to, options); - expect(result).toEqual([]); + expect(result[0]).toEqual(response.data.videos[0].filename); await tx.rollback(); } catch (e) { diff --git a/modules/ticket/front/boxing/index.js b/modules/ticket/front/boxing/index.js index 686bf7d01f..4e6b398f2f 100644 --- a/modules/ticket/front/boxing/index.js +++ b/modules/ticket/front/boxing/index.js @@ -6,20 +6,9 @@ class Controller extends Section { super($element, $); } - $onInit() { - window.location.href = this.lilium(`ticket/${this.ticket.id}/boxing`); - } - - lilium(route) { - const env = process.env.NODE_ENV; - let newRoute = 'http://localhost:8080/#/' + route; - - if (env == 'test') - newRoute = 'https://test-lilium.verdnatura.es/#/' + route; - if (env == 'producction') - newRoute = 'https://lilium.verdnatura.es/#/' + route; - - return newRoute; + async $onInit() { + const url = await this.vnApp.getUrl(`ticket/${this.$params.id}/boxing`); + window.open(url).focus(); } } From e931414bb7d7fd33b6a3caec661d7c1e26e7b8cd Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 30 Sep 2022 08:59:49 +0200 Subject: [PATCH 13/19] unnecessary code --- db/changes/10490-august/00-packingSiteConfig.sql | 12 ------------ front/core/lib/lilium.js | 12 ------------ front/core/services/app.js | 4 +--- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 front/core/lib/lilium.js diff --git a/db/changes/10490-august/00-packingSiteConfig.sql b/db/changes/10490-august/00-packingSiteConfig.sql index dc5e4c5cfc..945b5a54c6 100644 --- a/db/changes/10490-august/00-packingSiteConfig.sql +++ b/db/changes/10490-august/00-packingSiteConfig.sql @@ -7,18 +7,6 @@ CREATE TABLE `vn`.`packingSiteConfig` ( PRIMARY KEY (`id`) ); -INSERT INTO `vn`.`packingSiteConfig` SET - shinobiUrl = 'https://shinobi.verdnatura.es', - shinobiToken = 'BW4o7FZyJ85she1hlRDe6QnwW3jwEP', - shinobiGroupKey = 'xVqft9LFXg', - avgBoxingTime = 6000; - INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Boxing', '*', '*', 'ALLOW', 'ROLE', 'employee'); - -SELECT e.id expeditionFk, e.ticketFk, ps.code, ps.monitorId - FROM expedition e - JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk - JOIN packingSite ps ON ps.hostFk = h.id - WHERE e.ticketFk = 1; diff --git a/front/core/lib/lilium.js b/front/core/lib/lilium.js deleted file mode 100644 index ca10d3511b..0000000000 --- a/front/core/lib/lilium.js +++ /dev/null @@ -1,12 +0,0 @@ - -export default function lilium(route) { - const env = process.env.NODE_ENV; - let newRoute = 'https://localhost:8080/#/' + route; - - if (env == 'test') - newRoute = 'https://test-lilium.verdnatura.es/#/' + route; - if (env == 'producction') - newRoute = 'https://lilium.verdnatura.es/#/' + route; - - return newRoute; -} diff --git a/front/core/services/app.js b/front/core/services/app.js index 37bddeca04..fb0a087773 100644 --- a/front/core/services/app.js +++ b/front/core/services/app.js @@ -55,9 +55,7 @@ export default class App { } } - getUrl(route, appName) { - if (!appName) appName = 'lilium'; - + getUrl(route, appName = 'lilium') { const env = process.env.NODE_ENV; const filter = { where: {and: [ From eec1d6df4ad09fbbd2db274035971bb8486cf243 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 30 Sep 2022 09:06:43 +0200 Subject: [PATCH 14/19] add translation --- modules/ticket/front/locale/es.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ticket/front/locale/es.yml b/modules/ticket/front/locale/es.yml index 752dd7b36e..748ba210f5 100644 --- a/modules/ticket/front/locale/es.yml +++ b/modules/ticket/front/locale/es.yml @@ -4,6 +4,7 @@ Agency: Agencia Amount: Importe Base to commission: Base comisionable Boxes: Cajas +Boxing: Encajado by: por Checked: Comprobado Client: Cliente @@ -45,7 +46,7 @@ Price gap: Diferencia de precio Quantity: Cantidad Remove lines: Eliminar lineas Route: Ruta -SET OK: PONER OK +SET OK: PONER OK Shipment: Salida Shipped: F. envío Some fields are invalid: Algunos campos no son válidos @@ -81,4 +82,4 @@ Sale tracking: Líneas preparadas Pictures: Fotos Log: Historial Packager: Encajador -Palletizer: Palletizador \ No newline at end of file +Palletizer: Palletizador From f81b2775a00a8431b89bdeb4c63a10644fd138e0 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 30 Sep 2022 09:36:51 +0200 Subject: [PATCH 15/19] add fixture --- db/dump/fixtures.sql | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 189b1ebe63..b54bb1c825 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2642,7 +2642,11 @@ INSERT INTO `vn`.`host` (`id`, `code`, `description`, `warehouseFk`, `bankFk`) INSERT INTO `vn`.`packingSite` (`id`, `code`, `hostFk`, `monitorId`) VALUES - (1, 'h1', 1, 'VbiUcajdaT'); + (1, 'h1', 1, ''); + +INSERT INTO `vn`.`packingSiteConfig` (`shinobiUrl`, `shinobiToken`, `shinobiGroupKey`, `avgBoxingTime`) + VALUES + ('', 'SHINNOBI_TOKEN', 'GROUP_TOKEN', 6000); INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`) VALUES From 24cb8e00bbe7200a2d218162bcbb681a187b919b Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 11 Oct 2022 13:20:25 +0200 Subject: [PATCH 16/19] creates notification sql in changes --- .../10491-august/00-notificationProc.sql | 28 ++++++++ .../10491-august/00-notificationTables.sql | 63 +++++++++++++++++ db/changes/10491-august/delete.keep | 0 db/dump/structure.sql | 68 ------------------- 4 files changed, 91 insertions(+), 68 deletions(-) create mode 100644 db/changes/10491-august/00-notificationProc.sql create mode 100644 db/changes/10491-august/00-notificationTables.sql delete mode 100644 db/changes/10491-august/delete.keep diff --git a/db/changes/10491-august/00-notificationProc.sql b/db/changes/10491-august/00-notificationProc.sql new file mode 100644 index 0000000000..475b2e3892 --- /dev/null +++ b/db/changes/10491-august/00-notificationProc.sql @@ -0,0 +1,28 @@ +DROP FUNCTION IF EXISTS `util`.`notification_send`; +DELIMITER $$ +CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`notification_send`(vNotificationName VARCHAR(255), vParams TEXT, vAuthorFk INT) + RETURNS INT + MODIFIES SQL DATA +BEGIN +/** + * Sends a notification. + * + * @param vNotificationName The notification name + * @param vParams The notification parameters formatted as JSON + * @param vAuthorFk The notification author or %NULL if there is no author + * @return The notification id + */ + DECLARE vNotificationFk INT; + + SELECT id INTO vNotificationFk + FROM `notification` + WHERE `name` = vNotificationName; + + INSERT INTO notificationQueue + SET notificationFk = vNotificationFk, + params = vParams, + authorFk = vAuthorFk; + + RETURN LAST_INSERT_ID(); +END$$ +DELIMITER ; diff --git a/db/changes/10491-august/00-notificationTables.sql b/db/changes/10491-august/00-notificationTables.sql new file mode 100644 index 0000000000..d5fcf00b20 --- /dev/null +++ b/db/changes/10491-august/00-notificationTables.sql @@ -0,0 +1,63 @@ +USE util; + +CREATE TABLE notification( + id INT PRIMARY KEY, + `name` VARCHAR(255) UNIQUE, + `description` VARCHAR(255) +); + +CREATE TABLE notificationAcl( + notificationFk INT, -- FK notification.id + roleFk INT(10) unsigned, -- FK account.role.id + PRIMARY KEY(notificationFk, roleFk) +); + +ALTER TABLE `util`.`notificationAcl` ADD CONSTRAINT `notificationAcl_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `util`.`notification` (`id`) + ON DELETE CASCADE + ON UPDATE CASCADE; + +ALTER TABLE `util`.`notificationAcl` ADD CONSTRAINT `notificationAcl_ibfk_2` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role`(`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + +CREATE TABLE notificationSubscription( + notificationFk INT, -- FK notification.id + userFk INT(10) unsigned, -- FK account.user.id + PRIMARY KEY(notificationFk, userFk) +); + +ALTER TABLE `util`.`notificationSubscription` ADD CONSTRAINT `notificationSubscription_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `util`.`notification` (`id`) + ON DELETE CASCADE + ON UPDATE CASCADE; + +ALTER TABLE `util`.`notificationSubscription` ADD CONSTRAINT `notificationSubscription_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user`(`id`) + ON DELETE CASCADE + ON UPDATE CASCADE; + +CREATE TABLE notificationQueue( + id INT PRIMARY KEY AUTO_INCREMENT, + notificationFk VARCHAR(255), -- FK notification.name + params TEXT, -- JSON + authorFk INT(10) unsigned NULL, -- FK account.user.id + `status` ENUM('pending', 'sent', 'error') NOT NULL DEFAULT 'pending', + created DATETIME DEFAULT CURRENT_TIMESTAMP, + INDEX(notificationFk), + INDEX(authorFk), + INDEX(status) +); + +ALTER TABLE `util`.`notificationQueue` ADD CONSTRAINT `nnotificationQueue_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `util`.`notification` (`name`) + ON DELETE CASCADE + ON UPDATE CASCADE; + +ALTER TABLE `util`.`notificationQueue` ADD CONSTRAINT `notificationQueue_ibfk_2` FOREIGN KEY (`authorFk`) REFERENCES `account`.`user`(`id`) + ON DELETE CASCADE + ON UPDATE CASCADE; + +CREATE TABLE notificationConfig( + id INT PRIMARY KEY AUTO_INCREMENT, + cleanDays MEDIUMINT +); + +INSERT INTO notificationConfig + SET cleanDays = 90; diff --git a/db/changes/10491-august/delete.keep b/db/changes/10491-august/delete.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/db/dump/structure.sql b/db/dump/structure.sql index 184c7490f3..402c8e695b 100644 --- a/db/dump/structure.sql +++ b/db/dump/structure.sql @@ -20369,74 +20369,6 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `util` /*!40100 DEFAULT CHARACTER SET u USE `util`; -CREATE TABLE notification( - id INT PRIMARY KEY, - `name` VARCHAR(255) UNIQUE, - `description` VARCHAR(255) -); - -CREATE TABLE notificationAcl ( - notificationFk INT(11), - roleFk INT(10) unsigned, - PRIMARY KEY(notificationFk, roleFk), - CONSTRAINT `notificationAcl_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `notificationAcl_ibfk_2` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE notificationSubscription( - notificationFk INT, - userFk INT(10) unsigned, - PRIMARY KEY(notificationFk, userFk), - CONSTRAINT `notificationSubscription_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `notificationSubscription_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE notificationQueue( - id INT PRIMARY KEY AUTO_INCREMENT, - notificationFk VARCHAR(255), - params TEXT, - authorFk INT(10) unsigned NULL, - `status` ENUM('pending', 'sent', 'error') NOT NULL DEFAULT 'pending', - created DATETIME DEFAULT CURRENT_TIMESTAMP, - INDEX(notificationFk), - INDEX(authorFk), - INDEX(status), - CONSTRAINT `notificationQueue_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`name`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `notificationQueue_ibfk_2` FOREIGN KEY (`authorFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE notificationConfig( - id INT PRIMARY KEY AUTO_INCREMENT, - cleanDays MEDIUMINT -); - -DROP FUNCTION IF EXISTS util.notification_send; -DELIMITER $$ -CREATE FUNCTION util.notification_send(vNotificationName VARCHAR(255), vParams TEXT, vAuthorFk INT) - RETURNS INT -BEGIN -/** - * Sends a notification. - * - * @param vNotificationName The notification name - * @param vParams The notification parameters formatted as JSON - * @param vAuthorFk The notification author or %NULL if there is no author - * @return The notification id - */ - DECLARE vNotificationFk INT; - - SELECT id INTO vNotificationFk - FROM `notification` - WHERE `name` = vNotificationName; - - INSERT INTO notificationQueue - SET notificationFk = vNotificationFk, - params = vParams, - authorFk = vAuthorFk; - - RETURN LAST_INSERT_ID(); -END$$ -DELIMITER ; -- -- Table structure for table `binlogQueue` -- From c637f2c8798989b1684ec16f79d33d7e654ea791 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 14 Oct 2022 13:22:53 +0200 Subject: [PATCH 17/19] feat(send): use vn-print libary and adapt test --- back/methods/notification/send.js | 59 ++++++++++--------- back/methods/notification/specs/send.spec.js | 2 +- .../10491-august/00-notificationTables.sql | 14 ++--- db/dump/fixtures.sql | 8 ++- 4 files changed, 44 insertions(+), 39 deletions(-) diff --git a/back/methods/notification/send.js b/back/methods/notification/send.js index b56d9d6c03..5ae7e748b2 100644 --- a/back/methods/notification/send.js +++ b/back/methods/notification/send.js @@ -1,4 +1,5 @@ -const axios = require('axios'); +const {Email} = require('vn-print'); +const UserError = require('vn-loopback/util/user-error'); module.exports = Self => { Self.remoteMethod('send', { @@ -15,27 +16,18 @@ module.exports = Self => { }); Self.send = async options => { - // const headers = ctx.req.headers; - // const origin = headers.origin || 'http://' + headers.host; - // const auth = ctx.req.accessToken; - // console.log(origin); + if (process.env.NODE_ENV == 'test') + throw new UserError(`Action not allowed on the test environment`); const models = Self.app.models; - const status = 'pending'; + const findStatus = 'pending'; const myOptions = {}; - let tx; - if (typeof options == 'object') Object.assign(myOptions, options); - if (!myOptions.transaction) { - tx = await Self.beginTransaction({}); - myOptions.transaction = tx; - } - const notificationQueue = await models.NotificationQueue.find({ - where: {status: status}, + where: {status: findStatus}, include: [ { relation: 'notification', @@ -46,7 +38,7 @@ module.exports = Self => { include: { relation: 'user', scope: { - fields: ['name'] + fields: ['name', 'email', 'lang'] } } } @@ -59,24 +51,33 @@ module.exports = Self => { const statusSent = 'sent'; const statusError = 'error'; + for (const queue of notificationQueue) { - // console.log(queue); - // console.log(origin); - // console.log(auth); - // console.log(queue.notification().name); - // console.log(queue.params); + const queueName = queue.notification().name; + const queueParams = JSON.parse(queue.params); - // const queueParams = Object.assign({}, JSON.parse(queue.params)); - // queueParams.authorization = auth.id; + for (const notificationUser of queue.notification().subscription()) { + try { + const sendParams = { + recipient: notificationUser.user().email, + lang: notificationUser.user().lang + }; - try { - // await print axios.get(`print`, queueParams) - await queue.updateAttribute('status', statusSent); - } catch (error) { - await queue.updateAttribute('status', statusError); + if (notificationUser.userFk == queue.authorFk) { + await queue.updateAttribute('status', statusSent); + continue; + } + + const newParams = Object.assign({}, queueParams, sendParams); + const email = new Email(queueName, newParams); + + await email.send(); + + await queue.updateAttribute('status', statusSent); + } catch (error) { + await queue.updateAttribute('status', statusError); + } } } - - return notificationQueue; }; }; diff --git a/back/methods/notification/specs/send.spec.js b/back/methods/notification/specs/send.spec.js index 015d1cb4d0..f0b186e065 100644 --- a/back/methods/notification/specs/send.spec.js +++ b/back/methods/notification/specs/send.spec.js @@ -27,7 +27,7 @@ describe('Notification Send()', () => { throw e; } - expect(before.length).toEqual(1); + expect(before.length).toEqual(3); expect(after.length).toEqual(0); }); }); diff --git a/db/changes/10491-august/00-notificationTables.sql b/db/changes/10491-august/00-notificationTables.sql index d5fcf00b20..2db7d9874c 100644 --- a/db/changes/10491-august/00-notificationTables.sql +++ b/db/changes/10491-august/00-notificationTables.sql @@ -7,8 +7,8 @@ CREATE TABLE notification( ); CREATE TABLE notificationAcl( - notificationFk INT, -- FK notification.id - roleFk INT(10) unsigned, -- FK account.role.id + notificationFk INT, + roleFk INT(10) unsigned, PRIMARY KEY(notificationFk, roleFk) ); @@ -21,8 +21,8 @@ ALTER TABLE `util`.`notificationAcl` ADD CONSTRAINT `notificationAcl_ibfk_2` FOR ON UPDATE CASCADE; CREATE TABLE notificationSubscription( - notificationFk INT, -- FK notification.id - userFk INT(10) unsigned, -- FK account.user.id + notificationFk INT, + userFk INT(10) unsigned, PRIMARY KEY(notificationFk, userFk) ); @@ -36,9 +36,9 @@ ALTER TABLE `util`.`notificationSubscription` ADD CONSTRAINT `notificationSubscr CREATE TABLE notificationQueue( id INT PRIMARY KEY AUTO_INCREMENT, - notificationFk VARCHAR(255), -- FK notification.name - params TEXT, -- JSON - authorFk INT(10) unsigned NULL, -- FK account.user.id + notificationFk VARCHAR(255), + params JSON, + authorFk INT(10) unsigned NULL, `status` ENUM('pending', 'sent', 'error') NOT NULL DEFAULT 'pending', created DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX(notificationFk), diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index cd2a1c6dd4..9d873f2c6a 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2653,7 +2653,7 @@ INSERT INTO `util`.`notificationConfig` INSERT INTO `util`.`notification` (`id`, `name`, `description`) VALUES - (1, 'invoice', 'notification fixture one'); + (1, 'print-email', 'notification fixture one'); INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`) VALUES @@ -2661,11 +2661,15 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`) INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`) VALUES - (1, 'invoice', '{"invoiceId": 1}', 9, 'pending', util.VN_CURDATE()); + (1, 'print-email', '{"id": "1"}', 9, 'pending', util.VN_CURDATE()), + (2, 'print-email', '{"id": "2"}', null, 'pending', util.VN_CURDATE()), + (3, 'print-email', null, null, 'pending', util.VN_CURDATE()); INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`) VALUES + (1, 1109), (1, 1110); + INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`) VALUES (1, 9); From aef47d46b1ef8c1259c20347b8dd59479ea21309 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 17 Oct 2022 12:12:10 +0200 Subject: [PATCH 18/19] env test --- back/methods/notification/send.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/back/methods/notification/send.js b/back/methods/notification/send.js index 5ae7e748b2..15baf0175a 100644 --- a/back/methods/notification/send.js +++ b/back/methods/notification/send.js @@ -71,7 +71,8 @@ module.exports = Self => { const newParams = Object.assign({}, queueParams, sendParams); const email = new Email(queueName, newParams); - await email.send(); + if (process.env.NODE_ENV != 'test') + await email.send(); await queue.updateAttribute('status', statusSent); } catch (error) { From c24b975f267d33c1f054f48b307781610d33c028 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 17 Oct 2022 12:14:11 +0200 Subject: [PATCH 19/19] remove node_env --- back/methods/notification/send.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/back/methods/notification/send.js b/back/methods/notification/send.js index 15baf0175a..80faf0305b 100644 --- a/back/methods/notification/send.js +++ b/back/methods/notification/send.js @@ -16,9 +16,6 @@ module.exports = Self => { }); Self.send = async options => { - if (process.env.NODE_ENV == 'test') - throw new UserError(`Action not allowed on the test environment`); - const models = Self.app.models; const findStatus = 'pending';