From 4d0bb816326f0c6abe59b566c53424b3189f530b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 16:33:22 +0200
Subject: [PATCH 1/3] fix: refs #7323 worker/filter

---
 modules/worker/back/methods/worker/filter.js | 33 ++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/modules/worker/back/methods/worker/filter.js b/modules/worker/back/methods/worker/filter.js
index 2f328d28f..cd386bc2a 100644
--- a/modules/worker/back/methods/worker/filter.js
+++ b/modules/worker/back/methods/worker/filter.js
@@ -67,6 +67,18 @@ module.exports = Self => {
                 type: 'String',
                 description: 'The worker user name',
                 http: {source: 'query'}
+            },
+            {
+                arg: 'SSN',
+                type: 'String',
+                description: 'The worker SSN',
+                http: {source: 'query'}
+            },
+            {
+                arg: 'email',
+                type: 'String',
+                description: 'The user email',
+                http: {source: 'query'}
             }
         ],
         returns: {
@@ -99,6 +111,8 @@ module.exports = Self => {
                 return {'w.firstName': {like: `%${value}%`}};
             case 'lastName':
                 return {'w.lastName': {like: `%${value}%`}};
+            case 'nickname':
+                return {'u.nickname': {like: `%${value}%`}};
             case 'extension':
                 return {'p.extension': value};
             case 'fi':
@@ -107,6 +121,10 @@ module.exports = Self => {
                 return {'d.id': value};
             case 'userName':
                 return {'u.name': {like: `%${value}%`}};
+            case 'email':
+                return {'eu.email': {like: `%${value}%`}};
+            case 'SSN':
+                return {'w.SSN': value};
             }
         });
 
@@ -116,15 +134,24 @@ module.exports = Self => {
         let stmt;
 
         stmt = new ParameterizedSQL(
-            `SELECT w.id, u.email, p.extension, u.name as userName,
-                d.name AS department, w.lastName, u.nickname, mu.email
+            `SELECT w.id,
+                    w.lastName,
+                    w.firstName,
+                    w.SSN,
+                    u.email, 
+                    u.nickname,
+                    p.extension, 
+                    u.name as userName,
+                    d.name AS department,
+                    eu.email,
+                    c.fi
                 FROM worker w
                     LEFT JOIN workerDepartment wd ON wd.workerFk = w.id
                     LEFT JOIN department d ON d.id = wd.departmentFk
                     LEFT JOIN client c ON c.id = w.id
                     LEFT JOIN account.user u ON u.id = w.id
                     LEFT JOIN pbx.sip p ON p.user_id = u.id
-                    LEFT JOIN account.emailUser mu ON mu.userFk = u.id`
+                    LEFT JOIN account.emailUser eu ON eu.userFk = u.id`
         );
 
         stmt.merge(conn.makeSuffix(filter));
-- 
2.40.1


From 75b7e603c981591c2f512bc030f3042328055c0f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 16:08:51 +0200
Subject: [PATCH 2/3] fix: refs #7323 drop acl

---
 db/versions/11242-whiteAnthurium/00-firstScript.sql | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 db/versions/11242-whiteAnthurium/00-firstScript.sql

diff --git a/db/versions/11242-whiteAnthurium/00-firstScript.sql b/db/versions/11242-whiteAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..43dccf374
--- /dev/null
+++ b/db/versions/11242-whiteAnthurium/00-firstScript.sql
@@ -0,0 +1,3 @@
+DELETE FROM salix.ACL
+	WHERE model = 'WorkerLog'
+		AND property = '*';
\ No newline at end of file
-- 
2.40.1


From 5e5603410569c81cf6c3f3857eaefdccbad26601 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 09:48:07 +0200
Subject: [PATCH 3/3] fix: refs #7323 rollback

---
 modules/worker/back/methods/worker/filter.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/worker/back/methods/worker/filter.js b/modules/worker/back/methods/worker/filter.js
index cd386bc2a..52c60572a 100644
--- a/modules/worker/back/methods/worker/filter.js
+++ b/modules/worker/back/methods/worker/filter.js
@@ -68,12 +68,6 @@ module.exports = Self => {
                 description: 'The worker user name',
                 http: {source: 'query'}
             },
-            {
-                arg: 'SSN',
-                type: 'String',
-                description: 'The worker SSN',
-                http: {source: 'query'}
-            },
             {
                 arg: 'email',
                 type: 'String',
@@ -123,8 +117,6 @@ module.exports = Self => {
                 return {'u.name': {like: `%${value}%`}};
             case 'email':
                 return {'eu.email': {like: `%${value}%`}};
-            case 'SSN':
-                return {'w.SSN': value};
             }
         });
 
@@ -137,7 +129,6 @@ module.exports = Self => {
             `SELECT w.id,
                     w.lastName,
                     w.firstName,
-                    w.SSN,
                     u.email, 
                     u.nickname,
                     p.extension, 
-- 
2.40.1