@studious-lms/server 1.4.5 → 1.4.6

package/dist/services/comment.js.map

@@ -1 +1 @@
-{"version":3,"file":"comment.js","sources":["services/comment.ts"],"sourceRoot":"/","sourcesContent":["/**\n * Comment service – get comments, replies, and reactions. Used for announcements and worksheets.\n */\nimport { TRPCError } from \"@trpc/server\";\nimport {\n  findCommentById,\n  findRepliesByCommentId,\n  createComment,\n  findReactionByUserAndComment,\n  upsertReaction,\n  deleteReactionById,\n  findCommentWithAnnouncement,\n  getReactionCountsByCommentId,\n} from \"../models/comment.js\";\n\n/** Get a comment by ID. */\nexport async function getComment(id: string) {\n  const comment = await findCommentById(id);\n  if (!comment) {\n    throw new TRPCError({\n      code: \"NOT_FOUND\",\n      message: \"Comment not found\",\n    });\n  }\n  return comment;\n}\n\n/** Get all replies to a comment. */\nexport async function getReplies(commentId: string) {\n  return findRepliesByCommentId(commentId);\n}\n\n/** Create a reply to an existing comment. */\nexport async function replyToComment(\n  userId: string,\n  parentCommentId: string,\n  content: string\n) {\n  return createComment({\n    parentCommentId,\n    content,\n    authorId: userId,\n  });\n}\n\n/** Add or update a reaction (emoji) on a comment. */\nexport async function addReaction(\n  userId: string,\n  commentId: string,\n  type: string\n) {\n  const comment = await findCommentById(commentId);\n  if (!comment) {\n    throw new TRPCError({\n      code: \"INTERNAL_SERVER_ERROR\",\n      message: \"Unexpected error\",\n    });\n  }\n\n  const reaction = await upsertReaction({ userId, commentId, type });\n  return { reaction };\n}\n\n/** Remove user's reaction from a comment. */\nexport async function removeReaction(userId: string, commentId: string) {\n  const reaction = await findReactionByUserAndComment(userId, commentId);\n  if (!reaction) {\n    throw new TRPCError({\n      code: \"NOT_FOUND\",\n      message: \"Reaction not found\",\n    });\n  }\n  await deleteReactionById(reaction.id);\n  return { success: true };\n}\n\nexport async function getReactions(userId: string, commentId: string) {\n  const comment = await findCommentWithAnnouncement(commentId);\n  if (!comment) {\n    throw new TRPCError({\n      code: \"NOT_FOUND\",\n      message: \"Comment not found\",\n    });\n  }\n\n  const reactionCounts = await getReactionCountsByCommentId(commentId);\n  const userReaction = await findReactionByUserAndComment(userId, commentId);\n\n  const counts = {\n    THUMBSUP: 0,\n    CELEBRATE: 0,\n    CARE: 0,\n    HEART: 0,\n    IDEA: 0,\n    HAPPY: 0,\n  };\n  reactionCounts.forEach((item) => {\n    counts[item.type as keyof typeof counts] = item._count.type;\n  });\n\n  return {\n    counts,\n    userReaction: userReaction?.type || null,\n    total: reactionCounts.reduce((sum, item) => sum + item._count.type, 0),\n  };\n}\n"],"names":[],"mappings":"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","debug_id":"381af507-0513-5413-ae9b-6bcb211761ee"}
+{"version":3,"file":"comment.js","sources":["services/comment.ts"],"sourceRoot":"/","sourcesContent":["/**\n * Comment service – get comments, replies, and reactions.\n */\nimport { TRPCError } from \"@trpc/server\";\nimport { prisma } from \"../lib/prisma.js\";\nimport {\n  findCommentById,\n  findRepliesByCommentId,\n  createComment,\n  findReactionByUserAndComment,\n  upsertReaction,\n  deleteReactionById,\n  findCommentWithContext,\n  getReactionCountsByCommentId,\n} from \"../models/comment.js\";\n\nfunction getCommentClass(comment: any) {\n  return (\n    comment.announcement?.class ??\n    comment.assignment?.class ??\n    comment.submission?.assignment?.class ??\n    comment.studentQuestionProgress?.studentWorksheetResponse?.submission?.assignment?.class ??\n    comment.parentComment?.announcement?.class ??\n    comment.parentComment?.assignment?.class ??\n    comment.parentComment?.submission?.assignment?.class ??\n    comment.parentComment?.studentQuestionProgress?.studentWorksheetResponse?.submission?.assignment?.class ??\n    null\n  );\n}\n\nfunction getPrivateStudentId(comment: any) {\n  return (\n    comment.submission?.studentId ??\n    comment.studentQuestionProgress?.studentWorksheetResponse?.submission?.studentId ??\n    comment.studentQuestionProgress?.studentId ??\n    comment.parentComment?.submission?.studentId ??\n    comment.parentComment?.studentQuestionProgress?.studentWorksheetResponse?.submission?.studentId ??\n    comment.parentComment?.studentQuestionProgress?.studentId ??\n    null\n  );\n}\n\nfunction isClassTeacher(comment: any, userId: string) {\n  return getCommentClass(comment)?.teachers?.some((teacher: { id: string }) => teacher.id === userId) ?? false;\n}\n\nfunction isClassMember(comment: any, userId: string) {\n  const classData = getCommentClass(comment);\n  return (\n    classData?.teachers?.some((teacher: { id: string }) => teacher.id === userId) ||\n    classData?.students?.some((student: { id: string }) => student.id === userId) ||\n    false\n  );\n}\n\nfunction canReadComment(comment: any, userId: string) {\n  const privateStudentId = getPrivateStudentId(comment);\n  if (privateStudentId) {\n    return privateStudentId === userId || isClassTeacher(comment, userId);\n  }\n  return isClassMember(comment, userId);\n}\n\nfunction canDeleteComment(comment: any, userId: string) {\n  return comment.authorId === userId || isClassTeacher(comment, userId);\n}\n\nasync function requireCommentAccess(commentId: string, userId: string) {\n  const comment = await findCommentWithContext(commentId);\n  if (!comment) {\n    throw new TRPCError({\n      code: \"NOT_FOUND\",\n      message: \"Comment not found\",\n    });\n  }\n  if (!canReadComment(comment, userId)) {\n    throw new TRPCError({\n      code: \"FORBIDDEN\",\n      message: \"You do not have access to this comment\",\n    });\n  }\n  return comment;\n}\n\n/** Get a comment by ID. */\nexport async function getComment(userId: string, id: string) {\n  await requireCommentAccess(id, userId);\n  const comment = await findCommentById(id);\n  if (!comment) {\n    throw new TRPCError({\n      code: \"NOT_FOUND\",\n      message: \"Comment not found\",\n    });\n  }\n  return comment;\n}\n\n/** Get all replies to a comment. */\nexport async function getReplies(userId: string, commentId: string) {\n  await requireCommentAccess(commentId, userId);\n  return findRepliesByCommentId(commentId);\n}\n\n/** Create a reply to an existing comment. */\nexport async function replyToComment(\n  userId: string,\n  parentCommentId: string,\n  content: string\n) {\n  const parentComment = await requireCommentAccess(parentCommentId, userId);\n  return createComment({\n    parentCommentId,\n    content,\n    authorId: userId,\n    announcementId: parentComment.announcementId,\n    assignmentId: parentComment.assignmentId,\n    submissionId: parentComment.submissionId,\n    studentQuestionProgressId: parentComment.studentQuestionProgressId,\n  });\n}\n\n/** Update a comment authored by the user. */\nexport async function updateComment(userId: string, id: string, content: string) {\n  const comment = await requireCommentAccess(id, userId);\n  if (comment.authorId !== userId) {\n    throw new TRPCError({\n      code: \"FORBIDDEN\",\n      message: \"Only the comment author can update this comment\",\n    });\n  }\n\n  return prisma.comment.update({\n    where: { id },\n    data: { content },\n  });\n}\n\n/** Delete a comment authored by the user or moderated by a class teacher. */\nexport async function deleteComment(userId: string, id: string) {\n  const comment = await requireCommentAccess(id, userId);\n  if (!canDeleteComment(comment, userId)) {\n    throw new TRPCError({\n      code: \"FORBIDDEN\",\n      message: \"Only the comment author or class teachers can delete comments\",\n    });\n  }\n\n  await prisma.comment.delete({ where: { id } });\n  return { success: true };\n}\n\n/** Add or update a reaction (emoji) on a comment. */\nexport async function addReaction(\n  userId: string,\n  commentId: string,\n  type: string\n) {\n  await requireCommentAccess(commentId, userId);\n\n  const reaction = await upsertReaction({ userId, commentId, type });\n  return { reaction };\n}\n\n/** Remove user's reaction from a comment. */\nexport async function removeReaction(userId: string, commentId: string) {\n  await requireCommentAccess(commentId, userId);\n  const reaction = await findReactionByUserAndComment(userId, commentId);\n  if (!reaction) {\n    throw new TRPCError({\n      code: \"NOT_FOUND\",\n      message: \"Reaction not found\",\n    });\n  }\n  await deleteReactionById(reaction.id);\n  return { success: true };\n}\n\nexport async function getReactions(userId: string, commentId: string) {\n  await requireCommentAccess(commentId, userId);\n\n  const reactionCounts = await getReactionCountsByCommentId(commentId);\n  const userReaction = await findReactionByUserAndComment(userId, commentId);\n\n  const counts = {\n    THUMBSUP: 0,\n    CELEBRATE: 0,\n    CARE: 0,\n    HEART: 0,\n    IDEA: 0,\n    HAPPY: 0,\n  };\n  reactionCounts.forEach((item) => {\n    counts[item.type as keyof typeof counts] = item._count.type;\n  });\n\n  return {\n    counts,\n    userReaction: userReaction?.type || null,\n    total: reactionCounts.reduce((sum, item) => sum + item._count.type, 0),\n  };\n}\n"],"names":[],"mappings":"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","debug_id":"2f340cd4-2a5e-59d9-8448-05f1acff840a"}

package/dist/services/worksheet.d.ts

@@ -249,6 +249,8 @@ export declare function gradeAnswer(questionId: string, studentWorksheetResponse
 export declare function addCommentToResponse(responseId: string, comment: string, authorId: string): Promise<{
     status: import(".prisma/client").$Enums.GenerationStatus | null;
     id: string;
+    assignmentId: string | null;
+    submissionId: string | null;
     announcementId: string | null;
     createdAt: Date;
     modifiedAt: Date | null;

package/dist/services/worksheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worksheet.d.ts","sourceRoot":"/","sources":["services/worksheet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worksheet.d.ts","sourceRoot":"/","sources":["services/worksheet.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studious-lms/server",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "Backend server for Studious application",
   "main": "dist/exportType.js",
   "types": "dist/exportType.d.ts",

package/prisma/migrations/20260502230500_assignment_submission_comments/migration.sql

@@ -0,0 +1,60 @@
+ALTER TABLE "public"."Comment" ADD COLUMN "assignmentId" TEXT;
+ALTER TABLE "public"."Comment" ADD COLUMN "submissionId" TEXT;
+
+CREATE INDEX "Comment_assignmentId_idx" ON "public"."Comment"("assignmentId");
+CREATE INDEX "Comment_submissionId_idx" ON "public"."Comment"("submissionId");
+
+ALTER TABLE "public"."Comment" ADD CONSTRAINT "Comment_assignmentId_fkey" FOREIGN KEY ("assignmentId") REFERENCES "public"."Assignment"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE "public"."Comment" ADD CONSTRAINT "Comment_submissionId_fkey" FOREIGN KEY ("submissionId") REFERENCES "public"."Submission"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+WITH RECURSIVE "CommentOwnerContext" AS (
+  SELECT
+    "id",
+    "parentCommentId",
+    "announcementId",
+    "assignmentId",
+    "submissionId",
+    "studentQuestionProgressId"
+  FROM "public"."Comment"
+  WHERE "parentCommentId" IS NULL
+
+  UNION ALL
+
+  SELECT
+    child."id",
+    child."parentCommentId",
+    COALESCE(child."announcementId", parent."announcementId"),
+    COALESCE(child."assignmentId", parent."assignmentId"),
+    COALESCE(child."submissionId", parent."submissionId"),
+    COALESCE(child."studentQuestionProgressId", parent."studentQuestionProgressId")
+  FROM "public"."Comment" child
+  INNER JOIN "CommentOwnerContext" parent ON child."parentCommentId" = parent."id"
+)
+UPDATE "public"."Comment" c
+SET
+  "announcementId" = owner."announcementId",
+  "assignmentId" = owner."assignmentId",
+  "submissionId" = owner."submissionId",
+  "studentQuestionProgressId" = owner."studentQuestionProgressId"
+FROM "CommentOwnerContext" owner
+WHERE c."id" = owner."id"
+  AND c."parentCommentId" IS NOT NULL
+  AND (
+    (CASE WHEN c."assignmentId" IS NOT NULL THEN 1 ELSE 0 END) +
+    (CASE WHEN c."submissionId" IS NOT NULL THEN 1 ELSE 0 END) +
+    (CASE WHEN c."announcementId" IS NOT NULL THEN 1 ELSE 0 END) +
+    (CASE WHEN c."studentQuestionProgressId" IS NOT NULL THEN 1 ELSE 0 END)
+  ) = 0
+  AND (
+    (CASE WHEN owner."assignmentId" IS NOT NULL THEN 1 ELSE 0 END) +
+    (CASE WHEN owner."submissionId" IS NOT NULL THEN 1 ELSE 0 END) +
+    (CASE WHEN owner."announcementId" IS NOT NULL THEN 1 ELSE 0 END) +
+    (CASE WHEN owner."studentQuestionProgressId" IS NOT NULL THEN 1 ELSE 0 END)
+  ) = 1;
+
+ALTER TABLE "public"."Comment" ADD CONSTRAINT "Comment_single_owner_check" CHECK (
+  (CASE WHEN "assignmentId" IS NOT NULL THEN 1 ELSE 0 END) +
+  (CASE WHEN "submissionId" IS NOT NULL THEN 1 ELSE 0 END) +
+  (CASE WHEN "announcementId" IS NOT NULL THEN 1 ELSE 0 END) +
+  (CASE WHEN "studentQuestionProgressId" IS NOT NULL THEN 1 ELSE 0 END) = 1
+);

package/prisma/schema.prisma

@@ -282,6 +282,7 @@ model Assignment {
   aiPolicyLevel Int @default(0)
 
   submissions   Submission[]
+  comments      Comment[] @relation("AssignmentComments")
   assignedTo    User[] @relation("SpecificAssignmentAssignedTo")
   section       Section?       @relation(fields: [sectionId], references: [id], onDelete: Cascade)
   sectionId     String?
@@ -325,6 +326,10 @@ model Comment {
   authorId      String
   announcement  Announcement? @relation(fields: [announcementId], references: [id], onDelete: Cascade)
   announcementId String?
+  assignment    Assignment? @relation("AssignmentComments", fields: [assignmentId], references: [id], onDelete: Cascade)
+  assignmentId  String?
+  submission    Submission? @relation("SubmissionComments", fields: [submissionId], references: [id], onDelete: Cascade)
+  submissionId  String?
   parentComment Comment? @relation("CommentReplies", fields: [parentCommentId], references: [id], onDelete: Cascade)
   parentCommentId String?
   status GenerationStatus?
@@ -334,6 +339,9 @@ model Comment {
   modifiedAt    DateTime? @updatedAt
   studentQuestionProgress StudentQuestionProgress? @relation("StudentQuestionProgressComments", fields: [studentQuestionProgressId], references: [id], onDelete: Cascade)
   studentQuestionProgressId String?
+
+  @@index([assignmentId])
+  @@index([submissionId])
 }
 
 model Reaction {
@@ -366,6 +374,7 @@ model Submission {
 
   attachments File[]  @relation("SubmissionFile")
   annotations File[]  @relation("SubmissionAnnotations")
+  comments Comment[] @relation("SubmissionComments")
   worksheetResponses StudentWorksheetResponse[]
   extendedResponse String?
   gradeReceived Int?

package/src/lib/config/cors.ts

@@ -18,6 +18,10 @@ const nonProductionOrigins = [
   'http://127.0.0.1:3000',
   'http://127.0.0.1:3001',
 ];
+
+/** Any preview / prod deployment on *.vercel.app (HTTPS only). */
+const vercelAppOriginPattern = /^https:\/\/[a-z0-9][a-z0-9.-]*\.vercel\.app$/i;
+
 const MAX_PATTERN_LENGTH = 200;
 // This heuristic only targets common nested-quantifier cases like `(a+)+`.
 // It does not catch every risky construct (for example `.*.*` or deep alternation nesting),
@@ -77,7 +81,10 @@ export const createCorsOriginMatcher = (env: CorsEnv) => {
     ...parseCorsOrigins(env.CORS_ALLOWED_ORIGINS),
   ].filter(isDefined)));
 
-  const allowedOriginPatterns = parseCorsOriginPatterns(env.CORS_ALLOWED_ORIGIN_PATTERNS);
+  const allowedOriginPatterns = [
+    vercelAppOriginPattern,
+    ...parseCorsOriginPatterns(env.CORS_ALLOWED_ORIGIN_PATTERNS),
+  ];
 
   const isAllowedOrigin = (origin?: string) => {
     const corsOrigin = origin ? toCorsOrigin(origin) : undefined;

package/src/models/comment.ts

@@ -1,5 +1,5 @@
 /**
- * Comment model – comments, replies, and reactions (for announcements/worksheets).
+ * Comment model – comments, replies, and reactions.
  */
 import { prisma } from "../lib/prisma.js";
 import type { ReactionType } from "@prisma/client";
@@ -7,6 +7,10 @@ import type { ReactionType } from "@prisma/client";
 export const commentSelect = {
   id: true,
   content: true,
+  announcementId: true,
+  assignmentId: true,
+  submissionId: true,
+  parentCommentId: true,
   createdAt: true,
   modifiedAt: true,
   author: {
@@ -77,6 +81,10 @@ export function createComment(data: {
   parentCommentId: string;
   content: string;
   authorId: string;
+  announcementId?: string | null;
+  assignmentId?: string | null;
+  submissionId?: string | null;
+  studentQuestionProgressId?: string | null;
 }) {
   return prisma.comment.create({
     data,
@@ -142,6 +150,145 @@ export function findCommentWithAnnouncement(commentId: string) {
   });
 }
 
+/** @returns Comment with the owning class context for authorization. */
+export function findCommentWithContext(commentId: string) {
+  return prisma.comment.findUnique({
+    where: { id: commentId },
+    include: {
+      announcement: {
+        select: {
+          class: {
+            select: {
+              id: true,
+              teachers: { select: { id: true } },
+              students: { select: { id: true } },
+            },
+          },
+        },
+      },
+      assignment: {
+        select: {
+          class: {
+            select: {
+              id: true,
+              teachers: { select: { id: true } },
+              students: { select: { id: true } },
+            },
+          },
+        },
+      },
+      submission: {
+        select: {
+          studentId: true,
+          assignment: {
+            select: {
+              class: {
+                select: {
+                  id: true,
+                  teachers: { select: { id: true } },
+                  students: { select: { id: true } },
+                },
+              },
+            },
+          },
+        },
+      },
+      studentQuestionProgress: {
+        select: {
+          studentId: true,
+          studentWorksheetResponse: {
+            select: {
+              submission: {
+                select: {
+                  studentId: true,
+                  assignment: {
+                    select: {
+                      class: {
+                        select: {
+                          id: true,
+                          teachers: { select: { id: true } },
+                          students: { select: { id: true } },
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+      parentComment: {
+        include: {
+          announcement: {
+            select: {
+              class: {
+                select: {
+                  id: true,
+                  teachers: { select: { id: true } },
+                  students: { select: { id: true } },
+                },
+              },
+            },
+          },
+          assignment: {
+            select: {
+              class: {
+                select: {
+                  id: true,
+                  teachers: { select: { id: true } },
+                  students: { select: { id: true } },
+                },
+              },
+            },
+          },
+          submission: {
+            select: {
+              studentId: true,
+              assignment: {
+                select: {
+                  class: {
+                    select: {
+                      id: true,
+                      teachers: { select: { id: true } },
+                      students: { select: { id: true } },
+                    },
+                  },
+                },
+              },
+            },
+          },
+          studentQuestionProgress: {
+            select: {
+              studentId: true,
+              studentWorksheetResponse: {
+                select: {
+                  submission: {
+                    select: {
+                      studentId: true,
+                      assignment: {
+                        select: {
+                          class: {
+                            select: {
+                              id: true,
+                              teachers: { select: { id: true } },
+                              students: { select: { id: true } },
+                            },
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  });
+}
+
 /** @returns Reaction counts by type for a comment. */
 export function getReactionCountsByCommentId(commentId: string) {
   return prisma.reaction.groupBy({

package/src/pipelines/aiLabChat.ts

@@ -16,7 +16,8 @@ import { DocumentBlock } from "../lib/jsonStyles.js";
 import { type LabChatResponse, labChatResponseSchema } from "./aiLabChatContract.js";
 import { buildLabChatResponseMessages } from "./labChatPrompt.js";
 
-const LAB_CHAT_RESPONSE_TIMEOUT_MS = 90_000;
+/** Cap model wait time; leave headroom after inference for PDF/GCS/DB within Vercel maxDuration (500s). */
+const LAB_CHAT_RESPONSE_TIMEOUT_MS = 400_000;
 
 const withTimeout = async <T>(
   task: Promise<T>,

package/src/routers/assignment.ts

@@ -172,6 +172,66 @@ const updateUploadProgressSchema = z.object({
   progress: z.number().min(0).max(100),
 });
 
+const assignmentCommentSchema = z.object({
+  assignmentId: z.string(),
+  classId: z.string(),
+  content: z.string().min(1, "Comment cannot be empty"),
+  parentCommentId: z.string().optional(),
+});
+
+const assignmentCommentsSchema = z.object({
+  assignmentId: z.string(),
+  classId: z.string(),
+});
+
+const submissionCommentSchema = z.object({
+  assignmentId: z.string(),
+  classId: z.string(),
+  submissionId: z.string(),
+  content: z.string().min(1, "Comment cannot be empty"),
+  parentCommentId: z.string().optional(),
+});
+
+const submissionCommentsSchema = z.object({
+  assignmentId: z.string(),
+  classId: z.string(),
+  submissionId: z.string(),
+});
+
+const commentInclude = {
+  author: {
+    select: {
+      id: true,
+      username: true,
+      profile: {
+        select: {
+          displayName: true,
+          profilePicture: true,
+          profilePictureThumbnail: true,
+        },
+      },
+    },
+  },
+  replies: {
+    include: {
+      author: {
+        select: {
+          id: true,
+          username: true,
+          profile: {
+            select: {
+              displayName: true,
+              profilePicture: true,
+              profilePictureThumbnail: true,
+            },
+          },
+        },
+      },
+    },
+    orderBy: { createdAt: "asc" as const },
+  },
+} as const;
+
 export const assignmentRouter = createTRPCRouter({
   reorder: protectedTeacherProcedure
     .input(z.object({
@@ -254,6 +314,170 @@ export const assignmentRouter = createTRPCRouter({
     .input(z.object({ assignmentId: z.string(), classId: z.string() }))
     .query(({ ctx, input }) => getSubmissions(input.assignmentId, ctx.user!.id)),
 
+  getComments: protectedClassMemberProcedure
+    .input(assignmentCommentsSchema)
+    .query(async ({ input }) => {
+      const assignment = await prisma.assignment.findFirst({
+        where: { id: input.assignmentId, classId: input.classId },
+        select: { id: true },
+      });
+      if (!assignment) {
+        throw new TRPCError({
+          code: "NOT_FOUND",
+          message: "Assignment not found",
+        });
+      }
+
+      const comments = await prisma.comment.findMany({
+        where: {
+          assignmentId: input.assignmentId,
+          submissionId: null,
+          parentCommentId: null,
+        },
+        include: commentInclude,
+        orderBy: { createdAt: "asc" },
+      });
+
+      return { comments };
+    }),
+
+  addComment: protectedClassMemberProcedure
+    .input(assignmentCommentSchema)
+    .mutation(async ({ ctx, input }) => {
+      const assignment = await prisma.assignment.findFirst({
+        where: { id: input.assignmentId, classId: input.classId },
+        select: { id: true },
+      });
+      if (!assignment) {
+        throw new TRPCError({
+          code: "NOT_FOUND",
+          message: "Assignment not found",
+        });
+      }
+
+      if (input.parentCommentId) {
+        const parentComment = await prisma.comment.findFirst({
+          where: {
+            id: input.parentCommentId,
+            assignmentId: input.assignmentId,
+            submissionId: null,
+          },
+          select: { id: true },
+        });
+        if (!parentComment) {
+          throw new TRPCError({
+            code: "NOT_FOUND",
+            message: "Parent comment not found",
+          });
+        }
+      }
+
+      const comment = await prisma.comment.create({
+        data: {
+          content: input.content,
+          authorId: ctx.user!.id,
+          assignmentId: input.assignmentId,
+          ...(input.parentCommentId && { parentCommentId: input.parentCommentId }),
+        },
+        include: commentInclude,
+      });
+
+      return { comment };
+    }),
+
+  getSubmissionComments: protectedClassMemberProcedure
+    .input(submissionCommentsSchema)
+    .query(async ({ ctx, input }) => {
+      const submission = await prisma.submission.findFirst({
+        where: {
+          id: input.submissionId,
+          assignmentId: input.assignmentId,
+          assignment: {
+            classId: input.classId,
+            class: {
+              OR: [
+                { teachers: { some: { id: ctx.user!.id } } },
+                { students: { some: { id: ctx.user!.id } } },
+              ],
+            },
+          },
+          OR: [
+            { studentId: ctx.user!.id },
+            { assignment: { class: { teachers: { some: { id: ctx.user!.id } } } } },
+          ],
+        },
+        select: { id: true },
+      });
+      if (!submission) {
+        throw new TRPCError({
+          code: "NOT_FOUND",
+          message: "Submission not found",
+        });
+      }
+
+      const comments = await prisma.comment.findMany({
+        where: {
+          submissionId: input.submissionId,
+          parentCommentId: null,
+        },
+        include: commentInclude,
+        orderBy: { createdAt: "asc" },
+      });
+
+      return { comments };
+    }),
+
+  addSubmissionComment: protectedClassMemberProcedure
+    .input(submissionCommentSchema)
+    .mutation(async ({ ctx, input }) => {
+      const submission = await prisma.submission.findFirst({
+        where: {
+          id: input.submissionId,
+          assignmentId: input.assignmentId,
+          assignment: { classId: input.classId },
+          OR: [
+            { studentId: ctx.user!.id },
+            { assignment: { class: { teachers: { some: { id: ctx.user!.id } } } } },
+          ],
+        },
+        select: { id: true },
+      });
+      if (!submission) {
+        throw new TRPCError({
+          code: "NOT_FOUND",
+          message: "Submission not found",
+        });
+      }
+
+      if (input.parentCommentId) {
+        const parentComment = await prisma.comment.findFirst({
+          where: {
+            id: input.parentCommentId,
+            submissionId: input.submissionId,
+          },
+          select: { id: true },
+        });
+        if (!parentComment) {
+          throw new TRPCError({
+            code: "NOT_FOUND",
+            message: "Parent comment not found",
+          });
+        }
+      }
+
+      const comment = await prisma.comment.create({
+        data: {
+          content: input.content,
+          authorId: ctx.user!.id,
+          submissionId: input.submissionId,
+          ...(input.parentCommentId && { parentCommentId: input.parentCommentId }),
+        },
+        include: commentInclude,
+      });
+
+      return { comment };
+    }),
+
   updateSubmissionAsTeacher: protectedTeacherProcedure
     .input(updateSubmissionSchema)
     .mutation(({ ctx, input }) =>
@@ -660,4 +884,3 @@ export const assignmentRouter = createTRPCRouter({
       };
     }),
 });
-

package/src/routers/comment.ts

@@ -5,6 +5,8 @@ import {
   getComment,
   getReplies,
   replyToComment,
+  updateComment,
+  deleteComment,
   addReaction,
   removeReaction,
   getReactions,
@@ -15,11 +17,11 @@ export { commentSelect } from "../models/comment.js";
 export const commentRouter = createTRPCRouter({
   get: protectedProcedure
     .input(z.object({ id: z.string() }))
-    .query(({ input }) => getComment(input.id)),
+    .query(({ ctx, input }) => getComment(ctx.user!.id, input.id)),
 
   getReplies: protectedProcedure
     .input(z.object({ commentId: z.string() }))
-    .query(({ input }) => getReplies(input.commentId)),
+    .query(({ ctx, input }) => getReplies(ctx.user!.id, input.commentId)),
 
   replyToComment: protectedProcedure
     .input(
@@ -32,6 +34,21 @@ export const commentRouter = createTRPCRouter({
       replyToComment(ctx.user!.id, input.parentCommentId, input.content)
     ),
 
+  update: protectedProcedure
+    .input(
+      z.object({
+        id: z.string(),
+        content: z.string().min(1, "Comment cannot be empty"),
+      })
+    )
+    .mutation(({ ctx, input }) =>
+      updateComment(ctx.user!.id, input.id, input.content)
+    ),
+
+  delete: protectedProcedure
+    .input(z.object({ id: z.string() }))
+    .mutation(({ ctx, input }) => deleteComment(ctx.user!.id, input.id)),
+
   addReaction: protectedProcedure
     .input(
       z.object({