refactor:content api에서 advice와 feeling값 null값허용 (#59)

KAU2024-SANHAK · May 9, 2024 · e62b550 · e62b550
1 parent 0ace7b3
commit e62b550
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/org/kau/kkoolbeeServer/domain/advice/dto/AdviceResponseDto.java b/src/main/java/org/kau/kkoolbeeServer/domain/advice/dto/AdviceResponseDto.java
@@ -3,10 +3,19 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import org.kau.kkoolbeeServer.domain.advice.Advice;
 
 @Getter
 @AllArgsConstructor
 public class AdviceResponseDto {
     private String spicy;
     private String kind;
+
+    public static AdviceResponseDto fromAdviceOrNull(Advice advice) {
+        if (advice == null) {
+            return new AdviceResponseDto(null, null);
+        } else {
+            return new AdviceResponseDto(advice.getSpicy_advice(), advice.getKind_advice());
+        }
+    }  //advice가 null이어도 응답메시지를 보내야하므로
 }
diff --git a/src/main/java/org/kau/kkoolbeeServer/domain/diary/controller/DiaryController.java b/src/main/java/org/kau/kkoolbeeServer/domain/diary/controller/DiaryController.java
@@ -68,24 +68,15 @@ public ResponseEntity<ApiResponse<?>> getDiaryContents(@RequestHeader(value = "A
 
 
                 Diary diary = diaryOptional.get();
-                if(diary.getAdvice()==null){
-                    throw new CustomException(ErrorType.ADVICE_NOT_FOUND);
-                }
-
-                // Diary의 Advice 정보를 AdviceResponseDto 객체로 변환
-                AdviceResponseDto adviceResponseDto = new AdviceResponseDto(
-                        diary.getAdvice().getSpicy_advice(),    //여기서 null이 나오면 ?
-                        diary.getAdvice().getKind_advice()
-
-                );
-
-
+                AdviceResponseDto adviceResponseDto=AdviceResponseDto.fromAdviceOrNull(diary.getAdvice());
+                //feeling이 null인경우 대비
+                String feeling = diary.getFeeling() != null ? diary.getFeeling().toString() : null;
                 DiaryContentResponseDto responseDto = new DiaryContentResponseDto(
                         diary.getId(),
                         diary.getWritedAt(),
                         diary.getContent(),
                         adviceResponseDto,
-                        diary.getFeeling().toString(),
+                        feeling,
                         diary.getImageurl(),
                         diary.getTitle()
                 );