@studious-lms/server 1.2.32 → 1.2.33

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

@@ -223,6 +223,7 @@ export const worksheetRouter = createTRPCRouter({
           ...(answer !== undefined && { answer }),
           ...(markScheme !== undefined && { markScheme }),
           ...(type !== undefined && { type }),
+          ...(options !== undefined && { options }),
         },
       });
 
@@ -267,11 +268,36 @@ 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 worksheetResponses = 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;
@@ -421,14 +447,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: {