@studious-lms/server 1.4.6 → 1.4.7

package/src/models/comment.ts

@@ -46,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({
@@ -158,22 +179,14 @@ export function findCommentWithContext(commentId: string) {
       announcement: {
         select: {
           class: {
-            select: {
-              id: true,
-              teachers: { select: { id: true } },
-              students: { select: { id: true } },
-            },
+            select: commentClassAuthSelect,
           },
         },
       },
       assignment: {
         select: {
           class: {
-            select: {
-              id: true,
-              teachers: { select: { id: true } },
-              students: { select: { id: true } },
-            },
+            select: commentClassAuthSelect,
           },
         },
       },
@@ -183,11 +196,7 @@ export function findCommentWithContext(commentId: string) {
           assignment: {
             select: {
               class: {
-                select: {
-                  id: true,
-                  teachers: { select: { id: true } },
-                  students: { select: { id: true } },
-                },
+                select: commentClassAuthSelect,
               },
             },
           },
@@ -204,11 +213,7 @@ export function findCommentWithContext(commentId: string) {
                   assignment: {
                     select: {
                       class: {
-                        select: {
-                          id: true,
-                          teachers: { select: { id: true } },
-                          students: { select: { id: true } },
-                        },
+                        select: commentClassAuthSelect,
                       },
                     },
                   },
@@ -223,22 +228,14 @@ export function findCommentWithContext(commentId: string) {
           announcement: {
             select: {
               class: {
-                select: {
-                  id: true,
-                  teachers: { select: { id: true } },
-                  students: { select: { id: true } },
-                },
+                select: commentClassAuthSelect,
               },
             },
           },
           assignment: {
             select: {
               class: {
-                select: {
-                  id: true,
-                  teachers: { select: { id: true } },
-                  students: { select: { id: true } },
-                },
+                select: commentClassAuthSelect,
               },
             },
           },
@@ -248,11 +245,7 @@ export function findCommentWithContext(commentId: string) {
               assignment: {
                 select: {
                   class: {
-                    select: {
-                      id: true,
-                      teachers: { select: { id: true } },
-                      students: { select: { id: true } },
-                    },
+                    select: commentClassAuthSelect,
                   },
                 },
               },
@@ -269,11 +262,7 @@ export function findCommentWithContext(commentId: string) {
                       assignment: {
                         select: {
                           class: {
-                            select: {
-                              id: true,
-                              teachers: { select: { id: true } },
-                              students: { select: { id: true } },
-                            },
+                            select: commentClassAuthSelect,
                           },
                         },
                       },

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),
     },
   });
 }