Merge branch 'refs/heads/develop'

Author: doma17

build.gradle

@@ -46,6 +46,9 @@ dependencies {
 
     // Elastic Search
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
+    implementation 'org.elasticsearch.client:elasticsearch-rest-high-level-client:7.17.13'
+    implementation 'org.elasticsearch:elasticsearch:7.17.13'
+    implementation 'org.elasticsearch:elasticsearch-core:7.17.13'
 
     //QueryDSL
     implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'

src/main/java/inu/codin/codin/CodinLectureApiApplication.java

@@ -3,9 +3,12 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
+
 
-@EnableFeignClients
 @SpringBootApplication
+@EnableFeignClients
+@EnableElasticsearchRepositories
 public class CodinLectureApiApplication {
 
     public static void main(String[] args) {

src/main/java/inu/codin/codin/domain/elasticsearch/convertor/LectureDocumentConverter.java

@@ -14,21 +14,21 @@ public LectureDocument convertToDocument(Lecture lecture) {
                 .id(lecture.getId())
                 .lectureNm(lecture.getLectureNm())
                 .grade(lecture.getGrade())
-                .department(lecture.getDepartment().name())
+                .department(lecture.getDepartment() != null ? lecture.getDepartment().name() : null)
                 .starRating(lecture.getStarRating())
                 .likes((long) lecture.getLikes())
                 .hits((long) lecture.getHits())
                 .professor(lecture.getProfessor())
-                .type(lecture.getType().name())
+                .type(lecture.getType() != null ? lecture.getType().name() : null)
                 .lectureType(lecture.getLectureType())
-                .evaluation(lecture.getEvaluation().name())
+                .evaluation(lecture.getEvaluation() != null ? lecture.getEvaluation().name() : null)
                 .preCourses(lecture.getPreCourse() != null ? List.of(lecture.getPreCourse()) : List.of())
-                .tags(lecture.getTags().stream()
+                .tags(lecture.getTags() != null ? lecture.getTags().stream()
                         .map(tag -> tag.getTag().getTagName())
-                        .toList())
-                .semesters(lecture.getSemester().stream()
+                        .toList() : List.of())
+                .semesters(lecture.getSemester() != null ? lecture.getSemester().stream()
                         .map(ls -> ls.getSemester().getString())
-                        .toList())
+                        .toList() : List.of())
                 .build();
     }
 }

src/main/java/inu/codin/codin/domain/elasticsearch/document/LectureDocument.java

@@ -1,6 +1,9 @@
 package inu.codin.codin.domain.elasticsearch.document;
 
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;

src/main/java/inu/codin/codin/domain/elasticsearch/indexer/LectureStartupIndexer.java

@@ -13,6 +13,8 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -25,8 +27,8 @@ public class LectureStartupIndexer {
 
     private final LectureElasticRepository lectureElasticRepository;
     private final LectureRepository lectureRepository;
-
     private final LectureDocumentConverter lectureDocumentConverter;
+    private final ElasticsearchOperations elasticsearchOperations; // 추가
 
     private final int CHUNK_SIZE = 100;
 
@@ -42,6 +44,15 @@ public void onApplicationEvent(ApplicationReadyEvent event) {
             return;
         }
 
+        // 인덱스 존재 여부 확인 및 생성
+        IndexOperations indexOps = elasticsearchOperations.indexOps(LectureDocument.class);
+        if (!indexOps.exists()) {
+            log.info("ElasticSearch lectures 인덱스가 존재하지 않아 직접 생성합니다.");
+            indexOps.create();
+            indexOps.putMapping(indexOps.createMapping(LectureDocument.class));
+            log.info("ElasticSearch lectures 인덱스 및 매핑 생성 완료.");
+        }
+
         long existingCount = lectureElasticRepository.count();
         if (existingCount > 0) {
             log.info("ElasticSearch 인덱스가 이미 존재합니다 ({}개), 전체 재인덱싱을 진행합니다.", existingCount);
@@ -51,25 +62,28 @@ public void onApplicationEvent(ApplicationReadyEvent event) {
         }
 
         log.info("Starting ElasticSearch Indexing, Lecture Data");
-        Pageable pageable = PageRequest.of(0, CHUNK_SIZE);
-        Page<Lecture> page;
+        int pageNumber = 0;
         int totalProcessed = 0;
+        List<Lecture> lectures;
 
         do {
-            page = lectureRepository.findAllPaged(pageable);
-            List<LectureDocument> documents = page.getContent().stream()
-                    .map(lectureDocumentConverter::convertToDocument)
-                    .toList();
+            Pageable pageable = PageRequest.of(pageNumber, CHUNK_SIZE);
+            lectures = lectureRepository.findAllPaged(pageable);
 
-            lectureElasticRepository.saveAll(documents);
-            totalProcessed += documents.size();
+            if (!lectures.isEmpty()) {
+                List<LectureDocument> documents = lectures.stream()
+                        .map(lectureDocumentConverter::convertToDocument)
+                        .toList();
 
-            log.info("[indexAllLectures] Indexed Lecture: {}, Total: {})", documents.size(), totalProcessed);
-            pageable = page.nextPageable();
-        } while (page.hasNext());
+                lectureElasticRepository.saveAll(documents);
+                totalProcessed += documents.size();
 
-        log.info("ElasticSearch 인덱싱 성공. Total Indexed: {}", totalProcessed);
-    }
+                log.info("[indexAllLectures] Indexed Lecture: {}, Total: {}", documents.size(), totalProcessed);
+            }
 
+            pageNumber++;
+        } while (lectures.size() == CHUNK_SIZE);
 
+        log.info("ElasticSearch 인덱싱 성공. Total Indexed: {}", totalProcessed);
+    }
 }

src/main/java/inu/codin/codin/domain/lecture/repository/LectureRepository.java

@@ -35,12 +35,15 @@ public interface LectureRepository extends JpaRepository<Lecture, Long> {
         LEFT JOIN FETCH l.schedule
         WHERE l.id IN :lectureIds
     """)
-    Page<Lecture> findAllWithAssociationsByIds(List<Long> lectureIds);
+    List<Lecture> findAllWithAssociationsByIds(List<Long> lectureIds);
 
     @Query("""
         SELECT l FROM Lecture l
+        LEFT JOIN FETCH l.tags
+        LEFT JOIN FETCH l.reviews
+        LEFT JOIN FETCH l.semester
     """)
-    Page<Lecture> findAllPaged(Pageable pageable);
+    List<Lecture> findAllPaged(Pageable pageable);
 
 
     @Query("""

src/main/java/inu/codin/codin/domain/lecture/repository/LectureSearchRepositoryImpl.java

@@ -46,8 +46,8 @@ public Page<Lecture> searchLecturesAtPreview(String keyword, Department departme
         }
 
         // JPA로 Lecture 엔티티 Fetch 조회
-        Page<Lecture> lectures = lectureRepository.findAllWithAssociationsByIds(ids);
-        log.info("[searchLecturesAtPreview] 강의 조회, size={} ", lectures.getTotalElements());
+        List<Lecture> lectures = lectureRepository.findAllWithAssociationsByIds(ids);
+        log.info("[searchLecturesAtPreview] 강의 조회, size={} ", lectures.size());
 
         // ES 정렬 순서 유지하며 재정렬
         Map<Long, Lecture> lectureMap = lectures.stream()