From 3cfb8b4730345399d67ac335323ea8517b98da34 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Wed, 10 Jun 2020 12:13:07 +0200
Subject: [PATCH 1/3] 2323 - Filter by myTeam fix

---
 modules/ticket/back/methods/ticket/filter.js | 43 +++++++++-----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index 51979cf11..28de7b8ee 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -100,34 +100,27 @@ module.exports = Self => {
     });
 
     Self.filter = async(ctx, filter) => {
+        const userId = ctx.req.accessToken.userId;
         const conn = Self.dataSource.connector;
+        const models = Self.app.models;
         const args = ctx.args;
 
-        let worker = await Self.app.models.Worker.findOne({
-            where: {userFk: ctx.req.accessToken.userId},
-            include: [
-                {relation: 'collegues'}
-            ]
-        });
-
-        let teamIds = [];
-
-        if (worker.collegues().length && args.myTeam) {
-            worker.collegues().forEach(collegue => {
-                teamIds.push(collegue.collegueFk);
+        // Apply filter by team
+        const teamMembersId = [];
+        if (args.myTeam != null) {
+            const worker = await models.Worker.findById(userId, {
+                include: {
+                    relation: 'collegues'
+                }
             });
-        }
-
-        if (args.mine || (worker.collegues().length === 0 && args.myTeam)) {
-            worker = await Self.app.models.Worker.findOne({
-                fields: ['id'],
-                where: {userFk: ctx.req.accessToken.userId}
+            const collegues = worker.collegues() || [];
+            collegues.forEach(collegue => {
+                teamMembersId.push(collegue.collegueFk);
             });
-            teamIds = [worker && worker.id];
-        }
 
-        if (ctx.args && (args.mine || args.myTeam))
-            args.teamIds = teamIds;
+            if (teamMembersId.length == 0)
+                teamMembersId.push(userId);
+        }
 
         if (ctx.args && args.to) {
             const dateTo = args.to;
@@ -156,7 +149,11 @@ module.exports = Self => {
                 return {'ts.stateFk': value};
             case 'mine':
             case 'myTeam':
-                return {'c.salesPersonFk': {inq: teamIds}};
+                if (value)
+                    return {'c.salesPersonFk': {inq: teamMembersId}};
+                else
+                    return {'c.salesPersonFk': {nin: teamMembersId}};
+
             case 'alertLevel':
                 return {'ts.alertLevel': value};
             case 'pending':

From 461fec7e64999d60d89e9d9d9529ba8e77d36d4d Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Wed, 10 Jun 2020 13:57:08 +0200
Subject: [PATCH 2/3] Updated unit test

---
 .../back/methods/ticket/specs/filter.spec.js   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index faaeb82c0..7f744ba58 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-describe('ticket filter()', () => {
+fdescribe('ticket filter()', () => {
     it('should return the tickets matching the filter', async() => {
         const ctx = {req: {accessToken: {userId: 9}}, args: {}};
         const filter = {order: 'id DESC'};
@@ -71,4 +71,20 @@ describe('ticket filter()', () => {
         expect(secondRow.state).toEqual('Entregado');
         expect(thirdRow.state).toEqual('Entregado');
     });
+
+    it('should return the tickets from the worker team', async() => {
+        const ctx = {req: {accessToken: {userId: 9}}, args: {myTeam: true}};
+        const filter = {};
+        const result = await app.models.Ticket.filter(ctx, filter);
+
+        expect(result.length).toEqual(17);
+    });
+
+    it('should return the tickets that are not from the worker team', async() => {
+        const ctx = {req: {accessToken: {userId: 9}}, args: {myTeam: false}};
+        const filter = {};
+        const result = await app.models.Ticket.filter(ctx, filter);
+
+        expect(result.length).toEqual(7);
+    });
 });

From 5edfc59d97db84adc5f912a0da8af8c186e822cf Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Wed, 10 Jun 2020 13:57:32 +0200
Subject: [PATCH 3/3] Updated unit test

---
 modules/ticket/back/methods/ticket/specs/filter.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index 7f744ba58..56d351f2e 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-fdescribe('ticket filter()', () => {
+describe('ticket filter()', () => {
     it('should return the tickets matching the filter', async() => {
         const ctx = {req: {accessToken: {userId: 9}}, args: {}};
         const filter = {order: 'id DESC'};