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

back/methods/chat/notifyIssues.js

@@ -0,0 +1,39 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('notifyIssues', {
+        description: 'Notifies new urgent issues',
+        accessType: 'READ',
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: `/notifyIssues`,
+            verb: 'GET'
+        }
+    });
+
+    Self.notifyIssues = async ctx => {
+        const models = Self.app.models;
+        const $t = ctx.req.__; // $translate
+        const [urgentIssue] = await Self.rawSql(`
+            SELECT * FROM managedesktop.vn_workOrderInmediata LIMIT 1
+        `);
+
+        if (!urgentIssue) return;
+
+        const message = $t(`There's a new urgent ticket`, {
+            title: urgentIssue.title,
+            issueId: urgentIssue.workOrderId
+        });
+
+        const department = await models.Department.findOne({
+            where: {code: 'IT'}
+        });
+        const channelName = department && department.chatName;
+
+        if (channelName)
+            return Self.send(ctx, `#${channelName}`, `@all ➔ ${message}`);
+
+        return;
+    };
+};

back/methods/chat/spec/notifyIssue.spec.js

@@ -0,0 +1,38 @@
+const app = require('vn-loopback/server/server');
+
+describe('Chat notifyIssue()', () => {
+    const ctx = {req: {accessToken: {userId: 1}}};
+    ctx.req.__ = value => {
+        return value;
+    };
+    const chatModel = app.models.Chat;
+    const departmentId = 31;
+
+    it(`should not call to the send() method and neither return a response`, async() => {
+        spyOn(chatModel, 'send').and.callThrough();
+        spyOn(chatModel, 'rawSql').and.returnValue([]);
+
+        const response = await chatModel.notifyIssues(ctx);
+
+        expect(chatModel.send).not.toHaveBeenCalled();
+        expect(response).toBeUndefined();
+    });
+
+    it(`should return a response calling the send() method`, async() => {
+        spyOn(chatModel, 'send').and.callThrough();
+        spyOn(chatModel, 'rawSql').and.returnValue([{title: 'Issue title'}]);
+
+        const department = await app.models.Department.findById(departmentId);
+        let orgChatName = department.chatName;
+        await department.updateAttribute('chatName', 'IT');
+
+        const response = await chatModel.notifyIssues(ctx);
+
+        expect(response.statusCode).toEqual(200);
+        expect(response.message).toEqual('Fake notification sent');
+        expect(chatModel.send).toHaveBeenCalledWith(ctx, '#IT', `@all ➔ There's a new urgent ticket`);
+
+        // restores
+        await department.updateAttribute('chatName', orgChatName);
+    });
+});

back/methods/chat/spec/send.spec.js

@@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-describe('chat send()', () => {
+describe('Chat send()', () => {
     it('should return a "Fake notification sent" as response', async() => {
         let ctx = {req: {accessToken: {userId: 1}}};
         let response = await app.models.Chat.send(ctx, '@salesPerson', 'I changed something');

back/methods/chat/spec/sendCheckingPresence.spec.js

@@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-describe('chat sendCheckingPresence()', () => {
+describe('Chat sendCheckingPresence()', () => {
     const today = new Date();
     today.setHours(6, 0);
     const ctx = {req: {accessToken: {userId: 1}}};

back/models/chat.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
     require('../methods/chat/send')(Self);
     require('../methods/chat/sendCheckingPresence')(Self);
+    require('../methods/chat/notifyIssues')(Self);
 };

db/changes/10280-valentineDay/00-department.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `vn`.`department`
+	ADD code VARCHAR(45) NULL AFTER id;
+
+UPDATE `vn`.`department` t SET t.code = 'IT', t.chatName = 'informatica-cau' WHERE t.id = 31;

loopback/locale/en.json

@@ -90,5 +90,6 @@
 	"A travel with this data already exists": "A travel with this data already exists",
 	"The observation type can't be repeated": "The observation type can't be repeated",
 	"New ticket request has been created with price": "New ticket request has been created '{{description}}' for day <strong>{{shipped}}</strong>, with a quantity of <strong>{{quantity}}</strong> and a price of <strong>{{price}} €</strong>",
-	"New ticket request has been created": "New ticket request has been created '{{description}}' for day <strong>{{shipped}}</strong>, with a quantity of <strong>{{quantity}}</strong>"
+	"New ticket request has been created": "New ticket request has been created '{{description}}' for day <strong>{{shipped}}</strong>, with a quantity of <strong>{{quantity}}</strong>",
+	"There's a new urgent ticket": "There's a new urgent ticket: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})"
 }

loopback/locale/es.json

@@ -170,5 +170,6 @@
 	"Invalid account": "Cuenta inválida",
 	"New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día <strong>{{shipped}}</strong>, con una cantidad de <strong>{{quantity}}</strong> y un precio de <strong>{{price}} €</strong>",
 	"New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día <strong>{{shipped}}</strong>, con una cantidad de <strong>{{quantity}}</strong>",
-	"That item doesn't exists": "Ese artículo no existe"
+	"That item doesn't exists": "Ese artículo no existe",
+	"There's a new urgent ticket": "Hay un nuevo ticket urgente: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})"
 }

modules/claim/front/detail/index.js

@@ -86,16 +86,15 @@ class Controller extends Section {
         });
     }
 
-    showDeleteConfirm(index) {
+    showDeleteConfirm($index) {
-        this.sale = this.salesClaimed[index];
+        this.claimedIndex = $index;
         this.$.confirm.show();
     }
 
     deleteClaimedSale() {
-        let query = `ClaimBeginnings/${this.sale.id}`;
+        this.$.model.remove(this.claimedIndex);
-        this.$http.delete(query).then(() => {
+        this.$.model.save().then(() => {
             this.vnApp.showSuccess(this.$t('Data saved!'));
-            this.$.model.remove(this.sale);
             this.calculateTotals();
         });
     }

modules/claim/front/detail/index.spec.js

@@ -73,13 +73,16 @@ describe('claim', () => {
 
         describe('deleteClaimedSale()', () => {
             it('should make a delete and call refresh and showSuccess', () => {
-                controller.sale = {id: 1};
+                const claimedIndex = 1;
+                controller.claimedIndex = claimedIndex;
                 jest.spyOn(controller.$.model, 'remove');
+                jest.spyOn(controller.$.model, 'save');
                 jest.spyOn(controller.vnApp, 'showSuccess');
-                $httpBackend.expectDELETE(`ClaimBeginnings/1`).respond('ok');
-                controller.deleteClaimedSale();
-                $httpBackend.flush();
 
+                controller.deleteClaimedSale();
+
+                expect(controller.$.model.remove).toHaveBeenCalledWith(claimedIndex);
+                expect(controller.$.model.save).toHaveBeenCalledWith();
                 expect(controller.vnApp.showSuccess).toHaveBeenCalled();
             });
         });

modules/worker/back/models/department.json

@@ -9,28 +9,31 @@
     "properties": {
         "id": {
             "id": true,
-            "type": "Number"
+            "type": "number"
+        },
+        "code": {
+            "type": "string"
         },
         "name": {
-            "type": "String"
+            "type": "string"
         },
         "parentFk": {
-            "type": "Number"
+            "type": "number"
         },
         "lft": {
-            "type": "Number"
+            "type": "number"
         },
         "rgt": {
-            "type": "Number"
+            "type": "number"
         },
         "sons": {
-            "type": "Number"
+            "type": "number"
         },
         "chatName": {
-            "type": "String"
+            "type": "string"
         },
         "notificationEmail": {
-            "type": "String"
+            "type": "string"
         }
     }
 }