@studious-lms/server 1.0.7 → 1.1.0

package/src/routers/class.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { createTRPCRouter, protectedProcedure, protectedTeacherProcedure, protectedClassMemberProcedure } from "../trpc";
-import { prisma } from "../lib/prisma";
+import { createTRPCRouter, protectedProcedure, protectedTeacherProcedure, protectedClassMemberProcedure } from "../trpc.js";
+import { prisma } from "../lib/prisma.js";
 import { TRPCError } from "@trpc/server";
-import { generateInviteCode } from "../utils/generateInviteCode";
+import { generateInviteCode } from "../utils/generateInviteCode.js";
 
 export const classRouter = createTRPCRouter({
   getAll: protectedProcedure
@@ -168,25 +168,30 @@ export const classRouter = createTRPCRouter({
         },
       });
 
+
+      if (!classData) {
+        throw new Error('Class not found');
+      }
+
+      const formattedClassData = {
+        ...classData,
+        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),
+        })),
+      }
+
       const sections = await prisma.section.findMany({
         where: {
           classId: classId,
         },
       });
 
-      if (!classData) {
-        throw new Error('Class not found');
-      }
-
       return {
         class: {
-          ...classData,
-          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),
-          })),
+          ...formattedClassData,
           sections,
         },
       };
@@ -482,6 +487,12 @@ export const classRouter = createTRPCRouter({
     .mutation(async ({ ctx, input }) => {
       const { classId } = input;
 
+      await prisma.session.deleteMany({
+        where: {
+          classId,
+        },
+      });
+
       // Create a new session for the invite code
       const session = await prisma.session.create({
         data: {

package/src/routers/event.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { createTRPCRouter, protectedProcedure } from "../trpc.js";
 import { TRPCError } from "@trpc/server";
-import { prisma } from "../lib/prisma";
+import { prisma } from "../lib/prisma.js";
 import { parseISO } from "date-fns";
 
 const eventSchema = z.object({

package/src/routers/file.ts

@@ -1,10 +1,10 @@
 import { z } from "zod";
-import { createTRPCRouter, protectedProcedure, protectedTeacherProcedure } from "../trpc";
+import { createTRPCRouter, protectedProcedure, protectedTeacherProcedure } from "../trpc.js";
 import { TRPCError } from "@trpc/server";
-import { getSignedUrl, deleteFile } from "../lib/googleCloudStorage";
+import { getSignedUrl, deleteFile } from "../lib/googleCloudStorage.js";
 import type { User } from "@prisma/client";
-import { prisma } from "../lib/prisma";
-import { logger } from "../utils/logger";
+import { prisma } from "../lib/prisma.js";
+import { logger } from "../utils/logger.js";
 
 export const fileRouter = createTRPCRouter({
   getSignedUrl: protectedProcedure
@@ -246,14 +246,6 @@ export const fileRouter = createTRPCRouter({
         });
       }
 
-      // Verify the file belongs to this class
-      if (file.folder?.classId !== classId) {
-        throw new TRPCError({
-          code: "FORBIDDEN",
-          message: "File does not belong to this class",
-        });
-      }
-
       // Validate new name
       if (!newName.trim()) {
         throw new TRPCError({

package/src/routers/folder.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { createTRPCRouter, protectedProcedure, protectedClassMemberProcedure, protectedTeacherProcedure } from "../trpc";
+import { createTRPCRouter, protectedProcedure, protectedClassMemberProcedure, protectedTeacherProcedure } from "../trpc.js";
 import { TRPCError } from "@trpc/server";
-import { prisma } from "../lib/prisma";
-import { uploadFiles, type UploadedFile } from "../lib/fileUpload";
+import { prisma } from "../lib/prisma.js";
+import { uploadFiles, type UploadedFile } from "../lib/fileUpload.js";
 
 const fileSchema = z.object({
   name: z.string(),
@@ -548,7 +548,7 @@ export const folderRouter = createTRPCRouter({
   move: protectedTeacherProcedure
     .input(z.object({
       folderId: z.string(),
-      targetParentFolderId: z.string().optional(),
+      targetParentFolderId: z.string(),
       classId: z.string(),
     }))
     .mutation(async ({ ctx, input }) => {
@@ -646,7 +646,7 @@ export const folderRouter = createTRPCRouter({
       const updatedFolder = await prisma.folder.update({
         where: { id: folderId },
         data: {
-          parentFolderId: targetParentFolderId || null,
+          parentFolderId: targetParentFolderId,
         },
         include: {
           files: {

package/src/routers/notifications.ts

@@ -1,5 +1,5 @@
-import { createTRPCRouter, protectedProcedure } from "../trpc";
-import { prisma } from "../lib/prisma";
+import { createTRPCRouter, protectedProcedure } from "../trpc.js";
+import { prisma } from "../lib/prisma.js";
 import { z } from "zod";
 
 export const notificationRouter = createTRPCRouter({

package/src/routers/section.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { createTRPCRouter, protectedProcedure } from "../trpc.js";
 import { TRPCError } from "@trpc/server";
-import { prisma } from "../lib/prisma";
+import { prisma } from "../lib/prisma.js";
 
 const createSectionSchema = z.object({
   classId: z.string(),

package/src/routers/user.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { createTRPCRouter, protectedProcedure } from "../trpc.js";
 import { TRPCError } from "@trpc/server";
-import { prisma } from "../lib/prisma";
-import { uploadFiles, type UploadedFile } from "../lib/fileUpload";
+import { prisma } from "../lib/prisma.js";
+import { uploadFiles, type UploadedFile } from "../lib/fileUpload.js";
 
 const fileSchema = z.object({
   name: z.string(),

package/src/seedDatabase.ts

@@ -1,12 +1,34 @@
-import { prisma } from "./lib/prisma";
+import { prisma } from "./lib/prisma.js";
 import { hash } from "bcryptjs";
-import { logger } from "./utils/logger";
+import { logger } from "./utils/logger.js";
 
 export async function clearDatabase() {
+    // Delete in order to respect foreign key constraints
+    // Delete notifications first (they reference users)
+    await prisma.notification.deleteMany();
+    
+    // Delete other records that reference users
+    await prisma.submission.deleteMany();
+    await prisma.assignment.deleteMany();
+    await prisma.announcement.deleteMany();
+    await prisma.event.deleteMany();
+    await prisma.attendance.deleteMany();
+    await prisma.file.deleteMany();
+    
+    // Delete class-related records
+    await prisma.section.deleteMany();
+    await prisma.markScheme.deleteMany();
+    await prisma.gradingBoundary.deleteMany();
+    await prisma.folder.deleteMany();
     await prisma.class.deleteMany();
-    await prisma.userProfile.deleteMany();
+    
+    // Delete user-related records
     await prisma.session.deleteMany();
+    await prisma.userProfile.deleteMany();
+    
+    // Finally delete users and schools
     await prisma.user.deleteMany();
+    await prisma.school.deleteMany();
 }
 
 export async function createUser(email: string, password: string, username: string) {

package/src/socket/handlers.ts

@@ -1,5 +1,5 @@
 import { Socket, Server } from 'socket.io';
-import { logger } from '../utils/logger';
+import { logger } from '../utils/logger.js';
 
 export const setupSocketHandlers = (io: Server) => {
   io.on('connection', (socket: Socket) => {

package/src/trpc.ts

@@ -1,12 +1,12 @@
 import { initTRPC, TRPCError } from '@trpc/server';
 import { ZodError } from 'zod';
-import { logger } from './utils/logger';
-import { prisma } from './lib/prisma';
-import { createLoggingMiddleware } from './middleware/logging';
-import { createAuthMiddleware } from './middleware/auth';
+import { logger } from './utils/logger.js';
+import { prisma } from './lib/prisma.js';
+import { createLoggingMiddleware } from './middleware/logging.js';
+import { createAuthMiddleware } from './middleware/auth.js';
 import { Request, Response } from 'express';
 import { z } from 'zod';
-import { handlePrismaError, PrismaErrorInfo } from './utils/prismaErrorHandler';
+import { handlePrismaError, PrismaErrorInfo } from './utils/prismaErrorHandler.js';
 
 interface CreateContextOptions {
   req: Request;

package/src/types/trpc.ts

@@ -1,5 +1,5 @@
 import { inferAsyncReturnType } from '@trpc/server';
-import { createTRPCContext } from '../trpc';
+import { createTRPCContext } from '../trpc.js';
 
 export type Context = inferAsyncReturnType<typeof createTRPCContext> & {
   isTeacher?: boolean;

package/src/utils/prismaWrapper.ts

@@ -1,5 +1,5 @@
 import { TRPCError } from '@trpc/server';
-import { handlePrismaError } from './prismaErrorHandler';
+import { handlePrismaError } from './prismaErrorHandler.js';
 
 export async function withPrismaErrorHandling<T>(
   operation: () => Promise<T>,