D2M

src/main/java/OneQ/OnSurvey/domain/admin/api/AdminController.java

@@ -111,9 +111,9 @@ public SuccessResponse<String> changeSurveyOwner(
         @PathVariable Long surveyId,
         @RequestBody ChangeSurveyOwnerRequest request
     ) {
-        log.info("[ADMIN] 설문 소유자 변경 요청 - surveyId: {}, newMemberId: {}", surveyId, request.newMemberId());
+        log.info("[ADMIN] 설문 소유자 변경 요청 - surveyId: {}, memberId: {}, userKey: {}", surveyId, request.newMemberId(), request.newUserKey());
 
-        adminFacade.changeSurveyOwner(surveyId, request.newMemberId());
+        adminFacade.changeSurveyOwner(surveyId, request.newMemberId(), request.newUserKey());
 
         return SuccessResponse.ok("설문 소유자가 변경되었습니다.");
     }

src/main/java/OneQ/OnSurvey/domain/admin/api/dto/response/AdminSurveyDetailResponse.java

@@ -76,7 +76,9 @@ public record QuestionDto(
         String imageUrl,
         ChoicePropDto choiceProperty,
         RatingPropDto ratingProperty,
-        DatePropDto dateProperty
+        DatePropDto dateProperty,
+        GridPropDto gridProperty,
+        TimePropDto timeProperty
     ) {
         public static QuestionDto from(SurveyQuestion vo) {
             if (vo == null) return null;
@@ -91,7 +93,9 @@ public static QuestionDto from(SurveyQuestion vo) {
                 vo.imageUrl(),
                 ChoicePropDto.from(vo.choiceProperty()),
                 RatingPropDto.from(vo.ratingProperty()),
-                DatePropDto.from(vo.dateProperty())
+                DatePropDto.from(vo.dateProperty()),
+                GridPropDto.from(vo.gridProperty()),
+                TimePropDto.from(vo.timeProperty())
             );
         }
 
@@ -110,10 +114,10 @@ public static ChoicePropDto from(SurveyQuestion.ChoiceProp vo) {
                 return new ChoicePropDto(vo.maxChoice(), vo.hasCustomInput(), vo.hasNoneOption(), vo.isSectionDecidable(), optionDtos);
             }
 
-            public record OptionDto(String content, Integer nextSection, String imageUrl) {
+            public record OptionDto(Long optionId, String content, Integer nextSection, String imageUrl) {
                 public static OptionDto from(SurveyQuestion.ChoiceProp.Option vo) {
                     if (vo == null) return null;
-                    return new OptionDto(vo.content(), vo.nextSection(), vo.imageUrl());
+                    return new OptionDto(vo.optionId(), vo.content(), vo.nextSection(), vo.imageUrl());
                 }
             }
         }
@@ -131,6 +135,35 @@ public static DatePropDto from(SurveyQuestion.DateProp vo) {
                 return new DatePropDto(vo.defaultDate());
             }
         }
+
+        public record TimePropDto(Boolean isInterval) {
+            public static TimePropDto from(SurveyQuestion.TimeProp vo) {
+                if (vo == null) return null;
+                return new TimePropDto(vo.isInterval());
+            }
+        }
+
+        public record GridPropDto(
+            Boolean isCheckbox,
+            Boolean isChoiceMixed,
+            Boolean isChoiceDistinct,
+            Set<GridOptionDto> gridOptions
+        ) {
+            public static GridPropDto from(SurveyQuestion.GridProp vo) {
+                if (vo == null) return null;
+                Set<GridOptionDto> optionDtos = vo.gridOptions() != null
+                    ? vo.gridOptions().stream().map(GridOptionDto::from).collect(Collectors.toSet())
+                    : Set.of();
+                return new GridPropDto(vo.isCheckbox(), vo.isChoiceMixed(), vo.isChoiceDistinct(), optionDtos);
+            }
+
+            public record GridOptionDto(Long gridOptionId, Boolean isRow, String content, Integer order) {
+                public static GridOptionDto from(SurveyQuestion.GridProp.GridOption vo) {
+                    if (vo == null) return null;
+                    return new GridOptionDto(vo.gridOptionId(), vo.isRow(), vo.content(), vo.order());
+                }
+            }
+        }
     }
 
     public record ScreeningDto(

src/main/java/OneQ/OnSurvey/domain/admin/application/AdminFacade.java

@@ -99,8 +99,8 @@ public AdminSurveyDetailResponse getSurveyDetail(Long surveyId) {
 
     @Override
     @Transactional
-    public void changeSurveyOwner(Long surveyId, Long memberId) {
-        surveyPort.updateSurveyOwner(surveyId, memberId);
+    public void changeSurveyOwner(Long surveyId, Long memberId, Long userKey) {
+        surveyPort.updateSurveyOwner(surveyId, memberId, userKey);
     }
 
     @Override

src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveyQuestion.java

@@ -18,7 +18,9 @@ public record SurveyQuestion(
 
     ChoiceProp choiceProperty,
     RatingProp ratingProperty,
-    DateProp dateProperty
+    DateProp dateProperty,
+    GridProp gridProperty,
+    TimeProp timeProperty
 ) {
     public record ChoiceProp (
         Integer maxChoice,
@@ -29,6 +31,7 @@ public record ChoiceProp (
         Set<Option> options
     ) {
         public record Option (
+            Long optionId,
             String content,
             Integer nextSection,
             String imageUrl
@@ -44,4 +47,23 @@ public record RatingProp (
     public record DateProp (
         LocalDate defaultDate
     ) {}
+
+    public record GridProp (
+        Boolean isCheckbox,
+        Boolean isChoiceMixed,
+        Boolean isChoiceDistinct,
+
+        Set<GridOption> gridOptions
+    ) {
+        public record GridOption (
+            Long gridOptionId,
+            Boolean isRow,
+            String content,
+            Integer order
+        ) {}
+    }
+
+    public record TimeProp (
+        Boolean isInterval
+    ) {}
 }

src/main/java/OneQ/OnSurvey/domain/admin/domain/port/in/AdminUseCase.java

@@ -20,7 +20,7 @@ public interface AdminUseCase {
 
     AdminSurveyDetailResponse getSurveyDetail(Long surveyId);
 
-    void changeSurveyOwner(Long surveyId, Long newMemberId);
+    void changeSurveyOwner(Long surveyId, Long newMemberId, Long newUserKey);
 
     List<SurveyGrantStatsResponse> getSurveyGrantStats();
 

src/main/java/OneQ/OnSurvey/domain/admin/domain/port/out/SurveyPort.java

@@ -24,7 +24,7 @@ public interface SurveyPort {
 
     List<SurveySection> findSurveySectionsById(Long surveyId);
 
-    void updateSurveyOwner(Long surveyId, Long newMemberId);
+    void updateSurveyOwner(Long surveyId, Long newMemberId, Long newUserKey);
 
     List<OngoingSurveyView> findOngoingSurveys();
 }

src/main/java/OneQ/OnSurvey/domain/admin/infra/adapter/SurveyAdapter.java

@@ -97,10 +97,11 @@ public List<OngoingSurveyView> findOngoingSurveys() {
     }
 
     @Override
-    public void updateSurveyOwner(Long surveyId, Long memberId) {
+    public void updateSurveyOwner(Long surveyId, Long memberId, Long userKey) {
         SurveyOwnerChangeDto changeDto = SurveyOwnerChangeDto.builder()
             .surveyId(surveyId)
             .newMemberId(memberId)
+            .newUserKey(userKey)
             .build();
 
         surveyCommandService.updateSurveyOwner(changeDto);

src/main/java/OneQ/OnSurvey/domain/admin/infra/mapper/AdminSurveyMapper.java

@@ -6,11 +6,14 @@
 import OneQ.OnSurvey.domain.admin.domain.model.survey.SurveyScreening;
 import OneQ.OnSurvey.domain.admin.domain.model.survey.SurveySection;
 import OneQ.OnSurvey.domain.admin.domain.model.survey.SurveySingleViewInfo;
+import OneQ.OnSurvey.domain.question.model.dto.GridOptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.SectionDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.ChoiceDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.DateDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.DefaultQuestionDto;
+import OneQ.OnSurvey.domain.question.model.dto.type.GridDto;
 import OneQ.OnSurvey.domain.question.model.dto.type.RatingDto;
+import OneQ.OnSurvey.domain.question.model.dto.type.TimeDto;
 import OneQ.OnSurvey.domain.survey.model.SurveyStatus;
 import OneQ.OnSurvey.domain.survey.model.dto.ScreeningViewData;
 import OneQ.OnSurvey.domain.survey.model.dto.SurveyDetailData;
@@ -89,6 +92,7 @@ public static SurveyQuestion toSurveyQuestion(DefaultQuestionDto questionDto) {
                         choice.getIsSectionDecidable(),
                         choice.getOptions().stream()
                             .map(optionDto -> new SurveyQuestion.ChoiceProp.Option(
+                                optionDto.getOptionId(),
                                 optionDto.getContent(),
                                 optionDto.getNextSection(),
                                 optionDto.getImageUrl()
@@ -116,6 +120,33 @@ public static SurveyQuestion toSurveyQuestion(DefaultQuestionDto questionDto) {
                     )
                 ).build();
             }
+            case "GRID" -> {
+                GridDto grid = (GridDto) questionDto;
+                yield question.gridProperty(
+                    new SurveyQuestion.GridProp(
+                        grid.getIsCheckbox(),
+                        grid.getIsChoiceMixed(),
+                        grid.getIsChoiceDistinct(),
+                        (grid.getGridOptions() != null ? grid.getGridOptions() : List.<GridOptionDto>of())
+                            .stream()
+                            .map(gridOptionDto -> new SurveyQuestion.GridProp.GridOption(
+                                gridOptionDto.getGridOptionId(),
+                                gridOptionDto.getIsRow(),
+                                gridOptionDto.getContent(),
+                                gridOptionDto.getOrder()
+                            ))
+                            .collect(Collectors.toSet())
+                    )
+                ).build();
+            }
+            case "TIME" -> {
+                TimeDto time = (TimeDto) questionDto;
+                yield question.timeProperty(
+                    new SurveyQuestion.TimeProp(
+                        time.getIsInterval()
+                    )
+                ).build();
+            }
             default -> question.build();
         };
     }

src/main/java/OneQ/OnSurvey/domain/participation/entity/QuestionAnswer.java

@@ -12,26 +12,31 @@
 
 @Getter @ToString
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity @Table(name = "question_answer")
+@Entity @Table(name = "QUESTION_ANSWER")
 public class QuestionAnswer extends AbstractAnswer {
 
-    @Column(name = "question_id")
+    @Column(name = "QUESTION_ID", nullable = false)
     private Long questionId;
 
-    @Column(length = 512)
+    @Column(name = "GRID_ROW_ORDER")
+    private Integer gridRowOrder;
+
+    @Column(length = 512, nullable = false)
     private String content;
 
     @Builder
-    private QuestionAnswer(Long questionId, Long memberId, String content) {
+    private QuestionAnswer(Long questionId, Long memberId, Integer gridRowOrder, String content) {
         this.questionId = questionId;
         this.memberId = memberId;
+        this.gridRowOrder = gridRowOrder;
         this.content = content;
     }
 
     public static QuestionAnswer from(AnswerInsertDto.AnswerInfo info) {
         return QuestionAnswer.builder()
                 .questionId(info.getId())
                 .memberId(info.getMemberId())
+                .gridRowOrder(info.getGridRowOrder())
                 .content(info.getContent())
                 .build();
     }

src/main/java/OneQ/OnSurvey/domain/participation/model/dto/AnswerInsertDto.java

@@ -7,12 +7,15 @@
 
 @Getter @Builder
 public class AnswerInsertDto {
-    List<AnswerInfo> answerInfoList;
+    private Integer section;
+    private List<AnswerInfo> answerInfoList;
 
     @Getter @Builder
     public static class AnswerInfo {
         private Long id;
         private Long memberId;
+        private Integer gridRowOrder;
+        // TODO: 응답값을 List로 받도록 하여, 중복선택 응답 처리를 쉽도록 수정 (스크리닝 응답은 단일 원소의 리스트로 받도록)
         private String content;
 
         public Boolean getBooleanContent() {

src/main/java/OneQ/OnSurvey/domain/participation/model/dto/AnswerStats.java

@@ -5,12 +5,21 @@
 
 @Getter @AllArgsConstructor
 public class AnswerStats {
-    Long questionId;
-    String content;
-    Long count;
+    private Long questionId;
+    private Integer gridRowOrder;
+    private String content;
+    private Long count;
+
+    public AnswerStats(Long questionId, String content, Long count) {
+        this.questionId = questionId;
+        this.gridRowOrder = null;
+        this.content = content;
+        this.count = count;
+    }
 
     public AnswerStats(Long questionId, String content) {
         this.questionId = questionId;
+        this.gridRowOrder = null;
         this.content = content;
         this.count = 1L;
     }

src/main/java/OneQ/OnSurvey/domain/participation/model/dto/ParticipationCompletionDto.java

@@ -0,0 +1,14 @@
+package OneQ.OnSurvey.domain.participation.model.dto;
+
+import lombok.Builder;
+
+import java.util.List;
+
+@Builder
+public record ParticipationCompletionDto(
+    long surveyId,
+    long memberId,
+    long userKey,
+    List<Integer> visitedSectionList
+) {
+}