From c3b7b83353dfcea1063f4f0296d70d43983beaa9 Mon Sep 17 00:00:00 2001 From: Park - Jeonghwan <990706leo@gmail.com> Date: Wed, 15 May 2024 13:03:06 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=EC=B1=84=ED=8C=85=20=EB=A9=94?= =?UTF-8?q?=EC=84=B8=EC=A7=80=EB=A5=BC=20=EC=9C=84=ED=95=9C=20payload=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/gloddy/hanlder/InPayloadHandler.kt | 39 +++++++++++-------- .../payload/chatMessage/ChatMessagePayload.kt | 11 ++++++ .../chatMessage/ChatMessagePayloadType.kt | 5 +++ .../kotlin/gloddy/sqs/listner/SqsHandler.kt | 8 +++- .../kotlin/gloddy/sqs/util/MessageParser.kt | 6 +++ 5 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayload.kt create mode 100644 in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayloadType.kt diff --git a/in-message/src/main/kotlin/gloddy/hanlder/InPayloadHandler.kt b/in-message/src/main/kotlin/gloddy/hanlder/InPayloadHandler.kt index cecc4d7..0b7c79c 100644 --- a/in-message/src/main/kotlin/gloddy/hanlder/InPayloadHandler.kt +++ b/in-message/src/main/kotlin/gloddy/hanlder/InPayloadHandler.kt @@ -7,29 +7,30 @@ import gloddy.internal.apply.ApplyRepository import gloddy.internal.group.GroupRepository import gloddy.payload.apply.ApplyPayload import gloddy.payload.apply.ApplyPayloadType +import gloddy.payload.chatMessage.ChatMessagePayload import gloddy.payload.group.GroupPayload import gloddy.payload.group.GroupPayloadType import org.springframework.stereotype.Component @Component class InPayloadHandler( - private val applyRepository: ApplyRepository, - private val groupRepository: GroupRepository, - private val groupChatCommander: GroupChatCommander, + private val applyRepository: ApplyRepository, + private val groupRepository: GroupRepository, + private val groupChatCommander: GroupChatCommander, ) { fun handle(payload: GroupPayload) { when (payload.eventType) { GroupPayloadType.CREATE_GROUP -> { groupRepository.findById(payload.groupId) - .let { - groupChatCommander.createGroupChat( - GroupChatCreateCommand( - userId = it.captainId, - groupId = payload.groupId + .let { + groupChatCommander.createGroupChat( + GroupChatCreateCommand( + userId = it.captainId, + groupId = payload.groupId + ) ) - ) - } + } } } } @@ -38,17 +39,21 @@ class InPayloadHandler( when (payload.eventType) { ApplyPayloadType.APPLY_APPROVE -> { applyRepository.findById(payload.applyId) - .let { - groupChatCommander.join( - GroupChatJoinCommand( - groupId = it.groupId, - userId = it.applyUserId + .let { + groupChatCommander.join( + GroupChatJoinCommand( + groupId = it.groupId, + userId = it.applyUserId + ) ) - ) - } + } } else -> return } } + + fun handle(payload: ChatMessagePayload) { + + } } \ No newline at end of file diff --git a/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayload.kt b/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayload.kt new file mode 100644 index 0000000..9ba5b60 --- /dev/null +++ b/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayload.kt @@ -0,0 +1,11 @@ +package gloddy.payload.chatMessage + +import gloddy.payload.apply.ApplyPayloadType +import java.time.LocalDateTime +import java.util.* + +data class ChatMessagePayload( + val chatId: UUID, + val eventType: ApplyPayloadType, + val eventDateTime: LocalDateTime, +) \ No newline at end of file diff --git a/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayloadType.kt b/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayloadType.kt new file mode 100644 index 0000000..9afb54b --- /dev/null +++ b/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayloadType.kt @@ -0,0 +1,5 @@ +package gloddy.payload.chatMessage + +enum class ChatMessagePayloadType { + CREATE +} \ No newline at end of file diff --git a/in-message/src/main/kotlin/gloddy/sqs/listner/SqsHandler.kt b/in-message/src/main/kotlin/gloddy/sqs/listner/SqsHandler.kt index 1cfbee9..a8c9fa4 100644 --- a/in-message/src/main/kotlin/gloddy/sqs/listner/SqsHandler.kt +++ b/in-message/src/main/kotlin/gloddy/sqs/listner/SqsHandler.kt @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component @Component class SqsHandler( - private val inPayloadHandler: InPayloadHandler, + private val inPayloadHandler: InPayloadHandler, ) { @SqsListener(value = ["\${sqs.queue.group}"]) @@ -21,4 +21,10 @@ class SqsHandler( val applyPayload = MessageParser.parseApplyEvent(message) inPayloadHandler.handle(applyPayload) } + + @SqsListener(value = ["\${sqs.queue.message-create}"]) + fun handleChatMessageEvent(message: String) { + val applyPayload = MessageParser.parseChatMessageEvent(message) + inPayloadHandler.handle(applyPayload) + } } \ No newline at end of file diff --git a/in-message/src/main/kotlin/gloddy/sqs/util/MessageParser.kt b/in-message/src/main/kotlin/gloddy/sqs/util/MessageParser.kt index 48ededa..e4f5c30 100644 --- a/in-message/src/main/kotlin/gloddy/sqs/util/MessageParser.kt +++ b/in-message/src/main/kotlin/gloddy/sqs/util/MessageParser.kt @@ -3,6 +3,7 @@ package gloddy.sqs.util import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import gloddy.payload.apply.ApplyPayload +import gloddy.payload.chatMessage.ChatMessagePayload import gloddy.payload.group.GroupPayload class MessageParser { @@ -20,6 +21,11 @@ class MessageParser { return objectMapper.readValue(payload, GroupPayload::class.java) } + fun parseChatMessageEvent(message: String): ChatMessagePayload { + val payload = parsePayloadFromMessage(message) + return objectMapper.readValue(payload, ChatMessagePayload::class.java) + } + private fun parsePayloadFromMessage(message: String): String { val outerMessage: Map = objectMapper.readValue(message, Map::class.java) as Map From 472465e56d4607e97ae16132c4eaffc9c55a94e8 Mon Sep 17 00:00:00 2001 From: Park - Jeonghwan <990706leo@gmail.com> Date: Thu, 16 May 2024 00:28:08 +0900 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20GroupChatMessageEvent=EC=97=90=20?= =?UTF-8?q?=EB=A7=9E=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payload/chatMessage/ChatMessagePayload.kt | 11 ----------- .../payload/chatMessage/GroupChatMessagePayload.kt | 14 ++++++++++++++ ...yloadType.kt => GroupChatMessagePayloadType.kt} | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayload.kt create mode 100644 in-message/src/main/kotlin/gloddy/payload/chatMessage/GroupChatMessagePayload.kt rename in-message/src/main/kotlin/gloddy/payload/chatMessage/{ChatMessagePayloadType.kt => GroupChatMessagePayloadType.kt} (53%) diff --git a/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayload.kt b/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayload.kt deleted file mode 100644 index 9ba5b60..0000000 --- a/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayload.kt +++ /dev/null @@ -1,11 +0,0 @@ -package gloddy.payload.chatMessage - -import gloddy.payload.apply.ApplyPayloadType -import java.time.LocalDateTime -import java.util.* - -data class ChatMessagePayload( - val chatId: UUID, - val eventType: ApplyPayloadType, - val eventDateTime: LocalDateTime, -) \ No newline at end of file diff --git a/in-message/src/main/kotlin/gloddy/payload/chatMessage/GroupChatMessagePayload.kt b/in-message/src/main/kotlin/gloddy/payload/chatMessage/GroupChatMessagePayload.kt new file mode 100644 index 0000000..ca237e6 --- /dev/null +++ b/in-message/src/main/kotlin/gloddy/payload/chatMessage/GroupChatMessagePayload.kt @@ -0,0 +1,14 @@ +package gloddy.payload.chatMessage + +import gloddy.groupChat.event.GroupChatMessageEventType +import gloddy.payload.apply.ApplyPayloadType +import java.time.LocalDateTime +import java.util.* + +data class GroupChatMessagePayload( + val userId: Long, + val chatId: UUID, + val eventType: GroupChatMessagePayloadType, + val groupChatMessageId: UUID, + val eventDateTime: LocalDateTime +) \ No newline at end of file diff --git a/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayloadType.kt b/in-message/src/main/kotlin/gloddy/payload/chatMessage/GroupChatMessagePayloadType.kt similarity index 53% rename from in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayloadType.kt rename to in-message/src/main/kotlin/gloddy/payload/chatMessage/GroupChatMessagePayloadType.kt index 9afb54b..51f40ee 100644 --- a/in-message/src/main/kotlin/gloddy/payload/chatMessage/ChatMessagePayloadType.kt +++ b/in-message/src/main/kotlin/gloddy/payload/chatMessage/GroupChatMessagePayloadType.kt @@ -1,5 +1,5 @@ package gloddy.payload.chatMessage -enum class ChatMessagePayloadType { +enum class GroupChatMessagePayloadType { CREATE } \ No newline at end of file From 231c6066bcf8f197356c01ccdeb615ceb1093689 Mon Sep 17 00:00:00 2001 From: Park - Jeonghwan <990706leo@gmail.com> Date: Thu, 16 May 2024 00:29:42 +0900 Subject: [PATCH 3/7] =?UTF-8?q?refactor:=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20GroupChatMessagePayload=20?= =?UTF-8?q?=ED=95=B8=EB=93=A4=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/kotlin/gloddy/groupChat/GroupChat.kt | 27 ++++++++++--------- .../groupChat/event/GroupChatMessageEvent.kt | 1 + .../kotlin/gloddy/hanlder/InPayloadHandler.kt | 10 ++++--- .../hanlder/mapper/ApplicationEventMapper.kt | 20 ++++++++++++++ .../kotlin/gloddy/sqs/listner/SqsHandler.kt | 4 +-- .../kotlin/gloddy/sqs/util/MessageParser.kt | 6 ++--- 6 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 in-message/src/main/kotlin/gloddy/hanlder/mapper/ApplicationEventMapper.kt diff --git a/domain/src/main/kotlin/gloddy/groupChat/GroupChat.kt b/domain/src/main/kotlin/gloddy/groupChat/GroupChat.kt index 9b6adc6..b169887 100644 --- a/domain/src/main/kotlin/gloddy/groupChat/GroupChat.kt +++ b/domain/src/main/kotlin/gloddy/groupChat/GroupChat.kt @@ -50,10 +50,11 @@ data class GroupChat( this.events.add( GroupChatMessageEvent( - userId = userId, - eventType = GroupChatMessageEventType.CREATE, - groupChatMessageId = groupChatMessage.id, - eventDateTime = groupChatMessage.createdAt + userId = userId, + chatId = this.id, + eventType = GroupChatMessageEventType.CREATE, + groupChatMessageId = groupChatMessage.id, + eventDateTime = groupChatMessage.createdAt ) ) @@ -75,10 +76,11 @@ data class GroupChat( this.events.add( GroupChatMessageEvent( - userId = userId, - eventType = GroupChatMessageEventType.CREATE, - groupChatMessageId = groupChatMessage.id, - eventDateTime = groupChatMessage.createdAt + userId = userId, + chatId = this.id, + eventType = GroupChatMessageEventType.CREATE, + groupChatMessageId = groupChatMessage.id, + eventDateTime = groupChatMessage.createdAt ) ) return groupChatMessage @@ -88,10 +90,11 @@ data class GroupChat( val deletedGroupChatMessage = groupChatMessage.delete(userId) this.events.add( GroupChatMessageEvent( - userId = userId, - eventType = GroupChatMessageEventType.DELETE, - groupChatMessageId = groupChatMessage.id, - eventDateTime = deletedGroupChatMessage.deletedAt!! + userId = userId, + chatId = this.id, + eventType = GroupChatMessageEventType.DELETE, + groupChatMessageId = groupChatMessage.id, + eventDateTime = deletedGroupChatMessage.deletedAt!! ) ) return GroupChatMessageDeleteResult( diff --git a/domain/src/main/kotlin/gloddy/groupChat/event/GroupChatMessageEvent.kt b/domain/src/main/kotlin/gloddy/groupChat/event/GroupChatMessageEvent.kt index 281f9b3..9d8ad3a 100644 --- a/domain/src/main/kotlin/gloddy/groupChat/event/GroupChatMessageEvent.kt +++ b/domain/src/main/kotlin/gloddy/groupChat/event/GroupChatMessageEvent.kt @@ -5,6 +5,7 @@ import java.util.UUID data class GroupChatMessageEvent( val userId: Long, + val chatId: UUID, val eventType: GroupChatMessageEventType, val groupChatMessageId: UUID, val eventDateTime: LocalDateTime diff --git a/in-message/src/main/kotlin/gloddy/hanlder/InPayloadHandler.kt b/in-message/src/main/kotlin/gloddy/hanlder/InPayloadHandler.kt index 0b7c79c..0cd3585 100644 --- a/in-message/src/main/kotlin/gloddy/hanlder/InPayloadHandler.kt +++ b/in-message/src/main/kotlin/gloddy/hanlder/InPayloadHandler.kt @@ -3,11 +3,13 @@ package gloddy.hanlder import gloddy.groupChat.dto.command.GroupChatCreateCommand import gloddy.groupChat.dto.command.GroupChatJoinCommand import gloddy.groupChat.service.GroupChatCommander +import gloddy.groupChat.service.GroupChatMessageCommander +import gloddy.hanlder.mapper.toDomainEvent import gloddy.internal.apply.ApplyRepository import gloddy.internal.group.GroupRepository import gloddy.payload.apply.ApplyPayload import gloddy.payload.apply.ApplyPayloadType -import gloddy.payload.chatMessage.ChatMessagePayload +import gloddy.payload.chatMessage.GroupChatMessagePayload import gloddy.payload.group.GroupPayload import gloddy.payload.group.GroupPayloadType import org.springframework.stereotype.Component @@ -16,6 +18,7 @@ import org.springframework.stereotype.Component class InPayloadHandler( private val applyRepository: ApplyRepository, private val groupRepository: GroupRepository, + private val groupChatMessageCommander: GroupChatMessageCommander, private val groupChatCommander: GroupChatCommander, ) { @@ -53,7 +56,8 @@ class InPayloadHandler( } } - fun handle(payload: ChatMessagePayload) { - + fun handle(payload: GroupChatMessagePayload){ + val groupChatMessageEvent = payload.toDomainEvent() + groupChatMessageCommander.broadcastMessage(groupChatMessageEvent) } } \ No newline at end of file diff --git a/in-message/src/main/kotlin/gloddy/hanlder/mapper/ApplicationEventMapper.kt b/in-message/src/main/kotlin/gloddy/hanlder/mapper/ApplicationEventMapper.kt new file mode 100644 index 0000000..0a64018 --- /dev/null +++ b/in-message/src/main/kotlin/gloddy/hanlder/mapper/ApplicationEventMapper.kt @@ -0,0 +1,20 @@ +package gloddy.hanlder.mapper + +import gloddy.groupChat.event.GroupChatMessageEvent +import gloddy.groupChat.event.GroupChatMessageEventType +import gloddy.payload.chatMessage.GroupChatMessagePayload +import gloddy.payload.chatMessage.GroupChatMessagePayloadType + +fun GroupChatMessagePayload.toDomainEvent() : GroupChatMessageEvent = + GroupChatMessageEvent( + userId = this.userId, + chatId = this.chatId, + eventType = this.eventType.toDomainEventType(), + groupChatMessageId = this.groupChatMessageId, + eventDateTime = this.eventDateTime + ) + +private fun GroupChatMessagePayloadType.toDomainEventType() : GroupChatMessageEventType = + when(this){ + GroupChatMessagePayloadType.CREATE -> GroupChatMessageEventType.CREATE + } \ No newline at end of file diff --git a/in-message/src/main/kotlin/gloddy/sqs/listner/SqsHandler.kt b/in-message/src/main/kotlin/gloddy/sqs/listner/SqsHandler.kt index a8c9fa4..719e7b1 100644 --- a/in-message/src/main/kotlin/gloddy/sqs/listner/SqsHandler.kt +++ b/in-message/src/main/kotlin/gloddy/sqs/listner/SqsHandler.kt @@ -24,7 +24,7 @@ class SqsHandler( @SqsListener(value = ["\${sqs.queue.message-create}"]) fun handleChatMessageEvent(message: String) { - val applyPayload = MessageParser.parseChatMessageEvent(message) - inPayloadHandler.handle(applyPayload) + val groupChatMessagePayload = MessageParser.parseChatMessageEvent(message) + inPayloadHandler.handle(groupChatMessagePayload) } } \ No newline at end of file diff --git a/in-message/src/main/kotlin/gloddy/sqs/util/MessageParser.kt b/in-message/src/main/kotlin/gloddy/sqs/util/MessageParser.kt index e4f5c30..cefd086 100644 --- a/in-message/src/main/kotlin/gloddy/sqs/util/MessageParser.kt +++ b/in-message/src/main/kotlin/gloddy/sqs/util/MessageParser.kt @@ -3,7 +3,7 @@ package gloddy.sqs.util import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import gloddy.payload.apply.ApplyPayload -import gloddy.payload.chatMessage.ChatMessagePayload +import gloddy.payload.chatMessage.GroupChatMessagePayload import gloddy.payload.group.GroupPayload class MessageParser { @@ -21,9 +21,9 @@ class MessageParser { return objectMapper.readValue(payload, GroupPayload::class.java) } - fun parseChatMessageEvent(message: String): ChatMessagePayload { + fun parseChatMessageEvent(message: String): GroupChatMessagePayload { val payload = parsePayloadFromMessage(message) - return objectMapper.readValue(payload, ChatMessagePayload::class.java) + return objectMapper.readValue(payload, GroupChatMessagePayload::class.java) } From 061739535672c79332a73ea9e5498baa79202a81 Mon Sep 17 00:00:00 2001 From: Park - Jeonghwan <990706leo@gmail.com> Date: Thu, 16 May 2024 00:30:39 +0900 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=EC=9B=B9=EC=86=8C=EC=BC=93=20broad?= =?UTF-8?q?casting=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- domain/build.gradle.kts | 1 + .../service/GroupChatMessageCommander.kt | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 domain/src/main/kotlin/gloddy/groupChat/service/GroupChatMessageCommander.kt diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index 5047d3a..8c89c67 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -1,6 +1,7 @@ dependencies { compileOnly("org.springframework:spring-tx") compileOnly("org.springframework:spring-context") + compileOnly("org.springframework.boot:spring-boot-starter-websocket") testImplementation(project(":storage")) testImplementation(project(path = ":storage", configuration = "testArtifacts")) diff --git a/domain/src/main/kotlin/gloddy/groupChat/service/GroupChatMessageCommander.kt b/domain/src/main/kotlin/gloddy/groupChat/service/GroupChatMessageCommander.kt new file mode 100644 index 0000000..ce6bcc1 --- /dev/null +++ b/domain/src/main/kotlin/gloddy/groupChat/service/GroupChatMessageCommander.kt @@ -0,0 +1,16 @@ +package gloddy.groupChat.service + +import gloddy.groupChat.event.GroupChatMessageEvent +import gloddy.groupChat.repository.GroupChatCommandRepository +import org.springframework.messaging.simp.SimpMessageSendingOperations + +class GroupChatMessageCommander( + private val simpMessageSendingOperations: SimpMessageSendingOperations, + private val groupChatCommandRepository: GroupChatCommandRepository +) { + + fun broadcastMessage(groupChatMessageEvent: GroupChatMessageEvent) { + val foundMessage = groupChatCommandRepository.findGroupChatMessageById(groupChatMessageEvent.groupChatMessageId) + simpMessageSendingOperations.convertAndSend("sub/channel/" + groupChatMessageEvent.chatId, foundMessage) + } +} \ No newline at end of file From 3e27b5cf027ccd5eecb32a9d72a7e9bc12cf2a1e Mon Sep 17 00:00:00 2001 From: Park - Jeonghwan <990706leo@gmail.com> Date: Thu, 16 May 2024 00:41:26 +0900 Subject: [PATCH 5/7] =?UTF-8?q?fix(test):=20=EB=B3=80=EA=B2=BD=EB=90=9C=20?= =?UTF-8?q?event=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/kotlin/gloddy/groupChat/GroupChatCreateMessageTest.kt | 2 ++ .../test/kotlin/gloddy/groupChat/GroupChatDeleteMessageTest.kt | 1 + 2 files changed, 3 insertions(+) diff --git a/domain/src/test/kotlin/gloddy/groupChat/GroupChatCreateMessageTest.kt b/domain/src/test/kotlin/gloddy/groupChat/GroupChatCreateMessageTest.kt index ca2dcbc..add994b 100644 --- a/domain/src/test/kotlin/gloddy/groupChat/GroupChatCreateMessageTest.kt +++ b/domain/src/test/kotlin/gloddy/groupChat/GroupChatCreateMessageTest.kt @@ -58,6 +58,7 @@ class GroupChatCreateMessageTest : GroupChatServiceTest() { it.contains( GroupChatMessageEvent( userId = groupChatMessage.userId, + chatId = groupChatMessage.chatId, eventType = GroupChatMessageEventType.CREATE, groupChatMessageId = groupChatMessage.id, eventDateTime = groupChatMessage.createdAt @@ -104,6 +105,7 @@ class GroupChatCreateMessageTest : GroupChatServiceTest() { it.contains( GroupChatMessageEvent( userId = groupChatMessage.userId, + chatId = groupChatMessage.chatId, eventType = GroupChatMessageEventType.CREATE, groupChatMessageId = groupChatMessage.id, eventDateTime = groupChatMessage.createdAt diff --git a/domain/src/test/kotlin/gloddy/groupChat/GroupChatDeleteMessageTest.kt b/domain/src/test/kotlin/gloddy/groupChat/GroupChatDeleteMessageTest.kt index f82f320..16caf00 100644 --- a/domain/src/test/kotlin/gloddy/groupChat/GroupChatDeleteMessageTest.kt +++ b/domain/src/test/kotlin/gloddy/groupChat/GroupChatDeleteMessageTest.kt @@ -66,6 +66,7 @@ class GroupChatDeleteMessageTest : GroupChatServiceTest() { it.contains( GroupChatMessageEvent( userId = groupChatMessage.userId, + chatId = groupChatMessage.chatId, eventType = GroupChatMessageEventType.DELETE, groupChatMessageId = groupChatMessage.id, eventDateTime = groupChatMessage.deletedAt!! From b0393df2da3709f5781901d24bb855dc95728d4e Mon Sep 17 00:00:00 2001 From: Park - Jeonghwan <990706leo@gmail.com> Date: Wed, 29 May 2024 19:28:38 +0900 Subject: [PATCH 6/7] =?UTF-8?q?refactor:=20=EC=B6=A9=EB=8F=8C=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/kotlin/gloddy/groupChat/GroupChat.kt | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/domain/src/main/kotlin/gloddy/groupChat/GroupChat.kt b/domain/src/main/kotlin/gloddy/groupChat/GroupChat.kt index b169887..72d8509 100644 --- a/domain/src/main/kotlin/gloddy/groupChat/GroupChat.kt +++ b/domain/src/main/kotlin/gloddy/groupChat/GroupChat.kt @@ -7,8 +7,8 @@ import gloddy.groupChat.vo.GroupChatMessageImage import gloddy.groupChat.vo.MessageType import gloddy.util.UUIDGenerator import java.time.LocalDateTime -import java.time.LocalDateTime.* -import java.util.UUID +import java.time.LocalDateTime.now +import java.util.* data class GroupChat( val hostId: Long, @@ -50,11 +50,11 @@ data class GroupChat( this.events.add( GroupChatMessageEvent( - userId = userId, - chatId = this.id, - eventType = GroupChatMessageEventType.CREATE, - groupChatMessageId = groupChatMessage.id, - eventDateTime = groupChatMessage.createdAt + userId = userId, + chatId = this.id, + eventType = GroupChatMessageEventType.CREATE, + groupChatMessageId = groupChatMessage.id, + eventDateTime = groupChatMessage.createdAt ) ) @@ -76,11 +76,11 @@ data class GroupChat( this.events.add( GroupChatMessageEvent( - userId = userId, - chatId = this.id, - eventType = GroupChatMessageEventType.CREATE, - groupChatMessageId = groupChatMessage.id, - eventDateTime = groupChatMessage.createdAt + userId = userId, + chatId = this.id, + eventType = GroupChatMessageEventType.CREATE, + groupChatMessageId = groupChatMessage.id, + eventDateTime = groupChatMessage.createdAt ) ) return groupChatMessage @@ -88,15 +88,13 @@ data class GroupChat( fun deleteUserMessage(userId: Long, groupChatMessage: GroupChatMessage): GroupChatMessageDeleteResult { val deletedGroupChatMessage = groupChatMessage.delete(userId) - this.events.add( - GroupChatMessageEvent( - userId = userId, - chatId = this.id, - eventType = GroupChatMessageEventType.DELETE, - groupChatMessageId = groupChatMessage.id, - eventDateTime = deletedGroupChatMessage.deletedAt!! - ) - ) + this.events.add(GroupChatMessageEvent( + userId = userId, + chatId = this.id, + eventType = GroupChatMessageEventType.DELETE, + groupChatMessageId = groupChatMessage.id, + eventDateTime = deletedGroupChatMessage.deletedAt!! + )) return GroupChatMessageDeleteResult( groupChat = this, groupChatMessage = deletedGroupChatMessage From 28b30caf2409206918b3c5dfe170a44839e85ae4 Mon Sep 17 00:00:00 2001 From: Park - Jeonghwan <990706leo@gmail.com> Date: Wed, 29 May 2024 19:29:37 +0900 Subject: [PATCH 7/7] =?UTF-8?q?refactor(test):=20=EC=B6=A9=EB=8F=8C=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/gloddy/groupChat/GroupChatCreateMessageTest.kt | 4 ++-- .../kotlin/gloddy/groupChat/GroupChatDeleteMessageTest.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/domain/src/test/kotlin/gloddy/groupChat/GroupChatCreateMessageTest.kt b/domain/src/test/kotlin/gloddy/groupChat/GroupChatCreateMessageTest.kt index add994b..6c485b8 100644 --- a/domain/src/test/kotlin/gloddy/groupChat/GroupChatCreateMessageTest.kt +++ b/domain/src/test/kotlin/gloddy/groupChat/GroupChatCreateMessageTest.kt @@ -58,7 +58,7 @@ class GroupChatCreateMessageTest : GroupChatServiceTest() { it.contains( GroupChatMessageEvent( userId = groupChatMessage.userId, - chatId = groupChatMessage.chatId, + chatId = groupChat.id, eventType = GroupChatMessageEventType.CREATE, groupChatMessageId = groupChatMessage.id, eventDateTime = groupChatMessage.createdAt @@ -105,7 +105,7 @@ class GroupChatCreateMessageTest : GroupChatServiceTest() { it.contains( GroupChatMessageEvent( userId = groupChatMessage.userId, - chatId = groupChatMessage.chatId, + chatId = groupChat.id, eventType = GroupChatMessageEventType.CREATE, groupChatMessageId = groupChatMessage.id, eventDateTime = groupChatMessage.createdAt diff --git a/domain/src/test/kotlin/gloddy/groupChat/GroupChatDeleteMessageTest.kt b/domain/src/test/kotlin/gloddy/groupChat/GroupChatDeleteMessageTest.kt index 16caf00..fa941ed 100644 --- a/domain/src/test/kotlin/gloddy/groupChat/GroupChatDeleteMessageTest.kt +++ b/domain/src/test/kotlin/gloddy/groupChat/GroupChatDeleteMessageTest.kt @@ -66,7 +66,7 @@ class GroupChatDeleteMessageTest : GroupChatServiceTest() { it.contains( GroupChatMessageEvent( userId = groupChatMessage.userId, - chatId = groupChatMessage.chatId, + chatId = groupChat.id, eventType = GroupChatMessageEventType.DELETE, groupChatMessageId = groupChatMessage.id, eventDateTime = groupChatMessage.deletedAt!!