[IDLE-512] 센터 관리자 인증 요청 event 변경 및 NotificationInfo 인터페이스 패키지 이동

3IDLES · Nov 12, 2024 · 4e925f2 · 4e925f2
1 parent b2cbfe7
commit 4e925f2
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 32 deletions.
diff --git a/...applys/domain/CarerApplyEventPublisher.kt → .../applys/event/CarerApplyEventPublisher.kt b/...applys/domain/CarerApplyEventPublisher.kt → .../applys/event/CarerApplyEventPublisher.kt
@@ -1,4 +1,4 @@
-package com.swm.idle.application.applys.domain
+package com.swm.idle.application.applys.event
 
 import com.swm.idle.domain.applys.event.ApplyEvent
 import org.springframework.context.ApplicationEventPublisher

diff --git a/...ication/src/main/kotlin/com/swm/idle/application/applys/facade/CarerApplyFacadeService.kt b/...ication/src/main/kotlin/com/swm/idle/application/applys/facade/CarerApplyFacadeService.kt
@@ -1,7 +1,7 @@
 package com.swm.idle.application.applys.facade
 
-import com.swm.idle.application.applys.domain.CarerApplyEventPublisher
 import com.swm.idle.application.applys.domain.CarerApplyService
+import com.swm.idle.application.applys.event.CarerApplyEventPublisher
 import com.swm.idle.application.applys.vo.CarerApplyNotificationInfo
 import com.swm.idle.application.common.security.getUserAuthentication
 import com.swm.idle.application.jobposting.domain.JobPostingService

diff --git a/...lication/src/main/kotlin/com/swm/idle/application/applys/vo/CarerApplyNotificationInfo.kt b/...lication/src/main/kotlin/com/swm/idle/application/applys/vo/CarerApplyNotificationInfo.kt
@@ -1,7 +1,7 @@
 package com.swm.idle.application.applys.vo
 
 import com.swm.idle.domain.notification.enums.NotificationType
-import com.swm.idle.domain.notification.jpa.NotificationInfo
+import com.swm.idle.domain.notification.event.NotificationInfo
 import java.util.*
 
 data class CarerApplyNotificationInfo(

diff --git a/...cation/src/main/kotlin/com/swm/idle/application/notification/domain/DeviceTokenService.kt b/...cation/src/main/kotlin/com/swm/idle/application/notification/domain/DeviceTokenService.kt
@@ -21,6 +21,10 @@ class DeviceTokenService(
         return deviceTokenJpaRepository.findAllByUserId(userId)
     }
 
+    fun findByUserId(userId: UUID): DeviceToken? {
+        return deviceTokenJpaRepository.findByUserId(userId)
+    }
+
     @Transactional
     fun updateDeviceTokenUserId(
         deviceToken: DeviceToken,

diff --git a/...ation/src/main/kotlin/com/swm/idle/application/notification/domain/NotificationService.kt b/...ation/src/main/kotlin/com/swm/idle/application/notification/domain/NotificationService.kt
@@ -2,8 +2,8 @@ package com.swm.idle.application.notification.domain
 
 import com.swm.idle.domain.common.dto.NotificationQueryDto
 import com.swm.idle.domain.common.exception.PersistenceException
+import com.swm.idle.domain.notification.event.NotificationInfo
 import com.swm.idle.domain.notification.jpa.Notification
-import com.swm.idle.domain.notification.jpa.NotificationInfo
 import com.swm.idle.domain.notification.repository.jpa.NotificationJpaRepository
 import com.swm.idle.domain.notification.repository.querydsl.NotificationQueryRepository
 import org.springframework.data.repository.findByIdOrNull

diff --git a/...kotlin/com/swm/idle/application/user/center/service/domain/CenterManagerEventPublisher.kt b/...kotlin/com/swm/idle/application/user/center/service/domain/CenterManagerEventPublisher.kt
diff --git a/...e/application/user/center/service/event/CenterManagerVerificationRequestEventPublisher.kt b/...e/application/user/center/service/event/CenterManagerVerificationRequestEventPublisher.kt
@@ -0,0 +1,16 @@
+package com.swm.idle.application.user.center.service.event
+
+import com.swm.idle.domain.user.center.event.CenterManagerVerificationRequestEvent
+import org.springframework.context.ApplicationEventPublisher
+import org.springframework.stereotype.Service
+
+@Service
+class CenterManagerVerificationRequestEventPublisher(
+    private val eventPublisher: ApplicationEventPublisher,
+) {
+
+    fun publish(centerManagerVerificationRequestEvent: CenterManagerVerificationRequestEvent) {
+        eventPublisher.publishEvent(centerManagerVerificationRequestEvent)
+    }
+
+}
diff --git a/idle-domain/src/main/kotlin/com/swm/idle/domain/applys/event/ApplyEvent.kt b/idle-domain/src/main/kotlin/com/swm/idle/domain/applys/event/ApplyEvent.kt
@@ -1,7 +1,7 @@
 package com.swm.idle.domain.applys.event
 
+import com.swm.idle.domain.notification.event.NotificationInfo
 import com.swm.idle.domain.notification.jpa.DeviceToken
-import com.swm.idle.domain.notification.jpa.NotificationInfo
 import java.util.*
 
 data class ApplyEvent(

diff --git a/idle-domain/src/main/kotlin/com/swm/idle/domain/notification/enums/NotificationType.kt b/idle-domain/src/main/kotlin/com/swm/idle/domain/notification/enums/NotificationType.kt
@@ -2,4 +2,5 @@ package com.swm.idle.domain.notification.enums
 
 enum class NotificationType {
     APPLICANT,
+    CENTER_AUTHENTICATION,
 }
diff --git a/...main/notification/jpa/NotificationInfo.kt → ...in/notification/event/NotificationInfo.kt b/...main/notification/jpa/NotificationInfo.kt → ...in/notification/event/NotificationInfo.kt
@@ -1,4 +1,4 @@
-package com.swm.idle.domain.notification.jpa
+package com.swm.idle.domain.notification.event
 
 import com.swm.idle.domain.notification.enums.NotificationType
 import java.util.*

diff --git a/idle-domain/src/main/kotlin/com/swm/idle/domain/user/center/entity/jpa/CenterManager.kt b/idle-domain/src/main/kotlin/com/swm/idle/domain/user/center/entity/jpa/CenterManager.kt
@@ -48,4 +48,16 @@ class CenterManager(
         return status == CenterManagerAccountStatus.NEW
     }
 
+    fun isPending(): Boolean {
+        return status == CenterManagerAccountStatus.PENDING
+    }
+
+    fun updateStatusToApproved() {
+        this.status = CenterManagerAccountStatus.APPROVED
+    }
+
+    fun updateStatusToRejected() {
+        this.status = CenterManagerAccountStatus.REJECTED
+    }
+
 }
diff --git a/...omain/src/main/kotlin/com/swm/idle/domain/user/center/enums/CenterManagerAccountStatus.kt b/...omain/src/main/kotlin/com/swm/idle/domain/user/center/enums/CenterManagerAccountStatus.kt
@@ -4,4 +4,5 @@ enum class CenterManagerAccountStatus {
     NEW,
     PENDING,
     APPROVED,
+    REJECTED,
 }
diff --git a/.../center/event/CenterManagerVerifyEvent.kt → .../CenterManagerVerificationRequestEvent.kt b/.../center/event/CenterManagerVerifyEvent.kt → .../CenterManagerVerificationRequestEvent.kt
@@ -2,16 +2,16 @@ package com.swm.idle.domain.user.center.event
 
 import com.swm.idle.domain.user.center.entity.jpa.CenterManager
 
-data class CenterManagerVerifyEvent(
+data class CenterManagerVerificationRequestEvent(
     val centerManager: CenterManager,
 ) {
 
     companion object {
 
-        fun CenterManager.createVerifyEvent(): CenterManagerVerifyEvent {
+        fun CenterManager.createVerifyEvent(): CenterManagerVerificationRequestEvent {
             require(isNew()) { "인증 요청이 가능한 상태가 아닙니다." }
 
-            return CenterManagerVerifyEvent(this)
+            return CenterManagerVerificationRequestEvent(this)
         }
 
     }

diff --git a/...er/listener/CenterManagerEventListener.kt → ...anagerVerificationRequestEventListener.kt b/...er/listener/CenterManagerEventListener.kt → ...anagerVerificationRequestEventListener.kt
@@ -1,18 +1,18 @@
 package com.swm.idle.infrastructure.client.discord.user.center.listener
 
-import com.swm.idle.domain.user.center.event.CenterManagerVerifyEvent
+import com.swm.idle.domain.user.center.event.CenterManagerVerificationRequestEvent
 import com.swm.idle.infrastructure.client.discord.user.center.service.CenterManagerVerifyEventService
 import org.springframework.context.event.EventListener
 import org.springframework.stereotype.Component
 
 @Component
-class CenterManagerEventListener(
+class CenterManagerVerificationRequestEventListener(
     private val centerManagerVerifyEventService: CenterManagerVerifyEventService,
 ) {
 
     @EventListener
-    fun handleCenterManagerVerifyEvent(centerManagerVerifyEvent: CenterManagerVerifyEvent) {
-        centerManagerVerifyEventService.sendVerifyMessage(centerManagerVerifyEvent)
+    fun handleCenterManagerVerifyEvent(centerManagerVerificationRequestEvent: CenterManagerVerificationRequestEvent) {
+        centerManagerVerifyEventService.sendVerifyMessage(centerManagerVerificationRequestEvent)
     }
 
 }
diff --git a/...idle/infrastructure/client/discord/user/center/service/CenterManagerVerifyEventService.kt b/...idle/infrastructure/client/discord/user/center/service/CenterManagerVerifyEventService.kt
@@ -1,6 +1,6 @@
 package com.swm.idle.infrastructure.client.discord.user.center.service
 
-import com.swm.idle.domain.user.center.event.CenterManagerVerifyEvent
+import com.swm.idle.domain.user.center.event.CenterManagerVerificationRequestEvent
 import com.swm.idle.infrastructure.client.discord.common.event.EventType
 import com.swm.idle.infrastructure.client.discord.common.properties.DiscordClientProperties
 import com.swm.idle.infrastructure.client.discord.common.utils.DiscordMessageClient
@@ -17,13 +17,15 @@ class CenterManagerVerifyEventService(
 
     private val logger = KotlinLogging.logger { }
 
-    fun sendVerifyMessage(centerManagerVerifyEvent: CenterManagerVerifyEvent) {
+    fun sendVerifyMessage(centerManagerVerificationRequestEvent: CenterManagerVerificationRequestEvent) {
 
         if (this.discordClientProperties.events.getValue(EventType.CENTER_MANAGER_VERIFICATION).active) {
             val discordUri =
                 URI(this.discordClientProperties.events.getValue(EventType.CENTER_MANAGER_VERIFICATION).url)
             val message =
-                "[🌟새로운 센터 관리자 ${centerManagerVerifyEvent.centerManager.name} 님이 관리자 인증 요청을 보냈어요! 빠르게 확인해주세요 :)"
+                "[🌟새로운 센터 관리자 ${centerManagerVerificationRequestEvent.centerManager.name} 님이 관리자 인증 요청을 보냈어요! 빠르게 확인해주세요 :) \n" +
+                        "사업자 등록번호 [${centerManagerVerificationRequestEvent.centerManager.centerBusinessRegistrationNumber}]\n " +
+                        "연락처는 [${centerManagerVerificationRequestEvent.centerManager.phoneNumber} 이에요."
 
             runCatching {
                 discordMessageClient.send(