From 84e6e7f7bf740cd2b551d43bbd3d988be32834f2 Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Thu, 4 Apr 2024 14:53:26 +0200
Subject: [PATCH] refs #6641 test fixtures

---
 db/dump/fixtures.before.sql                       | 10 +++++++---
 modules/claim/back/methods/claim/filter.js        | 15 ++++++++++++---
 .../claim/back/methods/claim/specs/filter.spec.js |  9 +++++----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index 1dad68b2ce..f874c8aee5 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -1827,9 +1827,9 @@ INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`,
 
 INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`, `ticketFk`)
     VALUES
-        (1, util.VN_CURDATE(), 1,   1101, 18, 3, 0, util.VN_CURDATE(), 0,  11),
+        (1, util.VN_CURDATE(), 1,   1101, 19, 3, 0, util.VN_CURDATE(), 0,  11),
         (2, util.VN_CURDATE(), 4,   1101, 18, 3, 0, util.VN_CURDATE(), 1, 16),
-        (3, util.VN_CURDATE(), 3,   1101, 18, 1, 1, util.VN_CURDATE(), 5, 7),
+        (3, util.VN_CURDATE(), 3,   1101, 19, 1, 1, util.VN_CURDATE(), 5, 7),
         (4, util.VN_CURDATE(), 3,   1104, 18, 5, 0, util.VN_CURDATE(), 10, 8);
 
 INSERT INTO `vn`.`claimObservation` (`claimFk`, `workerFk`, `text`, `created`)
@@ -3745,4 +3745,8 @@ INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,new
 
 INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
     VALUES
-        (1, 10, 9);
\ No newline at end of file
+        (1, 10, 9);
+
+INSERT INTO vn.workerTeam
+(id, team, workerFk)
+VALUES(8, 1, 19);
diff --git a/modules/claim/back/methods/claim/filter.js b/modules/claim/back/methods/claim/filter.js
index b1d1cb3a75..21d6ff80f2 100644
--- a/modules/claim/back/methods/claim/filter.js
+++ b/modules/claim/back/methods/claim/filter.js
@@ -4,10 +4,15 @@ const buildFilter = require('vn-loopback/util/filter').buildFilter;
 const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
 
 module.exports = Self => {
-    Self.remoteMethodCtx('filter', {
+    Self.remoteMethod('filter', {
         description: 'Find all instances of the model matched by filter from the data source.',
         accessType: 'READ',
         accepts: [
+            {
+                arg: 'ctx',
+                type: 'object',
+                http: {source: 'context'}
+            },
             {
                 arg: 'filter',
                 type: 'object',
@@ -97,7 +102,11 @@ module.exports = Self => {
     });
 
     Self.filter = async(ctx, filter, options) => {
-        const userId = ctx.req.accessToken.userId;
+        const userId = ctx?.req?.accessToken?.userId;
+        console.log('ctx', ctx);
+        console.log('ctx.req', ctx.req);
+        console.log('ctx.req.accessToken', ctx.req.accessToken);
+        console.log('ctx.req.accessToken.userId', ctx.req.accessToken.userId);
         const models = Self.app.models;
         const conn = Self.dataSource.connector;
         const args = ctx.args;
@@ -143,7 +152,7 @@ module.exports = Self => {
                 teamMembersId.push(userId);
         }
 
-        const where = buildFilter(args, (param, value) => {
+        const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
                 return /^\d+$/.test(value)
diff --git a/modules/claim/back/methods/claim/specs/filter.spec.js b/modules/claim/back/methods/claim/specs/filter.spec.js
index a25ec8d278..677015c4d7 100644
--- a/modules/claim/back/methods/claim/specs/filter.spec.js
+++ b/modules/claim/back/methods/claim/specs/filter.spec.js
@@ -1,6 +1,7 @@
 const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
 
-describe('claim filter()', () => {
+fdescribe('claim filter()', () => {
     it('should return 1 result filtering by id', async() => {
         const tx = await app.models.Claim.beginTransaction({});
 
@@ -104,11 +105,11 @@ describe('claim filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const ctx = {req: {accessToken: {userId: 18}}, args: {myTeam: true}};
+            const ctx = {req: {accessToken: {userId: 9}}, args: {myTeam: true}};
             const filter = {};
-            const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
+            const result = await models.Claim.filter(ctx, filter, options);
 
-            expect(result.length).toBeGreaterThan(20);
+            expect(result.length).toEqual(2);
 
             await tx.rollback();
         } catch (e) {