@studious-lms/server 1.2.32 → 1.2.34

package/src/routers/class.ts

@@ -154,6 +154,22 @@ export const classRouter = createTRPCRouter({
             },
           },
           assignments: {
+            ...(!isTeacher && {
+              where: {OR: [
+                {
+                  assignedTo: {
+                    some: {
+                      id: ctx.user?.id,
+                    },
+                  },
+                },
+                {
+                  assignedTo: {
+                    none: {},
+                  },
+                },
+              ],}
+            }),
             select: {
               type: true,
               id: true,
@@ -217,8 +233,8 @@ export const classRouter = createTRPCRouter({
         assignments: classData.assignments.map(assignment => ({
           ...assignment,
           late: assignment.dueDate < new Date(),
-          submitted: assignment.submissions.some(submission => submission.studentId === ctx.user?.id),
-          returned: assignment.submissions.some(submission => submission.studentId === ctx.user?.id && submission.returned),
+          submitted: assignment.submissions.find(submission => submission.studentId === ctx.user?.id)?.submitted,
+          returned: assignment.submissions.find(submission => submission.studentId === ctx.user?.id)?.returned,
         })),
       }
 

package/src/routers/worksheet.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from "@trpc/server";
-import { createTRPCRouter, protectedProcedure } from "src/trpc";
+import { createTRPCRouter, protectedProcedure } from "../trpc.js";
 import { z } from "zod";
-import { prisma } from "src/lib/prisma";
+import { prisma } from "../lib/prisma.js";
 import { WorksheetQuestionType } from "@prisma/client";
 
 export const worksheetRouter = createTRPCRouter({
@@ -112,12 +112,13 @@ export const worksheetRouter = createTRPCRouter({
       worksheetId: z.string(),
       question: z.string(),
       answer: z.string(),
+      points: z.number().optional(),
       options: z.any().optional(), // JSON field
       markScheme: z.any().optional(), // JSON field
       type: z.enum(['MULTIPLE_CHOICE', 'TRUE_FALSE', 'SHORT_ANSWER', 'LONG_ANSWER', 'MATH_EXPRESSION', 'ESSAY']),
     }))
     .mutation(async ({ ctx, input }) => {
-      const { worksheetId, question, answer, options, markScheme, type } = input;
+      const { worksheetId, question, points, answer, options, markScheme, type } = input;
 
       const worksheet = await prisma.worksheet.findUnique({
         where: { id: worksheetId },
@@ -131,6 +132,7 @@ export const worksheetRouter = createTRPCRouter({
         data: {
           worksheetId,
           type,
+          points,
           question,
           answer,
           options,
@@ -201,12 +203,13 @@ export const worksheetRouter = createTRPCRouter({
       questionId: z.string(),
       question: z.string().optional(),
       answer: z.string().optional(),
+      points: z.number().optional(),
       options: z.any().optional(), // JSON field
       markScheme: z.any().optional(), // JSON field
       type: z.enum(['MULTIPLE_CHOICE', 'TRUE_FALSE', 'SHORT_ANSWER', 'LONG_ANSWER', 'MATH_EXPRESSION', 'ESSAY']).optional(),
     }))
     .mutation(async ({ ctx, input }) => {
-      const { worksheetId, questionId, question, answer, options, markScheme, type } = input;
+      const { worksheetId, questionId, points, question, answer, options, markScheme, type } = input;
 
       const worksheet = await prisma.worksheet.findUnique({
         where: { id: worksheetId },
@@ -223,6 +226,8 @@ export const worksheetRouter = createTRPCRouter({
           ...(answer !== undefined && { answer }),
           ...(markScheme !== undefined && { markScheme }),
           ...(type !== undefined && { type }),
+          ...(options !== undefined && { options }),
+          ...(points !== undefined && { points }),
         },
       });
 
@@ -267,14 +272,41 @@ export const worksheetRouter = createTRPCRouter({
         throw new TRPCError({ code: 'NOT_FOUND', message: 'Submission not found' });
       }
 
-      const worksheetResponses = await prisma.studentWorksheetResponse.findMany({
-        where: { submissionId },
-        include: {
-          responses: true,
-        },
+      // Find or create worksheet response for this submission
+      const worksheetResponse = await prisma.$transaction(async (tx) => {
+        // First check if a response exists
+        const existing = await tx.studentWorksheetResponse.findFirst({
+          where: { 
+            submissionId,
+            worksheetId 
+          },
+          include: {
+            responses: true,
+          },
+        });
+
+        if (existing) {
+          return existing;
+        }
+
+        // Create new response if it doesn't exist
+        const created = await tx.studentWorksheetResponse.create({
+          data: {
+            worksheetId,
+            submissionId,
+            studentId: submission.studentId,
+          },
+          include: {
+            responses: true,
+          },
+        });
+
+        return created;
       });
 
-      return worksheetResponses;
+
+      console.log(worksheetResponse);
+      return worksheetResponse;
     }),
   answerQuestion: protectedProcedure
     .input(z.object({
@@ -421,14 +453,14 @@ export const worksheetRouter = createTRPCRouter({
     }),
 
   // Get all student responses for a worksheet (teacher view)
-  getWorksheetResponses: protectedProcedure
+  getWorksheetResponse: protectedProcedure
     .input(z.object({
       worksheetId: z.string(),
     }))
     .query(async ({ ctx, input }) => {
       const { worksheetId } = input;
 
-      const responses = await prisma.studentWorksheetResponse.findMany({
+      const responses = await prisma.studentWorksheetResponse.findFirst({
         where: { worksheetId },
         include: {
           student: {