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

db/changes/10090-iberflora/00-ACL.sql

@@ -0,0 +1 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Claim', 'updateClaimAction', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant');

db/changes/10090-iberflora/00-claimState.sql

@@ -0,0 +1,2 @@
+UPDATE `vn`.`claimState` SET `roleFk` = '21' WHERE (`id` = '3');
+UPDATE `vn`.`claimState` SET `roleFk` = '21' WHERE (`id` = '5');

e2e/helpers/selectors.js

@@ -309,7 +309,7 @@ export default {
     ticketSummary: {
         header: 'vn-ticket-summary > vn-card > div > h5',
         state: 'vn-ticket-summary vn-label-value[label="State"] > section > span',
-        route: 'vn-ticket-summary vn-label-value[label="Route"] > section > span',
+        route: 'vn-ticket-summary vn-label-value[label="Route"] > section > a',
         total: 'vn-ticket-summary vn-one.taxes > p:nth-child(3) > strong',
         sale: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr',
         firstSaleItemId: 'vn-ticket-summary [name="sales"] vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span',

front/core/components/label-value/label-value.html

@@ -1,6 +1,12 @@
 <section class="ellipsize">
-	<vn-label></vn-label> 
+	<vn-label></vn-label>
-    <span></span>
+	<a
+		ng-show="$ctrl.state"
+		ui-sref="{{$ctrl.state}}($ctrl.stateParams)">
+	</a>
+	<span
+		ng-show="!$ctrl.state">
+	</span>
 	<vn-icon
 		ng-if="$ctrl.hasInfo"
 		vn-tooltip="{{$ctrl.info}}"

front/core/components/label-value/label-value.js

@@ -19,17 +19,24 @@ export default class Controller {
         return this._label;
     }
 
-    set value(value) {
+    get state() {
-        let span = this.element.querySelector('span');
+        return this._state;
-        span.title = value;
+    }
-        span.textContent = value ? value : '-';
+
-        this._value = value;
+    set state(value) {
+        this._state = value;
+        this.applyTextContent();
     }
 
     get value() {
         return this._value;
     }
 
+    set value(value) {
+        this._value = value;
+        this.applyTextContent();
+    }
+
     get title() {
         return this._title;
     }
@@ -39,6 +46,14 @@ export default class Controller {
         span.title = value;
         this._title = value;
     }
+
+    applyTextContent() {
+        const targetElement = this.state ? 'a' : 'span';
+        const element = this.element.querySelector(targetElement);
+        const hasValue = this.value && this.value != '';
+        element.title = this.value;
+        element.textContent = hasValue ? this.value : '-';
+    }
 }
 Controller.$inject = ['$element', '$translate', '$attrs'];
 
@@ -48,6 +63,8 @@ ngModule.component('vnLabelValue', {
     bindings: {
         title: '@?',
         label: '@',
-        value: '@'
+        value: '@',
+        state: '@?',
+        stateParams: '<?'
     }
 });

front/core/components/label-value/label-value.spec.js

@@ -0,0 +1,40 @@
+import './label-value.js';
+import template from './label-value.html';
+
+describe('Component vnInputTime', () => {
+    let $element;
+    let controller;
+
+    beforeEach(angular.mock.module('vnCore', $translateProvider => {
+        $translateProvider.translations('en', {});
+    }));
+
+    beforeEach(angular.mock.inject($componentController => {
+        const $attrs = {};
+        $element = angular.element(`${template}`);
+        controller = $componentController('vnLabelValue', {$element, $attrs});
+    }));
+
+    describe('applyTextContent()', () => {
+        it(`should set the value on the span element as there's no navigation setted`, () => {
+            const value = 'I am the value';
+            controller.value = value;
+            controller.title = value;
+            controller.applyTextContent();
+
+            expect(controller.element.querySelector('span').textContent).toEqual(value);
+            expect(controller.element.querySelector('span').title).toEqual(value);
+        });
+
+        it(`should set the value on the anchor element as there's a navigation setted`, () => {
+            const value = 'I am the value';
+            controller.value = value;
+            controller.title = value;
+            controller.state = 'some.state.to.go';
+            controller.applyTextContent();
+
+            expect(controller.element.querySelector('a').textContent).toEqual(value);
+            expect(controller.element.querySelector('a').title).toEqual(value);
+        });
+    });
+});

modules/claim/back/methods/claim/specs/updateClaim.spec.js

@@ -26,24 +26,21 @@ describe('Update Claim', () => {
         done();
     });
 
-    it('should throw error if isSaleAssistant is false and try to modify a forbidden field', async() => {
+    it(`should throw an error as the user doesn't have rights`, async() => {
-        let params = {
+        const forbiddenState = 3;
-            ticketFk: 3,
+        const salesPersonId = 18;
-            clientFk: 101,
+        let data = {
-            ticketCreated: newDate,
+            claimStateFk: forbiddenState,
-            workerFk: 18,
+            observation: 'valid observation'
-            isChargedToMana: false,
-            responsibility: 3,
-            observation: 'another'
         };
         let ctx = {
             req: {
                 accessToken: {
-                    userId: 18
+                    userId: salesPersonId
                 }
             }
         };
-        await app.models.Claim.updateClaim(ctx, newInstance.id, params)
+        await app.models.Claim.updateClaim(ctx, newInstance.id, data)
             .catch(e => {
                 error = e;
             });
@@ -51,74 +48,47 @@ describe('Update Claim', () => {
         expect(error.message).toEqual(`You don't have enough privileges to change that field`);
     });
 
-    it('should throw error if isSaleAssistant is false and try to modify a valid field but a forbidden stated', async() => {
+    it(`should success to update the claim within privileges `, async() => {
-        let params = {
+        const correctState = 4;
-            ticketFk: 3,
+        const salesPersonId = 18;
-            clientFk: 101,
+        let data = {
-            ticketCreated: newDate,
+            observation: 'valid observation',
-            workerFk: 18,
+            claimStateFk: correctState,
-            claimStateFk: 4,
-            observation: 'another'
         };
         let ctx = {
             req: {
                 accessToken: {
-                    userId: 18
+                    userId: salesPersonId
                 }
             }
         };
-        await app.models.Claim.updateClaim(ctx, newInstance.id, params)
+        await app.models.Claim.updateClaim(ctx, newInstance.id, data);
-            .catch(e => {
-                error = e;
-            });
-
-        expect(error.message).toEqual(`You don't have enough privileges to change that field`);
-    });
-
-    it('should change field observation', async() => {
-        let params = {
-            ticketCreated: newDate,
-            observation: 'another3'
-        };
-        let ctx = {
-            req: {
-                accessToken: {
-                    userId: 18
-                }
-            }
-        };
-        await app.models.Claim.updateClaim(ctx, newInstance.id, params);
 
         let claimUpdated = await app.models.Claim.findById(newInstance.id);
 
-        expect(claimUpdated.observation).toEqual(params.observation);
+        expect(claimUpdated.observation).toEqual(data.observation);
     });
 
-    it('should change sensible fields as salesAssistant', async() => {
+    it('should change some sensible fields as salesAssistant', async() => {
-        let params = {
+        const salesAssistantId = 21;
-            ticketFk: 3,
+        let data = {
-            clientFk: 101,
-            ticketCreated: newDate,
-            workerFk: 18,
             claimStateFk: 3,
-            isChargedToMana: true,
+            workerFk: 5,
-            responsibility: 3,
+            observation: 'another valid observation'
-            observation: 'another'
         };
         let ctx = {
             req: {
                 accessToken: {
-                    userId: 21
+                    userId: salesAssistantId
                 }
             }
         };
-        await app.models.Claim.updateClaim(ctx, newInstance.id, params);
+        await app.models.Claim.updateClaim(ctx, newInstance.id, data);
 
         let claimUpdated = await app.models.Claim.findById(newInstance.id);
 
-        expect(claimUpdated.observation).toEqual(params.observation);
+        expect(claimUpdated.observation).toEqual(data.observation);
-        expect(claimUpdated.claimStateFk).toEqual(params.claimStateFk);
+        expect(claimUpdated.claimStateFk).toEqual(data.claimStateFk);
-        expect(claimUpdated.responsibility).toEqual(params.responsibility);
+        expect(claimUpdated.workerFk).toEqual(data.workerFk);
-        expect(claimUpdated.isChargedToMana).toEqual(params.isChargedToMana);
     });
 });

modules/claim/back/methods/claim/specs/updateClaimAction.spec.js

@@ -0,0 +1,43 @@
+const app = require('vn-loopback/server/server');
+
+describe('Update Claim', () => {
+    let newDate = new Date();
+    let newInstance;
+    let original = {
+        ticketFk: 3,
+        clientFk: 101,
+        ticketCreated: newDate,
+        workerFk: 18,
+        claimStateFk: 2,
+        isChargedToMana: true,
+        responsibility: 4,
+        observation: 'observation'
+    };
+
+    beforeAll(async done => {
+        newInstance = await app.models.Claim.create(original);
+
+        done();
+    });
+
+    afterAll(async done => {
+        await app.models.Claim.destroyById(newInstance.id);
+        done();
+    });
+
+    it('should update the claim isChargedToMana attribute', async() => {
+        const data = {isChargedToMana: false};
+        const result = await app.models.Claim.updateClaimAction(newInstance.id, data);
+
+        expect(result.id).toEqual(newInstance.id);
+        expect(result.isChargedToMana).toBeFalsy();
+    });
+
+    it('should update the claim responsibility attribute', async() => {
+        const data = {responsibility: 2};
+        const result = await app.models.Claim.updateClaimAction(newInstance.id, data);
+
+        expect(result.id).toEqual(newInstance.id);
+        expect(result.responsibility).toEqual(2);
+    });
+});

modules/claim/back/methods/claim/updateClaim.js

@@ -1,26 +1,23 @@
 const UserError = require('vn-loopback/util/user-error');
-let pick = require('object.pick');
-let diff = require('object-diff');
-
 module.exports = Self => {
     Self.remoteMethodCtx('updateClaim', {
         description: 'Update a claim with privileges',
         accessType: 'WRITE',
         accepts: [{
             arg: 'id',
-            type: 'string',
+            type: 'number',
             required: true,
-            description: 'Client id',
+            description: 'Claim id',
             http: {source: 'path'}
         }, {
-            arg: 'params',
+            arg: 'data',
             type: 'object',
             required: true,
-            description: 'ticketFk, stateFk',
+            description: 'Data to update on the model',
             http: {source: 'body'}
         }],
         returns: {
-            type: 'string',
+            type: 'object',
             root: true
         },
         http: {
@@ -29,28 +26,31 @@ module.exports = Self => {
         }
     });
 
-    Self.updateClaim = async(ctx, id, params) => {
+    Self.updateClaim = async(ctx, id, data) => {
         let models = Self.app.models;
-        let isSalesAssistant;
+        let claim = await models.Claim.findById(id);
-        let currentUserId = ctx.req.accessToken.userId;
 
-        isSalesAssistant = await models.Account.hasRole(currentUserId, 'salesAssistant');
+        let canUpdate = await canChangeState(ctx, claim.claimStateFk);
+        let hasRights = await canChangeState(ctx, data.claimStateFk);
 
-        if (!isSalesAssistant) {
+        if (!canUpdate || !hasRights)
-            let oldClaim = await models.Claim.findById(id);
+            throw new UserError(`You don't have enough privileges to change that field`);
-            let notModifiable = ['id', 'responsibility', 'isChargedToMana'];
-            let changedFields = diff(oldClaim, params);
-            let changedFieldsPicked = pick(changedFields, notModifiable);
-            let statesViables = ['Gestionado', 'Pendiente', 'Anulado', 'Mana'];
-            let oldState = await models.ClaimState.findOne({where: {id: oldClaim.claimStateFk}});
-            let newState = await models.ClaimState.findOne({where: {id: params.claimStateFk}});
-            let canChangeState = statesViables.includes(oldState.description)
-                && statesViables.includes(newState.description);
-            if (Object.keys(changedFieldsPicked).length != 0 || !canChangeState)
-                throw new UserError(`You don't have enough privileges to change that field`);
-        }
 
-        let claim = await Self.findById(id);
+        return await claim.updateAttributes(data);
-        return await claim.updateAttributes(params);
     };
+
+    async function canChangeState(ctx, id) {
+        let models = Self.app.models;
+        let userId = ctx.req.accessToken.userId;
+
+        let state = await models.ClaimState.findById(id, {
+            include: {
+                relation: 'writeRole'
+            }
+        });
+        let stateRole = state.writeRole().name;
+        let canUpdate = await models.Account.hasRole(userId, stateRole);
+
+        return canUpdate;
+    }
 };

modules/claim/back/methods/claim/updateClaimAction.js

@@ -0,0 +1,43 @@
+
+module.exports = Self => {
+    Self.remoteMethod('updateClaimAction', {
+        description: 'Update a claim with privileges',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'Claim id',
+            http: {source: 'path'}
+        }, {
+            arg: 'data',
+            type: 'object',
+            required: true,
+            description: 'Data to update on the model',
+            http: {source: 'body'}
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/:id/updateClaimAction`,
+            verb: 'post'
+        }
+    });
+
+    Self.updateClaimAction = async(id, data) => {
+        let models = Self.app.models;
+
+        let claim = await models.Claim.findById(id);
+        let updatedData = {};
+
+        if (data.hasOwnProperty('responsibility'))
+            updatedData.responsibility = data.responsibility;
+
+        if (data.hasOwnProperty('isChargedToMana'))
+            updatedData.isChargedToMana = data.isChargedToMana;
+
+        return await claim.updateAttributes(updatedData);
+    };
+};

modules/claim/back/models/claim-state.json

@@ -18,7 +18,7 @@
         }
     },
     "relations": {
-    	"role": {
+    	"writeRole": {
       		"type": "belongsTo",
       		"model": "Role",
       		"foreignKey": "roleFk"

modules/claim/back/models/claim.js

@@ -5,4 +5,5 @@ module.exports = Self => {
     require('../methods/claim/updateClaim')(Self);
     require('../methods/claim/regularizeClaim')(Self);
     require('../methods/claim/uploadFile')(Self);
+    require('../methods/claim/updateClaimAction')(Self);
 };

modules/claim/front/action/index.js

@@ -167,14 +167,14 @@ class Controller {
     }
 
     saveResponsibility(value) {
-        let query = `/api/Claims/${this.$stateParams.id}/updateClaim`;
+        let query = `/api/Claims/${this.$stateParams.id}/updateClaimAction`;
 
         this.$http.post(query, {responsibility: value}).then(() => {
             this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
         });
     }
     saveMana(value) {
-        let query = `/api/Claims/${this.$stateParams.id}/updateClaim`;
+        let query = `/api/Claims/${this.$stateParams.id}/updateClaimAction`;
 
         this.$http.post(query, {isChargedToMana: value}).then(() => {
             this.vnApp.showSuccess(this.$translate.instant('Data saved!'));

modules/ticket/back/methods/sale/specs/updateConcept.spec.js

@@ -0,0 +1,39 @@
+const app = require('vn-loopback/server/server');
+
+describe('sale updateConcept()', () => {
+    const saleId = 1;
+    let originalSale;
+
+    beforeAll(async done => {
+        originalSale = await app.models.Sale.findById(saleId);
+
+        done();
+    });
+
+    afterAll(async done => {
+        await originalSale.save();
+
+        done();
+    });
+
+
+    it('should throw if ID was undefined', async() => {
+        const newConcept = 'I am he new concept';
+
+        await app.models.Sale.updateConcept(undefined, newConcept)
+            .catch(response => {
+                expect(response).toEqual(new Error(`Model::findById requiere el argumento id`));
+                error = response;
+            });
+
+        expect(error).toBeDefined();
+    });
+
+    it('should update the sale concept', async() => {
+        const newConcept = 'I am the new concept';
+
+        let response = await app.models.Sale.updateConcept(saleId, newConcept);
+
+        expect(response.concept).toEqual(newConcept);
+    });
+});

modules/ticket/back/methods/sale/updateConcept.js

@@ -25,7 +25,7 @@ module.exports = Self => {
     });
 
     Self.updateConcept = async(id, newConcept) => {
-        let currentLine = await Self.app.models.Sale.findOne({where: {id: id}});
+        let currentLine = await Self.app.models.Sale.findById(id);
 
         return await currentLine.updateAttributes({concept: newConcept});
     };

modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js

@@ -17,7 +17,7 @@ describe('ticket changeState()', () => {
         done();
     });
 
-    it('should throw an error if the ticket is not editable and the user isnt production', async() => {
+    it('should throw if the ticket is not editable and the user isnt production', async() => {
         let ctx = {req: {accessToken: {userId: 18}}};
         let params = {ticketFk: 2, stateFk: 3};
 

modules/ticket/back/methods/ticket/specs/transferSales.spec.js

@@ -8,11 +8,11 @@ describe('sale transferSales()', () => {
         done();
     });
 
-    it('should throw an error if the ticket is not editable', async() => {
+    it('should throw an error as the ticket is not editable', async() => {
         const ctx = {req: {accessToken: {userId: 101}}};
         let error;
 
-        const currentTicketId = 10;
+        const currentTicketId = 1;
         const receiverTicketId = undefined;
         const sales = [];
 

modules/ticket/back/methods/ticket/specs/updateEditableTicket.spec.js

@@ -13,7 +13,7 @@ describe('ticket updateEditableTicket()', () => {
         done();
     });
 
-    it('should throw an error if the ticket is not editable', async() => {
+    it('should now throw an error if the ticket is not editable', async() => {
         let error;
         let ctx = {req: {accessToken: {userId: 9}}};
 

modules/ticket/front/summary/index.html

@@ -36,7 +36,9 @@
                 value="{{$ctrl.summary.landed | dateTime: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Route" 
-                value="{{$ctrl.summary.routeFk}}">
+                value="{{$ctrl.summary.routeFk}}"
+                state="route.card.summary"
+                state-params="{id: $ctrl.summary.routeFk}">
             </vn-label-value>
             <vn-label-value label="Address" 
                 value="{{$ctrl.formattedAddress}}">