fix: sonar duplication (#397)

apps/nextjs/src/app/api/aila-download-all/route.ts

@@ -1,6 +1,5 @@
 import { auth } from "@clerk/nextjs/server";
-import type { LessonExportType } from "@oakai/db";
-import { prisma } from "@oakai/db";
+import { prisma, type LessonExportType } from "@oakai/db";
 import { downloadDriveFile } from "@oakai/exports";
 import * as Sentry from "@sentry/node";
 import { kv } from "@vercel/kv";
@@ -9,55 +8,14 @@ import { PassThrough } from "stream";
 
 import { withSentry } from "@/lib/sentry/withSentry";
 
+import { saveDownloadEvent } from "../aila-download/downloadHelpers";
 import { sanitizeFilename } from "../sanitizeFilename";
 
 type FileIdsAndFormats = {
   fileId: string;
   formats: ReadonlyArray<"pptx" | "docx" | "pdf">;
 }[];
 
-function getReadableExportType(exportType: LessonExportType) {
-  switch (exportType) {
-    case "EXIT_QUIZ_DOC":
-      return "Exit quiz";
-    case "LESSON_PLAN_DOC":
-      return "Lesson plan";
-    case "STARTER_QUIZ_DOC":
-      return "Starter quiz";
-    case "WORKSHEET_SLIDES":
-      return "Worksheet";
-    case "LESSON_SLIDES_SLIDES":
-      return "Lesson slides";
-    case "ADDITIONAL_MATERIALS_DOCS":
-      return "Additional materials";
-  }
-}
-
-async function saveDownloadEvent({
-  lessonExportId,
-  downloadedBy,
-  ext,
-}: {
-  lessonExportId: string;
-  downloadedBy: string;
-  ext: string;
-}) {
-  try {
-    await prisma.lessonExportDownload.create({
-      data: {
-        lessonExportId,
-        downloadedBy,
-        ext,
-      },
-    });
-  } catch (error) {
-    Sentry.captureException(error, {
-      level: "warning",
-      extra: { lessonExportId, downloadedBy, ext },
-    });
-  }
-}
-
 function nodePassThroughToReadableStream(passThrough: PassThrough) {
   return new ReadableStream({
     start(controller) {
@@ -77,6 +35,23 @@ function nodePassThroughToReadableStream(passThrough: PassThrough) {
   });
 }
 
+function getReadableExportType(exportType: LessonExportType) {
+  switch (exportType) {
+    case "EXIT_QUIZ_DOC":
+      return "Exit quiz";
+    case "LESSON_PLAN_DOC":
+      return "Lesson plan";
+    case "STARTER_QUIZ_DOC":
+      return "Starter quiz";
+    case "WORKSHEET_SLIDES":
+      return "Worksheet";
+    case "LESSON_SLIDES_SLIDES":
+      return "Lesson slides";
+    case "ADDITIONAL_MATERIALS_DOCS":
+      return "Additional materials";
+  }
+}
+
 async function getHandler(req: Request): Promise<Response> {
   const { searchParams } = new URL(req.url);
   const fileIdsParam = searchParams.get("fileIds");

apps/nextjs/src/app/api/aila-download/downloadHelpers.ts

@@ -0,0 +1,27 @@
+import { prisma } from "@oakai/db";
+import * as Sentry from "@sentry/node";
+
+export async function saveDownloadEvent({
+  lessonExportId,
+  downloadedBy,
+  ext,
+}: {
+  lessonExportId: string;
+  downloadedBy: string;
+  ext: string;
+}) {
+  try {
+    await prisma.lessonExportDownload.create({
+      data: {
+        lessonExportId,
+        downloadedBy,
+        ext,
+      },
+    });
+  } catch (error) {
+    Sentry.captureException(error, {
+      level: "warning",
+      extra: { lessonExportId, downloadedBy, ext },
+    });
+  }
+}

apps/nextjs/src/app/api/aila-download/route.ts

@@ -1,12 +1,12 @@
 import { auth } from "@clerk/nextjs/server";
-import type { LessonExportType } from "@oakai/db";
-import { prisma } from "@oakai/db";
+import { prisma, type LessonExportType } from "@oakai/db";
 import { downloadDriveFile } from "@oakai/exports";
 import * as Sentry from "@sentry/node";
 
 import { withSentry } from "@/lib/sentry/withSentry";
 
 import { sanitizeFilename } from "../sanitizeFilename";
+import { saveDownloadEvent } from "./downloadHelpers";
 
 // From: https://www.ericburel.tech/blog/nextjs-stream-files
 async function* nodeStreamToIterator(stream: NodeJS.ReadableStream) {
@@ -46,31 +46,6 @@ function getReadableExportType(exportType: LessonExportType) {
   }
 }
 
-async function saveDownloadEvent({
-  lessonExportId,
-  downloadedBy,
-  ext,
-}: {
-  lessonExportId: string;
-  downloadedBy: string;
-  ext: string;
-}) {
-  try {
-    await prisma.lessonExportDownload.create({
-      data: {
-        lessonExportId,
-        downloadedBy,
-        ext,
-      },
-    });
-  } catch (error) {
-    Sentry.captureException(error, {
-      level: "warning",
-      extra: { lessonExportId, downloadedBy, ext },
-    });
-  }
-}
-
 async function getHandler(req: Request): Promise<Response> {
   const { searchParams } = new URL(req.url);
 
@@ -135,7 +110,7 @@ async function getHandler(req: Request): Promise<Response> {
     });
   }
 
-  saveDownloadEvent({
+  await saveDownloadEvent({
     lessonExportId: lessonExport.id,
     downloadedBy: userId,
     ext,

apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 
 import type { LessonDeepPartial } from "@oakai/exports/browser";
 import { exportSlidesFullLessonSchema } from "@oakai/exports/browser";
-import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonInputData } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
@@ -29,8 +29,7 @@ export function useExportAllLessonAssets({
   const query = trpc.exports.generateAllAssetExports.useMutation();
 
   const [parseResult, setParseResult] = useState<
-    | { data?: LessonSlidesInputData; success: boolean; error?: ZodError }
-    | undefined
+    { data?: LessonInputData; success: boolean; error?: ZodError } | undefined
   >({ success: false });
   const debouncedParseResult = useDebounce(parseResult, 500);