From 0d081482d40501b717f8ea1e1620ae63cff1a253 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Fri, 13 Dec 2024 10:39:11 +0800
Subject: [PATCH] REQ-3201: ack

---
 .../java/cn/axzo/im/updatable/UpdatableMessageManager.java | 7 ++++---
 .../src/main/java/cn/axzo/im/updatable/UpdateSupport.java  | 6 ++++--
 .../axzo/im/updatable/retry/MessageUpdateRetryService.java | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/im-center-server/src/main/java/cn/axzo/im/updatable/UpdatableMessageManager.java b/im-center-server/src/main/java/cn/axzo/im/updatable/UpdatableMessageManager.java
index 87e045a..2487ead 100644
--- a/im-center-server/src/main/java/cn/axzo/im/updatable/UpdatableMessageManager.java
+++ b/im-center-server/src/main/java/cn/axzo/im/updatable/UpdatableMessageManager.java
@@ -180,11 +180,12 @@ public class UpdatableMessageManager {
         List<List<UpdateMessageRequest.Update>> batches = Lists.partition(
                 request.getUpdates(), props.getUpdatableMessageMaxLockRecords());
         for (List<UpdateMessageRequest.Update> batch : batches)
-            transactionTemplate.executeWithoutResult(unused -> updateMessageImpl(batch, response));
+            transactionTemplate.executeWithoutResult(unused -> updateMessageImpl(request, batch, response));
         return response;
     }
 
-    private void updateMessageImpl(List<UpdateMessageRequest.Update> requestUpdates,
+    private void updateMessageImpl(UpdateMessageRequest request,
+                                   List<UpdateMessageRequest.Update> requestUpdates,
                                    MessageUpdateResponse response) {
         List<UpdatableMessage> requestMessages = updatableMessageDao
                 .getByBizMessageIdsForUpdate(collectBizMessageIds(requestUpdates));
@@ -214,7 +215,7 @@ public class UpdatableMessageManager {
             updatableMessageDao.getBaseMapper().incrDataVersion(updateIds);
             messageUpdateRetryService.scheduleNextRetry(updateIds);
             AddUpdateHistoryResult result = updateSupport
-                    .addUpdateHistories("updateHistoryCreated", validUpdates);
+                    .addUpdateHistories(request, "updateHistoryCreated", validUpdates);
             updateSupport.updateHistoryId(result, UpdatableMessage::setUpdateHistoryId);
         }
     }
diff --git a/im-center-server/src/main/java/cn/axzo/im/updatable/UpdateSupport.java b/im-center-server/src/main/java/cn/axzo/im/updatable/UpdateSupport.java
index 334e85c..bcb51fc 100644
--- a/im-center-server/src/main/java/cn/axzo/im/updatable/UpdateSupport.java
+++ b/im-center-server/src/main/java/cn/axzo/im/updatable/UpdateSupport.java
@@ -44,7 +44,9 @@ public class UpdateSupport {
     private final CardManipulateCollectorFactory cardManipulateCollectorFactory;
 
     public AddUpdateHistoryResult addUpdateHistories(
-            String context, List<? extends MessageUpdateInfo> updates) {
+            Object request,
+            String context,
+            List<? extends MessageUpdateInfo> updates) {
         List<UpdatableMessage> messages = updatableMessageDao
                 .getByBizMessageIds(collectBizMessageIds(updates));
         Map<String, UpdatableMessage> bizMessageId2Message = messages
@@ -99,7 +101,7 @@ public class UpdateSupport {
             history.setRecordExt(recordExt);
             history.setTimestampForSend(new Date());
 
-            UpdatableMessageLog messageLog = message.toMessageLog(null);
+            UpdatableMessageLog messageLog = message.toMessageLog(request);
             collector.addLog(messageLog);
             messageLog2History.put(messageLog, history);
             messageLog.setDataVersion(message.getDataVersion());
diff --git a/im-center-server/src/main/java/cn/axzo/im/updatable/retry/MessageUpdateRetryService.java b/im-center-server/src/main/java/cn/axzo/im/updatable/retry/MessageUpdateRetryService.java
index 2641f41..105c64d 100644
--- a/im-center-server/src/main/java/cn/axzo/im/updatable/retry/MessageUpdateRetryService.java
+++ b/im-center-server/src/main/java/cn/axzo/im/updatable/retry/MessageUpdateRetryService.java
@@ -93,7 +93,7 @@ public class MessageUpdateRetryService {
         updatableMessageDao.getBaseMapper().incrRetryCount(messageIds);
         List<UpdatableMessage> messages = updatableMessageDao.listByIds(messageIds);
         AddUpdateHistoryResult result = updateSupport
-                .addUpdateHistories("retryUpdateHistoryCreated", messages);
+                .addUpdateHistories(null, "retryUpdateHistoryCreated", messages);
         updateSupport.updateHistoryId(result, UpdatableMessage::setRetryHistoryId);
     }
 }
\ No newline at end of file