Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

back/methods/collection/getTickets.js

@@ -62,7 +62,8 @@ module.exports = Self => {
                     p.code parkingCodePrevia,
                     p.pickingOrder pickingOrderPrevia,
                     iss.id itemShelvingSaleFk,
-                    iss.isPicked
+                    iss.isPicked,
+                    iss.itemShelvingFk
                 FROM ticketCollection tc
                     LEFT JOIN collection c ON c.id = tc.collectionFk
                     JOIN sale s ON s.ticketFk = tc.ticketFk
@@ -102,7 +103,8 @@ module.exports = Self => {
                 p.code,
                 p.pickingOrder,
                 iss.id itemShelvingSaleFk,
-                iss.isPicked
+                iss.isPicked,
+                iss.itemShelvingFk
             FROM sectorCollection sc
                 JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk  = sc.id 
                 JOIN saleGroup sg ON sg.id = ss.saleGroupFk

back/methods/docuware/core.js

@@ -4,21 +4,45 @@ module.exports = Self => {
     /**
      * Returns basic headers
      *
-     * @param {string} cookie - The docuware cookie
      * @return {object} - The headers
      */
     Self.getOptions = async() => {
         const docuwareConfig = await Self.app.models.DocuwareConfig.findOne();
+        const now = Date.vnNow();
+        let {url, username, password, token, expired} = docuwareConfig;
+
+        if (process.env.NODE_ENV && (!expired || expired < now + 60)) {
+            const {data: {IdentityServiceUrl}} = await axios.get(`${url}/Home/IdentityServiceInfo`);
+            const {data: {token_endpoint}} = await axios.get(`${IdentityServiceUrl}/.well-known/openid-configuration`);
+            const {data} = await axios.post(token_endpoint, {
+                grant_type: 'password',
+                scope: 'docuware.platform',
+                client_id: 'docuware.platform.net.client',
+                username,
+                password
+            }, {headers: {
+                'Accept': 'application/json',
+                'Content-Type': 'application/x-www-form-urlencoded'
+            }});
+
+            const newToken = data.access_token;
+            token = data.token_type + ' ' + newToken;
+            await docuwareConfig.updateAttributes({
+                token,
+                expired: now + data.expires_in
+            });
+        }
+
         const headers = {
             headers: {
                 'Accept': 'application/json',
                 'Content-Type': 'application/json',
-                'Cookie': docuwareConfig.cookie
+                'Authorization': token
             }
         };
 
         return {
-            url: docuwareConfig.url,
+            url,
             headers
         };
     };

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

@@ -2,87 +2,54 @@ const axios = require('axios');
 const models = require('vn-loopback/server/server').models;
 
 describe('Docuware core', () => {
-    beforeAll(() => {
+    const fileCabinetCode = 'deliveryNote';
+    beforeAll(async() => {
         process.env.NODE_ENV = 'testing';
-    });
 
-    afterAll(() => {
+        const docuwareInfo = await models.Docuware.findOne({
-        delete process.env.NODE_ENV;
+            where: {
-    });
+                code: fileCabinetCode
-
+            }
-    describe('getOptions()', () => {
-        it('should return url and headers', async() => {
-            const result = await models.Docuware.getOptions();
-
-            expect(result.url).toBeDefined();
-            expect(result.headers).toBeDefined();
         });
-    });
 
-    describe('getDialog()', () => {
+        spyOn(axios, 'get').and.callFake(url => {
-        it('should return dialogId', async() => {
+            if (url.includes('IdentityServiceInfo')) return {data: {IdentityServiceUrl: 'IdentityServiceUrl'}};
-            const dialogs = {
+            if (url.includes('IdentityServiceUrl')) return {data: {token_endpoint: 'token_endpoint'}};
-                data: {
+            if (url.includes('dialogs')) {
-                    Dialog: [
+                return {
-                        {
+                    data: {
-                            DisplayName: 'find',
+                        Dialog: [
-                            Id: 'getDialogTest'
+                            {
-                        }
+                                DisplayName: 'find',
-                    ]
+                                Id: 'getDialogTest'
-                }
+                            }
-            };
+                        ]
-            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
+                    }
-            const result = await models.Docuware.getDialog('deliveryNote', 'find', 'randomFileCabinetId');
+                };
+            }
 
-            expect(result).toEqual('getDialogTest');
+            if (url.includes('FileCabinets')) {
-        });
+                return {data: {
-    });
-
-    describe('getFileCabinet()', () => {
-        it('should return fileCabinetId', async() => {
-            const code = 'deliveryNote';
-            const docuwareInfo = await models.Docuware.findOne({
-                where: {
-                    code
-                }
-            });
-            const dialogs = {
-                data: {
                     FileCabinet: [
                         {
                             Name: docuwareInfo.fileCabinetName,
                             Id: 'getFileCabinetTest'
                         }
                     ]
-                }
+                }};
-            };
+            }
-            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
-            const result = await models.Docuware.getFileCabinet(code);
-
-            expect(result).toEqual('getFileCabinetTest');
-        });
-    });
-
-    describe('get()', () => {
-        it('should return data without parse', async() => {
-            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-            const data = {
-                data: {
-                    id: 1
-                }
-            };
-            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
-            const result = await models.Docuware.get('deliveryNote');
-
-            expect(result.id).toEqual(1);
         });
 
-        it('should return data with parse', async() => {
+        spyOn(axios, 'post').and.callFake(url => {
-            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            if (url.includes('token_endpoint')) {
-            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+                return {data: {
-            const data = {
+                    access_token: 'access_token',
-                data: {
+                    token_type: 'bearer',
+                    expires_in: 10000
+                }};
+            }
+            if (url.includes('DialogExpression')) {
+                return {data: {
                     Items: [{
                         Fields: [
                             {
@@ -103,12 +70,52 @@ describe('Docuware core', () => {
                         ]
                     }]
                 }
-            };
+                };
+            }
+        });
+    });
+
+    afterAll(() => {
+        delete process.env.NODE_ENV;
+    });
+
+    describe('getOptions()', () => {
+        it('should return url and headers', async() => {
+            const result = await models.Docuware.getOptions();
+
+            expect(result.url).toBeDefined();
+            expect(result.headers).toBeDefined();
+        });
+    });
+
+    describe('Dialog()', () => {
+        it('should return dialogId', async() => {
+            const result = await models.Docuware.getDialog('deliveryNote', 'find', 'randomFileCabinetId');
+
+            expect(result).toEqual('getDialogTest');
+        });
+    });
+
+    describe('getFileCabinet()', () => {
+        it('should return fileCabinetId', async() => {
+            const result = await models.Docuware.getFileCabinet(fileCabinetCode);
+
+            expect(result).toEqual('getFileCabinetTest');
+        });
+    });
+
+    describe('get()', () => {
+        it('should return data without parse', async() => {
+            const [result] = await models.Docuware.get('deliveryNote');
+
+            expect(result.firstRequiredField).toEqual(1);
+        });
+
+        it('should return data with parse', async() => {
             const parse = {
                 'firstRequiredField': 'id',
                 'secondRequiredField': 'name',
             };
-            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
             const [result] = await models.Docuware.get('deliveryNote', null, parse);
 
             expect(result.id).toEqual(1);
@@ -119,17 +126,14 @@ describe('Docuware core', () => {
 
     describe('getById()', () => {
         it('should return data', async() => {
-            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            spyOn(models.Docuware, 'get');
-            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            await models.Docuware.getById('deliveryNote', 1);
-            const data = {
-                data: {
-                    id: 1
-                }
-            };
-            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
-            const result = await models.Docuware.getById('deliveryNote', 1);
 
-            expect(result.id).toEqual(1);
+            expect(models.Docuware.get).toHaveBeenCalledWith(
+                'deliveryNote',
+                {condition: [Object({DBName: 'N__ALBAR_N', Value: [1]})]},
+                undefined
+            );
         });
     });
 });

back/methods/docuware/upload.js

@@ -143,7 +143,7 @@ module.exports = Self => {
                 headers: {
                     'Content-Type': 'multipart/form-data',
                     'X-File-ModifiedDate': Date.vnNew(),
-                    'Cookie': docuwareOptions.headers.headers.Cookie,
+                    'Authorization': docuwareOptions.headers.headers.Authorization,
                     ...data.getHeaders()
                 },
             };

back/models/docuware-config.json

@@ -16,17 +16,17 @@
         "url": {
             "type": "string"
         },
-        "cookie": {
+        "token": {
             "type": "string"
+        },
+        "username": {
+            "type": "string"
+        },
+        "password": {
+            "type": "string"
+        },
+        "expired":{
+            "type": "number"
         }
-    },
+    }
-    "acls": [
-        {
-            "property": "*",
-            "accessType": "*",
-            "principalType": "ROLE",
-            "principalId": "$everyone",
-            "permission": "ALLOW"
-	    }
-    ]
 }

db/routines/vn/procedures/saleTracking_sectorCollectionAddPrevOK.sql

@@ -0,0 +1,20 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`saleTracking_sectorCollectionAddPrevOK`(
+	vSectorCollectionFk INT
+)
+BEGIN
+/**
+ * Inserta los registros de sectorCollection con el estado PREVIA OK si la reserva está picked
+ *
+ * @param vSectorCollectionFk Identificador de vn.sectorCollection
+ */
+	REPLACE saleTracking(saleFk, isChecked, workerFk, stateFk)
+		SELECT sgd.saleFk, TRUE, sc.userFk, s.id
+			FROM sectorCollection sc
+				JOIN sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
+				JOIN saleGroupDetail sgd ON sgd.saleGroupFk = scsg.saleGroupFk
+				JOIN state s ON s.code = 'OK PREVIOUS'
+				JOIN itemShelvingSale iss ON iss.saleFk = sgd.saleFk
+			WHERE sc.id = vSectorCollectionFk AND iss.isPicked;
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemShelvingSale_afterInsert.sql

@@ -3,10 +3,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelvingSale_afterI
 	AFTER INSERT ON `itemShelvingSale`
 	FOR EACH ROW
 BEGIN 	
-	
 	UPDATE sale s
 			JOIN operator o ON o.workerFk = account.myUser_getId()
-		SET s.isPicked = IF(o.isOnReservationMode, s.isPicked, TRUE)		
+			JOIN sector se ON se.id = o.sectorFk
-		WHERE id = NEW.saleFk;
+		SET s.isPicked = IF(IFNULL(se.isOnReservationMode, o.isOnReservationMode), s.isPicked, TRUE)
+		WHERE s.id = NEW.saleFk;
 END$$
 DELIMITER ;

db/versions/11291-purpleChico/00-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS username varchar(100) NULL;
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS password varchar(100) NULL;
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS token text NULL;
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS expired int(11) NULL;