Merge pull request #56 from SAIG-KMITL/feat/connect-with-roadmap-ai

fix: remove user occupation public guards

src/enrollment/enrollment.service.ts

@@ -35,10 +35,12 @@ export class EnrollmentService {
     const enrollments = await find({
       relations: {
         user: true,
-        course: true,
+        course: {
+          teacher: true,
+          category: true,
+        },
       },
     }).run();
-
     return enrollments;
   }
 

src/roadmap/roadmap.service.ts

@@ -7,7 +7,6 @@ import {
 } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { Course } from 'src/course/course.entity';
-import { GLOBAL_CONFIG } from 'src/shared/constants/global-config.constant';
 import { CourseStatus } from 'src/shared/enums';
 import { createPagination } from 'src/shared/pagination';
 import { UserBackgroundService } from 'src/user-background/user-background.service';
@@ -132,7 +131,8 @@ export class RoadmapService {
       .leftJoinAndSelect('roadmap.user', 'user')
       .leftJoinAndSelect('roadmap.courses', 'courses')
       .leftJoinAndSelect('courses.teacher', 'teacher')
-      .leftJoinAndSelect('courses.category', 'category');
+      .leftJoinAndSelect('courses.category', 'category')
+      .orderBy('roadmap.priority', 'ASC');
 
     if (userId) {
       queryBuilder.andWhere('user.id = :userId', { userId });
@@ -152,6 +152,7 @@ export class RoadmapService {
 
     return new PaginatedRoadmapResponseDto(data, total, limit, page);
   }
+
   async findOne(options: FindOneOptions<Roadmap>): Promise<Roadmap> {
     try {
       const roadmap = await this.roadmapRepository.findOne(options);
@@ -192,4 +193,4 @@ export class RoadmapService {
       throw new InternalServerErrorException(error.message);
     }
   }
-}
+}

src/user-occupation/user-occupation.controller.ts

@@ -40,7 +40,6 @@ export class UserOccupationController {
 
   @Post()
   @Roles(Role.ADMIN)
-  @Public()
   @ApiResponse({
     status: HttpStatus.CREATED,
     type: UserOccupationResponseDto,