@studious-lms/server 1.1.26 → 1.2.6

package/prisma/migrations/20251109122857_annuoncements_comments/migration.sql

@@ -0,0 +1,30 @@
+-- AlterTable
+ALTER TABLE "public"."Announcement" ADD COLUMN     "modifiedAt" TIMESTAMP(3);
+
+-- AlterTable
+ALTER TABLE "public"."File" ADD COLUMN     "announcementId" TEXT;
+
+-- CreateTable
+CREATE TABLE "public"."AnnouncementComment" (
+    "id" TEXT NOT NULL,
+    "content" TEXT NOT NULL,
+    "authorId" TEXT NOT NULL,
+    "announcementId" TEXT NOT NULL,
+    "parentCommentId" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "modifiedAt" TIMESTAMP(3),
+
+    CONSTRAINT "AnnouncementComment_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "public"."File" ADD CONSTRAINT "File_announcementId_fkey" FOREIGN KEY ("announcementId") REFERENCES "public"."Announcement"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."AnnouncementComment" ADD CONSTRAINT "AnnouncementComment_authorId_fkey" FOREIGN KEY ("authorId") REFERENCES "public"."User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."AnnouncementComment" ADD CONSTRAINT "AnnouncementComment_announcementId_fkey" FOREIGN KEY ("announcementId") REFERENCES "public"."Announcement"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."AnnouncementComment" ADD CONSTRAINT "AnnouncementComment_parentCommentId_fkey" FOREIGN KEY ("parentCommentId") REFERENCES "public"."AnnouncementComment"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/prisma/migrations/20251109135555_reactions_announcements_comments/migration.sql

@@ -0,0 +1,35 @@
+-- CreateEnum
+CREATE TYPE "public"."ReactionType" AS ENUM ('THUMBSUP', 'CELEBRATE', 'CARE', 'HEART', 'IDEA', 'HAPPY');
+
+-- CreateTable
+CREATE TABLE "public"."Reaction" (
+    "id" TEXT NOT NULL,
+    "type" "public"."ReactionType" NOT NULL,
+    "userId" TEXT NOT NULL,
+    "announcementId" TEXT,
+    "commentId" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "Reaction_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "Reaction_announcementId_idx" ON "public"."Reaction"("announcementId");
+
+-- CreateIndex
+CREATE INDEX "Reaction_commentId_idx" ON "public"."Reaction"("commentId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Reaction_userId_announcementId_key" ON "public"."Reaction"("userId", "announcementId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Reaction_userId_commentId_key" ON "public"."Reaction"("userId", "commentId");
+
+-- AddForeignKey
+ALTER TABLE "public"."Reaction" ADD CONSTRAINT "Reaction_userId_fkey" FOREIGN KEY ("userId") REFERENCES "public"."User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."Reaction" ADD CONSTRAINT "Reaction_announcementId_fkey" FOREIGN KEY ("announcementId") REFERENCES "public"."Announcement"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."Reaction" ADD CONSTRAINT "Reaction_commentId_fkey" FOREIGN KEY ("commentId") REFERENCES "public"."AnnouncementComment"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/prisma/schema.prisma

@@ -9,6 +9,11 @@ generator client {
   // output   = "../generated/prisma"
 }
 
+// @todo: add type safety to json fields.
+// generator json {
+//   provider = "prisma-json-types-generator"
+// }
+
 datasource db {
   provider = "postgresql"
   url      = env("DATABASE_URL")
@@ -42,6 +47,33 @@ enum UploadStatus {
   CANCELLED
 }
 
+enum GenerationStatus {
+  NOT_STARTED
+  PENDING
+  GENERATING
+  COMPLETED
+  FAILED
+  CANCELLED
+}
+
+enum WorksheetQuestionType {
+  MULTIPLE_CHOICE
+  TRUE_FALSE
+  SHORT_ANSWER
+  LONG_ANSWER
+  MATH_EXPRESSION
+  ESSAY
+}
+
+enum ReactionType {
+  THUMBSUP
+  CELEBRATE
+  CARE
+  HEART
+  IDEA
+  HAPPY
+}
+
 model School {
   id          String      @id @default(uuid())
   name        String
@@ -63,8 +95,6 @@ model User {
   verified     Boolean     @default(false)
   role         UserRole    @default(NONE)
 
-  profileId    String?     @unique
-
   teacherIn   Class[] @relation("UserTeacherToClass")
   studentIn   Class[] @relation("UserStudentToClass")
 
@@ -72,10 +102,13 @@ model User {
   sessions    Session[]
   files       File[]
   assignments Assignment[]
+  specificAssignments Assignment[] @relation("SpecificAssignmentAssignedTo")
   events      Event[]
   announcements Announcement[]
   notificationsSent Notification[] @relation("SentNotifications")
   notificationsReceived Notification[] @relation("ReceivedNotifications")
+  studentQuestionProgress StudentQuestionProgress[]
+  studentWorksheetResponses StudentWorksheetResponse[]
 
   presentAttendance  Attendance[] @relation("PresentAttendance")
   lateAttendance    Attendance[] @relation("LateAttendance")
@@ -89,6 +122,8 @@ model User {
   sentMessages Message[] @relation("SentMessages")
   mentions Mention[] @relation("UserMentions")
   createdLabChats LabChat[] @relation("CreatedLabChats")
+  comments Comment[]
+  reactions Reaction[]
 
 }
 
@@ -121,14 +156,16 @@ model Class {
   events        Event[]
   sections      Section[]
   sessions      Session[]
+  worksheets    Worksheet[]
   students      User[]         @relation("UserStudentToClass")
   teachers      User[]         @relation("UserTeacherToClass")
-  markSchemes   MarkScheme[] @relation("ClassToMarkScheme")
-  gradingBoundaries GradingBoundary[] @relation("ClassToGradingBoundary")
+  // markSchemes   MarkScheme[] @relation("ClassToMarkScheme")
+  // gradingBoundaries GradingBoundary[] @relation("ClassToGradingBoundary")
   draftFiles File[] @relation("ClassDraftFiles")
   classFiles Folder? @relation("ClassFiles")
   labChats LabChat[] @relation("ClassLabChats")
-
+  markSchemes MarkScheme[]
+  gradingBoundaries GradingBoundary[]
   school    School? @relation(fields: [schoolId], references: [id])
   schoolId  String?
 }
@@ -136,7 +173,8 @@ model Class {
 model MarkScheme {
   id String @id @default(uuid())
   classId String
-  class Class[] @relation("ClassToMarkScheme")
+  // class Class[] @relation("ClassToMarkScheme")
+  class Class? @relation(fields: [classId], references: [id], onDelete: Cascade)
   structured String
   assignments Assignment[]
 }
@@ -144,7 +182,8 @@ model MarkScheme {
 model GradingBoundary {
   id String @id @default(uuid())
   classId String
-  class Class[] @relation("ClassToGradingBoundary")
+  // class Class[] @relation("ClassToGradingBoundary")
+  class Class? @relation(fields: [classId], references: [id], onDelete: Cascade)
   structured String
   assignments Assignment[]
 }
@@ -207,6 +246,9 @@ model File {
   messageId String?
   message Message? @relation("MessageAttachments", fields: [messageId], references: [id], onDelete: Cascade)
 
+  announcement Announcement? @relation("AnnouncementAttachments", fields: [announcementId], references: [id], onDelete: Cascade)
+  announcementId String?
+
   schools      School[]
 
   schoolDevelopementProgram SchoolDevelopementProgram? @relation("SchoolDevelopementProgramSupportingDocumentation", fields: [schoolDevelopementProgramId], references: [id], onDelete: Cascade)
@@ -225,7 +267,15 @@ model Assignment {
   class         Class          @relation(fields: [classId], references: [id], onDelete: Cascade)
   classId       String
   attachments   File[]
+  acceptFiles Boolean @default(false)
+  acceptExtendedResponse Boolean @default(false)
+  acceptWorksheet Boolean @default(false)
+  gradeWithAI Boolean @default(false)
+
+  aiPolicyLevel Int @default(0)
+
   submissions   Submission[]
+  assignedTo    User[] @relation("SpecificAssignmentAssignedTo")
   section       Section?       @relation(fields: [sectionId], references: [id], onDelete: Cascade)
   sectionId     String?
   graded        Boolean        @default(false)
@@ -241,6 +291,7 @@ model Assignment {
   order         Int?
   gradingBoundary GradingBoundary? @relation(fields: [gradingBoundaryId], references: [id], onDelete: Cascade)
   gradingBoundaryId String?
+  worksheets Worksheet[] @relation("AssignmentWorksheets")
 }
 
 
@@ -251,8 +302,47 @@ model Announcement {
   teacher User @relation(fields: [teacherId], references: [id])
   teacherId String
   createdAt DateTime @default(now())
+  modifiedAt DateTime? @updatedAt
   class   Class @relation(fields: [classId], references: [id], onDelete: Cascade)
   classId String
+  attachments File[] @relation("AnnouncementAttachments")
+  comments Comment[]
+  reactions Reaction[]
+}
+
+model Comment {
+  id            String @id @default(uuid())
+  content       String
+  author        User @relation(fields: [authorId], references: [id], onDelete: Cascade)
+  authorId      String
+  announcement  Announcement? @relation(fields: [announcementId], references: [id], onDelete: Cascade)
+  announcementId String?
+  parentComment Comment? @relation("CommentReplies", fields: [parentCommentId], references: [id], onDelete: Cascade)
+  parentCommentId String?
+  status GenerationStatus?
+  replies       Comment[] @relation("CommentReplies")
+  reactions     Reaction[]
+  createdAt     DateTime @default(now())
+  modifiedAt    DateTime? @updatedAt
+  studentQuestionProgress StudentQuestionProgress? @relation("StudentQuestionProgressComments", fields: [studentQuestionProgressId], references: [id], onDelete: Cascade)
+  studentQuestionProgressId String?
+}
+
+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?
+  createdAt     DateTime @default(now())
+  
+  @@unique([userId, announcementId])
+  @@unique([userId, commentId])
+  @@index([announcementId])
+  @@index([commentId])
 }
 
 model Submission {
@@ -268,7 +358,8 @@ model Submission {
 
   attachments File[]  @relation("SubmissionFile")
   annotations File[]  @relation("SubmissionAnnotations")
-
+  worksheetResponses StudentWorksheetResponse[]
+  extendedResponse String?
   gradeReceived Int?
 
   rubricState String?
@@ -277,6 +368,18 @@ model Submission {
   submittedAt DateTime?
   submitted   Boolean? @default(false)
   returned    Boolean? @default(false)
+  newtonTutors NewtonChat[]
+}
+
+model NewtonChat {
+  id String @id @default(uuid())
+  submissionId String
+  submission Submission @relation(fields: [submissionId], references: [id], onDelete: Cascade)
+  conversationId String @unique
+  conversation Conversation @relation(fields: [conversationId], references: [id], onDelete: Cascade)
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  title String @default("Session with Newton Tutor")
 }
 
 model Section {
@@ -364,6 +467,7 @@ model Conversation {
   members ConversationMember[]
   messages Message[]
   labChat LabChat?
+  newtonChat NewtonChat?
 }
 
 model LabChat {
@@ -374,8 +478,7 @@ model LabChat {
   conversationId String @unique
   createdById String // Teacher who created the lab
   createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-  
+  updatedAt DateTime @updatedAt  
   class Class @relation("ClassLabChats", fields: [classId], references: [id], onDelete: Cascade)
   conversation Conversation @relation(fields: [conversationId], references: [id], onDelete: Cascade)
   createdBy User @relation("CreatedLabChats", fields: [createdById], references: [id], onDelete: NoAction)
@@ -402,11 +505,13 @@ model Message {
   senderId String
   conversationId String
   createdAt DateTime @default(now())
-  
+  status GenerationStatus? @default(NOT_STARTED)
   sender User @relation("SentMessages", fields: [senderId], references: [id], onDelete: Cascade)
   conversation Conversation @relation(fields: [conversationId], references: [id], onDelete: Cascade)
   mentions Mention[]
   attachments File[] @relation("MessageAttachments")
+
+  meta Json? @default("{}")
 }
 
 model Mention {
@@ -421,6 +526,69 @@ model Mention {
   @@unique([messageId, userId])
 }
 
+model Worksheet {
+  id String @id @default(uuid())
+  name String
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  classId String
+  class Class? @relation(fields: [classId], references: [id], onDelete: Cascade)
+  assignments Assignment[] @relation("AssignmentWorksheets")
+  questions WorksheetQuestion[]
+  studentWorksheetResponses StudentWorksheetResponse[]
+}
+
+model WorksheetQuestion {
+  id String @id @default(uuid())
+  worksheetId String
+  worksheet Worksheet @relation(fields: [worksheetId], references: [id], onDelete: Cascade)
+  type WorksheetQuestionType
+  question String
+  answer String
+  options Json?  @default("{}")
+  markScheme Json?  @default("{}")
+  points Int @default(0)
+  order Int? @default(0)
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  studentResponses StudentQuestionProgress[]
+}
+
+model StudentWorksheetResponse {
+  id String @id @default(uuid())
+  studentId String
+  student User @relation(fields: [studentId], references: [id], onDelete: Cascade)
+  worksheetId String
+  worksheet Worksheet @relation(fields: [worksheetId], references: [id], onDelete: Cascade)
+  responses StudentQuestionProgress[]
+  submission Submission? @relation(fields: [submissionId], references: [id], onDelete: Cascade)
+  submissionId String?
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  submittedAt DateTime?
+  submitted Boolean @default(false)
+}
+
+model StudentQuestionProgress {
+  id String @id @default(uuid())
+  studentId String
+  student User @relation(fields: [studentId], references: [id], onDelete: Cascade)
+  questionId String
+  question WorksheetQuestion @relation(fields: [questionId], references: [id], onDelete: Cascade)
+  response String
+  isCorrect Boolean @default(false)
+  markschemeState Json? @default("{}")
+  points Int @default(0)
+  comments Comment[] @relation("StudentQuestionProgressComments")
+  feedback String?
+  createdAt DateTime @default(now())
+  updatedAt DateTime? @updatedAt
+  studentWorksheetResponseId String?
+  studentWorksheetResponse StudentWorksheetResponse? @relation(fields: [studentWorksheetResponseId], references: [id], onDelete: Cascade)
+  status GenerationStatus? @default(NOT_STARTED)
+  
+  @@index([studentId, questionId])
+}
 
 model SchoolDevelopementProgram {
   id String @id
@@ -443,7 +611,7 @@ model SchoolDevelopementProgram {
   submittedAt DateTime? @default(now())
   reviewedAt DateTime?
 
-  status String @default("PENDING") // PENDING, APPROVED, REJECTED, REFERRED
+  status String @default("NOT_STARTED") // NOT_STARTED, PENDING, APPROVED, REJECTED, REFERRED
 
   supportingDocumentation File[] @relation("SchoolDevelopementProgramSupportingDocumentation")
 }

package/scripts/test-pre-push.ts

@@ -0,0 +1,14 @@
+import { execSync } from 'child_process';
+import { logger } from '../src/utils/logger';
+import dotenv from 'dotenv';
+import { resolve } from 'path';
+
+dotenv.config({ path: resolve(process.cwd(), '.env.test') });
+
+logger.info("Syncing Prisma schema to test database...");
+
+execSync("npx prisma db push --force-reset --skip-generate", {
+  stdio: 'inherit',
+});
+
+logger.info("Test database is ready!");