@studious-lms/server 1.4.6 → 1.4.7

package/dist/services/worksheet.d.ts

@@ -15,9 +15,9 @@ export declare function getWorksheet(worksheetId: string, userId: string): Promi
         options: import("@prisma/client/runtime/library.js").JsonValue | null;
         id: string;
         createdAt: Date;
+        updatedAt: Date;
         order: number | null;
         points: number;
-        updatedAt: Date;
         worksheetId: string;
         markScheme: import("@prisma/client/runtime/library.js").JsonValue | null;
         question: string;
@@ -27,8 +27,8 @@ export declare function getWorksheet(worksheetId: string, userId: string): Promi
     name: string;
     id: string;
     createdAt: Date;
-    classId: string;
     updatedAt: Date;
+    classId: string;
 }>;
 /** Check if worksheet exists. */
 export declare function worksheetExists(id: string): Promise<boolean>;
@@ -40,8 +40,8 @@ export declare function listWorksheets(classId: string): Promise<{
     name: string;
     id: string;
     createdAt: Date;
-    classId: string;
     updatedAt: Date;
+    classId: string;
 }[]>;
 export declare function updateWorksheetRecord(worksheetId: string, userId: string, data: {
     name?: string;
@@ -49,22 +49,22 @@ export declare function updateWorksheetRecord(worksheetId: string, userId: strin
     name: string;
     id: string;
     createdAt: Date;
-    classId: string;
     updatedAt: Date;
+    classId: string;
 }>;
 export declare function deleteWorksheetRecord(worksheetId: string, userId: string): Promise<{
     name: string;
     id: string;
     createdAt: Date;
-    classId: string;
     updatedAt: Date;
+    classId: string;
 }>;
 export declare function createWorksheetRecord(classId: string, name: string): Promise<{
     name: string;
     id: string;
     createdAt: Date;
-    classId: string;
     updatedAt: Date;
+    classId: string;
 }>;
 /**
  * Create a worksheet by converting a PDF (URL) into structured questions.
@@ -74,8 +74,8 @@ export declare function createWorksheetFromPdf(classId: string, url: string): Pr
     name: string;
     id: string;
     createdAt: Date;
-    classId: string;
     updatedAt: Date;
+    classId: string;
 }>;
 /**
  * Create a worksheet from a PDF that was uploaded through the direct-upload flow.
@@ -84,8 +84,8 @@ export declare function createWorksheetFromUploadedPdf(classId: string, fileId:
     name: string;
     id: string;
     createdAt: Date;
-    classId: string;
     updatedAt: Date;
+    classId: string;
 }>;
 export declare function addQuestionToWorksheet(worksheetId: string, userId: string, data: {
     question: string;
@@ -99,9 +99,9 @@ export declare function addQuestionToWorksheet(worksheetId: string, userId: stri
     options: import("@prisma/client/runtime/library.js").JsonValue | null;
     id: string;
     createdAt: Date;
+    updatedAt: Date;
     order: number | null;
     points: number;
-    updatedAt: Date;
     worksheetId: string;
     markScheme: import("@prisma/client/runtime/library.js").JsonValue | null;
     question: string;
@@ -122,9 +122,9 @@ export declare function updateWorksheetQuestionRecord(worksheetId: string, quest
     options: import("@prisma/client/runtime/library.js").JsonValue | null;
     id: string;
     createdAt: Date;
+    updatedAt: Date;
     order: number | null;
     points: number;
-    updatedAt: Date;
     worksheetId: string;
     markScheme: import("@prisma/client/runtime/library.js").JsonValue | null;
     question: string;
@@ -135,9 +135,9 @@ export declare function deleteWorksheetQuestionRecord(worksheetId: string, quest
     options: import("@prisma/client/runtime/library.js").JsonValue | null;
     id: string;
     createdAt: Date;
+    updatedAt: Date;
     order: number | null;
     points: number;
-    updatedAt: Date;
     worksheetId: string;
     markScheme: import("@prisma/client/runtime/library.js").JsonValue | null;
     question: string;
@@ -152,6 +152,7 @@ export declare function getWorksheetSubmission(worksheetId: string, submissionId
         status: import(".prisma/client").$Enums.GenerationStatus | null;
         id: string;
         createdAt: Date;
+        updatedAt: Date | null;
         studentId: string;
         questionId: string;
         response: string;
@@ -159,17 +160,16 @@ export declare function getWorksheetSubmission(worksheetId: string, submissionId
         markschemeState: import("@prisma/client/runtime/library.js").JsonValue | null;
         points: number;
         feedback: string | null;
-        updatedAt: Date | null;
         studentWorksheetResponseId: string | null;
     })[];
 } & {
     id: string;
-    submissionId: string | null;
     createdAt: Date;
+    updatedAt: Date;
+    submissionId: string | null;
     studentId: string;
     submittedAt: Date | null;
     submitted: boolean;
-    updatedAt: Date;
     worksheetId: string;
 }>;
 export declare function answerWorksheetQuestion(worksheetResponseId: string, questionId: string, response: string, userId: string): Promise<{
@@ -177,6 +177,7 @@ export declare function answerWorksheetQuestion(worksheetResponseId: string, que
         status: import(".prisma/client").$Enums.GenerationStatus | null;
         id: string;
         createdAt: Date;
+        updatedAt: Date | null;
         studentId: string;
         questionId: string;
         response: string;
@@ -184,23 +185,23 @@ export declare function answerWorksheetQuestion(worksheetResponseId: string, que
         markschemeState: import("@prisma/client/runtime/library.js").JsonValue | null;
         points: number;
         feedback: string | null;
-        updatedAt: Date | null;
         studentWorksheetResponseId: string | null;
     }[];
 } & {
     id: string;
-    submissionId: string | null;
     createdAt: Date;
+    updatedAt: Date;
+    submissionId: string | null;
     studentId: string;
     submittedAt: Date | null;
     submitted: boolean;
-    updatedAt: Date;
     worksheetId: string;
 }>;
 export declare function cancelGrading(worksheetResponseId: string, progressId: string, userId: string): Promise<{
     status: import(".prisma/client").$Enums.GenerationStatus | null;
     id: string;
     createdAt: Date;
+    updatedAt: Date | null;
     studentId: string;
     questionId: string;
     response: string;
@@ -208,13 +209,13 @@ export declare function cancelGrading(worksheetResponseId: string, progressId: s
     markschemeState: import("@prisma/client/runtime/library.js").JsonValue | null;
     points: number;
     feedback: string | null;
-    updatedAt: Date | null;
     studentWorksheetResponseId: string | null;
 }>;
 export declare function regradeQuestion(worksheetResponseId: string, progressId: string, userId: string): Promise<{
     status: import(".prisma/client").$Enums.GenerationStatus | null;
     id: string;
     createdAt: Date;
+    updatedAt: Date | null;
     studentId: string;
     questionId: string;
     response: string;
@@ -222,7 +223,6 @@ export declare function regradeQuestion(worksheetResponseId: string, progressId:
     markschemeState: import("@prisma/client/runtime/library.js").JsonValue | null;
     points: number;
     feedback: string | null;
-    updatedAt: Date | null;
     studentWorksheetResponseId: string | null;
 }>;
 export declare function gradeAnswer(questionId: string, studentWorksheetResponseId: string, userId: string, data: {
@@ -236,6 +236,7 @@ export declare function gradeAnswer(questionId: string, studentWorksheetResponse
     status: import(".prisma/client").$Enums.GenerationStatus | null;
     id: string;
     createdAt: Date;
+    updatedAt: Date | null;
     studentId: string;
     questionId: string;
     response: string;
@@ -243,16 +244,15 @@ export declare function gradeAnswer(questionId: string, studentWorksheetResponse
     markschemeState: import("@prisma/client/runtime/library.js").JsonValue | null;
     points: number;
     feedback: string | null;
-    updatedAt: Date | null;
     studentWorksheetResponseId: string | null;
 }>;
 export declare function addCommentToResponse(responseId: string, comment: string, authorId: string): Promise<{
     status: import(".prisma/client").$Enums.GenerationStatus | null;
     id: string;
+    createdAt: Date;
     assignmentId: string | null;
     submissionId: string | null;
     announcementId: string | null;
-    createdAt: Date;
     modifiedAt: Date | null;
     content: string;
     authorId: string;

package/package.json

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

package/prisma/migrations/20260504071500_school_memberships/migration.sql

@@ -0,0 +1,81 @@
+-- Add durable multi-school membership and invite support.
+
+CREATE TYPE "SchoolMembershipRole" AS ENUM ('ADMIN', 'TEACHER', 'STUDENT');
+CREATE TYPE "SchoolMembershipStatus" AS ENUM ('ACTIVE', 'INVITED', 'SUSPENDED');
+CREATE TYPE "SchoolInviteStatus" AS ENUM ('PENDING', 'ACCEPTED', 'REVOKED', 'EXPIRED');
+
+ALTER TABLE "School"
+  ALTER COLUMN "logoId" DROP NOT NULL,
+  ADD COLUMN "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  ADD COLUMN "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;
+
+CREATE TABLE "SchoolMembership" (
+  "id" TEXT NOT NULL,
+  "schoolId" TEXT NOT NULL,
+  "userId" TEXT NOT NULL,
+  "role" "SchoolMembershipRole" NOT NULL,
+  "status" "SchoolMembershipStatus" NOT NULL DEFAULT 'ACTIVE',
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "updatedAt" TIMESTAMP(3) NOT NULL,
+
+  CONSTRAINT "SchoolMembership_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE "SchoolInvite" (
+  "id" TEXT NOT NULL,
+  "token" TEXT NOT NULL,
+  "email" TEXT NOT NULL,
+  "role" "SchoolMembershipRole" NOT NULL,
+  "status" "SchoolInviteStatus" NOT NULL DEFAULT 'PENDING',
+  "expiresAt" TIMESTAMP(3) NOT NULL,
+  "acceptedAt" TIMESTAMP(3),
+  "revokedAt" TIMESTAMP(3),
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "updatedAt" TIMESTAMP(3) NOT NULL,
+  "schoolId" TEXT NOT NULL,
+  "invitedById" TEXT NOT NULL,
+
+  CONSTRAINT "SchoolInvite_pkey" PRIMARY KEY ("id")
+);
+
+INSERT INTO "SchoolMembership" ("id", "schoolId", "userId", "role", "status", "createdAt", "updatedAt")
+SELECT
+  "id",
+  "schoolId",
+  "id",
+  CASE
+    WHEN "role" = 'ADMIN' THEN 'ADMIN'::"SchoolMembershipRole"
+    WHEN "role" = 'TEACHER' THEN 'TEACHER'::"SchoolMembershipRole"
+    ELSE 'STUDENT'::"SchoolMembershipRole"
+  END,
+  'ACTIVE'::"SchoolMembershipStatus",
+  CURRENT_TIMESTAMP,
+  CURRENT_TIMESTAMP
+FROM "User"
+WHERE "schoolId" IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+CREATE UNIQUE INDEX "SchoolMembership_schoolId_userId_key" ON "SchoolMembership"("schoolId", "userId");
+CREATE INDEX "SchoolMembership_userId_idx" ON "SchoolMembership"("userId");
+CREATE INDEX "SchoolMembership_schoolId_role_idx" ON "SchoolMembership"("schoolId", "role");
+CREATE INDEX "SchoolMembership_schoolId_status_idx" ON "SchoolMembership"("schoolId", "status");
+
+CREATE UNIQUE INDEX "SchoolInvite_token_key" ON "SchoolInvite"("token");
+CREATE INDEX "SchoolInvite_schoolId_status_idx" ON "SchoolInvite"("schoolId", "status");
+CREATE INDEX "SchoolInvite_email_idx" ON "SchoolInvite"("email");
+
+ALTER TABLE "SchoolMembership"
+  ADD CONSTRAINT "SchoolMembership_schoolId_fkey"
+  FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE "SchoolMembership"
+  ADD CONSTRAINT "SchoolMembership_userId_fkey"
+  FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE "SchoolInvite"
+  ADD CONSTRAINT "SchoolInvite_schoolId_fkey"
+  FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE "SchoolInvite"
+  ADD CONSTRAINT "SchoolInvite_invitedById_fkey"
+  FOREIGN KEY ("invitedById") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/prisma/schema.prisma

@@ -81,15 +81,38 @@ enum SubmissionRecommendationState {
   DISMISSED
 }
 
+enum SchoolMembershipRole {
+  ADMIN
+  TEACHER
+  STUDENT
+}
+
+enum SchoolMembershipStatus {
+  ACTIVE
+  INVITED
+  SUSPENDED
+}
+
+enum SchoolInviteStatus {
+  PENDING
+  ACCEPTED
+  REVOKED
+  EXPIRED
+}
+
 model School {
   id          String      @id @default(uuid())
   name        String
-  logo        File        @relation(references: [id], fields: [logoId])
-  logoId      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[]
 }
 
@@ -123,6 +146,8 @@ model User {
 
   school School? @relation(fields: [schoolId], references: [id])
   schoolId String?
+  schoolMemberships SchoolMembership[]
+  sentSchoolInvites SchoolInvite[] @relation("SchoolInviteInvitedBy")
 
   // Chat relations
   conversationMemberships ConversationMember[]
@@ -134,6 +159,45 @@ model User {
 
 }
 
+model SchoolMembership {
+  id        String                 @id @default(uuid())
+  schoolId  String
+  userId    String
+  role      SchoolMembershipRole
+  status    SchoolMembershipStatus @default(ACTIVE)
+  createdAt DateTime               @default(now())
+  updatedAt DateTime               @updatedAt
+
+  school School @relation(fields: [schoolId], references: [id], onDelete: Cascade)
+  user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@unique([schoolId, userId])
+  @@index([userId])
+  @@index([schoolId, role])
+  @@index([schoolId, status])
+}
+
+model SchoolInvite {
+  id          String               @id @default(uuid())
+  token       String               @unique
+  email       String
+  role        SchoolMembershipRole
+  status      SchoolInviteStatus   @default(PENDING)
+  expiresAt   DateTime
+  acceptedAt  DateTime?
+  revokedAt   DateTime?
+  createdAt   DateTime             @default(now())
+  updatedAt   DateTime             @updatedAt
+
+  schoolId    String
+  school      School               @relation(fields: [schoolId], references: [id], onDelete: Cascade)
+  invitedById String
+  invitedBy   User                 @relation("SchoolInviteInvitedBy", fields: [invitedById], references: [id], onDelete: Cascade)
+
+  @@index([schoolId, status])
+  @@index([email])
+}
+
 model UserProfile {
   id String @id @default(uuid())
   userId String @unique

package/src/models/access.ts

@@ -0,0 +1,48 @@
+/**
+ * Shared class access filters.
+ */
+
+export const schoolAdminForClassWhere = (userId: string) => ({
+  OR: [
+    {
+      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) => ({
+  OR: [
+    { teachers: { some: { id: userId } } },
+    schoolAdminForClassWhere(userId),
+  ],
+});
+
+export const classMemberOrSchoolAdminWhere = (userId: string) => ({
+  OR: [
+    { teachers: { some: { id: userId } } },
+    { students: { some: { id: userId } } },
+    schoolAdminForClassWhere(userId),
+  ],
+});

package/src/models/announcement.ts

@@ -56,13 +56,30 @@ export function findAnnouncementByIdAndClass(id: string, classId: string) {
   });
 }
 
-/** @returns Announcement by ID with class and teachers. */
+/** @returns Announcement by ID with class teachers and school admins. */
 export function findAnnouncementWithClass(id: string) {
   return prisma.announcement.findUnique({
     where: { id },
     include: {
       class: {
-        include: { teachers: true },
+        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 },
+              },
+            },
+          },
+        },
       },
       attachments: {
         select: {

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: {