Merge pull request 'refs #5925 models table docuware' (!1889) from 5925-docuwareTablet into dev

Reviewed-on: #1889
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

.vscode/settings.json

@@ -3,7 +3,7 @@
     // Carácter predeterminado de final de línea.
     "files.eol": "\n",
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
     "search.useIgnoreFiles": false,
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",

back/methods/docuware/specs/upload.spec.js

@@ -24,15 +24,40 @@ describe('docuware upload()', () => {
     });
 
     it('should try upload file', async() => {
+        const tx = await models.Docuware.beginTransaction({});
         spyOn(ticketModel, 'deliveryNotePdf').and.returnValue(new Promise(resolve => resolve({})));
 
         let error;
         try {
-            await models.Docuware.upload(ctx, ticketIds, fileCabinetName);
+            const options = {transaction: tx};
+            const user = await models.UserConfig.findById(userId, null, options);
+            await user.updateAttribute('tabletFk', 'Tablet1');
+            await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
+
+            await tx.rollback();
         } catch (e) {
-            error = e.message;
+            error = e;
+            await tx.rollback();
         }
 
-        expect(error).toEqual('Action not allowed on the test environment');
+        expect(error.message).toEqual('Action not allowed on the test environment');
+    });
+
+    it('should throw error when not have tablet assigned', async() => {
+        const tx = await models.Docuware.beginTransaction({});
+        spyOn(ticketModel, 'deliveryNotePdf').and.returnValue(new Promise(resolve => resolve({})));
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('This user does not have an assigned tablet');
     });
 });

back/methods/docuware/upload.js

@@ -29,12 +29,24 @@ module.exports = Self => {
         }
     });
 
-    Self.upload = async function(ctx, ticketIds, fileCabinet) {
+    Self.upload = async function(ctx, ticketIds, fileCabinet, options) {
         delete ctx.args.ticketIds;
         const models = Self.app.models;
         const action = 'store';
 
-        const options = await Self.getOptions();
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const userConfig = await models.UserConfig.findById(ctx.req.accessToken.userId, {
+            fields: ['tabletFk']
+        }, myOptions);
+
+        if (!userConfig?.tabletFk)
+            throw new UserError('This user does not have an assigned tablet');
+
+        const docuwareOptions = await Self.getOptions();
         const fileCabinetId = await Self.getFileCabinet(fileCabinet);
         const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId);
 
@@ -45,7 +57,7 @@ module.exports = Self => {
             const deliveryNote = await models.Ticket.deliveryNotePdf(ctx, {
                 id,
                 type: 'deliveryNote'
-            });
+            }, myOptions);
             // get ticket data
             const ticket = await models.Ticket.findById(id, {
                 include: [{
@@ -54,7 +66,7 @@ module.exports = Self => {
                         fields: ['id', 'name', 'fi']
                     }
                 }]
-            });
+            }, myOptions);
 
             // upload file
             const templateJson = {
@@ -102,7 +114,7 @@ module.exports = Self => {
                     {
                         'FieldName': 'FILTRO_TABLET',
                         'ItemElementName': 'string',
-                        'Item': 'Tablet1',
+                        'Item': userConfig.tabletFk,
                     }
                 ]
             };
@@ -116,11 +128,11 @@ module.exports = Self => {
                 const deleteJson = {
                     'Field': [{'FieldName': 'ESTADO', 'Item': 'Pendiente eliminar', 'ItemElementName': 'String'}]
                 };
-                const deleteUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
-                await axios.put(deleteUri, deleteJson, options.headers);
+                const deleteUri = `${docuwareOptions.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
+                await axios.put(deleteUri, deleteJson, docuwareOptions.headers);
             }
 
-            const uploadUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
+            const uploadUri = `${docuwareOptions.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
             const FormData = require('form-data');
             const data = new FormData();
 
@@ -130,7 +142,7 @@ module.exports = Self => {
                 headers: {
                     'Content-Type': 'multipart/form-data',
                     'X-File-ModifiedDate': Date.vnNew(),
-                    'Cookie': options.headers.headers.Cookie,
+                    'Cookie': docuwareOptions.headers.headers.Cookie,
                     ...data.getHeaders()
                 },
             };
@@ -141,11 +153,11 @@ module.exports = Self => {
                 const $t = ctx.req.__;
                 const message = $t('Failed to upload delivery note', {id});
                 if (uploaded.length)
-                    await models.TicketTracking.setDelivered(ctx, uploaded);
+                    await models.TicketTracking.setDelivered(ctx, uploaded, myOptions);
                 throw new UserError(message);
             }
             uploaded.push(id);
         }
-        return models.TicketTracking.setDelivered(ctx, ticketIds);
+        return models.TicketTracking.setDelivered(ctx, ticketIds, myOptions);
     };
 };

back/models/docuwareTablet.json

@@ -0,0 +1,17 @@
+{
+	"name": "docuwareTablet",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "docuwareTablet"
+		}
+	},
+	"properties": {
+        "tablet": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        }
+    }
+}

back/models/user-config.json

@@ -26,6 +26,9 @@
         },
         "darkMode": {
             "type": "boolean"
+        },
+        "tabletFk": {
+            "type": "string"
         }
     },
     "relations": {
@@ -43,6 +46,11 @@
             "type": "belongsTo",
             "model": "VnUser",
             "foreignKey": "userFk"
-          }
+        },
+        "Tablet": {
+            "type": "belongsTo",
+            "model": "docuwareTablet",
+            "foreignKey": "tabletFk"
+        }
     }
 }

db/changes/240201/00-tabletDocuware.sql

@@ -0,0 +1,10 @@
+-- vn.docuwareTablet definition
+
+CREATE TABLE `vn`.`docuwareTablet` (
+  `tablet` varchar(100) NOT NULL PRIMARY KEY,
+  `description` varchar(255) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE `vn`.`userConfig`
+ADD COLUMN tabletFk varchar(100) DEFAULT NULL,
+ADD FOREIGN KEY (tabletFk) REFERENCES `vn`.`docuwareTablet`(tablet);

db/dump/fixtures.sql

@@ -3009,3 +3009,8 @@ INSERT INTO `vn`.`invoiceCorrectionType` (`id`, `description`)
         (1, 'Error in VAT calculation'),
         (2, 'Error in sales details'),
         (3, 'Error in customer data');
+
+INSERT INTO `vn`.`docuwareTablet` (`tablet`,`description`)
+	VALUES
+        ('Tablet1','Jarvis tablet'),
+	    ('Tablet2','Avengers tablet');

loopback/locale/es.json

@@ -329,5 +329,6 @@
 	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
-	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}"
+	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
+    "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada"
 }