From 86e1f8272aea8b77b38d3e60ad312e40cdf59037 Mon Sep 17 00:00:00 2001
From: "semin.baek" <icksishu@gmail.com>
Date: Wed, 10 Sep 2025 19:44:33 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=84=EC=86=A1=20=EC=9D=B4=EB=A0=A5=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=A7=84=ED=96=89=EC=A4=91=20=20-=20TB=5F?=
 =?UTF-8?q?DFX=5FAGENT=5FMESSAGE=5FHISTORY=20->=20TB=5FDFX=5FAGENT=5FMESSA?=
 =?UTF-8?q?GE=20=EC=A3=BC=EA=B8=B0=EC=A0=81=20=EC=A0=80=EC=9E=A5=20?=
 =?UTF-8?q?=EA=B0=9C=EB=B0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/DfxAgentMessageHistoryMapper.java |  1 +
 .../DfxAgentMessageHistoryService.java        |  8 ++++
 .../mapper/app/dfx-agent-message-history.xml  | 37 +++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryMapper.java b/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryMapper.java
index 09d57fa..47df379 100644
--- a/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryMapper.java
+++ b/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryMapper.java
@@ -13,4 +13,5 @@ public interface DfxAgentMessageHistoryMapper {
     DfxAgentMessageHistoryDto selectDfxAgentMessageHistoryBySenderAgentIdAndMessageUuid(DfxAgentMessageHistoryDto dfxAgentMessageHistoryDto);
     void insertDfxAgentMessageHistory(DfxAgentMessageHistoryDto dfxAgentMessageHistoryDto);
     int updateDfxAgentMessageHistoryForProcessAck(DfxAgentMessageHistoryDto dfxAgentMessageHistoryDto);
+    int mergeDfxAgentMessageByDfxAgentMessageHistory();
 }
diff --git a/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryService.java b/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryService.java
index f0dccff..04dcd3b 100644
--- a/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryService.java
+++ b/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryService.java
@@ -5,7 +5,9 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -32,4 +34,10 @@ public class DfxAgentMessageHistoryService {
         List<DfxAgentMessageHistoryDto> dfxAgentMessageHistoryDtoList = dfxAgentMessageHistoryMapper.selectDfxAgentMessageHistoryList();
         return dfxAgentMessageHistoryDtoList;
     }
+
+    @Transactional
+    @Scheduled(cron = "1 0/10 * * * *")
+    public void autoSaveDfxAgentMessageByDfxAgentMessageHistory() {
+        this.dfxAgentMessageHistoryMapper.mergeDfxAgentMessageByDfxAgentMessageHistory();
+    }
 }
diff --git a/src/main/resources/mapper/app/dfx-agent-message-history.xml b/src/main/resources/mapper/app/dfx-agent-message-history.xml
index 1923aab..c5d388d 100644
--- a/src/main/resources/mapper/app/dfx-agent-message-history.xml
+++ b/src/main/resources/mapper/app/dfx-agent-message-history.xml
@@ -161,4 +161,41 @@
             AND MESSAGE_UUID = #{messageUuid}
         ]]>
     </update>
+
+    <update id="mergeDfxAgentMessageByDfxAgentMessageHistory">
+        <![CDATA[
+        INSERT INTO TB_DFX_AGENT_MESSAGE (
+            MESSAGE_UUID, SENDER_AGENT_ID, SENDER_POSTMAN_ID, SENDER_TS, RECIPIENT_AGENT_ID, RECIPIENT_DROPBOX_ID, RECIPIENT_TS, MESSAGE_TYPE_CODE, CONSOLE_RECEIVE_TS, PROCESS_STATUS_CODE, MESSAGE_DATA, MESSAGE_DATA_COUNT, PROCESS_ACK_TS
+        )
+        SELECT MESSAGE_UUID, SENDER_AGENT_ID, MAX(SENDER_POSTMAN_ID) AS SENDER_POSTMAN_ID, MIN(SENDER_TS) AS SENDER_TS
+            , MAX(RECIPIENT_AGENT_ID) AS RECIPIENT_AGENT_ID, MAX(RECIPIENT_DROPBOX_ID) AS RECIPIENT_DROPBOX_ID, MIN(RECIPIENT_TS) AS RECIPIENT_TS
+            , MAX(MESSAGE_TYPE_CODE) AS MESSAGE_TYPE_CODE, MAX(CONSOLE_RECEIVE_TS) AS CONSOLE_RECEIVE_TS
+            , CASE WHEN MAX(PROCESS_STATUS_ORDER) = 3 THEN 'PROCESS_FAIL'
+                WHEN MAX(PROCESS_STATUS_ORDER) = 2 THEN 'PROCESS_DONE'
+                WHEN MAX(PROCESS_STATUS_ORDER) = 1 THEN 'PROCESS_RECEIVE'
+                ELSE 'PROCESS_RECEIVE' END AS PROCESS_STATUS_CODE
+            , MAX(MESSAGE_DATA) AS MESSAGE_DATA, MAX(MESSAGE_DATA_COUNT) AS MESSAGE_DATA_COUNT, MIN(PROCESS_ACK_TS) AS PROCESS_ACK_TS
+        FROM (
+            SELECT MESSAGE_UUID, SENDER_AGENT_ID, SENDER_POSTMAN_ID, SENDER_TS, RECIPIENT_AGENT_ID, RECIPIENT_DROPBOX_ID, RECIPIENT_TS, MESSAGE_TYPE_CODE, CONSOLE_RECEIVE_TS, PROCESS_STATUS_CODE, MESSAGE_DATA, MESSAGE_DATA_COUNT, PROCESS_ACK_TS
+                , CASE WHEN PROCESS_STATUS_CODE = 'PROCESS_RECEIVED' THEN 1 WHEN PROCESS_STATUS_CODE = 'PROCESS_DONE' THEN 2 WHEN PROCESS_STATUS_CODE = 'PROCESS_FAIL' THEN 3 ELSE 9 END AS PROCESS_STATUS_ORDER
+            FROM TB_DFX_AGENT_MESSAGE_HISTORY
+            WHERE 1 = 1
+                AND CONSOLE_RECEIVE_TS BETWEEN CURRENT_TIMESTAMP - INTERVAL '14 days' AND CURRENT_TIMESTAMP - INTERVAL '1 hour'
+            ) A
+        GROUP BY MESSAGE_UUID, SENDER_AGENT_ID
+        ON CONFLICT (MESSAGE_UUID, SENDER_AGENT_ID) DO
+            UPDATE SET
+                SENDER_POSTMAN_ID = EXCLUDED.SENDER_POSTMAN_ID
+                , SENDER_TS = EXCLUDED.SENDER_TS
+                , RECIPIENT_AGENT_ID = EXCLUDED.RECIPIENT_AGENT_ID
+                , RECIPIENT_DROPBOX_ID = EXCLUDED.RECIPIENT_DROPBOX_ID
+                , RECIPIENT_TS = EXCLUDED.RECIPIENT_TS
+                , MESSAGE_TYPE_CODE = EXCLUDED.MESSAGE_TYPE_CODE
+                , CONSOLE_RECEIVE_TS = EXCLUDED.CONSOLE_RECEIVE_TS
+                , PROCESS_STATUS_CODE = EXCLUDED.PROCESS_STATUS_CODE
+                , MESSAGE_DATA = EXCLUDED.MESSAGE_DATA
+                , MESSAGE_DATA_COUNT = EXCLUDED.MESSAGE_DATA_COUNT
+                , PROCESS_ACK_TS = EXCLUDED.PROCESS_ACK_TS
+        ]]>
+    </update>
 </mapper>