From e3b51c81f9a4bd67cffa95e7e5ced1c80971c08a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 16:37:46 +0200
Subject: [PATCH] refactor: refs #7524 wrap it up in a fn

---
 loopback/common/models/vn-model.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/loopback/common/models/vn-model.js b/loopback/common/models/vn-model.js
index 596ec0967..e24653d13 100644
--- a/loopback/common/models/vn-model.js
+++ b/loopback/common/models/vn-model.js
@@ -28,7 +28,7 @@ module.exports = function(Self) {
             });
 
             this.beforeRemote('**', async ctx => {
-                if (ctx.method.noLimit || !this.hasFilter(ctx)) return;
+                if (!this.hasFilter(ctx)) return;
 
                 const defaultLimit = this.app.orm.selectLimit;
                 const filter = ctx.args.filter || {limit: defaultLimit};
@@ -40,7 +40,7 @@ module.exports = function(Self) {
             });
 
             this.afterRemote('**', async ctx => {
-                if (ctx.method.noLimit || !this.hasFilter(ctx)) return;
+                if (!this.hasFilter(ctx)) return;
 
                 const {result} = ctx;
                 const length = Array.isArray(result) ? result.length : result ? 1 : 0;
@@ -349,8 +349,10 @@ module.exports = function(Self) {
         },
 
         hasFilter(ctx) {
-            return ctx.req.method.toUpperCase() === 'GET' &&
-            ctx.method.accepts.some(x => x.arg === 'filter' && x.type.toLowerCase() === 'object');
+            const {method, req} = ctx;
+            if (method.noLimit) return false;
+            return req.method.toUpperCase() === 'GET' &&
+            method.accepts.some(x => x.arg === 'filter' && x.type.toLowerCase() === 'object');
         },
     });
 };