Merge pull request #7 from EVOGD-Project:dev

Dev

Author: tnfAngel

bun.lock

@@ -21,6 +21,7 @@
 		"@elysiajs/swagger": "^1.3.0",
 		"elysia": "^1.3.3",
 		"mongoose": "^8.15.1",
+		"nanoid": "^5.1.5",
 		"prom-client": "^15.1.3",
 		"tslib": "^2.8.1",
 		"uuid": "^11.1.0"

package.json

@@ -4,7 +4,9 @@ import swagger from '@elysiajs/swagger';
 import Elysia from 'elysia';
 import { authLoginRoute } from '../routes/auth/login';
 import { authRegisterRoute } from '../routes/auth/register';
+import { classroomRoute } from '../routes/classroom';
 import { userRoute } from '../routes/user';
+import { classroomActivitiesRoute } from '../routes/classroom/activities';
 
 export class MainServer {
 	app: Elysia;
@@ -16,7 +18,14 @@ export class MainServer {
 	}
 
 	public setup() {
-		this.app.use(cors()).use(staticPlugin()).use(authLoginRoute).use(authRegisterRoute).use(userRoute);
+		this.app
+			.use(cors())
+			.use(staticPlugin())
+			.use(authLoginRoute)
+			.use(authRegisterRoute)
+			.use(userRoute)
+			.use(classroomRoute)
+			.use(classroomActivitiesRoute);
 
 		if (process.env['ENABLE_SWAGGER'] === 'true') {
 			console.log('Swagger enabled.');

src/classes/MainServer.ts

@@ -0,0 +1,90 @@
+import { Schema, model } from 'mongoose';
+import { SchemaUtil } from '../classes/SchemaUtil';
+
+export interface IActivity {
+	id: string;
+	title: string;
+	description: string;
+	classroomId: string;
+	owner: string;
+	dueDate?: string;
+	createdAt: string;
+	type: 'assignment' | 'material';
+	content: {
+		instructions?: string;
+		resources?: Array<{
+			type: 'link' | 'file';
+			name: string;
+			url: string;
+		}>;
+	};
+}
+
+const resourceSchema = new Schema(
+	{
+		type: {
+			type: String,
+			enum: ['link', 'file'],
+			required: true
+		},
+		name: {
+			type: String,
+			required: true
+		},
+		url: {
+			type: String,
+			required: true
+		}
+	},
+	{ _id: false }
+);
+
+const activitySchema = new Schema<IActivity>(
+	{
+		title: {
+			type: String,
+			required: true
+		},
+		description: {
+			type: String,
+			required: true
+		},
+		classroomId: {
+			type: String,
+			required: true
+		},
+		owner: {
+			type: String,
+			required: true
+		},
+		dueDate: {
+			type: String,
+			required: false
+		},
+		type: {
+			type: String,
+			enum: ['assignment', 'material'],
+			required: true
+		},
+		content: {
+			instructions: {
+				type: String,
+				required: false
+			},
+			resources: {
+				type: [resourceSchema],
+				required: false,
+				default: []
+			}
+		}
+	},
+	{
+		timestamps: true
+	}
+);
+
+activitySchema.set('toJSON', {
+	transform: SchemaUtil.transformSchemaToJSON
+});
+
+export const ActivityModel = model<IActivity>('Activity', activitySchema);

src/models/ActivityModel.ts

@@ -0,0 +1,48 @@
+import { Schema, model } from 'mongoose';
+import { SchemaUtil } from '../classes/SchemaUtil';
+
+export interface IClassroom {
+	id: string;
+	name: string;
+	description: string;
+	thumbnailId: number;
+	code: string;
+	owner: string;
+}
+
+const schema = new Schema<IClassroom>(
+	{
+		name: {
+			type: String,
+			required: true
+		},
+		description: {
+			type: String,
+			required: true
+		},
+		thumbnailId: {
+			type: Number,
+			required: true
+		},
+		code: {
+			type: String,
+			required: true,
+			unique: true,
+			index: true
+		},
+		owner: {
+			type: String,
+			required: true,
+			index: true
+		}
+	},
+	{
+		timestamps: true
+	}
+);
+
+schema.set('toJSON', {
+	transform: SchemaUtil.transformSchemaToJSON
+});
+
+export const ClassroomModel = model<IClassroom>('Classroom', schema);

src/models/ClassroomModel.ts

@@ -18,19 +18,17 @@ const schema = new Schema(
 			trim: true
 		},
 		password: { type: String, required: true },
-		avatar: { type: String, required: false, trim: true }
+		avatar: { type: String, required: false, trim: true },
+		classroomIds: {
+			type: [String],
+			required: false,
+			default: []
+		}
 	},
 	{
 		statics: {
 			async verifyPassword(password: string, hash: string) {
 				return Bun.password.verify(password, hash);
-			},
-			async findByToken(id: string, auth: string) {
-				const targetUser = await this.findById(id);
-
-				if (!targetUser?.token || targetUser.token !== auth) return null;
-
-				return targetUser;
 			}
 		}
 	}