@studious-lms/server 1.2.53 → 1.4.0

package/dist/seedDatabase.d.ts

@@ -10,9 +10,9 @@ export declare function createUser(email: string, password: string, username: st
 }>;
 export declare function addNotification(userId: string, title: string, content: string): Promise<{
     id: string;
+    createdAt: Date;
     title: string;
     content: string;
-    createdAt: Date;
     read: boolean;
     senderId: string | null;
     receiverId: string;

package/dist/server/pipelines/gradeWorksheet.d.ts

@@ -2,29 +2,29 @@ export declare const gradeWorksheetPipeline: (worksheetResponseId: string) => Pr
 export declare const cancelGradePipeline: (worksheetResponseId: string, worksheetQuestionProgressId: string) => Promise<{
     status: import(".prisma/client").$Enums.GenerationStatus | null;
     id: string;
-    feedback: string | null;
-    studentId: string;
     createdAt: Date;
     updatedAt: Date | null;
-    questionId: string;
+    feedback: string | null;
+    studentId: string;
     response: string;
     isCorrect: boolean;
     markschemeState: import("@prisma/client/runtime/library.js").JsonValue | null;
     points: number;
+    questionId: string;
     studentWorksheetResponseId: string | null;
 }>;
 export declare const regradeWorksheetPipeline: (worksheetResponseId: string, worksheetQuestionProgressId: string) => Promise<{
     status: import(".prisma/client").$Enums.GenerationStatus | null;
     id: string;
-    feedback: string | null;
-    studentId: string;
     createdAt: Date;
     updatedAt: Date | null;
-    questionId: string;
+    feedback: string | null;
+    studentId: string;
     response: string;
     isCorrect: boolean;
     markschemeState: import("@prisma/client/runtime/library.js").JsonValue | null;
     points: number;
+    questionId: string;
     studentWorksheetResponseId: string | null;
 }>;
 //# sourceMappingURL=gradeWorksheet.d.ts.map

package/dist/server/pipelines/gradeWorksheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradeWorksheet.d.ts","sourceRoot":"/","sources":["server/pipelines/gradeWorksheet.ts"],"names":[],"mappings":"AA+IA,eAAO,MAAM,sBAAsB,GAAU,qBAAqB,MAAM,kBAsDvE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,qBAAqB,MAAM,EAAE,6BAA6B,MAAM;;;;;;;;;;;;;EAyBzG,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,qBAAqB,MAAM,EAAE,6BAA6B,MAAM;;;;;;;;;;;;;EAgD9G,CAAC"}
+{"version":3,"file":"gradeWorksheet.d.ts","sourceRoot":"/","sources":["server/pipelines/gradeWorksheet.ts"],"names":[],"mappings":"AAwJA,eAAO,MAAM,sBAAsB,GAAU,qBAAqB,MAAM,kBAsDvE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,qBAAqB,MAAM,EAAE,6BAA6B,MAAM;;;;;;;;;;;;;EAyBzG,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,qBAAqB,MAAM,EAAE,6BAA6B,MAAM;;;;;;;;;;;;;EA8C9G,CAAC"}

package/dist/server/pipelines/gradeWorksheet.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="dca8f58c-f587-5706-98e0-1eafd2fa5e2f")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="5fcc36af-16e5-52cb-84e1-f2f423e6d9eb")}catch(e){}}();
 import { GenerationStatus, WorksheetQuestionType } from "@prisma/client";
 import { prisma } from "../../lib/prisma.js";
 import { logger } from "../../utils/logger.js";
@@ -36,8 +36,16 @@ const gradeWorksheetQuestion = async (worksheetResponseId, worksheetQuestionProg
         },
     });
     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`, {
         id: studentQuestionProgress.id,
@@ -211,7 +219,6 @@ export const regradeWorksheetPipeline = async (worksheetResponseId, worksheetQue
             where: { id: worksheetQuestionProgressId },
             data: { status: GenerationStatus.PENDING },
         });
-        console.log(updatedStudentQuestionProgress);
         gradeWorksheetQuestion(worksheetResponseId, worksheetQuestionProgressId);
         return updatedStudentQuestionProgress;
     }
@@ -238,4 +245,4 @@ export const regradeWorksheetPipeline = async (worksheetResponseId, worksheetQue
     }
 };
 //# sourceMappingURL=gradeWorksheet.js.map
-//# debugId=dca8f58c-f587-5706-98e0-1eafd2fa5e2f
+//# debugId=5fcc36af-16e5-52cb-84e1-f2f423e6d9eb

package/dist/server/pipelines/gradeWorksheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"gradeWorksheet.js","sources":["server/pipelines/gradeWorksheet.ts"],"sourceRoot":"/","sourcesContent":["import { GenerationStatus, WorksheetQuestionType } from \"@prisma/client\";\nimport { prisma } from \"../../lib/prisma.js\";\nimport { logger } from \"../../utils/logger.js\";\nimport z from \"zod\";\nimport { inference } from \"../../utils/inference.js\";\nimport { getAIUserId } from \"../../utils/aiUser.js\";\nimport { pusher } from \"../../lib/pusher.js\";\n\n\nconst removeAllPreviousAIComments = async (worksheetQuestionProgressId: string) => {\n    await prisma.comment.deleteMany({\n        where: {\n            studentQuestionProgressId: worksheetQuestionProgressId,\n            authorId: getAIUserId(),\n        },\n    });\n};\n\nconst gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {\n\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId },\n        include: {\n            worksheet: true,\n        },\n    });\n\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }    \n\n    const studentQuestionProgress = await prisma.studentQuestionProgress.findFirst({\n        where: {\n            id: worksheetQuestionProgressId,\n        },\n        include: {\n            question: true,\n            comments: true,\n        },\n    });\n\n    if (!studentQuestionProgress) {\n        logger.error('Student question progress not found');\n        throw new Error('Student question progress not found');\n    }\n\n    pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-pending`, {\n        id: studentQuestionProgress.id,\n    });\n\n    const question = studentQuestionProgress.question;\n    const comments = studentQuestionProgress.comments;\n    const responseText = studentQuestionProgress.response;\n\n\n    try {\n        const apiResponse = await inference(\n            `Grade the following worksheet response:\n            \n            Question: ${question.question}\n            Response: ${responseText}\n\n            Comments: ${comments.map((comment) => comment.content).join('\\n')}\n            Mark Scheme: ${JSON.stringify(question.markScheme)}\n            \n            Justify your reasoning by including comment(s) and mark the question please.         \n            Return ONLY JSON in the following format (fill in the values as per the question):\n           {\n            \"isCorrect\": <boolean>,\n            \"points\": <number>,\n            \"markschemeState\": [\n                { \"id\": <string>, \"correct\": <boolean> }\n            ],\n            \"comments\": [<string>, ...]\n            }\n            `,\n            z.object({\n                isCorrect: z.boolean(),\n                points: z.number(),\n                markschemeState: z.array(z.object({\n                    id: z.string(),\n                    correct: z.boolean(),\n                  })), // @note: this has to be converted to [id: string]: correct boolean\n                comments: z.array(z.string()),\n            }),\n        ).catch((error) => {\n            logger.error('Failed to grade worksheet response', { error });\n            throw error;\n        });\n\n        const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({\n            where: { id: studentQuestionProgress.id, status: {\n                not: {\n                    in: ['CANCELLED'],\n                },\n            } },\n            data: {\n                status: GenerationStatus.COMPLETED,\n                isCorrect: (apiResponse as { isCorrect: boolean }).isCorrect,\n                points: (apiResponse as { points: number }).points,\n                markschemeState: (apiResponse as {\n                    markschemeState: { id: string; correct: boolean }[];\n                }).markschemeState.reduce((acc, curr) => {\n                    acc[\"item-\" + curr.id] = curr.correct;\n                    return acc;\n                }, {} as Record<string, boolean>),\n                comments: {\n                    create: (apiResponse as {\n                        comments: string[];\n                    }).comments.map((commentContent) => ({\n                        content: commentContent,\n                        authorId: getAIUserId(),\n                    })),\n                },\n            },\n        });\n        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-completed`, {\n            id: updatedStudentQuestionProgress.id,\n        });\n\n        return updatedStudentQuestionProgress;\n    } catch (error) {\n        logger.error('Failed to grade worksheet response', { error, worksheetResponseId });\n        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-failed`, {\n            id: studentQuestionProgress.id,\n        });\n        await prisma.studentQuestionProgress.update({\n            where: { id: studentQuestionProgress.id },\n            data: { status: GenerationStatus.FAILED },\n        });\n        throw error;\n    }\n}\n\n/**\n * Grades and regrades worksheet (can fixed failed responses)\n * @param worksheetResponseId worksheet response id\n * @returns updated worksheet response\n */\n\nconst DO_NOT_INFERENCE_STATUSES = [GenerationStatus.CANCELLED, GenerationStatus.PENDING, GenerationStatus.COMPLETED];\n\nexport const gradeWorksheetPipeline = async (worksheetResponseId: string) => {\n    logger.info('Grading worksheet response', { worksheetResponseId });\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId },\n        include: {\n            worksheet: true,\n            responses: {\n                where: {\n                    status: {\n                        not: {\n                            in: DO_NOT_INFERENCE_STATUSES,\n                        },\n                    },\n                    question: {\n                        type: {\n                            not: {\n                                in: [WorksheetQuestionType.MULTIPLE_CHOICE, WorksheetQuestionType.TRUE_FALSE],\n                            }\n                        },\n                    },\n                },\n                include: {\n                    question: true,\n                    comments: true,\n                },\n            },\n        },\n    });\n\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }\n\n    // Use for...of instead of forEach to properly handle async operations\n    for (const response of worksheetResponse.responses) {\n        logger.info('Grading question', { questionId: response.questionId });\n\n        const studentQuestionProgress = await prisma.studentQuestionProgress.update({\n            where: { id: response.id, status: {\n                not: {\n                    in: DO_NOT_INFERENCE_STATUSES,\n                }\n            } },\n            data: { status: GenerationStatus.PENDING },\n        });\n\n        if (studentQuestionProgress.status !== GenerationStatus.PENDING) {\n            return;\n        }\n\n        gradeWorksheetQuestion(worksheetResponseId, response.id);\n\n    };\n};\n\nexport const cancelGradePipeline = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {\n    logger.info('Cancelling auto grading', { worksheetResponseId, worksheetQuestionProgressId });\n\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId },\n        include: {\n            worksheet: true,\n        },\n    });\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }\n    const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({\n        where: { id: worksheetQuestionProgressId },\n        data: { status: GenerationStatus.CANCELLED },\n    });\n\n    await removeAllPreviousAIComments(worksheetQuestionProgressId);\n\n    pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-cancelled`, {\n        id: updatedStudentQuestionProgress.id,\n    });\n\n    return updatedStudentQuestionProgress;\n};\n\nexport const regradeWorksheetPipeline = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {\n    logger.info('Regrading worksheet response', { worksheetResponseId, worksheetQuestionProgressId });\n    try {\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId, },\n        include: {\n            worksheet: true,\n        },\n    });\n    \n    await removeAllPreviousAIComments(worksheetQuestionProgressId);\n\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }\n\n    const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({\n        where: { id: worksheetQuestionProgressId },\n        data: { status: GenerationStatus.PENDING },\n    });\n\nconsole.log(updatedStudentQuestionProgress);\n\n    gradeWorksheetQuestion(worksheetResponseId, worksheetQuestionProgressId);\n\n    return updatedStudentQuestionProgress;\n    } catch (error) {\n        await prisma.studentQuestionProgress.update({\n            where: { id: worksheetQuestionProgressId },\n            data: { status: GenerationStatus.FAILED },\n        });\n        const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n            where: { id: worksheetResponseId, },\n            include: {\n                worksheet: true,\n            },\n        });\n        if (!worksheetResponse) {\n            logger.error('Worksheet response not found');\n            throw new Error('Worksheet response not found');\n        }\n        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-failed`, {\n            id: worksheetQuestionProgressId,\n        });\n        logger.error('Failed to regrade worksheet response', { error, worksheetResponseId, worksheetQuestionProgressId });\n        throw error;\n    }\n};\n"],"names":[],"mappings":"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","debug_id":"dca8f58c-f587-5706-98e0-1eafd2fa5e2f"}
+{"version":3,"file":"gradeWorksheet.js","sources":["server/pipelines/gradeWorksheet.ts"],"sourceRoot":"/","sourcesContent":["import { GenerationStatus, WorksheetQuestionType } from \"@prisma/client\";\nimport { prisma } from \"../../lib/prisma.js\";\nimport { logger } from \"../../utils/logger.js\";\nimport z from \"zod\";\nimport { inference } from \"../../utils/inference.js\";\nimport { getAIUserId } from \"../../utils/aiUser.js\";\nimport { pusher } from \"../../lib/pusher.js\";\n\n\nconst removeAllPreviousAIComments = async (worksheetQuestionProgressId: string) => {\n    await prisma.comment.deleteMany({\n        where: {\n            studentQuestionProgressId: worksheetQuestionProgressId,\n            authorId: getAIUserId(),\n        },\n    });\n};\n\nconst gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {\n\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId },\n        include: {\n            worksheet: true,\n        },\n    });\n\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }    \n\n    const studentQuestionProgress = await prisma.studentQuestionProgress.findFirst({\n        where: {\n            id: worksheetQuestionProgressId,\n        },\n        include: {\n            question: true,\n            comments: true,\n        },\n    });\n\n    if (!studentQuestionProgress) {\n       const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.create({\n        data: {\n            studentId: worksheetResponse.studentId,\n            questionId: worksheetQuestionProgressId,\n            response: '',\n            isCorrect: false,\n            markschemeState: {},\n        },\n       });\n\n        return updatedStudentQuestionProgress;\n    }\n\n    pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-pending`, {\n        id: studentQuestionProgress.id,\n    });\n\n    const question = studentQuestionProgress.question;\n    const comments = studentQuestionProgress.comments;\n    const responseText = studentQuestionProgress.response;\n\n\n    try {\n        const apiResponse = await inference(\n            `Grade the following worksheet response:\n            \n            Question: ${question.question}\n            Response: ${responseText}\n\n            Comments: ${comments.map((comment) => comment.content).join('\\n')}\n            Mark Scheme: ${JSON.stringify(question.markScheme)}\n            \n            Justify your reasoning by including comment(s) and mark the question please.         \n            Return ONLY JSON in the following format (fill in the values as per the question):\n           {\n            \"isCorrect\": <boolean>,\n            \"points\": <number>,\n            \"markschemeState\": [\n                { \"id\": <string>, \"correct\": <boolean> }\n            ],\n            \"comments\": [<string>, ...]\n            }\n            `,\n            z.object({\n                isCorrect: z.boolean(),\n                points: z.number(),\n                markschemeState: z.array(z.object({\n                    id: z.string(),\n                    correct: z.boolean(),\n                  })), // @note: this has to be converted to [id: string]: correct boolean\n                comments: z.array(z.string()),\n            }),\n        ).catch((error) => {\n            logger.error('Failed to grade worksheet response', { error });\n            throw error;\n        });\n\n        const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({\n            where: { id: studentQuestionProgress.id, status: {\n                not: {\n                    in: ['CANCELLED'],\n                },\n            } },\n            data: {\n                status: GenerationStatus.COMPLETED,\n                isCorrect: (apiResponse as { isCorrect: boolean }).isCorrect,\n                points: (apiResponse as { points: number }).points,\n                markschemeState: (apiResponse as {\n                    markschemeState: { id: string; correct: boolean }[];\n                }).markschemeState.reduce((acc, curr) => {\n                    acc[\"item-\" + curr.id] = curr.correct;\n                    return acc;\n                }, {} as Record<string, boolean>),\n                comments: {\n                    create: (apiResponse as {\n                        comments: string[];\n                    }).comments.map((commentContent) => ({\n                        content: commentContent,\n                        authorId: getAIUserId(),\n                    })),\n                },\n            },\n        });\n        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-completed`, {\n            id: updatedStudentQuestionProgress.id,\n        });\n\n        return updatedStudentQuestionProgress;\n    } catch (error) {\n        logger.error('Failed to grade worksheet response', { error, worksheetResponseId });\n        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-failed`, {\n            id: studentQuestionProgress.id,\n        });\n        await prisma.studentQuestionProgress.update({\n            where: { id: studentQuestionProgress.id },\n            data: { status: GenerationStatus.FAILED },\n        });\n        throw error;\n    }\n}\n\n/**\n * Grades and regrades worksheet (can fixed failed responses)\n * @param worksheetResponseId worksheet response id\n * @returns updated worksheet response\n */\n\nconst DO_NOT_INFERENCE_STATUSES = [GenerationStatus.CANCELLED, GenerationStatus.PENDING, GenerationStatus.COMPLETED];\n\nexport const gradeWorksheetPipeline = async (worksheetResponseId: string) => {\n    logger.info('Grading worksheet response', { worksheetResponseId });\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId },\n        include: {\n            worksheet: true,\n            responses: {\n                where: {\n                    status: {\n                        not: {\n                            in: DO_NOT_INFERENCE_STATUSES,\n                        },\n                    },\n                    question: {\n                        type: {\n                            not: {\n                                in: [WorksheetQuestionType.MULTIPLE_CHOICE, WorksheetQuestionType.TRUE_FALSE],\n                            }\n                        },\n                    },\n                },\n                include: {\n                    question: true,\n                    comments: true,\n                },\n            },\n        },\n    });\n\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }\n\n    // Use for...of instead of forEach to properly handle async operations\n    for (const response of worksheetResponse.responses) {\n        logger.info('Grading question', { questionId: response.questionId });\n\n        const studentQuestionProgress = await prisma.studentQuestionProgress.update({\n            where: { id: response.id, status: {\n                not: {\n                    in: DO_NOT_INFERENCE_STATUSES,\n                }\n            } },\n            data: { status: GenerationStatus.PENDING },\n        });\n\n        if (studentQuestionProgress.status !== GenerationStatus.PENDING) {\n            return;\n        }\n\n        gradeWorksheetQuestion(worksheetResponseId, response.id);\n\n    };\n};\n\nexport const cancelGradePipeline = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {\n    logger.info('Cancelling auto grading', { worksheetResponseId, worksheetQuestionProgressId });\n\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId },\n        include: {\n            worksheet: true,\n        },\n    });\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }\n    const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({\n        where: { id: worksheetQuestionProgressId },\n        data: { status: GenerationStatus.CANCELLED },\n    });\n\n    await removeAllPreviousAIComments(worksheetQuestionProgressId);\n\n    pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-cancelled`, {\n        id: updatedStudentQuestionProgress.id,\n    });\n\n    return updatedStudentQuestionProgress;\n};\n\nexport const regradeWorksheetPipeline = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {\n    logger.info('Regrading worksheet response', { worksheetResponseId, worksheetQuestionProgressId });\n    try {\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId, },\n        include: {\n            worksheet: true,\n        },\n    });\n    \n    await removeAllPreviousAIComments(worksheetQuestionProgressId);\n\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }\n\n    const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({\n        where: { id: worksheetQuestionProgressId },\n        data: { status: GenerationStatus.PENDING },\n    });\n\n    gradeWorksheetQuestion(worksheetResponseId, worksheetQuestionProgressId);\n\n    return updatedStudentQuestionProgress;\n    } catch (error) {\n        await prisma.studentQuestionProgress.update({\n            where: { id: worksheetQuestionProgressId },\n            data: { status: GenerationStatus.FAILED },\n        });\n        const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n            where: { id: worksheetResponseId, },\n            include: {\n                worksheet: true,\n            },\n        });\n        if (!worksheetResponse) {\n            logger.error('Worksheet response not found');\n            throw new Error('Worksheet response not found');\n        }\n        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-failed`, {\n            id: worksheetQuestionProgressId,\n        });\n        logger.error('Failed to regrade worksheet response', { error, worksheetResponseId, worksheetQuestionProgressId });\n        throw error;\n    }\n};\n"],"names":[],"mappings":"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","debug_id":"5fcc36af-16e5-52cb-84e1-f2f423e6d9eb"}

package/dist/services/agenda.d.ts

@@ -0,0 +1,100 @@
+/** Get agenda events (personal + class) for ±3 months around the given week start. */
+export declare function getAgenda(userId: string, weekStart: string): Promise<{
+    events: {
+        personal: ({
+            class: {
+                id: string;
+                schoolId: string | null;
+                name: string;
+                subject: string;
+                color: string | null;
+                section: string;
+                syllabus: string | null;
+            } | null;
+            assignmentsAttached: {
+                type: import(".prisma/client").$Enums.AssignmentType;
+                id: string;
+                createdAt: Date | null;
+                classId: string;
+                title: string;
+                dueDate: Date;
+                maxGrade: number | null;
+                eventId: string | null;
+                instructions: string;
+                modifiedAt: Date | null;
+                teacherId: string;
+                acceptFiles: boolean;
+                acceptExtendedResponse: boolean;
+                acceptWorksheet: boolean;
+                gradeWithAI: boolean;
+                aiPolicyLevel: number;
+                sectionId: string | null;
+                graded: boolean;
+                weight: number;
+                inProgress: boolean;
+                template: boolean;
+                markSchemeId: string | null;
+                order: number | null;
+                gradingBoundaryId: string | null;
+            }[];
+        } & {
+            id: string;
+            userId: string | null;
+            location: string | null;
+            classId: string | null;
+            name: string | null;
+            color: string | null;
+            startTime: Date;
+            endTime: Date;
+            remarks: string | null;
+        })[];
+        class: ({
+            class: {
+                id: string;
+                schoolId: string | null;
+                name: string;
+                subject: string;
+                color: string | null;
+                section: string;
+                syllabus: string | null;
+            } | null;
+            assignmentsAttached: {
+                type: import(".prisma/client").$Enums.AssignmentType;
+                id: string;
+                createdAt: Date | null;
+                classId: string;
+                title: string;
+                dueDate: Date;
+                maxGrade: number | null;
+                eventId: string | null;
+                instructions: string;
+                modifiedAt: Date | null;
+                teacherId: string;
+                acceptFiles: boolean;
+                acceptExtendedResponse: boolean;
+                acceptWorksheet: boolean;
+                gradeWithAI: boolean;
+                aiPolicyLevel: number;
+                sectionId: string | null;
+                graded: boolean;
+                weight: number;
+                inProgress: boolean;
+                template: boolean;
+                markSchemeId: string | null;
+                order: number | null;
+                gradingBoundaryId: string | null;
+            }[];
+        } & {
+            id: string;
+            userId: string | null;
+            location: string | null;
+            classId: string | null;
+            name: string | null;
+            color: string | null;
+            startTime: Date;
+            endTime: Date;
+            remarks: string | null;
+        })[];
+    };
+}>;
+//# sourceMappingURL=agenda.d.ts.map

package/dist/services/agenda.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agenda.d.ts","sourceRoot":"/","sources":["services/agenda.ts"],"names":[],"mappings":"AAQA,sFAAsF;AACtF,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAWhE"}

package/dist/services/agenda.js

@@ -0,0 +1,21 @@
+/**
+ * Agenda service – fetches personal and class events for a date range.
+ */
+
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="1f426c37-bd3b-50ad-bfae-cfbdb0fc3d3c")}catch(e){}}();
+import { addMonths, subMonths, startOfDay, endOfDay } from "date-fns";
+import { findPersonalEvents, findClassEvents } from "../models/agenda.js";
+const RANGE_MONTHS = 3;
+/** Get agenda events (personal + class) for ±3 months around the given week start. */
+export async function getAgenda(userId, weekStart) {
+    const referenceDate = new Date(weekStart);
+    const rangeStart = startOfDay(subMonths(referenceDate, RANGE_MONTHS));
+    const rangeEnd = endOfDay(addMonths(referenceDate, RANGE_MONTHS));
+    const [personal, classEvents] = await Promise.all([
+        findPersonalEvents(userId, rangeStart, rangeEnd),
+        findClassEvents(userId, rangeStart, rangeEnd),
+    ]);
+    return { events: { personal, class: classEvents } };
+}
+//# sourceMappingURL=agenda.js.map
+//# debugId=1f426c37-bd3b-50ad-bfae-cfbdb0fc3d3c

package/dist/services/agenda.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agenda.js","sources":["services/agenda.ts"],"sourceRoot":"/","sourcesContent":["/**\n * Agenda service – fetches personal and class events for a date range.\n */\nimport { addMonths, subMonths, startOfDay, endOfDay } from \"date-fns\";\nimport { findPersonalEvents, findClassEvents } from \"../models/agenda.js\";\n\nconst RANGE_MONTHS = 3;\n\n/** Get agenda events (personal + class) for ±3 months around the given week start. */\nexport async function getAgenda(userId: string, weekStart: string) {\n  const referenceDate = new Date(weekStart);\n  const rangeStart = startOfDay(subMonths(referenceDate, RANGE_MONTHS));\n  const rangeEnd = endOfDay(addMonths(referenceDate, RANGE_MONTHS));\n\n  const [personal, classEvents] = await Promise.all([\n    findPersonalEvents(userId, rangeStart, rangeEnd),\n    findClassEvents(userId, rangeStart, rangeEnd),\n  ]);\n\n  return { events: { personal, class: classEvents } };\n}\n"],"names":[],"mappings":"AAAA;;GAEG;;;AACH,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE1E,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB,sFAAsF;AACtF,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAAc,EAAE,SAAiB;IAC/D,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;IAElE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChD,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC;QAChD,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC;KAC9C,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC;AACtD,CAAC","debug_id":"1f426c37-bd3b-50ad-bfae-cfbdb0fc3d3c"}

package/dist/services/announcement.d.ts

@@ -0,0 +1,135 @@
+import { type DirectUploadFile } from "../lib/fileUpload.js";
+export declare function getAllAnnouncements(classId: string): Promise<{
+    announcements: {
+        commentCount: number;
+        _count: undefined;
+        id: string;
+        createdAt: Date;
+        remarks: string;
+        modifiedAt: Date | null;
+        teacher: {
+            id: string;
+            username: string;
+            profile: {
+                displayName: string | null;
+                profilePicture: string | null;
+                profilePictureThumbnail: string | null;
+            } | null;
+        };
+        attachments: {
+            path: string;
+            type: string;
+            id: string;
+            name: string;
+            size: number | null;
+            uploadedAt: Date | null;
+            thumbnailId: string | null;
+        }[];
+    }[];
+}>;
+export declare function getAnnouncement(id: string, classId: string): Promise<{
+    announcement: {
+        id: string;
+        createdAt: Date;
+        remarks: string;
+        modifiedAt: Date | null;
+        teacher: {
+            id: string;
+            username: string;
+            profile: {
+                displayName: string | null;
+                profilePicture: string | null;
+                profilePictureThumbnail: string | null;
+            } | null;
+        };
+        attachments: {
+            path: string;
+            type: string;
+            id: string;
+            name: string;
+            size: number | null;
+            uploadedAt: Date | null;
+            thumbnailId: string | null;
+        }[];
+    };
+}>;
+export declare function createAnnouncementRecord(userId: string, input: {
+    classId: string;
+    remarks: string;
+    files?: {
+        name: string;
+        type: string;
+        size: number;
+    }[];
+    existingFileIds?: string[];
+}): Promise<{
+    announcement: {
+        id: string;
+        createdAt: Date;
+        remarks: string;
+        modifiedAt: Date | null;
+        teacher: {
+            id: string;
+            username: string;
+            profile: {
+                displayName: string | null;
+                profilePicture: string | null;
+                profilePictureThumbnail: string | null;
+            } | null;
+        };
+        attachments: {
+            path: string;
+            type: string;
+            id: string;
+            name: string;
+            size: number | null;
+            uploadedAt: Date | null;
+            thumbnailId: string | null;
+        }[];
+    };
+    uploadFiles: DirectUploadFile[] | undefined;
+}>;
+export declare function updateAnnouncementRecord(userId: string, input: {
+    id: string;
+    classId: string;
+    data: {
+        remarks?: string;
+        files?: {
+            name: string;
+            type: string;
+            size: number;
+        }[];
+        existingFileIds?: string[];
+        removedAttachments?: string[];
+    };
+}): Promise<{
+    announcement: {
+        id: string;
+        createdAt: Date;
+        remarks: string;
+        modifiedAt: Date | null;
+        teacher: {
+            id: string;
+            username: string;
+            profile: {
+                displayName: string | null;
+                profilePicture: string | null;
+                profilePictureThumbnail: string | null;
+            } | null;
+        };
+        attachments: {
+            path: string;
+            type: string;
+            id: string;
+            name: string;
+            size: number | null;
+            uploadedAt: Date | null;
+            thumbnailId: string | null;
+        }[];
+    };
+    uploadFiles: DirectUploadFile[] | undefined;
+}>;
+export declare function deleteAnnouncementRecord(userId: string, id: string, classId: string): Promise<{
+    success: boolean;
+}>;
+//# sourceMappingURL=announcement.d.ts.map

package/dist/services/announcement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"announcement.d.ts","sourceRoot":"/","sources":["services/announcement.ts"],"names":[],"mappings":"AAcA,OAAO,EAA2B,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAKtF,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;GAQxD;AAED,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;GAShE;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE;IACL,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACvD,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;;;;;;;;;;;;;;;;;;;;;;;;;;GAsFF;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE;IACL,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QACJ,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACvD,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3B,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;KAC/B,CAAC;CACH;;;;;;;;;;;;;;;;;;;;;;;;;;GAuHF;AAED,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;;GAsBzF"}