Merge pull request #34 from LikeLionHGU/vinci_feat/#33

vinci_feat/#33 -> main
LikeLionHGU · Aug 2, 2024 · 2719aa1 · 2719aa1
2 parents 438c645 + 9c550f0
commit 2719aa1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/com/example/ye4leeyu_back/application/usecase/CourseSearchAndLookUseCase.java b/src/main/java/com/example/ye4leeyu_back/application/usecase/CourseSearchAndLookUseCase.java
@@ -32,7 +32,9 @@ public CourseDetailResponse getCourseDetail(Long courseId) {
         CourseDto courseDto = CourseDto.of(courseService.getCourseAndCourseBlock(courseId));
         TeacherDto teacherDto = TeacherDto.of(teacherService.getTeacher(courseDto.getTeacherId()));
         boolean isLiked = courseService.isCourseLiked(courseId, memberId);
-        return CourseDetailResponse.of(courseDto, teacherDto, isLiked);
+
+        TeacherResponse teacherResponse = TeacherResponse.of(teacherDto, teacherDto.getCourseList().stream().map(dto -> CourseResponse.of(dto, teacherDto, courseService.isCourseLiked(courseId, memberId))).toList());
+        return CourseDetailResponse.of(courseDto, teacherResponse, isLiked);
     }
 
     public PurchaseInfoResponse getPurchaseInfo(Long courseId, Long courseBlockId) {
@@ -44,8 +46,10 @@ public PurchaseInfoResponse getPurchaseInfo(Long courseId, Long courseBlockId) {
 
         TeacherDto teacherDto = TeacherDto.of(teacherService.getTeacher(courseDto.getTeacherId()));
 
+        TeacherResponse teacherResponse = TeacherResponse.of(teacherDto, teacherDto.getCourseList().stream().map(dto -> CourseResponse.of(dto, teacherDto, courseService.isCourseLiked(courseId, memberId))).toList());
+
         boolean isLiked = courseService.isCourseLiked(courseId, memberId);
-        return PurchaseInfoResponse.of(StudentInfoResponse.of(studentDto), CourseDetailResponse.of(courseDto, teacherDto, isLiked));
+        return PurchaseInfoResponse.of(StudentInfoResponse.of(studentDto), CourseDetailResponse.of(courseDto, teacherResponse, isLiked));
     }
 
     public RecommendCourseResponse getRecommendCourse(String location) {

diff --git a/src/main/java/com/example/ye4leeyu_back/presentation/response/CourseDetailResponse.java b/src/main/java/com/example/ye4leeyu_back/presentation/response/CourseDetailResponse.java
@@ -27,7 +27,7 @@ public class CourseDetailResponse {
     private TeacherResponse teacher;
     private List<CourseBlockResponse> courseBlock;
 
-    public static CourseDetailResponse of(CourseDto courseDto, TeacherDto teacherDto, boolean isLike) {
+    public static CourseDetailResponse of(CourseDto courseDto, TeacherResponse teacherResponse, boolean isLike) {
         return CourseDetailResponse.builder()
                 .imageURL(courseDto.getImageName())
                 .title(courseDto.getTitle())
@@ -44,7 +44,7 @@ public static CourseDetailResponse of(CourseDto courseDto, TeacherDto teacherDto
                 .isLike(isLike)
                 .location(courseDto.getLocation())
                 .duration(courseDto.getDuration())
-                .teacher(TeacherResponse.of(teacherDto))
+                .teacher(teacherResponse)
                 .courseBlock(courseDto.getCourseBlockList()
                         .stream()
                         .map(CourseBlockResponse::of)

diff --git a/src/main/java/com/example/ye4leeyu_back/presentation/response/TeacherResponse.java b/src/main/java/com/example/ye4leeyu_back/presentation/response/TeacherResponse.java
@@ -5,6 +5,8 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 @Builder
@@ -18,8 +20,9 @@ public class TeacherResponse {
     private int scorePersonCount;
     private String career;
     private String contactNumber;
+    private List<CourseResponse> courseList;
 
-    public static TeacherResponse of(TeacherDto teacher) {
+    public static TeacherResponse of(TeacherDto teacher, List<CourseResponse> courseList) {
         return TeacherResponse.builder()
                 .id(teacher.getId())
                 .name(teacher.getName())
@@ -30,6 +33,7 @@ public static TeacherResponse of(TeacherDto teacher) {
                 .scorePersonCount(teacher.getScorePersonCount())
                 .career(teacher.getCareer())
                 .contactNumber(teacher.getContactNumber())
+                .courseList(courseList)
                 .build();
     }
 }