조회 api 작업 중

Author: gooinsung

src/main/java/com/icd/survey/api/controller/survey/SurveyController.java

@@ -2,7 +2,9 @@
 
 import com.icd.survey.api.dto.survey.request.CreateSurveyRequest;
 import com.icd.survey.api.dto.survey.request.UpdateSurveyUpdateRequest;
+import com.icd.survey.api.entity.survey.dto.SurveyDto;
 import com.icd.survey.api.service.survey.SurveyService;
+import com.icd.survey.common.response.ApiResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -16,9 +18,7 @@ public class SurveyController {
 
     private final SurveyService surveyService;
 
-    /*
-     * 디렉토리 구조나 아키텍처, 디자인 패턴 등 전반적인 리뷰를 듣고 싶습니다.
-     * */
+
     @PostMapping
     public void createSurvey(@Validated @RequestBody CreateSurveyRequest requestDto) {
         surveyService.createSurvey(requestDto);
@@ -29,4 +29,9 @@ public void updateSurvey(@Validated @RequestBody UpdateSurveyUpdateRequest reque
         surveyService.updateSurvey(requestDto);
     }
 
+    @GetMapping("/{surveySeq}")
+    public ApiResponse<SurveyDto> getSurveyAnswer(@PathVariable Long surveySeq) {
+        return new ApiResponse<>(surveyService.getSurveyAnswer(surveySeq));
+    }
+
 }

src/main/java/com/icd/survey/api/entity/survey/ItemAnswer.java

@@ -4,6 +4,7 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -13,6 +14,7 @@
 @DynamicUpdate
 @NoArgsConstructor
 @Table(name = "item_answer")
+@ToString
 public class ItemAnswer {
     @Id
     @Column(name = "answer_seq", nullable = false)

src/main/java/com/icd/survey/api/entity/survey/Survey.java

@@ -18,6 +18,7 @@
 @DynamicUpdate
 @NoArgsConstructor
 @Table(name = "survey")
+@ToString
 public class Survey extends BaseEntity {
     @Id
     @Column(name = "survey_seq")

src/main/java/com/icd/survey/api/entity/survey/SurveyItem.java

@@ -5,6 +5,7 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -16,6 +17,7 @@
 @DynamicUpdate
 @NoArgsConstructor
 @Table(name = "survey_item")
+@ToString
 public class SurveyItem extends BaseEntity {
     @Id
     @Column(name = "item_seq", nullable = false)
@@ -46,7 +48,7 @@ public class SurveyItem extends BaseEntity {
 
     @OneToMany(fetch = FetchType.LAZY)
     @JoinColumn(name = "item_seq")
-    private List<ItemAnswer> responseList;
+    private List<ItemAnswer> answerList;
 
     public void disable() {
         if(Boolean.FALSE.equals(getIsDeleted())){

src/main/java/com/icd/survey/api/repository/survey/ItemAnswerRepository.java

@@ -3,5 +3,8 @@
 import com.icd.survey.api.entity.survey.ItemAnswer;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface ItemAnswerRepository extends JpaRepository<ItemAnswer, Long> {
+
 }

src/main/java/com/icd/survey/api/repository/survey/SurveyItemRepository.java

@@ -2,11 +2,18 @@
 
 import com.icd.survey.api.entity.survey.SurveyItem;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
 
 public interface SurveyItemRepository extends JpaRepository<SurveyItem, Long> {
-
     Optional<List<SurveyItem>> findAllBySurveySeq(Long surveySeq);
+
+    @Query("SELECT ao FROM SurveyItem si " +
+            "JOIN si.responseList ao " +
+            "WHERE si.surveySeq = :surveySeq")
+    Optional<List<SurveyItem>> findAnswerOptionsBySurveySeq(@Param("surveySeq") Long surveySeq);
+    Optional<List<SurveyItem>> findSurveyItemsWithAnswers(@Param("surveySeq") Long surveySeq);
 }

src/main/java/com/icd/survey/api/repository/survey/SurveyRepository.java

@@ -2,6 +2,7 @@
 
 import com.icd.survey.api.entity.survey.Survey;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.Optional;
 

src/main/java/com/icd/survey/api/service/survey/SurveyService.java

@@ -6,6 +6,8 @@
 import com.icd.survey.api.dto.survey.request.UpdateSurveyUpdateRequest;
 import com.icd.survey.api.entity.survey.Survey;
 import com.icd.survey.api.entity.survey.SurveyItem;
+import com.icd.survey.api.entity.survey.dto.SurveyDto;
+import com.icd.survey.api.entity.survey.dto.SurveyItemDto;
 import com.icd.survey.api.service.survey.business.SurveyActionBusiness;
 import com.icd.survey.api.service.survey.business.SurveyQueryBusiness;
 import com.icd.survey.common.CommonUtils;
@@ -101,6 +103,23 @@ public void submitSurvey(SubmitSurveyRequest request) {
 
     }
 
+    public SurveyDto getSurveyAnswer(Long surveySeq) {
+        Survey survey = surveyQueryBusiness.findSurveyById(surveySeq)
+                .orElseThrow(() -> new ApiException(ExceptionResponseType.ENTITY_NOT_FNOUND));
+
+        surveyValidCheck(survey);
+
+        List<SurveyItem> itemList = surveyQueryBusiness.findAllItemInfoBySurveySeq(surveySeq)
+                .orElseThrow(() -> new ApiException(ExceptionResponseType.ENTITY_NOT_FNOUND));
+
+
+        /* todo : entity to dto and return 너무 하기 싫어서.... 담주에 하자..*/
+
+        SurveyDto result = survey.of();
+
+        return null;
+    }
+
     public void surveyValidCheck(Survey survey) {
         if (survey.getIsDeleted() != null && Boolean.TRUE.equals(survey.getIsDeleted())) {
             throw new ApiException(ExceptionResponseType.ENTITY_NOT_FNOUND);

src/main/java/com/icd/survey/api/service/survey/business/SurveyQueryBusiness.java

@@ -1,5 +1,6 @@
 package com.icd.survey.api.service.survey.business;
 
+import com.icd.survey.api.entity.survey.ItemAnswer;
 import com.icd.survey.api.entity.survey.ItemAnswerOption;
 import com.icd.survey.api.entity.survey.Survey;
 import com.icd.survey.api.entity.survey.SurveyItem;
@@ -23,18 +24,23 @@ public class SurveyQueryBusiness {
     private final ItemAnswerRepository itemAnswerRepository;
     private final AnswerOptionRepository answerOptionRepository;
 
+
     public Optional<Survey> findSurveyById(Long surveySeq) {
         return surveyRepository.findById(surveySeq);
     }
 
-    public Optional<Survey> findUserSurvey(String surveyName, String userSeq) {
-        return surveyRepository.findBySurveyNameAndIpAddress(surveyName, userSeq);
+    public Optional<List<SurveyItem>> findAllItemInfoBySurveySeq(Long surveySeq) {
+        return surveyItemRepository.findSurveyItemsWithAnswers(surveySeq);
     }
 
     public Optional<List<SurveyItem>> findItemAllBySurveySeq(Long surveySeq) {
         return surveyItemRepository.findAllBySurveySeq(surveySeq);
     }
 
+    public Optional<List<ItemAnswer>> findAnswerListBySurveySeq(Long surveySeq) {
+        return null;
+    }
+
     public Optional<List<ItemAnswerOption>> findOptionAllByItemSeq(Long itemSeq) {
         return answerOptionRepository.findAllByItemSeq(itemSeq);
     }
@@ -51,8 +57,5 @@ public Optional<SurveyItem> findSurveyItemById(Long itemSeq) {
         return surveyItemRepository.findById(itemSeq);
     }
 
-    public Optional<ItemAnswerOption> findAnswerOptionById(Long answerSeq) {
-        return answerOptionRepository.findById(answerSeq);
-    }
 
 }

src/main/java/com/icd/survey/exception/handler/GlobalExceptionHandler.java

@@ -48,6 +48,7 @@ protected ResponseEntity<ExceptionResponse> handleCustomApiException(ApiExceptio
     @ExceptionHandler(RuntimeException.class)
     protected ResponseEntity<ExceptionResponse> handleRuntimeException(RuntimeException e) {
         logError(e);
+        e.printStackTrace();
         return ResponseEntity
                 .internalServerError()
                 .body(ExceptionResponse