Merge pull request #28 from CodIN-INU/develop

fix: #25 #27 변경사항 적용

Author: doma17

src/main/java/inu/codin/codin/domain/elasticsearch/service/LectureElasticService.java

@@ -76,7 +76,7 @@ public Page<LectureDocument> searchLectureDocument(
                 b.filter(f -> f.term(t -> t.field("department").value(department.name())));
             }
 
-            if (like && likeIdList != null && !likeIdList.isEmpty()) {
+            if (Boolean.TRUE.equals(like) && likeIdList != null && !likeIdList.isEmpty()) {
                 b.filter(f -> f.ids(i -> i.values(likeIdList)));
             }
 

src/main/java/inu/codin/codin/domain/lecture/converter/EvaluationConverter.java

@@ -1,18 +1,31 @@
 package inu.codin.codin.domain.lecture.converter;
 
 import inu.codin.codin.domain.lecture.entity.Evaluation;
+import inu.codin.codin.domain.lecture.exception.LectureErrorCode;
+import inu.codin.codin.domain.lecture.exception.LectureException;
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Converter(autoApply = true)
 public class EvaluationConverter implements AttributeConverter<Evaluation, String> {
     @Override
     public String convertToDatabaseColumn(Evaluation attribute) {
-        return attribute.getDescription();
+        return attribute != null ? attribute.getDescription() : null;
     }
 
     @Override
-    public Evaluation convertToEntityAttribute(String dbData) {
-        return Evaluation.fromDescription(dbData);
+    public Evaluation convertToEntityAttribute(String data) {
+        if (data == null || data.trim().isEmpty()) {
+            return null;
+        }
+
+        try {
+            return Evaluation.fromDescription(data.trim());
+        } catch (IllegalArgumentException e) {
+            log.warn("Evaluation Converter 부분에서 문제가 발생했습니다.");
+            throw new LectureException(LectureErrorCode.CONVERT_ERROR);
+        }
     }
 }

src/main/java/inu/codin/codin/domain/lecture/entity/Evaluation.java

@@ -19,11 +19,20 @@ public String getDescription(){
 
     @JsonCreator
     public static Evaluation fromDescription(String description) {
+        if (description == null) {
+            return null;
+        }
+
         for (Evaluation evaluation : Evaluation.values()) {
             if (evaluation.getDescription().equals(description)) {
                 return evaluation;
             }
         }
-        return null;
+
+        try {
+            return Evaluation.valueOf(description);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("Unknown evaluation: " + description);
+        }
     }
 }

src/main/java/inu/codin/codin/domain/lecture/entity/Lecture.java

@@ -1,5 +1,6 @@
 package inu.codin.codin.domain.lecture.entity;
 
+import inu.codin.codin.domain.lecture.converter.EvaluationConverter;
 import inu.codin.codin.domain.lecture.converter.StringListConverter;
 import inu.codin.codin.domain.review.entity.Review;
 import inu.codin.codin.global.common.entity.Department;
@@ -28,17 +29,15 @@ public class Lecture {
 
     @Enumerated(EnumType.STRING)
     private Department department;                              //학과 (OTHERS : 교양)
-
-    @Enumerated(EnumType.STRING)
     private Type type;                                          //수업 유형(전공핵심, 전공선택..)
     private String lectureType;                                 //수업 방식(강의(이론), 온오프라인혼합형..)
 
-    @Enumerated(EnumType.STRING)
+    @Convert(converter = EvaluationConverter.class)
     private Evaluation evaluation;                              //평가 방식(상대평가, 절대평가, 이수)
 
     // Json 형태로 저장
     @Convert(converter = StringListConverter.class)
-    private List<String> preCourse;                                   //사전 과목 //todo List로 관리 피룡
+    private List<String> preCourse;                             //사전 과목
     private double starRating;                                  //과목 평점
     private int likes;                                          //좋아요 수
     private int hits;                                           //조회 수

src/main/java/inu/codin/codin/global/common/exception/GlobalExceptionHandler.java

@@ -20,19 +20,25 @@ public class GlobalExceptionHandler {
 
     @ExceptionHandler(Exception.class)
     protected ResponseEntity<ExceptionResponse> handleException(Exception e) {
-        StackTraceElement stackTraceElement = e.getStackTrace()[0];
+        StackTraceElement[] stack = e.getStackTrace();
 
-        log.warn("[Exception] 발생 위치: {}.{}({}:{}) | 원인: {} - {}",
-                stackTraceElement.getClassName(),      // 클래스 이름
-                stackTraceElement.getMethodName(),     // 메서드 이름
-                stackTraceElement.getFileName(),         // 파일 이름
-                stackTraceElement.getLineNumber(),       // 라인 번호
-                e.getClass().getSimpleName(),            // 예외 타입
-                e.getMessage()                           // 예외 메시지
-        );
+        if (stack != null && stack.length > 0) {
+            StackTraceElement stackTraceElement = stack[0];
+
+            log.error("[Exception] 발생 위치: {}.{}({}:{}) | 원인: {} - {}",
+                    stackTraceElement.getClassName(),
+                    stackTraceElement.getMethodName(),
+                    stackTraceElement.getFileName(),
+                    stackTraceElement.getLineNumber(),
+                    e.getClass().getSimpleName(),
+                    e.getMessage(),
+                    e);
+        } else {
+            log.error("[Exception] 원인: {} - {}", e.getClass().getSimpleName(), e.getMessage(), e);
+        }
 
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(new ExceptionResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), e.getMessage()));
+                .body(new ExceptionResponse(HttpStatus.INTERNAL_SERVER_ERROR.value(), "서버 내부 오류가 발생했습니다."));
     }
 
     @ExceptionHandler(LectureException.class)