From 42df0f718a83aae5e9ec856e5751b162b6af0e27 Mon Sep 17 00:00:00 2001
From: 1Seob <moon27456@naver.com>
Date: Wed, 29 Jul 2026 21:10:55 +0900
Subject: [PATCH 1/3] =?UTF-8?q?feat(admin):=20Ask=20Chat=20RAG=20=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=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

현재 embedding version 기준 Target·Indexed·Failed 집계 API를 추가하고, 어드민 페이지 진입 및 배치 완료 시 현황을 자동 갱신하도록 개선함
---
 .../admin/api/AdminAskChatRagController.java  |  9 ++++
 ...AdminAskChatRagBackfillStatusResponse.java | 18 ++++++++
 .../AskChatRagBackfillService.java            |  5 ++
 .../core/dto/AskChatRagBackfillStatusDto.java |  8 ++++
 .../AskChatRagBackfillQueryRepository.java    | 28 +++++++++++
 .../templates/admin/ask-chat-rag.html         | 46 +++++++++++++++----
 .../api/AdminAskChatRagControllerTest.java    | 39 ++++++++++++++++
 .../AskChatRagBackfillServiceTest.java        | 17 +++++++
 .../AskChatRagRepositoryIntegrationTest.java  | 28 +++++++++++
 9 files changed, 188 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/com/devkor/ifive/nadab/domain/admin/api/dto/response/AdminAskChatRagBackfillStatusResponse.java
 create mode 100644 src/main/java/com/devkor/ifive/nadab/domain/askchat/core/dto/AskChatRagBackfillStatusDto.java
 create mode 100644 src/test/java/com/devkor/ifive/nadab/domain/admin/api/AdminAskChatRagControllerTest.java

diff --git a/src/main/java/com/devkor/ifive/nadab/domain/admin/api/AdminAskChatRagController.java b/src/main/java/com/devkor/ifive/nadab/domain/admin/api/AdminAskChatRagController.java
index 9ec2c763..403309cf 100644
--- a/src/main/java/com/devkor/ifive/nadab/domain/admin/api/AdminAskChatRagController.java
+++ b/src/main/java/com/devkor/ifive/nadab/domain/admin/api/AdminAskChatRagController.java
@@ -1,13 +1,16 @@
 package com.devkor.ifive.nadab.domain.admin.api;
 
 import com.devkor.ifive.nadab.domain.admin.api.dto.response.AdminAskChatRagBackfillResponse;
+import com.devkor.ifive.nadab.domain.admin.api.dto.response.AdminAskChatRagBackfillStatusResponse;
 import com.devkor.ifive.nadab.domain.askchat.application.AskChatRagBackfillService;
 import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillResultDto;
+import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillStatusDto;
 import com.devkor.ifive.nadab.global.core.response.ApiResponseDto;
 import com.devkor.ifive.nadab.global.core.response.ApiResponseEntity;
 import io.swagger.v3.oas.annotations.Hidden;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,6 +23,12 @@ public class AdminAskChatRagController {
 
     private final AskChatRagBackfillService askChatRagBackfillService;
 
+    @GetMapping("/backfill/daily-answers/status")
+    public ResponseEntity<ApiResponseDto<AdminAskChatRagBackfillStatusResponse>> getDailyAnswerBackfillStatus() {
+        AskChatRagBackfillStatusDto status = askChatRagBackfillService.getCompletedDailyAnswerStatus();
+        return ApiResponseEntity.ok(AdminAskChatRagBackfillStatusResponse.from(status));
+    }
+
     @PostMapping("/backfill/daily-answers")
     public ResponseEntity<ApiResponseDto<AdminAskChatRagBackfillResponse>> backfillDailyAnswers() {
         AskChatRagBackfillResultDto result = askChatRagBackfillService.backfillCompletedDailyAnswers();
diff --git a/src/main/java/com/devkor/ifive/nadab/domain/admin/api/dto/response/AdminAskChatRagBackfillStatusResponse.java b/src/main/java/com/devkor/ifive/nadab/domain/admin/api/dto/response/AdminAskChatRagBackfillStatusResponse.java
new file mode 100644
index 00000000..7072d075
--- /dev/null
+++ b/src/main/java/com/devkor/ifive/nadab/domain/admin/api/dto/response/AdminAskChatRagBackfillStatusResponse.java
@@ -0,0 +1,18 @@
+package com.devkor.ifive.nadab.domain.admin.api.dto.response;
+
+import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillStatusDto;
+
+public record AdminAskChatRagBackfillStatusResponse(
+        long targetCount,
+        long indexedCount,
+        long failedCount
+) {
+
+    public static AdminAskChatRagBackfillStatusResponse from(AskChatRagBackfillStatusDto status) {
+        return new AdminAskChatRagBackfillStatusResponse(
+                status.targetCount(),
+                status.indexedCount(),
+                status.failedCount()
+        );
+    }
+}
diff --git a/src/main/java/com/devkor/ifive/nadab/domain/askchat/application/AskChatRagBackfillService.java b/src/main/java/com/devkor/ifive/nadab/domain/askchat/application/AskChatRagBackfillService.java
index 29000805..a2f258ce 100644
--- a/src/main/java/com/devkor/ifive/nadab/domain/askchat/application/AskChatRagBackfillService.java
+++ b/src/main/java/com/devkor/ifive/nadab/domain/askchat/application/AskChatRagBackfillService.java
@@ -1,6 +1,7 @@
 package com.devkor.ifive.nadab.domain.askchat.application;
 
 import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillResultDto;
+import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillStatusDto;
 import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillTargetDto;
 import com.devkor.ifive.nadab.domain.askchat.core.repository.AskChatRagBackfillQueryRepository;
 import com.devkor.ifive.nadab.domain.askchat.infra.AskChatEmbeddingClient;
@@ -19,6 +20,10 @@ public class AskChatRagBackfillService {
     private final AskChatRagIndexingService indexingService;
     private final AskChatEmbeddingClient embeddingClient;
 
+    public AskChatRagBackfillStatusDto getCompletedDailyAnswerStatus() {
+        return backfillQueryRepository.findCompletedDailyAnswerStatus(embeddingClient.version());
+    }
+
     public AskChatRagBackfillResultDto backfillCompletedDailyAnswers() {
         List<AskChatRagBackfillTargetDto> targets = backfillQueryRepository.findCompletedDailyAnswerTargets(
                 embeddingClient.version(),
diff --git a/src/main/java/com/devkor/ifive/nadab/domain/askchat/core/dto/AskChatRagBackfillStatusDto.java b/src/main/java/com/devkor/ifive/nadab/domain/askchat/core/dto/AskChatRagBackfillStatusDto.java
new file mode 100644
index 00000000..6b6a9f50
--- /dev/null
+++ b/src/main/java/com/devkor/ifive/nadab/domain/askchat/core/dto/AskChatRagBackfillStatusDto.java
@@ -0,0 +1,8 @@
+package com.devkor.ifive.nadab.domain.askchat.core.dto;
+
+public record AskChatRagBackfillStatusDto(
+        long targetCount,
+        long indexedCount,
+        long failedCount
+) {
+}
diff --git a/src/main/java/com/devkor/ifive/nadab/domain/askchat/core/repository/AskChatRagBackfillQueryRepository.java b/src/main/java/com/devkor/ifive/nadab/domain/askchat/core/repository/AskChatRagBackfillQueryRepository.java
index 43b8115b..ae466c48 100644
--- a/src/main/java/com/devkor/ifive/nadab/domain/askchat/core/repository/AskChatRagBackfillQueryRepository.java
+++ b/src/main/java/com/devkor/ifive/nadab/domain/askchat/core/repository/AskChatRagBackfillQueryRepository.java
@@ -1,5 +1,6 @@
 package com.devkor.ifive.nadab.domain.askchat.core.repository;
 
+import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillStatusDto;
 import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillTargetDto;
 import com.devkor.ifive.nadab.domain.user.core.entity.InterestCode;
 import lombok.RequiredArgsConstructor;
@@ -43,6 +44,33 @@ AND NOT EXISTS (
                 .addValue("limit", limit), this::mapTarget);
     }
 
+    public AskChatRagBackfillStatusDto findCompletedDailyAnswerStatus(int embeddingVersion) {
+        String sql = """
+                SELECT COUNT(*) FILTER (WHERE d.id IS NULL) AS target_count,
+                       COUNT(*) FILTER (WHERE d.embedding_status = 'COMPLETED') AS indexed_count,
+                       COUNT(*) FILTER (
+                           WHERE d.embedding_status IN ('FAILED', 'DEAD_LETTER')
+                       ) AS failed_count
+                  FROM daily_reports dr
+                  JOIN answer_entries ae ON ae.id = dr.answer_entry_id
+                  LEFT JOIN ask_chat_rag_documents d
+                    ON d.source_type = 'ANSWER_ENTRY'
+                   AND d.source_id = ae.id
+                   AND d.embedding_version = :embeddingVersion
+                 WHERE dr.status = 'COMPLETED'
+                """;
+
+        return jdbcTemplate.queryForObject(
+                sql,
+                new MapSqlParameterSource("embeddingVersion", embeddingVersion),
+                (rs, rowNum) -> new AskChatRagBackfillStatusDto(
+                        rs.getLong("target_count"),
+                        rs.getLong("indexed_count"),
+                        rs.getLong("failed_count")
+                )
+        );
+    }
+
     private AskChatRagBackfillTargetDto mapTarget(ResultSet rs, int rowNum) throws SQLException {
         String interestCode = rs.getString("interest_code");
         return new AskChatRagBackfillTargetDto(
diff --git a/src/main/resources/templates/admin/ask-chat-rag.html b/src/main/resources/templates/admin/ask-chat-rag.html
index fdd678be..28720c2a 100644
--- a/src/main/resources/templates/admin/ask-chat-rag.html
+++ b/src/main/resources/templates/admin/ask-chat-rag.html
@@ -210,6 +210,7 @@ <h2 class="panel-title">Daily Answer Backfill</h2>
         <p class="description">
             Completed daily answers that do not have a RAG document for the current embedding version are indexed one batch at a time.
             Run repeatedly until Target becomes 0. Failed embeddings are saved and handled by the retry scheduler.
+            Status counts can be refreshed without running a batch.
         </p>
 
         <div class="stats">
@@ -229,9 +230,10 @@ <h2 class="panel-title">Daily Answer Backfill</h2>
 
         <div class="btn-row">
             <button id="runBackfillBtn" class="btn btn-primary" type="button">Run Next Batch</button>
+            <button id="refreshStatusBtn" class="btn btn-ghost" type="button">Refresh Status</button>
         </div>
 
-        <div id="resultText" class="result">No run yet.</div>
+        <div id="resultText" class="result">Loading status...</div>
     </div>
 </div>
 
@@ -248,6 +250,7 @@ <h2 id="popupTitle" class="popup-title"></h2>
 
 <script>
     const runBackfillBtn = document.getElementById('runBackfillBtn');
+    const refreshStatusBtn = document.getElementById('refreshStatusBtn');
     const logoutBtn = document.getElementById('logoutBtn');
     const targetCountEl = document.getElementById('targetCount');
     const indexedCountEl = document.getElementById('indexedCount');
@@ -331,20 +334,38 @@ <h2 id="popupTitle" class="popup-title"></h2>
         return response.json();
     }
 
-    function renderResult(result) {
-        targetCountEl.textContent = result.targetCount;
-        indexedCountEl.textContent = result.indexedCount;
-        failedCountEl.textContent = result.failedCount;
+    function renderStatus(status) {
+        targetCountEl.textContent = status.targetCount;
+        indexedCountEl.textContent = status.indexedCount;
+        failedCountEl.textContent = status.failedCount;
 
-        if (result.targetCount === 0) {
+        if (status.targetCount === 0) {
             resultTextEl.textContent = 'No remaining completed daily answers for this embedding version.';
             return;
         }
 
-        resultTextEl.textContent =
-            `Processed one batch.\nTarget: ${result.targetCount}, Indexed: ${result.indexedCount}, Failed: ${result.failedCount}`;
+        resultTextEl.textContent = 'Status is up to date.';
     }
 
+    async function loadStatus() {
+        refreshStatusBtn.disabled = true;
+        refreshStatusBtn.textContent = 'Refreshing...';
+
+        try {
+            const body = await request('GET', '/admin/api/ask-chat/rag/backfill/daily-answers/status');
+            if (body) {
+                renderStatus(body.data);
+            }
+        } catch (e) {
+            resultTextEl.textContent = e.message;
+        } finally {
+            refreshStatusBtn.disabled = false;
+            refreshStatusBtn.textContent = 'Refresh Status';
+        }
+    }
+
+    refreshStatusBtn.addEventListener('click', loadStatus);
+
     runBackfillBtn.addEventListener('click', async () => {
         const confirmed = await showConfirmPopup(
             'Run one Ask Chat RAG backfill batch?\nThis calls the embedding API for completed daily answers that are not indexed yet.'
@@ -362,8 +383,11 @@ <h2 id="popupTitle" class="popup-title"></h2>
             if (!body) {
                 return;
             }
-            renderResult(body.data);
-            await showResultPopup('Backfill batch completed.');
+            const result = body.data;
+            await loadStatus();
+            await showResultPopup(
+                `Backfill batch completed.\nTarget: ${result.targetCount}, Indexed: ${result.indexedCount}, Failed: ${result.failedCount}`
+            );
         } catch (e) {
             resultTextEl.textContent = e.message;
             await showResultPopup(e.message, true);
@@ -390,6 +414,8 @@ <h2 id="popupTitle" class="popup-title"></h2>
             location.replace('/admin/login');
         }
     });
+
+    loadStatus();
 </script>
 </body>
 </html>
diff --git a/src/test/java/com/devkor/ifive/nadab/domain/admin/api/AdminAskChatRagControllerTest.java b/src/test/java/com/devkor/ifive/nadab/domain/admin/api/AdminAskChatRagControllerTest.java
new file mode 100644
index 00000000..2e76cc15
--- /dev/null
+++ b/src/test/java/com/devkor/ifive/nadab/domain/admin/api/AdminAskChatRagControllerTest.java
@@ -0,0 +1,39 @@
+package com.devkor.ifive.nadab.domain.admin.api;
+
+import com.devkor.ifive.nadab.domain.admin.api.dto.response.AdminAskChatRagBackfillStatusResponse;
+import com.devkor.ifive.nadab.domain.askchat.application.AskChatRagBackfillService;
+import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillStatusDto;
+import com.devkor.ifive.nadab.global.core.response.ApiResponseDto;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.ResponseEntity;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class AdminAskChatRagControllerTest {
+
+    @Mock
+    private AskChatRagBackfillService askChatRagBackfillService;
+
+    @InjectMocks
+    private AdminAskChatRagController controller;
+
+    @Test
+    void getDailyAnswerBackfillStatus_returns_current_counts() {
+        when(askChatRagBackfillService.getCompletedDailyAnswerStatus())
+                .thenReturn(new AskChatRagBackfillStatusDto(4, 12, 2));
+
+        ResponseEntity<ApiResponseDto<AdminAskChatRagBackfillStatusResponse>> response =
+                controller.getDailyAnswerBackfillStatus();
+
+        assertThat(response.getStatusCode().value()).isEqualTo(200);
+        assertThat(response.getBody()).isNotNull();
+        assertThat(response.getBody().getData())
+                .isEqualTo(new AdminAskChatRagBackfillStatusResponse(4, 12, 2));
+    }
+}
diff --git a/src/test/java/com/devkor/ifive/nadab/domain/askchat/application/AskChatRagBackfillServiceTest.java b/src/test/java/com/devkor/ifive/nadab/domain/askchat/application/AskChatRagBackfillServiceTest.java
index 6e87b0f7..9aaab9ac 100644
--- a/src/test/java/com/devkor/ifive/nadab/domain/askchat/application/AskChatRagBackfillServiceTest.java
+++ b/src/test/java/com/devkor/ifive/nadab/domain/askchat/application/AskChatRagBackfillServiceTest.java
@@ -1,6 +1,7 @@
 package com.devkor.ifive.nadab.domain.askchat.application;
 
 import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillResultDto;
+import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillStatusDto;
 import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillTargetDto;
 import com.devkor.ifive.nadab.domain.askchat.core.repository.AskChatRagBackfillQueryRepository;
 import com.devkor.ifive.nadab.domain.askchat.infra.AskChatEmbeddingClient;
@@ -31,6 +32,22 @@ class AskChatRagBackfillServiceTest {
     @Mock
     private AskChatEmbeddingClient embeddingClient;
 
+    @Test
+    void getCompletedDailyAnswerStatus_queries_current_embedding_version() {
+        AskChatRagBackfillService service = new AskChatRagBackfillService(
+                backfillQueryRepository,
+                indexingService,
+                embeddingClient
+        );
+        AskChatRagBackfillStatusDto expectedStatus = new AskChatRagBackfillStatusDto(3, 7, 1);
+        when(embeddingClient.version()).thenReturn(2);
+        when(backfillQueryRepository.findCompletedDailyAnswerStatus(2)).thenReturn(expectedStatus);
+
+        AskChatRagBackfillStatusDto status = service.getCompletedDailyAnswerStatus();
+
+        assertThat(status).isEqualTo(expectedStatus);
+    }
+
     @Test
     void backfillCompletedDailyAnswers_indexes_targets_for_current_embedding_version() {
         AskChatRagBackfillService service = new AskChatRagBackfillService(
diff --git a/src/test/java/com/devkor/ifive/nadab/domain/askchat/core/repository/AskChatRagRepositoryIntegrationTest.java b/src/test/java/com/devkor/ifive/nadab/domain/askchat/core/repository/AskChatRagRepositoryIntegrationTest.java
index 61c9cbfa..2c8ece45 100644
--- a/src/test/java/com/devkor/ifive/nadab/domain/askchat/core/repository/AskChatRagRepositoryIntegrationTest.java
+++ b/src/test/java/com/devkor/ifive/nadab/domain/askchat/core/repository/AskChatRagRepositoryIntegrationTest.java
@@ -1,5 +1,6 @@
 package com.devkor.ifive.nadab.domain.askchat.core.repository;
 
+import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillStatusDto;
 import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagBackfillTargetDto;
 import com.devkor.ifive.nadab.domain.askchat.core.dto.AskChatRagSearchResultDto;
 import com.devkor.ifive.nadab.domain.user.core.entity.InterestCode;
@@ -68,6 +69,33 @@ void findCompletedDailyAnswerTargets_excludes_already_indexed_sources_and_limits
                 .containsExactly(secondReportId, thirdReportId);
     }
 
+    @Test
+    void findCompletedDailyAnswerStatus_counts_targets_indexed_and_failed_for_current_version() {
+        Long userId = insertUser("backfill-status");
+        Long questionId = insertDailyQuestion(InterestCode.RELATIONSHIP, "status question");
+        Long targetAnswerId = insertAnswerEntry(userId, questionId, "target", LocalDate.of(2026, 7, 10));
+        Long indexedAnswerId = insertAnswerEntry(userId, questionId, "indexed", LocalDate.of(2026, 7, 11));
+        Long failedAnswerId = insertAnswerEntry(userId, questionId, "failed", LocalDate.of(2026, 7, 12));
+        Long deadLetterAnswerId = insertAnswerEntry(userId, questionId, "dead letter", LocalDate.of(2026, 7, 13));
+        Long oldVersionAnswerId = insertAnswerEntry(userId, questionId, "old version", LocalDate.of(2026, 7, 14));
+        insertDailyReport(targetAnswerId, "target report", "COMPLETED", LocalDate.of(2026, 7, 10));
+        insertDailyReport(indexedAnswerId, "indexed report", "COMPLETED", LocalDate.of(2026, 7, 11));
+        insertDailyReport(failedAnswerId, "failed report", "COMPLETED", LocalDate.of(2026, 7, 12));
+        insertDailyReport(deadLetterAnswerId, "dead letter report", "COMPLETED", LocalDate.of(2026, 7, 13));
+        insertDailyReport(oldVersionAnswerId, "old version report", "COMPLETED", LocalDate.of(2026, 7, 14));
+        insertRagDocument(userId, "ANSWER_ENTRY", indexedAnswerId, InterestCode.RELATIONSHIP, 2, "COMPLETED");
+        insertRagDocument(userId, "ANSWER_ENTRY", failedAnswerId, InterestCode.RELATIONSHIP, 2, "FAILED");
+        insertRagDocument(userId, "ANSWER_ENTRY", deadLetterAnswerId, InterestCode.RELATIONSHIP, 2, "DEAD_LETTER");
+        insertRagDocument(userId, "ANSWER_ENTRY", oldVersionAnswerId, InterestCode.RELATIONSHIP, 1, "COMPLETED");
+
+        AskChatRagBackfillStatusDto status =
+                backfillQueryRepository.findCompletedDailyAnswerStatus(2);
+
+        assertThat(status.targetCount()).isEqualTo(2);
+        assertThat(status.indexedCount()).isEqualTo(1);
+        assertThat(status.failedCount()).isEqualTo(2);
+    }
+
     @Test
     void updateEmbedding_and_markEmbeddingFailed_update_pgvector_document_status() {
         Long userId = insertUser("vector-update");

From 98b49e5f793ef66e8cfde3243834bcc5065b921a Mon Sep 17 00:00:00 2001
From: 1Seob <moon27456@naver.com>
Date: Wed, 29 Jul 2026 21:23:52 +0900
Subject: [PATCH 2/3] =?UTF-8?q?feat(admin):=20Ask=20Chat=20RAG=20=EC=97=B0?=
 =?UTF-8?q?=EC=86=8D=20=EB=B0=B0=EC=B9=98=20=EC=8B=A4=ED=96=89=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

지정한 횟수만큼 백필 배치를 순차 실행하고, 배치 실패 또는 Target 소진 시 후속 실행을 중단하도록 개선함
---
 .../templates/admin/ask-chat-rag.html         | 117 ++++++++++++++++--
 1 file changed, 105 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/templates/admin/ask-chat-rag.html b/src/main/resources/templates/admin/ask-chat-rag.html
index 28720c2a..3482db00 100644
--- a/src/main/resources/templates/admin/ask-chat-rag.html
+++ b/src/main/resources/templates/admin/ask-chat-rag.html
@@ -117,10 +117,31 @@
 
         .btn-row {
             display: flex;
+            align-items: end;
             gap: 8px;
             flex-wrap: wrap;
         }
 
+        .batch-run-control {
+            display: grid;
+            gap: 5px;
+        }
+
+        .batch-run-control label {
+            color: var(--muted);
+            font-size: 12px;
+        }
+
+        .batch-run-control input {
+            width: 110px;
+            border: 1px solid var(--border);
+            border-radius: 6px;
+            background: var(--surface-2);
+            color: var(--text);
+            padding: 8px 10px;
+            font-size: 13px;
+        }
+
         .btn {
             border: 0;
             border-radius: 6px;
@@ -209,7 +230,8 @@ <h1 class="title">Admin Console</h1>
         <h2 class="panel-title">Daily Answer Backfill</h2>
         <p class="description">
             Completed daily answers that do not have a RAG document for the current embedding version are indexed one batch at a time.
-            Run repeatedly until Target becomes 0. Failed embeddings are saved and handled by the retry scheduler.
+            Set how many batches to run. Processing stops immediately when a batch fails or Target becomes 0.
+            Failed embeddings are saved and handled by the retry scheduler.
             Status counts can be refreshed without running a batch.
         </p>
 
@@ -229,7 +251,11 @@ <h2 class="panel-title">Daily Answer Backfill</h2>
         </div>
 
         <div class="btn-row">
-            <button id="runBackfillBtn" class="btn btn-primary" type="button">Run Next Batch</button>
+            <div class="batch-run-control">
+                <label for="batchRunCount">Batch runs</label>
+                <input id="batchRunCount" type="number" min="1" step="1" value="1"/>
+            </div>
+            <button id="runBackfillBtn" class="btn btn-primary" type="button">Run Batches</button>
             <button id="refreshStatusBtn" class="btn btn-ghost" type="button">Refresh Status</button>
         </div>
 
@@ -251,6 +277,7 @@ <h2 id="popupTitle" class="popup-title"></h2>
 <script>
     const runBackfillBtn = document.getElementById('runBackfillBtn');
     const refreshStatusBtn = document.getElementById('refreshStatusBtn');
+    const batchRunCountEl = document.getElementById('batchRunCount');
     const logoutBtn = document.getElementById('logoutBtn');
     const targetCountEl = document.getElementById('targetCount');
     const indexedCountEl = document.getElementById('indexedCount');
@@ -367,33 +394,99 @@ <h2 id="popupTitle" class="popup-title"></h2>
     refreshStatusBtn.addEventListener('click', loadStatus);
 
     runBackfillBtn.addEventListener('click', async () => {
+        const requestedRunCount = Number(batchRunCountEl.value);
+        if (!Number.isSafeInteger(requestedRunCount) || requestedRunCount < 1) {
+            await showResultPopup('Batch runs must be a positive integer.', true);
+            return;
+        }
+
         const confirmed = await showConfirmPopup(
-            'Run one Ask Chat RAG backfill batch?\nThis calls the embedding API for completed daily answers that are not indexed yet.'
+            `Run up to ${requestedRunCount} Ask Chat RAG backfill batches?\n` +
+            'Processing stops immediately if a batch fails or no targets remain. This calls the embedding API.'
         );
         if (!confirmed) {
             return;
         }
 
         runBackfillBtn.disabled = true;
+        refreshStatusBtn.disabled = true;
+        batchRunCountEl.disabled = true;
         runBackfillBtn.textContent = 'Running...';
-        resultTextEl.textContent = 'Running backfill batch...';
 
+        let attemptedRunCount = 0;
+        let totalIndexedCount = 0;
+        let totalFailedCount = 0;
         try {
-            const body = await request('POST', '/admin/api/ask-chat/rag/backfill/daily-answers');
-            if (!body) {
+            const initialStatusBody =
+                await request('GET', '/admin/api/ask-chat/rag/backfill/daily-answers/status');
+            if (!initialStatusBody) {
                 return;
             }
-            const result = body.data;
-            await loadStatus();
+
+            renderStatus(initialStatusBody.data);
+            if (initialStatusBody.data.targetCount === 0) {
+                await showResultPopup('No remaining completed daily answers for this embedding version.');
+                return;
+            }
+
+            let stoppedBecauseTargetsCompleted = false;
+            for (let runNumber = 1; runNumber <= requestedRunCount; runNumber++) {
+                resultTextEl.textContent = `Running batch ${runNumber} of ${requestedRunCount}...`;
+
+                const body = await request('POST', '/admin/api/ask-chat/rag/backfill/daily-answers');
+                if (!body) {
+                    return;
+                }
+
+                const result = body.data;
+                attemptedRunCount++;
+                totalIndexedCount += result.indexedCount;
+                totalFailedCount += result.failedCount;
+
+                const statusBody =
+                    await request('GET', '/admin/api/ask-chat/rag/backfill/daily-answers/status');
+                if (!statusBody) {
+                    return;
+                }
+                renderStatus(statusBody.data);
+
+                if (result.failedCount > 0) {
+                    resultTextEl.textContent =
+                        `Stopped at batch ${runNumber} of ${requestedRunCount} because ${result.failedCount} item(s) failed.`;
+                    await showResultPopup(
+                        `Backfill stopped at batch ${runNumber} of ${requestedRunCount}.\n` +
+                        `Indexed: ${totalIndexedCount}, Failed: ${totalFailedCount}`,
+                        true
+                    );
+                    return;
+                }
+
+                if (statusBody.data.targetCount === 0) {
+                    stoppedBecauseTargetsCompleted = true;
+                    break;
+                }
+            }
+
+            resultTextEl.textContent =
+                `Completed ${attemptedRunCount} batch(es). Indexed: ${totalIndexedCount}, Failed: ${totalFailedCount}.`;
             await showResultPopup(
-                `Backfill batch completed.\nTarget: ${result.targetCount}, Indexed: ${result.indexedCount}, Failed: ${result.failedCount}`
+                `Backfill completed.\n` +
+                `Batches: ${attemptedRunCount} of ${requestedRunCount}, ` +
+                `Indexed: ${totalIndexedCount}, Failed: ${totalFailedCount}` +
+                (stoppedBecauseTargetsCompleted ? '\nNo targets remain.' : '')
             );
         } catch (e) {
-            resultTextEl.textContent = e.message;
-            await showResultPopup(e.message, true);
+            resultTextEl.textContent =
+                `Stopped after ${attemptedRunCount} batch(es): ${e.message}`;
+            await showResultPopup(
+                `Backfill stopped after ${attemptedRunCount} batch(es).\n${e.message}`,
+                true
+            );
         } finally {
             runBackfillBtn.disabled = false;
-            runBackfillBtn.textContent = 'Run Next Batch';
+            refreshStatusBtn.disabled = false;
+            batchRunCountEl.disabled = false;
+            runBackfillBtn.textContent = 'Run Batches';
         }
     });
 

From 45c8065d1c0b3231fc346a08803c3138460773f9 Mon Sep 17 00:00:00 2001
From: 1Seob <moon27456@naver.com>
Date: Wed, 29 Jul 2026 21:41:35 +0900
Subject: [PATCH 3/3] =?UTF-8?q?feat(auth):=20=EB=A1=9C=EC=BB=AC=20?=
 =?UTF-8?q?=EB=8D=94=EB=AF=B8=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=9E=90=EB=8F=99=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GET /local/dummy-login 호출 시 더미 사용자·ROUTINE 관심사·일반 및 Ask Chat 지갑을 멱등 생성한 뒤 액세스 토큰을 발급하도록 개선함
---
 .../domain/auth/api/LocalAuthController.java  |   3 +-
 .../auth/application/LocalTokenService.java   |  18 +--
 .../auth/infra/LocalDummyUserRepository.java  | 100 +++++++++++++++++
 .../application/LocalTokenServiceTest.java    |  51 +++++++++
 .../infra/LocalDummyUserRepositoryTest.java   | 103 ++++++++++++++++++
 5 files changed, 262 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/com/devkor/ifive/nadab/domain/auth/infra/LocalDummyUserRepository.java
 create mode 100644 src/test/java/com/devkor/ifive/nadab/domain/auth/application/LocalTokenServiceTest.java
 create mode 100644 src/test/java/com/devkor/ifive/nadab/domain/auth/infra/LocalDummyUserRepositoryTest.java

diff --git a/src/main/java/com/devkor/ifive/nadab/domain/auth/api/LocalAuthController.java b/src/main/java/com/devkor/ifive/nadab/domain/auth/api/LocalAuthController.java
index 659428a4..f74c3dd2 100644
--- a/src/main/java/com/devkor/ifive/nadab/domain/auth/api/LocalAuthController.java
+++ b/src/main/java/com/devkor/ifive/nadab/domain/auth/api/LocalAuthController.java
@@ -28,7 +28,8 @@ public class LocalAuthController {
     @Operation(
             summary = "더미 유저 로그인",
             description = """
-                    로컬 환경에서 더미 유저로 로그인하여 액세스 토큰을 발급받습니다.
+                    로컬 환경에서 더미 유저로 로그인하여 액세스 토큰을 발급받습니다. <br/>
+                    더미 유저가 없을 시에는 자동 생성합니다.
                     """
     )
     public ResponseEntity<ApiResponseDto<LocalTokenResponse>> dummyLogin() {
diff --git a/src/main/java/com/devkor/ifive/nadab/domain/auth/application/LocalTokenService.java b/src/main/java/com/devkor/ifive/nadab/domain/auth/application/LocalTokenService.java
index 02ad09b2..2ca8ccca 100644
--- a/src/main/java/com/devkor/ifive/nadab/domain/auth/application/LocalTokenService.java
+++ b/src/main/java/com/devkor/ifive/nadab/domain/auth/application/LocalTokenService.java
@@ -1,19 +1,20 @@
 package com.devkor.ifive.nadab.domain.auth.application;
 
 import com.devkor.ifive.nadab.domain.auth.api.dto.response.LocalTokenResponse;
+import com.devkor.ifive.nadab.domain.auth.infra.LocalDummyUserRepository;
 import com.devkor.ifive.nadab.domain.user.core.entity.User;
 import com.devkor.ifive.nadab.domain.user.core.repository.UserRepository;
-import com.devkor.ifive.nadab.domain.wallet.core.entity.UserWallet;
-import com.devkor.ifive.nadab.domain.wallet.core.repository.UserWalletRepository;
 import com.devkor.ifive.nadab.global.core.response.ErrorCode;
 import com.devkor.ifive.nadab.global.exception.NotFoundException;
 import com.devkor.ifive.nadab.global.security.token.AccessTokenProvider;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+@Profile("local")
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -21,24 +22,17 @@ public class LocalTokenService {
 
     private final AccessTokenProvider accessTokenProvider;
     private final UserRepository userRepository;
-    private final UserWalletRepository userWalletRepository;
+    private final LocalDummyUserRepository localDummyUserRepository;
 
     // 로컬 로그인용 토큰 발급
     public LocalTokenResponse issueDummyAccessToken() {
-        User user = userRepository.findById(11111L)
+        Long dummyUserId = localDummyUserRepository.createIfAbsent();
+        User user = userRepository.findById(dummyUserId)
                 .orElseThrow(() -> new NotFoundException(ErrorCode.AUTH_DUMMY_USER_NOT_FOUND));
 
-        UserWallet wallet = getOrCreateWallet(user);
-
         List<String> roles = List.of("USER");
         String accessToken = accessTokenProvider.generateToken(user.getId(), roles);
 
         return new LocalTokenResponse(accessToken);
     }
-
-    public UserWallet getOrCreateWallet(User user) {
-        return userWalletRepository.findByUserId(user.getId())
-                .orElseGet(() -> userWalletRepository.save(UserWallet.create(user)));
-    }
-
 }
diff --git a/src/main/java/com/devkor/ifive/nadab/domain/auth/infra/LocalDummyUserRepository.java b/src/main/java/com/devkor/ifive/nadab/domain/auth/infra/LocalDummyUserRepository.java
new file mode 100644
index 00000000..92846c6c
--- /dev/null
+++ b/src/main/java/com/devkor/ifive/nadab/domain/auth/infra/LocalDummyUserRepository.java
@@ -0,0 +1,100 @@
+package com.devkor.ifive.nadab.domain.auth.infra;
+
+import com.devkor.ifive.nadab.domain.user.core.entity.InterestCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Profile;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+@Profile("local")
+@Repository
+@RequiredArgsConstructor
+public class LocalDummyUserRepository {
+
+    private static final long DUMMY_USER_ID = 11111L;
+    private static final String DUMMY_EMAIL = "test@example.com";
+    private static final String DUMMY_PASSWORD_HASH = "hashed_pw";
+    private static final String DUMMY_NICKNAME = "TestUser";
+    private static final long INITIAL_CRYSTAL_BALANCE = 1_000L;
+    private static final int INITIAL_FREE_TURN_BALANCE = 3;
+    private static final int INITIAL_PAID_TURN_BALANCE = 1_000;
+
+    private final NamedParameterJdbcTemplate jdbcTemplate;
+
+    public Long createIfAbsent() {
+        MapSqlParameterSource parameters = new MapSqlParameterSource()
+                .addValue("userId", DUMMY_USER_ID)
+                .addValue("email", DUMMY_EMAIL)
+                .addValue("passwordHash", DUMMY_PASSWORD_HASH)
+                .addValue("nickname", DUMMY_NICKNAME)
+                .addValue("interestCode", InterestCode.ROUTINE.name())
+                .addValue("crystalBalance", INITIAL_CRYSTAL_BALANCE)
+                .addValue("freeTurnBalance", INITIAL_FREE_TURN_BALANCE)
+                .addValue("paidTurnBalance", INITIAL_PAID_TURN_BALANCE);
+
+        jdbcTemplate.update("""
+                INSERT INTO users (
+                    id,
+                    email,
+                    password_hash,
+                    nickname,
+                    profile_image_key,
+                    default_profile_type,
+                    signup_status,
+                    registered_at,
+                    created_at,
+                    updated_at
+                )
+                VALUES (
+                    :userId,
+                    :email,
+                    :passwordHash,
+                    :nickname,
+                    NULL,
+                    'DEFAULT',
+                    'PROFILE_INCOMPLETE',
+                    CURRENT_TIMESTAMP,
+                    CURRENT_TIMESTAMP,
+                    CURRENT_TIMESTAMP
+                )
+                ON CONFLICT (id) DO NOTHING
+                """, parameters);
+
+        jdbcTemplate.update("""
+                INSERT INTO user_interests (user_id, interest_id)
+                SELECT :userId, id
+                  FROM interests
+                 WHERE code = :interestCode
+                ON CONFLICT (user_id) DO NOTHING
+                """, parameters);
+
+        jdbcTemplate.update("""
+                INSERT INTO user_wallets (user_id, crystal_balance)
+                VALUES (:userId, :crystalBalance)
+                ON CONFLICT (user_id) DO NOTHING
+                """, parameters);
+
+        jdbcTemplate.update("""
+                INSERT INTO ask_chat_wallets (
+                    user_id,
+                    free_turn_balance,
+                    paid_turn_balance,
+                    version,
+                    created_at,
+                    updated_at
+                )
+                VALUES (
+                    :userId,
+                    :freeTurnBalance,
+                    :paidTurnBalance,
+                    0,
+                    CURRENT_TIMESTAMP,
+                    CURRENT_TIMESTAMP
+                )
+                ON CONFLICT (user_id) DO NOTHING
+                """, parameters);
+
+        return DUMMY_USER_ID;
+    }
+}
diff --git a/src/test/java/com/devkor/ifive/nadab/domain/auth/application/LocalTokenServiceTest.java b/src/test/java/com/devkor/ifive/nadab/domain/auth/application/LocalTokenServiceTest.java
new file mode 100644
index 00000000..2e34220d
--- /dev/null
+++ b/src/test/java/com/devkor/ifive/nadab/domain/auth/application/LocalTokenServiceTest.java
@@ -0,0 +1,51 @@
+package com.devkor.ifive.nadab.domain.auth.application;
+
+import com.devkor.ifive.nadab.domain.auth.api.dto.response.LocalTokenResponse;
+import com.devkor.ifive.nadab.domain.auth.infra.LocalDummyUserRepository;
+import com.devkor.ifive.nadab.domain.user.core.entity.User;
+import com.devkor.ifive.nadab.domain.user.core.repository.UserRepository;
+import com.devkor.ifive.nadab.global.security.token.AccessTokenProvider;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class LocalTokenServiceTest {
+
+    @Mock
+    private AccessTokenProvider accessTokenProvider;
+
+    @Mock
+    private UserRepository userRepository;
+
+    @Mock
+    private LocalDummyUserRepository localDummyUserRepository;
+
+    @InjectMocks
+    private LocalTokenService localTokenService;
+
+    @Test
+    void issueDummyAccessToken_creates_dummy_user_if_absent_and_returns_access_token() {
+        User dummyUser = User.createUser("test@example.com", "hashed_pw");
+        ReflectionTestUtils.setField(dummyUser, "id", 11111L);
+        when(localDummyUserRepository.createIfAbsent()).thenReturn(11111L);
+        when(userRepository.findById(11111L)).thenReturn(Optional.of(dummyUser));
+        when(accessTokenProvider.generateToken(11111L, List.of("USER"))).thenReturn("access-token");
+
+        LocalTokenResponse response = localTokenService.issueDummyAccessToken();
+
+        assertThat(response.accessToken()).isEqualTo("access-token");
+        verify(localDummyUserRepository).createIfAbsent();
+        verify(accessTokenProvider).generateToken(11111L, List.of("USER"));
+    }
+}
diff --git a/src/test/java/com/devkor/ifive/nadab/domain/auth/infra/LocalDummyUserRepositoryTest.java b/src/test/java/com/devkor/ifive/nadab/domain/auth/infra/LocalDummyUserRepositoryTest.java
new file mode 100644
index 00000000..5bb8b0a9
--- /dev/null
+++ b/src/test/java/com/devkor/ifive/nadab/domain/auth/infra/LocalDummyUserRepositoryTest.java
@@ -0,0 +1,103 @@
+package com.devkor.ifive.nadab.domain.auth.infra;
+
+import com.devkor.ifive.nadab.infra.db.PostgresIntegrationTestSupport;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.ActiveProfiles;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DataJpaTest
+@ActiveProfiles({"test", "local"})
+@Import(LocalDummyUserRepository.class)
+class LocalDummyUserRepositoryTest extends PostgresIntegrationTestSupport {
+
+    @Autowired
+    private LocalDummyUserRepository localDummyUserRepository;
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Test
+    void createIfAbsent_creates_dummy_user_interest_and_wallets() {
+        Long userId = localDummyUserRepository.createIfAbsent();
+
+        assertThat(userId).isEqualTo(11111L);
+        assertThat(queryString("SELECT email FROM users WHERE id = 11111")).isEqualTo("test@example.com");
+        assertThat(queryString("SELECT password_hash FROM users WHERE id = 11111")).isEqualTo("hashed_pw");
+        assertThat(queryString("SELECT nickname FROM users WHERE id = 11111")).isEqualTo("TestUser");
+        assertThat(queryString("SELECT default_profile_type FROM users WHERE id = 11111")).isEqualTo("DEFAULT");
+        assertThat(queryString("SELECT signup_status FROM users WHERE id = 11111")).isEqualTo("PROFILE_INCOMPLETE");
+        assertThat(queryString("""
+                SELECT i.code
+                  FROM user_interests ui
+                  JOIN interests i ON i.id = ui.interest_id
+                 WHERE ui.user_id = 11111
+                """)).isEqualTo("ROUTINE");
+        assertThat(queryLong(
+                "SELECT crystal_balance FROM user_wallets WHERE user_id = 11111"
+        )).isEqualTo(1_000L);
+        assertThat(queryInteger(
+                "SELECT free_turn_balance FROM ask_chat_wallets WHERE user_id = 11111"
+        )).isEqualTo(3);
+        assertThat(queryInteger(
+                "SELECT paid_turn_balance FROM ask_chat_wallets WHERE user_id = 11111"
+        )).isEqualTo(1_000);
+        assertThat(queryLong(
+                "SELECT version FROM ask_chat_wallets WHERE user_id = 11111"
+        )).isZero();
+    }
+
+    @Test
+    void createIfAbsent_does_not_reset_existing_wallet_balances() {
+        localDummyUserRepository.createIfAbsent();
+        jdbcTemplate.update(
+                "UPDATE user_wallets SET crystal_balance = 900 WHERE user_id = 11111"
+        );
+        jdbcTemplate.update("""
+                UPDATE ask_chat_wallets
+                   SET free_turn_balance = 2,
+                       paid_turn_balance = 900
+                 WHERE user_id = 11111
+                """);
+
+        localDummyUserRepository.createIfAbsent();
+
+        assertThat(queryLong(
+                "SELECT COUNT(*) FROM users WHERE id = 11111"
+        )).isEqualTo(1L);
+        assertThat(queryLong(
+                "SELECT COUNT(*) FROM user_interests WHERE user_id = 11111"
+        )).isEqualTo(1L);
+        assertThat(queryLong(
+                "SELECT COUNT(*) FROM user_wallets WHERE user_id = 11111"
+        )).isEqualTo(1L);
+        assertThat(queryLong(
+                "SELECT COUNT(*) FROM ask_chat_wallets WHERE user_id = 11111"
+        )).isEqualTo(1L);
+        assertThat(queryLong(
+                "SELECT crystal_balance FROM user_wallets WHERE user_id = 11111"
+        )).isEqualTo(900L);
+        assertThat(queryInteger(
+                "SELECT free_turn_balance FROM ask_chat_wallets WHERE user_id = 11111"
+        )).isEqualTo(2);
+        assertThat(queryInteger(
+                "SELECT paid_turn_balance FROM ask_chat_wallets WHERE user_id = 11111"
+        )).isEqualTo(900);
+    }
+
+    private String queryString(String sql) {
+        return jdbcTemplate.queryForObject(sql, String.class);
+    }
+
+    private Long queryLong(String sql) {
+        return jdbcTemplate.queryForObject(sql, Long.class);
+    }
+
+    private Integer queryInteger(String sql) {
+        return jdbcTemplate.queryForObject(sql, Integer.class);
+    }
+}