fix:: constructor를 이용해 DTO내에서 초기화하도록 수정

DevKor-github · Jul 20, 2024 · bf9c0fc · bf9c0fc
1 parent 4af158b
commit bf9c0fc
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 48 deletions.
diff --git a/src/course/course.service.ts b/src/course/course.service.ts
@@ -1,4 +1,8 @@
-import { BadRequestException, Injectable } from '@nestjs/common';
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
 import { CourseRepository } from './course.repository';
 import { CourseEntity } from 'src/entities/course.entity';
 import { CourseDetailEntity } from 'src/entities/course-detail.entity';
@@ -23,28 +27,11 @@ export class CourseService {
       relations: ['courseDetails'],
     });
 
-    const courseInformations = {
-      id: course.id,
-      professorName: course.professorName,
-      category: course.category,
-      college: course.college,
-      courseName: course.courseName,
-      courseCode: course.courseCode,
-      credit: course.credit,
-      major: course.major,
-      hasExchangeSeat: course.hasExchangeSeat,
-      year: course.year,
-      semester: course.semester,
-      syllabus: course.syllabus,
-      totalRate: course.totalRate,
-      details: course.courseDetails.map((detail) => ({
-        day: detail.day,
-        startTime: detail.startTime,
-        endTime: detail.endTime,
-        classroom: detail.classroom,
-      })),
-    };
-    return new CommonCourseResponseDto(courseInformations);
+    if (!course) {
+      throw new NotFoundException('Course not found!');
+    }
+
+    return new CommonCourseResponseDto(course);
   }
 
   async getCourseWithCourseDetails(courseId: number): Promise<CourseEntity> {
@@ -341,30 +328,9 @@ export class CourseService {
   async mappingCourseDetailsToCourses(
     courses: CourseEntity[],
   ): Promise<PaginatedCoursesDto> {
-    const courseInformations = courses.map((course) => ({
-      id: course.id,
-      professorName: course.professorName,
-      category: course.category,
-      college: course.college,
-      courseName: course.courseName,
-      courseCode: course.courseCode,
-      credit: course.credit,
-      major: course.major,
-      hasExchangeSeat: course.hasExchangeSeat,
-      year: course.year,
-      semester: course.semester,
-      syllabus: course.syllabus,
-      totalRate: course.totalRate,
-      details: course.courseDetails.map((detail) => ({
-        day: detail.day,
-        startTime: detail.startTime,
-        endTime: detail.endTime,
-        classroom: detail.classroom,
-      })),
-    }));
-    const response = courseInformations.map(
+    const courseInformations = courses.map(
       (course) => new CommonCourseResponseDto(course),
     );
-    return new PaginatedCoursesDto(response);
+    return new PaginatedCoursesDto(courseInformations);
   }
 }
diff --git a/src/course/dto/common-course-response.dto.ts b/src/course/dto/common-course-response.dto.ts
@@ -1,4 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { CourseEntity } from 'src/entities/course.entity';
 
 export class CommonCourseResponseDto {
   @ApiProperty({ description: 'ID' })
@@ -48,7 +49,25 @@ export class CommonCourseResponseDto {
     classroom: string;
   }[];
 
-  constructor(commonCourseResponseDto: CommonCourseResponseDto) {
-    Object.assign(this, commonCourseResponseDto);
+  constructor(course: CourseEntity) {
+    this.id = course.id;
+    this.professorName = course.professorName;
+    this.category = course.category;
+    this.college = course.college;
+    this.courseName = course.courseName;
+    this.courseCode = course.courseCode;
+    this.credit = course.credit;
+    this.major = course.major;
+    this.hasExchangeSeat = course.hasExchangeSeat;
+    this.year = course.year;
+    this.semester = course.semester;
+    this.syllabus = course.syllabus;
+    this.totalRate = course.totalRate;
+    this.details = course.courseDetails.map((detail) => ({
+      day: detail.day,
+      startTime: detail.startTime,
+      endTime: detail.endTime,
+      classroom: detail.classroom,
+    }));
   }
 }