fix: count query where

kierianlee · Feb 24, 2024 · 120156a · 120156a
1 parent b9d7bab
commit 120156a
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/app/(with-layout)/dashboard/[id]/page.tsx b/src/app/(with-layout)/dashboard/[id]/page.tsx
@@ -29,7 +29,7 @@ export default async function Dashboard({
 }) {
   const session = await getServerSession(authOptions);
   if (!session) {
-    return <></>;
+    return redirect("/");
   }
 
   const page = parseInt(searchParams.page?.toString() || "1");
@@ -62,23 +62,22 @@ export default async function Dashboard({
     redirect("/dashboard");
   }
 
+  const where = and(
+    eq(submissionsTable.formId, form.id),
+    ...(filterField && filterType && filterValue
+      ? [
+          filterType === QueryType.CONTAINS
+            ? sql`fields ->> ${filterField} ilike ${`%${filterValue}%`}`
+            : sql`fields ->> ${filterField} = ${filterValue}`,
+        ]
+      : []),
+  );
   const [submissions, [{ count: submissionsCount }], submissionKeys] =
     await Promise.all([
       db
         .select()
         .from(submissionsTable)
-        .where(
-          and(
-            eq(submissionsTable.formId, form.id),
-            ...(filterField && filterType && filterValue
-              ? [
-                  filterType === QueryType.CONTAINS
-                    ? sql`fields ->> ${filterField} ilike ${`%${filterValue}%`}`
-                    : sql`fields ->> ${filterField} = ${filterValue}`,
-                ]
-              : []),
-          ),
-        )
+        .where(where)
         .orderBy(
           sortField === "Date"
             ? sortDir === "asc"
@@ -90,7 +89,7 @@ export default async function Dashboard({
         )
         .limit(take)
         .offset((page - 1) * take),
-      db.select({ count: count() }).from(submissionsTable),
+      db.select({ count: count() }).from(submissionsTable).where(where),
       db
         .execute(
           sql`