Merge pull request #238 from devping-kr/dev

deploy : 배포

Author: daewon-ko

src/main/java/devping/nnplanner/domain/auth/service/AuthService.java

@@ -101,6 +101,7 @@ public String loginUrlGoogle() {
             + "&response_type=code&scope=email%20profile%20openid&access_type=offline";
     }
 
+    @Transactional
     public AuthResponseDTO loginGoogle(GoogleLoginRequestDTO googleLoginRequestDTO) {
 
         RestTemplate restTemplate = new RestTemplate();

src/main/java/devping/nnplanner/domain/menucategory/service/MenuCategoryService.java

@@ -68,6 +68,7 @@ private void saveMenuCategories(String majorCategory, List<String> minorCategori
         }
     }
 
+    @Transactional(readOnly = true)
     public List<String> getSchoolNameSuggestions(String keyword) {
 
         if (keyword.length() < 2) { // 최소 2글자 이상 입력해야 검색

src/main/java/devping/nnplanner/domain/monthmenu/service/MonthMenuService.java

@@ -1,14 +1,14 @@
 package devping.nnplanner.domain.survey.dto.response;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 @Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Setter
 public class SurveyDetailResponseDTO {
 
@@ -21,24 +21,45 @@ public class SurveyDetailResponseDTO {
 
     private AverageScores averageScores;
 
+    @Builder
+    private SurveyDetailResponseDTO(String surveyName, LocalDateTime deadline, UUID mmId, List<QuestionSatisfactionDistribution> mandatoryQuestions, List<QuestionSatisfactionDistribution> additionalQuestions, AverageScores averageScores) {
+        this.surveyName = surveyName;
+        this.deadline = deadline;
+        this.mmId = mmId;
+        this.mandatoryQuestions = mandatoryQuestions;
+        this.additionalQuestions = additionalQuestions;
+        this.averageScores = averageScores;
+    }
+
     @Getter
     @Setter
+    @NoArgsConstructor
     public static class AverageScores {
         private double totalSatisfaction;
         private double portionSatisfaction;
         private double hygieneSatisfaction;
         private double tasteSatisfaction;
+
+        @Builder
+        public AverageScores(double totalSatisfaction, double portionSatisfaction, double hygieneSatisfaction, double tasteSatisfaction) {
+            this.totalSatisfaction = totalSatisfaction;
+            this.portionSatisfaction = portionSatisfaction;
+            this.hygieneSatisfaction = hygieneSatisfaction;
+            this.tasteSatisfaction = tasteSatisfaction;
+        }
     }
 
     @Getter
-    @Setter
+    @NoArgsConstructor(access = AccessLevel.PROTECTED)
+
     public static class QuestionSatisfactionDistribution {
         private Long questionId;
         private String questionText;
         private Map<Integer, Integer> radioResponses; // "radio" 타입 질문에 대해서만 설정됨
         private List<String> textResponses; // "text" 타입 질문에 대해서만 설정됨
         private String answerType;
 
+        @Builder
         public QuestionSatisfactionDistribution(Long questionId, String questionText,
                                                 Map<Integer, Integer> radioResponses,
                                                 List<String> textResponses,
@@ -50,7 +71,8 @@ public QuestionSatisfactionDistribution(Long questionId, String questionText,
             this.answerType = answerType;
         }
 
-        public QuestionSatisfactionDistribution(Long questionId, String questionText, String answerType) {
+        @Builder
+        private QuestionSatisfactionDistribution(Long questionId, String questionText, String answerType) {
             this.questionId = questionId;
             this.questionText = questionText;
             this.radioResponses = Map.of();

src/main/java/devping/nnplanner/domain/survey/dto/response/SurveyDetailResponseDTO.java

@@ -0,0 +1,11 @@
+package devping.nnplanner.domain.survey.entity;
+
+public enum AnswerItemType {
+    DATE("날짜"), RADIO("점수"), TEXT("의견"), ETC("기타");
+
+    private final String name;
+
+    AnswerItemType(String name) {
+        this.name = name;
+    }
+}

src/main/java/devping/nnplanner/domain/survey/entity/AnswerItemType.java

@@ -1,5 +1,6 @@
 package devping.nnplanner.domain.survey.entity;
 
+import com.fasterxml.jackson.databind.introspect.Annotated;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -34,4 +35,9 @@ public Question(String question, String answerType, boolean isMandatory, Survey
         this.isMandatory = isMandatory;
         this.survey = survey;
     }
+
+    public void reviseQuestion(final String newContent, final String answerType) {
+        this.question = newContent;
+        this.answerType = answerType;
+    }
 }

src/main/java/devping/nnplanner/domain/survey/entity/Question.java

@@ -0,0 +1,39 @@
+package devping.nnplanner.domain.survey.entity;
+
+import devping.nnplanner.global.entity.BaseTimeEntity;
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+public class SurveyAnswerItem extends BaseTimeEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY )
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "survey_response_detail_id", nullable = false)
+    private SurveyResponseDetail surveyResponseDetail;
+
+    @Column(name = "answer_item", length = 1000)
+    private String answerItem;
+
+    @Column(name = "answer_score")
+    private Integer answerScore;  // radio 타입 점수 저장
+
+    @Enumerated(EnumType.STRING)
+    private AnswerItemType answerItemType;
+
+    @Builder
+    private SurveyAnswerItem(Long id, SurveyResponseDetail surveyResponseDetail, String answerItem, Integer answerScore, AnswerItemType answerItemType) {
+        this.id = id;
+        this.surveyResponseDetail = surveyResponseDetail;
+        this.answerItem = answerItem;
+        this.answerScore = answerScore;
+        this.answerItemType = answerItemType;
+    }
+}

src/main/java/devping/nnplanner/domain/survey/entity/SurveyAnswerItem.java

@@ -1,16 +1,14 @@
 package devping.nnplanner.domain.survey.entity;
 
 import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 import java.util.List;
 
 @Entity
 @Getter
 @Setter
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class SurveyResponseDetail {
 
     @Id
@@ -25,22 +23,14 @@ public class SurveyResponseDetail {
     @JoinColumn(name = "question_id", nullable = false)
     private Question question;  // 질문과 연관
 
-    @Column(name = "answer_score")
-    private Integer answerScore;  // radio 타입 점수 저장
 
-    @Column(name = "answer_text", length = 1000)
-    private String answerText;  // text 타입의 단일 텍스트 응답 저장
+    @OneToMany(mappedBy = "surveyResponseDetail", fetch = FetchType.LAZY)
+    private List<SurveyAnswerItem> surveyAnswerItems;  // 응답에 포함된 답변 항목 리스트
 
-    @ElementCollection
-    @CollectionTable(name = "survey_response_answer_list", joinColumns = @JoinColumn(name = "survey_response_detail_id"))
-    @Column(name = "answer_item")
-    private List<String> answerList;  // text 타입의 리스트 응답 저장 (ex: "가장 좋아하는 상위 3개 식단")
+    @Builder
 
-    public SurveyResponseDetail(SurveyResponse surveyResponse, Question question, Integer answerScore, String answerText, List<String> answerList) {
+    private SurveyResponseDetail(SurveyResponse surveyResponse, Question question) {
         this.surveyResponse = surveyResponse;
         this.question = question;
-        this.answerScore = answerScore;
-        this.answerText = answerText;
-        this.answerList = answerList;
     }
 }

src/main/java/devping/nnplanner/domain/survey/entity/SurveyResponseDetail.java

@@ -3,8 +3,11 @@
 import devping.nnplanner.domain.survey.entity.Question;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface QuestionRepository extends JpaRepository<Question, Long> {
     Optional<Question> findByIdAndSurveyId(Long questionId, Long surveyId);
+
+    Optional<List<Question>> findAllBySurveyId(Long surveyId);
 }

src/main/java/devping/nnplanner/domain/survey/repository/QuestionRepository.java

@@ -7,21 +7,23 @@
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface ResponseDetailRepository extends JpaRepository<SurveyResponseDetail, Long> {
 
-    // 특정 SurveyResponse에 연결된 ResponseDetail 조회
-    List<SurveyResponseDetail> findBySurveyResponse(SurveyResponse surveyResponse);
-
-    // 특정 질문 ID에 따라 분류된 응답 조회 예시
-    @Query("SELECT rd FROM SurveyResponseDetail rd WHERE rd.question.id = :questionId AND rd.surveyResponse.survey.id = :surveyId")
-    List<SurveyResponseDetail> findByQuestionAndSurvey(@Param("questionId") Long questionId, @Param("surveyId") Long surveyId);
-
-    // 영양사에게 남긴 메시지 조회 (answerText가 NULL이 아닌 경우)
-    @Query("SELECT rd.answerText FROM SurveyResponseDetail rd WHERE rd.surveyResponse.survey.id = :surveyId AND rd.answerText IS NOT NULL")
-    List<String> findMessagesToDietitian(@Param("surveyId") Long surveyId);
-
-    // 만족도나 기타 항목의 평균값 계산 예시
-    @Query("SELECT AVG(rd.answerScore) FROM SurveyResponseDetail rd WHERE rd.surveyResponse.survey.id = :surveyId")
-    Double findAverageSatisfactionScoreBySurvey(@Param("surveyId") Long surveyId);
+    // 특정 SurveyResponse에 연결된 ResponseDetail 조회")
+    @Query("SELECT rd FROM SurveyResponseDetail rd join fetch rd.surveyAnswerItems WHERE rd.surveyResponse.id = :surveyResponseId")
+    Optional<List<SurveyResponseDetail>> findSurveyResponseDetailBySurveyResponse(final Long surveyResponseId);
+//
+//    // 특정 질문 ID에 따라 분류된 응답 조회 예시
+//    @Query("SELECT rd FROM SurveyResponseDetail rd WHERE rd.question.id = :questionId AND rd.surveyResponse.survey.id = :surveyId")
+//    List<SurveyResponseDetail> findByQuestionAndSurvey(@Param("questionId") Long questionId, @Param("surveyId") Long surveyId);
+//
+//    // 영양사에게 남긴 메시지 조회 (answerText가 NULL이 아닌 경우)
+//    @Query("SELECT rd.answerText FROM SurveyResponseDetail rd WHERE rd.surveyResponse.survey.id = :surveyId AND rd.answerText IS NOT NULL")
+//    List<String> findMessagesToDietitian(@Param("surveyId") Long surveyId);
+//
+//    // 만족도나 기타 항목의 평균값 계산 예시
+//    @Query("SELECT AVG(rd.answerScore) FROM SurveyResponseDetail rd WHERE rd.surveyResponse.survey.id = :surveyId")
+//    Double findAverageSatisfactionScoreBySurvey(@Param("surveyId") Long surveyId);
 }