From 0aa94bbc3c2b307dcd65baeb35fb81557e8f79cc Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Tue, 14 Jun 2022 20:12:03 +0200
Subject: [PATCH] feat(assist): assist changed search payload

---
 ee/utilities/utils/helper-ee.js | 4 ++--
 utilities/utils/helper.js       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ee/utilities/utils/helper-ee.js b/ee/utilities/utils/helper-ee.js
index 7853d67ad..18fca5fe4 100644
--- a/ee/utilities/utils/helper-ee.js
+++ b/ee/utilities/utils/helper-ee.js
@@ -37,11 +37,11 @@ const extractFiltersFromRequest = async function (req, res) {
         }
 
         let body = await getBodyFromUWSResponse(res);
-        filters = {...filters, ...body};
+        filters = {...filters, ...(body.filter || {})};
     } else {
         return helper.extractFiltersFromRequest(req);
     }
-    filters = helper.objectToObjectOfArrays({...filters, ...req.body});
+    filters = helper.objectToObjectOfArrays({...filters, ...(req.body.filter || {})});
     return Object.keys(filters).length > 0 ? filters : undefined;
 }
 module.exports = {
diff --git a/utilities/utils/helper.js b/utilities/utils/helper.js
index 54fbfd8ef..531cf9f64 100644
--- a/utilities/utils/helper.js
+++ b/utilities/utils/helper.js
@@ -72,7 +72,7 @@ const extractFiltersFromRequest = function (req) {
         debug && console.log(`[WS]where userId=${req.query.userId}`);
         filters.userID = [req.query.userId];
     }
-    filters = objectToObjectOfArrays({...filters, ...req.body});
+    filters = objectToObjectOfArrays({...filters, ...(req.body.filter || {})});
     return Object.keys(filters).length > 0 ? filters : undefined;
 }
 module.exports = {