@studious-lms/server 1.0.6 → 1.0.7

package/dist/routers/assignment.js

@@ -1,90 +1,93 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assignmentRouter = void 0;
-const zod_1 = require("zod");
-const trpc_1 = require("../trpc");
-const server_1 = require("@trpc/server");
-const prisma_1 = require("../lib/prisma");
-const fileUpload_1 = require("../lib/fileUpload");
-const googleCloudStorage_1 = require("../lib/googleCloudStorage");
-const fileSchema = zod_1.z.object({
-    name: zod_1.z.string(),
-    type: zod_1.z.string(),
-    size: zod_1.z.number(),
-    data: zod_1.z.string(), // base64 encoded file data
+import { z } from "zod";
+import { createTRPCRouter, protectedProcedure, protectedClassMemberProcedure, protectedTeacherProcedure } from "../trpc";
+import { TRPCError } from "@trpc/server";
+import { prisma } from "../lib/prisma";
+import { uploadFiles } from "../lib/fileUpload";
+import { deleteFile } from "../lib/googleCloudStorage";
+const fileSchema = z.object({
+    name: z.string(),
+    type: z.string(),
+    size: z.number(),
+    data: z.string(), // base64 encoded file data
 });
-const createAssignmentSchema = zod_1.z.object({
-    classId: zod_1.z.string(),
-    title: zod_1.z.string(),
-    instructions: zod_1.z.string(),
-    dueDate: zod_1.z.string(),
-    files: zod_1.z.array(fileSchema).optional(),
-    maxGrade: zod_1.z.number().optional(),
-    graded: zod_1.z.boolean().optional(),
-    weight: zod_1.z.number().optional(),
-    sectionId: zod_1.z.string().optional(),
-    type: zod_1.z.enum(['HOMEWORK', 'QUIZ', 'TEST', 'PROJECT', 'ESSAY', 'DISCUSSION', 'PRESENTATION', 'LAB', 'OTHER']).optional(),
-    markSchemeId: zod_1.z.string().optional(),
-    gradingBoundaryId: zod_1.z.string().optional(),
+const createAssignmentSchema = z.object({
+    classId: z.string(),
+    title: z.string(),
+    instructions: z.string(),
+    dueDate: z.string(),
+    files: z.array(fileSchema).optional(),
+    existingFileIds: z.array(z.string()).optional(),
+    maxGrade: z.number().optional(),
+    graded: z.boolean().optional(),
+    weight: z.number().optional(),
+    sectionId: z.string().optional(),
+    type: z.enum(['HOMEWORK', 'QUIZ', 'TEST', 'PROJECT', 'ESSAY', 'DISCUSSION', 'PRESENTATION', 'LAB', 'OTHER']).optional(),
+    markSchemeId: z.string().optional(),
+    gradingBoundaryId: z.string().optional(),
+    inProgress: z.boolean().optional(),
 });
-const updateAssignmentSchema = zod_1.z.object({
-    classId: zod_1.z.string(),
-    id: zod_1.z.string(),
-    title: zod_1.z.string().optional(),
-    instructions: zod_1.z.string().optional(),
-    dueDate: zod_1.z.string().optional(),
-    files: zod_1.z.array(fileSchema).optional(),
-    removedAttachments: zod_1.z.array(zod_1.z.string()).optional(),
-    maxGrade: zod_1.z.number().optional(),
-    graded: zod_1.z.boolean().optional(),
-    weight: zod_1.z.number().optional(),
-    sectionId: zod_1.z.string().nullable().optional(),
-    type: zod_1.z.enum(['HOMEWORK', 'QUIZ', 'TEST', 'PROJECT', 'ESSAY', 'DISCUSSION', 'PRESENTATION', 'LAB', 'OTHER']).optional(),
+const updateAssignmentSchema = z.object({
+    classId: z.string(),
+    id: z.string(),
+    title: z.string().optional(),
+    instructions: z.string().optional(),
+    dueDate: z.string().optional(),
+    files: z.array(fileSchema).optional(),
+    existingFileIds: z.array(z.string()).optional(),
+    removedAttachments: z.array(z.string()).optional(),
+    maxGrade: z.number().optional(),
+    graded: z.boolean().optional(),
+    weight: z.number().optional(),
+    sectionId: z.string().nullable().optional(),
+    type: z.enum(['HOMEWORK', 'QUIZ', 'TEST', 'PROJECT', 'ESSAY', 'DISCUSSION', 'PRESENTATION', 'LAB', 'OTHER']).optional(),
+    inProgress: z.boolean().optional(),
 });
-const deleteAssignmentSchema = zod_1.z.object({
-    id: zod_1.z.string(),
-    classId: zod_1.z.string(),
+const deleteAssignmentSchema = z.object({
+    id: z.string(),
+    classId: z.string(),
 });
-const getAssignmentSchema = zod_1.z.object({
-    id: zod_1.z.string(),
-    classId: zod_1.z.string(),
+const getAssignmentSchema = z.object({
+    id: z.string(),
+    classId: z.string(),
 });
-const submissionSchema = zod_1.z.object({
-    assignmentId: zod_1.z.string(),
-    classId: zod_1.z.string(),
-    submissionId: zod_1.z.string(),
-    submit: zod_1.z.boolean().optional(),
-    newAttachments: zod_1.z.array(fileSchema).optional(),
-    removedAttachments: zod_1.z.array(zod_1.z.string()).optional(),
+const submissionSchema = z.object({
+    assignmentId: z.string(),
+    classId: z.string(),
+    submissionId: z.string(),
+    submit: z.boolean().optional(),
+    newAttachments: z.array(fileSchema).optional(),
+    existingFileIds: z.array(z.string()).optional(),
+    removedAttachments: z.array(z.string()).optional(),
 });
-const updateSubmissionSchema = zod_1.z.object({
-    assignmentId: zod_1.z.string(),
-    classId: zod_1.z.string(),
-    submissionId: zod_1.z.string(),
-    return: zod_1.z.boolean().optional(),
-    gradeReceived: zod_1.z.number().nullable().optional(),
-    newAttachments: zod_1.z.array(fileSchema).optional(),
-    removedAttachments: zod_1.z.array(zod_1.z.string()).optional(),
-    rubricGrades: zod_1.z.array(zod_1.z.object({
-        criteriaId: zod_1.z.string(),
-        selectedLevelId: zod_1.z.string(),
-        points: zod_1.z.number(),
-        comments: zod_1.z.string(),
+const updateSubmissionSchema = z.object({
+    assignmentId: z.string(),
+    classId: z.string(),
+    submissionId: z.string(),
+    return: z.boolean().optional(),
+    gradeReceived: z.number().nullable().optional(),
+    newAttachments: z.array(fileSchema).optional(),
+    existingFileIds: z.array(z.string()).optional(),
+    removedAttachments: z.array(z.string()).optional(),
+    rubricGrades: z.array(z.object({
+        criteriaId: z.string(),
+        selectedLevelId: z.string(),
+        points: z.number(),
+        comments: z.string(),
     })).optional(),
 });
-exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
-    create: trpc_1.protectedProcedure
+export const assignmentRouter = createTRPCRouter({
+    create: protectedProcedure
         .input(createAssignmentSchema)
         .mutation(async ({ ctx, input }) => {
-        const { classId, title, instructions, dueDate, files, maxGrade, graded, weight, sectionId, type, markSchemeId, gradingBoundaryId } = input;
+        const { classId, title, instructions, dueDate, files, existingFileIds, maxGrade, graded, weight, sectionId, type, markSchemeId, gradingBoundaryId, inProgress } = input;
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
         // Get all students in the class
-        const classData = await prisma_1.prisma.class.findUnique({
+        const classData = await prisma.class.findUnique({
             where: { id: classId },
             include: {
                 students: {
@@ -93,25 +96,29 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             }
         });
         if (!classData) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Class not found",
             });
         }
-        const rubric = await prisma_1.prisma.markScheme.findUnique({
-            where: { id: markSchemeId },
-            select: {
-                structured: true,
-            }
-        });
-        const parsedRubric = JSON.parse(rubric?.structured || "{}");
-        // Calculate max grade from rubric criteria levels
-        const computedMaxGrade = parsedRubric.criteria.reduce((acc, criterion) => {
-            const maxPoints = Math.max(...criterion.levels.map((level) => level.points));
-            return acc + maxPoints;
-        }, 0);
+        let computedMaxGrade = maxGrade;
+        if (markSchemeId) {
+            const rubric = await prisma.markScheme.findUnique({
+                where: { id: markSchemeId },
+                select: {
+                    structured: true,
+                }
+            });
+            const parsedRubric = JSON.parse(rubric?.structured || "{}");
+            // Calculate max grade from rubric criteria levels
+            computedMaxGrade = parsedRubric.criteria.reduce((acc, criterion) => {
+                const maxPoints = Math.max(...criterion.levels.map((level) => level.points));
+                return acc + maxPoints;
+            }, 0);
+        }
+        console.log(markSchemeId, gradingBoundaryId);
         // Create assignment with submissions for all students
-        const assignment = await prisma_1.prisma.assignment.create({
+        const assignment = await prisma.assignment.create({
             data: {
                 title,
                 instructions,
@@ -120,6 +127,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
                 graded,
                 weight,
                 type,
+                inProgress: inProgress || false,
                 class: {
                     connect: { id: classId }
                 },
@@ -189,11 +197,11 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         let uploadedFiles = [];
         if (files && files.length > 0) {
             // Store files in a class and assignment specific directory
-            uploadedFiles = await (0, fileUpload_1.uploadFiles)(files, ctx.user.id, `class/${classId}/assignment/${assignment.id}`);
+            uploadedFiles = await uploadFiles(files, ctx.user.id);
         }
         // Update assignment with new file attachments
         if (uploadedFiles.length > 0) {
-            await prisma_1.prisma.assignment.update({
+            await prisma.assignment.update({
                 where: { id: assignment.id },
                 data: {
                     attachments: {
@@ -212,20 +220,31 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
                 }
             });
         }
+        // Connect existing files if provided
+        if (existingFileIds && existingFileIds.length > 0) {
+            await prisma.assignment.update({
+                where: { id: assignment.id },
+                data: {
+                    attachments: {
+                        connect: existingFileIds.map(fileId => ({ id: fileId }))
+                    }
+                }
+            });
+        }
         return assignment;
     }),
-    update: trpc_1.protectedProcedure
+    update: protectedProcedure
         .input(updateAssignmentSchema)
         .mutation(async ({ ctx, input }) => {
-        const { id, title, instructions, dueDate, files, maxGrade, graded, weight, sectionId, type } = input;
+        const { id, title, instructions, dueDate, files, existingFileIds, maxGrade, graded, weight, sectionId, type, inProgress } = input;
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
         // Get the assignment with current attachments
-        const assignment = await prisma_1.prisma.assignment.findFirst({
+        const assignment = await prisma.assignment.findFirst({
             where: {
                 id,
                 teacherId: ctx.user.id,
@@ -236,6 +255,8 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
                         id: true,
                         name: true,
                         type: true,
+                        path: true,
+                        size: true,
                         thumbnail: {
                             select: {
                                 path: true
@@ -252,7 +273,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             },
         });
         if (!assignment) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Assignment not found",
             });
@@ -261,10 +282,10 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         let uploadedFiles = [];
         if (files && files.length > 0) {
             // Store files in a class and assignment specific directory
-            uploadedFiles = await (0, fileUpload_1.uploadFiles)(files, ctx.user.id, `class/${assignment.classId}/assignment/${id}`);
+            uploadedFiles = await uploadFiles(files, ctx.user.id);
         }
         // Update assignment
-        const updatedAssignment = await prisma_1.prisma.assignment.update({
+        const updatedAssignment = await prisma.assignment.update({
             where: { id },
             data: {
                 ...(title && { title }),
@@ -274,6 +295,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
                 ...(graded !== undefined && { graded }),
                 ...(weight && { weight }),
                 ...(type && { type }),
+                ...(inProgress !== undefined && { inProgress }),
                 ...(sectionId !== undefined && {
                     section: sectionId ? {
                         connect: { id: sectionId }
@@ -296,6 +318,11 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
                         }))
                     }
                 }),
+                ...(existingFileIds && existingFileIds.length > 0 && {
+                    attachments: {
+                        connect: existingFileIds.map(fileId => ({ id: fileId }))
+                    }
+                }),
                 ...(input.removedAttachments && input.removedAttachments.length > 0 && {
                     attachments: {
                         deleteMany: {
@@ -329,7 +356,11 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
                         id: true,
                         name: true,
                         type: true,
-                        thumbnail: true
+                        thumbnail: true,
+                        size: true,
+                        path: true,
+                        uploadedAt: true,
+                        thumbnailId: true,
                     }
                 },
                 section: true,
@@ -338,7 +369,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             }
         });
         if (assignment.markSchemeId) {
-            const rubric = await prisma_1.prisma.markScheme.findUnique({
+            const rubric = await prisma.markScheme.findUnique({
                 where: { id: assignment.markSchemeId },
                 select: {
                     structured: true,
@@ -349,7 +380,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
                 const maxPoints = Math.max(...criterion.levels.map((level) => level.points));
                 return acc + maxPoints;
             }, 0);
-            await prisma_1.prisma.assignment.update({
+            await prisma.assignment.update({
                 where: { id },
                 data: {
                     maxGrade: computedMaxGrade,
@@ -358,18 +389,18 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         }
         return updatedAssignment;
     }),
-    delete: trpc_1.protectedProcedure
+    delete: protectedProcedure
         .input(deleteAssignmentSchema)
         .mutation(async ({ ctx, input }) => {
         const { id, classId } = input;
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
         // Get the assignment with all related files
-        const assignment = await prisma_1.prisma.assignment.findFirst({
+        const assignment = await prisma.assignment.findFirst({
             where: {
                 id,
                 teacherId: ctx.user.id,
@@ -397,7 +428,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             }
         });
         if (!assignment) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Assignment not found",
             });
@@ -411,10 +442,10 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         await Promise.all(filesToDelete.map(async (file) => {
             try {
                 // Delete the main file
-                await (0, googleCloudStorage_1.deleteFile)(file.path);
+                await deleteFile(file.path);
                 // Delete thumbnail if it exists
                 if (file.thumbnail) {
-                    await (0, googleCloudStorage_1.deleteFile)(file.thumbnail.path);
+                    await deleteFile(file.thumbnail.path);
                 }
             }
             catch (error) {
@@ -422,24 +453,24 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             }
         }));
         // Delete the assignment (this will cascade delete all related records)
-        await prisma_1.prisma.assignment.delete({
+        await prisma.assignment.delete({
             where: { id },
         });
         return {
             id,
         };
     }),
-    get: trpc_1.protectedProcedure
+    get: protectedProcedure
         .input(getAssignmentSchema)
         .query(async ({ ctx, input }) => {
         const { id, classId } = input;
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
-        const assignment = await prisma_1.prisma.assignment.findUnique({
+        const assignment = await prisma.assignment.findUnique({
             where: {
                 id,
                 // classId,
@@ -462,6 +493,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
                         type: true,
                         size: true,
                         path: true,
+                        uploadedAt: true,
                         thumbnailId: true,
                     }
                 },
@@ -508,12 +540,12 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             }
         });
         if (!assignment) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Assignment not found",
             });
         }
-        const sections = await prisma_1.prisma.section.findMany({
+        const sections = await prisma.section.findMany({
             where: {
                 classId: assignment.classId,
             },
@@ -524,20 +556,20 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         });
         return { ...assignment, sections };
     }),
-    getSubmission: trpc_1.protectedClassMemberProcedure
-        .input(zod_1.z.object({
-        assignmentId: zod_1.z.string(),
-        classId: zod_1.z.string(),
+    getSubmission: protectedClassMemberProcedure
+        .input(z.object({
+        assignmentId: z.string(),
+        classId: z.string(),
     }))
         .query(async ({ ctx, input }) => {
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
         const { assignmentId } = input;
-        const submission = await prisma_1.prisma.submission.findFirst({
+        const submission = await prisma.submission.findFirst({
             where: {
                 assignmentId,
                 studentId: ctx.user.id,
@@ -572,7 +604,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         });
         if (!submission) {
             // Create a new submission if it doesn't exist
-            return await prisma_1.prisma.submission.create({
+            return await prisma.submission.create({
                 data: {
                     assignment: {
                         connect: { id: assignmentId },
@@ -615,20 +647,20 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             late: submission.assignment.dueDate < new Date(),
         };
     }),
-    getSubmissionById: trpc_1.protectedTeacherProcedure
-        .input(zod_1.z.object({
-        submissionId: zod_1.z.string(),
-        classId: zod_1.z.string(),
+    getSubmissionById: protectedTeacherProcedure
+        .input(z.object({
+        submissionId: z.string(),
+        classId: z.string(),
     }))
         .query(async ({ ctx, input }) => {
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
         const { submissionId, classId } = input;
-        const submission = await prisma_1.prisma.submission.findFirst({
+        const submission = await prisma.submission.findFirst({
             where: {
                 id: submissionId,
                 assignment: {
@@ -671,7 +703,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             },
         });
         if (!submission) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Submission not found",
             });
@@ -681,17 +713,17 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             late: submission.assignment.dueDate < new Date(),
         };
     }),
-    updateSubmission: trpc_1.protectedClassMemberProcedure
+    updateSubmission: protectedClassMemberProcedure
         .input(submissionSchema)
         .mutation(async ({ ctx, input }) => {
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
-        const { submissionId, submit, newAttachments, removedAttachments } = input;
-        const submission = await prisma_1.prisma.submission.findFirst({
+        const { submissionId, submit, newAttachments, existingFileIds, removedAttachments } = input;
+        const submission = await prisma.submission.findFirst({
             where: {
                 id: submissionId,
                 OR: [
@@ -739,14 +771,14 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             },
         });
         if (!submission) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Submission not found",
             });
         }
         if (submit !== undefined) {
             // Toggle submission status
-            return await prisma_1.prisma.submission.update({
+            return await prisma.submission.update({
                 where: { id: submission.id },
                 data: {
                     submitted: !submission.submitted,
@@ -783,11 +815,11 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         let uploadedFiles = [];
         if (newAttachments && newAttachments.length > 0) {
             // Store files in a class and assignment specific directory
-            uploadedFiles = await (0, fileUpload_1.uploadFiles)(newAttachments, ctx.user.id, `class/${submission.assignment.classId}/assignment/${submission.assignmentId}/submission/${submission.id}`);
+            uploadedFiles = await uploadFiles(newAttachments, ctx.user.id);
         }
         // Update submission with new file attachments
         if (uploadedFiles.length > 0) {
-            await prisma_1.prisma.submission.update({
+            await prisma.submission.update({
                 where: { id: submission.id },
                 data: {
                     attachments: {
@@ -806,6 +838,17 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
                 }
             });
         }
+        // Connect existing files if provided
+        if (existingFileIds && existingFileIds.length > 0) {
+            await prisma.submission.update({
+                where: { id: submission.id },
+                data: {
+                    attachments: {
+                        connect: existingFileIds.map(fileId => ({ id: fileId }))
+                    }
+                }
+            });
+        }
         // Delete removed attachments if any
         if (removedAttachments && removedAttachments.length > 0) {
             const filesToDelete = submission.attachments.filter((file) => removedAttachments.includes(file.id));
@@ -813,10 +856,10 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             await Promise.all(filesToDelete.map(async (file) => {
                 try {
                     // Delete the main file
-                    await (0, googleCloudStorage_1.deleteFile)(file.path);
+                    await deleteFile(file.path);
                     // Delete thumbnail if it exists
                     if (file.thumbnail?.path) {
-                        await (0, googleCloudStorage_1.deleteFile)(file.thumbnail.path);
+                        await deleteFile(file.thumbnail.path);
                     }
                 }
                 catch (error) {
@@ -825,7 +868,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             }));
         }
         // Update submission with attachments
-        return await prisma_1.prisma.submission.update({
+        return await prisma.submission.update({
             where: { id: submission.id },
             data: {
                 ...(removedAttachments && removedAttachments.length > 0 && {
@@ -868,20 +911,20 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             },
         });
     }),
-    getSubmissions: trpc_1.protectedTeacherProcedure
-        .input(zod_1.z.object({
-        assignmentId: zod_1.z.string(),
-        classId: zod_1.z.string(),
+    getSubmissions: protectedTeacherProcedure
+        .input(z.object({
+        assignmentId: z.string(),
+        classId: z.string(),
     }))
         .query(async ({ ctx, input }) => {
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
         const { assignmentId } = input;
-        const submissions = await prisma_1.prisma.submission.findMany({
+        const submissions = await prisma.submission.findMany({
             where: {
                 assignment: {
                     id: assignmentId,
@@ -928,17 +971,17 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             late: submission.assignment.dueDate < new Date(),
         }));
     }),
-    updateSubmissionAsTeacher: trpc_1.protectedTeacherProcedure
+    updateSubmissionAsTeacher: protectedTeacherProcedure
         .input(updateSubmissionSchema)
         .mutation(async ({ ctx, input }) => {
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
-        const { submissionId, return: returnSubmission, gradeReceived, newAttachments, removedAttachments, rubricGrades } = input;
-        const submission = await prisma_1.prisma.submission.findFirst({
+        const { submissionId, return: returnSubmission, gradeReceived, newAttachments, existingFileIds, removedAttachments, rubricGrades } = input;
+        const submission = await prisma.submission.findFirst({
             where: {
                 id: submissionId,
                 assignment: {
@@ -980,14 +1023,14 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             },
         });
         if (!submission) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Submission not found",
             });
         }
         if (returnSubmission !== undefined) {
             // Toggle return status
-            return await prisma_1.prisma.submission.update({
+            return await prisma.submission.update({
                 where: { id: submissionId },
                 data: {
                     returned: !submission.returned,
@@ -1023,11 +1066,11 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         let uploadedFiles = [];
         if (newAttachments && newAttachments.length > 0) {
             // Store files in a class and assignment specific directory
-            uploadedFiles = await (0, fileUpload_1.uploadFiles)(newAttachments, ctx.user.id, `class/${submission.assignment.classId}/assignment/${submission.assignmentId}/submission/${submission.id}/annotations`);
+            uploadedFiles = await uploadFiles(newAttachments, ctx.user.id);
         }
         // Update submission with new file attachments
         if (uploadedFiles.length > 0) {
-            await prisma_1.prisma.submission.update({
+            await prisma.submission.update({
                 where: { id: submission.id },
                 data: {
                     annotations: {
@@ -1046,6 +1089,17 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
                 }
             });
         }
+        // Connect existing files if provided
+        if (existingFileIds && existingFileIds.length > 0) {
+            await prisma.submission.update({
+                where: { id: submission.id },
+                data: {
+                    annotations: {
+                        connect: existingFileIds.map(fileId => ({ id: fileId }))
+                    }
+                }
+            });
+        }
         // Delete removed attachments if any
         if (removedAttachments && removedAttachments.length > 0) {
             const filesToDelete = submission.annotations.filter((file) => removedAttachments.includes(file.id));
@@ -1053,10 +1107,10 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             await Promise.all(filesToDelete.map(async (file) => {
                 try {
                     // Delete the main file
-                    await (0, googleCloudStorage_1.deleteFile)(file.path);
+                    await deleteFile(file.path);
                     // Delete thumbnail if it exists
                     if (file.thumbnail?.path) {
-                        await (0, googleCloudStorage_1.deleteFile)(file.thumbnail.path);
+                        await deleteFile(file.thumbnail.path);
                     }
                 }
                 catch (error) {
@@ -1065,7 +1119,7 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             }));
         }
         // Update submission with grade and attachments
-        return await prisma_1.prisma.submission.update({
+        return await prisma.submission.update({
             where: { id: submissionId },
             data: {
                 ...(gradeReceived !== undefined && { gradeReceived }),
@@ -1115,21 +1169,21 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             },
         });
     }),
-    attachToEvent: trpc_1.protectedTeacherProcedure
-        .input(zod_1.z.object({
-        assignmentId: zod_1.z.string(),
-        eventId: zod_1.z.string(),
+    attachToEvent: protectedTeacherProcedure
+        .input(z.object({
+        assignmentId: z.string(),
+        eventId: z.string(),
     }))
         .mutation(async ({ ctx, input }) => {
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
         const { assignmentId, eventId } = input;
         // Check if assignment exists and user is a teacher of the class
-        const assignment = await prisma_1.prisma.assignment.findFirst({
+        const assignment = await prisma.assignment.findFirst({
             where: {
                 id: assignmentId,
                 class: {
@@ -1143,26 +1197,26 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             },
         });
         if (!assignment) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Assignment not found or you are not authorized",
             });
         }
         // Check if event exists and belongs to the same class
-        const event = await prisma_1.prisma.event.findFirst({
+        const event = await prisma.event.findFirst({
             where: {
                 id: eventId,
                 classId: assignment.classId,
             },
         });
         if (!event) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Event not found or does not belong to the same class",
             });
         }
         // Attach assignment to event
-        const updatedAssignment = await prisma_1.prisma.assignment.update({
+        const updatedAssignment = await prisma.assignment.update({
             where: { id: assignmentId },
             data: {
                 eventAttached: {
@@ -1201,20 +1255,20 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         });
         return { assignment: updatedAssignment };
     }),
-    detachEvent: trpc_1.protectedTeacherProcedure
-        .input(zod_1.z.object({
-        assignmentId: zod_1.z.string(),
+    detachEvent: protectedTeacherProcedure
+        .input(z.object({
+        assignmentId: z.string(),
     }))
         .mutation(async ({ ctx, input }) => {
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
         const { assignmentId } = input;
         // Check if assignment exists and user is a teacher of the class
-        const assignment = await prisma_1.prisma.assignment.findFirst({
+        const assignment = await prisma.assignment.findFirst({
             where: {
                 id: assignmentId,
                 class: {
@@ -1225,13 +1279,13 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             },
         });
         if (!assignment) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Assignment not found or you are not authorized",
             });
         }
         // Detach assignment from event
-        const updatedAssignment = await prisma_1.prisma.assignment.update({
+        const updatedAssignment = await prisma.assignment.update({
             where: { id: assignmentId },
             data: {
                 eventAttached: {
@@ -1270,20 +1324,20 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         });
         return { assignment: updatedAssignment };
     }),
-    getAvailableEvents: trpc_1.protectedTeacherProcedure
-        .input(zod_1.z.object({
-        assignmentId: zod_1.z.string(),
+    getAvailableEvents: protectedTeacherProcedure
+        .input(z.object({
+        assignmentId: z.string(),
     }))
         .query(async ({ ctx, input }) => {
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
         const { assignmentId } = input;
         // Get the assignment to find the class
-        const assignment = await prisma_1.prisma.assignment.findFirst({
+        const assignment = await prisma.assignment.findFirst({
             where: {
                 id: assignmentId,
                 class: {
@@ -1295,13 +1349,13 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             select: { classId: true }
         });
         if (!assignment) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Assignment not found or you are not authorized",
             });
         }
         // Get all events for the class that don't already have this assignment attached
-        const events = await prisma_1.prisma.event.findMany({
+        const events = await prisma.event.findMany({
             where: {
                 classId: assignment.classId,
                 assignmentsAttached: {
@@ -1324,15 +1378,15 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         });
         return { events };
     }),
-    dueToday: trpc_1.protectedProcedure
+    dueToday: protectedProcedure
         .query(async ({ ctx }) => {
         if (!ctx.user) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "UNAUTHORIZED",
                 message: "User must be authenticated",
             });
         }
-        const assignments = await prisma_1.prisma.assignment.findMany({
+        const assignments = await prisma.assignment.findMany({
             where: {
                 dueDate: {
                     equals: new Date(),
@@ -1358,39 +1412,39 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
             dueDate: assignment.dueDate.toISOString(),
         }));
     }),
-    attachMarkScheme: trpc_1.protectedTeacherProcedure
-        .input(zod_1.z.object({
-        assignmentId: zod_1.z.string(),
-        markSchemeId: zod_1.z.string().nullable(),
+    attachMarkScheme: protectedTeacherProcedure
+        .input(z.object({
+        assignmentId: z.string(),
+        markSchemeId: z.string().nullable(),
     }))
         .mutation(async ({ ctx, input }) => {
         const { assignmentId, markSchemeId } = input;
-        const assignment = await prisma_1.prisma.assignment.findFirst({
+        const assignment = await prisma.assignment.findFirst({
             where: {
                 id: assignmentId,
             },
         });
         if (!assignment) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Assignment not found",
             });
         }
         // If markSchemeId is provided, verify it exists
         if (markSchemeId) {
-            const markScheme = await prisma_1.prisma.markScheme.findFirst({
+            const markScheme = await prisma.markScheme.findFirst({
                 where: {
                     id: markSchemeId,
                 },
             });
             if (!markScheme) {
-                throw new server_1.TRPCError({
+                throw new TRPCError({
                     code: "NOT_FOUND",
                     message: "Mark scheme not found",
                 });
             }
         }
-        const updatedAssignment = await prisma_1.prisma.assignment.update({
+        const updatedAssignment = await prisma.assignment.update({
             where: { id: assignmentId },
             data: {
                 markScheme: markSchemeId ? {
@@ -1409,24 +1463,24 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         });
         return updatedAssignment;
     }),
-    detachMarkScheme: trpc_1.protectedTeacherProcedure
-        .input(zod_1.z.object({
-        assignmentId: zod_1.z.string(),
+    detachMarkScheme: protectedTeacherProcedure
+        .input(z.object({
+        assignmentId: z.string(),
     }))
         .mutation(async ({ ctx, input }) => {
         const { assignmentId } = input;
-        const assignment = await prisma_1.prisma.assignment.findFirst({
+        const assignment = await prisma.assignment.findFirst({
             where: {
                 id: assignmentId,
             },
         });
         if (!assignment) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Assignment not found",
             });
         }
-        const updatedAssignment = await prisma_1.prisma.assignment.update({
+        const updatedAssignment = await prisma.assignment.update({
             where: { id: assignmentId },
             data: {
                 markScheme: {
@@ -1443,39 +1497,39 @@ exports.assignmentRouter = (0, trpc_1.createTRPCRouter)({
         });
         return updatedAssignment;
     }),
-    attachGradingBoundary: trpc_1.protectedTeacherProcedure
-        .input(zod_1.z.object({
-        assignmentId: zod_1.z.string(),
-        gradingBoundaryId: zod_1.z.string().nullable(),
+    attachGradingBoundary: protectedTeacherProcedure
+        .input(z.object({
+        assignmentId: z.string(),
+        gradingBoundaryId: z.string().nullable(),
     }))
         .mutation(async ({ ctx, input }) => {
         const { assignmentId, gradingBoundaryId } = input;
-        const assignment = await prisma_1.prisma.assignment.findFirst({
+        const assignment = await prisma.assignment.findFirst({
             where: {
                 id: assignmentId,
             },
         });
         if (!assignment) {
-            throw new server_1.TRPCError({
+            throw new TRPCError({
                 code: "NOT_FOUND",
                 message: "Assignment not found",
             });
         }
         // If gradingBoundaryId is provided, verify it exists
         if (gradingBoundaryId) {
-            const gradingBoundary = await prisma_1.prisma.gradingBoundary.findFirst({
+            const gradingBoundary = await prisma.gradingBoundary.findFirst({
                 where: {
                     id: gradingBoundaryId,
                 },
             });
             if (!gradingBoundary) {
-                throw new server_1.TRPCError({
+                throw new TRPCError({
                     code: "NOT_FOUND",
                     message: "Grading boundary not found",
                 });
             }
         }
-        const updatedAssignment = await prisma_1.prisma.assignment.update({
+        const updatedAssignment = await prisma.assignment.update({
             where: { id: assignmentId },
             data: {
                 gradingBoundary: gradingBoundaryId ? {