@studious-lms/server 1.7.0 → 1.8.0

package/prisma/schema.prisma

@@ -111,18 +111,70 @@ enum SchoolInviteStatus {
 }
 
 model School {
-  id        String   @id @default(uuid())
-  name      String
-  logo      File?    @relation(references: [id], fields: [logoId])
-  logoId    String?
-  subdomain String?  @unique
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  users       User[]
-  memberships SchoolMembership[]
-  invites     SchoolInvite[]
-  classes     Class[]
+  id          String   @id @default(uuid())
+  name        String
+  description String?
+  logo        File?    @relation("SchoolLogo", references: [id], fields: [logoId])
+  logoId      String?
+  subdomain   String?  @unique
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+
+  users         User[]
+  memberships   SchoolMembership[]
+  invites       SchoolInvite[]
+  classes       Class[]
+  departments   Department[]
+  tags          Tag[]
+  storageRoot   Folder?            @relation("SchoolStorageRoot")
+}
+
+model Department {
+  id          String   @id @default(uuid())
+  schoolId    String
+  name        String
+  description String?
+  color       String?  @default("#3B82F6")
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+
+  school            School            @relation(fields: [schoolId], references: [id], onDelete: Cascade)
+  members           User[]            @relation("UserDepartments")
+  classes           Class[]
+  tags              Tag[]
+  rubricTemplates   MarkScheme[]
+  boundaryTemplates GradingBoundary[]
+
+  @@unique([schoolId, name])
+  @@index([schoolId])
+}
+
+enum TagTarget {
+  USER
+  CLASS
+  RUBRIC
+  BOUNDARY
+}
+
+model Tag {
+  id           String   @id @default(uuid())
+  schoolId     String
+  departmentId String?
+  name         String
+  color        String   @default("#3B82F6")
+  createdAt    DateTime @default(now())
+  updatedAt    DateTime @updatedAt
+
+  school     School            @relation(fields: [schoolId], references: [id], onDelete: Cascade)
+  department Department?       @relation(fields: [departmentId], references: [id], onDelete: SetNull)
+  users      User[]            @relation("UserTags")
+  classes    Class[]           @relation("ClassTags")
+  rubrics    MarkScheme[]      @relation("MarkSchemeTags")
+  boundaries GradingBoundary[] @relation("GradingBoundaryTags")
+
+  @@unique([schoolId, name])
+  @@index([schoolId])
+  @@index([departmentId])
 }
 
 model User {
@@ -132,7 +184,6 @@ model User {
   password String
   profile  UserProfile?
   verified Boolean      @default(false)
-  role     UserRole     @default(NONE)
 
   teacherIn Class[] @relation("UserTeacherToClass")
   studentIn Class[] @relation("UserStudentToClass")
@@ -158,6 +209,10 @@ model User {
   schoolMemberships SchoolMembership[]
   sentSchoolInvites SchoolInvite[]     @relation("SchoolInviteInvitedBy")
 
+  departments     Department[] @relation("UserDepartments")
+  tags            Tag[]        @relation("UserTags")
+  personalStorage Folder?      @relation("UserStorageRoot")
+
   // Chat relations
   conversationMemberships ConversationMember[]
   sentMessages            Message[]            @relation("SentMessages")
@@ -238,8 +293,6 @@ model Class {
   worksheets        Worksheet[]
   students          User[]            @relation("UserStudentToClass")
   teachers          User[]            @relation("UserTeacherToClass")
-  // markSchemes   MarkScheme[] @relation("ClassToMarkScheme")
-  // gradingBoundaries GradingBoundary[] @relation("ClassToGradingBoundary")
   draftFiles        File[]            @relation("ClassDraftFiles")
   classFiles        Folder?           @relation("ClassFiles")
   labChats          LabChat[]         @relation("ClassLabChats")
@@ -247,36 +300,67 @@ model Class {
   gradingBoundaries GradingBoundary[]
   school            School?           @relation(fields: [schoolId], references: [id])
   schoolId          String?
+  department        Department?       @relation(fields: [departmentId], references: [id], onDelete: SetNull)
+  departmentId      String?
+  tags              Tag[]             @relation("ClassTags")
+
+  @@index([schoolId])
+  @@index([departmentId])
 }
 
 model MarkScheme {
-  id          String       @id @default(uuid())
-  classId     String
-  // class Class[] @relation("ClassToMarkScheme")
-  class       Class?       @relation(fields: [classId], references: [id], onDelete: Cascade)
-  structured  String
-  assignments Assignment[]
+  id           String       @id @default(uuid())
+  classId      String?
+  class        Class?       @relation(fields: [classId], references: [id], onDelete: Cascade)
+  departmentId String?
+  department   Department?  @relation(fields: [departmentId], references: [id], onDelete: Cascade)
+  name         String?
+  structured   String
+  assignments  Assignment[]
+  tags         Tag[]        @relation("MarkSchemeTags")
+
+  @@index([classId])
+  @@index([departmentId])
 }
 
 model GradingBoundary {
-  id          String       @id @default(uuid())
-  classId     String
-  // class Class[] @relation("ClassToGradingBoundary")
-  class       Class?       @relation(fields: [classId], references: [id], onDelete: Cascade)
-  structured  String
-  assignments Assignment[]
+  id           String       @id @default(uuid())
+  classId      String?
+  class        Class?       @relation(fields: [classId], references: [id], onDelete: Cascade)
+  departmentId String?
+  department   Department?  @relation(fields: [departmentId], references: [id], onDelete: Cascade)
+  name         String?
+  structured   String
+  assignments  Assignment[]
+  tags         Tag[]        @relation("GradingBoundaryTags")
+
+  @@index([classId])
+  @@index([departmentId])
+}
+
+enum FolderScope {
+  CLASS
+  SCHOOL_STORAGE
+  PERSONAL
+  GENERIC
 }
 
 model Folder {
-  id             String   @id @default(uuid())
+  id             String      @id @default(uuid())
   name           String
-  files          File[]   @relation("FolderFiles")
-  childFolders   Folder[] @relation("ParentChildFolders")
-  parentFolder   Folder?  @relation("ParentChildFolders", fields: [parentFolderId], references: [id])
+  scope          FolderScope @default(GENERIC)
+  files          File[]      @relation("FolderFiles")
+  childFolders   Folder[]    @relation("ParentChildFolders")
+  parentFolder   Folder?     @relation("ParentChildFolders", fields: [parentFolderId], references: [id])
   parentFolderId String?
-  color          String?  @default("#3B82F6")
-  class          Class?   @relation("ClassFiles", fields: [classId], references: [id])
-  classId        String?  @unique
+  color          String?     @default("#3B82F6")
+
+  class           Class?  @relation("ClassFiles", fields: [classId], references: [id])
+  classId         String? @unique
+  schoolStorage   School? @relation("SchoolStorageRoot", fields: [schoolStorageId], references: [id], onDelete: Cascade)
+  schoolStorageId String? @unique
+  personalOwner   User?   @relation("UserStorageRoot", fields: [personalOwnerId], references: [id], onDelete: Cascade)
+  personalOwnerId String? @unique
 }
 
 model File {
@@ -328,7 +412,7 @@ model File {
   announcement   Announcement? @relation("AnnouncementAttachments", fields: [announcementId], references: [id], onDelete: Cascade)
   announcementId String?
 
-  schools School[]
+  schools School[] @relation("SchoolLogo")
 
   schoolDevelopementProgram   SchoolDevelopementProgram? @relation("SchoolDevelopementProgramSupportingDocumentation", fields: [schoolDevelopementProgramId], references: [id], onDelete: Cascade)
   schoolDevelopementProgramId String?

package/src/models/access.ts

@@ -3,33 +3,17 @@
  */
 
 export const schoolAdminForClassWhere = (userId: string) => ({
-  OR: [
-    {
-      school: {
-        is: {
-          memberships: {
-            some: {
-              userId,
-              role: "ADMIN" as const,
-              status: "ACTIVE" as const,
-            },
-          },
+  school: {
+    is: {
+      memberships: {
+        some: {
+          userId,
+          role: "ADMIN" as const,
+          status: "ACTIVE" as const,
         },
       },
     },
-    {
-      school: {
-        is: {
-          users: {
-            some: {
-              id: userId,
-              role: "ADMIN" as const,
-            },
-          },
-        },
-      },
-    },
-  ],
+  },
 });
 
 export const classTeacherOrSchoolAdminWhere = (userId: string) => ({

package/src/models/announcement.ts

@@ -67,7 +67,6 @@ export function findAnnouncementWithClass(id: string) {
           school: {
             include: {
               users: {
-                where: { role: "ADMIN" as const },
                 select: { id: true },
               },
               memberships: {

package/src/models/auth.ts

@@ -61,7 +61,6 @@ export function findUserByEmail(email: string) {
     select: {
       id: true,
       email: true,
-      role: true,
       profile: {
         select: {
           displayName: true,

package/src/models/class.ts

@@ -54,6 +54,19 @@ const classIncludeForGetAll = {
       },
     },
   },
+  school: {
+    select: {
+      id: true,
+      name: true,
+    },
+  },
+  department: {
+    select: {
+      id: true,
+      name: true,
+      color: true,
+    },
+  },
 } as const;
 
 /** @returns Classes where user is a teacher. */

package/src/models/cloudStorage.ts

@@ -0,0 +1,194 @@
+/**
+ * CloudStorage model — scope-aware folder helpers used by the institution and
+ * personal cloud storage UI. Sits on top of the same Folder/File tables that
+ * back class folders, but adds scope (school/personal) and ownership semantics.
+ */
+import type { FolderScope } from "@prisma/client";
+import { prisma } from "../lib/prisma.js";
+
+export type CloudScope =
+  | { kind: "CLASS"; classId: string }
+  | { kind: "SCHOOL_STORAGE"; schoolId: string }
+  | { kind: "PERSONAL"; userId: string };
+
+const folderSelect = {
+  id: true,
+  name: true,
+  color: true,
+  scope: true,
+  classId: true,
+  schoolStorageId: true,
+  personalOwnerId: true,
+  parentFolderId: true,
+} as const;
+
+export async function findOrCreateScopeRoot(scope: CloudScope) {
+  switch (scope.kind) {
+    case "CLASS": {
+      let root = await prisma.folder.findFirst({
+        where: { classId: scope.classId, parentFolderId: null },
+      });
+      if (!root) {
+        root = await prisma.folder.create({
+          data: {
+            name: "Class Files",
+            scope: "CLASS" as FolderScope,
+            class: { connect: { id: scope.classId } },
+          },
+        });
+      } else if (root.scope !== "CLASS") {
+        root = await prisma.folder.update({
+          where: { id: root.id },
+          data: { scope: "CLASS" as FolderScope },
+        });
+      }
+      return root;
+    }
+    case "SCHOOL_STORAGE": {
+      let root = await prisma.folder.findFirst({
+        where: { schoolStorageId: scope.schoolId },
+      });
+      if (!root) {
+        root = await prisma.folder.create({
+          data: {
+            name: "Cloud Storage",
+            scope: "SCHOOL_STORAGE" as FolderScope,
+            schoolStorage: { connect: { id: scope.schoolId } },
+          },
+        });
+      }
+      return root;
+    }
+    case "PERSONAL": {
+      let root = await prisma.folder.findFirst({
+        where: { personalOwnerId: scope.userId },
+      });
+      if (!root) {
+        root = await prisma.folder.create({
+          data: {
+            name: "My Files",
+            scope: "PERSONAL" as FolderScope,
+            personalOwner: { connect: { id: scope.userId } },
+          },
+        });
+      }
+      return root;
+    }
+  }
+}
+
+/**
+ * Walk up the folder tree until we reach a root with a scope owner. Used to
+ * permission-check sub-folders (which only carry a parentFolderId).
+ */
+export async function resolveFolderScope(
+  folderId: string
+): Promise<CloudScope | null> {
+  let currentId: string | null = folderId;
+  let visits = 0;
+  while (currentId && visits < 64) {
+    const folder = await prisma.folder.findUnique({
+      where: { id: currentId },
+      select: folderSelect,
+    });
+    if (!folder) return null;
+    if (folder.classId) return { kind: "CLASS", classId: folder.classId };
+    if (folder.schoolStorageId)
+      return { kind: "SCHOOL_STORAGE", schoolId: folder.schoolStorageId };
+    if (folder.personalOwnerId)
+      return { kind: "PERSONAL", userId: folder.personalOwnerId };
+    if (!folder.parentFolderId) return null;
+    currentId = folder.parentFolderId;
+    visits += 1;
+  }
+  return null;
+}
+
+const fileSelect = {
+  id: true,
+  name: true,
+  type: true,
+  size: true,
+  path: true,
+  uploadedAt: true,
+  user: { select: { id: true, username: true } },
+} as const;
+
+const childFolderSelect = {
+  id: true,
+  name: true,
+  color: true,
+  _count: { select: { files: true, childFolders: true } },
+} as const;
+
+export function findFolderWithContents(folderId: string) {
+  return prisma.folder.findFirst({
+    where: { id: folderId },
+    include: {
+      files: {
+        where: { uploadStatus: "COMPLETED" },
+        select: fileSelect,
+        orderBy: { uploadedAt: "desc" },
+      },
+      childFolders: {
+        select: childFolderSelect,
+        orderBy: { name: "asc" },
+      },
+      parentFolder: { select: { id: true, name: true } },
+    },
+  });
+}
+
+export function createSubFolder(data: {
+  name: string;
+  parentFolderId: string;
+  color?: string;
+}) {
+  return prisma.folder.create({
+    data: {
+      name: data.name,
+      color: data.color,
+      parentFolder: { connect: { id: data.parentFolderId } },
+    },
+    select: folderSelect,
+  });
+}
+
+export function findFolderById(folderId: string) {
+  return prisma.folder.findUnique({
+    where: { id: folderId },
+    select: folderSelect,
+  });
+}
+
+export function deleteFolderById(folderId: string) {
+  return prisma.folder.delete({ where: { id: folderId } });
+}
+
+export function renameFolder(folderId: string, name: string, color?: string) {
+  return prisma.folder.update({
+    where: { id: folderId },
+    data: {
+      name,
+      ...(color ? { color } : {}),
+    },
+    select: folderSelect,
+  });
+}
+
+export async function listFolderBreadcrumbs(folderId: string) {
+  const breadcrumbs: { id: string; name: string }[] = [];
+  let currentId: string | null = folderId;
+  let visits = 0;
+  while (currentId && visits < 64) {
+    const folder = await prisma.folder.findUnique({
+      where: { id: currentId },
+      select: { id: true, name: true, parentFolderId: true },
+    });
+    if (!folder) break;
+    breadcrumbs.unshift({ id: folder.id, name: folder.name });
+    currentId = folder.parentFolderId;
+    visits += 1;
+  }
+  return breadcrumbs;
+}

package/src/models/comment.ts

@@ -52,10 +52,6 @@ const commentClassAuthSelect = {
   students: { select: { id: true } },
   school: {
     select: {
-      users: {
-        where: { role: "ADMIN" as const },
-        select: { id: true },
-      },
       memberships: {
         where: {
           role: "ADMIN" as const,

package/src/models/department.ts

@@ -0,0 +1,159 @@
+/**
+ * Department model — department CRUD, members, and template artefacts.
+ *
+ * Departments scope rubric/boundary templates and tags inside an institution.
+ * They are an admin-managed taxonomy; teachers/students can be members of
+ * many departments.
+ */
+import { prisma } from "../lib/prisma.js";
+
+const departmentSelect = {
+  id: true,
+  schoolId: true,
+  name: true,
+  description: true,
+  color: true,
+  createdAt: true,
+  updatedAt: true,
+} as const;
+
+const memberSelect = {
+  id: true,
+  username: true,
+  email: true,
+  profile: {
+    select: {
+      displayName: true,
+      profilePicture: true,
+      profilePictureThumbnail: true,
+    },
+  },
+} as const;
+
+export function listDepartmentsForSchool(schoolId: string) {
+  return prisma.department.findMany({
+    where: { schoolId },
+    orderBy: { name: "asc" },
+    select: {
+      ...departmentSelect,
+      _count: {
+        select: {
+          members: true,
+          classes: true,
+          tags: true,
+          rubricTemplates: true,
+          boundaryTemplates: true,
+        },
+      },
+    },
+  });
+}
+
+export function listDepartmentsForUser(userId: string, schoolId: string) {
+  return prisma.department.findMany({
+    where: {
+      schoolId,
+      members: { some: { id: userId } },
+    },
+    orderBy: { name: "asc" },
+    select: departmentSelect,
+  });
+}
+
+export function getDepartment(departmentId: string) {
+  return prisma.department.findUnique({
+    where: { id: departmentId },
+    select: {
+      ...departmentSelect,
+      members: { select: memberSelect },
+      tags: {
+        select: { id: true, name: true, color: true },
+      },
+      rubricTemplates: {
+        select: { id: true, name: true, structured: true },
+      },
+      boundaryTemplates: {
+        select: { id: true, name: true, structured: true },
+      },
+      classes: {
+        select: {
+          id: true,
+          name: true,
+          subject: true,
+          section: true,
+          color: true,
+        },
+      },
+    },
+  });
+}
+
+export function createDepartment(data: {
+  schoolId: string;
+  name: string;
+  description?: string;
+  color?: string;
+}) {
+  return prisma.department.create({
+    data: {
+      schoolId: data.schoolId,
+      name: data.name,
+      description: data.description,
+      color: data.color,
+    },
+    select: departmentSelect,
+  });
+}
+
+export function updateDepartment(
+  departmentId: string,
+  data: { name?: string; description?: string | null; color?: string }
+) {
+  return prisma.department.update({
+    where: { id: departmentId },
+    data,
+    select: departmentSelect,
+  });
+}
+
+export function deleteDepartment(departmentId: string) {
+  return prisma.department.delete({
+    where: { id: departmentId },
+  });
+}
+
+export function addDepartmentMembers(
+  departmentId: string,
+  userIds: string[]
+) {
+  return prisma.department.update({
+    where: { id: departmentId },
+    data: {
+      members: { connect: userIds.map((id) => ({ id })) },
+    },
+    select: { id: true },
+  });
+}
+
+export function removeDepartmentMember(
+  departmentId: string,
+  userId: string
+) {
+  return prisma.department.update({
+    where: { id: departmentId },
+    data: {
+      members: { disconnect: { id: userId } },
+    },
+    select: { id: true },
+  });
+}
+
+export function findDepartmentMembership(
+  departmentId: string,
+  userId: string
+) {
+  return prisma.department.findFirst({
+    where: { id: departmentId, members: { some: { id: userId } } },
+    select: { id: true },
+  });
+}

package/src/models/event.ts

@@ -11,7 +11,6 @@ const eventGetInclude = {
       school: {
         include: {
           users: {
-            where: { role: "ADMIN" as const },
             select: { id: true },
           },
           memberships: {
@@ -134,7 +133,6 @@ export function findEventWithClass(eventId: string) {
           school: {
             include: {
               users: {
-                where: { role: "ADMIN" as const },
                 select: { id: true },
               },
               memberships: {
@@ -163,7 +161,6 @@ export function findAssignmentWithClass(assignmentId: string) {
           school: {
             include: {
               users: {
-                where: { role: "ADMIN" as const },
                 select: { id: true },
               },
               memberships: {

package/src/models/file.ts

@@ -9,7 +9,6 @@ const classFileAccessInclude = {
   school: {
     include: {
       users: {
-        where: { role: "ADMIN" as const },
         select: { id: true },
       },
       memberships: {
@@ -46,7 +45,6 @@ export function findFileById(fileId: string) {
                   school: {
                     include: {
                       users: {
-                        where: { role: "ADMIN" as const },
                         select: { id: true },
                       },
                       memberships: {
@@ -75,7 +73,6 @@ export function findFileById(fileId: string) {
                   school: {
                     include: {
                       users: {
-                        where: { role: "ADMIN" as const },
                         select: { id: true },
                       },
                       memberships: {