From cbed961d0126590501ee8e1ebc0e1729a9e98247 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Fri, 11 Aug 2023 11:37:01 -0700
Subject: [PATCH] Fix search results.

---
 pages/api/me/websites.ts |  2 +-
 queries/admin/team.ts    |  2 +-
 queries/admin/website.ts | 44 +++++++++++++++++++++-------------------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/pages/api/me/websites.ts b/pages/api/me/websites.ts
index f9ccbcab..238d1b6e 100644
--- a/pages/api/me/websites.ts
+++ b/pages/api/me/websites.ts
@@ -1,5 +1,5 @@
 import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody, WebsiteSearchFilterType } from 'lib/types';
+import { NextApiRequestQueryBody, SearchFilter, WebsiteSearchFilterType } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed } from 'next-basics';
 
diff --git a/queries/admin/team.ts b/queries/admin/team.ts
index 97838227..3294c029 100644
--- a/queries/admin/team.ts
+++ b/queries/admin/team.ts
@@ -104,7 +104,7 @@ export async function getTeams(
             ...((filterType === TEAM_FILTER_TYPES.all ||
               filterType === TEAM_FILTER_TYPES['user:username']) && {
               teamUser: {
-                every: {
+                some: {
                   role: ROLES.teamOwner,
                   user: {
                     username: {
diff --git a/queries/admin/website.ts b/queries/admin/website.ts
index 68f634a6..721b0662 100644
--- a/queries/admin/website.ts
+++ b/queries/admin/website.ts
@@ -57,31 +57,33 @@ export async function getWebsites(
         },
       },
     }),
-    AND: {
-      OR: [
-        {
-          ...(userId && {
-            userId,
-          }),
-        },
-        {
-          ...(includeTeams && {
-            teamWebsite: {
-              some: {
-                team: {
-                  teamUser: {
-                    some: {
-                      userId,
+    AND: [
+      {
+        OR: [
+          {
+            ...(userId && {
+              userId,
+            }),
+          },
+          {
+            ...(includeTeams && {
+              teamWebsite: {
+                some: {
+                  team: {
+                    teamUser: {
+                      some: {
+                        userId,
+                      },
                     },
                   },
                 },
               },
-            },
-          }),
-        },
-      ],
-    },
-    ...(filter && filterQuery),
+            }),
+          },
+        ],
+      },
+      { ...(filter && filterQuery) },
+    ],
   };
 
   const [pageFilters, getParameters] = prisma.getPageFilters({