From 3fba81b41e8bc7ae1162dabcd41944fa525e76d3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 24 Jan 2025 10:46:35 +0100
Subject: [PATCH] feat: refs #7119 add 'id' filter option and enhance bank
 policy model with dmsFk field

---
 modules/route/back/methods/vehicle/filter.js | 11 ++++++-----
 modules/route/back/models/bank-policy.json   |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/route/back/methods/vehicle/filter.js b/modules/route/back/methods/vehicle/filter.js
index 7e8fb36415..cb55f5f3ca 100644
--- a/modules/route/back/methods/vehicle/filter.js
+++ b/modules/route/back/methods/vehicle/filter.js
@@ -69,13 +69,14 @@ module.exports = Self => {
             switch (param) {
             case 'search':
                 return {or: [{'v.id': value}, {numberPlate: {like: `%${value}%`}}]};
+            case 'id':
+                return {'v.id': value};
             case 'description':
             case 'tradeMark':
             case 'numberPlate':
             case 'chassis':
             case 'leasing':
                 return {[param]: {like: `%${value}%`}};
-            case 'id':
             case 'companyFk':
             case 'warehouseFk':
             case 'countryCodeFk':
@@ -83,9 +84,9 @@ module.exports = Self => {
             case 'vehicleTypeFk':
                 return {[param]: value};
             }
-        }) || {};
+        });
 
-        const myFilter = mergeFilters(filter, {where});
+        filter = mergeFilters(filter, {where});
 
         const stmt = new ParameterizedSQL(`
             SELECT v.id,
@@ -116,9 +117,9 @@ module.exports = Self => {
                     ) sub ON sub.vehicleFk = v.id AND sub.rn = 1
         `);
 
-        const sqlWhere = conn.makeWhere(myFilter.where);
+        const sqlWhere = conn.makeWhere(filter.where);
         stmt.merge(sqlWhere);
-        stmt.merge(conn.makePagination(myFilter));
+        stmt.merge(conn.makePagination(filter));
 
         const sql = ParameterizedSQL.join([stmt], ';');
 
diff --git a/modules/route/back/models/bank-policy.json b/modules/route/back/models/bank-policy.json
index edbc636ffa..55a409a671 100644
--- a/modules/route/back/models/bank-policy.json
+++ b/modules/route/back/models/bank-policy.json
@@ -13,6 +13,9 @@
         },
         "ref": {
             "type": "string"
+        },
+        "dmsFk": {
+            "type": "number"
         }
     }
 }
\ No newline at end of file