From dce6d00dce381913539cb5afa5725014a6b4b268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=98=84=EA=B2=BD?= Date: Sat, 25 Jul 2026 17:12:53 +0900 Subject: [PATCH 1/2] FIX: merge error --- .../java/com/example/umcCall/domain/chat/entity/ChatRoom.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/example/umcCall/domain/chat/entity/ChatRoom.java b/src/main/java/com/example/umcCall/domain/chat/entity/ChatRoom.java index ae5767b..704e8f8 100644 --- a/src/main/java/com/example/umcCall/domain/chat/entity/ChatRoom.java +++ b/src/main/java/com/example/umcCall/domain/chat/entity/ChatRoom.java @@ -82,10 +82,6 @@ public void archive() { this.deleted = true; } - - public void touch(LocalDateTime messageAt) { - this.lastMessageAt = messageAt; - /** 음소거 여부를 요청받은 값으로 */ public void updateMuted(boolean muted) { this.muted = muted; From 1eeba828e72038b853eab00cefd277902f0aafd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=98=84=EA=B2=BD?= Date: Sat, 25 Jul 2026 17:18:54 +0900 Subject: [PATCH 2/2] FIX: merge error --- .../domain/proactive/service/ProactiveContactProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/umcCall/domain/proactive/service/ProactiveContactProcessor.java b/src/main/java/com/example/umcCall/domain/proactive/service/ProactiveContactProcessor.java index ddacdfa..a357643 100644 --- a/src/main/java/com/example/umcCall/domain/proactive/service/ProactiveContactProcessor.java +++ b/src/main/java/com/example/umcCall/domain/proactive/service/ProactiveContactProcessor.java @@ -205,7 +205,7 @@ public void complete(Claim claim, String reply, LocalDateTime now) { .chatRoom(room) .proactiveRequestId(claim.requestId()) .build()); - room.touch(now); + room.updateLastMessageAt(now); } CharacterAiProfile profile = profileRepository.findById(relationship.getCharacter().getId()).orElseThrow();