recache the cached that we uncached because i thought the cache was brocken

Author: izadoesdev

packages/rpc/src/routers/websites.ts

@@ -1,5 +1,6 @@
 import { websitesApi } from '@databuddy/auth';
 import { and, chQuery, eq, isNull, websites } from '@databuddy/db';
+import { createDrizzleCache, redis } from '@databuddy/redis';
 import { logger } from '@databuddy/shared';
 import {
 	createWebsiteSchema,
@@ -17,29 +18,47 @@ import {
 	trackWebsiteUsage,
 } from '../utils/billing';
 
+const drizzleCache = createDrizzleCache({ redis, namespace: 'websites' });
+
+const CACHE_TTL = 60;
+
 const buildDomain = (domain: string, subdomain?: string) =>
 	subdomain ? `${subdomain}.${domain}` : domain;
 
 export const websitesRouter = createTRPCRouter({
 	list: protectedProcedure
 		.input(z.object({ organizationId: z.string().optional() }).default({}))
 		.query(({ ctx, input }) => {
-			const where = input.organizationId
-				? eq(websites.organizationId, input.organizationId)
-				: and(
-						eq(websites.userId, ctx.user.id),
-						isNull(websites.organizationId)
-					);
-			return ctx.db.query.websites.findMany({
-				where,
-				orderBy: (table, { desc }) => [desc(table.createdAt)],
+			const cacheKey = `list:${ctx.user.id}:${input.organizationId || ''}`;
+			return drizzleCache.withCache({
+				key: cacheKey,
+				ttl: CACHE_TTL,
+				tables: ['websites'],
+				queryFn: () => {
+					const where = input.organizationId
+						? eq(websites.organizationId, input.organizationId)
+						: and(
+								eq(websites.userId, ctx.user.id),
+								isNull(websites.organizationId)
+							);
+					return ctx.db.query.websites.findMany({
+						where,
+						orderBy: (table, { desc }) => [desc(table.createdAt)],
+					});
+				},
 			});
 		}),
 
 	getById: publicProcedure
 		.input(z.object({ id: z.string() }))
 		.query(({ ctx, input }) => {
-			return authorizeWebsiteAccess(ctx, input.id, 'read');
+			const cacheKey = `getById:${input.id}`;
+			return drizzleCache.withCache({
+				key: cacheKey,
+				ttl: CACHE_TTL,
+				tables: ['websites'],
+				queryFn: () => authorizeWebsiteAccess(ctx, input.id, 'read'),
+			});
 		}),
 
 	create: protectedProcedure
@@ -114,6 +133,8 @@ export const websitesRouter = createTRPCRouter({
 				}
 			);
 
+			await drizzleCache.invalidateByTables(['websites']);
+
 			return website;
 		}),
 
@@ -143,6 +164,11 @@ export const websitesRouter = createTRPCRouter({
 				}
 			);
 
+			await Promise.all([
+				drizzleCache.invalidateByTables(['websites']),
+				drizzleCache.invalidateByKey(`getById:${input.id}`),
+			]);
+
 			return updatedWebsite;
 		}),
 
@@ -171,6 +197,11 @@ export const websitesRouter = createTRPCRouter({
 				}
 			);
 
+			await Promise.all([
+				drizzleCache.invalidateByTables(['websites']),
+				drizzleCache.invalidateByKey(`getById:${input.id}`),
+			]);
+
 			return { success: true };
 		}),
 
@@ -215,6 +246,11 @@ export const websitesRouter = createTRPCRouter({
 				}
 			);
 
+			await Promise.all([
+				drizzleCache.invalidateByTables(['websites']),
+				drizzleCache.invalidateByKey(`getById:${input.websiteId}`),
+			]);
+
 			return updatedWebsite;
 		}),