Merged 'develop' into 'develop-G5'.

Author: github-actions[bot]

back-end/src/app.controller.ts

@@ -45,8 +45,8 @@ export class AppController {
 				],
 			}),
 		)
-		// @ts-ignore
-		file: any,
+		file: // @ts-ignore
+		any,
 		@Param('context') context: string,
 		@Res() res: Response,
 	) {

back-end/src/base/articles/interfaces/articles.interface.ts

@@ -15,7 +15,7 @@ export interface Article {
 	type: number;
 	participants?: Array<User>;
 	eventDate?: Date;
-	status: string,
+	status: string;
 }
 
 export interface Commentary {

back-end/src/base/calls/calls.repository.ts

@@ -547,7 +547,6 @@ export class CallsRepository {
 		return course.groups;
 	}
 
-
 	async saveMessage(userId: ObjectId, courseId: string, message: any) {
 		const courseObjectId = new ObjectId(courseId);
 		const userObjectId = new ObjectId(userId);
@@ -621,7 +620,7 @@ export class CallsRepository {
 		}
 		const groups = course.groups;
 		let groupToJoin = null;
-		const groupIdToJoin = new ObjectId(groupId['groupId'])
+		const groupIdToJoin = new ObjectId(groupId['groupId']);
 		groups.map((group) => {
 			if (new ObjectId(group.id).equals(groupIdToJoin)) {
 				groupToJoin = group;
@@ -852,7 +851,6 @@ export class CallsRepository {
 
 		const actualCourse = await this.db.collection('courses').findOne(query);
 
-
 		// La base n'est pas typée, j'ai besoin de tout en front donc voilà
 		return actualCourse ?? null;
 	}

back-end/src/base/calls/calls.service.ts

@@ -46,7 +46,7 @@ export class CallsService {
 	async getActualCourse(userId: ObjectId) {
 		return await this.callsRepository.getActualCourse(userId);
 	}
-  
+
 	async getActualCourseGroup(userId: ObjectId) {
 		const actualCourse = await this.callsRepository.getActualCourseGroup(userId);
 		return actualCourse;

back-end/src/base/courses/courses.controller.ts

@@ -1,13 +1,4 @@
-import {
-	Controller,
-	Get,
-	Post,
-	Res,
-	Req,
-	UseFilters,
-	UseGuards,
-	Param,
-} from '@nestjs/common';
+import { Controller, Get, Post, Res, Req, UseFilters, UseGuards, Param } from '@nestjs/common';
 import { Response, Request } from 'express';
 import { ServiceErrorCatcher } from 'src/common/decorators/catch.decorator';
 import { CoursesService } from 'src/base/courses/courses.service';
@@ -29,16 +20,15 @@ export class CoursesController {
 	@Get('/allCourses')
 	async getAllCourses(@Res() res: Response) {
 		const courses = await this.coursesService.getAllCourses();
-		return res.status(200).json({ status: 'ok', courses })
+		return res.status(200).json({ status: 'ok', courses });
 	}
 
 	@Get('/:id')
-	async getCoursesById(@Req() req: Request, @Res() res: Response, @Param('id') courseId: string){
-		const courseById = await this.coursesService.getCoursesById(courseId)
+	async getCoursesById(@Req() req: Request, @Res() res: Response, @Param('id') courseId: string) {
+		const courseById = await this.coursesService.getCoursesById(courseId);
 		return res.status(200).json({ status: 'ok', courseById });
 	}
 
-
 	@Post('/create')
 	async createCourse(@Req() req: Request, @Res() res: Response) {
 		await this.coursesService.createCourse(req.body).then((course) => {
@@ -50,8 +40,4 @@ export class CoursesController {
 		const courses = await this.coursesService.getAllCourses();
 		return res.status(200).json(courses);
 	}
-
 }
-
-
-

back-end/src/base/courses/courses.module.ts

@@ -17,7 +17,7 @@ import { RetrospectivesRepository } from '../retrospectives/retrospectives.repos
 		CoursesRepository,
 		UsersRepository,
 		CanvasRoomRepository,
-		RetrospectivesRepository
+		RetrospectivesRepository,
 	],
 	controllers: [CoursesController],
 	exports: [CoursesService, CoursesRepository],

back-end/src/base/courses/courses.service.ts

@@ -12,7 +12,7 @@ export class CoursesService {
 		@Inject(forwardRef(() => CanvasRoomRepository))
 		private coursesRepository: CoursesRepository,
 		private retrospectiveRepository: RetrospectivesRepository,
-		private canvasRoomRepository: CanvasRoomRepository
+		private canvasRoomRepository: CanvasRoomRepository,
 	) {}
 
 	// Business logic methods goes there...
@@ -23,15 +23,17 @@ export class CoursesService {
 	}
 
 	async getCoursesById(courseId: string) {
-		const courses = await this.coursesRepository.findOne({_id: new ObjectId(courseId)});
-		const retro = await this.retrospectiveRepository.findOne({_id: new ObjectId(courses.retro)})
-		const canvas = await this.canvasRoomRepository.findManyCanvasRoom({_id: {$in: courses.projects}})
+		const courses = await this.coursesRepository.findOne({ _id: new ObjectId(courseId) });
+		const retro = await this.retrospectiveRepository.findOne({ _id: new ObjectId(courses.retro) });
+		const canvas = await this.canvasRoomRepository.findManyCanvasRoom({
+			_id: { $in: courses.projects },
+		});
 
 		return {
 			course: courses,
 			retro: retro,
-			projects: canvas
-		}
+			projects: canvas,
+		};
 	}
 
 	async createCourse(query) {

back-end/src/base/courses/dto/coures.dto.ts

@@ -1,10 +1,5 @@
-
 import { User } from '@/base/users/interfaces/users.interface';
-import {
-	IsNotEmpty,
-	IsOptional,
-	IsString,
-} from 'class-validator';
+import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
 
 export class CourseDTO {
 	@IsOptional()
@@ -40,5 +35,5 @@ export class CourseDTO {
 	project?: Array<any>; // Don't know what it is
 
 	@IsOptional()
-	site?: string
+	site?: string;
 }

back-end/src/base/courses/interfaces/courses.interface.ts

@@ -7,24 +7,23 @@ export interface Course {
 	tag: string;
 	classId?: ObjectId;
 	picture: string;
-    language: string;
-    createdAt: Date;
-    periodStart: Date;
-    periodEnd: Date;
-    presence:[];
+	language: string;
+	createdAt: Date;
+	periodStart: Date;
+	periodEnd: Date;
+	presence: [];
 	projects: Array<ObjectId>;
-    site: string;
-    teacherId?: ObjectId;
+	site: string;
+	teacherId?: ObjectId;
 	isLocked?: boolean;
-	groups?: Array<Group>
-	retro: ObjectId
-	trellos?: Array<any> // WAITING FOR TRELLO
+	groups?: Array<Group>;
+	retro: ObjectId;
+	trellos?: Array<any>; // WAITING FOR TRELLO
 	/*
 		productOwner?: User;
 	academicYear?: AcademicYear;
 	retrospective?: Retrospective;
 	*/
-
 }
 
 export interface Call {

back-end/src/base/groups/groups.controller.ts

@@ -26,5 +26,4 @@ export class GroupsController {
 
 		return res.status(200).json({ status: 'ok' });
 	}
-
 }