fix: 템플릿 상세 조회 로직 변경

depromeet · Aug 29, 2024 · 9c1bbb4 · 9c1bbb4
1 parent 31fb0ef
commit 9c1bbb4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/...pi/src/main/java/org/layer/domain/template/controller/dto/TemplateDetailInfoResponse.java b/...pi/src/main/java/org/layer/domain/template/controller/dto/TemplateDetailInfoResponse.java
@@ -7,6 +7,7 @@
 import org.layer.domain.template.entity.TemplateMetadata;
 
 import java.util.List;
+import java.util.Optional;
 
 @Builder
 @Schema
@@ -21,7 +22,7 @@ public record TemplateDetailInfoResponse(
         @NotNull
         String templateName, // ex. KPT 회고
         @Schema(description = "템플릿 대표 사진", example = "[이미지 url]")
-        @NotNull
+        // @NotNull
         String templateImageUrl,
         @Schema(description = "회고에 대한 설명", example = "회고 내용을 Keep, Problem, Try 세가지 관점으로 분류하여... [생략]")
         @NotNull
@@ -41,15 +42,15 @@ public record TemplateDetailInfoResponse(
         List<TemplatePurposeResponse> templatePurposeResponseList // 질문(회고 과정)에 대한 설명
 
 ) {
-    public static TemplateDetailInfoResponse toResponse(Form form, TemplateMetadata templateMetadata, List<TemplateDetailQuestionResponse> templateQuestionList, List<TemplatePurposeResponse> templatePurposeResponseList) {
+    public static TemplateDetailInfoResponse toResponse(Form form, Optional<TemplateMetadata> templateMetadata, List<TemplateDetailQuestionResponse> templateQuestionList, List<TemplatePurposeResponse> templatePurposeResponseList) {
         return TemplateDetailInfoResponse.builder()
                 .id(form.getId())
                 .title(form.getTitle())
                 .templateName(form.getFormTag().getTag())
-                .templateImageUrl(templateMetadata.getTemplateImageUrl())
+                .templateImageUrl(templateMetadata.map(TemplateMetadata::getTemplateImageUrl).orElse(null))
                 .introduction(form.getIntroduction())
-                .tipTitle(templateMetadata.getTipTitle())
-                .tipDescription(templateMetadata.getTipDescription())
+                .tipTitle(templateMetadata.map(TemplateMetadata::getTipTitle).orElse(null))
+                .tipDescription(templateMetadata.map(TemplateMetadata::getTipDescription).orElse(null))
                 .templateDetailQuestionList(templateQuestionList)
                 .templatePurposeResponseList(templatePurposeResponseList)
                 .build();

diff --git a/layer-api/src/main/java/org/layer/domain/template/service/TemplateService.java b/layer-api/src/main/java/org/layer/domain/template/service/TemplateService.java
@@ -19,6 +19,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 import static org.layer.domain.form.entity.FormType.TEMPLATE;
 
@@ -42,18 +43,18 @@ public TemplateSimpleInfoResponse getTemplateSimpleInfo(Long formId) {
     //== 상세 정보 단건 조회 ==//
     public TemplateDetailInfoResponse getTemplateDetailInfo(Long formId) {
         Form form = formRepository.findByIdOrThrow(formId);
-        TemplateMetadata template = templateMetadataRepository.findByFormIdOrThrow(formId);
+        Optional<TemplateMetadata> template = templateMetadataRepository.findByFormId(formId);
         List<Question> questionList = questionRepository.findAllByFormId(formId);
 
         List<TemplatePurpose> templatePurposeList = templatePurposeRepository.findAllByFormId(formId);
 
         List<TemplatePurposeResponse> templatePurposeResponses = templatePurposeList.stream().map(TemplatePurposeResponse::toResponse).toList();
         List<TemplateDetailQuestionResponse> questionDesList = questionList.stream().map(q -> {
-            QuestionDescription description = questionDescriptionRepository.findByQuestionIdOrThrow(q.getId());
+            Optional<QuestionDescription> description = questionDescriptionRepository.findByQuestionId(q.getId());
             return TemplateDetailQuestionResponse.builder()
                     .questionId(q.getId())
                     .question(q.getContent())
-                    .description(description.getDescription()).build();
+                    .description(description.map(QuestionDescription::getDescription).orElse(null)).build();
         }).toList();
 
         return TemplateDetailInfoResponse.toResponse(form, template, questionDesList, templatePurposeResponses);

diff --git a/layer-domain/src/main/java/org/layer/domain/template/exception/TemplateExceptionType.java b/layer-domain/src/main/java/org/layer/domain/template/exception/TemplateExceptionType.java
@@ -15,11 +15,11 @@ public enum TemplateExceptionType implements ExceptionType {
 
     @Override
     public HttpStatus httpStatus() {
-        return null;
+        return status;
     }
 
     @Override
     public String message() {
-        return null;
+        return message;
     }
 }