From cb6ba1999f8f39e2eb570a5008d2bae2adeab8f3 Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Fri, 20 Nov 2020 15:07:04 -0400 Subject: [PATCH] Refactor filtering --- server/src/resolvers/Query.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/src/resolvers/Query.js b/server/src/resolvers/Query.js index 6833fde..7c4074f 100755 --- a/server/src/resolvers/Query.js +++ b/server/src/resolvers/Query.js @@ -113,13 +113,15 @@ const Query = { include: { WifiDevice: { orderBy: [{ lastSeen: 'desc' }] } } }) + search = search.toLowerCase() + const userPresences = usersWithWifiDevices .filter( user => - user.displayName.toLowerCase().includes(search.toLowerCase()) || - user.sAMAccountName.toLowerCase().includes(search.toLowerCase()) || + user.displayName.toLowerCase().includes(search) || + user.sAMAccountName.toLowerCase().includes(search) || user.WifiDevice.some(device => - device.apName.toLowerCase().includes(search.toLowerCase()) + device.apName.toLowerCase().includes(search) ) ) .map(user => ({