Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification

2024-09-12 10:27:27 +00:00 · 2024-09-12 10:27:27 +00:00 · 4f9eb865d0
parent d15be5100d 2f6a80a746
commit 4f9eb865d0
18 changed files with 81 additions and 53 deletions
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -2488,7 +2488,7 @@ INSERT INTO `vn`.`clientDms`(`clientFk`, `dmsFk`)
        (1104, 2),
        (1104, 3);

-INSERT INTO `vn`.`workerDocument`(`id`, `worker`, `document`,`isReadableByWorker`)
+INSERT INTO `vn`.`workerDms`(`id`, `workerFk`, `dmsFk`,`isReadableByWorker`)
    VALUES
        (1, 1106, 4, TRUE),
        (2, 1107, 3, FALSE);
--- a/db/routines/vn/procedures/productionSectorList.sql
+++ b/db/routines/vn/procedures/productionSectorList.sql
@ -55,7 +55,6 @@ BEGIN
 						i.itemPackingTypeFk,
 						isa.`size`,
 						isa.Estado,
-						isa.sectorProdPriority,
 						isa.available,
 						isa.sectorFk,
 						isa.matricula,
--- a/db/routines/vn/procedures/ticket_getProblems.sql
+++ b/db/routines/vn/procedures/ticket_getProblems.sql
@ -36,7 +36,7 @@ BEGIN
 	UPDATE tmp.ticket_problems
 		SET totalProblems = (
 			(isFreezed) +
-			(hasRisk) +
+			(hasHighRisk) +
 			(hasTicketRequest) +
 			(!isTaxDataChecked) +
 			(hasComponentLack) +
--- a/db/routines/vn/triggers/workerDocument_afterDelete.sql
+++ b/db/routines/vn/triggers/workerDocument_afterDelete.sql
@ -1,11 +1,11 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerDocument_afterDelete`
-	AFTER DELETE ON `workerDocument`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerDms_afterDelete`
+	AFTER DELETE ON `workerDms`
 	FOR EACH ROW
 BEGIN
 	INSERT INTO workerLog
 		SET `action` = 'delete',
-			`changedModel` = 'WorkerDocument',
+			`changedModel` = 'WorkerDms',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
 END$$
--- a/db/routines/vn/triggers/workerDocument_beforeInsert.sql
+++ b/db/routines/vn/triggers/workerDocument_beforeInsert.sql
@ -1,6 +1,6 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerDocument_beforeInsert`
-	BEFORE INSERT ON `workerDocument`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerDms_beforeInsert`
+	BEFORE INSERT ON `workerDms`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
--- a/db/routines/vn/triggers/workerDocument_beforeUpdate.sql
+++ b/db/routines/vn/triggers/workerDocument_beforeUpdate.sql
@ -1,6 +1,6 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerDocument_beforeUpdate`
-	BEFORE UPDATE ON `workerDocument`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerDms_beforeUpdate`
+	BEFORE UPDATE ON `workerDms`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
--- a/db/routines/vn/views/itemShelvingAvailable.sql
+++ b/db/routines/vn/views/itemShelvingAvailable.sql
@ -10,7 +10,6 @@ AS SELECT `s`.`id` AS `saleFk`,
 	`s`.`concept` AS `concept`,
 	`i`.`size` AS `size`,
 	`st`.`name` AS `Estado`,
-	`st`.`sectorProdPriority` AS `sectorProdPriority`,
 	`stock`.`visible` AS `available`,
 	`stock`.`sectorFk` AS `sectorFk`,
 	`stock`.`shelvingFk` AS `matricula`,
--- a/db/routines/vn2008/views/state.sql
+++ b/db/routines/vn2008/views/state.sql
@ -6,7 +6,6 @@ AS SELECT `s`.`id` AS `id`,
 	`s`.`order` AS `order`,
 	`s`.`alertLevel` AS `alert_level`,
 	`s`.`code` AS `code`,
-	`s`.`sectorProdPriority` AS `sectorProdPriority`,
 	`s`.`nextStateFk` AS `nextStateFk`,
 	`s`.`isPreviousPreparable` AS `isPreviousPreparable`,
 	`s`.`isPicked` AS `isPicked`
--- a/db/versions/11113-bronzeDendro/00-firstScript.sql
+++ b/db/versions/11113-bronzeDendro/00-firstScript.sql
@ -0,0 +1,16 @@
+ALTER TABLE IF EXISTS `vn`.`payrollWorker`
+	MODIFY COLUMN IF EXISTS `nss__` varchar(23) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `codpuesto__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `codcontrato__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `FAntiguedad__` date NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `grupotarifa__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `codcategoria__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `ContratoTemporal__` tinyint(1) NOT NULL DEFAULT 0 COMMENT '@deprecated 2024-03-15';
+
+ALTER TABLE IF EXISTS `vn`.`payrollWorkCenter`
+	MODIFY COLUMN IF EXISTS `Centro__` varchar(255) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `nss_cotizacion__` varchar(15) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `domicilio__` varchar(255) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `poblacion__` varchar(45) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `cp__` varchar(5) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `empresa_id__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15';
--- a/db/versions/11222-azureCordyline/00-firstScript.sql
+++ b/db/versions/11222-azureCordyline/00-firstScript.sql
@ -0,0 +1 @@
+ALTER TABLE vn.state DROP COLUMN sectorProdPriority;
--- a/db/versions/11225-goldenLaurel/00-firstScript.sql
+++ b/db/versions/11225-goldenLaurel/00-firstScript.sql
@ -0,0 +1 @@
+ALTER TABLE vn.workerDocument CHANGE worker workerFk int(10) unsigned DEFAULT NULL NULL;
--- a/db/versions/11225-goldenLaurel/01-firstScript.sql
+++ b/db/versions/11225-goldenLaurel/01-firstScript.sql
@ -0,0 +1 @@
+ALTER TABLE vn.workerDocument CHANGE document dmsFk int(11) DEFAULT NULL NULL;
--- a/db/versions/11225-goldenLaurel/02-firstScript.sql
+++ b/db/versions/11225-goldenLaurel/02-firstScript.sql
@ -0,0 +1 @@
+RENAME TABLE vn.workerDocument TO vn.workerDms;
--- a/modules/worker/back/methods/worker-dms/filter.js
+++ b/modules/worker/back/methods/worker-dms/filter.js
@ -8,19 +8,19 @@ module.exports = Self => {
        accepts: [
            {
                arg: 'id',
-                type: 'Number',
+                type: 'number',
                description: 'The worker id',
                http: {source: 'path'}
            },
            {
                arg: 'filter',
-                type: 'Object',
+                type: 'object',
                description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
                http: {source: 'query'}
            }
        ],
        returns: {
-            type: ['Object'],
+            type: ['object'],
            root: true
        },
        http: {
@ -36,38 +36,50 @@ module.exports = Self => {

        // Get ids alloweds
        const account = await models.VnUser.findById(userId);
+
        const stmt = new ParameterizedSQL(
            `SELECT d.id, d.id dmsFk
-                FROM workerDocument wd
-                    JOIN dms d ON d.id = wd.document
+                FROM workerDms wd
+                    JOIN dms d ON d.id = wd.dmsFk
                    JOIN dmsType dt ON dt.id = d.dmsTypeFk
-                    LEFT JOIN account.roleRole rr ON rr.inheritsFrom = dt.readRoleFk AND rr.role = ?
+                    LEFT JOIN account.roleRole rr ON rr.inheritsFrom = dt.readRoleFk
+                        AND rr.role = ?
                `, [account.roleFk]
        );
-        const yourOwnDms = {and: [{isReadableByWorker: true}, {worker: userId}]};
-        const where = {
-            or: [yourOwnDms, {
+        const yourOwnDms = {
+            or: [
+                {and: [
+                    {isReadableByWorker: true},
+                    {worker: userId}
+                ]},
+                {
                    role: {
                        neq: null
                    }
                }]
        };
-        stmt.merge(conn.makeSuffix(mergeWhere(filter.where, where)));

-        // Get workerDms alloweds
+        const where = mergeWhere(filter.where, yourOwnDms);
+        stmt.merge(conn.makeSuffix({where}));
        const dmsIds = await conn.executeStmt(stmt);
+
        const allowedIds = dmsIds.map(dms => dms.id);
        const allowedFilter = mergeFilters(filter, {where: {dmsFk: {inq: allowedIds}, workerFk: id}});
-        let workerDms = await models.WorkerDms.find(allowedFilter);

-        // Get docuware info
-        const docuware = await models.Docuware.findOne({
+        const workerDms = await models.WorkerDms.find(allowedFilter);
+
+        const workerDocuware = filter.skip ? [] : await getDocuware(ctx, id);
+        return workerDms.concat(workerDocuware);
+
+        async function getDocuware(ctx, id) {
+            const {dmsTypeFk} = await models.Docuware.findOne({
                fields: ['dmsTypeFk'],
                where: {code: 'hr', action: 'find'}
            });
-        const docuwareDmsType = docuware.dmsTypeFk;
+
+            if (!await models.DmsType.hasReadRole(ctx, dmsTypeFk)) return [];
+
            let workerDocuware = [];
-        if (!filter.skip && (!docuwareDmsType || (docuwareDmsType && await models.DmsType.hasReadRole(ctx, docuwareDmsType)))) {
            const worker = await models.Worker.findById(id, {fields: ['fi', 'firstName', 'lastName']});
            const docuwareParse = {
                'Filename': 'dmsFk',
@ -105,7 +117,7 @@ module.exports = Self => {
                };
                Object.assign(document, defaultData);
            }
+            return workerDocuware;
        }
-        return workerDms.concat(workerDocuware);
    };
 };
--- a/modules/worker/back/models/worker-dms.json
+++ b/modules/worker/back/models/worker-dms.json
@ -6,7 +6,7 @@
    },
    "options": {
        "mysql": {
-            "table": "workerDocument"
+            "table": "workerDms"
        }
    },
    "properties": {
@ -16,17 +16,11 @@
        },
        "dmsFk": {
            "type": "number",
-            "required": true,
-            "mysql": {
-                "columnName": "document"
-            }
+            "required": true
        },
        "workerFk": {
            "type": "number",
-            "required": true,
-            "mysql": {
-                "columnName": "worker"
-            }
+            "required": true
        },
        "isReadableByWorker": {
            "type": "boolean"
--- a/myt.config.yml
+++ b/myt.config.yml
@ -2,6 +2,7 @@ code: vn-database
 versionSchema: util
 replace: true
 sumViews: false
+defaultDefiner: vn@localhost
 mockDate: '2001-01-01 12:00:00'
 subdir: db
 schemas:
@ -375,7 +376,7 @@ localFixtures:
    - workerBosses
    - workerBusinessType
    - workerConfig
-    - workerDocument
+    - workerDms
    - workerLog
    - workerMana
    - workerManaExcluded
--- a/package.json
+++ b/package.json
@ -60,7 +60,7 @@
        "@babel/register": "^7.7.7",
        "@commitlint/cli": "^19.2.1",
        "@commitlint/config-conventional": "^19.1.0",
-        "@verdnatura/myt": "^1.6.9",
+        "@verdnatura/myt": "^1.6.10",
        "angular-mocks": "^1.7.9",
        "babel-jest": "^26.0.1",
        "babel-loader": "^8.2.4",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -143,8 +143,8 @@ devDependencies:
    specifier: ^19.1.0
    version: 19.1.0
  '@verdnatura/myt':
-    specifier: ^1.6.9
-    version: 1.6.9
+    specifier: ^1.6.10
+    version: 1.6.10
  angular-mocks:
    specifier: ^1.7.9
    version: 1.8.3
@ -2846,8 +2846,8 @@ packages:
    dev: false
    optional: true

-  /@verdnatura/myt@1.6.9:
-    resolution: {integrity: sha512-29IauYra9igfdPWwV4+pVV/tBXvIg0fkVHEpSz8Zz3G3lRtzm286FN2Kv6hZkxmD/F1n52O37jN9WLiLHDTW1Q==}
+  /@verdnatura/myt@1.6.10:
+    resolution: {integrity: sha512-fih/TFll5Sn/SxxafUmYh6CW0Qwpck8PpQ63/CKm4ya8rz8gYPq0THM2B5N8yEJ3PiolMg0wrWWas9j+taAh6w==}
    hasBin: true
    dependencies:
      '@sqltools/formatter': 1.2.5
@ -3306,6 +3306,7 @@ packages:

  /are-we-there-yet@1.1.7:
    resolution: {integrity: sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==}
+    deprecated: This package is no longer supported.
    dependencies:
      delegates: 1.0.0
      readable-stream: 2.3.8
@ -6593,6 +6594,7 @@ packages:

  /gauge@2.7.4:
    resolution: {integrity: sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==}
+    deprecated: This package is no longer supported.
    dependencies:
      aproba: 1.2.0
      console-control-strings: 1.1.0
@ -10814,6 +10816,7 @@ packages:

  /npmlog@4.1.2:
    resolution: {integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==}
+    deprecated: This package is no longer supported.
    dependencies:
      are-we-there-yet: 1.1.7
      console-control-strings: 1.1.0
@ -11055,6 +11058,7 @@ packages:

  /osenv@0.1.5:
    resolution: {integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==}
+    deprecated: This package is no longer supported.
    dependencies:
      os-homedir: 1.0.2
      os-tmpdir: 1.0.2
				`@ -0,0 +1 @@`
				`ALTER TABLE vn.state DROP COLUMN sectorProdPriority;`
				`@ -0,0 +1 @@`
				`ALTER TABLE vn.workerDocument CHANGE worker workerFk int(10) unsigned DEFAULT NULL NULL;`
				`@ -0,0 +1 @@`
				`ALTER TABLE vn.workerDocument CHANGE document dmsFk int(11) DEFAULT NULL NULL;`
				`@ -0,0 +1 @@`
				`RENAME TABLE vn.workerDocument TO vn.workerDms;`