add :: userNotFoundException

MEOGO-DSM · Oct 8, 2024 · c342b3c · c342b3c
1 parent 04ad08f
commit c342b3c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main/kotlin/org/meogo/domain/review/service/QueryAllBySchoolIdService.kt b/src/main/kotlin/org/meogo/domain/review/service/QueryAllBySchoolIdService.kt
@@ -3,6 +3,7 @@ package org.meogo.domain.review.service
 import org.meogo.domain.review.domain.ReviewRepository
 import org.meogo.domain.review.presentation.dto.response.ReviewListResponse
 import org.meogo.domain.review.presentation.dto.response.ReviewResponse
+import org.meogo.domain.user.exception.UserNotFoundException
 import org.meogo.domain.user.facade.UserFacade
 import org.meogo.global.s3.FileUtil
 import org.meogo.global.s3.Path
@@ -23,7 +24,7 @@ class QueryAllBySchoolIdService(
         return ReviewListResponse(
             count = reviews.size,
             reviews = reviews.map { review ->
-                val user = userFacade.getUserById(review.userId)
+                val user = userFacade.getUserById(review.userId) ?: throw UserNotFoundException
                 val profile = fileUtil.generateObjectUrl(user.profile, Path.USER)
                 val image = review.picture?.split(",")?.map { pic ->
                     fileUtil.generateObjectUrl(pic.trim(), Path.REVIEW)

diff --git a/src/main/kotlin/org/meogo/domain/user/facade/UserFacade.kt b/src/main/kotlin/org/meogo/domain/user/facade/UserFacade.kt
@@ -16,9 +16,9 @@ class UserFacade(
         return accountId?.let { getUserByAccountId(it) }
     }
 
-    fun getUserByAccountId(accountId: String): User =
+    fun getUserByAccountId(accountId: String): User? =
         userRepository.findByAccountId(accountId)
 
-    fun getUserById(id: UUID): User =
+    fun getUserById(id: UUID): User? =
         userRepository.findById(id)
 }
diff --git a/src/main/kotlin/org/meogo/global/auth/AuthDetailsService.kt b/src/main/kotlin/org/meogo/global/auth/AuthDetailsService.kt
@@ -1,5 +1,6 @@
 package org.meogo.global.auth
 
+import org.meogo.domain.user.exception.UserNotFoundException
 import org.meogo.domain.user.facade.UserFacade
 import org.springframework.security.core.userdetails.UserDetails
 import org.springframework.security.core.userdetails.UserDetailsService
@@ -10,7 +11,7 @@ class AuthDetailsService(
     private val userFacade: UserFacade
 ) : UserDetailsService {
     override fun loadUserByUsername(username: String): UserDetails {
-        val user = userFacade.getUserByAccountId(username)
+        val user = userFacade.getUserByAccountId(username) ?: throw UserNotFoundException
         return AuthDetails(user.accountId, user.role)
     }
 }