From 4ee6a46bd567cfbc7660d78daae1b88af76fce6a Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 14 Oct 2024 11:29:49 +0200
Subject: [PATCH 1/3] feat: added new filter param

---
 .../back/methods/ticket-request/filter.js     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index 5364cef9a..ad000036b 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -59,6 +59,11 @@ module.exports = Self => {
                 arg: 'state',
                 type: 'string',
                 description: `Search request by request state`
+            },
+            {
+                arg: 'myTeam',
+                type: 'boolean',
+                description: `Team partners`
             }
         ],
         returns: {
@@ -75,6 +80,24 @@ module.exports = Self => {
         const conn = Self.dataSource.connector;
         const userId = ctx.req.accessToken.userId;
         const myOptions = {};
+        const models = Self.app.models;
+        const args = ctx.args;
+
+        // Apply filter by team
+        const teamMembersId = [];
+        if (args.myTeam != null) {
+            const worker = await models.Worker.findById(userId, {
+                include: {
+                    relation: 'collegues'
+                }
+            }, myOptions);
+            const collegues = worker.collegues() || [];
+            for (let collegue of collegues)
+                teamMembersId.push(collegue.collegueFk);
+
+            if (teamMembersId.length == 0)
+                teamMembersId.push(userId);
+        }
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -113,6 +136,11 @@ module.exports = Self => {
                 return {'w.id': value};
             case 'salesPersonFk':
                 return {'c.salesPersonFk': value};
+            case 'myTeam':
+                if (value)
+                    return {'c.salesPersonFk': {inq: teamMembersId}};
+                else
+                    return {'c.salesPersonFk': {nin: teamMembersId}};
             }
         });
 

From 07849ebeb8234172072b027317ad8517dc34cfe4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 14 Oct 2024 13:25:09 +0200
Subject: [PATCH 2/3] fix: myTeam param

---
 modules/ticket/back/methods/ticket-request/filter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index ad000036b..2e1d2fbae 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -138,9 +138,9 @@ module.exports = Self => {
                 return {'c.salesPersonFk': value};
             case 'myTeam':
                 if (value)
-                    return {'c.salesPersonFk': {inq: teamMembersId}};
+                    return {'tr.requesterFk': {inq: teamMembersId}};
                 else
-                    return {'c.salesPersonFk': {nin: teamMembersId}};
+                    return {'tr.requesterFk': {nin: teamMembersId}};
             }
         });
 

From e334152acc901fb1357a59d9da85c317b9b29548 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 15 Oct 2024 09:03:15 +0200
Subject: [PATCH 3/3] refactor: deleted comment

---
 .../ticket/back/methods/ticket-request/filter.js    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index 2e1d2fbae..53f90b98f 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -83,7 +83,12 @@ module.exports = Self => {
         const models = Self.app.models;
         const args = ctx.args;
 
-        // Apply filter by team
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (ctx.args.mine)
+            ctx.args.attenderFk = userId;
+
         const teamMembersId = [];
         if (args.myTeam != null) {
             const worker = await models.Worker.findById(userId, {
@@ -99,12 +104,6 @@ module.exports = Self => {
                 teamMembersId.push(userId);
         }
 
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (ctx.args.mine)
-            ctx.args.attenderFk = userId;
-
         let where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':