Merge pull request #15 from khu-bigdata-project-team-5/feat/1

Feat/1: Lecture API 구현(#1)

src/main/java/khu/bigdata/infou/business/LectureConverter.java

@@ -1,6 +1,6 @@
 package khu.bigdata.infou.business;
 
-import khu.bigdata.infou.domain.LectureTag;
+import khu.bigdata.infou.domain.LectureDetail;
 import khu.bigdata.infou.domain.LectureUdemy;
 import khu.bigdata.infou.web.dto.LectureResponseDTO;
 
@@ -12,19 +12,15 @@ public class LectureConverter {
 
     public static LectureResponseDTO.CategoryRecommendLectureInfo toCategoryRecommendLectureInfo(LectureUdemy lectureUdemy) {
 
-        LectureTag lectureTag = lectureUdemy.getLectureTag();
-
         return LectureResponseDTO.CategoryRecommendLectureInfo.builder()
                 .lectureId(lectureUdemy.getLectureId())
                 .title(lectureUdemy.getTitle())
                 .price(lectureUdemy.getPrice())
                 .avgRating(lectureUdemy.getAvgRating())
                 .thumbnail(lectureUdemy.getThumbnail())
-                .topword1(lectureTag.getTopword1())
-                .topword2(lectureTag.getTopword2())
-                .topword3(lectureTag.getTopword3())
-                .topword4(lectureTag.getTopword4())
-                .topword5(lectureTag.getTopword5())
+                .instructorName(lectureUdemy.getInstructorName())
+                .topword1(lectureUdemy.getTopic())
+                .topword2(lectureUdemy.getSubcategory())
                 .build();
     }
 
@@ -40,19 +36,16 @@ public static LectureResponseDTO.CategoryRecommendLectureDto toCategoryRecommend
 
     // 키워드별 추천 강좌 조회
     public static LectureResponseDTO.KeywordRecommendLectureInfo toKeywordRecommendLectureInfo(LectureUdemy lectureUdemy) {
-        LectureTag lectureTag = lectureUdemy.getLectureTag();
 
         return LectureResponseDTO.KeywordRecommendLectureInfo.builder()
                 .lectureId(lectureUdemy.getLectureId())
                 .title(lectureUdemy.getTitle())
                 .price(lectureUdemy.getPrice())
                 .avgRating(lectureUdemy.getAvgRating())
                 .thumbnail(lectureUdemy.getThumbnail())
-                .topword1(lectureTag.getTopword1())
-                .topword2(lectureTag.getTopword2())
-                .topword3(lectureTag.getTopword3())
-                .topword4(lectureTag.getTopword4())
-                .topword5(lectureTag.getTopword5())
+                .instructorName(lectureUdemy.getInstructorName())
+                .topword1(lectureUdemy.getTopic())
+                .topword2(lectureUdemy.getSubcategory())
                 .build();
     }
 
@@ -67,4 +60,26 @@ public static LectureResponseDTO.KeywordRecommendLectureDto toKeywordRecommendLe
                 .build();
     }
 
+    // 강좌 세부 조회
+    public static LectureResponseDTO.LectureDetailDto toLectureDetailDto(LectureUdemy lectureUdemy, LectureDetail lectureDetail) {
+
+        return LectureResponseDTO.LectureDetailDto.builder()
+                .lectureId(lectureUdemy.getLectureId())
+                .title(lectureUdemy.getTitle())
+                .price(lectureUdemy.getPrice())
+                .avgRating(lectureUdemy.getAvgRating())
+                .thumbnail(lectureUdemy.getThumbnail())
+                .instructorName(lectureUdemy.getInstructorName())
+                .category(lectureUdemy.getCategory())
+                .subcategory(lectureUdemy.getSubcategory())
+                .good(lectureDetail.getGood())
+                .bad(lectureDetail.getBad())
+                .teaching_quality(lectureDetail.getTeachingQuality())
+                .reference(lectureDetail.getReference())
+                .practice(lectureDetail.getPractice())
+                .rating(lectureDetail.getRating())
+                .level(lectureDetail.getLevel())
+                .topword(lectureUdemy.getTopic())
+                .build();
+    }
 }

src/main/java/khu/bigdata/infou/domain/LectureDetail.java

@@ -11,7 +11,8 @@
 @DynamicInsert
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)  // 생성 로직 규정
-@Table(name = "lecture_detail")
+@Table(name = "lecture_detail", indexes = {
+        @Index(name = "idx_lecture_id", columnList = "lectureId")})
 public class LectureDetail {
 
     @Id

src/main/java/khu/bigdata/infou/domain/LectureUdemy.java

@@ -4,15 +4,14 @@
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;
 
-import java.util.Date;
-
 @Entity
 @Getter
 @Builder
 @DynamicInsert
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)  // 생성 로직 규정
-@Table(name = "lecture_udemy")
+@Table(name = "lecture_udemy", indexes = {
+        @Index(name = "idx_lecture_id", columnList = "lectureId")})
 public class LectureUdemy {
 
     @Id
@@ -53,13 +52,13 @@ public class LectureUdemy {
     @Column(name = "content_length_min")
     private float contentLengthMin;
 
-    @Column(name = "category", length = 255)
+    @Column(name = "category")
     private String category;
 
-    @Column(name = "subcategory", length = 50)
+    @Column(name = "subcategory")
     private String subcategory;
 
-    @Column(name = "topic", length = 50)
+    @Column(name = "topic")
     private String topic;
 
     @Column(name = "language", length = 20)
@@ -68,23 +67,12 @@ public class LectureUdemy {
     @Column(name = "course_url", columnDefinition = "TEXT")
     private String courseUrl;
 
-    @Column(name = "instructor_name", length = 50)
+    @Column(name = "instructor_name")
     private String instructorName;
 
-    @Column(name = "instructor_url", columnDefinition = "TEXT")
-    private String instructorUrl;
-
     @Column(name = "thumbnail", columnDefinition = "TEXT")
     private String thumbnail;
 
-    @Column(name = "published_time")
-    @Temporal(TemporalType.DATE)
-    private Date publishedTime;
-
-    @Column(name = "last_update_date")
-    @Temporal(TemporalType.DATE)
-    private Date lastUpdateDate;
-
     @ManyToOne(fetch = FetchType.LAZY)
     private PlatformStudentLecture platformStudentLecture;
 

src/main/java/khu/bigdata/infou/implement/LectureService.java

@@ -1,7 +1,9 @@
 package khu.bigdata.infou.implement;
 
 import khu.bigdata.infou.business.LectureConverter;
+import khu.bigdata.infou.domain.LectureDetail;
 import khu.bigdata.infou.domain.LectureUdemy;
+import khu.bigdata.infou.repository.LectureDetailRepository;
 import khu.bigdata.infou.repository.LectureInflearnRepository;
 import khu.bigdata.infou.repository.LectureUdemyRepository;
 import khu.bigdata.infou.web.dto.LectureResponseDTO;
@@ -20,9 +22,10 @@ public class LectureService {
 
     private final LectureInflearnRepository lectureInflearnRepository;
     private final LectureUdemyRepository lectureUdemyRepository;
+    private final LectureDetailRepository lectureDetailRepository;
 
 
-    // 메인페이지 카테고리별 추천 강좌 조회
+    // 카테고리별 추천 강좌 조회
     public LectureResponseDTO.CategoryRecommendLectureDto findRecommendedLectureByCategory(String category) {
 
         if (category == null) {
@@ -33,7 +36,7 @@ public LectureResponseDTO.CategoryRecommendLectureDto findRecommendedLectureByCa
 
         // 일단 가져오고 상위 값 추출
         List<LectureUdemy> sortedList = lectureUdemyList.stream()
-                .sorted(Comparator.comparingDouble(lecture -> lecture.getAvgRating() * lecture.getNumReviews()))
+                .sorted(Comparator.comparingDouble((LectureUdemy lecture) -> lecture.getAvgRating() * lecture.getNumReviews()).reversed())
                 .collect(Collectors.toList());
 
         return LectureConverter.toCategoryRecommendLectureDto(sortedList);
@@ -46,20 +49,32 @@ public LectureResponseDTO.KeywordRecommendLectureDto findRecommendedLectureByKey
             throw new IllegalArgumentException("Keyword must not be null or empty");
         }
 
-        // 키워드를 포함하는 강의 목록을 조회
-        List<LectureUdemy> lectureUdemyList = lectureUdemyRepository.findAllByTitleContaining(keyword);
+        // 키워드를 포함하는 강의 목록을 조회(topic 데이터에 있는지 확인)
+        List<LectureUdemy> lectureUdemyList = lectureUdemyRepository.findAllByTopic(keyword);
 
         // 조회된 강의 목록을 AvgRating과 NumReviews의 값을 곱한 값으로 내림차순 정렬
         List<LectureUdemy> sortedList = lectureUdemyList.stream()
-                .sorted(Comparator.comparingDouble(lecture -> lecture.getAvgRating() * lecture.getNumReviews()))
+                .sorted(Comparator.comparingDouble((LectureUdemy lecture) -> lecture.getAvgRating() * lecture.getNumReviews()).reversed())
                 .collect(Collectors.toList());
 
         // 조회된 강의 목록을 DTO로 변환하여 반환
         return LectureConverter.toKeywordRecommendLectureDto(sortedList);
     }
 
-    public LectureResponseDTO.LectureDetailDto findLectureDetail() {
-        return null;
+    // 강좌 세부 조회
+    public LectureResponseDTO.LectureDetailDto findLectureDetail(Integer lectureId) {
+
+        // lectureId가 null인 경우에 대한 예외 처리
+        if (lectureId == null) {
+            throw new IllegalArgumentException("LectureId must not be null");
+        }
+
+        LectureUdemy lectureUdemy = lectureUdemyRepository.findByLectureId(Long.valueOf(lectureId))
+                .orElseThrow(() -> new IllegalArgumentException("Lecture not found"));
+        LectureDetail lectureDetail = lectureDetailRepository.findByLectureId(Long.valueOf(lectureId))
+                .orElseThrow(() -> new IllegalArgumentException("Lecture detail not found"));
+
+        return LectureConverter.toLectureDetailDto(lectureUdemy, lectureDetail);
     }
 
     public LectureResponseDTO.OtherStudentsDto findOtherStudents() {
@@ -70,8 +85,4 @@ public LectureResponseDTO.OtherLectureListDto findOtherLectureList() {
         return null;
     }
 
-
-    public LectureResponseDTO.StudentTopwordDto findStudentTopword() {
-        return null;
-    }
 }

src/main/java/khu/bigdata/infou/repository/LectureDetailRepository.java

@@ -1,7 +1,14 @@
 package khu.bigdata.infou.repository;
 
 import khu.bigdata.infou.domain.LectureDetail;
+import khu.bigdata.infou.domain.LectureUdemy;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface LectureDetailRepository extends JpaRepository<LectureDetail, Long> {
+
+    Optional<LectureDetail> findByLectureUdemy(LectureUdemy lectureUdemy);
+
+    Optional<LectureDetail> findByLectureId(Long lectureId);
 }

src/main/java/khu/bigdata/infou/repository/LectureUdemyRepository.java

@@ -2,12 +2,19 @@
 
 import khu.bigdata.infou.domain.LectureUdemy;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface LectureUdemyRepository extends JpaRepository<LectureUdemy, Long> {
 
-    public List<LectureUdemy> findAllBySubcategory(String subcategory);
 
-    public List<LectureUdemy> findAllByTitleContaining(String keyword);
+    @Query("select l from LectureUdemy l left join fetch l.lectureTag where l.subcategory = :subcategory")
+    List<LectureUdemy> findAllBySubcategory(String subcategory);
+
+    List<LectureUdemy> findAllByTopic(String topic);
+
+    Optional<LectureUdemy> findByLectureId(Long lectureId);
+
 }

src/main/java/khu/bigdata/infou/repository/PlatformStudentLectureRepository.java

@@ -0,0 +1,7 @@
+package khu.bigdata.infou.repository;
+
+import khu.bigdata.infou.domain.PlatformStudentLecture;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface PlatformStudentLectureRepository extends JpaRepository<PlatformStudentLecture, Long> {
+}

src/main/java/khu/bigdata/infou/repository/PlatformStudentRepository.java

@@ -0,0 +1,7 @@
+package khu.bigdata.infou.repository;
+
+import khu.bigdata.infou.domain.PlatformStudent;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface PlatformStudentRepository extends JpaRepository<PlatformStudent, Long> {
+}

src/main/java/khu/bigdata/infou/web/controller/MainController.java → src/main/java/khu/bigdata/infou/web/controller/MainServiceController.java

@@ -12,12 +12,12 @@
 @RequiredArgsConstructor
 @Slf4j
 @RequestMapping("/api")
-public class MainController {
+public class MainServiceController {
 
     private final LectureService lectureService;
 
     @GetMapping("/lectures/categories")
-    @Operation(summary = "카테고리별 추천 강좌 조회 API", description = "카테고리: 프로그래밍 언어, 웹 개발, 게임 개발, 모바일 앱 개발, 데이터 사이언스, 인공지능")
+    @Operation(summary = "카테고리별 추천 강좌 조회 API", description = "카테고리: Programming Language, Web Development, Game Development, Mobile Development, Data Science")
     public ResponseEntity<LectureResponseDTO.CategoryRecommendLectureDto> getRecommendedLectureByCategory(
             @RequestParam(name = "category") String category
     ) {
@@ -26,7 +26,7 @@ public ResponseEntity<LectureResponseDTO.CategoryRecommendLectureDto> getRecomme
 
 
     @GetMapping("/curriculum/recommendation")
-    @Operation(summary = "선택된 키워드별 추천 강좌 조회 API", description = "유저로부터 입력받은 키워드 4개를 입력받습니다.")
+    @Operation(summary = "선택된 키워드별 추천 강좌 조회 API", description = "유저로부터 입력받은 키워드와 일치하는 강좌를 조회합니다.")
     public ResponseEntity<LectureResponseDTO.KeywordRecommendLectureDto> getRecommendedLectureByKeyword(
             @RequestParam(name = "keyword") String keyword
     ) {
@@ -39,9 +39,12 @@ public ResponseEntity<LectureResponseDTO.KeywordRecommendLectureDto> getRecommen
     public ResponseEntity<LectureResponseDTO.LectureDetailDto> getLectureDetail(
             @PathVariable(name = "lectureId") Integer lectureId
     ) {
-        return ResponseEntity.ok(lectureService.findLectureDetail());
+        return ResponseEntity.ok(lectureService.findLectureDetail(lectureId));
     }
 
+    /**
+     * TODO
+     */
     @GetMapping("/others")
     @Operation(summary = "다른 수강생들의 커리큘럼 전체 조회 API")
     public ResponseEntity<LectureResponseDTO.OtherStudentsDto> getOtherStudents() {
@@ -55,12 +58,4 @@ public ResponseEntity<LectureResponseDTO.OtherLectureListDto> getOtherLectureLis
     ) {
         return ResponseEntity.ok(lectureService.findOtherLectureList());
     }
-
-    @GetMapping("/others/{userId}")
-    @Operation(summary = "특정 수강생의 topword 조회 API", description = "유저로부터 입력받은 키워드 4개를 입력받습니다.")
-    public ResponseEntity<LectureResponseDTO.StudentTopwordDto> getStudentTopword(
-            @PathVariable(name = "userId") Integer userId
-    ) {
-        return ResponseEntity.ok(lectureService.findStudentTopword());
-    }
 }