푸시 딥링크 추가 및 초대장 발신자 수신 필터링 (#40)

* feat: 회원 탈퇴시 모임 참여한�모임에서 전부 제거

* refactor: 코드 정리

* Auto stash before rebase of "feat/delete-gathering-member" onto "origin/main"

* fix: 브랜치 충돌

* fix: test

* feat: 제안한 사람 푸시 필터링

* refactor: 코드 정리

* feat: dto 변경

* feat: deep link 변경

* refactor: 코드 정리

* refactor: 코드 정리

Author: songyi00

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/GatheringCommandService.kt

@@ -59,4 +59,9 @@ class GatheringMemberService(
 
         return gatheringMembers.map { it.memberId }
     }
+
+    @Transactional
+    fun deleteGatheringMember(memberId: Long) {
+        gatheringMemberRepository.deleteAllByMemberId(memberId)
+    }
 }

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/GatheringMemberService.kt

@@ -37,7 +37,9 @@ class GatheringProposalService(
         pushService.sendPush(
             PushCommand.Push.Proposal(
                 pushType = PushType.PROPOSAL,
-                gatheringId = command.gatheringId
+                gatheringId = command.gatheringId,
+                proposalId = command.proposalId,
+                proposerMemberId = command.memberId,
             )
         )
     }

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/GatheringProposalService.kt

@@ -4,11 +4,12 @@ import nexters.tuk.application.gathering.dto.request.GatheringCommand
 import nexters.tuk.application.gathering.dto.response.GatheringResponse
 import nexters.tuk.domain.gathering.Gathering
 import nexters.tuk.domain.gathering.GatheringRepository
+import nexters.tuk.domain.gathering.findByIdOrThrow
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
-class GatheringGenerateService(
+class GatheringService(
     private val gatheringRepository: GatheringRepository,
     private val gatheringMemberService: GatheringMemberService,
     private val gatheringTagService: GatheringTagService,
@@ -32,4 +33,16 @@ class GatheringGenerateService(
             gathering.id,
         )
     }
+
+    @Transactional
+    fun updateGathering(command: GatheringCommand.Update): GatheringResponse.Simple {
+        val gathering = gatheringRepository.findByIdOrThrow(command.gatheringId)
+        gathering.update(command)
+
+        return GatheringResponse.Simple(
+            gatheringId = gathering.id,
+            gatheringName = gathering.name,
+            intervalDays = gathering.intervalDays,
+        )
+    }
 }

…on/gathering/GatheringGenerateService.kt …pplication/gathering/GatheringService.kttuk-api/src/main/kotlin/nexters/tuk/application/gathering/GatheringGenerateService.kt renamed to tuk-api/src/main/kotlin/nexters/tuk/application/gathering/GatheringService.kt tuk-api/src/main/kotlin/nexters/tuk/application/gathering/GatheringGenerateService.kt renamed to tuk-api/src/main/kotlin/nexters/tuk/application/gathering/GatheringService.kt

@@ -0,0 +1,20 @@
+package nexters.tuk.application.gathering.handler
+
+import nexters.tuk.application.gathering.GatheringMemberService
+import nexters.tuk.application.member.MemberService
+import nexters.tuk.application.member.event.MemberEvent
+import org.springframework.context.event.EventListener
+import org.springframework.stereotype.Component
+import org.springframework.transaction.event.TransactionPhase
+import org.springframework.transaction.event.TransactionalEventListener
+
+@Component
+class GatheringHandler(
+    private val gatheringMemberService: GatheringMemberService,
+) {
+
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    fun handleDeleteMember(event: MemberEvent.MemberDeleted) {
+        gatheringMemberService.deleteGatheringMember(event.memberId)
+    }
+}

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/handler/GatheringHandler.kt

@@ -2,17 +2,20 @@ package nexters.tuk.application.member
 
 import nexters.tuk.application.member.dto.request.MemberCommand
 import nexters.tuk.application.member.dto.response.MemberResponse
+import nexters.tuk.application.member.event.MemberEvent
 import nexters.tuk.contract.ApiResponse
 import nexters.tuk.contract.BaseException
 import nexters.tuk.contract.ErrorType
 import nexters.tuk.domain.member.Member
 import nexters.tuk.domain.member.MemberRepository
+import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
 class MemberService(
     private val memberRepository: MemberRepository,
+    private val applicationEventPublisher: ApplicationEventPublisher,
 ) {
     @Transactional
     fun login(command: MemberCommand.Login): MemberResponse.Login {
@@ -48,6 +51,7 @@ class MemberService(
     @Transactional
     fun deleteMember(memberId: Long) {
         memberRepository.leave(memberId)
+        applicationEventPublisher.publishEvent(MemberEvent.MemberDeleted(memberId))
     }
 
     @Transactional(readOnly = true)

tuk-api/src/main/kotlin/nexters/tuk/application/member/MemberService.kt

@@ -0,0 +1,7 @@
+package nexters.tuk.application.member.event
+
+class MemberEvent {
+    data class MemberDeleted(
+        val memberId: Long,
+    )
+}

tuk-api/src/main/kotlin/nexters/tuk/application/member/event/MemberEvent.kt

@@ -5,7 +5,7 @@ import nexters.tuk.application.proposal.vo.ProposalPurposeInfo
 class ProposalCommand {
     data class Propose(
         val memberId: Long,
-        val gatheringId: Long?,
+        val gatheringId: Long? = null,
         val purpose: ProposalPurposeInfo,
     )
 }

tuk-api/src/main/kotlin/nexters/tuk/application/proposal/dto/request/ProposalCommand.kt

@@ -0,0 +1,9 @@
+package nexters.tuk.application.push
+
+enum class PushDeepLink(
+    val link: String,
+) {
+    DEFAULT("tuk-app://tuk"),
+    PROPOSAL("tuk-app://tuk/proposal-detail/%s"),
+    ;
+}

tuk-api/src/main/kotlin/nexters/tuk/application/push/PushDeepLink.kt

@@ -19,16 +19,18 @@ class PushService(
 
     @Transactional
     fun sendPush(command: PushCommand.Push) {
-        val pushMessage = PushMessage.random()
         when (command) {
             is PushCommand.Push.GatheringNotification -> {
-                val memberIds = command.recipients.map { it.memberId }
+                val pushMessage = PushMessage.random(pushType = command.pushType)
+                val memberIds = gatheringMemberService.getGatheringMemberIds(gatheringId = command.gatheringId)
                 pushAll(memberIds = memberIds, pushMessage = pushMessage)
-                logger.info("Sent gathering notification push. Recipients: ${command.recipients.size}, PushType: ${command.pushType}")
+                logger.info("Sent gathering notification push. Recipients: ${memberIds.size}, PushType: ${command.pushType}")
             }
 
             is PushCommand.Push.Proposal -> {
+                val pushMessage = PushMessage.random(pushType = command.pushType, proposalId = command.proposalId)
                 val memberIds = gatheringMemberService.getGatheringMemberIds(gatheringId = command.gatheringId)
+                    .filter { memberId -> memberId != command.proposerMemberId }
                 pushAll(memberIds = memberIds, pushMessage = pushMessage)
                 logger.info("Sent proposal push. GatheringId: ${command.gatheringId}, Recipients: ${memberIds.size}, PushType: ${command.pushType}")
             }
@@ -37,7 +39,7 @@ class PushService(
 
     private fun pushAll(
         memberIds: List<Long>,
-        pushMessage: PushMessage,
+        pushMessage: PushData,
     ) {
         logger.info("PushService.pushAll -> memberIds: $memberIds")
         val memberNameMap = memberService.getMembers(memberIds).associate { it.memberId to it.memberName }
@@ -50,7 +52,8 @@ class PushService(
                         memberNameMap[token.memberId]
                             ?: return@forEach
                     ),
-                    body = pushMessage.body
+                    body = pushMessage.body,
+                    deepLink = pushMessage.deepLink(pushMessage.meta?.proposalId),
                 )
             )
         }