From 3b0a8160ae021224dc38fa24bbe34c3abee1a18d Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Sat, 28 Feb 2026 23:32:11 +0900
Subject: [PATCH 01/13] =?UTF-8?q?feat:=20=EA=B5=AC=EA=B8=80=ED=8F=BC=20?=
 =?UTF-8?q?=EC=84=A4=EB=AC=B8=20=EB=B3=80=ED=99=98=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 88c5a178c9d319a9ec955d6d4231331ee8e7029a)
---
 .../domain/survey/SurveyErrorCode.java        |   3 +-
 .../formRequest/FormConversionPayload.java    |   9 +
 .../formRequest/FormConversionResponse.java   |  65 +++++
 .../event/FormRequestConversionEvent.java     |   9 +
 .../formRequest/FormCommandService.java       |   7 +
 .../formRequest/FormRequestLambda.java        | 234 ++++++++++++++++++
 6 files changed, 326 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionPayload.java
 create mode 100644 src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
 create mode 100644 src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/event/FormRequestConversionEvent.java
 create mode 100644 src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java

diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/SurveyErrorCode.java b/src/main/java/OneQ/OnSurvey/domain/survey/SurveyErrorCode.java
index dfad10ae..b913e471 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/SurveyErrorCode.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/SurveyErrorCode.java
@@ -29,7 +29,8 @@ public enum SurveyErrorCode implements ApiErrorCode {
     SURVEY_ANSWER_INVALID("SURVEY_ANSWER_400", "설문 답변이 올바르지 않습니다.", HttpStatus.BAD_REQUEST),
     SURVEY_FREE_PROMOTION_NOT_ALLOWED("SURVEY_PROMOTION_400", "무료 설문은 프로모션 지급 대상이 아닙니다.", HttpStatus.BAD_REQUEST),
 
-    FORM_REQUEST_NOT_FOUND("FORM_REQUEST_404", "구글 폼 신청을 찾을 수 없습니다.", HttpStatus.NOT_FOUND);
+    FORM_REQUEST_NOT_FOUND("FORM_REQUEST_404", "구글 폼 신청을 찾을 수 없습니다.", HttpStatus.NOT_FOUND),
+    FORM_CONVERSION_FAILED("FORM_REQUEST_001", "구글 폼 변환에 실패했습니다.", HttpStatus.BAD_REQUEST);
 
     private final String errorCode;
     private final String message;
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionPayload.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionPayload.java
new file mode 100644
index 00000000..c04fd24c
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionPayload.java
@@ -0,0 +1,9 @@
+package OneQ.OnSurvey.domain.survey.model.formRequest;
+
+import java.util.List;
+
+public record FormConversionPayload (
+    Long requestId,
+    List<String> formUrls
+) {
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
new file mode 100644
index 00000000..59f91577
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
@@ -0,0 +1,65 @@
+package OneQ.OnSurvey.domain.survey.model.formRequest;
+
+import java.util.List;
+
+public record FormConversionResponse(
+    int totalCount,
+    int successCount,
+    List<Result> results,
+    String error
+) {
+
+    public record Result(
+        String url,
+        String status, // "SUCCESS", "FAIL"
+
+        // SUCCESS
+        Survey survey,
+        List<UnsupportedQuestion> unsupportedQuestions,
+
+        // FAIL
+        String message
+
+    ) {
+        public boolean isSuccess() {
+            return "SUCCESS".equals(status);
+        }
+    }
+
+    public record Survey(
+        String title,
+        String description,
+        List<Section> sections
+    ) { }
+
+    public record Section(
+        String id,
+        int order,
+        String title,
+        String description,
+        Integer nextSectionOrder,
+        List<Question> questions
+    ) { }
+
+    public record Question(
+        String id,
+        String title,
+        String description,
+        String type,
+        boolean required,
+        List<Option> options
+    ) { }
+
+    public record Option(
+        String text,
+        Integer goToSectionOrder,
+        boolean isOther
+    ) { }
+
+    public record UnsupportedQuestion(
+        int order,
+        String title,
+        String type,
+        String reason
+    ) { }
+}
\ No newline at end of file
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/event/FormRequestConversionEvent.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/event/FormRequestConversionEvent.java
new file mode 100644
index 00000000..674a46b1
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/event/FormRequestConversionEvent.java
@@ -0,0 +1,9 @@
+package OneQ.OnSurvey.domain.survey.model.formRequest.event;
+
+import java.util.List;
+
+public record FormRequestConversionEvent (
+    Long requestId,
+    List<String> formUrls
+) {
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormCommandService.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormCommandService.java
index 5d903505..44ebe670 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormCommandService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormCommandService.java
@@ -1,14 +1,18 @@
 package OneQ.OnSurvey.domain.survey.service.formRequest;
 
 import OneQ.OnSurvey.domain.survey.entity.FormRequest;
+import OneQ.OnSurvey.domain.survey.model.formRequest.event.FormRequestConversionEvent;
 import OneQ.OnSurvey.domain.survey.model.formRequest.FormRequestDto;
 import OneQ.OnSurvey.domain.survey.repository.formRequest.FormRequestRepository;
 import OneQ.OnSurvey.domain.survey.service.query.SurveyQueryService;
 import OneQ.OnSurvey.global.common.exception.CustomException;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 import static OneQ.OnSurvey.domain.survey.SurveyErrorCode.FORM_REQUEST_NOT_FOUND;
 
 @Service
@@ -16,6 +20,7 @@
 @RequiredArgsConstructor
 public class FormCommandService implements FormCreator, FormUpdater {
 
+    private final ApplicationEventPublisher eventPublisher;
     private final FormRequestRepository formRequestRepository;
     private final SurveyQueryService surveyQueryService;
 
@@ -23,6 +28,8 @@ public class FormCommandService implements FormCreator, FormUpdater {
     public Long createFormRequest(FormRequestDto dto) {
         FormRequest request = dto.toEntity();
         FormRequest savedRequest = formRequestRepository.save(request);
+
+        eventPublisher.publishEvent(new FormRequestConversionEvent(savedRequest.getId(), List.of(savedRequest.getFormLink())));
         return savedRequest.getId();
     }
 
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
new file mode 100644
index 00000000..32203946
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
@@ -0,0 +1,234 @@
+package OneQ.OnSurvey.domain.survey.service.formRequest;
+
+import OneQ.OnSurvey.domain.question.model.QuestionType;
+import OneQ.OnSurvey.domain.question.model.dto.OptionDto;
+import OneQ.OnSurvey.domain.question.model.dto.OptionUpsertDto;
+import OneQ.OnSurvey.domain.question.model.dto.QuestionUpsertDto;
+import OneQ.OnSurvey.domain.question.model.dto.SectionDto;
+import OneQ.OnSurvey.domain.question.service.QuestionCommand;
+import OneQ.OnSurvey.domain.survey.SurveyErrorCode;
+import OneQ.OnSurvey.domain.survey.model.formRequest.FormConversionPayload;
+import OneQ.OnSurvey.domain.survey.model.formRequest.FormConversionResponse;
+import OneQ.OnSurvey.domain.survey.model.formRequest.event.FormRequestConversionEvent;
+import OneQ.OnSurvey.domain.survey.model.request.SurveyFormCreateRequest;
+import OneQ.OnSurvey.domain.survey.model.response.SurveyFormResponse;
+import OneQ.OnSurvey.domain.survey.service.command.SurveyCommand;
+import OneQ.OnSurvey.global.common.exception.CustomException;
+import OneQ.OnSurvey.global.infra.discord.notifier.AlertNotifier;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class FormRequestLambda {
+
+    private static final Long SYSTEM_MEMBER_ID = 1L; // 시스템 사용자 ID
+
+    @Value("${external.lambda.survey-conversion.url}")
+    private String lambdaUrl;
+
+    private final AlertNotifier alertNotifier;
+    private final WebClient webClient;
+
+    private final FormUpdater formUpdater;
+    private final SurveyCommand surveyCommand;
+    private final QuestionCommand questionCommand;
+
+    @Async
+    @Transactional
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
+        log.info("[FormRequestLambda] 구글폼 변환 시작 - requestId: {}, formUrl: {}", event.requestId(), event.formUrls());
+
+        FormConversionPayload payload = new FormConversionPayload(event.requestId(), event.formUrls());
+
+        FormConversionResponse response = webClient.post()
+            .uri(lambdaUrl)
+            .contentType(MediaType.APPLICATION_JSON)
+            .bodyValue(payload)
+            .retrieve()
+            .bodyToMono(FormConversionResponse.class)
+            .block();
+
+        if (response == null || response.results() == null) {
+            log.error("[FormRequestLambda] 구글폼 변환 실패 - 응답이 null입니다. requestId: {}", event.requestId());
+            throw new CustomException(SurveyErrorCode.FORM_CONVERSION_FAILED);
+        }
+
+        response.results().forEach(result -> {
+            if (result.isSuccess()) {
+                try {
+                    Long surveyId = createSurveyFromConversionResult(result);
+                    formUpdater.markAsRegistered(event.requestId(), surveyId);
+                    log.info("[FormRequestLambda] 구글폼 변환 성공 - requestId: {}, surveyId: {}", event.requestId(), surveyId);
+
+                    if (result.unsupportedQuestions() != null && !result.unsupportedQuestions().isEmpty()) {
+                        log.warn("[FormRequestLambda] 지원하지 않는 문항 존재 - requestId: {}, count: {}",
+                            event.requestId(), result.unsupportedQuestions().size());
+                    }
+                } catch (Exception e) {
+                    log.error("[FormRequestLambda] 설문 생성 중 오류 발생 - requestId: {}, error: {}",
+                        event.requestId(), e.getMessage(), e);
+                }
+            } else {
+                log.error("[FormRequestLambda] 구글폼 변환 실패 - requestId: {}, url: {}, message: {}",
+                    event.requestId(), result.url(), result.message());
+            }
+        });
+    }
+
+    private Long createSurveyFromConversionResult(FormConversionResponse.Result result) {
+        FormConversionResponse.Survey survey = result.survey();
+
+        // 1. 설문 생성
+        SurveyFormCreateRequest surveyRequest = new SurveyFormCreateRequest(
+            survey.title(),
+            survey.description()
+        );
+        SurveyFormResponse surveyResponse = surveyCommand.upsertSurvey(SYSTEM_MEMBER_ID, null, surveyRequest);
+        Long surveyId = surveyResponse.surveyId();
+
+        log.info("[FormRequestLambda] 설문 생성 완료 - surveyId: {}, title: {}", surveyId, survey.title());
+
+        // 2. 섹션 생성
+        if (survey.sections() != null && !survey.sections().isEmpty()) {
+            List<SectionDto> sectionDtoList = survey.sections().stream()
+                .map(section -> new SectionDto(
+                    null,
+                    section.title(),
+                    section.description(),
+                    section.order(),
+                    section.nextSectionOrder()
+                ))
+                .toList();
+
+            questionCommand.upsertSections(surveyId, sectionDtoList);
+            log.info("[FormRequestLambda] 섹션 생성 완료 - surveyId: {}, sectionCount: {}", surveyId, sectionDtoList.size());
+        }
+
+        // 3. 문항 생성
+        List<QuestionUpsertDto.UpsertInfo> questionUpsertInfoList = new ArrayList<>();
+        AtomicInteger questionOrder = new AtomicInteger(0);
+
+        if (survey.sections() != null) {
+            for (FormConversionResponse.Section section : survey.sections()) {
+                if (section.questions() != null) {
+                    for (FormConversionResponse.Question question : section.questions()) {
+                        QuestionType questionType = mapQuestionType(question.type());
+                        if (questionType == null) {
+                            log.warn("[FormRequestLambda] 지원하지 않는 문항 타입 - type: {}, title: {}",
+                                question.type(), question.title());
+                            continue;
+                        }
+
+                        QuestionUpsertDto.UpsertInfo.UpsertInfoBuilder builder = QuestionUpsertDto.UpsertInfo.builder()
+                            .questionId(null)
+                            .title(question.title())
+                            .description(question.description())
+                            .isRequired(question.required())
+                            .questionType(questionType)
+                            .questionOrder(questionOrder.getAndIncrement())
+                            .section(section.order())
+                            .nextSection(section.nextSectionOrder());
+
+                        // Choice 타입인 경우 옵션 설정
+                        if (questionType == QuestionType.CHOICE && question.options() != null) {
+                            boolean hasOtherOption = question.options().stream()
+                                .anyMatch(FormConversionResponse.Option::isOther);
+                            boolean isSectionDecidable = question.options().stream()
+                                .anyMatch(opt -> opt.goToSectionOrder() != null);
+
+                            builder.maxChoice(1)
+                                .hasNoneOption(false)
+                                .hasCustomInput(hasOtherOption)
+                                .isSectionDecidable(isSectionDecidable)
+                                .options(question.options().stream()
+                                    .map(opt -> OptionDto.builder()
+                                        .content(opt.text())
+                                        .nextSection(opt.goToSectionOrder())
+                                        .build())
+                                    .toList());
+                        }
+
+                        questionUpsertInfoList.add(builder.build());
+                    }
+                }
+            }
+        }
+
+        if (!questionUpsertInfoList.isEmpty()) {
+            QuestionUpsertDto questionUpsertDto = QuestionUpsertDto.builder()
+                .surveyId(surveyId)
+                .upsertInfoList(questionUpsertInfoList)
+                .build();
+
+            QuestionUpsertDto savedQuestions = questionCommand.upsertQuestionList(questionUpsertDto);
+            log.info("[FormRequestLambda] 문항 생성 완료 - surveyId: {}, questionCount: {}",
+                surveyId, savedQuestions.getUpsertInfoList().size());
+
+            // 4. Choice 문항의 옵션 저장
+            List<OptionUpsertDto> optionUpsertDtoList = new ArrayList<>();
+            List<QuestionUpsertDto.UpsertInfo> savedInfoList = savedQuestions.getUpsertInfoList();
+
+            for (int i = 0; i < savedInfoList.size(); i++) {
+                QuestionUpsertDto.UpsertInfo savedInfo = savedInfoList.get(i);
+                QuestionUpsertDto.UpsertInfo originalInfo = questionUpsertInfoList.get(i);
+
+                if (savedInfo.getQuestionType() == QuestionType.CHOICE && originalInfo.getOptions() != null) {
+                    List<OptionDto> options = originalInfo.getOptions().stream()
+                        .map(opt -> OptionDto.builder()
+                            .questionId(savedInfo.getQuestionId())
+                            .content(opt.getContent())
+                            .nextSection(opt.getNextSection())
+                            .build())
+                        .toList();
+
+                    optionUpsertDtoList.add(OptionUpsertDto.builder()
+                        .questionId(savedInfo.getQuestionId())
+                        .optionInfoList(options)
+                        .build());
+                }
+            }
+
+            if (!optionUpsertDtoList.isEmpty()) {
+                questionCommand.upsertChoiceOptionList(optionUpsertDtoList);
+                log.info("[FormRequestLambda] 옵션 생성 완료 - surveyId: {}, choiceQuestionCount: {}",
+                    surveyId, optionUpsertDtoList.size());
+            }
+        }
+
+        return surveyId;
+    }
+
+    private QuestionType mapQuestionType(String googleFormType) {
+        if (googleFormType == null) {
+            return null;
+        }
+
+        return switch (googleFormType.toUpperCase()) {
+            case "MULTIPLE_CHOICE", "CHECKBOX", "DROPDOWN", "LIST" -> QuestionType.CHOICE;
+            case "SHORT_ANSWER", "SHORT" -> QuestionType.SHORT;
+            case "PARAGRAPH", "LONG" -> QuestionType.LONG;
+            case "LINEAR_SCALE", "SCALE" -> QuestionType.RATING;
+            case "DATE" -> QuestionType.DATE;
+            case "NUMBER" -> QuestionType.NUMBER;
+            default -> {
+                log.warn("[FormRequestLambda] 알 수 없는 문항 타입 - type: {}", googleFormType);
+                yield null;
+            }
+        };
+    }
+}

From a17cb0c88e7147c558a6b32481b5940819024f7e Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Sun, 1 Mar 2026 13:03:56 +0900
Subject: [PATCH 02/13] =?UTF-8?q?mod:=20=EA=B5=AC=EA=B8=80=ED=8F=BC=20?=
 =?UTF-8?q?=EB=B3=80=ED=99=98=20=EC=84=B8=EB=B6=80=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit cca511bbd17054a5c5bb79ceabe26f7795cfac44)
---
 .../formRequest/FormConversionPayload.java    |  3 +-
 .../formRequest/FormConversionResponse.java   | 68 +++++++++++++++++++
 .../event/FormRequestConversionEvent.java     |  1 +
 .../formRequest/FormCommandService.java       |  6 +-
 .../formRequest/FormRequestLambda.java        | 58 ++++++++++------
 .../notifier/dto/SurveyConversionAlert.java   |  0
 .../infra/transaction/TransactionHandler.java | 16 +++++
 7 files changed, 128 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/dto/SurveyConversionAlert.java
 create mode 100644 src/main/java/OneQ/OnSurvey/global/infra/transaction/TransactionHandler.java

diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionPayload.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionPayload.java
index c04fd24c..6127c00f 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionPayload.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionPayload.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 public record FormConversionPayload (
-    Long requestId,
-    List<String> formUrls
+    List<String> urls
 ) {
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
index 59f91577..6cd7108b 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
@@ -1,7 +1,69 @@
 package OneQ.OnSurvey.domain.survey.model.formRequest;
 
+//import java.util.List;
+//
+//public record FormConversionResponse(
+//    Long totalCount,
+//    Long successCount,
+//    List<Success> results,
+//
+//    String error
+//) {
+//
+//    public record Success(
+//        String url,
+//        String status,
+//        List<ConvertedSurvey> successSurveyList,
+//        List<Failure> failureQuestionList
+//    ) { }
+//
+//    public record ConvertedSurvey(
+//        String title,
+//        String description,
+//        List<Section> sectionList
+//    ) {
+//
+//        public record Section(
+//            Integer sectionOrder,
+//            String sectionTitle,
+//            String sectionDesc,
+//            Integer nextSectionOrder,
+//            List<Question> questionList
+//        ) { }
+//
+//        public record Question(
+//            String questionTitle,
+//            String questionDesc,
+//            String type,
+//            Boolean isRequired,
+//            List<Option> options
+//        ) {
+//            public record Option(
+//                String optionText,
+//                Integer nextSectionOrder,
+//                Boolean isOther
+//            ) { }
+//        }
+//    }
+//
+//    public record Failure(
+//        Integer order,
+//        String questionTitle,
+//        String type,
+//        String reason
+//    ) { }
+//
+//
+//    public boolean isAllSuccess() {
+//        return totalCount.equals(successCount);
+//    }
+//}
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import java.util.List;
 
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public record FormConversionResponse(
     int totalCount,
     int successCount,
@@ -9,6 +71,7 @@ public record FormConversionResponse(
     String error
 ) {
 
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record Result(
         String url,
         String status, // "SUCCESS", "FAIL"
@@ -26,12 +89,14 @@ public boolean isSuccess() {
         }
     }
 
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record Survey(
         String title,
         String description,
         List<Section> sections
     ) { }
 
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record Section(
         String id,
         int order,
@@ -41,6 +106,7 @@ public record Section(
         List<Question> questions
     ) { }
 
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record Question(
         String id,
         String title,
@@ -50,12 +116,14 @@ public record Question(
         List<Option> options
     ) { }
 
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record Option(
         String text,
         Integer goToSectionOrder,
         boolean isOther
     ) { }
 
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record UnsupportedQuestion(
         int order,
         String title,
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/event/FormRequestConversionEvent.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/event/FormRequestConversionEvent.java
index 674a46b1..692ab6dc 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/event/FormRequestConversionEvent.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/event/FormRequestConversionEvent.java
@@ -4,6 +4,7 @@
 
 public record FormRequestConversionEvent (
     Long requestId,
+    String email,
     List<String> formUrls
 ) {
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormCommandService.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormCommandService.java
index 44ebe670..a910aafe 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormCommandService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormCommandService.java
@@ -29,7 +29,11 @@ public Long createFormRequest(FormRequestDto dto) {
         FormRequest request = dto.toEntity();
         FormRequest savedRequest = formRequestRepository.save(request);
 
-        eventPublisher.publishEvent(new FormRequestConversionEvent(savedRequest.getId(), List.of(savedRequest.getFormLink())));
+        eventPublisher.publishEvent(new FormRequestConversionEvent(
+            savedRequest.getId(),
+            savedRequest.getRequesterEmail(),
+            List.of(savedRequest.getFormLink()))
+        );
         return savedRequest.getId();
     }
 
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
index 32203946..0828ebfa 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
@@ -1,5 +1,7 @@
 package OneQ.OnSurvey.domain.survey.service.formRequest;
 
+import OneQ.OnSurvey.domain.member.dto.MemberSearchResult;
+import OneQ.OnSurvey.domain.member.service.MemberFinder;
 import OneQ.OnSurvey.domain.question.model.QuestionType;
 import OneQ.OnSurvey.domain.question.model.dto.OptionDto;
 import OneQ.OnSurvey.domain.question.model.dto.OptionUpsertDto;
@@ -15,13 +17,13 @@
 import OneQ.OnSurvey.domain.survey.service.command.SurveyCommand;
 import OneQ.OnSurvey.global.common.exception.CustomException;
 import OneQ.OnSurvey.global.infra.discord.notifier.AlertNotifier;
+import OneQ.OnSurvey.global.infra.transaction.TransactionHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -35,25 +37,24 @@
 @RequiredArgsConstructor
 public class FormRequestLambda {
 
-    private static final Long SYSTEM_MEMBER_ID = 1L; // 시스템 사용자 ID
-
     @Value("${external.lambda.survey-conversion.url}")
     private String lambdaUrl;
 
     private final AlertNotifier alertNotifier;
+    private final TransactionHandler transactionHandler;
     private final WebClient webClient;
 
+    private final MemberFinder memberFinder;
     private final FormUpdater formUpdater;
     private final SurveyCommand surveyCommand;
     private final QuestionCommand questionCommand;
 
     @Async
-    @Transactional
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
         log.info("[FormRequestLambda] 구글폼 변환 시작 - requestId: {}, formUrl: {}", event.requestId(), event.formUrls());
 
-        FormConversionPayload payload = new FormConversionPayload(event.requestId(), event.formUrls());
+        FormConversionPayload payload = new FormConversionPayload(event.formUrls());
 
         FormConversionResponse response = webClient.post()
             .uri(lambdaUrl)
@@ -68,17 +69,29 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
             throw new CustomException(SurveyErrorCode.FORM_CONVERSION_FAILED);
         }
 
+        List<MemberSearchResult> memberResultList = memberFinder.searchMembers(event.email(), null, null, null);
+        if (memberResultList.size() != 1) {
+            log.warn("[FormRequestLambda] 설문 생성 실패 - 요청자 이메일로 회원을 찾을 수 없습니다. email: {}", event.email());
+            throw new CustomException(SurveyErrorCode.FORM_REQUEST_NOT_FOUND);
+        }
+        Long memberId = memberResultList.getFirst().id();
+
         response.results().forEach(result -> {
             if (result.isSuccess()) {
                 try {
-                    Long surveyId = createSurveyFromConversionResult(result);
-                    formUpdater.markAsRegistered(event.requestId(), surveyId);
-                    log.info("[FormRequestLambda] 구글폼 변환 성공 - requestId: {}, surveyId: {}", event.requestId(), surveyId);
+                    transactionHandler.runInTransaction(() -> {
+                        Long surveyId = createSurveyFromConversionResult(result, memberId);
+                        formUpdater.markAsRegistered(event.requestId(), surveyId);
 
-                    if (result.unsupportedQuestions() != null && !result.unsupportedQuestions().isEmpty()) {
-                        log.warn("[FormRequestLambda] 지원하지 않는 문항 존재 - requestId: {}, count: {}",
-                            event.requestId(), result.unsupportedQuestions().size());
-                    }
+                        log.info("[FormRequestLambda] 구글폼 변환 성공 - requestId: {}, surveyId: {}", event.requestId(), surveyId);
+
+                        if (result.unsupportedQuestions() != null && !result.unsupportedQuestions().isEmpty()) {
+                            log.warn("[FormRequestLambda] 지원하지 않는 문항 존재 - requestId: {}, count: {}",
+                                event.requestId(), result.unsupportedQuestions().size());
+                        }
+
+                        return null;
+                    });
                 } catch (Exception e) {
                     log.error("[FormRequestLambda] 설문 생성 중 오류 발생 - requestId: {}, error: {}",
                         event.requestId(), e.getMessage(), e);
@@ -90,7 +103,7 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
         });
     }
 
-    private Long createSurveyFromConversionResult(FormConversionResponse.Result result) {
+    private Long createSurveyFromConversionResult(FormConversionResponse.Result result, Long memberId) {
         FormConversionResponse.Survey survey = result.survey();
 
         // 1. 설문 생성
@@ -98,7 +111,7 @@ private Long createSurveyFromConversionResult(FormConversionResponse.Result resu
             survey.title(),
             survey.description()
         );
-        SurveyFormResponse surveyResponse = surveyCommand.upsertSurvey(SYSTEM_MEMBER_ID, null, surveyRequest);
+        SurveyFormResponse surveyResponse = surveyCommand.upsertSurvey(memberId, null, surveyRequest);
         Long surveyId = surveyResponse.surveyId();
 
         log.info("[FormRequestLambda] 설문 생성 완료 - surveyId: {}, title: {}", surveyId, survey.title());
@@ -111,7 +124,7 @@ private Long createSurveyFromConversionResult(FormConversionResponse.Result resu
                     section.title(),
                     section.description(),
                     section.order(),
-                    section.nextSectionOrder()
+                    section.nextSectionOrder() != null ? section.nextSectionOrder() : 0
                 ))
                 .toList();
 
@@ -150,12 +163,18 @@ private Long createSurveyFromConversionResult(FormConversionResponse.Result resu
                                 .anyMatch(FormConversionResponse.Option::isOther);
                             boolean isSectionDecidable = question.options().stream()
                                 .anyMatch(opt -> opt.goToSectionOrder() != null);
+                            int maxChoice = switch (question.type().toUpperCase()) {
+                                case "CHECKBOX" -> question.options().size(); // 체크박스는 여러 개 선택 가능
+                                case "DROPDOWN", "MULTIPLE_CHOICE" -> 1; // 드롭다운, 객관식은 하나만 선택 가능
+                                default -> 1; // 기본적으로 하나만 선택 가능하도록 설정
+                            };
 
-                            builder.maxChoice(1)
+                            builder.maxChoice(maxChoice)
                                 .hasNoneOption(false)
                                 .hasCustomInput(hasOtherOption)
                                 .isSectionDecidable(isSectionDecidable)
                                 .options(question.options().stream()
+                                    .filter(opt -> !opt.isOther())
                                     .map(opt -> OptionDto.builder()
                                         .content(opt.text())
                                         .nextSection(opt.goToSectionOrder())
@@ -219,16 +238,13 @@ private QuestionType mapQuestionType(String googleFormType) {
         }
 
         return switch (googleFormType.toUpperCase()) {
-            case "MULTIPLE_CHOICE", "CHECKBOX", "DROPDOWN", "LIST" -> QuestionType.CHOICE;
+            case "MULTIPLE_CHOICE", "CHECKBOX" -> QuestionType.CHOICE;
             case "SHORT_ANSWER", "SHORT" -> QuestionType.SHORT;
             case "PARAGRAPH", "LONG" -> QuestionType.LONG;
             case "LINEAR_SCALE", "SCALE" -> QuestionType.RATING;
             case "DATE" -> QuestionType.DATE;
             case "NUMBER" -> QuestionType.NUMBER;
-            default -> {
-                log.warn("[FormRequestLambda] 알 수 없는 문항 타입 - type: {}", googleFormType);
-                yield null;
-            }
+            default -> null;
         };
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/dto/SurveyConversionAlert.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/dto/SurveyConversionAlert.java
new file mode 100644
index 00000000..e69de29b
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/transaction/TransactionHandler.java b/src/main/java/OneQ/OnSurvey/global/infra/transaction/TransactionHandler.java
new file mode 100644
index 00000000..7fb8f1ca
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/global/infra/transaction/TransactionHandler.java
@@ -0,0 +1,16 @@
+package OneQ.OnSurvey.global.infra.transaction;
+
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.function.Supplier;
+
+@Component
+public class TransactionHandler {
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public <T> T runInTransaction(Supplier<T> supplier) {
+        return supplier.get();
+    }
+}

From 026d566d24899400b13b32979904f94c7d54be02 Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Sun, 1 Mar 2026 13:17:20 +0900
Subject: [PATCH 03/13] =?UTF-8?q?feat:=20=EA=B5=AC=EA=B8=80=ED=8F=BC=20?=
 =?UTF-8?q?=EB=B3=80=ED=99=98=20=EB=94=94=EC=8A=A4=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 05eb9ecce526881c4885891098adc2b2a4aac04f)
---
 .../formRequest/FormRequestLambda.java        | 49 +++++++++++++-----
 .../discord/DiscordAlarmAsyncFacade.java      |  6 +++
 .../infra/discord/DiscordAlarmService.java    | 48 +++++++++++++++++
 .../infra/discord/notifier/AlertNotifier.java |  2 +
 .../notifier/DiscordAlertNotifier.java        |  6 +++
 .../discord/notifier/NoOpAlertNotifier.java   | 11 ++++
 .../notifier/dto/SurveyConversionAlert.java   | 51 +++++++++++++++++++
 7 files changed, 160 insertions(+), 13 deletions(-)

diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
index 0828ebfa..742ba276 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
@@ -17,6 +17,7 @@
 import OneQ.OnSurvey.domain.survey.service.command.SurveyCommand;
 import OneQ.OnSurvey.global.common.exception.CustomException;
 import OneQ.OnSurvey.global.infra.discord.notifier.AlertNotifier;
+import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveyConversionAlert;
 import OneQ.OnSurvey.global.infra.transaction.TransactionHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -66,9 +67,18 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
 
         if (response == null || response.results() == null) {
             log.error("[FormRequestLambda] 구글폼 변환 실패 - 응답이 null입니다. requestId: {}", event.requestId());
+            alertNotifier.sendSurveyConversionAsync(
+                response == null
+                    ? SurveyConversionAlert.error(1, 0, "변환 요청에 대한 응답이 null입니다.")
+                    : SurveyConversionAlert.error(response.totalCount(), response.successCount(), response.error())
+            );
             throw new CustomException(SurveyErrorCode.FORM_CONVERSION_FAILED);
         }
 
+        SurveyConversionAlert alert = SurveyConversionAlert.success(
+            response.totalCount(), response.successCount(), new ArrayList<>()
+        );
+
         List<MemberSearchResult> memberResultList = memberFinder.searchMembers(event.email(), null, null, null);
         if (memberResultList.size() != 1) {
             log.warn("[FormRequestLambda] 설문 생성 실패 - 요청자 이메일로 회원을 찾을 수 없습니다. email: {}", event.email());
@@ -79,19 +89,30 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
         response.results().forEach(result -> {
             if (result.isSuccess()) {
                 try {
-                    transactionHandler.runInTransaction(() -> {
-                        Long surveyId = createSurveyFromConversionResult(result, memberId);
-                        formUpdater.markAsRegistered(event.requestId(), surveyId);
-
-                        log.info("[FormRequestLambda] 구글폼 변환 성공 - requestId: {}, surveyId: {}", event.requestId(), surveyId);
-
-                        if (result.unsupportedQuestions() != null && !result.unsupportedQuestions().isEmpty()) {
-                            log.warn("[FormRequestLambda] 지원하지 않는 문항 존재 - requestId: {}, count: {}",
-                                event.requestId(), result.unsupportedQuestions().size());
-                        }
-
-                        return null;
-                    });
+                    alert.details().add(
+                        transactionHandler.runInTransaction(() -> {
+                            Long surveyId = createSurveyFromConversionResult(result, memberId);
+                            formUpdater.markAsRegistered(event.requestId(), surveyId);
+
+                            log.info("[FormRequestLambda] 구글폼 변환 성공 - requestId: {}, surveyId: {}", event.requestId(), surveyId);
+
+                            if (result.unsupportedQuestions() != null && !result.unsupportedQuestions().isEmpty()) {
+                                log.warn("[FormRequestLambda] 지원하지 않는 문항 존재 - requestId: {}, count: {}",
+                                    event.requestId(), result.unsupportedQuestions().size());
+                            }
+
+                            return SurveyConversionAlert.SurveyDetails.success(
+                                result.url(),
+                                result.survey().title(),
+                                surveyId,
+                                memberId,
+                                result.survey().sections() != null ? result.survey().sections().stream().mapToInt(s -> s.questions() != null ? s.questions().size() : 0).sum() : 0,
+                                result.unsupportedQuestions() != null ? result.unsupportedQuestions().stream()
+                                    .map(q -> new SurveyConversionAlert.SurveyDetails.UnsupportedQuestion(q.order(), q.type(), q.reason()))
+                                    .toList() : List.of()
+                            );
+                        })
+                    );
                 } catch (Exception e) {
                     log.error("[FormRequestLambda] 설문 생성 중 오류 발생 - requestId: {}, error: {}",
                         event.requestId(), e.getMessage(), e);
@@ -99,8 +120,10 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
             } else {
                 log.error("[FormRequestLambda] 구글폼 변환 실패 - requestId: {}, url: {}, message: {}",
                     event.requestId(), result.url(), result.message());
+                alert.details().add(SurveyConversionAlert.SurveyDetails.failure(result.url(), result.message()));
             }
         });
+        alertNotifier.sendSurveyConversionAsync(alert);
     }
 
     private Long createSurveyFromConversionResult(FormConversionResponse.Result result, Long memberId) {
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmAsyncFacade.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmAsyncFacade.java
index e3988a4a..2411d157 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmAsyncFacade.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmAsyncFacade.java
@@ -1,6 +1,7 @@
 package OneQ.OnSurvey.global.infra.discord;
 
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.PaymentCompletedAlert;
+import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveyConversionAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveySubmittedAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.TossAccessTokenAlert;
 import lombok.RequiredArgsConstructor;
@@ -31,4 +32,9 @@ public void sendSurveySubmittedAsync(SurveySubmittedAlert alert) {
     public void sendTossAccessTokenAsync(TossAccessTokenAlert alert) {
         service.sendTossAccessTokenAlert(alert);
     }
+
+    @Async("discordAlarmExecutor")
+    public void sendSurveyConversionAsync(SurveyConversionAlert alert) {
+        service.sendSurveyConversionAlert(alert);
+    }
 }
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
index 7bc957a7..4bc13a36 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
@@ -3,6 +3,7 @@
 import OneQ.OnSurvey.global.common.util.JwtDecodeUtils;
 import OneQ.OnSurvey.global.infra.discord.client.DiscordWebhookClient;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.PaymentCompletedAlert;
+import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveyConversionAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveySubmittedAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.TossAccessTokenAlert;
 import lombok.RequiredArgsConstructor;
@@ -40,6 +41,9 @@ public class DiscordAlarmService {
     @Value("${discord.test-toss-auth-url:}")
     private String tossAuthTestWebhookUrl;
 
+    @Value("${discord.survey-conversion-alert-url:}")
+    private String surveyConversionWebhookUrl;
+
     public void sendErrorAlert(Throwable e, String method, String path, String query) {
         if (!enabled || errorWebhookUrl == null || errorWebhookUrl.isBlank()) return;
 
@@ -114,6 +118,50 @@ public void sendTossAccessTokenAlert(TossAccessTokenAlert a) {
         post(url, title, desc);
     }
 
+    public void sendSurveyConversionAlert(SurveyConversionAlert alert) {
+        if (!enabled) return;
+
+        String url = (surveyConversionWebhookUrl != null && !surveyConversionWebhookUrl.isBlank())
+                ? surveyConversionWebhookUrl
+                : errorWebhookUrl;
+        if (url == null || url.isBlank()) return;
+
+        String title;
+        StringBuilder desc = new StringBuilder();
+        if (alert.isSuccess()) {
+            title = "📊 설문 변환 성공";
+            desc.append("* 설문 변환 시도: ").append(alert.totalCount()).append('\n')
+                .append("* 설문 변환 성공: ").append(alert.successCount()).append('\n')
+                .append("* 설문 변환 상세 :\n");
+            for (SurveyConversionAlert.SurveyDetails d : alert.details()) {
+
+                desc.append("\u3000[\n")
+                    .append("\u3000 URL: ").append(safe(d.url())).append('\n')
+                    .append("\u3000 tittle: ").append(safe(d.title())).append('\n')
+                    .append("\u3000 surveyId: ").append(d.surveyId()).append('\n')
+                    .append("\u3000 memberId: ").append(d.memberId()).append('\n')
+                    .append("\u3000 questionCount: ").append(d.questionCount()).append('\n');
+                if (!d.unsupportedList().isEmpty()) {
+                    desc.append("  * 변환 실패 질문:\n");
+                    for (SurveyConversionAlert.SurveyDetails.UnsupportedQuestion q : d.unsupportedList()) {
+                        desc.append("    * order: ").append(q.order())
+                            .append(", type: ").append(safe(q.type()))
+                            .append(", reason: ").append(safe(q.reason())).append('\n');
+                    }
+                }
+                desc.append("\u3000 ],\n");
+            }
+        } else {
+            title = "⚠️ 설문 전환 실패";
+            desc.append("* 설문 변환 시도: ").append(alert.totalCount()).append('\n')
+                .append("* 설문 변환 성공: ").append(alert.successCount()).append('\n')
+                .append("* error: ").append(safe(alert.error())).append("`\n");
+        }
+
+        post(url, title, desc.toString());
+    }
+
+
     private String maskKey(String key) {
         return JwtDecodeUtils.maskToken(key);
     }
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/AlertNotifier.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/AlertNotifier.java
index 5970c822..9193bbb8 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/AlertNotifier.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/AlertNotifier.java
@@ -1,6 +1,7 @@
 package OneQ.OnSurvey.global.infra.discord.notifier;
 
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.PaymentCompletedAlert;
+import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveyConversionAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveySubmittedAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.TossAccessTokenAlert;
 
@@ -9,4 +10,5 @@ public interface AlertNotifier {
     void sendPaymentCompletedAsync(PaymentCompletedAlert alert);
     void sendSurveySubmittedAsync(SurveySubmittedAlert alert);
     void sendTossAccessTokenAsync(TossAccessTokenAlert alert);
+    void sendSurveyConversionAsync(SurveyConversionAlert alert);
 }
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/DiscordAlertNotifier.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/DiscordAlertNotifier.java
index b56fb79b..8dee58b8 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/DiscordAlertNotifier.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/DiscordAlertNotifier.java
@@ -2,6 +2,7 @@
 
 import OneQ.OnSurvey.global.infra.discord.DiscordAlarmAsyncFacade;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.PaymentCompletedAlert;
+import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveyConversionAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveySubmittedAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.TossAccessTokenAlert;
 import lombok.RequiredArgsConstructor;
@@ -34,4 +35,9 @@ public void sendSurveySubmittedAsync(SurveySubmittedAlert alert) {
     public void sendTossAccessTokenAsync(TossAccessTokenAlert alert) {
         discord.sendTossAccessTokenAsync(alert);
     }
+
+    @Override
+    public void sendSurveyConversionAsync(SurveyConversionAlert alert) {
+        discord.sendSurveyConversionAsync(alert);
+    }
 }
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/NoOpAlertNotifier.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/NoOpAlertNotifier.java
index a2355186..ecd4b9f1 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/NoOpAlertNotifier.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/NoOpAlertNotifier.java
@@ -1,15 +1,21 @@
 package OneQ.OnSurvey.global.infra.discord.notifier;
 
+import OneQ.OnSurvey.global.infra.discord.DiscordAlarmAsyncFacade;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.PaymentCompletedAlert;
+import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveyConversionAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveySubmittedAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.TossAccessTokenAlert;
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
+@RequiredArgsConstructor
 @Component
 @Profile({"local", "dev"})
 public class NoOpAlertNotifier implements AlertNotifier {
 
+    private final DiscordAlarmAsyncFacade discord;
+
     @Override
     public void sendErrorAlertAsync(Exception e, String method, String uri, String queryString) {}
 
@@ -21,4 +27,9 @@ public void sendSurveySubmittedAsync(SurveySubmittedAlert alert) {}
 
     @Override
     public void sendTossAccessTokenAsync(TossAccessTokenAlert alert) {}
+
+    @Override
+    public void sendSurveyConversionAsync(SurveyConversionAlert alert) {
+        discord.sendSurveyConversionAsync(alert);
+    }
 }
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/dto/SurveyConversionAlert.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/dto/SurveyConversionAlert.java
index e69de29b..4f4f5988 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/dto/SurveyConversionAlert.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/dto/SurveyConversionAlert.java
@@ -0,0 +1,51 @@
+package OneQ.OnSurvey.global.infra.discord.notifier.dto;
+
+import java.util.List;
+
+public record SurveyConversionAlert(
+    int totalCount,
+    int successCount,
+    List<SurveyDetails> details,
+    String error
+) {
+    public boolean isSuccess() {
+        return error == null || error.isBlank();
+    }
+
+    public static SurveyConversionAlert success(int totalCount, int successCount, List<SurveyDetails> details) {
+        return new SurveyConversionAlert(totalCount, successCount, details, null);
+    }
+
+    public static SurveyConversionAlert error(int totalCount, int successCount, String error) {
+        return new SurveyConversionAlert(totalCount, successCount, List.of(), error);
+    }
+
+    public record SurveyDetails(
+        String url,
+
+        // SUCCESS
+        String title,
+        Long surveyId,
+        Long memberId,
+        int questionCount,
+        List<UnsupportedQuestion> unsupportedList,
+
+        // FAIL
+        String message
+    ) {
+
+        public static SurveyDetails success(String url, String title, Long surveyId, Long memberId, int questionCount, List<UnsupportedQuestion> unsupportedList) {
+            return new SurveyDetails(url, title, surveyId, memberId, questionCount, unsupportedList, null);
+        }
+
+        public static SurveyDetails failure(String url, String message) {
+            return new SurveyDetails(url, null, null, null, 0, List.of(), message);
+        }
+
+        public record UnsupportedQuestion(
+            int order,
+            String type,
+            String reason
+        ) { }
+    }
+}

From 24582aabde0d0b96da4f04f82ed971ef7a40724c Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Sun, 1 Mar 2026 13:20:59 +0900
Subject: [PATCH 04/13] =?UTF-8?q?chore:=20=EB=B6=88=ED=95=84=EC=9A=94=20?=
 =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 9dd3a9de5706a04c5e836ad30442a247120c2fe3)
---
 .../formRequest/FormConversionResponse.java   | 59 -------------------
 1 file changed, 59 deletions(-)

diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
index 6cd7108b..832d8a40 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
@@ -1,64 +1,5 @@
 package OneQ.OnSurvey.domain.survey.model.formRequest;
 
-//import java.util.List;
-//
-//public record FormConversionResponse(
-//    Long totalCount,
-//    Long successCount,
-//    List<Success> results,
-//
-//    String error
-//) {
-//
-//    public record Success(
-//        String url,
-//        String status,
-//        List<ConvertedSurvey> successSurveyList,
-//        List<Failure> failureQuestionList
-//    ) { }
-//
-//    public record ConvertedSurvey(
-//        String title,
-//        String description,
-//        List<Section> sectionList
-//    ) {
-//
-//        public record Section(
-//            Integer sectionOrder,
-//            String sectionTitle,
-//            String sectionDesc,
-//            Integer nextSectionOrder,
-//            List<Question> questionList
-//        ) { }
-//
-//        public record Question(
-//            String questionTitle,
-//            String questionDesc,
-//            String type,
-//            Boolean isRequired,
-//            List<Option> options
-//        ) {
-//            public record Option(
-//                String optionText,
-//                Integer nextSectionOrder,
-//                Boolean isOther
-//            ) { }
-//        }
-//    }
-//
-//    public record Failure(
-//        Integer order,
-//        String questionTitle,
-//        String type,
-//        String reason
-//    ) { }
-//
-//
-//    public boolean isAllSuccess() {
-//        return totalCount.equals(successCount);
-//    }
-//}
-
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import java.util.List;

From 1dde5b67d5155f7496d7ca3b793da9dfb55436b1 Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Sun, 1 Mar 2026 15:07:47 +0900
Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=EB=88=84=EB=9D=BD=EB=90=9C=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EB=B0=8F=20=EB=AC=B8=ED=95=AD-=EB=B3=B4=EA=B8=B0=20=EB=A7=A4?=
 =?UTF-8?q?=ED=95=91=EC=9D=B4=20=EC=9E=98=EB=AA=BB=EB=90=A0=20=EA=B0=80?=
 =?UTF-8?q?=EB=8A=A5=EC=84=B1=EC=9D=B4=20=EC=9E=88=EB=8A=94=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit a01ba33d0d7e636c33fcb146cb4c56ce09e38a3a)
---
 .../formRequest/FormRequestLambda.java        | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
index 742ba276..34a91709 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
@@ -31,7 +31,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
 
 @Slf4j
 @Component
@@ -63,6 +65,14 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
             .bodyValue(payload)
             .retrieve()
             .bodyToMono(FormConversionResponse.class)
+            .retry(3)
+            .doOnError(e -> {
+                log.error("[FormRequestLambda] 구글폼 변환 중 오류 발생 - requestId: {}, error: {}", event.requestId(), e.getMessage(), e);
+                alertNotifier.sendSurveyConversionAsync(
+                    SurveyConversionAlert.error(1, 0, "구글폼 변환 중 오류가 발생했습니다. error: " + e.getMessage())
+                );
+                throw new CustomException(SurveyErrorCode.FORM_CONVERSION_FAILED);
+            })
             .block();
 
         if (response == null || response.results() == null) {
@@ -106,7 +116,11 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
                                 result.survey().title(),
                                 surveyId,
                                 memberId,
-                                result.survey().sections() != null ? result.survey().sections().stream().mapToInt(s -> s.questions() != null ? s.questions().size() : 0).sum() : 0,
+                                result.survey().sections() != null
+                                    ? result.survey().sections().stream().mapToInt(s -> s.questions() != null
+                                        ? s.questions().size()
+                                        : 0).sum()
+                                    : 0,
                                 result.unsupportedQuestions() != null ? result.unsupportedQuestions().stream()
                                     .map(q -> new SurveyConversionAlert.SurveyDetails.UnsupportedQuestion(q.order(), q.type(), q.reason()))
                                     .toList() : List.of()
@@ -116,6 +130,7 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
                 } catch (Exception e) {
                     log.error("[FormRequestLambda] 설문 생성 중 오류 발생 - requestId: {}, error: {}",
                         event.requestId(), e.getMessage(), e);
+                    alert.details().add(SurveyConversionAlert.SurveyDetails.failure(result.url(), "설문 생성 중 오류가 발생했습니다."));
                 }
             } else {
                 log.error("[FormRequestLambda] 구글폼 변환 실패 - requestId: {}, url: {}, message: {}",
@@ -178,7 +193,7 @@ private Long createSurveyFromConversionResult(FormConversionResponse.Result resu
                             .questionType(questionType)
                             .questionOrder(questionOrder.getAndIncrement())
                             .section(section.order())
-                            .nextSection(section.nextSectionOrder());
+                            .nextSection(section.nextSectionOrder() != null ? section.nextSectionOrder() : 0);
 
                         // Choice 타입인 경우 옵션 설정
                         if (questionType == QuestionType.CHOICE && question.options() != null) {
@@ -224,10 +239,11 @@ private Long createSurveyFromConversionResult(FormConversionResponse.Result resu
             // 4. Choice 문항의 옵션 저장
             List<OptionUpsertDto> optionUpsertDtoList = new ArrayList<>();
             List<QuestionUpsertDto.UpsertInfo> savedInfoList = savedQuestions.getUpsertInfoList();
+            Map<Integer, QuestionUpsertDto.UpsertInfo> originalInfoMap = questionUpsertInfoList.stream()
+                .collect(java.util.stream.Collectors.toMap(QuestionUpsertDto.UpsertInfo::getQuestionOrder, Function.identity()));
 
-            for (int i = 0; i < savedInfoList.size(); i++) {
-                QuestionUpsertDto.UpsertInfo savedInfo = savedInfoList.get(i);
-                QuestionUpsertDto.UpsertInfo originalInfo = questionUpsertInfoList.get(i);
+            for (QuestionUpsertDto.UpsertInfo savedInfo : savedInfoList) {
+                QuestionUpsertDto.UpsertInfo originalInfo = originalInfoMap.get(savedInfo.getQuestionOrder());
 
                 if (savedInfo.getQuestionType() == QuestionType.CHOICE && originalInfo.getOptions() != null) {
                     List<OptionDto> options = originalInfo.getOptions().stream()

From 61a736ccb791b89475ca1052bff644a5c0896b0f Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Sun, 1 Mar 2026 15:09:17 +0900
Subject: [PATCH 06/13] =?UTF-8?q?fix:=20=EB=A1=9C=EC=BB=AC=20=EB=94=94?=
 =?UTF-8?q?=EC=8A=A4=EC=BD=94=EB=93=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=A1=A4=EB=B0=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 4c7919a6171714e8d98fd2fa3ef3f37aaa705d6d)
---
 .../global/infra/discord/DiscordAlarmService.java        | 2 +-
 .../global/infra/discord/notifier/NoOpAlertNotifier.java | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
index 4bc13a36..34e94e98 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
@@ -155,7 +155,7 @@ public void sendSurveyConversionAlert(SurveyConversionAlert alert) {
             title = "⚠️ 설문 전환 실패";
             desc.append("* 설문 변환 시도: ").append(alert.totalCount()).append('\n')
                 .append("* 설문 변환 성공: ").append(alert.successCount()).append('\n')
-                .append("* error: ").append(safe(alert.error())).append("`\n");
+                .append("* error: ").append(safe(alert.error())).append("\n");
         }
 
         post(url, title, desc.toString());
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/NoOpAlertNotifier.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/NoOpAlertNotifier.java
index ecd4b9f1..51a462ce 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/NoOpAlertNotifier.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/discord/notifier/NoOpAlertNotifier.java
@@ -1,21 +1,16 @@
 package OneQ.OnSurvey.global.infra.discord.notifier;
 
-import OneQ.OnSurvey.global.infra.discord.DiscordAlarmAsyncFacade;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.PaymentCompletedAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveyConversionAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.SurveySubmittedAlert;
 import OneQ.OnSurvey.global.infra.discord.notifier.dto.TossAccessTokenAlert;
-import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
-@RequiredArgsConstructor
 @Component
 @Profile({"local", "dev"})
 public class NoOpAlertNotifier implements AlertNotifier {
 
-    private final DiscordAlarmAsyncFacade discord;
-
     @Override
     public void sendErrorAlertAsync(Exception e, String method, String uri, String queryString) {}
 
@@ -29,7 +24,5 @@ public void sendSurveySubmittedAsync(SurveySubmittedAlert alert) {}
     public void sendTossAccessTokenAsync(TossAccessTokenAlert alert) {}
 
     @Override
-    public void sendSurveyConversionAsync(SurveyConversionAlert alert) {
-        discord.sendSurveyConversionAsync(alert);
-    }
+    public void sendSurveyConversionAsync(SurveyConversionAlert alert) {}
 }

From debac1db59a7396c83d2acaff22339f30a1b710f Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Sun, 1 Mar 2026 15:10:40 +0900
Subject: [PATCH 07/13] =?UTF-8?q?chore:=20=EB=94=94=EC=8A=A4=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=95=8C=EB=A6=BC=20=EC=98=A4=ED=83=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EA=B5=AC=EA=B8=80=ED=8F=BC=20=EB=B3=80?=
 =?UTF-8?q?=ED=99=98=EC=9A=94=EC=B2=AD=20=ED=83=80=EC=9E=84=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b6dccc4e0695d001ed9f66f2bc476118fa1bcb83)
---
 .../domain/survey/service/formRequest/FormRequestLambda.java  | 4 ++++
 .../OnSurvey/global/infra/discord/DiscordAlarmService.java    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
index 34a91709..02cdf4eb 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
@@ -29,6 +29,7 @@
 import org.springframework.transaction.event.TransactionalEventListener;
 import org.springframework.web.reactive.function.client.WebClient;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,8 @@
 @RequiredArgsConstructor
 public class FormRequestLambda {
 
+    private static final long FORM_CONVERSION_REQUEST_TIMEOUT = 20L;
+
     @Value("${external.lambda.survey-conversion.url}")
     private String lambdaUrl;
 
@@ -66,6 +69,7 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
             .retrieve()
             .bodyToMono(FormConversionResponse.class)
             .retry(3)
+            .timeout(Duration.ofSeconds(FORM_CONVERSION_REQUEST_TIMEOUT))
             .doOnError(e -> {
                 log.error("[FormRequestLambda] 구글폼 변환 중 오류 발생 - requestId: {}, error: {}", event.requestId(), e.getMessage(), e);
                 alertNotifier.sendSurveyConversionAsync(
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
index 34e94e98..14198ad6 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
@@ -137,7 +137,7 @@ public void sendSurveyConversionAlert(SurveyConversionAlert alert) {
 
                 desc.append("\u3000[\n")
                     .append("\u3000 URL: ").append(safe(d.url())).append('\n')
-                    .append("\u3000 tittle: ").append(safe(d.title())).append('\n')
+                    .append("\u3000 title: ").append(safe(d.title())).append('\n')
                     .append("\u3000 surveyId: ").append(d.surveyId()).append('\n')
                     .append("\u3000 memberId: ").append(d.memberId()).append('\n')
                     .append("\u3000 questionCount: ").append(d.questionCount()).append('\n');

From 80c13863605c7196b1c9d5693ec203132b3ac6b5 Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Sun, 1 Mar 2026 16:22:55 +0900
Subject: [PATCH 08/13] =?UTF-8?q?feat:=20=EB=B0=B1=EC=98=A4=ED=94=BC?=
 =?UTF-8?q?=EC=8A=A4=20=EC=84=A4=EB=AC=B8=EB=B3=80=ED=99=98=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 6e375653f874f00f824570eef32d6864d23f7065)
---
 .../static/bo/scripts/form-request.js         | 56 +++++++++++++++++++
 .../resources/templates/bo/form-request.html  | 52 +++++++++++++++++
 2 files changed, 108 insertions(+)

diff --git a/src/main/resources/static/bo/scripts/form-request.js b/src/main/resources/static/bo/scripts/form-request.js
index a8347bfa..58bac1de 100644
--- a/src/main/resources/static/bo/scripts/form-request.js
+++ b/src/main/resources/static/bo/scripts/form-request.js
@@ -16,6 +16,62 @@ function resetFilters() {
     loadFormRequests();
 }
 
+// ========== 폼 변환 요청 제출 관련 함수 ==========
+async function submitFormRequest() {
+    const formLink = document.getElementById('newFormLink').value.trim();
+    const requesterEmail = document.getElementById('newRequesterEmail').value.trim();
+    const questionCount = document.getElementById('newQuestionCount').value;
+    const targetResponseCount = document.getElementById('newTargetResponseCount').value;
+    const deadline = document.getElementById('newDeadline').value;
+    const price = document.getElementById('newPrice').value;
+
+    // 필수 값 체크
+    if (!formLink) {
+        showToast('폼 링크를 입력해주세요.', 'error');
+        document.getElementById('newFormLink').focus();
+        return;
+    }
+
+    // URL 형식 검증
+    try {
+        new URL(formLink);
+    } catch (e) {
+        showToast('올바른 URL 형식을 입력해주세요.', 'error');
+        document.getElementById('newFormLink').focus();
+        return;
+    }
+
+    const requestData = {
+        formLink: formLink,
+        requesterEmail: requesterEmail || null,
+        questionCount: questionCount ? parseInt(questionCount) : null,
+        targetResponseCount: targetResponseCount ? parseInt(targetResponseCount) : null,
+        deadline: deadline || null,
+        price: price ? parseInt(price) : null
+    };
+
+    try {
+        const response = await apiCall('/form-requests', 'POST', requestData);
+        if (response !== undefined) {
+            showToast('폼 변환 요청이 등록되었습니다.', 'success');
+            clearFormRequestInputs();
+            loadFormRequests(); // 목록 새로고침
+        }
+    } catch (error) {
+        console.error('폼 변환 요청 실패:', error);
+    }
+}
+
+// 폼 변환 요청 입력 필드 초기화
+function clearFormRequestInputs() {
+    document.getElementById('newFormLink').value = '';
+    document.getElementById('newRequesterEmail').value = '';
+    document.getElementById('newQuestionCount').value = '';
+    document.getElementById('newTargetResponseCount').value = '';
+    document.getElementById('newDeadline').value = '';
+    document.getElementById('newPrice').value = '';
+}
+
 // ========== 설문 변환 요청 관련 함수 ==========
 async function loadFormRequests(page = 0) {
     try {
diff --git a/src/main/resources/templates/bo/form-request.html b/src/main/resources/templates/bo/form-request.html
index cf547025..a9fa3b5e 100644
--- a/src/main/resources/templates/bo/form-request.html
+++ b/src/main/resources/templates/bo/form-request.html
@@ -14,6 +14,58 @@
 <body class="bg-slate-100 h-screen overflow-y-auto p-6">
 
 <div class="space-y-6 pb-6">
+    <!-- 폼 변환 요청 입력 영역 -->
+    <div class="bg-white rounded-xl shadow-sm border border-slate-200 p-4">
+        <div class="flex items-center gap-2 mb-4">
+            <i class="fas fa-file-import text-indigo-600"></i>
+            <h2 class="text-lg font-bold text-slate-700">폼 변환 요청</h2>
+        </div>
+        <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+            <!-- 폼 링크 (필수) -->
+            <div class="lg:col-span-2">
+                <label class="block text-xs font-bold text-slate-500 mb-1">폼 링크 <span class="text-red-500">*</span></label>
+                <input type="url" id="newFormLink" placeholder="https://docs.google.com/forms/d/e/..."
+                       class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
+            </div>
+            <!-- 신청자 이메일 -->
+            <div>
+                <label class="block text-xs font-bold text-slate-500 mb-1">신청자 이메일</label>
+                <input type="email" id="newRequesterEmail" placeholder="example@email.com"
+                       class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
+            </div>
+            <!-- 질문 수 -->
+            <div>
+                <label class="block text-xs font-bold text-slate-500 mb-1">질문 수</label>
+                <input type="number" id="newQuestionCount" placeholder="예: 15" min="1"
+                       class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
+            </div>
+            <!-- 목표 응답 수 -->
+            <div>
+                <label class="block text-xs font-bold text-slate-500 mb-1">목표 응답 수</label>
+                <input type="number" id="newTargetResponseCount" placeholder="예: 100" min="1"
+                       class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
+            </div>
+            <!-- 마감일 -->
+            <div>
+                <label class="block text-xs font-bold text-slate-500 mb-1">마감일</label>
+                <input type="date" id="newDeadline"
+                       class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
+            </div>
+            <!-- 가격 -->
+            <div>
+                <label class="block text-xs font-bold text-slate-500 mb-1">가격 (원)</label>
+                <input type="number" id="newPrice" placeholder="예: 9900" min="0"
+                       class="w-full border border-slate-300 rounded px-3 py-2 text-sm focus:border-indigo-500 outline-none">
+            </div>
+            <!-- 버튼 영역 -->
+            <div class="flex items-end">
+                <button onclick="submitFormRequest()" class="w-full px-4 py-2 bg-green-600 text-white rounded text-sm font-bold hover:bg-green-700 transition">
+                    <i class="fas fa-paper-plane mr-1"></i>변환 요청
+                </button>
+            </div>
+        </div>
+    </div>
+
     <!-- 검색 및 필터 영역 -->
     <div class="bg-white rounded-xl shadow-sm border border-slate-200 p-4">
         <div class="flex flex-wrap gap-4 items-end">

From 1b7e03b3d6adc5ae0fd275a7f0e78123fd28bbb0 Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Wed, 4 Mar 2026 10:49:49 +0900
Subject: [PATCH 09/13] =?UTF-8?q?feat:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?=
 =?UTF-8?q?=EB=AC=B8=ED=95=AD=20=EB=B0=8F=20=EB=AC=B8=ED=95=AD/=EB=B3=B4?=
 =?UTF-8?q?=EA=B8=B0=20=EB=82=B4=20=EC=9D=B8=EB=9D=BC=EC=9D=B8=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20URL=20=ED=95=84=EB=93=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit df26d15b344cfed3cbd423562e5850a8206be78c)
---
 .../domain/question/entity/Question.java      |  7 ---
 .../question/entity/question/Choice.java      |  5 +-
 .../question/entity/question/DateAnswer.java  |  5 +-
 .../question/entity/question/Image.java       | 50 +++++++++++++++++++
 .../question/entity/question/LongAnswer.java  |  5 +-
 .../domain/question/entity/question/NPS.java  |  5 +-
 .../entity/question/NumberAnswer.java         |  5 +-
 .../question/entity/question/Rating.java      |  5 +-
 .../question/entity/question/ShortAnswer.java |  5 +-
 .../domain/question/model/QuestionType.java   |  2 +
 .../question/model/dto/QuestionUpsertDto.java |  4 --
 .../question/model/dto/type/ChoiceDto.java    |  1 -
 .../question/model/dto/type/DateDto.java      |  1 -
 .../model/dto/type/DefaultQuestionDto.java    |  5 --
 .../question/model/dto/type/RatingDto.java    |  1 -
 .../service/QuestionCommandService.java       | 38 +++++++-------
 .../formRequest/FormConversionResponse.java   |  6 ++-
 .../formRequest/FormRequestLambda.java        | 18 ++++---
 .../global/common/config/WebClientConfig.java | 15 ++++++
 19 files changed, 111 insertions(+), 72 deletions(-)
 create mode 100644 src/main/java/OneQ/OnSurvey/domain/question/entity/question/Image.java

diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/Question.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/Question.java
index b7b43d0b..7cc148a3 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/entity/Question.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/Question.java
@@ -44,11 +44,6 @@ public abstract class Question extends BaseEntity {
     @Builder.Default
     protected Integer section = 1;
 
-    /* 임시 필드 */
-    @Column(name = "NEXT_SECTION")
-    protected Integer nextSection;
-    /* 섹션 엔티티 분리 후 제거 예정 */
-
     @Column(name = "image_url", columnDefinition = "TEXT")
     protected String imageUrl;
 
@@ -58,7 +53,6 @@ public void updateQuestion(
         Boolean isRequired,
         Integer order,
         Integer section,
-        Integer nextSection,
         String imageUrl
     ) {
         this.title = title;
@@ -66,7 +60,6 @@ public void updateQuestion(
         this.isRequired = isRequired;
         this.order = order;
         this.section = (section != null) ? section : this.section;
-        this.nextSection = nextSection;
         this.imageUrl = imageUrl;
     }
 
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Choice.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Choice.java
index 4f712ffc..365aec30 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Choice.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Choice.java
@@ -44,7 +44,6 @@ public static Choice of(
         String description,
         Boolean isRequired,
         Integer section,
-        Integer nextSection,
         Integer maxChoice,
         Boolean hasNoneOption,
         Boolean hasCustomInput,
@@ -59,7 +58,6 @@ public static Choice of(
             .description(description)
             .isRequired(isRequired)
             .section(section)
-            .nextSection(nextSection)
             .maxChoice(maxChoice)
             .hasNoneOption(hasNoneOption)
             .hasCustomInput(hasCustomInput)
@@ -75,14 +73,13 @@ public void updateQuestion(
         Boolean isRequired,
         Integer order,
         Integer section,
-        Integer nextSection,
         Integer maxChoice,
         Boolean hasNoneOption,
         Boolean hasCustomInput,
         Boolean isSectionDecidable,
         String imageUrl
     ) {
-        super.updateQuestion(title, description, isRequired, order, section, nextSection, imageUrl);
+        super.updateQuestion(title, description, isRequired, order, section, imageUrl);
         this.maxChoice = maxChoice;
         this.hasNoneOption = (hasNoneOption != null) ? hasNoneOption : this.hasNoneOption;
         this.hasCustomInput = (hasCustomInput != null) ? hasCustomInput : this.hasCustomInput;
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/DateAnswer.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/DateAnswer.java
index 75e08fc5..4c8e2efc 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/DateAnswer.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/DateAnswer.java
@@ -30,7 +30,6 @@ public static DateAnswer of(
         String description,
         Boolean isRequired,
         Integer section,
-        Integer nextSection,
         LocalDateTime defaultDate,
         QuestionType type,
         String imageUrl
@@ -42,7 +41,6 @@ public static DateAnswer of(
             .description(description)
             .isRequired(isRequired)
             .section(section)
-            .nextSection(nextSection)
             .defaultDate(defaultDate)
             .type(type.name())
             .imageUrl(imageUrl)
@@ -55,11 +53,10 @@ public void updateQuestion(
         Boolean isRequired,
         Integer order,
         Integer section,
-        Integer nextSection,
         LocalDateTime defaultDate,
         String imageUrl
     ) {
-        super.updateQuestion(title, description, isRequired, order, section, nextSection, imageUrl);
+        super.updateQuestion(title, description, isRequired, order, section, imageUrl);
         this.defaultDate = defaultDate;
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Image.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Image.java
new file mode 100644
index 00000000..a4b7a1d5
--- /dev/null
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Image.java
@@ -0,0 +1,50 @@
+package OneQ.OnSurvey.domain.question.entity.question;
+
+import OneQ.OnSurvey.domain.question.entity.Question;
+import OneQ.OnSurvey.domain.question.model.QuestionType;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Getter @SuperBuilder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+@DiscriminatorValue(value = QuestionType.Values.IMAGE)
+public class Image extends Question {
+
+    public static Image of(
+        Long surveyId,
+        Integer order,
+        String title,
+        String description,
+        Boolean isRequired,
+        Integer section,
+        QuestionType type,
+        String imageUrl
+    ) {
+        return Image.builder()
+            .surveyId(surveyId)
+            .order(order)
+            .title(title)
+            .description(description)
+            .isRequired(isRequired)
+            .type(type.name())
+            .section(section)
+            .imageUrl(imageUrl)
+            .build();
+    }
+
+    public void updateQuestion(
+        String title,
+        String description,
+        Boolean isRequired,
+        Integer order,
+        Integer section,
+        String imageUrl
+    ) {
+        super.updateQuestion(title, description, isRequired, order, section, imageUrl);
+    }
+}
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/LongAnswer.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/LongAnswer.java
index d3d6a995..8becc3a6 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/LongAnswer.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/LongAnswer.java
@@ -22,7 +22,6 @@ public static LongAnswer of(
         String description,
         Boolean isRequired,
         Integer section,
-        Integer nextSection,
         QuestionType type,
         String imageUrl
     ) {
@@ -34,7 +33,6 @@ public static LongAnswer of(
             .isRequired(isRequired)
             .type(type.name())
             .section(section)
-            .nextSection(nextSection)
             .imageUrl(imageUrl)
             .build();
     }
@@ -45,9 +43,8 @@ public void updateQuestion(
         Boolean isRequired,
         Integer order,
         Integer section,
-        Integer nextSection,
         String imageUrl
     ) {
-        super.updateQuestion(title, description, isRequired, order, section, nextSection, imageUrl);
+        super.updateQuestion(title, description, isRequired, order, section, imageUrl);
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/NPS.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/NPS.java
index f399aff8..6bd8a7f1 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/NPS.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/NPS.java
@@ -22,7 +22,6 @@ public static NPS of(
         String description,
         Boolean isRequired,
         Integer section,
-        Integer nextSection,
         QuestionType type,
         String imageUrl
     ) {
@@ -34,7 +33,6 @@ public static NPS of(
             .isRequired(isRequired)
             .type(type.name())
             .section(section)
-            .nextSection(nextSection)
             .imageUrl(imageUrl)
             .build();
     }
@@ -45,9 +43,8 @@ public void updateQuestion(
         Boolean isRequired,
         Integer order,
         Integer section,
-        Integer nextSection,
         String imageUrl
     ) {
-        super.updateQuestion(title, description, isRequired, order, section, nextSection, imageUrl);
+        super.updateQuestion(title, description, isRequired, order, section, imageUrl);
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/NumberAnswer.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/NumberAnswer.java
index aad2bd4f..383bc169 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/NumberAnswer.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/NumberAnswer.java
@@ -22,7 +22,6 @@ public static NumberAnswer of(
         String description,
         Boolean isRequired,
         Integer section,
-        Integer nextSection,
         QuestionType type,
         String imageUrl
     ) {
@@ -34,7 +33,6 @@ public static NumberAnswer of(
             .isRequired(isRequired)
             .type(type.name())
             .section(section)
-            .nextSection(nextSection)
             .imageUrl(imageUrl)
             .build();
     }
@@ -45,9 +43,8 @@ public void updateQuestion(
         Boolean isRequired,
         Integer order,
         Integer section,
-        Integer nextSection,
         String imageUrl
     ) {
-        super.updateQuestion(title, description, isRequired, order, section, nextSection, imageUrl);
+        super.updateQuestion(title, description, isRequired, order, section, imageUrl);
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Rating.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Rating.java
index 0077b426..d887f2c2 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Rating.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/Rating.java
@@ -32,7 +32,6 @@ public static Rating of(
         String description,
         Boolean isRequired,
         Integer section,
-        Integer nextSection,
         String maxValue,
         String minValue,
         Integer rate,
@@ -46,7 +45,6 @@ public static Rating of(
             .description(description)
             .isRequired(isRequired)
             .section(section)
-            .nextSection(nextSection)
             .maxValue(maxValue)
             .minValue(minValue)
             .rate(rate)
@@ -61,13 +59,12 @@ public void updateQuestion(
         Boolean isRequired,
         Integer order,
         Integer section,
-        Integer nextSection,
         String maxValue,
         String minValue,
         Integer rate,
         String imageUrl
     ) {
-        super.updateQuestion(title, description, isRequired, order, section, nextSection, imageUrl);
+        super.updateQuestion(title, description, isRequired, order, section, imageUrl);
         this.maxValue = maxValue;
         this.minValue = minValue;
         this.rate = rate;
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/ShortAnswer.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/ShortAnswer.java
index cb36f754..d8e920b9 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/entity/question/ShortAnswer.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/question/ShortAnswer.java
@@ -22,7 +22,6 @@ public static ShortAnswer of(
         String description,
         Boolean isRequired,
         Integer section,
-        Integer nextSection,
         QuestionType type,
         String imageUrl
     ) {
@@ -33,7 +32,6 @@ public static ShortAnswer of(
             .description(description)
             .isRequired(isRequired)
             .section(section)
-            .nextSection(nextSection)
             .type(type.name())
             .imageUrl(imageUrl)
             .build();
@@ -45,9 +43,8 @@ public void updateQuestion(
         Boolean isRequired,
         Integer order,
         Integer section,
-        Integer nextSection,
         String imageUrl
     ) {
-        super.updateQuestion(title, description, isRequired, order, section, nextSection, imageUrl);
+        super.updateQuestion(title, description, isRequired, order, section, imageUrl);
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/QuestionType.java b/src/main/java/OneQ/OnSurvey/domain/question/model/QuestionType.java
index 37ab360b..c144f852 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/QuestionType.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/QuestionType.java
@@ -13,6 +13,7 @@ public enum QuestionType {
     LONG("장문형", Values.LONG),
     NUMBER("숫자형", Values.NUMBER),
     DATE("날짜형", Values.DATE),
+    IMAGE("이미지형", Values.IMAGE),
     TEXT("주관식", Values.TEXT);
     private final String description;
     private final String value;
@@ -26,6 +27,7 @@ public static class Values {
         public static final String NUMBER = "NUMBER";
         public static final String DATE = "DATE";
         public static final String TEXT = "TEXT";
+        public static final String IMAGE = "IMAGE";
     }
 
     public boolean isText() {
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/QuestionUpsertDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/QuestionUpsertDto.java
index 3abfcd2b..c8f3c701 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/QuestionUpsertDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/QuestionUpsertDto.java
@@ -27,10 +27,6 @@ public static class UpsertInfo {
         QuestionType questionType;
         Integer questionOrder;
         Integer section;
-
-        // 임시 필드
-        Integer nextSection;
-
         String imageUrl;
 
         // Choice 필드
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/ChoiceDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/ChoiceDto.java
index 60a20a98..9f05a1cb 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/ChoiceDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/ChoiceDto.java
@@ -34,7 +34,6 @@ public static ChoiceDto fromEntity(Choice choice) {
             .isRequired(choice.getIsRequired())
             .questionOrder(choice.getOrder())
             .section(choice.getSection() != null ? choice.getSection() : 1)
-            .nextSection(choice.getNextSection())
             .imageUrl(choice.getImageUrl())
             .build();
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DateDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DateDto.java
index 41313e89..ea5ccb05 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DateDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DateDto.java
@@ -25,7 +25,6 @@ public static DateDto fromEntity(DateAnswer date) {
             .isRequired(date.getIsRequired())
             .questionOrder(date.getOrder())
             .section(date.getSection() != null ? date.getSection() : 1)
-            .nextSection(date.getNextSection())
             .imageUrl(date.getImageUrl())
             .build();
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DefaultQuestionDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DefaultQuestionDto.java
index af78a370..8fbe3ca2 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DefaultQuestionDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/DefaultQuestionDto.java
@@ -42,10 +42,6 @@ public class DefaultQuestionDto {
     private Boolean isRequired;
     private Integer questionOrder;
     private Integer section;
-
-    // 임시 필드
-    private Integer nextSection;
-
     private String imageUrl;
 
     public static DefaultQuestionDto fromEntity(Question question) {
@@ -58,7 +54,6 @@ public static DefaultQuestionDto fromEntity(Question question) {
             .isRequired(question.getIsRequired())
             .questionOrder(question.getOrder())
             .section(question.getSection() != null ? question.getSection() : 1)
-            .nextSection(question.getNextSection())
             .imageUrl(question.getImageUrl())
             .build();
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/RatingDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/RatingDto.java
index 720c7d2f..2d7e4cc0 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/RatingDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/type/RatingDto.java
@@ -27,7 +27,6 @@ public static RatingDto fromEntity(Rating rating) {
             .isRequired(rating.getIsRequired())
             .questionOrder(rating.getOrder())
             .section(rating.getSection() != null ? rating.getSection() : 1)
-            .nextSection(rating.getNextSection())
             .imageUrl(rating.getImageUrl())
             .build();
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommandService.java b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommandService.java
index d0843fe0..ded5dd8b 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommandService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/service/QuestionCommandService.java
@@ -132,7 +132,6 @@ private void updateQuestion(QuestionUpsertDto.UpsertInfo upsertInfo, Question qu
                 upsertInfo.getIsRequired(),
                 upsertInfo.getQuestionOrder(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 upsertInfo.getMaxChoice(),
                 upsertInfo.getHasNoneOption(),
                 upsertInfo.getHasCustomInput(),
@@ -146,7 +145,6 @@ private void updateQuestion(QuestionUpsertDto.UpsertInfo upsertInfo, Question qu
                 upsertInfo.getIsRequired(),
                 upsertInfo.getQuestionOrder(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 upsertInfo.getMaxValue(),
                 upsertInfo.getMinValue(),
                 upsertInfo.getRate(),
@@ -159,7 +157,6 @@ private void updateQuestion(QuestionUpsertDto.UpsertInfo upsertInfo, Question qu
                 upsertInfo.getIsRequired(),
                 upsertInfo.getQuestionOrder(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 upsertInfo.getImageUrl()
             );
         } else if (question instanceof DateAnswer date) {
@@ -169,7 +166,6 @@ private void updateQuestion(QuestionUpsertDto.UpsertInfo upsertInfo, Question qu
                 upsertInfo.getIsRequired(),
                 upsertInfo.getQuestionOrder(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 upsertInfo.getDefaultDate(),
                 upsertInfo.getImageUrl()
             );
@@ -180,7 +176,6 @@ private void updateQuestion(QuestionUpsertDto.UpsertInfo upsertInfo, Question qu
                 upsertInfo.getIsRequired(),
                 upsertInfo.getQuestionOrder(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 upsertInfo.getImageUrl()
             );
         } else if (question instanceof LongAnswer longAnswer) {
@@ -190,7 +185,6 @@ private void updateQuestion(QuestionUpsertDto.UpsertInfo upsertInfo, Question qu
                 upsertInfo.getIsRequired(),
                 upsertInfo.getQuestionOrder(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 upsertInfo.getImageUrl()
             );
         } else if (question instanceof NumberAnswer numberAnswer) {
@@ -200,7 +194,15 @@ private void updateQuestion(QuestionUpsertDto.UpsertInfo upsertInfo, Question qu
                 upsertInfo.getIsRequired(),
                 upsertInfo.getQuestionOrder(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
+                upsertInfo.getImageUrl()
+            );
+        } else if (question instanceof Image image) {
+            image.updateQuestion(
+                upsertInfo.getTitle(),
+                upsertInfo.getDescription(),
+                upsertInfo.getIsRequired(),
+                upsertInfo.getQuestionOrder(),
+                upsertInfo.getSection(),
                 upsertInfo.getImageUrl()
             );
         }
@@ -217,7 +219,6 @@ private Question createQuestion(Long surveyId, QuestionUpsertDto.UpsertInfo upse
                 upsertInfo.getDescription(),
                 upsertInfo.getIsRequired(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 upsertInfo.getDefaultDate(),
                 type,
                 upsertInfo.getImageUrl()
@@ -230,7 +231,6 @@ private Question createQuestion(Long surveyId, QuestionUpsertDto.UpsertInfo upse
                 upsertInfo.getDescription(),
                 upsertInfo.getIsRequired(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 type,
                 upsertInfo.getImageUrl()
             );
@@ -242,7 +242,6 @@ private Question createQuestion(Long surveyId, QuestionUpsertDto.UpsertInfo upse
                 upsertInfo.getDescription(),
                 upsertInfo.getIsRequired(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 upsertInfo.getMaxValue(),
                 upsertInfo.getMinValue(),
                 upsertInfo.getRate(),
@@ -257,7 +256,6 @@ private Question createQuestion(Long surveyId, QuestionUpsertDto.UpsertInfo upse
                 upsertInfo.getDescription(),
                 upsertInfo.getIsRequired(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 upsertInfo.getMaxChoice(),
                 upsertInfo.getHasNoneOption(),
                 upsertInfo.getHasCustomInput(),
@@ -273,7 +271,6 @@ private Question createQuestion(Long surveyId, QuestionUpsertDto.UpsertInfo upse
                 upsertInfo.getDescription(),
                 upsertInfo.getIsRequired(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 type,
                 upsertInfo.getImageUrl()
             );
@@ -285,7 +282,6 @@ private Question createQuestion(Long surveyId, QuestionUpsertDto.UpsertInfo upse
                 upsertInfo.getDescription(),
                 upsertInfo.getIsRequired(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
                 type,
                 upsertInfo.getImageUrl()
             );
@@ -297,7 +293,17 @@ private Question createQuestion(Long surveyId, QuestionUpsertDto.UpsertInfo upse
                 upsertInfo.getDescription(),
                 upsertInfo.getIsRequired(),
                 upsertInfo.getSection(),
-                upsertInfo.getNextSection(),
+                type,
+                upsertInfo.getImageUrl()
+            );
+        } else if (QuestionType.IMAGE.equals(type)) {
+            return Image.of(
+                surveyId,
+                upsertInfo.getQuestionOrder(),
+                upsertInfo.getTitle(),
+                upsertInfo.getDescription(),
+                upsertInfo.getIsRequired(),
+                upsertInfo.getSection(),
                 type,
                 upsertInfo.getImageUrl()
             );
@@ -416,13 +422,11 @@ public List<SectionDto> upsertSections(Long surveyId, List<SectionDto> sectionDt
                     .description(sectionDto.description())
                     .sectionOrder(sectionDto.order())
                     .nextSection(sectionDto.nextSection())
-                    .imageUrl(sectionDto.imageUrl())
                     .build();
             } else {
                 Section section = orderSectionMap.get(sectionDto.order());
                 section.updateSection(
-                    sectionDto.title(), sectionDto.description(), sectionDto.order(), sectionDto.nextSection(),
-                    sectionDto.imageUrl()
+                    sectionDto.title(), sectionDto.description(), sectionDto.order(), sectionDto.nextSection()
                 );
                 orderSectionMap.remove(sectionDto.order());
                 return section;
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
index 832d8a40..b1012944 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/formRequest/FormConversionResponse.java
@@ -54,14 +54,16 @@ public record Question(
         String description,
         String type,
         boolean required,
-        List<Option> options
+        List<Option> options,
+        String imageUrl
     ) { }
 
     @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record Option(
         String text,
         Integer goToSectionOrder,
-        boolean isOther
+        boolean isOther,
+        String imageUrl
     ) { }
 
     @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
index 02cdf4eb..26e375e4 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
@@ -21,6 +21,7 @@
 import OneQ.OnSurvey.global.infra.transaction.TransactionHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.scheduling.annotation.Async;
@@ -28,6 +29,7 @@
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
 import org.springframework.web.reactive.function.client.WebClient;
+import reactor.util.retry.Retry;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -39,16 +41,17 @@
 @Slf4j
 @Component
 @RequiredArgsConstructor
+@Qualifier("lambdaWebClient")
 public class FormRequestLambda {
 
     private static final long FORM_CONVERSION_REQUEST_TIMEOUT = 20L;
 
-    @Value("${external.lambda.survey-conversion.url}")
+    @Value("${external.lambda.survey-conversion.url:}")
     private String lambdaUrl;
 
     private final AlertNotifier alertNotifier;
     private final TransactionHandler transactionHandler;
-    private final WebClient webClient;
+    private final WebClient lambdaWebClient;
 
     private final MemberFinder memberFinder;
     private final FormUpdater formUpdater;
@@ -62,14 +65,14 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
 
         FormConversionPayload payload = new FormConversionPayload(event.formUrls());
 
-        FormConversionResponse response = webClient.post()
+        FormConversionResponse response = lambdaWebClient.post()
             .uri(lambdaUrl)
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(payload)
             .retrieve()
             .bodyToMono(FormConversionResponse.class)
-            .retry(3)
             .timeout(Duration.ofSeconds(FORM_CONVERSION_REQUEST_TIMEOUT))
+            .retryWhen(Retry.backoff(3, Duration.ofSeconds(3)))
             .doOnError(e -> {
                 log.error("[FormRequestLambda] 구글폼 변환 중 오류 발생 - requestId: {}, error: {}", event.requestId(), e.getMessage(), e);
                 alertNotifier.sendSurveyConversionAsync(
@@ -196,8 +199,8 @@ private Long createSurveyFromConversionResult(FormConversionResponse.Result resu
                             .isRequired(question.required())
                             .questionType(questionType)
                             .questionOrder(questionOrder.getAndIncrement())
-                            .section(section.order())
-                            .nextSection(section.nextSectionOrder() != null ? section.nextSectionOrder() : 0);
+                            .imageUrl(question.imageUrl())
+                            .section(section.order());
 
                         // Choice 타입인 경우 옵션 설정
                         if (questionType == QuestionType.CHOICE && question.options() != null) {
@@ -220,6 +223,7 @@ private Long createSurveyFromConversionResult(FormConversionResponse.Result resu
                                     .map(opt -> OptionDto.builder()
                                         .content(opt.text())
                                         .nextSection(opt.goToSectionOrder())
+                                        .imageUrl(opt.imageUrl())
                                         .build())
                                     .toList());
                         }
@@ -255,6 +259,7 @@ private Long createSurveyFromConversionResult(FormConversionResponse.Result resu
                             .questionId(savedInfo.getQuestionId())
                             .content(opt.getContent())
                             .nextSection(opt.getNextSection())
+                            .imageUrl(opt.getImageUrl())
                             .build())
                         .toList();
 
@@ -287,6 +292,7 @@ private QuestionType mapQuestionType(String googleFormType) {
             case "LINEAR_SCALE", "SCALE" -> QuestionType.RATING;
             case "DATE" -> QuestionType.DATE;
             case "NUMBER" -> QuestionType.NUMBER;
+            case "IMAGE" -> QuestionType.IMAGE;
             default -> null;
         };
     }
diff --git a/src/main/java/OneQ/OnSurvey/global/common/config/WebClientConfig.java b/src/main/java/OneQ/OnSurvey/global/common/config/WebClientConfig.java
index d4900ca2..29151121 100644
--- a/src/main/java/OneQ/OnSurvey/global/common/config/WebClientConfig.java
+++ b/src/main/java/OneQ/OnSurvey/global/common/config/WebClientConfig.java
@@ -30,4 +30,19 @@ WebClient webClient(@Value("${discord.timeout-ms:2000}") int timeoutMs) {
                 .clientConnector(new ReactorClientHttpConnector(httpClient))
                 .build();
     }
+
+    @Bean
+    WebClient lambdaWebClient(@Value("${google.timeout-ms:10000}") int timeoutMs) {
+        HttpClient httpClient = HttpClient.create()
+            .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, timeoutMs)
+            .responseTimeout(Duration.ofMillis(timeoutMs))
+            .doOnConnected(conn ->
+                    conn.addHandlerLast(new ReadTimeoutHandler(timeoutMs, TimeUnit.MILLISECONDS))
+                            .addHandlerLast(new WriteTimeoutHandler(timeoutMs, TimeUnit.MILLISECONDS))
+            );
+
+        return WebClient.builder()
+            .clientConnector(new ReactorClientHttpConnector(httpClient))
+            .build();
+    }
 }

From 534e5be06ac34f8af3aff0755fa9b941e240985b Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Wed, 4 Mar 2026 11:08:56 +0900
Subject: [PATCH 10/13] =?UTF-8?q?chore:=20=EC=84=A4=EB=AC=B8=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EB=B3=80=EA=B2=BD=20API=20=EC=97=94?=
 =?UTF-8?q?=EB=93=9C=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 1e5a342c6b7c967f288c034b56194fdc8f7f9ef1)
---
 .../java/OneQ/OnSurvey/domain/admin/api/AdminController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/api/AdminController.java b/src/main/java/OneQ/OnSurvey/domain/admin/api/AdminController.java
index 2e46e99a..93e7e717 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/api/AdminController.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/api/AdminController.java
@@ -59,7 +59,7 @@ public SuccessResponse<AdminSurveyDetailResponse> getQuestionsCompleted(
         return SuccessResponse.ok(adminFacade.getSurveyDetail(surveyId));
     }
 
-    @PatchMapping("/{surveyId}/owner")
+    @PatchMapping("/surveys/{surveyId}/owner")
     @Operation(summary = "설문 소유자 변경 (어드민)", description = "어드민 권한으로 설문의 소유자를 변경합니다.")
     public SuccessResponse<String> changeSurveyOwner(
         @PathVariable Long surveyId,

From 755d66e6a673ea92192f4c52bc37e401dbe3983d Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Wed, 4 Mar 2026 11:08:56 +0900
Subject: [PATCH 11/13] =?UTF-8?q?mod:=20=EC=84=A4=EB=AC=B8/=EC=84=B9?=
 =?UTF-8?q?=EC=85=98=20=EB=82=B4=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20URL=20?=
 =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 6652520dcb18b67207cf61ecf93f8d358802418e)
---
 .../response/AdminSurveyDetailResponse.java   |  8 ++-----
 .../domain/model/survey/SurveySection.java    |  3 +--
 .../model/survey/SurveySingleViewInfo.java    |  1 -
 .../admin/infra/mapper/AdminSurveyMapper.java |  4 +---
 .../domain/question/entity/Section.java       |  6 +-----
 .../domain/question/model/dto/SectionDto.java |  6 ++----
 .../section/SectionRepositoryImpl.java        |  6 ++----
 .../OnSurvey/domain/survey/entity/Survey.java |  7 +------
 .../survey/model/dto/SurveyDetailData.java    |  1 -
 .../model/request/FreeSurveyFormRequest.java  |  6 +-----
 .../survey/model/request/SectionRequest.java  |  6 ++----
 .../request/SurveyFormCreateRequest.java      |  4 +---
 .../model/request/SurveyFormRequest.java      |  5 +----
 .../response/ParticipationInfoResponse.java   |  6 ++----
 .../ParticipationQuestionResponse.java        | 21 ++-----------------
 .../model/response/SurveyDetailResponse.java  |  6 ++----
 .../model/response/SurveyFormResponse.java    |  4 +---
 .../repository/SurveyRepositoryImpl.java      |  1 -
 .../service/command/SurveyCommandService.java |  9 +++-----
 .../service/query/SurveyQueryService.java     |  2 +-
 20 files changed, 26 insertions(+), 86 deletions(-)

diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/api/dto/response/AdminSurveyDetailResponse.java b/src/main/java/OneQ/OnSurvey/domain/admin/api/dto/response/AdminSurveyDetailResponse.java
index 3d6b89de..428a54a1 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/api/dto/response/AdminSurveyDetailResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/api/dto/response/AdminSurveyDetailResponse.java
@@ -43,7 +43,6 @@ public record SurveyInformationDto(
         String title,
         String description,
         String deadline,
-        String imageUrl,
         Set<String> ages,
         String gender,
         String residence,
@@ -57,7 +56,6 @@ public static SurveyInformationDto from(SurveySingleViewInfo vo) {
                 vo.title(),
                 vo.description(),
                 vo.deadline() != null ? vo.deadline().toString() : null,
-                vo.imageUrl(),
                 vo.ages(),
                 vo.gender(),
                 vo.residence(),
@@ -155,8 +153,7 @@ public record SectionDto(
         String title,
         String description,
         Integer order,
-        Integer nextSection,
-        String imageUrl
+        Integer nextSection
     ) {
         public static SectionDto from(SurveySection vo) {
             if (vo == null) return null;
@@ -165,8 +162,7 @@ public static SectionDto from(SurveySection vo) {
                 vo.title(),
                 vo.description(),
                 vo.order(),
-                vo.nextSection(),
-                vo.imageUrl()
+                vo.nextSection()
             );
         }
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveySection.java b/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveySection.java
index a4e6add7..1c9ffda2 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveySection.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveySection.java
@@ -5,7 +5,6 @@ public record SurveySection (
     String title,
     String description,
     Integer order,
-    Integer nextSection,
-    String imageUrl
+    Integer nextSection
 ) {
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveySingleViewInfo.java b/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveySingleViewInfo.java
index f07dcc28..2ddff995 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveySingleViewInfo.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/domain/model/survey/SurveySingleViewInfo.java
@@ -8,7 +8,6 @@ public record SurveySingleViewInfo(
     String title,
     String description,
     LocalDate deadline,
-    String imageUrl,
 
     Set<String> ages,
     String gender,
diff --git a/src/main/java/OneQ/OnSurvey/domain/admin/infra/mapper/AdminSurveyMapper.java b/src/main/java/OneQ/OnSurvey/domain/admin/infra/mapper/AdminSurveyMapper.java
index 5f6048a4..c7b0c9a6 100644
--- a/src/main/java/OneQ/OnSurvey/domain/admin/infra/mapper/AdminSurveyMapper.java
+++ b/src/main/java/OneQ/OnSurvey/domain/admin/infra/mapper/AdminSurveyMapper.java
@@ -54,7 +54,6 @@ public static SurveySingleViewInfo toSurveySingleViewInfo(SurveyDetailData surve
             surveyDetailData.getTitle(),
             surveyDetailData.getDescription(),
             surveyDetailData.getDeadline() != null ? surveyDetailData.getDeadline().toLocalDate() : null,
-            surveyDetailData.getImageUrl(),
             surveyDetailData.getAges().stream().map(Enum::name).collect(Collectors.toSet()),
             surveyDetailData.getGender() != null ? surveyDetailData.getGender().name() : null,
             surveyDetailData.getResidence() != null ? surveyDetailData.getResidence().name() : null,
@@ -136,8 +135,7 @@ public static SurveySection toSurveySection(SectionDto sectionDto) {
             sectionDto.title(),
             sectionDto.description(),
             sectionDto.order(),
-            sectionDto.nextSection(),
-            sectionDto.imageUrl()
+            sectionDto.nextSection()
         );
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/entity/Section.java b/src/main/java/OneQ/OnSurvey/domain/question/entity/Section.java
index c13636d5..6cdc6044 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/entity/Section.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/entity/Section.java
@@ -39,14 +39,10 @@ public class Section extends BaseEntity {
     @Column(name = "NEXT_SECTION", nullable = false)
     private Integer nextSection;
 
-    @Column(name = "image_url", columnDefinition = "TEXT")
-    private String imageUrl;
-
-    public void updateSection(String title, String description, Integer order, Integer nextSection, String imageUrl) {
+    public void updateSection(String title, String description, Integer order, Integer nextSection) {
         this.title = title;
         this.description = description;
         this.sectionOrder = order;
         this.nextSection = nextSection;
-        this.imageUrl = imageUrl;
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/SectionDto.java b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/SectionDto.java
index eabbaeaa..2d84c418 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/model/dto/SectionDto.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/model/dto/SectionDto.java
@@ -8,8 +8,7 @@ public record SectionDto (
     String title,
     String description,
     Integer order,
-    Integer nextSection,
-    String imageUrl
+    Integer nextSection
 ) {
 
     public static SectionDto fromEntity(Section section) {
@@ -18,8 +17,7 @@ public static SectionDto fromEntity(Section section) {
             section.getTitle(),
             section.getDescription(),
             section.getSectionOrder(),
-            section.getNextSection(),
-            section.getImageUrl()
+            section.getNextSection()
         );
     }
 
diff --git a/src/main/java/OneQ/OnSurvey/domain/question/repository/section/SectionRepositoryImpl.java b/src/main/java/OneQ/OnSurvey/domain/question/repository/section/SectionRepositoryImpl.java
index c5191ab5..ff97b679 100644
--- a/src/main/java/OneQ/OnSurvey/domain/question/repository/section/SectionRepositoryImpl.java
+++ b/src/main/java/OneQ/OnSurvey/domain/question/repository/section/SectionRepositoryImpl.java
@@ -36,8 +36,7 @@ public SectionDto findSectionDtoBySurveyIdAndOrder(long surveyId, int order) {
             section.title,
             section.description,
             section.sectionOrder,
-            section.nextSection,
-            section.imageUrl
+            section.nextSection
         ))
             .from(section)
             .where(
@@ -54,8 +53,7 @@ public List<SectionDto> findAllSectionDtoBySurveyId(long surveyId) {
             section.title,
             section.description,
             section.sectionOrder,
-            section.nextSection,
-            section.imageUrl
+            section.nextSection
         ))
             .from(section)
             .where(
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/entity/Survey.java b/src/main/java/OneQ/OnSurvey/domain/survey/entity/Survey.java
index c281f117..d1f09adb 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/entity/Survey.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/entity/Survey.java
@@ -59,9 +59,6 @@ public class Survey extends BaseEntity {
     @Builder.Default
     private Boolean isFree = false;
 
-    @Column(name = "image_url", columnDefinition = "TEXT")
-    private String imageUrl;
-
     public static Survey of(
         Long memberId,
         String title,
@@ -87,14 +84,12 @@ public void updateSurvey(
             String title,
             String description,
             LocalDateTime deadline,
-            Integer totalCoin,
-            String imageUrl
+            Integer totalCoin
     ) {
         this.title = title;
         this.description = description;
         this.deadline = deadline;
         this.totalCoin = totalCoin;
-        this.imageUrl = imageUrl;
     }
 
     public void updateInterests(Set<Interest> interests) {
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/dto/SurveyDetailData.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/dto/SurveyDetailData.java
index c8f92dc5..c6ad943a 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/dto/SurveyDetailData.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/dto/SurveyDetailData.java
@@ -20,7 +20,6 @@ public class SurveyDetailData {
     private String title;
     private String description;
     private LocalDateTime deadline;
-    private String imageUrl;
 
     // 설문 상세 정보
     private Integer dueCount;
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/FreeSurveyFormRequest.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/FreeSurveyFormRequest.java
index 1b819284..f7f7e2b3 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/FreeSurveyFormRequest.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/FreeSurveyFormRequest.java
@@ -2,15 +2,11 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Future;
-import jakarta.validation.constraints.Pattern;
 
 import java.time.LocalDateTime;
 
 public record FreeSurveyFormRequest(
         @Future
         @Schema(description = "설문 마감일", example = "2026-12-31T23:59:59")
-        LocalDateTime deadline,
-        @Schema(description = "설문 이미지 URL")
-        @Pattern(regexp = "^(https?)://.+$", message = "imageUrl은 http/https URL 형식이어야 합니다.")
-        String imageUrl
+        LocalDateTime deadline
 ) {}
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SectionRequest.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SectionRequest.java
index 7cbd3bf7..4b2153cd 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SectionRequest.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SectionRequest.java
@@ -12,8 +12,7 @@ public record SectionInfo (
         String title,
         String description,
         Integer order,
-        Integer nextSection,
-        String imageUrl
+        Integer nextSection
     ) { }
 
     public List<SectionDto> toDto() {
@@ -22,8 +21,7 @@ public List<SectionDto> toDto() {
             sectionInfo.title(),
             sectionInfo.description(),
             sectionInfo.order(),
-            sectionInfo.nextSection(),
-            sectionInfo.imageUrl()
+            sectionInfo.nextSection()
         )).toList();
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyFormCreateRequest.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyFormCreateRequest.java
index 2b7e8566..461132f7 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyFormCreateRequest.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyFormCreateRequest.java
@@ -6,8 +6,6 @@ public record SurveyFormCreateRequest(
         @Schema(description = "설문 제목", example = "설문1")
         String title,
         @Schema(description = "설문 설명", example = "설문1에 대한 설명입니다.")
-        String description,
-        @Schema(description = "설문 이미지 url", example = "https://example.com/survey1.png")
-        String imageUrl
+        String description
 ) {
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyFormRequest.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyFormRequest.java
index 122d863e..a2729b5a 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyFormRequest.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/request/SurveyFormRequest.java
@@ -35,9 +35,6 @@ public record SurveyFormRequest(
         Integer dueCountPrice,
 
         @Schema(description = "총 코인", example = "10000")
-        Integer totalCoin,
-
-        @Schema(description = "설문 이미지 URL")
-        String imageUrl
+        Integer totalCoin
 ) {
 }
\ No newline at end of file
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationInfoResponse.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationInfoResponse.java
index 915c58da..4d4e7bac 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationInfoResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationInfoResponse.java
@@ -17,8 +17,7 @@ public record ParticipationInfoResponse(
     boolean isScreenRequired,
     boolean isScreened,
     boolean isSurveyResponded,
-    Boolean isFree,
-    String imageUrl
+    Boolean isFree
 ) {
     public static ParticipationInfoResponse from(
         Survey survey, int responseCount, ParticipationStatus participationStatus
@@ -33,8 +32,7 @@ public static ParticipationInfoResponse from(
             participationStatus.isScreenRequired(),
             participationStatus.isScreened(),
             participationStatus.isSurveyResponded(),
-            survey.getIsFree(),
-            survey.getImageUrl()
+            survey.getIsFree()
         );
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationQuestionResponse.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationQuestionResponse.java
index 1dc2946f..6070ed65 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationQuestionResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationQuestionResponse.java
@@ -7,7 +7,6 @@
 public record ParticipationQuestionResponse(
     String sectionTitle,
     String sectionDescription,
-    String sectionImageUrl,
     Integer currSection,
     Integer nextSection,
     List<DefaultQuestionDto> info
@@ -16,7 +15,7 @@ public static ParticipationQuestionResponse of(
         List<DefaultQuestionDto> info
     ) {
         return new ParticipationQuestionResponse(
-            null, null, null,
+            null, null,
             1, 0,
             info
         );
@@ -30,23 +29,7 @@ public static ParticipationQuestionResponse of(
         List<DefaultQuestionDto> info
     ) {
         return new ParticipationQuestionResponse(
-            title, description, null,
-            currSection != null ? currSection : 1,
-            currSection != null ? nextSection : 0,
-            info
-        );
-    }
-
-    public static ParticipationQuestionResponse of(
-        String title,
-        String description,
-        String imageUrl,
-        Integer currSection,
-        Integer nextSection,
-        List<DefaultQuestionDto> info
-    ) {
-        return new ParticipationQuestionResponse(
-            title, description, imageUrl,
+            title, description,
             currSection != null ? currSection : 1,
             currSection != null ? nextSection : 0,
             info
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyDetailResponse.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyDetailResponse.java
index cc830a26..ba541833 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyDetailResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyDetailResponse.java
@@ -14,8 +14,7 @@ public record SurveyDetailResponse(
         int totalCoin,
         @DateFormat LocalDateTime createdAt,
         @DateFormat LocalDateTime deadline,
-        SurveyInfoResponse surveyInfo,
-        String imageUrl
+        SurveyInfoResponse surveyInfo
 ) {
     public static SurveyDetailResponse from(Survey survey, SurveyInfo info) {
         return new SurveyDetailResponse(
@@ -25,8 +24,7 @@ public static SurveyDetailResponse from(Survey survey, SurveyInfo info) {
                 survey.getTotalCoin(),
                 survey.getCreatedAt(),
                 survey.getDeadline(),
-                SurveyInfoResponse.from(info),
-                survey.getImageUrl()
+                SurveyInfoResponse.from(info)
         );
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyFormResponse.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyFormResponse.java
index ee982a9e..2ca34f2e 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyFormResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/SurveyFormResponse.java
@@ -11,8 +11,7 @@ public record SurveyFormResponse (
     String title,
     String description,
     Integer totalCoin,
-    LocalDateTime createdAt,
-    String imageUrl
+    LocalDateTime createdAt
 ) {
 
     public static SurveyFormResponse fromEntity(Survey survey) {
@@ -22,7 +21,6 @@ public static SurveyFormResponse fromEntity(Survey survey) {
             .description(survey.getDescription())
             .totalCoin(survey.getTotalCoin())
             .createdAt(survey.getCreatedAt())
-            .imageUrl(survey.getImageUrl())
             .build();
     }
 }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/repository/SurveyRepositoryImpl.java b/src/main/java/OneQ/OnSurvey/domain/survey/repository/SurveyRepositoryImpl.java
index aaee20bf..795da163 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/repository/SurveyRepositoryImpl.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/repository/SurveyRepositoryImpl.java
@@ -169,7 +169,6 @@ public SurveyDetailData getSurveyDetailDataById(Long surveyId) {
                     survey.title,
                     survey.description,
                     survey.deadline,
-                    survey.imageUrl,
                     surveyInfo.dueCount,
                     set(ageAlias).as("ages"),
                     surveyInfo.gender,
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/command/SurveyCommandService.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/command/SurveyCommandService.java
index 8a2c0c40..e50d8342 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/command/SurveyCommandService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/command/SurveyCommandService.java
@@ -39,7 +39,6 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.Set;
 
 import static OneQ.OnSurvey.domain.survey.model.SurveyStatus.REFUNDED;
@@ -99,7 +98,6 @@ public SurveyFormResponse upsertSurvey(Long memberId, Long surveyId, SurveyFormC
             }
             if (survey.getTitle().equals(request.title())
                 && survey.getDescription().equals(request.description())
-                && Objects.equals(survey.getImageUrl(), request.imageUrl())
             ) {
                 return SurveyFormResponse.fromEntity(survey);
             }
@@ -108,8 +106,7 @@ public SurveyFormResponse upsertSurvey(Long memberId, Long surveyId, SurveyFormC
                     request.title(),
                     request.description(),
                     survey.getDeadline(),
-                    survey.getTotalCoin(),
-                    request.imageUrl()
+                    survey.getTotalCoin()
             );
             survey = surveyRepository.save(survey);
             log.info("[SURVEY:COMMAND:upsertSurvey] 설문 수정 완료 - surveyId={}", surveyId);
@@ -125,7 +122,7 @@ public SurveyFormResponse submitSurvey(Long userKey, Long surveyId, SurveyFormRe
 
         Set<AgeRange> ages = (request.ages() == null) ? Set.of() : new HashSet<>(request.ages());
 
-        survey.updateSurvey(survey.getTitle(), survey.getDescription(), request.deadline(), request.totalCoin(), request.imageUrl());
+        survey.updateSurvey(survey.getTitle(), survey.getDescription(), request.deadline(), request.totalCoin());
 
         SurveyInfo info = upsertSurveyInfo(
                 surveyId,
@@ -152,7 +149,7 @@ public SurveyFormResponse submitFreeSurvey(Long userKey, Long surveyId, FreeSurv
         validateMember(userKey);
 
         survey.markFree();
-        survey.updateSurvey(survey.getTitle(), survey.getDescription(), request.deadline(), 0, request.imageUrl());
+        survey.updateSurvey(survey.getTitle(), survey.getDescription(), request.deadline(), 0);
 
         SurveyInfo info = upsertSurveyInfo(
                 surveyId,
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/query/SurveyQueryService.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/query/SurveyQueryService.java
index f2e72fbb..9ded814f 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/query/SurveyQueryService.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/query/SurveyQueryService.java
@@ -279,7 +279,7 @@ public ParticipationQuestionResponse getParticipationQuestionInfo(Long surveyId,
 
         return section != null
             ? ParticipationQuestionResponse.of(
-                section.title(), section.description(), section.imageUrl(),
+                section.title(), section.description(),
                 section.order(), section.nextSection(), questionDtoList
             )
             : ParticipationQuestionResponse.of(questionDtoList);

From 419fa929ffad6e44221d804e82a1cb60e7a2f9f3 Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Wed, 4 Mar 2026 16:55:08 +0900
Subject: [PATCH 12/13] =?UTF-8?q?fix:=20=ED=95=98=EC=9D=B4=ED=8D=BC?=
 =?UTF-8?q?=EB=A7=81=ED=81=AC/=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EB=B0=B1=EC=98=A4?=
 =?UTF-8?q?=ED=94=BC=EC=8A=A4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit e62db0e78bc760d89ebed5867878b4871c9df00d)
---
 src/main/resources/templates/bo/survey.html | 1094 +++++++++++++++----
 1 file changed, 878 insertions(+), 216 deletions(-)

diff --git a/src/main/resources/templates/bo/survey.html b/src/main/resources/templates/bo/survey.html
index e8218d32..8ad840a0 100644
--- a/src/main/resources/templates/bo/survey.html
+++ b/src/main/resources/templates/bo/survey.html
@@ -33,16 +33,42 @@
             white-space: pre-wrap;
             overflow-y: auto;
         }
-        /* 하이퍼링크 미리보기 */
+        /* 하이퍼링크 미리보기 및 contenteditable 내 링크 */
         .desc-html-preview a,
-        .option-text-html-preview a {
+        .option-text-html-preview a,
+        .question-title-input[contenteditable] a,
+        .question-desc-input[contenteditable] a,
+        .section-title-input[contenteditable] a,
+        .section-desc-input[contenteditable] a,
+        #survey-title[contenteditable] a,
+        #survey-description[contenteditable] a {
             color: #4f46e5;
             text-decoration: underline;
             font-weight: 500;
+            cursor: pointer;
+            padding: 1px 4px;
+            border-radius: 3px;
+            transition: background-color 0.15s;
         }
         .desc-html-preview a:hover,
-        .option-text-html-preview a:hover {
+        .option-text-html-preview a:hover,
+        .question-title-input[contenteditable] a:hover,
+        .question-desc-input[contenteditable] a:hover,
+        .section-title-input[contenteditable] a:hover,
+        .section-desc-input[contenteditable] a:hover,
+        #survey-title[contenteditable] a:hover,
+        #survey-description[contenteditable] a:hover {
             color: #3730a3;
+            background-color: #e0e7ff;
+        }
+        /* contenteditable placeholder */
+        [contenteditable][data-placeholder]:empty:before {
+            content: attr(data-placeholder);
+            color: #9ca3af;
+            pointer-events: none;
+        }
+        [contenteditable]:focus {
+            outline: none;
         }
     </style>
 </head>
@@ -137,7 +163,22 @@ <h3 class="text-sm font-bold text-indigo-800 mb-3"><i class="fas fa-pen-nib mr-2
         <div class="flex justify-between items-start gap-4">
             <div class="flex-1">
                 <span id="mode-badge" class="text-xs font-bold text-indigo-600 bg-indigo-50 px-2 py-1 rounded mb-2 inline-block">EDIT MODE</span>
-                <input type="text" id="survey-title" class="w-full text-lg font-bold border-b-2 border-slate-100 focus:border-indigo-500 outline-none pb-2 transition-colors" value="" placeholder="설문 제목을 입력하세요">
+                <!-- 설문 제목 (contenteditable) -->
+                <input type="hidden" id="survey-title-value" value="">
+                <div id="survey-title" class="w-full text-lg font-bold border-b-2 border-slate-100 focus:border-indigo-500 outline-none pb-2 transition-colors" contenteditable="true" data-placeholder="설문 제목을 입력하세요" oninput="syncSurveyTitleValue(this)"></div>
+                <div class="flex items-center gap-2 mt-1 mb-2">
+                    <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 shrink-0" onclick="openHyperlinkDialogForEditable(document.getElementById('survey-title'))">
+                        <i class="fas fa-link text-xs"></i> 제목 하이퍼링크
+                    </button>
+                </div>
+                <!-- 설문 설명 (contenteditable) -->
+                <input type="hidden" id="survey-description-value" value="">
+                <div id="survey-description" class="w-full text-sm text-slate-600 border border-slate-200 rounded-lg p-2 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 outline-none min-h-[60px]" contenteditable="true" data-placeholder="설문 설명을 입력하세요" oninput="syncSurveyDescValue(this)"></div>
+                <div class="flex items-center gap-2 mt-1">
+                    <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 shrink-0" onclick="openHyperlinkDialogForEditable(document.getElementById('survey-description'))">
+                        <i class="fas fa-link text-xs"></i> 설명 하이퍼링크
+                    </button>
+                </div>
             </div>
             <!-- 편집 모드 버튼 -->
             <div id="edit-mode-buttons" class="flex flex-col gap-2 shrink-0">
@@ -161,49 +202,6 @@ <h3 class="text-sm font-bold text-indigo-800 mb-3"><i class="fas fa-pen-nib mr-2
                 </button>
             </div>
         </div>
-        <!-- 설문 설명 영역 -->
-        <div class="mt-3">
-            <div class="flex items-center gap-2 cursor-pointer" onclick="toggleDescription()">
-                <button id="desc-toggle-btn" class="text-slate-400 hover:text-slate-600 transition-transform duration-200 flex items-center justify-center w-4 h-5">
-                    <i class="fas fa-chevron-down text-xs"></i>
-                </button>
-                <div id="desc-preview" class="text-sm text-slate-500 truncate flex-1 leading-5">
-                </div>
-            </div>
-            <div id="desc-edit" class="hidden mt-2">
-                <div class="flex items-start gap-2">
-                    <div class="flex items-center justify-center w-4 h-9">
-                        <button id="desc-toggle-btn-edit" class="text-slate-400 hover:text-slate-600 transition-transform duration-200" style="transform: rotate(180deg);" onclick="event.stopPropagation(); toggleDescription();">
-                            <i class="fas fa-chevron-down text-xs"></i>
-                        </button>
-                    </div>
-                    <div class="flex-1">
-                        <textarea id="survey-description" class="w-full text-sm text-slate-600 border border-slate-200 rounded-lg p-2 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 outline-none resize-none leading-5" rows="3" placeholder="설문 설명을 입력하세요"></textarea>
-                        <div class="flex items-center justify-between mt-2">
-                            <div class="flex gap-2">
-                                <label class="cursor-pointer text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 inline-flex items-center gap-1">
-                                    <i class="fas fa-image text-xs"></i> 이미지
-                                    <input type="file" class="hidden" accept="image/*" onchange="handleSurveyImageUpload(this)">
-                                </label>
-                                <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialog(document.getElementById('survey-description'))">
-                                    <i class="fas fa-link text-xs"></i> 하이퍼링크
-                                </button>
-                            </div>
-                            <button onclick="saveDescription()" class="text-xs text-indigo-600 font-bold hover:bg-indigo-50 px-3 py-1 rounded">확인</button>
-                        </div>
-                        <input type="hidden" id="survey-image-url-input" value="">
-                        <div id="survey-image-preview" class="hidden mt-2">
-                            <div class="relative inline-block">
-                                <img class="max-h-32 rounded border border-slate-200" src="" alt="설문 이미지">
-                                <button type="button" class="absolute -top-2 -right-2 w-5 h-5 bg-red-500 text-white rounded-full text-xs flex items-center justify-center hover:bg-red-600" onclick="removeSurveyImage()">
-                                    <i class="fas fa-times text-[8px]"></i>
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
     </div>
 
     <div id="section-list" class="space-y-8 pb-8 mt-6"></div>
@@ -649,6 +647,29 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
     </div>
 </div>
 
+<!-- 하이퍼링크 수정 팝오버 -->
+<div id="hyperlinkEditPopover" class="hidden absolute z-[70] bg-white border border-slate-200 rounded-lg shadow-lg p-3 w-72">
+    <div class="space-y-2 mb-3">
+        <div>
+            <label class="block text-xs font-medium text-slate-600 mb-1">표시 텍스트</label>
+            <input type="text" id="editLinkText" class="w-full border border-slate-300 rounded px-2 py-1.5 text-sm focus:border-indigo-500 outline-none">
+        </div>
+        <div>
+            <label class="block text-xs font-medium text-slate-600 mb-1">URL</label>
+            <input type="text" id="editLinkUrl" class="w-full border border-slate-300 rounded px-2 py-1.5 text-sm focus:border-indigo-500 outline-none">
+        </div>
+    </div>
+    <div class="flex justify-between">
+        <button onclick="deleteLinkFromPopover()" class="px-2 py-1 text-xs text-red-600 hover:bg-red-50 rounded">
+            <i class="fas fa-trash-alt mr-1"></i>삭제
+        </button>
+        <div class="flex gap-1">
+            <button onclick="closeHyperlinkEditPopover()" class="px-2 py-1 text-xs text-slate-600 hover:bg-slate-100 rounded">취소</button>
+            <button onclick="confirmEditLink()" class="px-2 py-1 text-xs bg-indigo-600 text-white font-bold rounded hover:bg-indigo-700">적용</button>
+        </div>
+    </div>
+</div>
+
 <script>
     // ==================== API 설정 및 전역 변수 ====================
 
@@ -713,7 +734,8 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         'rating': '평가형',
         'nps': 'NPS',
         'number': '숫자형',
-        'date': '날짜형'
+        'date': '날짜형',
+        'image': '이미지'
     };
 
     // 문항 타입 매핑 (프론트엔드 → 백엔드)
@@ -724,7 +746,8 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         'rating': 'RATING',
         'nps': 'NPS',
         'number': 'NUMBER',
-        'date': 'DATE'
+        'date': 'DATE',
+        'image': 'IMAGE'
     };
 
     // 문항 타입 역매핑 (백엔드 → 프론트엔드)
@@ -735,7 +758,8 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         'RATING': 'rating',
         'NPS': 'nps',
         'NUMBER': 'number',
-        'DATE': 'date'
+        'DATE': 'date',
+        'IMAGE': 'image'
     };
 
     // 생성 폼 토글
@@ -803,15 +827,18 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
     async function updateSurveyDisplay() {
         if (!currentSurveyId) return null;
 
-        const title = document.getElementById('survey-title').value.trim();
-        const description = document.getElementById('survey-description').value.trim();
-        const imageUrl = document.getElementById('survey-image-url-input').value.trim();
+        // contenteditable div에서 값 가져오기
+        const titleDiv = document.getElementById('survey-title');
+        const descDiv = document.getElementById('survey-description');
+
+        // 저장 전 HTML sanitize (a 태그와 href 속성만 허용)
+        const title = sanitizeHtmlForSave((titleDiv.innerHTML || '').trim());
+        const description = sanitizeHtmlForSave((descDiv.innerHTML || '').trim());
 
         try {
             const response = await apiCall(`/survey-form/surveys/${currentSurveyId}/display`, 'PATCH', {
                 title,
-                description,
-                imageUrl
+                description
             });
 
             showToast('설문 정보가 수정되었습니다.', 'success');
@@ -839,10 +866,31 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 const frontendType = item.getAttribute('data-question-type') || 'choice';
                 const questionType = QUESTION_TYPE_MAP[frontendType];
 
+                // contenteditable div + hidden input 조합에서 값 수집
+                const titleValueInput = item.querySelector('.question-title-value');
+                const descValueInput = item.querySelector('.question-desc-value');
                 const titleInput = item.querySelector('.question-title-input');
                 const descInput = item.querySelector('.question-desc-input');
                 const requiredCheckbox = item.querySelector('.required-checkbox');
 
+                // title/description 값 가져오기 (hidden input 우선, 없으면 contenteditable innerHTML)
+                let titleValue = '';
+                let descValue = '';
+                if (titleValueInput) {
+                    titleValue = titleValueInput.value;
+                } else if (titleInput) {
+                    titleValue = titleInput.innerHTML || titleInput.value || '';
+                }
+                if (descValueInput) {
+                    descValue = descValueInput.value;
+                } else if (descInput) {
+                    descValue = descInput.innerHTML || descInput.value || '';
+                }
+
+                // 저장 전 HTML sanitize (a 태그와 href 속성만 허용)
+                titleValue = sanitizeHtmlForSave(titleValue);
+                descValue = sanitizeHtmlForSave(descValue);
+
                 // [신규] 분기 설정 체크박스
                 const routeCheckbox = item.querySelector('.route-checkbox');
                 const isSectionDecidable = routeCheckbox ? routeCheckbox.checked : false;
@@ -852,16 +900,25 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 const hasCustomInput = !!customInputOption;
 
                 const imageUrlInput = item.querySelector('.question-image-url-input');
+                // 이미지 문항의 경우 전용 input에서 URL 수집
+                const imageTypeUrlInput = item.querySelector('.question-image-url-input-for-image-type');
+                let imageUrl = null;
+                if (frontendType === 'image' && imageTypeUrlInput) {
+                    imageUrl = imageTypeUrlInput.value.trim() || null;
+                } else if (imageUrlInput) {
+                    imageUrl = imageUrlInput.value.trim() || null;
+                }
+
                 const questionData = {
                     questionId: questionId,
                     questionType: questionType,
-                    title: titleInput ? titleInput.value : '',
-                    description: descInput ? descInput.value : '',
+                    title: titleValue,
+                    description: descValue,
                     isRequired: requiredCheckbox ? requiredCheckbox.checked : false,
                     isSectionDecidable: isSectionDecidable,
                     questionOrder: globalOrder,
                     section: sectionOrder,
-                    imageUrl: imageUrlInput ? (imageUrlInput.value.trim() || null) : null
+                    imageUrl: imageUrl
                 };
 
                 // 객관식인 경우 옵션 데이터 추가
@@ -923,9 +980,12 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
 
             const imageUrlInput = optionItem.querySelector('.option-image-url-input');
 
+            // 저장 전 HTML sanitize (a 태그와 href 속성만 허용)
+            const sanitizedContent = sanitizeHtmlForSave(textInput.value || '');
+
             options.push({
                 optionId: optionId,
-                content: textInput.value || '',
+                content: sanitizedContent,
                 nextSection: nextSection,
                 imageUrl: imageUrlInput ? (imageUrlInput.value.trim() || null) : null
             });
@@ -1021,7 +1081,9 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         const sectionItems = document.querySelectorAll('.section-item');
         for (const section of sectionItems) {
             const titleInput = section.querySelector('.section-title-input');
-            if (titleInput && !titleInput.value.trim()) {
+            // contenteditable의 경우 textContent로 검사, 일반 input의 경우 value로 검사
+            const titleValue = titleInput ? (titleInput.textContent || titleInput.value || '').trim() : '';
+            if (titleInput && !titleValue) {
                 isValid = false;
                 titleInput.classList.add('border-red-400', 'border', 'ring-1', 'ring-red-400');
                 if (!firstInvalidElement) firstInvalidElement = titleInput;
@@ -1037,7 +1099,9 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         const questionItems = document.querySelectorAll('.question-item');
         for (const question of questionItems) {
             const titleInput = question.querySelector('.question-title-input');
-            if (titleInput && !titleInput.value.trim()) {
+            // contenteditable의 경우 textContent로 검사, 일반 input의 경우 value로 검사
+            const titleValue = titleInput ? (titleInput.textContent || titleInput.value || '').trim() : '';
+            if (titleInput && !titleValue) {
                 isValid = false;
                 titleInput.classList.add('border-red-400', 'ring-1', 'ring-red-400');
                 if (!firstInvalidElement) firstInvalidElement = titleInput;
@@ -1084,6 +1148,26 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                     }, 3000);
                 }
             }
+
+            // 5. 이미지 문항인 경우 이미지가 필수인지 검사
+            if (questionType === 'image') {
+                const imageTypeUrlInput = question.querySelector('.question-image-url-input-for-image-type');
+                const imageUrl = imageTypeUrlInput ? imageTypeUrlInput.value.trim() : '';
+
+                if (!imageUrl) {
+                    isValid = false;
+                    const imageUploadArea = question.querySelector('.image-upload-required');
+                    if (imageUploadArea) {
+                        imageUploadArea.classList.add('ring-2', 'ring-red-400');
+                        if (!firstInvalidElement) firstInvalidElement = imageUploadArea;
+
+                        setTimeout(() => {
+                            imageUploadArea.classList.remove('ring-2', 'ring-red-400');
+                        }, 3000);
+                    }
+                    showToast('이미지 문항에는 반드시 이미지를 업로드해야 합니다.', 'error');
+                }
+            }
         }
 
         if (!isValid && firstInvalidElement) {
@@ -1233,8 +1317,8 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                 // options는 Set이므로 Array로 변환
                 const optionsArray = Array.isArray(choiceProp.options) ? choiceProp.options : Array.from(choiceProp.options || []);
                 optionsArray.forEach(opt => {
-                    // 옵션 추가 (optionId가 없으므로 null 전달)
-                    addOptionWithData(newQuestionEl, opt.content, null, opt.nextSection, isSectionDecidable, opt.imageUrl || null);
+                    // 옵션 추가 (optionId 포함)
+                    addOptionWithData(newQuestionEl, opt.content, opt.optionId || null, opt.nextSection, isSectionDecidable, opt.imageUrl || null);
                 });
 
                 if (hasCustomInput) {
@@ -1316,7 +1400,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             </div>
             <div class="option-image-preview ${imageUrl ? '' : 'hidden'} ml-6">
                 <div class="relative inline-block">
-                    <img class="option-image-tag max-h-16 rounded border border-slate-200" src="${escapeHtml(imageUrl || '')}" alt="보기 이미지">
+                    <img class="option-image-tag max-h-16 rounded border border-slate-200" src="${escapeHtml(imageUrl || '')}" alt="보기 이미지" referrerpolicy="no-referrer">
                     <button type="button" class="absolute -top-1.5 -right-1.5 w-4 h-4 bg-red-500 text-white rounded-full text-xs flex items-center justify-center hover:bg-red-600" onclick="removeOptionImage(this)">
                         <i class="fas fa-times text-[7px]"></i>
                     </button>
@@ -1373,48 +1457,105 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         }
     }
 
-    async function handleSectionImageUpload(input) {
+    async function handleQuestionImageUpload(input) {
         const file = input.files[0];
         if (!file) return;
         showToast('이미지 업로드 중...', 'info');
         const url = await uploadImageFile(file);
         if (!url) return;
-        const sectionItem = input.closest('.section-item');
-        sectionItem.querySelector('.section-image-url-input').value = url;
-        const preview = sectionItem.querySelector('.section-image-preview');
-        preview.querySelector('.section-image-tag').src = url;
+        const questionItem = input.closest('.question-item');
+        questionItem.querySelector('.question-image-url-input').value = url;
+        const preview = questionItem.querySelector('.question-image-preview');
+        preview.querySelector('.question-image-tag').src = url;
         preview.classList.remove('hidden');
         input.value = '';
-        await saveSectionsToServer();
-        showToast('이미지가 업로드되었습니다.', 'success');
+        showToast('이미지가 업로드되었습니다. 문항을 저장해주세요.', 'success');
     }
 
-    async function removeSectionImage(btn) {
-        const sectionItem = btn.closest('.section-item');
-        sectionItem.querySelector('.section-image-url-input').value = '';
-        btn.closest('.section-image-preview').classList.add('hidden');
-        await saveSectionsToServer();
+    function removeQuestionImage(btn) {
+        const questionItem = btn.closest('.question-item');
+        questionItem.querySelector('.question-image-url-input').value = '';
+        btn.closest('.question-image-preview').classList.add('hidden');
     }
 
-    async function handleQuestionImageUpload(input) {
+    // 이미지 문항 전용 이미지 업로드
+    async function handleImageTypeUpload(input) {
         const file = input.files[0];
         if (!file) return;
         showToast('이미지 업로드 중...', 'info');
         const url = await uploadImageFile(file);
         if (!url) return;
         const questionItem = input.closest('.question-item');
-        questionItem.querySelector('.question-image-url-input').value = url;
-        const preview = questionItem.querySelector('.question-image-preview');
-        preview.querySelector('.question-image-tag').src = url;
+
+        // 이미지 문항 전용 hidden input에 URL 저장
+        questionItem.querySelector('.question-image-url-input-for-image-type').value = url;
+        // 일반 이미지 input에도 동기화 (데이터 수집 시 사용)
+        const generalImageInput = questionItem.querySelector('.question-image-url-input');
+        if (generalImageInput) generalImageInput.value = url;
+
+        const uploadArea = questionItem.querySelector('.image-upload-required');
+        const emptyArea = uploadArea.querySelector('.image-type-empty');
+        const preview = uploadArea.querySelector('.image-type-preview');
+        const container = preview.querySelector('.image-type-container');
+        const fallback = preview.querySelector('.image-type-fallback');
+
+        // 이미지 컨테이너 표시, fallback 숨김
+        if (container) container.classList.remove('hidden');
+        if (fallback) fallback.classList.add('hidden');
+
+        preview.querySelector('.image-type-tag').src = url;
+        preview.querySelector('.image-type-url-display').textContent = url;
+
+        // 빈 영역 숨기고 미리보기 표시
+        if (emptyArea) emptyArea.classList.add('hidden');
         preview.classList.remove('hidden');
+
         input.value = '';
         showToast('이미지가 업로드되었습니다. 문항을 저장해주세요.', 'success');
     }
 
-    function removeQuestionImage(btn) {
+    // 이미지 문항 전용 이미지 삭제
+    function removeImageTypeImage(btn) {
         const questionItem = btn.closest('.question-item');
-        questionItem.querySelector('.question-image-url-input').value = '';
-        btn.closest('.question-image-preview').classList.add('hidden');
+        questionItem.querySelector('.question-image-url-input-for-image-type').value = '';
+        // 일반 이미지 input에도 동기화
+        const generalImageInput = questionItem.querySelector('.question-image-url-input');
+        if (generalImageInput) generalImageInput.value = '';
+
+        const uploadArea = questionItem.querySelector('.image-upload-required');
+        const emptyArea = uploadArea.querySelector('.image-type-empty');
+        const preview = uploadArea.querySelector('.image-type-preview');
+
+        preview.querySelector('.image-type-tag').src = '';
+        preview.querySelector('.image-type-url-display').textContent = '';
+        preview.classList.add('hidden');
+
+        // fallback UI도 숨김
+        const fallback = preview.querySelector('.image-type-fallback');
+        if (fallback) fallback.classList.add('hidden');
+        const container = preview.querySelector('.image-type-container');
+        if (container) container.classList.remove('hidden');
+
+        // 빈 영역 다시 표시
+        if (emptyArea) emptyArea.classList.remove('hidden');
+    }
+
+    // 이미지 문항 전용 이미지 로드 실패 처리
+    function handleImageTypeLoadError(img) {
+        const questionItem = img.closest('.question-item');
+        const preview = questionItem.querySelector('.image-type-preview');
+        const container = preview.querySelector('.image-type-container');
+        const fallback = preview.querySelector('.image-type-fallback');
+        const urlInput = questionItem.querySelector('.question-image-url-input-for-image-type');
+        const url = urlInput ? urlInput.value : '';
+
+        // 이미지 컨테이너 숨기고 fallback 표시
+        if (container) container.classList.add('hidden');
+        if (fallback) {
+            fallback.classList.remove('hidden');
+            const fallbackUrl = fallback.querySelector('.image-type-fallback-url');
+            if (fallbackUrl) fallbackUrl.textContent = url;
+        }
     }
 
     async function handleOptionImageUpload(input) {
@@ -1438,23 +1579,52 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         btn.closest('.option-image-preview').classList.add('hidden');
     }
 
-    async function handleSurveyImageUpload(input) {
+    // 이미지 문항 선택 시 사전 업로드 영역 토글
+    function toggleImageUploadArea(selectElement) {
+        const form = selectElement.closest('.add-question-form');
+        const uploadArea = form.querySelector('.image-pre-upload-area');
+        const descTextarea = form.querySelector('.new-question-desc');
+
+        if (selectElement.value === 'image') {
+            uploadArea.classList.remove('hidden');
+            descTextarea.classList.add('hidden');
+        } else {
+            uploadArea.classList.add('hidden');
+            descTextarea.classList.remove('hidden');
+            // 다른 타입 선택 시 이미지 URL 초기화
+            form.querySelector('.new-question-image-url').value = '';
+            const preview = form.querySelector('.new-question-image-preview');
+            preview.classList.add('hidden');
+            form.querySelector('.new-question-image-status').textContent = '이미지를 먼저 업로드하세요';
+        }
+    }
+
+    // 이미지 문항용 사전 이미지 업로드
+    async function handlePreUploadImage(input) {
         const file = input.files[0];
         if (!file) return;
         showToast('이미지 업로드 중...', 'info');
         const url = await uploadImageFile(file);
         if (!url) return;
-        document.getElementById('survey-image-url-input').value = url;
-        const preview = document.getElementById('survey-image-preview');
-        preview.querySelector('img').src = url;
+
+        const form = input.closest('.add-question-form');
+        form.querySelector('.new-question-image-url').value = url;
+
+        const preview = form.querySelector('.new-question-image-preview');
+        preview.querySelector('.new-question-image-tag').src = url;
         preview.classList.remove('hidden');
+
+        form.querySelector('.new-question-image-status').textContent = '업로드 완료!';
         input.value = '';
-        showToast('이미지가 업로드되었습니다.', 'success');
+        showToast('이미지가 업로드되었습니다. 이제 문항을 추가하세요.', 'success');
     }
 
-    function removeSurveyImage() {
-        document.getElementById('survey-image-url-input').value = '';
-        document.getElementById('survey-image-preview').classList.add('hidden');
+    // 사전 업로드된 이미지 삭제
+    function removePreUploadImage(btn) {
+        const form = btn.closest('.add-question-form');
+        form.querySelector('.new-question-image-url').value = '';
+        form.querySelector('.new-question-image-preview').classList.add('hidden');
+        form.querySelector('.new-question-image-status').textContent = '이미지를 먼저 업로드하세요';
     }
 
     async function handlePublishImageUpload(input) {
@@ -1480,7 +1650,48 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
 
     // ==================== 하이퍼링크 삽입 ====================
 
-    // <a> 태그만 허용하는 HTML 새니타이저 (XSS 방지)
+    // 저장용 HTML sanitizer: <a> 태그와 href 속성만 허용 (DB 저장 전 사용)
+    function sanitizeHtmlForSave(html) {
+        if (!html || typeof html !== 'string') return html || '';
+
+        // &nbsp;를 줄바꿈(\n)으로 변환
+        html = html.replace(/&nbsp;/g, '\n').replace(/\u00A0/g, '\n');
+
+        const allowedSchemes = ['http:', 'https:', 'mailto:'];
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(html, 'text/html');
+        const wrapper = document.createElement('span');
+
+        function processNode(src, dest) {
+            for (const child of src.childNodes) {
+                if (child.nodeType === Node.TEXT_NODE) {
+                    dest.appendChild(document.createTextNode(child.textContent));
+                } else if (child.nodeType === Node.ELEMENT_NODE) {
+                    if (child.tagName.toLowerCase() === 'a') {
+                        const a = document.createElement('a');
+                        const href = child.getAttribute('href') || '';
+                        try {
+                            const parsed = new URL(href);
+                            if (allowedSchemes.includes(parsed.protocol)) {
+                                a.href = parsed.href;  // href 속성만 설정
+                            }
+                        } catch (e) { /* 잘못된 URL — href 미설정 */ }
+                        // 텍스트 내용만 유지 (자식 태그 제거)
+                        a.textContent = child.textContent;
+                        dest.appendChild(a);
+                    } else {
+                        // 허용되지 않는 태그: 자식 노드 재귀 처리
+                        processNode(child, dest);
+                    }
+                }
+            }
+        }
+
+        processNode(doc.body, wrapper);
+        return wrapper.innerHTML;
+    }
+
+    // <a> 태그만 허용하는 HTML 새니타이저 (렌더링/미리보기용 - XSS 방지)
     function sanitizeDescHtml(html) {
         const allowedSchemes = ['http:', 'https:', 'mailto:'];
         const parser = new DOMParser();
@@ -1517,9 +1728,143 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         return wrapper.innerHTML;
     }
 
-    // 섹션/문항 description textarea 아래에 HTML 렌더링 미리보기를 동기화
+    // contenteditable div에서 hidden input으로 값 동기화 (제목)
+    function syncTitleValue(editableDiv) {
+        if (!editableDiv) return;
+        const questionItem = editableDiv.closest('.question-item');
+        if (!questionItem) return;
+        const hiddenInput = questionItem.querySelector('.question-title-value');
+        if (hiddenInput) {
+            hiddenInput.value = editableDiv.innerHTML;
+        }
+        // 링크 클릭 핸들러 재설정
+        setupEditableLinkHandlers(editableDiv);
+    }
+
+    // contenteditable div에서 hidden input으로 값 동기화 (설명)
+    function syncDescValue(editableDiv) {
+        if (!editableDiv) return;
+        const questionItem = editableDiv.closest('.question-item');
+        if (!questionItem) return;
+        const hiddenInput = questionItem.querySelector('.question-desc-value');
+        if (hiddenInput) {
+            hiddenInput.value = editableDiv.innerHTML;
+        }
+        // 링크 클릭 핸들러 재설정
+        setupEditableLinkHandlers(editableDiv);
+    }
+
+    // 설문 제목 동기화
+    function syncSurveyTitleValue(editableDiv) {
+        if (!editableDiv) return;
+        const hiddenInput = document.getElementById('survey-title-value');
+        if (hiddenInput) {
+            hiddenInput.value = editableDiv.innerHTML;
+        }
+        setupEditableLinkHandlers(editableDiv);
+    }
+
+    // 설문 설명 동기화
+    function syncSurveyDescValue(editableDiv) {
+        if (!editableDiv) return;
+        const hiddenInput = document.getElementById('survey-description-value');
+        if (hiddenInput) {
+            hiddenInput.value = editableDiv.innerHTML;
+        }
+        setupEditableLinkHandlers(editableDiv);
+    }
+
+    // 섹션 제목 동기화
+    function syncSectionTitleValue(editableDiv) {
+        if (!editableDiv) return;
+        const sectionItem = editableDiv.closest('.section-item');
+        if (!sectionItem) return;
+        const hiddenInput = sectionItem.querySelector('.section-title-value');
+        if (hiddenInput) {
+            hiddenInput.value = editableDiv.innerHTML;
+        }
+        setupEditableLinkHandlers(editableDiv);
+    }
+
+    // 섹션 설명 동기화
+    function syncSectionDescValue(editableDiv) {
+        if (!editableDiv) return;
+        const sectionItem = editableDiv.closest('.section-item');
+        if (!sectionItem) return;
+        const hiddenInput = sectionItem.querySelector('.section-desc-value');
+        if (hiddenInput) {
+            hiddenInput.value = editableDiv.innerHTML;
+        }
+        setupEditableLinkHandlers(editableDiv);
+    }
+
+    // contenteditable div 내 링크에 클릭 핸들러 설정
+    function setupEditableLinkHandlers(editableDiv) {
+        if (!editableDiv) return;
+        editableDiv.querySelectorAll('a').forEach(link => {
+            // 이미 핸들러가 설정되어 있으면 스킵
+            if (link.dataset.handlerSet) return;
+            link.dataset.handlerSet = 'true';
+            link.addEventListener('click', function(e) {
+                e.preventDefault();
+                e.stopPropagation();
+                openHyperlinkEditPopover(this, editableDiv);
+            });
+        });
+    }
+
+    // contenteditable용 하이퍼링크 삽입 다이얼로그
+    let _hyperlinkTargetEditable = null;
+    let _savedSelectionRange = null;  // 다이얼로그 열기 전 선택 범위 저장
+
+    function openHyperlinkDialogForEditable(editableDiv) {
+        _hyperlinkTargetEditable = editableDiv;
+
+        // 현재 선택 범위 저장 (다이얼로그 열기 전에)
+        const selection = window.getSelection();
+        if (selection.rangeCount > 0) {
+            const range = selection.getRangeAt(0);
+            // 선택 범위가 해당 editable 내에 있는지 확인
+            if (editableDiv.contains(range.commonAncestorContainer) ||
+                editableDiv === range.commonAncestorContainer) {
+                _savedSelectionRange = range.cloneRange();
+            } else {
+                _savedSelectionRange = null;
+            }
+        } else {
+            _savedSelectionRange = null;
+        }
+
+        document.getElementById('hyperlinkText').value = '';
+        document.getElementById('hyperlinkUrl').value = '';
+        document.getElementById('hyperlinkDialog').classList.remove('hidden');
+        document.getElementById('hyperlinkText').focus();
+    }
+
+    // 기존 미리보기 함수들 (하위 호환성 유지)
+    function syncTitleHtmlPreview(input) {
+        // contenteditable로 변경됨 - 더 이상 사용되지 않음
+    }
+
+    function syncDescriptionHtmlPreview(textarea) {
+        // contenteditable로 변경됨 - 더 이상 사용되지 않음
+    }
+
+    // 섹션/문항 description textarea 아래에 HTML 렌더링 미리보기를 동기화 (기존 - 섹션용으로 유지)
     function syncDescHtmlPreview(textarea) {
         if (!textarea) return;
+
+        // contenteditable인 경우 처리
+        if (textarea.getAttribute('contenteditable') === 'true') {
+            if (textarea.classList.contains('question-title-input')) {
+                syncTitleValue(textarea);
+            } else if (textarea.classList.contains('question-desc-input')) {
+                syncDescValue(textarea);
+            }
+            return;
+        }
+
+        // 섹션용 기존 로직
         const parentNode = textarea.parentNode;
         let preview = parentNode.querySelector('.desc-html-preview');
         if (!preview) {
@@ -1574,8 +1919,147 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
     function closeHyperlinkDialog() {
         document.getElementById('hyperlinkDialog').classList.add('hidden');
         _hyperlinkTargetTextarea = null;
+        _hyperlinkTargetEditable = null;
+        _savedSelectionRange = null;
+    }
+
+    // ==================== 하이퍼링크 수정 팝오버 ====================
+    let _currentEditingLink = null;  // 현재 수정 중인 링크 요소
+    let _currentEditingInput = null; // 현재 수정 중인 input/textarea
+
+    function openHyperlinkEditPopover(linkElement, inputElement) {
+        _currentEditingLink = linkElement;
+        _currentEditingInput = inputElement;
+
+        const popover = document.getElementById('hyperlinkEditPopover');
+        document.getElementById('editLinkText').value = linkElement.textContent;
+        document.getElementById('editLinkUrl').value = linkElement.getAttribute('href') || '';
+
+        // 링크 요소 위치 계산
+        const rect = linkElement.getBoundingClientRect();
+        popover.style.top = (rect.top - popover.offsetHeight - 8 + window.scrollY) + 'px';
+        popover.style.left = rect.left + 'px';
+
+        // 화면 밖으로 나가면 조정
+        popover.classList.remove('hidden');
+        const popoverRect = popover.getBoundingClientRect();
+        if (popoverRect.top < 0) {
+            popover.style.top = (rect.bottom + 8 + window.scrollY) + 'px';
+        }
+        if (popoverRect.right > window.innerWidth) {
+            popover.style.left = (window.innerWidth - popoverRect.width - 16) + 'px';
+        }
+
+        document.getElementById('editLinkText').focus();
+    }
+
+    function closeHyperlinkEditPopover() {
+        document.getElementById('hyperlinkEditPopover').classList.add('hidden');
+        _currentEditingLink = null;
+        _currentEditingInput = null;
+    }
+
+    function confirmEditLink() {
+        if (!_currentEditingLink || !_currentEditingInput) return;
+
+        const newText = document.getElementById('editLinkText').value.trim();
+        const newUrl = document.getElementById('editLinkUrl').value.trim();
+
+        if (!newText || !newUrl) {
+            showToast('텍스트와 URL을 모두 입력해주세요.', 'error');
+            return;
+        }
+
+        const allowedSchemes = ['http:', 'https:', 'mailto:'];
+        function tryParseUrl(s) { try { return new URL(s); } catch (e) { return null; } }
+        let parsedUrl = tryParseUrl(newUrl);
+        if (!parsedUrl || !allowedSchemes.includes(parsedUrl.protocol)) {
+            parsedUrl = tryParseUrl('https://' + newUrl);
+        }
+        if (!parsedUrl || !allowedSchemes.includes(parsedUrl.protocol)) {
+            showToast('올바른 URL을 입력해주세요.', 'error');
+            return;
+        }
+
+        // 링크 텍스트와 URL 업데이트
+        _currentEditingLink.textContent = newText;
+        _currentEditingLink.setAttribute('href', parsedUrl.href);
+
+        // contenteditable인 경우 hidden input 동기화
+        syncEditableToHiddenInput(_currentEditingInput);
+
+        closeHyperlinkEditPopover();
+        showToast('링크가 수정되었습니다.', 'success');
+    }
+
+    function deleteLinkFromPopover() {
+        if (!_currentEditingLink || !_currentEditingInput) return;
+
+        // 링크를 텍스트로 변환
+        const textNode = document.createTextNode(_currentEditingLink.textContent);
+        _currentEditingLink.parentNode.replaceChild(textNode, _currentEditingLink);
+
+        // contenteditable인 경우 hidden input 동기화
+        syncEditableToHiddenInput(_currentEditingInput);
+
+        closeHyperlinkEditPopover();
+        showToast('링크가 삭제되었습니다.', 'success');
+    }
+
+    // contenteditable div에서 hidden input으로 동기화
+    function syncEditableToHiddenInput(editableDiv) {
+        if (!editableDiv) return;
+
+        // 설문 제목/설명인 경우
+        if (editableDiv.id === 'survey-title') {
+            const hiddenInput = document.getElementById('survey-title-value');
+            if (hiddenInput) hiddenInput.value = editableDiv.innerHTML;
+            return;
+        }
+        if (editableDiv.id === 'survey-description') {
+            const hiddenInput = document.getElementById('survey-description-value');
+            if (hiddenInput) hiddenInput.value = editableDiv.innerHTML;
+            return;
+        }
+
+        // 섹션 제목/설명인 경우
+        const sectionItem = editableDiv.closest('.section-item');
+        if (sectionItem) {
+            if (editableDiv.classList.contains('section-title-input')) {
+                const hiddenInput = sectionItem.querySelector('.section-title-value');
+                if (hiddenInput) hiddenInput.value = editableDiv.innerHTML;
+                return;
+            }
+            if (editableDiv.classList.contains('section-desc-input')) {
+                const hiddenInput = sectionItem.querySelector('.section-desc-value');
+                if (hiddenInput) hiddenInput.value = editableDiv.innerHTML;
+                return;
+            }
+        }
+
+        // 문항 제목/설명인 경우
+        const questionItem = editableDiv.closest('.question-item');
+        if (questionItem) {
+            if (editableDiv.classList.contains('question-title-input')) {
+                const hiddenInput = questionItem.querySelector('.question-title-value');
+                if (hiddenInput) hiddenInput.value = editableDiv.innerHTML;
+            } else if (editableDiv.classList.contains('question-desc-input')) {
+                const hiddenInput = questionItem.querySelector('.question-desc-value');
+                if (hiddenInput) hiddenInput.value = editableDiv.innerHTML;
+            }
+        }
     }
 
+    // 팝오버 외부 클릭 시 닫기
+    document.addEventListener('click', function(e) {
+        const popover = document.getElementById('hyperlinkEditPopover');
+        if (!popover.classList.contains('hidden') &&
+            !popover.contains(e.target) &&
+            e.target !== _currentEditingLink) {
+            closeHyperlinkEditPopover();
+        }
+    });
+
     function confirmHyperlink() {
         const text = document.getElementById('hyperlinkText').value.trim();
         const url = document.getElementById('hyperlinkUrl').value.trim();
@@ -1593,6 +2077,44 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             showToast('올바른 URL을 입력해주세요. (예: https://example.com)', 'error');
             return;
         }
+
+        // contenteditable div 처리
+        if (_hyperlinkTargetEditable) {
+            const a = document.createElement('a');
+            a.href = parsedUrl.href;
+            a.textContent = text;
+
+            // 저장된 선택 범위가 있으면 해당 위치에, 없으면 맨 뒤에 삽입
+            if (_savedSelectionRange) {
+                const selection = window.getSelection();
+                selection.removeAllRanges();
+                selection.addRange(_savedSelectionRange);
+
+                _savedSelectionRange.deleteContents();
+                _savedSelectionRange.insertNode(a);
+
+                // 커서를 링크 뒤로 이동
+                const newRange = document.createRange();
+                newRange.setStartAfter(a);
+                newRange.collapse(true);
+                selection.removeAllRanges();
+                selection.addRange(newRange);
+            } else {
+                // 저장된 범위가 없으면 맨 뒤에 삽입
+                _hyperlinkTargetEditable.appendChild(a);
+            }
+
+            // hidden input 동기화 및 링크 핸들러 설정
+            syncEditableToHiddenInput(_hyperlinkTargetEditable);
+            setupEditableLinkHandlers(_hyperlinkTargetEditable);
+
+            _hyperlinkTargetEditable = null;
+            _savedSelectionRange = null;
+            closeHyperlinkDialog();
+            return;
+        }
+
+        // 기존 textarea/input 처리
         if (_hyperlinkTargetTextarea) {
             const a = document.createElement('a');
             a.href = parsedUrl.href;
@@ -1606,7 +2128,9 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             _hyperlinkTargetTextarea.focus();
 
             if (_hyperlinkTargetTextarea.classList.contains('section-desc-input') ||
-                _hyperlinkTargetTextarea.classList.contains('question-desc-input')) {
+                _hyperlinkTargetTextarea.classList.contains('question-desc-input') ||
+                _hyperlinkTargetTextarea.classList.contains('section-title-input') ||
+                _hyperlinkTargetTextarea.classList.contains('question-title-input')) {
                 syncDescHtmlPreview(_hyperlinkTargetTextarea);
             } else if (_hyperlinkTargetTextarea.classList.contains('option-text-input')) {
                 syncOptionHtmlPreview(_hyperlinkTargetTextarea);
@@ -1879,40 +2403,33 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             questionIdMap.clear();
             questionCounter = 0;
 
-            // 입력 필드 초기화
-            document.getElementById('survey-title').value = data.title;
-            document.getElementById('survey-description').value = data.description;
-            document.getElementById('desc-preview').innerHTML = data.description === null
-                ? '설문 설명을 입력하세요' : data.description;
+            // 입력 필드 초기화 (contenteditable)
+            const titleDiv = document.getElementById('survey-title');
+            const descDiv = document.getElementById('survey-description');
+            titleDiv.innerHTML = data.title || '';
+            descDiv.innerHTML = data.description || '';
+            document.getElementById('survey-title-value').value = data.title || '';
+            document.getElementById('survey-description-value').value = data.description || '';
+            setupEditableLinkHandlers(titleDiv);
+            setupEditableLinkHandlers(descDiv);
 
             document.getElementById('section-list').innerHTML = '';
             sectionCounter = 0;
             questionCounter = 0;
             questionIdMap.clear();
 
-            // 이미지 초기화
-            document.getElementById('survey-image-url-input').value = '';
-            document.getElementById('survey-image-preview').classList.add('hidden');
-
             // 기존 문항 제거
             const existingQuestions = document.querySelectorAll('.question-item');
             existingQuestions.forEach(q => q.remove());
         } else if (mode === 'edit') {
-            document.getElementById('survey-title').value = data.title;
-            document.getElementById('survey-description').value = data.description;
-            document.getElementById('desc-preview').innerHTML = data.description === null
-                ? '설문 설명을 입력하세요' : data.description;
-
-            // 설문 이미지 표시
-            const surveyImageUrl = data.imageUrl || null;
-            document.getElementById('survey-image-url-input').value = surveyImageUrl || '';
-            const surveyImagePreview = document.getElementById('survey-image-preview');
-            if (surveyImageUrl) {
-                surveyImagePreview.querySelector('img').src = surveyImageUrl;
-                surveyImagePreview.classList.remove('hidden');
-            } else {
-                surveyImagePreview.classList.add('hidden');
-            }
+            const titleDiv = document.getElementById('survey-title');
+            const descDiv = document.getElementById('survey-description');
+            titleDiv.innerHTML = data.title || '';
+            descDiv.innerHTML = data.description || '';
+            document.getElementById('survey-title-value').value = data.title || '';
+            document.getElementById('survey-description-value').value = data.description || '';
+            setupEditableLinkHandlers(titleDiv);
+            setupEditableLinkHandlers(descDiv);
         }
     }
 
@@ -1937,25 +2454,19 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             <div class="flex items-start gap-2 flex-1">
                 <span class="bg-slate-700 text-white text-xs px-2 py-1 rounded font-bold mt-1">SECTION <span class="section-display-num">${newSectionNumber}</span></span>
                 <div class="flex flex-col gap-2 flex-1">
-                    <textarea class="section-title-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-500 text-sm font-bold text-slate-700 placeholder-slate-400 w-full focus:outline-none focus:border-indigo-500 resize-none px-2 py-1" placeholder="섹션 제목 입력 (필수)" rows="1" oninput="onSectionInfoChange(this); autoResizeTextarea(this);" required>섹션 ${newSectionNumber}</textarea>
-                    <textarea class="section-desc-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-400 text-sm text-slate-500 placeholder-slate-400 w-full focus:outline-none focus:border-indigo-400 resize-none px-2 py-1" placeholder="섹션 설명 (선택사항)" rows="1" oninput="onSectionInfoChange(this); autoResizeTextarea(this);"></textarea>
+                    <input type="hidden" class="section-title-value" value="섹션 ${newSectionNumber}">
+                    <div class="section-title-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-500 text-sm font-bold text-slate-700 w-full focus:outline-none focus:border-indigo-500 px-2 py-1 min-h-[28px]" contenteditable="true" data-placeholder="섹션 제목 입력 (필수)" oninput="syncSectionTitleValue(this); onSectionInfoChange(this);">섹션 ${newSectionNumber}</div>
                     <div class="flex gap-2 mt-1">
-                        <input type="hidden" class="section-image-url-input" value="">
-                        <label class="cursor-pointer text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 inline-flex items-center gap-1">
-                            <i class="fas fa-image text-xs"></i> 이미지
-                            <input type="file" class="hidden section-image-file-input" accept="image/*" onchange="handleSectionImageUpload(this)">
-                        </label>
-                        <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialog(this.closest('.section-item').querySelector('.section-desc-input'))">
-                            <i class="fas fa-link text-xs"></i> 하이퍼링크
+                        <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialogForEditable(this.closest('.section-item').querySelector('.section-title-input'))">
+                            <i class="fas fa-link text-xs"></i> 제목 하이퍼링크
                         </button>
                     </div>
-                    <div class="section-image-preview hidden">
-                        <div class="relative inline-block">
-                            <img class="section-image-tag max-h-24 rounded border border-slate-200" src="" alt="섹션 이미지">
-                            <button type="button" class="absolute -top-2 -right-2 w-5 h-5 bg-red-500 text-white rounded-full text-xs flex items-center justify-center hover:bg-red-600" onclick="removeSectionImage(this)">
-                                <i class="fas fa-times text-[8px]"></i>
-                            </button>
-                        </div>
+                    <input type="hidden" class="section-desc-value" value="">
+                    <div class="section-desc-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-400 text-sm text-slate-500 w-full focus:outline-none focus:border-indigo-400 px-2 py-1 min-h-[28px]" contenteditable="true" data-placeholder="섹션 설명 (선택사항)" oninput="syncSectionDescValue(this); onSectionInfoChange(this);"></div>
+                    <div class="flex gap-2 mt-1">
+                        <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialogForEditable(this.closest('.section-item').querySelector('.section-desc-input'))">
+                            <i class="fas fa-link text-xs"></i> 설명 하이퍼링크
+                        </button>
                     </div>
                 </div>
             </div>
@@ -1983,7 +2494,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                         <i class="fas fa-plus text-slate-400 group-hover:text-indigo-600 mr-2"></i>
                         <span class="text-sm font-bold text-slate-500 group-hover:text-indigo-600">추가</span>
                     </button>
-                    <select class="new-question-type text-xs border border-slate-300 rounded px-2 py-1.5 text-slate-600 focus:border-indigo-500 outline-none bg-white">
+                    <select class="new-question-type text-xs border border-slate-300 rounded px-2 py-1.5 text-slate-600 focus:border-indigo-500 outline-none bg-white" onchange="toggleImageUploadArea(this)">
                         <option value="choice" selected>객관식</option>
                         <option value="text">단답형</option>
                         <option value="textarea">장문형</option>
@@ -1991,11 +2502,33 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                         <option value="nps">NPS</option>
                         <option value="number">숫자형</option>
                         <option value="date">날짜형</option>
+                        <option value="image">이미지</option>
                     </select>
                 </div>
                 <div class="flex-1 flex flex-col gap-2">
                     <input type="text" class="new-question-title w-full text-sm font-medium border border-slate-200 rounded px-3 py-2 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 outline-none" placeholder="이 섹션에 추가할 문항 제목">
                     <textarea class="new-question-desc w-full text-sm text-slate-600 border border-slate-200 rounded px-3 py-2 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 outline-none resize-none" rows="1" placeholder="설명 (선택사항)"></textarea>
+                    <!-- 이미지 문항용 사전 업로드 영역 -->
+                    <div class="image-pre-upload-area hidden mt-2">
+                        <input type="hidden" class="new-question-image-url" value="">
+                        <div class="bg-purple-50 border-2 border-dashed border-purple-300 rounded-lg p-3">
+                            <div class="flex items-center gap-3">
+                                <label class="cursor-pointer px-3 py-1.5 bg-purple-600 text-white text-xs font-medium rounded hover:bg-purple-700 transition-colors inline-flex items-center gap-1">
+                                    <i class="fas fa-upload"></i> 이미지 업로드 <span class="text-red-300">*필수</span>
+                                    <input type="file" class="hidden new-question-image-file" accept="image/*" onchange="handlePreUploadImage(this)">
+                                </label>
+                                <span class="new-question-image-status text-xs text-purple-600">이미지를 먼저 업로드하세요</span>
+                            </div>
+                            <div class="new-question-image-preview hidden mt-2">
+                                <div class="relative inline-block">
+                                    <img class="new-question-image-tag max-h-24 rounded border border-purple-200" src="" alt="업로드된 이미지" referrerpolicy="no-referrer">
+                                    <button type="button" class="absolute -top-1.5 -right-1.5 w-4 h-4 bg-red-500 text-white rounded-full text-xs flex items-center justify-center hover:bg-red-600" onclick="removePreUploadImage(this)">
+                                        <i class="fas fa-times text-[7px]"></i>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -2022,7 +2555,6 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         const sectionId = sectionData.sectionId || '';
         const nextSection = (sectionData.nextSection !== undefined && sectionData.nextSection !== null)
             ? sectionData.nextSection : 0;
-        const imageUrl = sectionData.imageUrl || null;
 
         const sectionItem = document.createElement('div');
         sectionItem.className = 'section-item bg-slate-50 border border-slate-300 rounded-xl p-6 relative transition-all';
@@ -2035,25 +2567,19 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             <div class="flex items-start gap-2 flex-1">
                 <span class="bg-slate-700 text-white text-xs px-2 py-1 rounded font-bold mt-1">SECTION <span class="section-display-num">${newSectionNumber}</span></span>
                 <div class="flex flex-col gap-2 flex-1">
-                    <textarea class="section-title-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-500 text-sm font-bold text-slate-700 placeholder-slate-400 w-full focus:outline-none focus:border-indigo-500 resize-none px-2 py-1" placeholder="섹션 제목 입력 (필수)" rows="1" oninput="onSectionInfoChange(this); autoResizeTextarea(this);" required>${escapeHtml(title)}</textarea>
-                    <textarea class="section-desc-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-400 text-sm text-slate-500 placeholder-slate-400 w-full focus:outline-none focus:border-indigo-400 resize-none px-2 py-1" placeholder="섹션 설명 (선택사항)" rows="1" oninput="onSectionInfoChange(this); autoResizeTextarea(this);">${escapeHtml(description)}</textarea>
+                    <input type="hidden" class="section-title-value" value="${escapeHtml(title)}">
+                    <div class="section-title-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-500 text-sm font-bold text-slate-700 w-full focus:outline-none focus:border-indigo-500 px-2 py-1 min-h-[28px]" contenteditable="true" data-placeholder="섹션 제목 입력 (필수)" oninput="syncSectionTitleValue(this); onSectionInfoChange(this);">${title}</div>
                     <div class="flex gap-2 mt-1">
-                        <input type="hidden" class="section-image-url-input" value="${escapeHtml(imageUrl || '')}">
-                        <label class="cursor-pointer text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 inline-flex items-center gap-1">
-                            <i class="fas fa-image text-xs"></i> 이미지
-                            <input type="file" class="hidden section-image-file-input" accept="image/*" onchange="handleSectionImageUpload(this)">
-                        </label>
-                        <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialog(this.closest('.section-item').querySelector('.section-desc-input'))">
-                            <i class="fas fa-link text-xs"></i> 하이퍼링크
+                        <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialogForEditable(this.closest('.section-item').querySelector('.section-title-input'))">
+                            <i class="fas fa-link text-xs"></i> 제목 하이퍼링크
                         </button>
                     </div>
-                    <div class="section-image-preview ${imageUrl ? '' : 'hidden'}">
-                        <div class="relative inline-block">
-                            <img class="section-image-tag max-h-24 rounded border border-slate-200" src="${escapeHtml(imageUrl || '')}" alt="섹션 이미지">
-                            <button type="button" class="absolute -top-2 -right-2 w-5 h-5 bg-red-500 text-white rounded-full text-xs flex items-center justify-center hover:bg-red-600" onclick="removeSectionImage(this)">
-                                <i class="fas fa-times text-[8px]"></i>
-                            </button>
-                        </div>
+                    <input type="hidden" class="section-desc-value" value="${escapeHtml(description)}">
+                    <div class="section-desc-input bg-transparent border border-slate-200 rounded focus:ring-1 focus:ring-indigo-400 text-sm text-slate-500 w-full focus:outline-none focus:border-indigo-400 px-2 py-1 min-h-[28px]" contenteditable="true" data-placeholder="섹션 설명 (선택사항)" oninput="syncSectionDescValue(this); onSectionInfoChange(this);">${description}</div>
+                    <div class="flex gap-2 mt-1">
+                        <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialogForEditable(this.closest('.section-item').querySelector('.section-desc-input'))">
+                            <i class="fas fa-link text-xs"></i> 설명 하이퍼링크
+                        </button>
                     </div>
                 </div>
             </div>
@@ -2081,7 +2607,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                         <i class="fas fa-plus text-slate-400 group-hover:text-indigo-600 mr-2"></i>
                         <span class="text-sm font-bold text-slate-500 group-hover:text-indigo-600">추가</span>
                     </button>
-                    <select class="new-question-type text-xs border border-slate-300 rounded px-2 py-1.5 text-slate-600 focus:border-indigo-500 outline-none bg-white">
+                    <select class="new-question-type text-xs border border-slate-300 rounded px-2 py-1.5 text-slate-600 focus:border-indigo-500 outline-none bg-white" onchange="toggleImageUploadArea(this)">
                         <option value="choice" selected>객관식</option>
                         <option value="text">단답형</option>
                         <option value="textarea">장문형</option>
@@ -2089,11 +2615,33 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                         <option value="nps">NPS</option>
                         <option value="number">숫자형</option>
                         <option value="date">날짜형</option>
+                        <option value="image">이미지</option>
                     </select>
                 </div>
                 <div class="flex-1 flex flex-col gap-2">
                     <input type="text" class="new-question-title w-full text-sm font-medium border border-slate-200 rounded px-3 py-2 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 outline-none" placeholder="이 섹션에 추가할 문항 제목">
                     <textarea class="new-question-desc w-full text-sm text-slate-600 border border-slate-200 rounded px-3 py-2 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 outline-none resize-none" rows="1" placeholder="설명 (선택사항)"></textarea>
+                    <!-- 이미지 문항용 사전 업로드 영역 -->
+                    <div class="image-pre-upload-area hidden mt-2">
+                        <input type="hidden" class="new-question-image-url" value="">
+                        <div class="bg-purple-50 border-2 border-dashed border-purple-300 rounded-lg p-3">
+                            <div class="flex items-center gap-3">
+                                <label class="cursor-pointer px-3 py-1.5 bg-purple-600 text-white text-xs font-medium rounded hover:bg-purple-700 transition-colors inline-flex items-center gap-1">
+                                    <i class="fas fa-upload"></i> 이미지 업로드 <span class="text-red-300">*필수</span>
+                                    <input type="file" class="hidden new-question-image-file" accept="image/*" onchange="handlePreUploadImage(this)">
+                                </label>
+                                <span class="new-question-image-status text-xs text-purple-600">이미지를 먼저 업로드하세요</span>
+                            </div>
+                            <div class="new-question-image-preview hidden mt-2">
+                                <div class="relative inline-block">
+                                    <img class="new-question-image-tag max-h-24 rounded border border-purple-200" src="" alt="업로드된 이미지" referrerpolicy="no-referrer">
+                                    <button type="button" class="absolute -top-1.5 -right-1.5 w-4 h-4 bg-red-500 text-white rounded-full text-xs flex items-center justify-center hover:bg-red-600" onclick="removePreUploadImage(this)">
+                                        <i class="fas fa-times text-[7px]"></i>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -2104,10 +2652,16 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         // refreshAllJumpSelects();
         // refreshAllJumpSelects()는 호출하지 않음 - 모든 섹션 추가 후 renderLoadedQuestions에서 한 번만 호출
 
-        // 기존 description에 HTML이 있으면 미리보기 동기화
+        // 기존 description에 HTML(링크)이 있으면 링크 핸들러 설정
         if (description) {
             const descInput = sectionItem.querySelector('.section-desc-input');
-            if (descInput) syncDescHtmlPreview(descInput);
+            if (descInput) setupEditableLinkHandlers(descInput);
+        }
+
+        // 기존 title에 HTML(링크)이 있으면 링크 핸들러 설정
+        if (title) {
+            const titleInput = sectionItem.querySelector('.section-title-input');
+            if (titleInput) setupEditableLinkHandlers(titleInput);
         }
     }
 
@@ -2221,19 +2775,37 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             const order = index + 1;
             const titleInput = section.querySelector('.section-title-input');
             const descInput = section.querySelector('.section-desc-input');
+            const titleValueInput = section.querySelector('.section-title-value');
+            const descValueInput = section.querySelector('.section-desc-value');
             const nextSectionSelect = section.querySelector('.section-next-select');
 
             // 드롭다운에서 선택된 다음 섹션 값 사용
             const nextSection = nextSectionSelect ? parseInt(nextSectionSelect.value) : 0;
 
-            const imageUrlInput = section.querySelector('.section-image-url-input');
+            // contenteditable인 경우 hidden input 또는 innerHTML 사용
+            let titleValue = '';
+            let descValue = '';
+            if (titleValueInput) {
+                titleValue = titleValueInput.value.trim();
+            } else if (titleInput) {
+                titleValue = (titleInput.innerHTML || titleInput.value || '').trim();
+            }
+            if (descValueInput) {
+                descValue = descValueInput.value.trim();
+            } else if (descInput) {
+                descValue = (descInput.innerHTML || descInput.value || '').trim();
+            }
+
+            // 저장 전 HTML sanitize (a 태그와 href 속성만 허용)
+            titleValue = sanitizeHtmlForSave(titleValue);
+            descValue = sanitizeHtmlForSave(descValue);
+
             sections.push({
                 sectionId: (sectionId !== null) ? Number(sectionId) : null,
-                title: titleInput ? titleInput.value.trim() : `섹션 ${order}`,
-                description: descInput ? descInput.value.trim() : '',
+                title: titleValue || `섹션 ${order}`,
+                description: descValue,
                 order: order,
-                nextSection: nextSection,
-                imageUrl: imageUrlInput ? (imageUrlInput.value.trim() || null) : null
+                nextSection: nextSection
             });
         });
 
@@ -2378,11 +2950,13 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         const titleInput = formContainer.querySelector('.new-question-title');
         const descInput = formContainer.querySelector('.new-question-desc');
         const typeInput = formContainer.querySelector('.new-question-type');
+        const imageUrlInput = formContainer.querySelector('.new-question-image-url');
 
         const title = titleInput.value.trim();
         const description = descInput.value.trim();
         const frontendType = typeInput.value;
         const section = parseInt(sectionItem.getAttribute('data-section-order'));
+        const preUploadedImageUrl = imageUrlInput ? imageUrlInput.value.trim() : '';
 
         if (!title) {
             titleInput.focus();
@@ -2393,36 +2967,57 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             return;
         }
 
+        // 이미지 문항인 경우 이미지 필수 체크
+        if (frontendType === 'image' && !preUploadedImageUrl) {
+            showToast('이미지 문항에는 이미지를 먼저 업로드해야 합니다.', 'error');
+            const uploadArea = formContainer.querySelector('.image-pre-upload-area');
+            if (uploadArea) {
+                uploadArea.classList.add('ring-2', 'ring-red-400');
+                setTimeout(() => {
+                    uploadArea.classList.remove('ring-2', 'ring-red-400');
+                }, 2000);
+            }
+            return;
+        }
+
         try {
             // 전체 문항 수 계산 (순서용)
             const totalQuestions = document.querySelectorAll('.question-item').length;
 
-            // 3. API 호출
+            // 3. API 호출 (이미지 문항인 경우 imageUrl 포함)
+            const questionData = {
+                title: title,
+                description: frontendType === 'image' ? '' : description, // 이미지 문항은 설명 없음
+                questionType: QUESTION_TYPE_MAP[frontendType],
+                questionOrder: totalQuestions + 1,
+                section: section
+            };
+
+            // 이미지 URL이 있으면 추가
+            if (preUploadedImageUrl) {
+                questionData.imageUrl = preUploadedImageUrl;
+            }
+
             const response = await apiCall(`/survey-form/surveys/${currentSurveyId}/questions`, 'POST',
                 {
-                    questions: [
-                        {
-                            title: title,
-                            description: description,
-                            questionType: QUESTION_TYPE_MAP[frontendType],
-                            questionOrder: totalQuestions + 1,
-                            section: section
-                        }
-                    ]
+                    questions: [questionData]
                 }
             );
 
-            // 4. UI 생성 및 추가 (여기가 수정됨)
+            // 4. UI 생성 및 추가
             const questionsContainer = sectionItem.querySelector('.section-questions');
 
             // addNewQuestion은 이제 요소를 반환만 함. appendChild는 여기서 수행.
-            // description은 API 응답에 없을 수 있으므로 입력된 값 사용
             const newQuestionEl = addNewQuestion(
                 response.questionId,
                 response.title || title,
-                description,  // 입력된 description 값 사용
+                frontendType === 'image' ? '' : description,  // 이미지 문항은 설명 없음
                 totalQuestions + 1, // order (UI 표시용)
-                QUESTION_TYPE_REVERSE_MAP[response.type] || frontendType
+                QUESTION_TYPE_REVERSE_MAP[response.type] || frontendType,
+                false, // isSectionDecidable
+                false, // hasCustomInput
+                null,  // defaultDate
+                preUploadedImageUrl || null // imageUrl
             );
 
             // 비어있음 안내문구가 있다면 숨김 처리
@@ -2434,6 +3029,18 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             // 5. 입력란 초기화
             titleInput.value = '';
             descInput.value = '';
+            if (imageUrlInput) imageUrlInput.value = '';
+            // 이미지 업로드 영역 초기화
+            const uploadArea = formContainer.querySelector('.image-pre-upload-area');
+            if (uploadArea) {
+                uploadArea.classList.add('hidden');
+                const preview = uploadArea.querySelector('.new-question-image-preview');
+                if (preview) preview.classList.add('hidden');
+                const status = uploadArea.querySelector('.new-question-image-status');
+                if (status) status.textContent = '이미지를 먼저 업로드하세요';
+            }
+            // 타입 선택을 기본값으로
+            typeInput.value = 'choice';
 
             updateQuestionNumbers();
             // 새 문항에 대한 섹션 이동 옵션 초기화 (분기 설정이 꺼져있으므로 숨김 상태로 시작)
@@ -2469,6 +3076,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         const showNps = type === 'nps' ? '' : 'hidden';
         const showNumber = type === 'number' ? '' : 'hidden';
         const showDate = type === 'date' ? '' : 'hidden';
+        const showImage = type === 'image' ? '' : 'hidden';
 
         // [신규] 섹션 분기 설정 체크박스 표시 여부 (객관식일 때만)
         const showRouteConfig = type === 'choice' ? '' : 'hidden';
@@ -2479,6 +3087,9 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         // 분기 설정이 true이면 옵션의 select box를 보여줌
         const jumpSelectClass = isSectionDecidable ? '' : 'hidden';
 
+        // 이미지 타입은 설명 없이 제목만 표시
+        const showDescription = type === 'image' ? 'hidden' : '';
+
         newQuestion.innerHTML = `
             <div class="w-64 bg-slate-50 border-r border-slate-200 p-4 flex flex-col gap-4 shrink-0">
                 <div class="flex justify-between items-center">
@@ -2521,27 +3132,80 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             </div>
 
             <div class="flex-1 p-6">
-                <input type="text" class="question-title-input w-full text-lg font-bold border-b-2 border-slate-100 focus:border-indigo-500 outline-none pb-2 mb-2 transition-colors" placeholder="질문을 입력하세요" value="${escapeHtml(title)}">
-                <textarea class="question-desc-input w-full text-sm text-slate-500 border-b border-slate-100 focus:border-indigo-400 outline-none pb-2 transition-all resize-none overflow-hidden" placeholder="문항에 대한 설명을 입력하세요 (선택사항)" rows="1" onfocus="expandDescTextarea(this)" onblur="collapseDescTextarea(this)">${escapeHtml(description)}</textarea>
-                <div class="flex gap-2 mt-2 mb-3">
+                <input type="hidden" class="question-title-value" value="${escapeHtml(title)}">
+                <div class="question-title-input w-full text-lg font-bold border-b-2 border-slate-100 focus:border-indigo-500 outline-none pb-2 mb-2 transition-colors" contenteditable="true" data-placeholder="질문을 입력하세요" oninput="syncTitleValue(this)">${title || ''}</div>
+                <div class="flex items-center gap-2 mt-1 mb-2">
+                    <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 shrink-0" onclick="openHyperlinkDialogForEditable(this.closest('.question-item').querySelector('.question-title-input'))">
+                        <i class="fas fa-link text-xs"></i> 제목 하이퍼링크
+                    </button>
+                </div>
+                <input type="hidden" class="question-desc-value" value="${escapeHtml(description)}">
+                <div class="question-desc-input ${showDescription} w-full text-sm text-slate-500 border-b border-slate-100 focus:border-indigo-400 outline-none pb-2 transition-all min-h-[28px]" contenteditable="true" data-placeholder="문항에 대한 설명을 입력하세요 (선택사항)" oninput="syncDescValue(this)">${description || ''}</div>
+                <div class="flex items-center gap-2 mt-2 mb-3 ${showDescription}">
+                    <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 shrink-0" onclick="openHyperlinkDialogForEditable(this.closest('.question-item').querySelector('.question-desc-input'))">
+                        <i class="fas fa-link text-xs"></i> 설명 하이퍼링크
+                    </button>
+                </div>
+                <div class="flex gap-2 mt-2 mb-3 ${type === 'image' ? 'hidden' : ''}">
                     <input type="hidden" class="question-image-url-input" value="${escapeHtml(imageUrl || '')}">
                     <label class="cursor-pointer text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400 inline-flex items-center gap-1">
                         <i class="fas fa-image text-xs"></i> 이미지
                         <input type="file" class="hidden question-image-file-input" accept="image/*" onchange="handleQuestionImageUpload(this)">
                     </label>
-                    <button type="button" class="text-xs text-slate-500 hover:text-indigo-600 px-2 py-1 rounded border border-slate-200 hover:border-indigo-400" onclick="openHyperlinkDialog(this.closest('.question-item').querySelector('.question-desc-input'))">
-                        <i class="fas fa-link text-xs"></i> 하이퍼링크
-                    </button>
                 </div>
-                <div class="question-image-preview ${imageUrl ? '' : 'hidden'} mb-3">
+                <div class="question-image-preview ${imageUrl ? '' : 'hidden'} mb-3 ${type === 'image' ? 'hidden' : ''}">
                     <div class="relative inline-block">
-                        <img class="question-image-tag max-h-32 rounded border border-slate-200" src="${escapeHtml(imageUrl || '')}" alt="문항 이미지">
+                        <img class="question-image-tag max-h-32 rounded border border-slate-200" src="${escapeHtml(imageUrl || '')}" alt="문항 이미지" referrerpolicy="no-referrer">
                         <button type="button" class="absolute -top-2 -right-2 w-5 h-5 bg-red-500 text-white rounded-full text-xs flex items-center justify-center hover:bg-red-600" onclick="removeQuestionImage(this)">
                             <i class="fas fa-times text-[8px]"></i>
                         </button>
                     </div>
                 </div>
 
+                <!-- 이미지 문항 전용 이미지 업로드 영역 (단순화) -->
+                <div class="image-upload-required ${type === 'image' ? '' : 'hidden'} mb-3">
+                    <input type="hidden" class="question-image-url-input-for-image-type" value="${escapeHtml(imageUrl || '')}">
+
+                    <!-- 이미지가 없을 때: 업로드 버튼만 표시 -->
+                    <div class="image-type-empty ${imageUrl ? 'hidden' : ''} flex items-center gap-2">
+                        <label class="cursor-pointer px-3 py-1.5 bg-purple-600 text-white text-xs font-medium rounded hover:bg-purple-700 transition-colors inline-flex items-center gap-1">
+                            <i class="fas fa-upload"></i> 이미지 업로드 <span class="text-purple-200">*필수</span>
+                            <input type="file" class="hidden image-type-file-input" accept="image/*" onchange="handleImageTypeUpload(this)">
+                        </label>
+                    </div>
+
+                    <!-- 이미지가 있을 때: 미리보기 + 변경/삭제 버튼 -->
+                    <div class="image-type-preview ${imageUrl ? '' : 'hidden'}">
+                        <div class="flex items-start gap-3">
+                            <div class="relative inline-block image-type-container">
+                                <img class="image-type-tag max-h-40 rounded border border-slate-200" src="${escapeHtml(imageUrl || '')}" alt="이미지 문항 이미지" referrerpolicy="no-referrer" onerror="handleImageTypeLoadError(this)">
+                            </div>
+                            <!-- 이미지 로드 실패 시 표시될 fallback -->
+                            <div class="image-type-fallback hidden flex-1">
+                                <div class="bg-amber-50 border border-amber-200 rounded p-2">
+                                    <div class="flex items-center gap-1 text-amber-600 text-xs mb-1">
+                                        <i class="fas fa-exclamation-triangle"></i>
+                                        <span>이미지 로드 실패</span>
+                                    </div>
+                                    <p class="text-xs text-slate-500 break-all image-type-fallback-url">${escapeHtml(imageUrl || '')}</p>
+                                </div>
+                            </div>
+                            <div class="flex flex-col gap-1">
+                                <label class="cursor-pointer px-2 py-1 bg-slate-100 text-slate-600 text-xs rounded hover:bg-slate-200 transition-colors inline-flex items-center gap-1">
+                                    <i class="fas fa-sync-alt"></i> 변경
+                                    <input type="file" class="hidden image-type-file-input" accept="image/*" onchange="handleImageTypeUpload(this)">
+                                </label>
+                                <button type="button" class="px-2 py-1 bg-red-50 text-red-600 text-xs rounded hover:bg-red-100 transition-colors inline-flex items-center gap-1" onclick="removeImageTypeImage(this)">
+                                    <i class="fas fa-trash-alt"></i> 삭제
+                                </button>
+                            </div>
+                        </div>
+                        <div class="mt-1">
+                            <span class="image-type-url-display text-xs text-slate-400 break-all">${escapeHtml(imageUrl || '')}</span>
+                        </div>
+                    </div>
+                </div>
+
                 <div class="choice-options space-y-3 pl-2 ${showChoice}">
                     <div class="options-container" data-question-id="${questionId}">
                         ${type === 'choice' ? getInitialOptionHTML(questionId, jumpSelectClass) : ''}
@@ -2624,16 +3288,28 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
                         </div>
                     </div>
                 </div>
+                <div class="image-options ${showImage}">
+                </div>
             </div>
         `;
 
         // 주의: 이 함수는 appendChild를 하지 않고 요소를 반환만 합니다.
         // 호출자가 적절한 위치에 append 해야 합니다.
 
-        // 기존 description에 HTML이 있으면 미리보기 동기화
+        // 기존 title에 HTML(링크)이 있으면 링크 핸들러 설정
+        if (title) {
+            const titleInput = newQuestion.querySelector('.question-title-input');
+            if (titleInput) {
+                setupEditableLinkHandlers(titleInput);
+            }
+        }
+
+        // 기존 description에 HTML(링크)이 있으면 링크 핸들러 설정
         if (description) {
             const descInput = newQuestion.querySelector('.question-desc-input');
-            if (descInput) syncDescHtmlPreview(descInput);
+            if (descInput) {
+                setupEditableLinkHandlers(descInput);
+            }
         }
 
         return newQuestion;
@@ -3128,7 +3804,7 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             </div>
             <div class="option-image-preview hidden ml-6">
                 <div class="relative inline-block">
-                    <img class="option-image-tag max-h-16 rounded border border-slate-200" src="" alt="보기 이미지">
+                    <img class="option-image-tag max-h-16 rounded border border-slate-200" src="" alt="보기 이미지" referrerpolicy="no-referrer">
                     <button type="button" class="absolute -top-1.5 -right-1.5 w-4 h-4 bg-red-500 text-white rounded-full text-xs flex items-center justify-center hover:bg-red-600" onclick="removeOptionImage(this)">
                         <i class="fas fa-times text-[7px]"></i>
                     </button>
@@ -3349,17 +4025,10 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
         // 가격 초기 계산
         calculateTotalPrice();
 
-        // 설문 이미지 초기화 (builder에서 설정한 이미지 또는 기존 이미지)
-        const builderImageUrl = document.getElementById('survey-image-url-input')?.value?.trim() || '';
-        document.getElementById('publish-image-url-input').value = builderImageUrl;
-        if (builderImageUrl) {
-            document.getElementById('publish-image-tag').src = builderImageUrl;
-            document.getElementById('publish-image-preview').classList.remove('hidden');
-            document.getElementById('publish-image-remove-btn').classList.remove('hidden');
-        } else {
-            document.getElementById('publish-image-preview').classList.add('hidden');
-            document.getElementById('publish-image-remove-btn').classList.add('hidden');
-        }
+        // 설문 대표 이미지 초기화
+        document.getElementById('publish-image-url-input').value = '';
+        document.getElementById('publish-image-preview').classList.add('hidden');
+        document.getElementById('publish-image-remove-btn').classList.add('hidden');
 
         document.getElementById('publishModal').classList.remove('hidden');
     }
@@ -3668,22 +4337,14 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             viewButtons.classList.remove('hidden');
             addSectionBtn.classList.add('hidden');
 
-            surveyTitle.readOnly = true;
+            // contenteditable div 비활성화
+            surveyTitle.setAttribute('contenteditable', 'false');
             surveyTitle.classList.add('bg-slate-50', 'cursor-not-allowed');
-            surveyDescription.readOnly = true;
+            surveyDescription.setAttribute('contenteditable', 'false');
             surveyDescription.classList.add('bg-slate-50', 'cursor-not-allowed');
 
             // 모든 입력 필드 비활성화
             disableAllInputs();
-
-            // 섹션/문항 description textarea를 렌더링된 div로 교체
-            document.querySelectorAll('.section-desc-input, .question-desc-input').forEach(textarea => {
-                const rendered = document.createElement('div');
-                rendered.className = 'desc-rendered-preview text-sm text-slate-500 px-2 py-1 leading-relaxed';
-                rendered.innerHTML = textarea.value || '';
-                textarea.classList.add('hidden');
-                textarea.parentNode.insertBefore(rendered, textarea.nextSibling);
-            });
         } else {
             // 편집 모드
             modeBadge.textContent = 'EDIT MODE';
@@ -3693,16 +4354,11 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
             viewButtons.classList.add('hidden');
             addSectionBtn.classList.remove('hidden');
 
-            surveyTitle.readOnly = false;
+            // contenteditable div 활성화
+            surveyTitle.setAttribute('contenteditable', 'true');
             surveyTitle.classList.remove('bg-slate-50', 'cursor-not-allowed');
-            surveyDescription.readOnly = false;
+            surveyDescription.setAttribute('contenteditable', 'true');
             surveyDescription.classList.remove('bg-slate-50', 'cursor-not-allowed');
-
-            // 렌더링 div 제거하고 textarea 복원
-            document.querySelectorAll('.desc-rendered-preview').forEach(div => div.remove());
-            document.querySelectorAll('.section-desc-input, .question-desc-input').forEach(textarea => {
-                textarea.classList.remove('hidden');
-            });
         }
     }
 
@@ -3710,13 +4366,19 @@ <h3 class="font-bold text-slate-700 mb-4"><i class="fas fa-link mr-2 text-indigo
     function disableAllInputs() {
         const sectionList = document.getElementById('section-list');
 
-        // 섹션 내 모든 입력 필드 비활성화
+        // 섹션 내 모든 입력 필드 비활성화 (일반 input, textarea, select)
         sectionList.querySelectorAll('input, textarea, select').forEach(el => {
             el.readOnly = true;
             el.disabled = true;
             el.classList.add('bg-slate-50', 'cursor-not-allowed');
         });
 
+        // contenteditable div 비활성화
+        sectionList.querySelectorAll('[contenteditable="true"]').forEach(el => {
+            el.setAttribute('contenteditable', 'false');
+            el.classList.add('bg-slate-50', 'cursor-not-allowed');
+        });
+
         // 버튼 비활성화/숨기기
         sectionList.querySelectorAll('button').forEach(btn => {
             btn.style.display = 'none';

From 0f770f90b8b51e2dcebe7228eaea0f4b0a0148d1 Mon Sep 17 00:00:00 2001
From: wonjuneee <tony000709@gmail.com>
Date: Fri, 6 Mar 2026 17:20:42 +0900
Subject: [PATCH 13/13] =?UTF-8?q?fix:=20=EC=9D=91=EB=8B=B5=ED=98=95?=
 =?UTF-8?q?=EC=8B=9D=20=EA=B0=9C=EC=84=A0=20=EB=B0=8F=20=EC=9D=98=EC=A1=B4?=
 =?UTF-8?q?=EC=84=B1=20=EC=A3=BC=EC=9E=85=EB=B0=A9=EC=8B=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParticipationQuestionResponse.java        |  2 +-
 .../formRequest/FormRequestLambda.java        | 23 +++++++++----------
 .../global/common/config/WebClientConfig.java |  2 +-
 .../infra/discord/DiscordAlarmService.java    |  6 ++++-
 src/main/java/lombok.config                   |  1 +
 5 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 src/main/java/lombok.config

diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationQuestionResponse.java b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationQuestionResponse.java
index 6070ed65..dc83d01c 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationQuestionResponse.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/model/response/ParticipationQuestionResponse.java
@@ -31,7 +31,7 @@ public static ParticipationQuestionResponse of(
         return new ParticipationQuestionResponse(
             title, description,
             currSection != null ? currSection : 1,
-            currSection != null ? nextSection : 0,
+            nextSection != null ? nextSection : 0,
             info
         );
     }
diff --git a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
index 26e375e4..20c8a044 100644
--- a/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
+++ b/src/main/java/OneQ/OnSurvey/domain/survey/service/formRequest/FormRequestLambda.java
@@ -41,7 +41,6 @@
 @Slf4j
 @Component
 @RequiredArgsConstructor
-@Qualifier("lambdaWebClient")
 public class FormRequestLambda {
 
     private static final long FORM_CONVERSION_REQUEST_TIMEOUT = 20L;
@@ -51,7 +50,8 @@ public class FormRequestLambda {
 
     private final AlertNotifier alertNotifier;
     private final TransactionHandler transactionHandler;
-    private final WebClient lambdaWebClient;
+    @Qualifier("lambdaWebClient")
+    private final WebClient webClient;
 
     private final MemberFinder memberFinder;
     private final FormUpdater formUpdater;
@@ -65,7 +65,7 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
 
         FormConversionPayload payload = new FormConversionPayload(event.formUrls());
 
-        FormConversionResponse response = lambdaWebClient.post()
+        FormConversionResponse response = webClient.post()
             .uri(lambdaUrl)
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(payload)
@@ -73,7 +73,7 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
             .bodyToMono(FormConversionResponse.class)
             .timeout(Duration.ofSeconds(FORM_CONVERSION_REQUEST_TIMEOUT))
             .retryWhen(Retry.backoff(3, Duration.ofSeconds(3)))
-            .doOnError(e -> {
+            .onErrorMap(e -> {
                 log.error("[FormRequestLambda] 구글폼 변환 중 오류 발생 - requestId: {}, error: {}", event.requestId(), e.getMessage(), e);
                 alertNotifier.sendSurveyConversionAsync(
                     SurveyConversionAlert.error(1, 0, "구글폼 변환 중 오류가 발생했습니다. error: " + e.getMessage())
@@ -92,10 +92,6 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
             throw new CustomException(SurveyErrorCode.FORM_CONVERSION_FAILED);
         }
 
-        SurveyConversionAlert alert = SurveyConversionAlert.success(
-            response.totalCount(), response.successCount(), new ArrayList<>()
-        );
-
         List<MemberSearchResult> memberResultList = memberFinder.searchMembers(event.email(), null, null, null);
         if (memberResultList.size() != 1) {
             log.warn("[FormRequestLambda] 설문 생성 실패 - 요청자 이메일로 회원을 찾을 수 없습니다. email: {}", event.email());
@@ -103,10 +99,11 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
         }
         Long memberId = memberResultList.getFirst().id();
 
+        List<SurveyConversionAlert.SurveyDetails> detailList = new ArrayList<>();
         response.results().forEach(result -> {
             if (result.isSuccess()) {
                 try {
-                    alert.details().add(
+                    detailList.add(
                         transactionHandler.runInTransaction(() -> {
                             Long surveyId = createSurveyFromConversionResult(result, memberId);
                             formUpdater.markAsRegistered(event.requestId(), surveyId);
@@ -137,15 +134,17 @@ public void convertGoogleFormIntoSurvey(FormRequestConversionEvent event) {
                 } catch (Exception e) {
                     log.error("[FormRequestLambda] 설문 생성 중 오류 발생 - requestId: {}, error: {}",
                         event.requestId(), e.getMessage(), e);
-                    alert.details().add(SurveyConversionAlert.SurveyDetails.failure(result.url(), "설문 생성 중 오류가 발생했습니다."));
+                    detailList.add(SurveyConversionAlert.SurveyDetails.failure(result.url(), "설문 생성 중 오류가 발생했습니다."));
                 }
             } else {
                 log.error("[FormRequestLambda] 구글폼 변환 실패 - requestId: {}, url: {}, message: {}",
                     event.requestId(), result.url(), result.message());
-                alert.details().add(SurveyConversionAlert.SurveyDetails.failure(result.url(), result.message()));
+                detailList.add(SurveyConversionAlert.SurveyDetails.failure(result.url(), result.message()));
             }
         });
-        alertNotifier.sendSurveyConversionAsync(alert);
+        alertNotifier.sendSurveyConversionAsync(
+            SurveyConversionAlert.success(response.totalCount(), response.successCount(), detailList)
+        );
     }
 
     private Long createSurveyFromConversionResult(FormConversionResponse.Result result, Long memberId) {
diff --git a/src/main/java/OneQ/OnSurvey/global/common/config/WebClientConfig.java b/src/main/java/OneQ/OnSurvey/global/common/config/WebClientConfig.java
index 29151121..e5e75700 100644
--- a/src/main/java/OneQ/OnSurvey/global/common/config/WebClientConfig.java
+++ b/src/main/java/OneQ/OnSurvey/global/common/config/WebClientConfig.java
@@ -32,7 +32,7 @@ WebClient webClient(@Value("${discord.timeout-ms:2000}") int timeoutMs) {
     }
 
     @Bean
-    WebClient lambdaWebClient(@Value("${google.timeout-ms:10000}") int timeoutMs) {
+    WebClient lambdaWebClient(@Value("${lambda.timeout-ms:10000}") int timeoutMs) {
         HttpClient httpClient = HttpClient.create()
             .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, timeoutMs)
             .responseTimeout(Duration.ofMillis(timeoutMs))
diff --git a/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java b/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
index 14198ad6..d7abc584 100644
--- a/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
+++ b/src/main/java/OneQ/OnSurvey/global/infra/discord/DiscordAlarmService.java
@@ -158,7 +158,11 @@ public void sendSurveyConversionAlert(SurveyConversionAlert alert) {
                 .append("* error: ").append(safe(alert.error())).append("\n");
         }
 
-        post(url, title, desc.toString());
+        String descStr = desc.toString();
+        if (descStr.length() > MAX_EMBED_DESC) {
+            descStr = descStr.substring(0, MAX_EMBED_DESC - TRUNC_SUFFIX.length()) + TRUNC_SUFFIX;
+        }
+        post(url, title, descStr);
     }
 
 
diff --git a/src/main/java/lombok.config b/src/main/java/lombok.config
new file mode 100644
index 00000000..eb6db90e
--- /dev/null
+++ b/src/main/java/lombok.config
@@ -0,0 +1 @@
+lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Qualifier
\ No newline at end of file