@studious-lms/server 1.4.5 → 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,14 +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;
-    announcementId: string | null;
     createdAt: Date;
+    assignmentId: string | null;
+    submissionId: string | null;
+    announcementId: string | null;
     modifiedAt: Date | null;
     content: string;
     authorId: string;

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.7",
   "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/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
@@ -282,6 +346,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 +390,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 +403,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 +438,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/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: {