Merge branch 'dev' of https://github.com/HanaFun/HanaFun_BE into testing

src/main/java/com/hanaro/hanafun/lesson/controller/LessonController.java

@@ -42,8 +42,8 @@ public ResponseEntity<ApiResponse> lessonDetail(@PathVariable Long lessonId) {
 
     // 클래스 상세보기
     @GetMapping("/lesson/{lessonId}")
-    public ResponseEntity<ApiResponse> lessonInfo(@PathVariable Long lessonId) {
-        LessonInfoResDto lessonInfoResDto = lessonService.lessonInfo(lessonId);
+    public ResponseEntity<ApiResponse> lessonInfo(@AuthenticationPrincipal Long userId, @PathVariable Long lessonId) {
+        LessonInfoResDto lessonInfoResDto = lessonService.lessonInfo(userId, lessonId);
         return ResponseEntity.ok(new ApiResponse<>(true, "ok", lessonInfoResDto));
     }
 

src/main/java/com/hanaro/hanafun/lesson/dto/response/FullLessonResDto.java

@@ -11,4 +11,5 @@ public class FullLessonResDto {
     private String title;
     private int price;
     private String hostName;
+    private int applicantSum;
 }

src/main/java/com/hanaro/hanafun/lesson/dto/response/LessonInfoResDto.java

@@ -15,4 +15,5 @@ public class LessonInfoResDto {
     private String materials;
     private int capacity;
     private String categoryName;
+    private boolean isHostMe;
 }

src/main/java/com/hanaro/hanafun/lesson/service/LessonService.java

@@ -13,7 +13,7 @@ public interface LessonService {
     List<OpenedLessonsResDto> openedLessons(Long userId);
 
     // 클래스 상세보기
-    LessonInfoResDto lessonInfo(Long lessonId);
+    LessonInfoResDto lessonInfo(Long userId, Long lessonId);
 
     // 클래스 등록하기
     void createLesson(Long userId, CreateLessonReqDto createLessonReqDto);

src/main/java/com/hanaro/hanafun/lesson/service/impl/LessonServiceImpl.java

@@ -16,6 +16,8 @@
 import com.hanaro.hanafun.lesson.service.LessonService;
 import com.hanaro.hanafun.lessondate.domain.LessonDateEntity;
 import com.hanaro.hanafun.lessondate.domain.LessonDateRepository;
+import com.hanaro.hanafun.user.domain.UserEntity;
+import com.hanaro.hanafun.user.domain.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,9 +57,17 @@ public List<OpenedLessonsResDto> openedLessons(Long userId) {
     // 클래스 상세보기
     @Transactional
     @Override
-    public LessonInfoResDto lessonInfo(Long lessonId) {
+    public LessonInfoResDto lessonInfo(Long userId, Long lessonId) {
         LessonEntity lesson = lessonRepository.findById(lessonId).orElseThrow(() -> new LessonNotFoundException());
 
+        // 해당 클래스의 호스트가 로그인한 유저인지 확인
+        boolean isHostMe;
+        if(userId.equals(lesson.getHostEntity().getUserEntity().getUserId())) {
+            isHostMe = true;
+        } else {
+            isHostMe = false;
+        }
+
         LessonInfoResDto lessonInfoResDto = LessonInfoResDto.builder()
                 .lessonId(lessonId)
                 .image(lesson.getImage())
@@ -68,6 +78,7 @@ public LessonInfoResDto lessonInfo(Long lessonId) {
                 .materials(lesson.getMaterials())
                 .capacity(lesson.getCapacity())
                 .categoryName(lesson.getCategoryEntity().getCategoryName())
+                .isHostMe(isHostMe)
                 .build();
 
         return lessonInfoResDto;
@@ -182,6 +193,7 @@ public List<FullLessonResDto> searchLessonList(List<LessonEntity> lessonlist){
                     .title(lesson.getTitle())
                     .price(lesson.getPrice())
                     .hostName(lesson.getHostEntity().getUserEntity().getUsername())
+                    .applicantSum(lesson.getApplicantSum())
                     .build();
             return fullLessonResDto;
         }).collect(Collectors.toList());

src/main/java/com/hanaro/hanafun/reservation/dto/request/BookLessonReqDto.java

@@ -1,8 +1,14 @@
 package com.hanaro.hanafun.reservation.dto.request;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class BookLessonReqDto {
     private Long lessondateId;
     private int applicant;  // 예약 수량

src/main/java/com/hanaro/hanafun/reservation/dto/request/CancelLessonReqDto.java

@@ -1,8 +1,14 @@
 package com.hanaro.hanafun.reservation.dto.request;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class CancelLessonReqDto {
     private Long reservationId;
 }

src/main/java/com/hanaro/hanafun/reservation/dto/request/LessonDateDetailReqDto.java

@@ -1,8 +1,14 @@
 package com.hanaro.hanafun.reservation.dto.request;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class LessonDateDetailReqDto {
     private Long lessondateId;
 }

src/test/java/com/hanaro/hanafun/LessonServiceTests.java

@@ -143,7 +143,7 @@ void lessonInfoTest_Success() {
         when(lessonRepository.findById(lessonId1)).thenReturn(Optional.of(lesson1));
 
         // When
-        LessonInfoResDto result = lessonService.lessonInfo(lessonId1);
+        LessonInfoResDto result = lessonService.lessonInfo(userId1, lessonId1);
 
         // Then
         assertEquals(lessonId1, result.getLessonId());
@@ -164,7 +164,7 @@ void lessonInfoTest_Fail() {
 
         // When, Then
         assertThrows(LessonNotFoundException.class, () -> {
-            lessonService.lessonInfo(lessonId1);
+            lessonService.lessonInfo(userId1, lessonId1);
         });
     }