Add 5 minute cache and 2 minute SWR to common Prisma find calls

oaknational · Aug 28, 2024 · 2a53c89 · 2a53c89
1 parent b9bcde5
commit 2a53c89
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -26,6 +26,7 @@
     "cloudinary",
     "compat",
     "contrib",
+    "cuid",
     "dashify",
     "dialog",
     "Dialogs",
@@ -39,6 +40,7 @@
     "estruyf",
     "fkey",
     "fontsource",
+    "gdrive",
     "Geist",
     "gleap",
     "Hardman",
@@ -74,6 +76,7 @@
     "NDJSON",
     "nextjs",
     "nocheck",
+    "Nullability",
     "oakai",
     "oaknational",
     "oaknationalacademy",

diff --git a/apps/nextjs/src/app/api/aila-download/route.ts b/apps/nextjs/src/app/api/aila-download/route.ts
@@ -115,6 +115,7 @@ async function getHandler(req: Request): Promise<Response> {
       gdriveFileId: fileId,
       userId,
     },
+    cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
   });
 
   if (!lessonExport) {

diff --git a/apps/nextjs/src/app/api/qd-download/route.ts b/apps/nextjs/src/app/api/qd-download/route.ts
@@ -112,6 +112,7 @@ async function getHandler(req: Request) {
       gdriveFileId: fileId,
       userId,
     },
+    cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
   });
 
   if (!qdExport) {

diff --git a/packages/aila/src/utils/lessonPlan/fetchLessonPlanContentById.ts b/packages/aila/src/utils/lessonPlan/fetchLessonPlanContentById.ts
@@ -14,6 +14,7 @@ export async function fetchLessonPlanContentById(
     where: {
       id,
     },
+    cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
   });
 
   if (!lessonPlanRecord) {

diff --git a/packages/api/src/router/app.ts b/packages/api/src/router/app.ts
@@ -47,6 +47,7 @@ export const appRouter = router({
             slug: input.appSlug,
           },
           select: { id: true },
+          cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
         });
         if (!app) {
           throw new TRPCError({
@@ -161,6 +162,7 @@ export const appRouter = router({
             current: true,
           },
           select: { id: true, appId: true },
+          cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
         });
 
         const avgGenerationTimeResult = await ctx.prisma.statistics.findMany({
@@ -169,6 +171,7 @@ export const appRouter = router({
             promptId,
           },
           select: { name: true, value: true },
+          cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
         });
 
         const timingsKeyedByName = Object.fromEntries(

diff --git a/packages/api/src/router/exports.ts b/packages/api/src/router/exports.ts
@@ -70,6 +70,7 @@ async function ailaGetOrSaveSnapshot({
     orderBy: {
       createdAt: "desc",
     },
+    cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
   });
 
   if (!lessonSchema) {

diff --git a/packages/api/src/router/generations.ts b/packages/api/src/router/generations.ts
@@ -119,6 +119,7 @@ export const generationRouter = router({
           current: true,
         },
         select: { id: true, appId: true },
+        cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
       });
 
       if (!promptAndAppId) {
@@ -311,6 +312,7 @@ export const generationRouter = router({
         where: {
           id: flaggedItem.lastGenerationId,
         },
+        cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
       });
 
       await sendQuizFeedbackEmail({

diff --git a/packages/api/src/router/lesson.ts b/packages/api/src/router/lesson.ts
@@ -215,6 +215,7 @@ export const lessonRouter = router({
       }
       const transcript = await ctx.prisma.transcript.findFirst({
         where: { lessonId: lesson.id, variant: "ORIGINAL" },
+        cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
       });
       if (!transcript || !transcript.content) {
         throw new TRPCError({

diff --git a/packages/core/src/models/apps.ts b/packages/core/src/models/apps.ts
@@ -20,6 +20,7 @@ export class Apps {
           },
         },
       },
+      cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
     });
   }
 
@@ -37,6 +38,7 @@ export class Apps {
   async getSharedContent(shareId: string) {
     return this.prisma.sharedContent.findFirst({
       where: { id: shareId },
+      cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
     });
   }
   async getSingleSessionOutput(sessionId: string, userId: string) {

diff --git a/packages/core/src/models/promptVariants.tsx b/packages/core/src/models/promptVariants.tsx
@@ -31,6 +31,7 @@ export class PromptVariants {
       where: {
         hash,
       },
+      cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
     });
     if (existing) {
       return;
@@ -45,6 +46,7 @@ export class PromptVariants {
 
     const app = await this.prisma.app.findFirstOrThrow({
       where: { slug: appSlug },
+      cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
     });
     const maxVersionRows = (await this.prisma
       .$queryRaw`select max(version) as max_version from prompts where slug = ${slug}`) as {

diff --git a/packages/core/src/models/prompts.ts b/packages/core/src/models/prompts.ts
@@ -44,6 +44,7 @@ export class Prompts {
         current: true,
       },
       include: { app: true },
+      cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
     });
   }
 

diff --git a/packages/core/src/rag/index.ts b/packages/core/src/rag/index.ts
@@ -603,6 +603,7 @@ Thank you and happy classifying!`;
           { slug: { equals: keyStage.toLowerCase(), mode: "insensitive" } },
         ],
       },
+      cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
     });
     if (!foundKeyStage) {
       const categorisation = await this.categoriseKeyStageAndSubject(keyStage);
@@ -611,6 +612,7 @@ Thank you and happy classifying!`;
           where: {
             slug: categorisation.keyStage,
           },
+          cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
         });
       }
     }
@@ -654,6 +656,7 @@ Thank you and happy classifying!`;
           { title: { equals: subject.toLowerCase(), mode: "insensitive" } },
         ],
       },
+      cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
     });
 
     // If none of that works, fall back to categorising the subject based on free text
@@ -667,6 +670,7 @@ Thank you and happy classifying!`;
           where: {
             slug: categorisation.subject,
           },
+          cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
         });
       }
     }

diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
@@ -37,7 +37,6 @@ model App {
   statistics  Statistics[]
 
   @@map("apps")
-  @@cacheStrategy(ttl: 300)
 }
 
 model Prompt {
@@ -62,7 +61,6 @@ model Prompt {
   AnswersAndDistractorsForJudgement AnswersAndDistractorsForJudgement[]
 
   @@map("prompts")
-  @@cacheStrategy(ttl: 300)
 }
 
 // Clerk users
@@ -102,7 +100,6 @@ model KeyStage {
   LessonPlan            LessonPlan[]
 
   @@map("key_stages")
-  @@cacheStrategy(ttl: 300)
 }
 
 model KeyStageSubject {
@@ -118,7 +115,6 @@ model KeyStageSubject {
 
   @@unique([keyStageId, subjectId])
   @@map("key_stage_subjects")
-  @@cacheStrategy(ttl: 300)
 }
 
 model AilaUserFlag {
@@ -179,7 +175,6 @@ model Subject {
   LessonPlans           LessonPlan[]
 
   @@map("subjects")
-  @@cacheStrategy(ttl: 300)
 }
 
 model Lesson {
@@ -254,7 +249,6 @@ model LessonSummary {
   subject  Subject?               @relation(fields: [subjectId], references: [id], onDelete: Cascade)
 
   @@map("lesson_summaries")
-  @@cacheStrategy(ttl: 300)
 }
 
 model LessonPlan {
@@ -750,7 +744,6 @@ model Moderation {
   lessonSnapshot LessonSnapshot? @relation(fields: [lessonSnapshotId], references: [id], onDelete: Cascade)
 
   @@map("moderations")
-  @@cacheStrategy(ttl: 300)
 }
 
 model LessonSchema {
-Original file line number
+Diff line change
@@ Expand Up @@
           gdriveFileId: fileId,
           userId,
         },
+        cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
       });
       if (!lessonExport) {
@@ Expand Down @@