v1.0.2

v1.0.2

Author: char-yb

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ arrow_fx = "1.2.1"
 jwt = "0.12.6"
 bouncycastle = "1.70"
 # Spring
-spring_boot = "3.4.5"
+spring_boot = "3.4.11"
 spring_dependency_management = "1.1.7"
 spring_cloud_dependencies = "2024.0.0"
 jakartaAnnotation = "3.0.0"

sseudam-admin/src/main/kotlin/com/sseudam/admin/application/AdminFacade.kt

@@ -1,5 +1,7 @@
 package com.sseudam.admin.application
 
+import com.sseudam.admin.application.report.AdminSpotReportDetail
+import com.sseudam.admin.application.suggestion.AdminSpotSuggestionDetail
 import com.sseudam.admin.domain.AdminToken
 import com.sseudam.admin.domain.AdminUserProfile
 import com.sseudam.auth.AuthenticationService
@@ -10,6 +12,7 @@ import com.sseudam.notification.command.FirebaseCloudMessageCommand
 import com.sseudam.notification.fcm.FcmSender
 import com.sseudam.report.ReportFacade
 import com.sseudam.report.ReportService
+import com.sseudam.report.ReportStatus
 import com.sseudam.report.ReportType
 import com.sseudam.report.SpotReport
 import com.sseudam.report.command.UpdateReportCommand
@@ -82,16 +85,53 @@ class AdminFacade(
     fun findSuggestions(
         offsetPageRequest: OffsetPageRequest,
         searchStatus: SuggestionStatus?,
-    ): Page<SpotSuggestion.Detail> = suggestionService.findSuggestionsBy(offsetPageRequest, searchStatus)
+    ): Page<AdminSpotSuggestionDetail> {
+        val pages = suggestionService.findSuggestionsBy(offsetPageRequest, searchStatus)
+        val users = userService.findAllBy(pages.content.map { it.userId }).associateBy { it.id }
+        val contents =
+            pages.content.map { suggestion ->
+                AdminSpotSuggestionDetail.of(
+                    suggestion,
+                    users[suggestion.userId],
+                )
+            }
+        return Page.of(
+            content = contents,
+            totalCount = pages.totalCount,
+        )
+    }
 
-    fun findSuggestionDetails(suggestionId: Long): SpotSuggestion.Detail = suggestionService.findSpotSuggestionById(suggestionId)
+    fun findSuggestionDetails(suggestionId: Long): AdminSpotSuggestionDetail {
+        val detail = suggestionService.findSpotSuggestionById(suggestionId)
+        val user = userService.getProfile(detail.userId)
+        return AdminSpotSuggestionDetail.of(detail, user)
+    }
 
     fun findReports(
         offsetPageRequest: OffsetPageRequest,
         searchType: ReportType?,
-    ): Page<SpotReport.Detail> = reportService.findReportsBy(offsetPageRequest, searchType)
+        status: ReportStatus?,
+    ): Page<AdminSpotReportDetail> {
+        val pages = reportService.findReportsBy(offsetPageRequest, searchType, status)
+        val users = userService.findAllBy(pages.content.map { it.userId }).associateBy { it.id }
+        val contents =
+            pages.content.map { report ->
+                AdminSpotReportDetail.of(
+                    report,
+                    users[report.userId],
+                )
+            }
+        return Page.of(
+            content = contents,
+            totalCount = pages.totalCount,
+        )
+    }
 
-    fun findReportDetails(reportId: Long): SpotReport.Detail = reportFacade.findReportDetails(reportId)
+    fun findReportDetails(reportId: Long): AdminSpotReportDetail {
+        val detail = reportFacade.findReportDetails(reportId)
+        val user = userService.getProfile(detail.userId)
+        return AdminSpotReportDetail.of(detail, user)
+    }
 
     fun updateSpotSuggestionStatus(command: UpdateSuggestionCommand) =
         SpotSuggestion.UpdateResult.of(

sseudam-admin/src/main/kotlin/com/sseudam/admin/application/report/AdminSpotReportDetail.kt

@@ -0,0 +1,55 @@
+package com.sseudam.admin.application.report
+
+import com.sseudam.common.Address
+import com.sseudam.common.GeoJson
+import com.sseudam.common.Region
+import com.sseudam.report.ReportStatus
+import com.sseudam.report.ReportType
+import com.sseudam.report.SpotReport
+import com.sseudam.trashspot.TrashType
+import com.sseudam.user.UserProfile
+import java.time.LocalDateTime
+
+data class AdminSpotReportDetail(
+    val id: Long,
+    val spotId: Long,
+    val userId: Long,
+    val userName: String?,
+    val reportType: ReportType,
+    val point: GeoJson,
+    val spotName: String,
+    val region: Region = Region.UNKNOWN,
+    val address: Address,
+    val trashType: TrashType,
+    val imageUrl: String,
+    val status: ReportStatus = ReportStatus.WAITING,
+    val rejectReason: String?,
+    val reason: String?,
+    val createdAt: LocalDateTime,
+) {
+    companion object {
+        fun of(
+            detail: SpotReport.Detail,
+            user: UserProfile?,
+        ): AdminSpotReportDetail =
+            with(detail) {
+                AdminSpotReportDetail(
+                    id = id,
+                    spotId = spotId,
+                    userId = userId,
+                    userName = user?.name,
+                    reportType = reportType,
+                    point = point,
+                    spotName = spotName,
+                    region = region,
+                    address = address,
+                    trashType = trashType,
+                    imageUrl = imageUrl,
+                    status = status,
+                    rejectReason = rejectReason,
+                    reason = reason,
+                    createdAt = createdAt,
+                )
+            }
+    }
+}

sseudam-admin/src/main/kotlin/com/sseudam/admin/application/suggestion/AdminSpotSuggestionDetail.kt

@@ -0,0 +1,45 @@
+package com.sseudam.admin.application.suggestion
+
+import com.sseudam.common.Address
+import com.sseudam.common.GeoJson
+import com.sseudam.common.Region
+import com.sseudam.suggestion.SpotSuggestion
+import com.sseudam.suggestion.SuggestionStatus
+import com.sseudam.trashspot.TrashType
+import com.sseudam.user.UserProfile
+import java.time.LocalDateTime
+
+data class AdminSpotSuggestionDetail(
+    val id: Long,
+    val userId: Long,
+    val userName: String?,
+    val spotName: String,
+    val point: GeoJson,
+    val region: Region,
+    val address: Address,
+    val trashType: TrashType,
+    val imageUrl: String,
+    val status: SuggestionStatus = SuggestionStatus.WAITING,
+    val rejectReason: String?,
+    val createdAt: LocalDateTime,
+) {
+    companion object {
+        fun of(
+            detail: SpotSuggestion.Detail,
+            user: UserProfile?,
+        ) = AdminSpotSuggestionDetail(
+            id = detail.id,
+            userId = detail.userId,
+            userName = user?.name,
+            spotName = detail.spotName,
+            point = detail.point,
+            region = detail.region,
+            address = detail.address,
+            trashType = detail.trashType,
+            imageUrl = detail.imageUrl,
+            status = detail.status,
+            rejectReason = detail.rejectReason,
+            createdAt = detail.createdAt,
+        )
+    }
+}

sseudam-admin/src/main/kotlin/com/sseudam/admin/presentation/response/report/SpotReportAdminResponse.kt

@@ -1,10 +1,10 @@
 package com.sseudam.admin.presentation.response.report
 
+import com.sseudam.admin.application.report.AdminSpotReportDetail
 import com.sseudam.common.Address
 import com.sseudam.common.GeoJson
 import com.sseudam.report.ReportStatus
 import com.sseudam.report.ReportType
-import com.sseudam.report.SpotReport
 import com.sseudam.trashspot.TrashType
 import io.swagger.v3.oas.annotations.media.Schema
 import java.time.LocalDateTime
@@ -17,6 +17,8 @@ data class SpotReportAdminResponse(
     val spotId: Long,
     @Schema(description = "신고자 ID")
     val userId: Long,
+    @Schema(description = "신고자 이름")
+    val userName: String?,
     @Schema(description = "신고 타입")
     val reportType: ReportType,
     @Schema(description = "신고 위치")
@@ -37,11 +39,12 @@ data class SpotReportAdminResponse(
     val createdAt: LocalDateTime,
 ) {
     companion object {
-        fun of(detail: SpotReport.Detail) =
+        fun of(detail: AdminSpotReportDetail) =
             SpotReportAdminResponse(
                 id = detail.id,
                 spotId = detail.spotId,
                 userId = detail.userId,
+                userName = detail.userName,
                 reportType = detail.reportType,
                 point = detail.point,
                 address = detail.address,

sseudam-admin/src/main/kotlin/com/sseudam/admin/presentation/response/report/SpotReportAllAdminResponse.kt

@@ -1,6 +1,6 @@
 package com.sseudam.admin.presentation.response.report
 
-import com.sseudam.report.SpotReport
+import com.sseudam.admin.application.report.AdminSpotReportDetail
 import com.sseudam.support.page.Page
 import io.swagger.v3.oas.annotations.media.Schema
 
@@ -10,7 +10,7 @@ data class SpotReportAllAdminResponse(
     val totalCount: Long,
 ) {
     companion object {
-        fun of(page: Page<SpotReport.Detail>): SpotReportAllAdminResponse =
+        fun of(page: Page<AdminSpotReportDetail>): SpotReportAllAdminResponse =
             SpotReportAllAdminResponse(
                 list = page.content.map { SpotReportAdminResponse.of(it) },
                 totalCount = page.totalCount,

sseudam-admin/src/main/kotlin/com/sseudam/admin/presentation/response/suggestion/SpotSuggestionAdminResponse.kt

@@ -1,9 +1,9 @@
 package com.sseudam.admin.presentation.response.suggestion
 
+import com.sseudam.admin.application.suggestion.AdminSpotSuggestionDetail
 import com.sseudam.common.Address
 import com.sseudam.common.GeoJson
 import com.sseudam.common.Region
-import com.sseudam.suggestion.SpotSuggestion
 import com.sseudam.suggestion.SuggestionStatus
 import com.sseudam.trashspot.TrashType
 import io.swagger.v3.oas.annotations.media.Schema
@@ -13,6 +13,10 @@ import java.time.LocalDateTime
 data class SpotSuggestionAdminResponse(
     @Schema(description = "제보 ID")
     val id: Long,
+    @Schema(description = "제보자 ID")
+    val userId: Long,
+    @Schema(description = "제보자 이름")
+    val userName: String?,
     @Schema(description = "제보 위치")
     val point: GeoJson,
     @Schema(description = "제보 장소 이름")
@@ -33,9 +37,11 @@ data class SpotSuggestionAdminResponse(
     val createdAt: LocalDateTime,
 ) {
     companion object {
-        fun of(suggestion: SpotSuggestion.Detail) =
+        fun of(suggestion: AdminSpotSuggestionDetail) =
             SpotSuggestionAdminResponse(
                 id = suggestion.id,
+                userId = suggestion.userId,
+                userName = suggestion.userName,
                 point = suggestion.point,
                 spotName = suggestion.spotName,
                 region = suggestion.region,

sseudam-admin/src/main/kotlin/com/sseudam/admin/presentation/response/suggestion/SpotSuggestionAllAdminResponse.kt

@@ -1,14 +1,14 @@
 package com.sseudam.admin.presentation.response.suggestion
 
-import com.sseudam.suggestion.SpotSuggestion
+import com.sseudam.admin.application.suggestion.AdminSpotSuggestionDetail
 import com.sseudam.support.page.Page
 
 data class SpotSuggestionAllAdminResponse(
     val list: List<SpotSuggestionAdminResponse>,
     val totalCount: Long,
 ) {
     companion object {
-        fun of(page: Page<SpotSuggestion.Detail>) =
+        fun of(page: Page<AdminSpotSuggestionDetail>) =
             SpotSuggestionAllAdminResponse(
                 list = page.content.map { SpotSuggestionAdminResponse.of(it) },
                 totalCount = page.totalCount,

sseudam-admin/src/main/kotlin/com/sseudam/admin/presentation/v1/report/AdminReportController.kt

@@ -6,6 +6,7 @@ import com.sseudam.admin.presentation.response.report.SpotReportAdminResponse
 import com.sseudam.admin.presentation.response.report.SpotReportAllAdminResponse
 import com.sseudam.admin.presentation.v1.annotation.AdminTagDocs
 import com.sseudam.admin.presentation.v1.annotation.ApiAdminV1Controller
+import com.sseudam.report.ReportStatus
 import com.sseudam.report.ReportType
 import com.sseudam.support.page.OffsetPageRequest
 import io.swagger.v3.oas.annotations.Operation
@@ -27,9 +28,10 @@ class AdminReportController(
         @RequestParam(defaultValue = "0") page: Int,
         @RequestParam(defaultValue = "20") size: Int,
         @RequestParam(required = false) searchType: ReportType?,
+        @RequestParam(required = false) status: ReportStatus?,
     ): SpotReportAllAdminResponse =
         SpotReportAllAdminResponse.of(
-            adminFacade.findReports(OffsetPageRequest(page, size), searchType),
+            adminFacade.findReports(OffsetPageRequest(page, size), searchType, status),
         )
 
     @Operation(summary = "신고 내역 상세 조회", description = "신고 내역을 상세 조회합니다.")

sseudam-clients/aws/src/main/kotlin/com/sseudam/image/ImageS3Processor.kt

@@ -29,7 +29,7 @@ class ImageS3Processor(
                 awsProperties.s3.bucket,
                 imageFilePath,
                 imageFileName,
-                Duration.ofSeconds(30),
+                Duration.ofMinutes(10),
             )
         return S3ImageUrl(
             presignedUrl,