@studious-lms/server 1.0.1 → 1.0.3

package/dist/index.js

@@ -9,10 +9,10 @@ const socket_io_1 = require("socket.io");
 const cors_1 = __importDefault(require("cors"));
 const dotenv_1 = __importDefault(require("dotenv"));
 const express_2 = require("@trpc/server/adapters/express");
-const _app_1 = require("@routers/_app");
-const trpc_1 = require("@/trpc");
-const logger_1 = require("@utils/logger");
-const handlers_1 = require("@/socket/handlers");
+const _app_1 = require("./routers/_app");
+const trpc_1 = require("./trpc");
+const logger_1 = require("./utils/logger");
+const handlers_1 = require("./socket/handlers");
 dotenv_1.default.config();
 const app = (0, express_1.default)();
 // CORS middleware

package/dist/middleware/auth.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAuthMiddleware = void 0;
 const server_1 = require("@trpc/server");
-const prisma_1 = require("@lib/prisma");
+const prisma_1 = require("../lib/prisma");
 const createAuthMiddleware = (t) => {
     // Auth middleware
     const isAuthed = t.middleware(async ({ next, ctx }) => {

package/dist/middleware/logging.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLoggingMiddleware = void 0;
-const logger_1 = require("@/logger");
+const logger_1 = require("../utils/logger");
 const createLoggingMiddleware = (t) => {
     return t.middleware(async ({ path, type, next, ctx }) => {
         const start = Date.now();

package/dist/routers/_app.js

@@ -6,7 +6,7 @@ const class_1 = require("./class");
 const announcement_1 = require("./announcement");
 const assignment_1 = require("./assignment");
 const user_1 = require("./user");
-const trpc_2 = require("@/trpc");
+const trpc_2 = require("../trpc");
 const section_1 = require("./section");
 const attendance_1 = require("./attendance");
 const event_1 = require("./event");

package/dist/routers/agenda.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.agendaRouter = void 0;
 const zod_1 = require("zod");
 const trpc_1 = require("../trpc");
-const prisma_1 = require("@lib/prisma");
+const prisma_1 = require("../lib/prisma");
 const server_1 = require("@trpc/server");
 const date_fns_1 = require("date-fns");
 exports.agendaRouter = (0, trpc_1.createTRPCRouter)({

package/dist/routers/announcement.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.announcementRouter = void 0;
 const zod_1 = require("zod");
 const trpc_1 = require("../trpc");
-const prisma_1 = require("@lib/prisma");
+const prisma_1 = require("../lib/prisma");
 const server_1 = require("@trpc/server");
 const AnnouncementSelect = {
     id: true,

package/dist/routers/assignment.js

@@ -4,9 +4,9 @@ exports.assignmentRouter = void 0;
 const zod_1 = require("zod");
 const trpc_1 = require("../trpc");
 const server_1 = require("@trpc/server");
-const prisma_1 = require("@lib/prisma");
-const fileUpload_1 = require("@lib/fileUpload");
-const googleCloudStorage_1 = require("@lib/googleCloudStorage");
+const prisma_1 = require("../lib/prisma");
+const fileUpload_1 = require("../lib/fileUpload");
+const googleCloudStorage_1 = require("../lib/googleCloudStorage");
 const fileSchema = zod_1.z.object({
     name: zod_1.z.string(),
     type: zod_1.z.string(),

package/dist/routers/attendance.js

@@ -4,7 +4,7 @@ exports.attendanceRouter = void 0;
 const zod_1 = require("zod");
 const trpc_1 = require("../trpc");
 const server_1 = require("@trpc/server");
-const prisma_1 = require("@lib/prisma");
+const prisma_1 = require("../lib/prisma");
 const attendanceSchema = zod_1.z.object({
     eventId: zod_1.z.string().optional(),
     present: zod_1.z.array(zod_1.z.object({ id: zod_1.z.string(), username: zod_1.z.string() })),

package/dist/routers/auth.js

@@ -4,10 +4,10 @@ exports.authRouter = void 0;
 const zod_1 = require("zod");
 const trpc_1 = require("../trpc");
 const server_1 = require("@trpc/server");
-const prisma_1 = require("@lib/prisma");
+const prisma_1 = require("../lib/prisma");
 const uuid_1 = require("uuid");
 const bcryptjs_1 = require("bcryptjs");
-const email_1 = require("@/utils/email");
+const email_1 = require("../utils/email");
 const loginSchema = zod_1.z.object({
     username: zod_1.z.string(),
     password: zod_1.z.string(),

package/dist/routers/class.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.classRouter = void 0;
 const zod_1 = require("zod");
 const trpc_1 = require("../trpc");
-const prisma_1 = require("@lib/prisma");
+const prisma_1 = require("../lib/prisma");
 const server_1 = require("@trpc/server");
-const generateInviteCode_1 = require("@/utils/generateInviteCode");
+const generateInviteCode_1 = require("../utils/generateInviteCode");
 exports.classRouter = (0, trpc_1.createTRPCRouter)({
     getAll: trpc_1.protectedProcedure
         .query(async ({ ctx }) => {

package/dist/routers/event.js

@@ -4,7 +4,7 @@ exports.eventRouter = void 0;
 const zod_1 = require("zod");
 const trpc_1 = require("../trpc");
 const server_1 = require("@trpc/server");
-const prisma_1 = require("@lib/prisma");
+const prisma_1 = require("../lib/prisma");
 const date_fns_1 = require("date-fns");
 const eventSchema = zod_1.z.object({
     name: zod_1.z.string().optional(),

package/dist/routers/file.js

@@ -4,8 +4,8 @@ exports.fileRouter = void 0;
 const zod_1 = require("zod");
 const trpc_1 = require("../trpc");
 const server_1 = require("@trpc/server");
-const googleCloudStorage_1 = require("@/lib/googleCloudStorage");
-const prisma_1 = require("@lib/prisma");
+const googleCloudStorage_1 = require("../lib/googleCloudStorage");
+const prisma_1 = require("../lib/prisma");
 exports.fileRouter = (0, trpc_1.createTRPCRouter)({
     getSignedUrl: trpc_1.protectedProcedure
         .input(zod_1.z.object({

package/dist/routers/section.js

@@ -4,7 +4,7 @@ exports.sectionRouter = void 0;
 const zod_1 = require("zod");
 const trpc_1 = require("../trpc");
 const server_1 = require("@trpc/server");
-const prisma_1 = require("@lib/prisma");
+const prisma_1 = require("../lib/prisma");
 const createSectionSchema = zod_1.z.object({
     classId: zod_1.z.string(),
     name: zod_1.z.string(),

package/dist/routers/user.js

@@ -4,8 +4,8 @@ exports.userRouter = void 0;
 const zod_1 = require("zod");
 const trpc_1 = require("../trpc");
 const server_1 = require("@trpc/server");
-const prisma_1 = require("@lib/prisma");
-const fileUpload_1 = require("@lib/fileUpload");
+const prisma_1 = require("../lib/prisma");
+const fileUpload_1 = require("../lib/fileUpload");
 const fileSchema = zod_1.z.object({
     name: zod_1.z.string(),
     type: zod_1.z.string(),

package/dist/trpc.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCallerFactory = exports.protectedTeacherProcedure = exports.protectedClassMemberProcedure = exports.protectedProcedure = exports.publicProcedure = exports.createTRPCRouter = exports.t = exports.createTRPCContext = void 0;
 const server_1 = require("@trpc/server");
 const zod_1 = require("zod");
-const logger_1 = require("@utils/logger");
-const prisma_1 = require("@lib/prisma");
+const logger_1 = require("./utils/logger");
+const prisma_1 = require("./lib/prisma");
 const logging_1 = require("./middleware/logging");
 const auth_1 = require("./middleware/auth");
 const zod_2 = require("zod");

package/package.json

@@ -1,14 +1,9 @@
 {
   "name": "@studious-lms/server",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Backend server for Studious application",
   "main": "dist/exportType.js",
   "types": "dist/exportType.d.ts",
-  "files": [
-    "dist/**/*",
-    "generated/**/*",
-    "README.md"
-  ],
   "scripts": {
     "dev": "ts-node-dev -r tsconfig-paths/register --respawn --transpile-only src/index.ts",
     "build": "tsc",

package/prisma/schema.prisma

@@ -0,0 +1,228 @@
+// This is your Prisma schema file,
+// learn more about it in the docs: https://pris.ly/d/prisma-schema
+
+// Looking for ways to speed up your queries, or scale easily with your serverless or edge functions?
+// Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
+
+generator client {
+  provider = "prisma-client-js"
+  // output   = "../generated/prisma"
+}
+
+datasource db {
+  provider = "postgresql"
+  url      = env("DATABASE_URL")
+}
+
+enum AssignmentType {
+  HOMEWORK
+  QUIZ
+  TEST
+  PROJECT
+  ESSAY
+  DISCUSSION
+  PRESENTATION
+  LAB
+  OTHER
+}
+
+
+model User {
+  id           String      @id @default(uuid())
+  username     String
+  email        String
+  password     String
+  profile      UserProfile?
+  verified     Boolean     @default(false)
+
+  profileId    String?     @unique
+
+  teacherIn   Class[] @relation("UserTeacherToClass")
+  studentIn   Class[] @relation("UserStudentToClass")
+
+  submissions Submission[]
+  sessions    Session[]
+  files       File[]
+  assignments Assignment[]
+  events      Event[]
+  announcements Announcement[]
+
+  presentAttendance  Attendance[] @relation("PresentAttendance")
+  lateAttendance    Attendance[] @relation("LateAttendance")
+  absentAttendance  Attendance[] @relation("AbsentAttendance")
+}
+
+model UserProfile {
+  id String @id @default(uuid())
+  userId String @unique
+  user User? @relation(fields: [userId], references: [id])
+
+} 
+
+model Class {
+  id            String         @id @default(uuid())
+  name          String
+  subject       String
+  color         String?        @default("#3B82F6")
+  section       String
+  announcements Announcement[]
+  assignments   Assignment[]
+  attendance    Attendance[]
+  events        Event[]
+  sections      Section[]
+  sessions      Session[]
+  students      User[]         @relation("UserStudentToClass")
+  teachers      User[]         @relation("UserTeacherToClass")
+  markSchemes   MarkScheme[] @relation("ClassToMarkScheme")
+  gradingBoundaries GradingBoundary[] @relation("ClassToGradingBoundary")
+}
+
+model MarkScheme {
+  id String @id @default(uuid())
+  classId String
+  class Class[] @relation("ClassToMarkScheme")
+  structured String
+  assignments Assignment[]
+}
+
+model GradingBoundary {
+  id String @id @default(uuid())
+  classId String
+  class Class[] @relation("ClassToGradingBoundary")
+  structured String
+  assignments Assignment[]
+}
+
+model File {
+  id         String @id @default(uuid())
+  name       String
+  path       String
+  size       Int?
+  type       String
+  user       User? @relation(fields: [userId], references: [id])
+  userId     String?
+  uploadedAt DateTime? @default(now())
+
+  // Thumbnail relationship
+  thumbnail   File?  @relation("Thumbnail", fields: [thumbnailId], references: [id])
+  thumbnailId String? @unique
+  originalFile File? @relation("Thumbnail")
+
+  assignment Assignment? @relation(fields: [assignmentId], references: [id], onDelete: Cascade)
+  assignmentId String?
+
+  submission Submission? @relation("SubmissionFile", fields: [submissionId], references: [id], onDelete: Cascade)
+  submissionId String?
+
+  annotations Submission? @relation("SubmissionAnnotations", fields: [annotationId], references: [id], onDelete: Cascade)
+  annotationId String?
+}
+
+model Assignment {
+  id            String         @id @default(uuid())
+  title         String
+  instructions  String
+  dueDate       DateTime
+  createdAt     DateTime?      @default(now())
+  modifiedAt    DateTime?      @updatedAt
+  teacher       User           @relation(fields: [teacherId], references: [id], onDelete: NoAction)
+  teacherId     String
+  class         Class          @relation(fields: [classId], references: [id], onDelete: Cascade)
+  classId       String
+  attachments   File[]
+  submissions   Submission[]
+  section       Section?       @relation(fields: [sectionId], references: [id], onDelete: Cascade)
+  sectionId     String?
+  graded        Boolean        @default(false)
+  maxGrade      Int?          @default(0)
+  weight        Float         @default(1)
+  type          AssignmentType @default(HOMEWORK)
+  eventAttached Event?        @relation(fields: [eventId], references: [id], onDelete: NoAction)
+  eventId       String?
+  markScheme    MarkScheme? @relation(fields: [markSchemeId], references: [id], onDelete: Cascade)
+  markSchemeId  String?
+  gradingBoundary GradingBoundary? @relation(fields: [gradingBoundaryId], references: [id], onDelete: Cascade)
+  gradingBoundaryId String?
+}
+
+model Announcement {
+  id      String @id @default(uuid())
+  remarks String
+  teacher User @relation(fields: [teacherId], references: [id])
+  teacherId String
+  createdAt DateTime @default(now())
+  class   Class @relation(fields: [classId], references: [id], onDelete: Cascade)
+  classId String
+}
+
+model Submission {
+  id      String @id @default(uuid())
+  createdAt DateTime @default(now())
+  modifiedAt DateTime @default(now())
+
+  assignment Assignment @relation(fields: [assignmentId], references: [id], onDelete: Cascade)
+  assignmentId String
+
+  student User @relation(fields: [studentId], references: [id])
+  studentId String
+
+  attachments File[]  @relation("SubmissionFile")
+  annotations File[]  @relation("SubmissionAnnotations")
+
+  gradeReceived Int?
+
+  rubricState String?
+
+  submittedAt DateTime?
+  submitted   Boolean? @default(false)
+  returned    Boolean? @default(false)
+}
+
+model Section {
+  id        String @id @default(uuid())
+  name      String
+  classId   String
+  class     Class @relation(fields: [classId], references: [id], onDelete: Cascade)
+  assignments Assignment[]
+}
+
+model Session {
+  id        String @id @default(uuid())
+  createdAt DateTime? @default(now())
+  expiresAt DateTime?
+  userId    String?
+  user      User? @relation(fields: [userId], references: [id], onDelete: NoAction)
+  classId   String?
+  class     Class? @relation(fields: [classId], references: [id], onDelete: Cascade)
+}
+
+model Event {
+  id        String @id @default(uuid())
+  name      String?
+  startTime DateTime
+  endTime   DateTime
+  location  String?
+  remarks   String?
+  userId    String?
+  user      User? @relation(fields: [userId], references: [id], onDelete: Cascade)
+  classId   String?
+  class     Class? @relation(fields: [classId], references: [id], onDelete: Cascade)
+  color         String? @default("#3B82F6")
+  assignmentsAttached Assignment[]
+  attendance Attendance[]
+}
+
+model Attendance {
+  id        String   @id @default(uuid())
+  date      DateTime @default(now())
+  
+  class     Class    @relation(fields: [classId], references: [id], onDelete: Cascade)
+  classId   String
+
+  event     Event?   @relation(fields: [eventId], references: [id], onDelete: Cascade)
+  eventId   String?
+
+  present   User[]   @relation("PresentAttendance")
+  late      User[]   @relation("LateAttendance")
+  absent    User[]   @relation("AbsentAttendance")
+}

package/src/exportType.ts

@@ -0,0 +1,9 @@
+/**
+ * Export types for the server
+ * This is used to export the types for the server
+ * to the client via npmjs
+ */
+
+export type { AppRouter } from "./routers/_app";
+export type { RouterInputs } from "./routers/_app";
+export type { RouterOutputs } from "./routers/_app";

package/src/index.ts

@@ -0,0 +1,94 @@
+import express from 'express';
+import type { Request, Response } from 'express';
+import { createServer } from 'http';
+import { Server } from 'socket.io';
+import cors from 'cors';
+import dotenv from 'dotenv';
+import { createExpressMiddleware } from '@trpc/server/adapters/express';
+import { appRouter } from './routers/_app';
+import { createTRPCContext, createCallerFactory } from './trpc';
+import { logger } from './utils/logger';
+import { setupSocketHandlers } from './socket/handlers';
+
+dotenv.config();
+
+const app = express();
+
+// CORS middleware
+app.use(cors({
+  origin: process.env.NEXT_PUBLIC_APP_URL || 'http://localhost:3000',
+  credentials: true,
+}));
+
+// Response time logging middleware
+app.use((req, res, next) => {
+  const start = Date.now();
+  res.on('finish', () => {
+    const duration = Date.now() - start;
+    logger.info('Request completed', {
+      method: req.method,
+      path: req.path,
+      statusCode: res.statusCode,
+      duration: `${duration}ms`
+    });
+  });
+  next();
+});
+
+// Create HTTP server
+const httpServer = createServer(app);
+
+// Setup Socket.IO
+const io = new Server(httpServer, {
+  cors: {
+    origin: process.env.NEXT_PUBLIC_APP_URL || 'http://localhost:3000',
+    methods: ['GET', 'POST'],
+    credentials: true,
+    allowedHeaders: ['Access-Control-Allow-Origin']
+  },
+  transports: ['websocket', 'polling'],
+  pingTimeout: 60000,
+  pingInterval: 25000,
+  connectTimeout: 45000,
+  path: '/socket.io/',
+  allowEIO3: true
+});
+
+// Add server-level logging
+io.engine.on('connection_error', (err) => {
+  logger.error('Socket connection error', { error: err.message });
+});
+
+// Setup socket handlers
+setupSocketHandlers(io);
+
+// Create caller
+const createCaller = createCallerFactory(appRouter);
+
+// Setup tRPC middleware
+app.use(
+  '/trpc',
+  createExpressMiddleware({
+    router: appRouter,
+    createContext: async ({ req, res }: { req: Request; res: Response }) => {
+      return createTRPCContext({ req, res });
+    },
+  })
+);
+
+const PORT = process.env.PORT || 3001;
+
+httpServer.listen(PORT, () => {
+  logger.info(`Server running on port ${PORT}`, { 
+    port: PORT,
+    services: ['tRPC', 'Socket.IO']
+  });
+}); 
+
+// log all env variables
+logger.info('Configurations', {
+  NODE_ENV: process.env.NODE_ENV,
+  PORT: process.env.PORT,
+  NEXT_PUBLIC_APP_URL: process.env.NEXT_PUBLIC_APP_URL,
+  LOG_MODE: process.env.LOG_MODE,
+});