v0.1.9

char-yb · web-flow · commit 59ba6dfb1bb3 · 2025-09-30T17:52:08.000+09:00
v0.1.9
diff --git a/sseudam-clients/notification/src/main/kotlin/com/sseudam/client/discord/DiscordClientSender.kt b/sseudam-clients/notification/src/main/kotlin/com/sseudam/client/discord/DiscordClientSender.kt
@@ -1,6 +1,10 @@
 package com.sseudam.client.discord
 
+import com.sseudam.common.GeoJson
 import com.sseudam.notification.discord.DiscordClient
+import com.sseudam.report.ReportType
+import com.sseudam.report.SpotReport
+import com.sseudam.suggestion.SpotSuggestion
 import com.sseudam.user.UserProfile
 import org.springframework.core.env.Environment
 import org.springframework.retry.annotation.Backoff
@@ -14,20 +18,27 @@ class DiscordClientSender(
     private val discordWebhookClient: DiscordWebhookClient,
     private val discordWebhookProperties: DiscordWebhookProperties,
 ) : DiscordClient {
+    companion object {
+        const val ADMIN_URL = "https://sseudam-admin.vercel.app"
+    }
+
+    private val environmentName: String
+        get() {
+            val env = environment.getProperty("spring.profiles.active")
+            return when (env) {
+                "prod" -> "운영"
+                "staging" -> "스테이징"
+                "dev" -> "개발"
+                else -> "그 외 환경"
+            }
+        }
+
     @Retryable(
         maxAttempts = 3,
         backoff = Backoff(delay = 1000, multiplier = 2.0),
         retryFor = [Exception::class],
     )
     override fun sendCreateUserMessage(userProfile: UserProfile) {
-        val environment = environment.getProperty("spring.profiles.active")
-        val environmentName =
-            when (environment) {
-                "prod" -> "운영"
-                "staging" -> "스테이징"
-                "dev" -> "개발"
-                else -> "그 외 환경"
-            }
         val content =
             """
             ## 🎉 쓰담 새 회원 가입 알림 ($environmentName)
@@ -40,4 +51,83 @@ class DiscordClientSender(
         val message = DiscordMessagePayload(content)
         discordWebhookClient.sendMessage(URI.create(discordWebhookProperties.userChannel), message)
     }
+
+    @Retryable(
+        maxAttempts = 3,
+        backoff = Backoff(delay = 1000, multiplier = 2.0),
+        retryFor = [Exception::class],
+    )
+    override fun sendReportMessage(report: SpotReport.Info) {
+        val reportMessageByType = "**신고 내용:** ${
+            when (report.reportType) {
+                ReportType.POINT -> {
+                    when (val point = report.point) {
+                        is GeoJson.Point -> {
+                            val coords = point.coordinates
+                            if (coords.size >= 2) {
+                                "${coords[0]}, ${coords[1]} (경도, 위도)"
+                            } else {
+                                "좌표 정보 없음"
+                            }
+                        }
+                        else -> "좌표 정보 없음"
+                    }
+                }
+                ReportType.NAME -> report.spotName
+                ReportType.KIND -> report.trashType.displayName
+                ReportType.PHOTO -> report.imageUrl
+            }
+        }로 수정 요청"
+        val content =
+            """
+            ## 🚨 신고 접수 알림 ($environmentName)
+
+            **신고 ID:** ${report.id}
+            **신고 유형:** ${report.reportType.displayName} (${report.reportType.name})
+            $reportMessageByType
+            **신고자 ID:** ${report.userId}
+            **신고 일시:** ${report.createdAt.toLocalDate()} ${report.createdAt.toLocalTime()}
+
+            확인하러 가기 -> $ADMIN_URL/reports/trash-cans
+            """.trimIndent()
+
+        val message = DiscordMessagePayload(content)
+        discordWebhookClient.sendMessage(URI.create(discordWebhookProperties.reportChannel), message)
+    }
+
+    @Retryable(
+        maxAttempts = 3,
+        backoff = Backoff(delay = 1000, multiplier = 2.0),
+        retryFor = [Exception::class],
+    )
+    override fun sendSuggestionMessage(suggestion: SpotSuggestion.Info) {
+        val pointCoordinate =
+            when (val point = suggestion.point) {
+                is GeoJson.Point -> point.coordinates
+                else -> emptyList()
+            }
+        val coordinateText =
+            if (pointCoordinate.size >= 2) {
+                "${pointCoordinate[0]}, ${pointCoordinate[1]} (경도, 위도)"
+            } else {
+                "좌표 정보 없음"
+            }
+        val content =
+            """
+            ## 💡 제보 접수 알림 ($environmentName)
+            **제보 ID:** ${suggestion.id}
+            **제보된 주소:** ${suggestion.address.site}
+            **제보된 장소 이름:** ${suggestion.spotName}
+            **제보된 장소 좌표:** $coordinateText
+            **제보된 쓰레기통 타입:** ${suggestion.trashType.displayName}
+            **제보자 ID:** ${suggestion.userId}
+            **제보 일시:** ${suggestion.createdAt.toLocalDate()} ${suggestion.createdAt.toLocalTime()}
+            확인하러 가기 -> $ADMIN_URL/suggestions/trash-cans
+            """.trimIndent()
+        val message = DiscordMessagePayload(content)
+        discordWebhookClient.sendMessage(
+            URI.create(discordWebhookProperties.suggestionChannel),
+            message,
+        )
+    }
 }
diff --git a/sseudam-core/core-api/src/test/kotlin/com/sseudam/domain/trashspot/TrashSpotFacadeTest.kt b/sseudam-core/core-api/src/test/kotlin/com/sseudam/domain/trashspot/TrashSpotFacadeTest.kt
@@ -6,6 +6,7 @@ import com.sseudam.common.GeoJson
 import com.sseudam.fixture.trashspot.TrashSpotFixture
 import com.sseudam.suggestion.SpotSuggestion
 import com.sseudam.suggestion.SuggestionService
+import com.sseudam.suggestion.SuggestionStatus
 import com.sseudam.trashspot.TrashSpotFacade
 import com.sseudam.trashspot.TrashSpotLocation
 import com.sseudam.trashspot.TrashSpotService
@@ -56,6 +57,7 @@ class TrashSpotFacadeTest :
                         address = spot.address,
                         trashType = spot.trashType,
                         imageUrl = "",
+                        status = SuggestionStatus.WAITING,
                         createdAt = LocalDateTime.now(),
                     )
                 val userProfile = UserProfile(id = 123L, key = "k", email = "e@example.com", name = "u", nickname = "nick", createdAt = LocalDateTime.now())
diff --git a/sseudam-core/core-domain/src/main/kotlin/com/sseudam/notification/discord/DiscordClient.kt b/sseudam-core/core-domain/src/main/kotlin/com/sseudam/notification/discord/DiscordClient.kt
@@ -1,7 +1,13 @@
 package com.sseudam.notification.discord
 
+import com.sseudam.report.SpotReport
+import com.sseudam.suggestion.SpotSuggestion
 import com.sseudam.user.UserProfile
 
 interface DiscordClient {
     fun sendCreateUserMessage(userProfile: UserProfile)
+
+    fun sendReportMessage(report: SpotReport.Info)
+
+    fun sendSuggestionMessage(suggestion: SpotSuggestion.Info)
 }
diff --git a/sseudam-core/core-domain/src/main/kotlin/com/sseudam/report/ReportFacade.kt b/sseudam-core/core-domain/src/main/kotlin/com/sseudam/report/ReportFacade.kt
@@ -2,6 +2,7 @@ package com.sseudam.report
 
 import com.sseudam.common.ImageS3Caller
 import com.sseudam.common.S3ImageUrl
+import com.sseudam.notification.discord.DiscordClient
 import com.sseudam.pet.PetPointAction
 import com.sseudam.pet.event.PetEventPublisher
 import com.sseudam.support.Cache
@@ -15,6 +16,7 @@ class ReportFacade(
     private val reportService: ReportService,
     private val trashSpotService: TrashSpotService,
     private val trashSpotImageService: TrashSpotImageService,
+    private val discordClient: DiscordClient,
     private val imageS3Caller: ImageS3Caller,
     private val petEventPublisher: PetEventPublisher,
     private val txAdvice: TxAdvice,
@@ -58,6 +60,7 @@ class ReportFacade(
                 reportService.appendReport(imageUrl, create).apply {
                     Cache.delete("user:${create.userId}:histories")
                 }
+            discordClient.sendReportMessage(spotReport)
             petEventPublisher.publish(create.userId, PetPointAction.REPORT)
 
             return@write spotReport to presignedUrl
diff --git a/sseudam-core/core-domain/src/main/kotlin/com/sseudam/suggestion/SpotSuggestion.kt b/sseudam-core/core-domain/src/main/kotlin/com/sseudam/suggestion/SpotSuggestion.kt
@@ -52,7 +52,7 @@ class SpotSuggestion {
         val address: Address,
         val trashType: TrashType,
         val imageUrl: String,
-        val status: SuggestionStatus = SuggestionStatus.WAITING,
+        val status: SuggestionStatus,
         val createdAt: LocalDateTime,
     )
 
diff --git a/sseudam-core/core-domain/src/main/kotlin/com/sseudam/suggestion/SuggestionFacade.kt b/sseudam-core/core-domain/src/main/kotlin/com/sseudam/suggestion/SuggestionFacade.kt
@@ -1,6 +1,7 @@
 package com.sseudam.suggestion
 
 import com.sseudam.common.S3ImageUrl
+import com.sseudam.notification.discord.DiscordClient
 import com.sseudam.support.Cache
 import com.sseudam.trashspot.TrashSpotService
 import org.springframework.stereotype.Service
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Service
 class SuggestionFacade(
     private val suggestionService: SuggestionService,
     private val trashSpotService: TrashSpotService,
+    private val discordClient: DiscordClient,
 ) {
     fun validateSpotSuggestion(name: String): Boolean {
         suggestionService.validateSpotSuggestionName(name)
@@ -24,6 +26,7 @@ class SuggestionFacade(
                 .apply {
                     Cache.delete("user:${create.userId}:histories")
                 }
+        discordClient.sendSuggestionMessage(suggestionInfo)
         return suggestionInfo to s3ImageUrl
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class SpotSuggestion {`
`52`	`52`	`val address: Address,`
`53`	`53`	`val trashType: TrashType,`
`54`	`54`	`val imageUrl: String,`
`55`		`- val status: SuggestionStatus = SuggestionStatus.WAITING,`
	`55`	`+ val status: SuggestionStatus,`
`56`	`56`	`val createdAt: LocalDateTime,`
`57`	`57`	`)`
`58`	`58`