@studious-lms/server 1.4.5 → 1.4.7

package/src/models/assignment.ts

@@ -2,6 +2,11 @@
  * Assignment model – assignments, submissions, attachments.
  */
 import { prisma } from "../lib/prisma.js";
+import {
+  classMemberOrSchoolAdminWhere,
+  classTeacherOrSchoolAdminWhere,
+  schoolAdminForClassWhere,
+} from "./access.js";
 
 const assignmentGetInclude = {
   submissions: {
@@ -57,7 +62,13 @@ export function findAssignmentWithDetails(id: string) {
 /** @returns Assignment with attachments for delete. */
 export function findAssignmentForDelete(id: string, teacherId: string) {
   return prisma.assignment.findFirst({
-    where: { id, teacherId },
+    where: {
+      id,
+      OR: [
+        { teacherId },
+        { class: schoolAdminForClassWhere(teacherId) },
+      ],
+    },
     include: {
       attachments: { include: { thumbnail: true } },
       submissions: {
@@ -115,12 +126,7 @@ export function findSubmissionByIdForClassMember(submissionId: string, classId:
       id: submissionId,
       assignment: {
         classId,
-        class: {
-          OR: [
-            { teachers: { some: { id: userId } } },
-            { students: { some: { id: userId } } },
-          ],
-        },
+        class: classMemberOrSchoolAdminWhere(userId),
       },
     },
     include: {
@@ -148,9 +154,7 @@ export function findSubmissionForUpdate(submissionId: string, userId: string) {
         { studentId: userId },
         {
           assignment: {
-            class: {
-              teachers: { some: { id: userId } },
-            },
+            class: classTeacherOrSchoolAdminWhere(userId),
           },
         },
       ],
@@ -204,7 +208,7 @@ export function findAssignmentWithClassForTeacher(assignmentId: string, teacherI
   return prisma.assignment.findFirst({
     where: {
       id: assignmentId,
-      class: { teachers: { some: { id: teacherId } } },
+      class: classTeacherOrSchoolAdminWhere(teacherId),
     },
     include: { class: true },
   });
@@ -216,7 +220,7 @@ export function findSubmissionsByAssignmentForTeacher(assignmentId: string, teac
     where: {
       assignment: {
         id: assignmentId,
-        class: { teachers: { some: { id: teacherId } } },
+        class: classTeacherOrSchoolAdminWhere(teacherId),
       },
     },
     include: {
@@ -251,7 +255,7 @@ export function findSubmissionForTeacherUpdate(submissionId: string, teacherId:
     where: {
       id: submissionId,
       assignment: {
-        class: { teachers: { some: { id: teacherId } } },
+        class: classTeacherOrSchoolAdminWhere(teacherId),
       },
     },
     include: {

package/src/models/attendance.ts

@@ -2,6 +2,7 @@
  * Attendance model – attendance records, present/late/absent students per event.
  */
 import { prisma } from "../lib/prisma.js";
+import { classTeacherOrSchoolAdminWhere } from "./access.js";
 
 const attendanceInclude = {
   event: {
@@ -105,12 +106,12 @@ export function findClassWithStudents(classId: string) {
   });
 }
 
-/** @returns Class if user is a teacher. */
+/** @returns Class if user is a teacher or school admin. */
 export function findClassWithTeacher(classId: string, teacherId: string) {
-  return prisma.class.findUnique({
+  return prisma.class.findFirst({
     where: {
       id: classId,
-      teachers: { some: { id: teacherId } },
+      ...classTeacherOrSchoolAdminWhere(teacherId),
     },
   });
 }

package/src/models/auth.ts

@@ -5,6 +5,10 @@
 import { SessionType } from "@prisma/client";
 import { getRedis } from "../lib/redis.js";
 import { prisma } from "../lib/prisma.js";
+import {
+  classMemberOrSchoolAdminWhere,
+  classTeacherOrSchoolAdminWhere,
+} from "./access.js";
 
 const AUTH_SESSION_CACHE_PREFIX = "auth-session:";
 
@@ -246,9 +250,7 @@ export async function findUserBySessionToken(token: string) {
 /** @returns Class IDs where user is a teacher. */
 export function findTeacherClassesByUserId(userId: string) {
   return prisma.class.findMany({
-    where: {
-      teachers: { some: { id: userId } },
-    },
+    where: classTeacherOrSchoolAdminWhere(userId),
     select: { id: true },
   });
 }
@@ -258,20 +260,17 @@ export function findClassWithMember(classId: string, userId: string) {
   return prisma.class.findFirst({
     where: {
       id: classId,
-      OR: [
-        { students: { some: { id: userId } } },
-        { teachers: { some: { id: userId } } },
-      ],
+      ...classMemberOrSchoolAdminWhere(userId),
     },
   });
 }
 
-/** @returns Class if user is a teacher. */
+/** @returns Class if user is a teacher or school admin. */
 export function findClassWithTeacher(classId: string, teacherId: string) {
   return prisma.class.findFirst({
     where: {
       id: classId,
-      teachers: { some: { id: teacherId } },
+      ...classTeacherOrSchoolAdminWhere(teacherId),
     },
   });
 }

package/src/models/class.ts

@@ -10,6 +10,10 @@ import type { PrismaClient, WorksheetQuestion } from "@prisma/client";
 import { prisma } from "../lib/prisma.js";
 import { v4 as uuidv4 } from 'uuid';
 import { copyFile } from "../lib/googleCloudStorage.js";
+import {
+  classMemberOrSchoolAdminWhere,
+  classTeacherOrSchoolAdminWhere,
+} from "./access.js";
 
 const classIncludeForGetAll = {
   assignments: {
@@ -55,7 +59,7 @@ const classIncludeForGetAll = {
 /** @returns Classes where user is a teacher. */
 export function findTeacherClasses(userId: string) {
   return prisma.class.findMany({
-    where: { teachers: { some: { id: userId } } },
+    where: classTeacherOrSchoolAdminWhere(userId),
     include: classIncludeForGetAll,
   });
 }
@@ -68,12 +72,12 @@ export function findStudentClasses(userId: string) {
   });
 }
 
-/** @returns Class if user is a teacher. */
+/** @returns Class if user is a teacher or school admin. */
 export function isTeacherInClass(classId: string, userId: string) {
   return prisma.class.findFirst({
     where: {
       id: classId,
-      teachers: { some: { id: userId } },
+      ...classTeacherOrSchoolAdminWhere(userId),
     },
   });
 }
@@ -218,12 +222,7 @@ export function findClassWithAssignments(
     where: {
       id: classId,
       ...(options.userId
-        ? {
-            OR: [
-              { students: { some: { id: options.userId } } },
-              { teachers: { some: { id: options.userId } } },
-            ],
-          }
+        ? classMemberOrSchoolAdminWhere(options.userId)
         : {}),
     },
     include: {

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: {
@@ -42,6 +46,27 @@ export const commentSelect = {
   },
 } as const;
 
+const commentClassAuthSelect = {
+  id: true,
+  teachers: { select: { id: true } },
+  students: { select: { id: true } },
+  school: {
+    select: {
+      users: {
+        where: { role: "ADMIN" as const },
+        select: { id: true },
+      },
+      memberships: {
+        where: {
+          role: "ADMIN" as const,
+          status: "ACTIVE" as const,
+        },
+        select: { userId: true },
+      },
+    },
+  },
+} as const;
+
 /** @returns Comment by ID with author and reactions. */
 export function findCommentById(id: string) {
   return prisma.comment.findUnique({
@@ -77,6 +102,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 +171,113 @@ 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: commentClassAuthSelect,
+          },
+        },
+      },
+      assignment: {
+        select: {
+          class: {
+            select: commentClassAuthSelect,
+          },
+        },
+      },
+      submission: {
+        select: {
+          studentId: true,
+          assignment: {
+            select: {
+              class: {
+                select: commentClassAuthSelect,
+              },
+            },
+          },
+        },
+      },
+      studentQuestionProgress: {
+        select: {
+          studentId: true,
+          studentWorksheetResponse: {
+            select: {
+              submission: {
+                select: {
+                  studentId: true,
+                  assignment: {
+                    select: {
+                      class: {
+                        select: commentClassAuthSelect,
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+      parentComment: {
+        include: {
+          announcement: {
+            select: {
+              class: {
+                select: commentClassAuthSelect,
+              },
+            },
+          },
+          assignment: {
+            select: {
+              class: {
+                select: commentClassAuthSelect,
+              },
+            },
+          },
+          submission: {
+            select: {
+              studentId: true,
+              assignment: {
+                select: {
+                  class: {
+                    select: commentClassAuthSelect,
+                  },
+                },
+              },
+            },
+          },
+          studentQuestionProgress: {
+            select: {
+              studentId: true,
+              studentWorksheetResponse: {
+                select: {
+                  submission: {
+                    select: {
+                      studentId: true,
+                      assignment: {
+                        select: {
+                          class: {
+                            select: commentClassAuthSelect,
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  });
+}
+
 /** @returns Reaction counts by type for a comment. */
 export function getReactionCountsByCommentId(commentId: string) {
   return prisma.reaction.groupBy({

package/src/models/event.ts

@@ -2,9 +2,29 @@
  * Event model – calendar events, assignment attachment/detachment.
  */
 import { prisma } from "../lib/prisma.js";
+import { classTeacherOrSchoolAdminWhere } from "./access.js";
 
 const eventGetInclude = {
-  class: true,
+  class: {
+    include: {
+      teachers: { select: { id: true } },
+      school: {
+        include: {
+          users: {
+            where: { role: "ADMIN" as const },
+            select: { id: true },
+          },
+          memberships: {
+            where: {
+              role: "ADMIN" as const,
+              status: "ACTIVE" as const,
+            },
+            select: { userId: true },
+          },
+        },
+      },
+    },
+  },
   user: true,
   assignmentsAttached: {
     select: {
@@ -50,12 +70,12 @@ export function findEventById(id: string) {
   });
 }
 
-/** @returns Class if user is a teacher. */
+/** @returns Class if user is a teacher or school admin. */
 export function findClassWithTeachers(classId: string, teacherId: string) {
-  return prisma.class.findUnique({
+  return prisma.class.findFirst({
     where: {
       id: classId,
-      teachers: { some: { id: teacherId } },
+      ...classTeacherOrSchoolAdminWhere(teacherId),
     },
   });
 }
@@ -111,6 +131,21 @@ export function findEventWithClass(eventId: string) {
       class: {
         include: {
           teachers: { select: { id: true } },
+          school: {
+            include: {
+              users: {
+                where: { role: "ADMIN" as const },
+                select: { id: true },
+              },
+              memberships: {
+                where: {
+                  role: "ADMIN" as const,
+                  status: "ACTIVE" as const,
+                },
+                select: { userId: true },
+              },
+            },
+          },
         },
       },
     },
@@ -125,6 +160,21 @@ export function findAssignmentWithClass(assignmentId: string) {
       class: {
         include: {
           teachers: { select: { id: true } },
+          school: {
+            include: {
+              users: {
+                where: { role: "ADMIN" as const },
+                select: { id: true },
+              },
+              memberships: {
+                where: {
+                  role: "ADMIN" as const,
+                  status: "ACTIVE" as const,
+                },
+                select: { userId: true },
+              },
+            },
+          },
         },
       },
     },

package/src/models/file.ts

@@ -3,6 +3,26 @@
  */
 import { prisma } from "../lib/prisma.js";
 
+const classFileAccessInclude = {
+  students: true,
+  teachers: true,
+  school: {
+    include: {
+      users: {
+        where: { role: "ADMIN" as const },
+        select: { id: true },
+      },
+      memberships: {
+        where: {
+          role: "ADMIN" as const,
+          status: "ACTIVE" as const,
+        },
+        select: { userId: true },
+      },
+    },
+  },
+} as const;
+
 /** @returns File with assignment, submission, annotations, folder, announcement for permission checks. */
 export function findFileById(fileId: string) {
   return prisma.file.findUnique({
@@ -11,10 +31,7 @@ export function findFileById(fileId: string) {
       assignment: {
         include: {
           class: {
-            include: {
-              students: true,
-              teachers: true,
-            },
+            include: classFileAccessInclude,
           },
         },
       },
@@ -26,6 +43,21 @@ export function findFileById(fileId: string) {
               class: {
                 include: {
                   teachers: true,
+                  school: {
+                    include: {
+                      users: {
+                        where: { role: "ADMIN" as const },
+                        select: { id: true },
+                      },
+                      memberships: {
+                        where: {
+                          role: "ADMIN" as const,
+                          status: "ACTIVE" as const,
+                        },
+                        select: { userId: true },
+                      },
+                    },
+                  },
                 },
               },
             },
@@ -40,6 +72,21 @@ export function findFileById(fileId: string) {
               class: {
                 include: {
                   teachers: true,
+                  school: {
+                    include: {
+                      users: {
+                        where: { role: "ADMIN" as const },
+                        select: { id: true },
+                      },
+                      memberships: {
+                        where: {
+                          role: "ADMIN" as const,
+                          status: "ACTIVE" as const,
+                        },
+                        select: { userId: true },
+                      },
+                    },
+                  },
                 },
               },
             },
@@ -49,20 +96,14 @@ export function findFileById(fileId: string) {
       folder: {
         include: {
           class: {
-            include: {
-              students: true,
-              teachers: true,
-            },
+            include: classFileAccessInclude,
           },
         },
       },
       announcement: {
         include: {
           class: {
-            include: {
-              students: true,
-              teachers: true,
-            },
+            include: classFileAccessInclude,
           },
         },
       },

package/src/models/folder.ts

@@ -2,6 +2,7 @@
  * Folder model – class folders, hierarchy, contents. Teacher permission checks.
  */
 import { prisma } from "../lib/prisma.js";
+import { classTeacherOrSchoolAdminWhere } from "./access.js";
 
 const fileSelect = {
   id: true,
@@ -19,12 +20,12 @@ const childFolderSelect = {
   _count: { select: { files: true, childFolders: true } },
 };
 
-/** @returns Class if user is a teacher. */
+/** @returns Class if user is a teacher or school admin. */
 export function findClassWithTeacher(classId: string, teacherId: string) {
   return prisma.class.findFirst({
     where: {
       id: classId,
-      teachers: { some: { id: teacherId } },
+      ...classTeacherOrSchoolAdminWhere(teacherId),
     },
   });
 }

package/src/models/labChat.ts

@@ -2,6 +2,10 @@
  * Lab chat model – AI lab conversations, members, posts. Teacher/student access.
  */
 import { prisma } from "../lib/prisma.js";
+import {
+  classMemberOrSchoolAdminWhere,
+  classTeacherOrSchoolAdminWhere,
+} from "./access.js";
 
 const labChatInclude = {
   conversation: {
@@ -51,7 +55,7 @@ export function findClassWithTeachersForLab(classId: string, teacherId: string)
   return prisma.class.findFirst({
     where: {
       id: classId,
-      teachers: { some: { id: teacherId } },
+      ...classTeacherOrSchoolAdminWhere(teacherId),
     },
     include: {
       students: {
@@ -95,13 +99,13 @@ export function findLabChatByMember(labChatId: string, userId: string) {
   });
 }
 
-/** @returns Lab chat if user is class teacher. */
+/** @returns Lab chat if user is class teacher or school admin. */
 export function findLabChatByTeacher(labChatId: string, userId: string) {
   return prisma.labChat.findFirst({
     where: {
       id: labChatId,
       class: {
-        teachers: { some: { id: userId } },
+        ...classTeacherOrSchoolAdminWhere(userId),
       },
     },
     include: {
@@ -118,15 +122,12 @@ export function findLabChatById(labChatId: string) {
   });
 }
 
-/** @returns Class if user is student or teacher. */
+/** @returns Class if user is student, teacher, or school admin. */
 export function findClassMembership(classId: string, userId: string) {
   return prisma.class.findFirst({
     where: {
       id: classId,
-      OR: [
-        { students: { some: { id: userId } } },
-        { teachers: { some: { id: userId } } },
-      ],
+      ...classMemberOrSchoolAdminWhere(userId),
     },
   });
 }