nice removing duplicates

2022-05-30 11:04:49 -05:00
parent 05d029a5e9
commit f5755e66aa
1 changed files with 9 additions and 2 deletions
@@ -121,9 +121,16 @@ export const searchUsers = async (searchQuery: string): Promise<User[] | undefin
    const emailquerySnap = await getDocs(emaildocSearchQuery);
    const namequerySnap = await getDocs(nameSearchQuery);

+    const nameQueryResults = namequerySnap.docs.map((doc) => doc.data());
+    const emailQueryResults = emailquerySnap.docs.map((doc) => doc.data());
+
+    // remove duplicates
    return [
-      ...emailquerySnap.docs.map((doc) => doc.data()),
-      ...namequerySnap.docs.map((doc) => doc.data()),
+      ...nameQueryResults,
+      ...emailQueryResults.filter(
+        (userResult) =>
+          !nameQueryResults.find((userFromNameQuery) => userResult.id === userFromNameQuery.id),
+      ),
    ];
  } catch (e) {
    console.error('Error: ', e);