fix stale data on activity feed when reseting & replace unstable_cach…

…e with tags in fetch request in activity feed

actions/reset.ts

@@ -1,9 +1,9 @@
 'use server';
 
-import { prisma } from '~/utils/db';
-import { utapi } from '../app/api/uploadthing/core';
 import { revalidatePath, revalidateTag } from 'next/cache';
 import { requireApiAuth } from '~/utils/auth';
+import { prisma } from '~/utils/db';
+import { utapi } from '../app/api/uploadthing/core';
 
 export const resetAppSettings = async () => {
   await requireApiAuth();
@@ -21,6 +21,7 @@ export const resetAppSettings = async () => {
 
     revalidatePath('/');
     revalidateTag('appSettings');
+    revalidateTag('activityFeed');
 
     // Remove all files from UploadThing:
     await utapi.listFiles({}).then(({ files }) => {

app/api/activity-feed/route.ts

@@ -1,14 +1,53 @@
 import { NextResponse, type NextRequest } from 'next/server';
 import { searchParamsCache } from '~/app/dashboard/_components/ActivityFeed/SearchParams';
-import { getActivities } from '~/queries/activityFeed';
 import { requireApiAuth } from '~/utils/auth';
+import { prisma } from '~/utils/db';
 
 export async function GET(request: NextRequest) {
   await requireApiAuth();
 
   const rawParams = request.nextUrl.searchParams.entries();
   const searchParams = searchParamsCache.parse(Object.fromEntries(rawParams));
 
-  const result = await getActivities(searchParams);
-  return NextResponse.json(result);
+  const { page, perPage, sort, sortField, filterParams } = searchParams;
+
+  // Number of items to skip
+  const offset = page > 0 ? (page - 1) * perPage : 0;
+
+  // Generate the dynamic filter parameters for the database call from the
+  // input filter params.
+  const queryFilterParams = filterParams
+    ? {
+        OR: [
+          ...filterParams.map(({ id, value }) => {
+            const operator = Array.isArray(value) ? 'in' : 'contains';
+            return {
+              [id]: { [operator]: value },
+            };
+          }),
+        ],
+      }
+    : {};
+
+  // Transaction is used to ensure both queries are executed in a single transaction
+  const [count, events] = await prisma.$transaction([
+    prisma.events.count({
+      where: {
+        ...queryFilterParams,
+      },
+    }),
+    prisma.events.findMany({
+      take: perPage,
+      skip: offset,
+      orderBy: { [sortField]: sort },
+      where: {
+        ...queryFilterParams,
+      },
+    }),
+  ]);
+
+  const pageCount = Math.ceil(count / perPage);
+
+
+  return NextResponse.json({ events, pageCount });
 }

app/dashboard/_components/ActivityFeed/ActivityFeed.tsx

@@ -12,7 +12,9 @@ export const ActivityFeed = () => {
   const { isPending, data } = useQuery({
     queryKey: ['activityFeed', params.toString()],
     queryFn: async () => {
-      const response = await fetch(`/api/activity-feed?${params.toString()}`);
+      const response = await fetch(`/api/activity-feed?${params.toString()}`, {
+        next: { tags: ['activityFeed'] },
+      });
       return response.json() as Promise<{
         events: Events[];
         pageCount: number;