rewrite function

app/api/collections/route.ts

@@ -29,28 +29,22 @@ export async function GET(request: Request) {
   }
 
   if (userId) {
-    query.where.userId = {
-      equals: userId
+    query.where = {
+      userId: {
+        equals: userId
+      },
+      is_visible: {
+        equals: true
+      }
+    }
+  } else if (is_admin) {
+    query.where = {
+      is_visible: {
+        equals: undefined
+      }
     }
   }
 
-  // if (userId) {
-  //   query.where = {
-  //     userId: {
-  //       equals: userId
-  //     },
-  //     is_visible: {
-  //       equals: true
-  //     }
-  //   }
-  // } else if (is_admin) {
-  //   query.where = {
-  //     is_visible: {
-  //       equals: undefined
-  //     }
-  //   }
-  // }
-
   const collections = await prisma.collection.findMany(query)
 
   const total = await prisma.collection.count()

components/main/hooks/useCollections.ts

@@ -19,7 +19,9 @@ export const useCollections = (category: string) => {
     ["collections"],
     async () => {
       const queryParams = new URLSearchParams();
-      queryParams.append('userId', category === 'my-own' ? user?.sub : undefined);
+      if (category === 'my-own') {
+        queryParams.append('userId', user?.sub);
+      }
       queryParams.append('page', '0');
 
       const response = await fetch(`/api/collections?${queryParams.toString()}`, {
@@ -50,7 +52,9 @@ export const useCollections = (category: string) => {
   const infiniteRefetch = async () => {
     setLoading(true);
     const queryParams = new URLSearchParams();
-      queryParams.append('userId', category === 'my-own' ? user?.sub : undefined);
+      if (category === 'my-own') {
+        queryParams.append('userId', user?.sub);
+      }
       queryParams.append('page', data?.pagination?.page + 1);
 
       const response = await fetch(`/api/collections?${queryParams.toString()}`, {