@studious-lms/server 1.20.0 → 1.22.0

package/prisma/migrations/20260708011629_add_gradebook_categories_columns_policies/migration.sql

@@ -0,0 +1,78 @@
+-- CreateEnum
+CREATE TYPE "GradeRoundingMode" AS ENUM ('NONE', 'HALF_UP', 'FLOOR', 'CEILING');
+
+-- AlterTable
+ALTER TABLE "Assignment" ADD COLUMN     "gradeCategoryId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Class" ADD COLUMN     "gradeRoundingMode" "GradeRoundingMode" NOT NULL DEFAULT 'NONE',
+ADD COLUMN     "treatMissingAsZero" BOOLEAN NOT NULL DEFAULT false;
+
+-- CreateTable
+CREATE TABLE "GradeCategory" (
+    "id" TEXT NOT NULL,
+    "classId" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "weight" DOUBLE PRECISION NOT NULL,
+    "dropLowest" INTEGER NOT NULL DEFAULT 0,
+    "position" INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT "GradeCategory_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "CustomGradeColumn" (
+    "id" TEXT NOT NULL,
+    "classId" TEXT NOT NULL,
+    "gradeCategoryId" TEXT,
+    "name" TEXT NOT NULL,
+    "maxPoints" DOUBLE PRECISION NOT NULL,
+    "position" INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT "CustomGradeColumn_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "CustomGradeEntry" (
+    "id" TEXT NOT NULL,
+    "columnId" TEXT NOT NULL,
+    "studentId" TEXT NOT NULL,
+    "points" DOUBLE PRECISION NOT NULL,
+    "note" TEXT,
+
+    CONSTRAINT "CustomGradeEntry_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "GradeCategory_classId_idx" ON "GradeCategory"("classId");
+
+-- CreateIndex
+CREATE INDEX "CustomGradeColumn_classId_idx" ON "CustomGradeColumn"("classId");
+
+-- CreateIndex
+CREATE INDEX "CustomGradeColumn_gradeCategoryId_idx" ON "CustomGradeColumn"("gradeCategoryId");
+
+-- CreateIndex
+CREATE INDEX "CustomGradeEntry_studentId_idx" ON "CustomGradeEntry"("studentId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "CustomGradeEntry_columnId_studentId_key" ON "CustomGradeEntry"("columnId", "studentId");
+
+-- AddForeignKey
+ALTER TABLE "GradeCategory" ADD CONSTRAINT "GradeCategory_classId_fkey" FOREIGN KEY ("classId") REFERENCES "Class"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "CustomGradeColumn" ADD CONSTRAINT "CustomGradeColumn_classId_fkey" FOREIGN KEY ("classId") REFERENCES "Class"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "CustomGradeColumn" ADD CONSTRAINT "CustomGradeColumn_gradeCategoryId_fkey" FOREIGN KEY ("gradeCategoryId") REFERENCES "GradeCategory"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "CustomGradeEntry" ADD CONSTRAINT "CustomGradeEntry_columnId_fkey" FOREIGN KEY ("columnId") REFERENCES "CustomGradeColumn"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "CustomGradeEntry" ADD CONSTRAINT "CustomGradeEntry_studentId_fkey" FOREIGN KEY ("studentId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Assignment" ADD CONSTRAINT "Assignment_gradeCategoryId_fkey" FOREIGN KEY ("gradeCategoryId") REFERENCES "GradeCategory"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+

package/prisma/migrations/20260723142314_make_file_annotation_submission_optional/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "FileAnnotation" ALTER COLUMN "submissionId" DROP NOT NULL;

package/prisma/schema.prisma

@@ -128,14 +128,14 @@ model School {
   createdAt   DateTime @default(now())
   updatedAt   DateTime @updatedAt
 
-  users         User[]
-  memberships   SchoolMembership[]
-  invites       SchoolInvite[]
-  classes       Class[]
-  departments   Department[]
-  tags          Tag[]
-  storageRoot   Folder?            @relation("SchoolStorageRoot")
-  permissions   Permission[]       @relation("SchoolPermissions")
+  users       User[]
+  memberships SchoolMembership[]
+  invites     SchoolInvite[]
+  classes     Class[]
+  departments Department[]
+  tags        Tag[]
+  storageRoot Folder?            @relation("SchoolStorageRoot")
+  permissions Permission[]       @relation("SchoolPermissions")
 }
 
 model Department {
@@ -175,13 +175,13 @@ model Tag {
   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")
-  permissions Permission[]     @relation("TagPermissions")
+  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")
+  permissions Permission[]      @relation("TagPermissions")
 
   @@unique([schoolId, name])
   @@index([schoolId])
@@ -197,7 +197,7 @@ model User {
   verified Boolean      @default(false)
 
   termsAcceptedAt DateTime?
-  termsVersion      String?
+  termsVersion    String?
 
   teacherIn Class[] @relation("UserTeacherToClass")
   studentIn Class[] @relation("UserStudentToClass")
@@ -241,6 +241,8 @@ model User {
   discussions             Discussion[]
   discussionReplies       DiscussionReply[]
   discussionReads         DiscussionRead[]
+  customGradeEntries      CustomGradeEntry[]   @relation("UserCustomGradeEntries")
+  fileAnnotations         FileAnnotation[]     @relation("AuthoredFileAnnotations")
 }
 
 model SchoolMembership {
@@ -330,14 +332,71 @@ model Class {
   classTags         ClassTag[]
   embeddings        Embedding[]
 
-  discussionsEnabled              Boolean @default(true)
-  studentsCanCreateDiscussions    Boolean @default(true)
-  studentsCanReply                Boolean @default(true)
+  discussionsEnabled           Boolean @default(true)
+  studentsCanCreateDiscussions Boolean @default(true)
+  studentsCanReply             Boolean @default(true)
+
+  gradeCategories    GradeCategory[]
+  customGradeColumns CustomGradeColumn[]
+
+  treatMissingAsZero Boolean           @default(false)
+  gradeRoundingMode  GradeRoundingMode @default(NONE)
 
   @@index([schoolId])
   @@index([departmentId])
 }
 
+enum GradeRoundingMode {
+  NONE
+  HALF_UP
+  FLOOR
+  CEILING
+}
+
+model GradeCategory {
+  id         String @id @default(uuid())
+  classId    String
+  class      Class  @relation(fields: [classId], references: [id], onDelete: Cascade)
+  name       String
+  weight     Float
+  dropLowest Int    @default(0)
+  position   Int    @default(0)
+
+  assignments   Assignment[]
+  customColumns CustomGradeColumn[]
+
+  @@index([classId])
+}
+
+model CustomGradeColumn {
+  id              String         @id @default(uuid())
+  classId         String
+  class           Class          @relation(fields: [classId], references: [id], onDelete: Cascade)
+  gradeCategoryId String?
+  gradeCategory   GradeCategory? @relation(fields: [gradeCategoryId], references: [id], onDelete: SetNull)
+  name            String
+  maxPoints       Float
+  position        Int            @default(0)
+
+  entries CustomGradeEntry[]
+
+  @@index([classId])
+  @@index([gradeCategoryId])
+}
+
+model CustomGradeEntry {
+  id        String            @id @default(uuid())
+  columnId  String
+  column    CustomGradeColumn @relation(fields: [columnId], references: [id], onDelete: Cascade)
+  studentId String
+  student   User              @relation("UserCustomGradeEntries", fields: [studentId], references: [id], onDelete: Cascade)
+  points    Float
+  note      String?
+
+  @@unique([columnId, studentId])
+  @@index([studentId])
+}
+
 model MarkScheme {
   id           String       @id @default(uuid())
   classId      String?
@@ -454,6 +513,35 @@ model File {
 
   schoolDevelopementProgram   SchoolDevelopementProgram? @relation("SchoolDevelopementProgramSupportingDocumentation", fields: [schoolDevelopementProgramId], references: [id], onDelete: Cascade)
   schoolDevelopementProgramId String?
+
+  fileAnnotations FileAnnotation[] @relation("FileAnnotations")
+}
+
+enum FileAnnotationType {
+  HIGHLIGHT
+  INK
+  COMMENT
+  TEXT
+}
+
+model FileAnnotation {
+  id           String             @id @default(uuid())
+  file         File               @relation("FileAnnotations", fields: [fileId], references: [id], onDelete: Cascade)
+  fileId       String
+  submission   Submission?        @relation("SubmissionFileAnnotations", fields: [submissionId], references: [id], onDelete: Cascade)
+  submissionId String?
+  author       User               @relation("AuthoredFileAnnotations", fields: [authorId], references: [id], onDelete: Cascade)
+  authorId     String
+  page         Int
+  type         FileAnnotationType
+  geometry     Json
+  text         String?
+  color        String?
+  createdAt    DateTime           @default(now())
+  updatedAt    DateTime           @updatedAt
+
+  @@index([fileId])
+  @@index([submissionId])
 }
 
 model Assignment {
@@ -493,6 +581,8 @@ model Assignment {
   order                 Int?
   gradingBoundary       GradingBoundary? @relation(fields: [gradingBoundaryId], references: [id], onDelete: Cascade)
   gradingBoundaryId     String?
+  gradeCategory         GradeCategory?   @relation(fields: [gradeCategoryId], references: [id], onDelete: SetNull)
+  gradeCategoryId       String?
   worksheets            Worksheet[]      @relation("AssignmentWorksheets")
   targetedBySubmissions Submission[]     @relation("SubmissionTargetedAssignment")
 }
@@ -607,19 +697,19 @@ model DiscussionRead {
 }
 
 model Reaction {
-  id             String        @id @default(uuid())
-  type           ReactionType
-  user           User          @relation(fields: [userId], references: [id], onDelete: Cascade)
-  userId         String
-  announcement   Announcement? @relation(fields: [announcementId], references: [id], onDelete: Cascade)
-  announcementId String?
-  comment        Comment?      @relation(fields: [commentId], references: [id], onDelete: Cascade)
-  commentId      String?
+  id                String           @id @default(uuid())
+  type              ReactionType
+  user              User             @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId            String
+  announcement      Announcement?    @relation(fields: [announcementId], references: [id], onDelete: Cascade)
+  announcementId    String?
+  comment           Comment?         @relation(fields: [commentId], references: [id], onDelete: Cascade)
+  commentId         String?
   discussion        Discussion?      @relation(fields: [discussionId], references: [id], onDelete: Cascade)
   discussionId      String?
   discussionReply   DiscussionReply? @relation(fields: [discussionReplyId], references: [id], onDelete: Cascade)
   discussionReplyId String?
-  createdAt      DateTime      @default(now())
+  createdAt         DateTime         @default(now())
 
   @@unique([userId, announcementId])
   @@unique([userId, commentId])
@@ -661,6 +751,8 @@ model Submission {
   returned     Boolean?     @default(false)
   newtonTutors NewtonChat[]
 
+  fileAnnotations FileAnnotation[] @relation("SubmissionFileAnnotations")
+
   @@index([studentId, recommendationState])
 }
 
@@ -890,11 +982,11 @@ model Worksheet {
   questions                 WorksheetQuestion[]
   studentWorksheetResponses StudentWorksheetResponse[]
 
-  runJobId                  String?
-  runJob                    RunJob?                    @relation("WorksheetRunJob", fields: [runJobId], references: [id], onDelete: SetNull)
+  runJobId String?
+  runJob   RunJob? @relation("WorksheetRunJob", fields: [runJobId], references: [id], onDelete: SetNull)
 
-  status                    JobStatus?                 @default(NOT_STARTED)
-  tags                      ClassTag[]                 @relation("WorksheetToTag")
+  status JobStatus? @default(NOT_STARTED)
+  tags   ClassTag[] @relation("WorksheetToTag")
 
   @@unique([classId, sourceUrl])
 }
@@ -1011,14 +1103,14 @@ enum EmbeddingSourceType {
 }
 
 model Embedding {
-  id         String              @id @default(uuid())
+  id         String                      @id @default(uuid())
   classId    String
   sourceType EmbeddingSourceType
   sourceId   String
   content    String
   vector     Unsupported("vector(1536)")
-  metadata   Json?               @default("{}")
-  createdAt  DateTime            @default(now())
+  metadata   Json?                       @default("{}")
+  createdAt  DateTime                    @default(now())
 
   class Class @relation(fields: [classId], references: [id], onDelete: Cascade)
 
@@ -1062,7 +1154,7 @@ model RunJob {
   /// most jobs touch zero or one of these.
   messages                  Message[]                 @relation("MessageRunJob")
   studentQuestionProgresses StudentQuestionProgress[] @relation("StudentQuestionProgressRunJob")
-  worksheet                 Worksheet[]                @relation("WorksheetRunJob")
+  worksheet                 Worksheet[]               @relation("WorksheetRunJob")
 
   @@index([userId, type, status])
   @@index([classId, status])
@@ -1098,9 +1190,9 @@ enum PermissionLevel {
 ///     `schoolId` is set, matching `principalType`. CLASS, CLASS_TEACHERS,
 ///     CLASS_STUDENTS all share `classId`.
 model Permission {
-  id       String  @id @default(uuid())
+  id       String @id @default(uuid())
   folderId String
-  folder   Folder  @relation("FolderPermissions", fields: [folderId], references: [id], onDelete: Cascade)
+  folder   Folder @relation("FolderPermissions", fields: [folderId], references: [id], onDelete: Cascade)
 
   principalType PermissionPrincipalType
   userId        String?

package/src/models/gradebook.ts

@@ -0,0 +1,91 @@
+/**
+ * Gradebook model – grade categories, custom gradebook columns/entries,
+ * and the queries backing the computed gradebook.
+ */
+
+import { prisma } from "../lib/prisma.js";
+
+/** @returns Grade categories for a class, ordered by position. */
+export function findGradeCategoriesByClassId(classId: string) {
+  return prisma.gradeCategory.findMany({
+    where: { classId },
+    orderBy: { position: "asc" },
+  });
+}
+
+/** @returns A grade category scoped to a class. */
+export function findGradeCategory(categoryId: string, classId: string) {
+  return prisma.gradeCategory.findFirst({
+    where: { id: categoryId, classId },
+  });
+}
+
+/** @returns Custom gradebook columns for a class with their entries. */
+export function findCustomGradeColumnsByClassId(classId: string) {
+  return prisma.customGradeColumn.findMany({
+    where: { classId },
+    orderBy: { position: "asc" },
+    include: {
+      entries: {
+        select: { id: true, studentId: true, points: true, note: true },
+      },
+    },
+  });
+}
+
+/** @returns A custom gradebook column scoped to a class. */
+export function findCustomGradeColumn(columnId: string, classId: string) {
+  return prisma.customGradeColumn.findFirst({
+    where: { id: columnId, classId },
+  });
+}
+
+/** @returns Class data needed to compute the gradebook. */
+export function findClassForGradebook(classId: string) {
+  return prisma.class.findUnique({
+    where: { id: classId },
+    select: {
+      id: true,
+      treatMissingAsZero: true,
+      gradeRoundingMode: true,
+      students: {
+        select: {
+          id: true,
+          username: true,
+          profile: { select: { displayName: true } },
+        },
+      },
+      gradingBoundaries: {
+        take: 1,
+        select: { id: true, name: true, structured: true },
+      },
+      assignments: {
+        where: { graded: true, template: false, inProgress: false },
+        orderBy: [{ order: "asc" }, { dueDate: "asc" }],
+        select: {
+          id: true,
+          title: true,
+          maxGrade: true,
+          weight: true,
+          gradeCategoryId: true,
+          dueDate: true,
+          submissions: {
+            select: { studentId: true, gradeReceived: true },
+          },
+        },
+      },
+    },
+  });
+}
+
+/** @returns Grade policy fields for a class. */
+export function findClassGradePolicies(classId: string) {
+  return prisma.class.findUnique({
+    where: { id: classId },
+    select: {
+      id: true,
+      treatMissingAsZero: true,
+      gradeRoundingMode: true,
+    },
+  });
+}

package/src/routers/_app.ts

@@ -29,6 +29,7 @@ import { permissionsRouter } from "./permissions.js";
 import { discussionRouter } from "./discussion.js";
 import { adminRouter } from "./admin.js";
 import { embeddingRouter } from "./embedding.js";
+import { gradebookRouter } from "./gradebook.js";
 
 export const appRouter = createTRPCRouter({
   class: classRouter,
@@ -59,6 +60,7 @@ export const appRouter = createTRPCRouter({
   discussion: discussionRouter,
   admin: adminRouter,
   embedding: embeddingRouter,
+  gradebook: gradebookRouter,
 });
 
 // Export type router type definition

package/src/routers/admin.ts

@@ -4,15 +4,21 @@ import { createTRPCRouter, adminProcedure } from '../trpc.js';
 import {
   getRunJobForAdmin,
   listRunJobsForAdmin,
+  retryRunJobForAdmin,
 } from '../services/adminRunJob.js';
 import {
+  getSchoolForAdmin,
   listDepartmentsForAdmin,
   listEarlyAccessRequestsForAdmin,
   listSchoolDevelopmentProgramsForAdmin,
   listSchoolsForAdmin,
 } from '../services/adminInstitution.js';
+import { getOverviewMetricsForAdmin } from '../services/adminMetrics.js';
+import { getUserForAdmin, searchUsersForAdmin } from '../services/adminUser.js';
 
 export const adminRouter = createTRPCRouter({
+  getOverviewMetrics: adminProcedure.query(() => getOverviewMetricsForAdmin()),
+
   listRunJobs: adminProcedure
     .input(
       z.object({
@@ -28,6 +34,14 @@ export const adminRouter = createTRPCRouter({
     .input(z.object({ id: z.string().uuid() }))
     .query(({ input }) => getRunJobForAdmin(input.id)),
 
+  retryRunJob: adminProcedure
+    .input(z.object({ id: z.string().uuid() }))
+    .mutation(({ input }) => retryRunJobForAdmin(input.id)),
+
+  getSchool: adminProcedure
+    .input(z.object({ id: z.string().uuid() }))
+    .query(({ input }) => getSchoolForAdmin(input.id)),
+
   listSchools: adminProcedure
     .input(
       z.object({
@@ -67,4 +81,18 @@ export const adminRouter = createTRPCRouter({
       }),
     )
     .query(({ input }) => listEarlyAccessRequestsForAdmin(input)),
+
+  searchUsers: adminProcedure
+    .input(
+      z.object({
+        page: z.number().int().min(0).default(0),
+        pageSize: z.number().int().min(1).max(100).default(25),
+        query: z.string().optional(),
+      }),
+    )
+    .query(({ input }) => searchUsersForAdmin(input)),
+
+  getUser: adminProcedure
+    .input(z.object({ id: z.string().uuid() }))
+    .query(({ input }) => getUserForAdmin(input.id)),
 });