@studious-lms/server 1.2.53 → 1.3.0

package/src/models/notification.ts

@@ -0,0 +1,54 @@
+/**
+ * Notification model – in-app notifications, create, mark read.
+ */
+import { prisma } from "../lib/prisma.js";
+
+const notificationInclude = {
+  sender: { select: { username: true } },
+  receiver: { select: { username: true } },
+};
+
+/** @returns Notifications for a receiver, newest first. */
+export function findNotificationsByReceiverId(receiverId: string) {
+  return prisma.notification.findMany({
+    where: { receiverId },
+    orderBy: { createdAt: "desc" },
+    include: notificationInclude,
+  });
+}
+
+/** @returns Notification by ID. */
+export function findNotificationById(id: string) {
+  return prisma.notification.findUnique({
+    where: { id },
+    include: notificationInclude,
+  });
+}
+
+/** Create a notification for one receiver. */
+export function createNotification(data: {
+  receiverId: string;
+  title: string;
+  content: string;
+}) {
+  return prisma.notification.create({
+    data,
+  });
+}
+
+/** Create multiple notifications in one call. */
+export function createManyNotifications(
+  data: Array<{ receiverId: string; title: string; content: string }>
+) {
+  return prisma.notification.createMany({
+    data,
+  });
+}
+
+/** Mark a notification as read. */
+export function markNotificationAsRead(id: string) {
+  return prisma.notification.update({
+    where: { id },
+    data: { read: true },
+  });
+}

package/src/models/section.ts

@@ -0,0 +1,98 @@
+/**
+ * Section model – class sections, ordering, assignment grouping.
+ */
+import { prisma } from "../lib/prisma.js";
+
+/** @returns Section by ID. */
+export function findSectionById(id: string) {
+  return prisma.section.findUnique({
+    where: { id },
+  });
+}
+
+/** @returns Class if user is a teacher. */
+export function findClassWithTeacher(classId: string, teacherId: string) {
+  return prisma.class.findFirst({
+    where: {
+      id: classId,
+      teachers: { some: { id: teacherId } },
+    },
+  });
+}
+
+/** Create a section in a class. */
+export function createSection(data: {
+  id?: string;
+  name: string;
+  order: number;
+  classId: string;
+  color?: string;
+}) {
+  return prisma.section.create({
+    data: {
+      ...(data.id && { id: data.id }),
+      name: data.name,
+      order: data.order,
+      class: { connect: { id: data.classId } },
+      ...(data.color && { color: data.color }),
+    },
+  });
+}
+
+/** @returns Sections for a class (id, order only). */
+export function findSectionsByClassId(classId: string) {
+  return prisma.section.findMany({
+    where: { classId },
+    select: { id: true, order: true },
+  });
+}
+
+/** @returns Assignments for a class (id, order only). */
+export function findAssignmentsByClassId(classId: string) {
+  return prisma.assignment.findMany({
+    where: { classId },
+    select: { id: true, order: true },
+  });
+}
+
+/** Update section order. */
+export function updateSectionOrder(id: string, order: number) {
+  return prisma.section.update({
+    where: { id },
+    data: { order },
+  });
+}
+
+/** Update assignment order. */
+export function updateAssignmentOrder(id: string, order: number) {
+  return prisma.assignment.update({
+    where: { id },
+    data: { order },
+  });
+}
+
+/** Update section name and color. */
+export function updateSection(
+  id: string,
+  data: { name: string; color?: string }
+) {
+  return prisma.section.update({
+    where: { id },
+    data,
+  });
+}
+
+/** Delete a section. */
+export function deleteSectionById(id: string) {
+  return prisma.section.delete({
+    where: { id },
+  });
+}
+
+/** @returns Section by ID and classId. */
+export function findSectionByClassAndId(sectionId: string, classId: string) {
+  return prisma.section.findFirst({
+    where: { id: sectionId, classId },
+    select: { id: true, classId: true },
+  });
+}

package/src/models/user.ts

@@ -0,0 +1,47 @@
+/**
+ * User model – user lookup, profile, profile upsert.
+ */
+import { prisma } from "../lib/prisma.js";
+
+/** @returns User by ID (id, username only). */
+export function findUserById(id: string) {
+  return prisma.user.findUnique({
+    where: { id },
+    select: {
+      id: true,
+      username: true,
+    },
+  });
+}
+
+/** @returns User profile by userId. */
+export function findUserProfileByUserId(userId: string) {
+  return prisma.userProfile.findUnique({
+    where: { userId },
+  });
+}
+
+/** Create or update user profile. */
+export function upsertUserProfile(
+  userId: string,
+  data: {
+    displayName?: string;
+    bio?: string;
+    location?: string;
+    website?: string;
+    profilePicture?: string;
+    profilePictureThumbnail?: string;
+  }
+) {
+  return prisma.userProfile.upsert({
+    where: { userId },
+    create: {
+      userId,
+      ...data,
+    },
+    update: {
+      ...data,
+      updatedAt: new Date(),
+    },
+  });
+}

package/src/models/worksheet.ts

@@ -0,0 +1,294 @@
+/**
+ * Worksheet model – worksheets, questions, submissions, student progress, grading.
+ */
+import { prisma } from "../lib/prisma.js";
+import type { WorksheetQuestionType, GenerationStatus } from "@prisma/client";
+
+/** @returns Worksheet with questions and class. */
+export function findWorksheetById(id: string) {
+  return prisma.worksheet.findUnique({
+    where: { id },
+    include: {
+      questions: { orderBy: { createdAt: "asc" as const } },
+      class: true,
+    },
+  });
+}
+
+/** @returns Worksheet by ID (minimal). */
+export function findWorksheetByIdMinimal(id: string) {
+  return prisma.worksheet.findUnique({
+    where: { id },
+  });
+}
+
+/** @returns Worksheets for a class. */
+export function findWorksheetsByClassId(classId: string) {
+  return prisma.worksheet.findMany({
+    where: { classId },
+    include: {
+      questions: { select: { id: true } },
+    },
+    orderBy: { createdAt: "desc" },
+  });
+}
+
+/** Create a worksheet. */
+export function createWorksheet(data: { classId: string; name: string }) {
+  return prisma.worksheet.create({
+    data,
+  });
+}
+
+/** Update worksheet name. */
+export function updateWorksheet(id: string, data: { name?: string }) {
+  return prisma.worksheet.update({
+    where: { id },
+    data,
+  });
+}
+
+/** Delete a worksheet. */
+export function deleteWorksheet(id: string) {
+  return prisma.worksheet.delete({
+    where: { id },
+  });
+}
+
+/** @returns Questions for a worksheet. */
+export function findQuestionsByWorksheetId(worksheetId: string) {
+  return prisma.worksheetQuestion.findMany({
+    where: { worksheetId },
+    orderBy: { order: "asc" },
+  });
+}
+
+/** Create a worksheet question. */
+export function createWorksheetQuestion(data: {
+  worksheetId: string;
+  type: WorksheetQuestionType;
+  question: string;
+  answer: string;
+  points?: number;
+  options?: object;
+  markScheme?: object;
+}) {
+  return prisma.worksheetQuestion.create({
+    data,
+  });
+}
+
+/** Update question order. */
+export function updateWorksheetQuestionOrder(id: string, order: number) {
+  return prisma.worksheetQuestion.update({
+    where: { id },
+    data: { order },
+  });
+}
+
+/** Update a worksheet question. */
+export function updateWorksheetQuestion(
+  id: string,
+  data: {
+    question?: string;
+    answer?: string;
+    points?: number;
+    options?: object;
+    markScheme?: object;
+    type?: WorksheetQuestionType;
+  }
+) {
+  return prisma.worksheetQuestion.update({
+    where: { id },
+    data,
+  });
+}
+
+/** Delete a worksheet question. */
+export function deleteWorksheetQuestion(id: string) {
+  return prisma.worksheetQuestion.delete({
+    where: { id },
+  });
+}
+
+/** @returns Submission by ID. */
+export function findSubmissionById(id: string) {
+  return prisma.submission.findUnique({
+    where: { id },
+  });
+}
+
+const worksheetResponseInclude = {
+  responses: {
+    include: {
+      comments: { select: { id: true } },
+    },
+  },
+};
+
+/** @returns Worksheet response for submission and worksheet. */
+export function findWorksheetResponseBySubmissionAndWorksheet(
+  submissionId: string,
+  worksheetId: string
+) {
+  return prisma.studentWorksheetResponse.findFirst({
+    where: { submissionId, worksheetId },
+    include: worksheetResponseInclude,
+  });
+}
+
+/** Get or create worksheet response for student. */
+export async function findOrCreateWorksheetResponse(
+  submissionId: string,
+  worksheetId: string,
+  studentId: string
+) {
+  return prisma.$transaction(async (tx) => {
+    const existing = await tx.studentWorksheetResponse.findFirst({
+      where: { submissionId, worksheetId },
+      include: worksheetResponseInclude,
+    });
+    if (existing) return existing;
+    return tx.studentWorksheetResponse.create({
+      data: { worksheetId, submissionId, studentId },
+      include: worksheetResponseInclude,
+    });
+  });
+}
+
+/** Create a worksheet response. */
+export function createWorksheetResponse(data: {
+  worksheetId: string;
+  submissionId: string;
+  studentId: string;
+}) {
+  return prisma.studentWorksheetResponse.create({
+    data,
+    include: {
+      responses: {
+        include: {
+          comments: { select: { id: true } },
+        },
+      },
+    },
+  });
+}
+
+/** @returns Worksheet response by ID. */
+export function findWorksheetResponseById(id: string) {
+  return prisma.studentWorksheetResponse.findUnique({
+    where: { id },
+    include: { responses: true },
+  });
+}
+
+/** @returns Worksheet response with question responses. */
+export function findWorksheetResponseWithResponses(
+  id: string,
+  questionId?: string
+) {
+  return prisma.studentWorksheetResponse.findUnique({
+    where: { id },
+    include: {
+      responses: questionId
+        ? { where: { questionId } }
+        : true,
+    },
+  });
+}
+
+/** @returns Worksheet question by ID. */
+export function findWorksheetQuestionById(id: string) {
+  return prisma.worksheetQuestion.findUnique({
+    where: { id },
+  });
+}
+
+/** Update student's question progress. */
+export function updateStudentQuestionProgress(
+  id: string,
+  data: {
+    response?: string;
+    isCorrect?: boolean;
+    points?: number;
+    status?: GenerationStatus;
+  }
+) {
+  return prisma.studentQuestionProgress.update({
+    where: { id },
+    data,
+  });
+}
+
+/** Create student question progress. */
+export function createStudentQuestionProgress(data: {
+  studentId: string;
+  questionId: string;
+  studentWorksheetResponseId: string;
+  response: string;
+  isCorrect?: boolean;
+  points?: number;
+}) {
+  return prisma.studentQuestionProgress.create({
+    data,
+  });
+}
+
+/** @returns Student's progress for a question. */
+export function findStudentQuestionProgress(
+  studentId: string,
+  questionId: string,
+  studentWorksheetResponseId: string
+) {
+  return prisma.studentQuestionProgress.findFirst({
+    where: {
+      studentId,
+      questionId,
+      studentWorksheetResponseId,
+    },
+  });
+}
+
+/** Update progress for grading (AI feedback, marks). */
+export function updateStudentQuestionProgressForGrading(
+  id: string,
+  data: {
+    isCorrect?: boolean;
+    feedback?: string;
+    markschemeState?: object;
+    points?: number;
+    response?: string;
+  }
+) {
+  return prisma.studentQuestionProgress.update({
+    where: { id },
+    data,
+  });
+}
+
+/** Create progress record for grading pipeline. */
+export function createStudentQuestionProgressForGrading(data: {
+  studentId: string;
+  questionId: string;
+  studentWorksheetResponseId: string;
+  response: string;
+  isCorrect: boolean;
+  feedback?: string;
+  markschemeState?: object;
+  points?: number;
+}) {
+  return prisma.studentQuestionProgress.create({
+    data,
+  });
+}
+
+/** Create a comment on a worksheet response. */
+export function createComment(data: {
+  studentQuestionProgressId: string;
+  content: string;
+  authorId: string;
+}) {
+  return prisma.comment.create({
+    data,
+  });
+}

package/src/{server/pipelines → pipelines}/aiLabChat.ts

@@ -1,14 +1,18 @@
-import { getAIUserId, isAIUser } from "../../utils/aiUser.js";
-import { prisma } from "../../lib/prisma.js";
+/**
+ * AI lab chat pipeline – generates lab introductions and responses.
+ * Can create worksheets, sections, assignments, and PDF docs from AI output.
+ */
+import { getAIUserId, isAIUser } from "../utils/aiUser.js";
+import { prisma } from "../lib/prisma.js";
 import { Assignment, Class, File, Section, User } from "@prisma/client";
-import { inference, inferenceClient, sendAIMessage } from "../../utils/inference.js";
+import { inference, inferenceClient, sendAIMessage } from "../utils/inference.js";
 import z from "zod";
-import { logger } from "../../utils/logger.js";
-import { createPdf } from "../../lib/jsonConversion.js";
+import { logger } from "../utils/logger.js";
+import { createPdf } from "../lib/jsonConversion.js";
 import { v4 } from "uuid";
-import { bucket } from "../../lib/googleCloudStorage.js";
+import { bucket } from "../lib/googleCloudStorage.js";
 import OpenAI from "openai";
-import { DocumentBlock } from "../../lib/jsonStyles.js";
+import { DocumentBlock } from "../lib/jsonStyles.js";
 
 // Schema for lab chat response with PDF document generation
 const labChatResponseSchema = z.object({

package/src/{server/pipelines → pipelines}/aiNewtonChat.ts

@@ -1,8 +1,12 @@
-import { prisma } from "../../lib/prisma.js";
-import { inference, inferenceClient, openAIClient } from "../../utils/inference.js";
-import { logger } from "../../utils/logger.js";
-import { sendAIMessage } from "../../utils/inference.js";
-import { isAIUser } from "../../utils/aiUser.js";
+/**
+ * AI Newton chat pipeline – Newton tutor introductions and responses.
+ * Uses assignment context and AI policy levels for tutoring.
+ */
+import { prisma } from "../lib/prisma.js";
+import { inference, inferenceClient, openAIClient } from "../utils/inference.js";
+import { logger } from "../utils/logger.js";
+import { sendAIMessage } from "../utils/inference.js";
+import { isAIUser } from "../utils/aiUser.js";
 import { Assignment } from "@prisma/client";
 
 

package/src/{server/pipelines → pipelines}/gradeWorksheet.ts

@@ -1,10 +1,14 @@
+/**
+ * Grade worksheet pipeline – AI-powered grading of worksheet responses.
+ * Grades questions via inference API, broadcasts status via Pusher (pending/completed/failed/cancelled).
+ */
 import { GenerationStatus, WorksheetQuestionType } from "@prisma/client";
-import { prisma } from "../../lib/prisma.js";
-import { logger } from "../../utils/logger.js";
+import { prisma } from "../lib/prisma.js";
+import { logger } from "../utils/logger.js";
 import z from "zod";
-import { inference } from "../../utils/inference.js";
-import { getAIUserId } from "../../utils/aiUser.js";
-import { pusher } from "../../lib/pusher.js";
+import { inference } from "../utils/inference.js";
+import { getAIUserId } from "../utils/aiUser.js";
+import { pusher, worksheetChannel } from "../lib/pusher.js";
 
 
 const removeAllPreviousAIComments = async (worksheetQuestionProgressId: string) => {
@@ -41,11 +45,20 @@ const gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQues
     });
 
     if (!studentQuestionProgress) {
-        logger.error('Student question progress not found');
-        throw new Error('Student question progress not found');
+       const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.create({
+        data: {
+            studentId: worksheetResponse.studentId,
+            questionId: worksheetQuestionProgressId,
+            response: '',
+            isCorrect: false,
+            markschemeState: {},
+        },
+       });
+
+        return updatedStudentQuestionProgress;
     }
 
-    pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-pending`, {
+    pusher.trigger(worksheetChannel(worksheetResponse.id), `set-pending`, {
         id: studentQuestionProgress.id,
     });
 
@@ -115,14 +128,14 @@ const gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQues
                 },
             },
         });
-        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-completed`, {
+        pusher.trigger(worksheetChannel(worksheetResponse.id), `set-completed`, {
             id: updatedStudentQuestionProgress.id,
         });
 
         return updatedStudentQuestionProgress;
     } catch (error) {
         logger.error('Failed to grade worksheet response', { error, worksheetResponseId });
-        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-failed`, {
+        pusher.trigger(worksheetChannel(worksheetResponse.id), `set-failed`, {
             id: studentQuestionProgress.id,
         });
         await prisma.studentQuestionProgress.update({
@@ -217,7 +230,7 @@ export const cancelGradePipeline = async (worksheetResponseId: string, worksheet
 
     await removeAllPreviousAIComments(worksheetQuestionProgressId);
 
-    pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-cancelled`, {
+    pusher.trigger(worksheetChannel(worksheetResponse.id), `set-cancelled`, {
         id: updatedStudentQuestionProgress.id,
     });
 
@@ -246,8 +259,6 @@ export const regradeWorksheetPipeline = async (worksheetResponseId: string, work
         data: { status: GenerationStatus.PENDING },
     });
 
-console.log(updatedStudentQuestionProgress);
-
     gradeWorksheetQuestion(worksheetResponseId, worksheetQuestionProgressId);
 
     return updatedStudentQuestionProgress;
@@ -266,7 +277,7 @@ console.log(updatedStudentQuestionProgress);
             logger.error('Worksheet response not found');
             throw new Error('Worksheet response not found');
         }
-        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-failed`, {
+        pusher.trigger(worksheetChannel(worksheetResponse.id), `set-failed`, {
             id: worksheetQuestionProgressId,
         });
         logger.error('Failed to regrade worksheet response', { error, worksheetResponseId, worksheetQuestionProgressId });

package/src/routers/agenda.ts

@@ -1,8 +1,7 @@
 import { z } from "zod";
 import { createTRPCRouter, protectedProcedure } from "../trpc.js";
-import { prisma } from "../lib/prisma.js";
 import { TRPCError } from "@trpc/server";
-import { addDays, addMonths, subMonths, startOfDay, endOfDay } from "date-fns";
+import { getAgenda } from "../services/agenda.js";
 
 export const agendaRouter = createTRPCRouter({
   get: protectedProcedure
@@ -17,68 +16,6 @@ export const agendaRouter = createTRPCRouter({
         });
       }
 
-      // Expand query range to 6 months (3 months before and after the reference date)
-      // to allow calendar navigation and ensure newly created events are visible
-      const referenceDate = new Date(input.weekStart);
-      const rangeStart = startOfDay(subMonths(referenceDate, 3));
-      const rangeEnd = endOfDay(addMonths(referenceDate, 3));
-
-      const [personalEvents, classEvents] = await Promise.all([
-        // Get personal events
-        prisma.event.findMany({
-          where: {
-            userId: ctx.user.id,
-            startTime: {
-              gte: rangeStart,
-              lte: rangeEnd,
-            },
-            class: {
-              is: null,
-            },
-          },
-          include: {
-            assignmentsAttached: true,
-            class: true,
-          },
-        }),
-        // Get class events
-        prisma.event.findMany({
-          where: {
-            class: {
-              OR: [
-                {
-                  teachers: {
-                    some: {
-                      id: ctx.user.id,
-                    },
-                  },
-                },
-                {
-                  students: {
-                    some: {
-                      id: ctx.user.id,
-                    },
-                  },
-                },
-              ],
-            },
-            startTime: {
-              gte: rangeStart,
-              lte: rangeEnd,
-            },
-          },
-          include: {
-            assignmentsAttached: true,
-            class: true,
-          },
-        }),
-      ]);
-
-      return {
-        events: {
-          personal: personalEvents,
-          class: classEvents,
-        },
-      };
+      return getAgenda(ctx.user.id, input.weekStart);
     }),
-}); 
+});