From 08cf79b09bc68104a2547e95e1f4b165b8ac6ea8 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Tue, 2 Jul 2024 08:39:42 +0200
Subject: [PATCH] feat roadmap  refs #7195

---
 .../back/methods/roadmapStop/getPalletMatchState.js      | 9 ++++-----
 .../roadmapStop/specs/getPalletMatchState.spec.js        | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/route/back/methods/roadmapStop/getPalletMatchState.js b/modules/route/back/methods/roadmapStop/getPalletMatchState.js
index efed64327..138d62411 100644
--- a/modules/route/back/methods/roadmapStop/getPalletMatchState.js
+++ b/modules/route/back/methods/roadmapStop/getPalletMatchState.js
@@ -1,6 +1,6 @@
 module.exports = Self => {
     Self.remoteMethod('getPalletMatchState', {
-        description: 'Get pallet',
+        description: 'Get list of pallet from roadMapStop with true or false if state is matched',
         accessType: 'WRITE',
         accepts: [{
             arg: 'roadMapStopFk',
@@ -32,7 +32,7 @@ module.exports = Self => {
 
         const result = await Self.rawSql(`
                         WITH tPallet AS(
-                            SELECT ep.truckFk roadMapStop,ep.id pallet, e.id expedition, e.stateTypeFk
+                            SELECT ep.id pallet, e.id expedition, e.stateTypeFk
                                 FROM vn.expeditionPallet ep 
                                     JOIN vn.expeditionScan es ON es.palletFk = ep.id
                                     JOIN expedition e ON e.id = es.expeditionFk 
@@ -48,9 +48,8 @@ module.exports = Self => {
                                     WHERE code = ?
                                     GROUP BY expedition
                             )
-                        SELECT t.roadMapStop, 
-                                t.pallet, 
-                                IF (tpe.totalPalletExpedition = tpec.totalPalletExpeditionCode, 'TRUE', 'FALSE') hasMatchStateCode
+                        SELECT  t.pallet, 
+                                tpe.totalPalletExpedition = tpec.totalPalletExpeditionCode hasMatchStateCode
                             FROM tPallet t
                                 LEFT JOIN totalPalletExpedition tpe ON tpe.expedition = t.expedition
                                 LEFT JOIN totalPalletExpeditionCode tpec ON tpec.expedition = t.expedition
diff --git a/modules/route/back/methods/roadmapStop/specs/getPalletMatchState.spec.js b/modules/route/back/methods/roadmapStop/specs/getPalletMatchState.spec.js
index ac782561a..3e89bd528 100644
--- a/modules/route/back/methods/roadmapStop/specs/getPalletMatchState.spec.js
+++ b/modules/route/back/methods/roadmapStop/specs/getPalletMatchState.spec.js
@@ -2,11 +2,11 @@
 const {models} = require('vn-loopback/server/server');
 
 describe('roadMapStop getPalletMatchState()', () => {
-    fit('should return list of pallet with true or false if state is matched', async() => {
+    it('should return list of pallet with true or false if state is matched', async() => {
         const roadmapStopFk = 1;
         const state = 'ON DELIVERY';
         const result = await models.RoadmapStop.getPalletMatchState(roadmapStopFk, state);
 
-        expect(result[0].hasMatchStateCode).toBe('TRUE');
+        expect(result[0].hasMatchStateCode).toBe(1);
     });
 });