Merge pull request #250 from flyvictor/PO-4636-bookings-list-screen

fix(PO-4636): fix query string include
flyvictor · Jul 12, 2024 · 7ba3afb · 7ba3afb
2 parents 2707c8b + 79fd83a
commit 7ba3afb
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/lib/route.js b/lib/route.js
@@ -163,11 +163,7 @@ function route(
           const includeMeta =
             req.query.includeMeta &&
             !_.isBoolean(req.query.includeMeta) &&
-            _.without(
-              ensureQueryArray(req.query.includeMeta).split(','),
-              'count',
-              'true',
-            );
+            _.without(ensureQueryArray(req.query.includeMeta), 'count', 'true');
           if (!includeMeta || !includeMeta.length) return object;
           object.meta = object.meta || {};
           return RSVP.all(
@@ -659,7 +655,7 @@ function route(
       resource: collection,
     });
 
-    if (req.query.ids) match.id = { $in: req.query.ids.split(',') };
+    if (req.query.ids) match.id = { $in: ensureQueryArray(req.query.ids) };
 
     //run beforeRead
     localTracer('before-read-hooks', () => beforeReadHook({}, req, res))
@@ -724,12 +720,10 @@ function route(
               if (
                 req.query.includeMeta &&
                 (_.isBoolean(req.query.includeMeta) ||
-                  ensureQueryArray(req.query.includeMeta)
-                    .split(',')
-                    .indexOf('count') !== -1 ||
-                  ensureQueryArray(req.query.includeMeta)
-                    .split(',')
-                    .indexOf('true') !== -1)
+                  ensureQueryArray(req.query.includeMeta).indexOf('count') !==
+                    -1 ||
+                  ensureQueryArray(req.query.includeMeta).indexOf('true') !==
+                    -1)
               ) {
                 //Count all resources that service would potentially allow to read
                 if (process.env.DISASTER_RECOVERY_COUNT_ENABLED) {