merge: (#90) Redis Repository 문제 해결

Team-ComIT · Oct 14, 2022 · 337be12 · 337be12
2 parents eb989d1 + 3d5a2e3
commit 337be12
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 30 deletions.
diff --git a/...ucture/src/main/kotlin/team/comit/simtong/global/security/principle/AuthDetailsService.kt b/...ucture/src/main/kotlin/team/comit/simtong/global/security/principle/AuthDetailsService.kt
@@ -1,5 +1,6 @@
 package team.comit.simtong.global.security.principle
 
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.security.core.userdetails.UserDetails
 import org.springframework.security.core.userdetails.UserDetailsService
 import org.springframework.stereotype.Component
@@ -22,7 +23,7 @@ class AuthDetailsService(
 
     override fun loadUserByUsername(userId: String): UserDetails {
         val id = UUID.fromString(userId)
-        val user = userRepository.queryUserJpaEntityById(id) ?: throw InvalidTokenException.EXCEPTION
+        val user = userRepository.findByIdOrNull(id) ?: throw InvalidTokenException.EXCEPTION
 
         return AuthDetails(id, user.authority)
     }

diff --git a/...re/src/main/kotlin/team/comit/simtong/persistence/auth/AuthCodeLimitPersistenceAdapter.kt b/...re/src/main/kotlin/team/comit/simtong/persistence/auth/AuthCodeLimitPersistenceAdapter.kt
@@ -1,5 +1,6 @@
 package team.comit.simtong.persistence.auth
 
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Component
 import team.comit.simtong.domain.auth.model.AuthCodeLimit
 import team.comit.simtong.domain.auth.spi.AuthCodeLimitPort
@@ -22,7 +23,7 @@ class AuthCodeLimitPersistenceAdapter(
 ) : AuthCodeLimitPort {
 
     override fun queryAuthCodeLimitByEmail(email: String) = authCodeLimitMapper.toDomain(
-        authCodeLimitRepository.queryAuthCodeLimitEntityByKey(email)
+        authCodeLimitRepository.findByIdOrNull(email)
     )
 
     override fun save(authCodeLimit: AuthCodeLimit) = authCodeLimitMapper.toDomain(

diff --git a/...ructure/src/main/kotlin/team/comit/simtong/persistence/auth/AuthCodePersistenceAdapter.kt b/...ructure/src/main/kotlin/team/comit/simtong/persistence/auth/AuthCodePersistenceAdapter.kt
@@ -1,5 +1,6 @@
 package team.comit.simtong.persistence.auth
 
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Component
 import team.comit.simtong.domain.auth.model.AuthCode
 import team.comit.simtong.domain.auth.spi.AuthCodePort
@@ -21,7 +22,7 @@ class AuthCodePersistenceAdapter(
 ): AuthCodePort {
 
     override fun queryAuthCodeByEmail(email: String) = authCodeMapper.toDomain(
-        authCodeRepository.queryAuthCodeEntityByKey(email)
+        authCodeRepository.findByIdOrNull(email)
     )
 
     override fun save(authCode: AuthCode) = authCodeMapper.toDomain(

diff --git a/...ure/src/main/kotlin/team/comit/simtong/persistence/auth/RefreshTokenPersistenceAdapter.kt b/...ure/src/main/kotlin/team/comit/simtong/persistence/auth/RefreshTokenPersistenceAdapter.kt
@@ -1,5 +1,6 @@
 package team.comit.simtong.persistence.auth
 
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Component
 import team.comit.simtong.domain.auth.spi.RefreshTokenPort
 import team.comit.simtong.persistence.auth.mapper.RefreshTokenMapper
@@ -21,7 +22,7 @@ class RefreshTokenPersistenceAdapter(
 ) : RefreshTokenPort {
 
     override fun queryRefreshTokenByToken(token: String) = refreshTokenMapper.toDomain(
-        refreshTokenRepository.queryRefreshTokenEntityByToken(token)
+        refreshTokenRepository.findByIdOrNull(token)
     )
 
 }
diff --git a/...frastructure/src/main/kotlin/team/comit/simtong/persistence/auth/entity/AuthCodeEntity.kt b/...frastructure/src/main/kotlin/team/comit/simtong/persistence/auth/entity/AuthCodeEntity.kt
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull
  * @version 1.0.0
  **/
 @RedisHash("tbl_authcode")
-class AuthCodeEntity(
+data class AuthCodeEntity(
     @Id
     val key: String,
 

diff --git a/...ructure/src/main/kotlin/team/comit/simtong/persistence/auth/entity/AuthCodeLimitEntity.kt b/...ructure/src/main/kotlin/team/comit/simtong/persistence/auth/entity/AuthCodeLimitEntity.kt
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull
  * @version 1.0.0
  **/
 @RedisHash("tbl_authcode_limit")
-class AuthCodeLimitEntity(
+data class AuthCodeLimitEntity(
     @Id
     val key: String,
 

diff --git a/...tructure/src/main/kotlin/team/comit/simtong/persistence/auth/entity/RefreshTokenEntity.kt b/...tructure/src/main/kotlin/team/comit/simtong/persistence/auth/entity/RefreshTokenEntity.kt
@@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull
  * @version 1.0.0
  **/
 @RedisHash("tbl_refresh_token")
-class RefreshTokenEntity(
+data class RefreshTokenEntity(
     @Id
     val token: String,
 

diff --git a/...src/main/kotlin/team/comit/simtong/persistence/auth/repository/AuthCodeLimitRepository.kt b/...src/main/kotlin/team/comit/simtong/persistence/auth/repository/AuthCodeLimitRepository.kt
@@ -15,6 +15,4 @@ import team.comit.simtong.persistence.auth.entity.AuthCodeLimitEntity
  **/
 @Repository
 interface AuthCodeLimitRepository : CrudRepository<AuthCodeLimitEntity, String> {
-
-    fun queryAuthCodeLimitEntityByKey(email: String): AuthCodeLimitEntity?
 }
diff --git a/...ture/src/main/kotlin/team/comit/simtong/persistence/auth/repository/AuthCodeRepository.kt b/...ture/src/main/kotlin/team/comit/simtong/persistence/auth/repository/AuthCodeRepository.kt
@@ -14,7 +14,4 @@ import team.comit.simtong.persistence.auth.entity.AuthCodeEntity
  **/
 @Repository
 interface AuthCodeRepository : CrudRepository<AuthCodeEntity, String> {
-
-    fun queryAuthCodeEntityByKey(key: String): AuthCodeEntity?
-
 }
diff --git a/.../src/main/kotlin/team/comit/simtong/persistence/auth/repository/RefreshTokenRepository.kt b/.../src/main/kotlin/team/comit/simtong/persistence/auth/repository/RefreshTokenRepository.kt
@@ -14,6 +14,4 @@ import team.comit.simtong.persistence.auth.entity.RefreshTokenEntity
  **/
 @Repository
 interface RefreshTokenRepository : CrudRepository<RefreshTokenEntity, String> {
-
-    fun queryRefreshTokenEntityByToken(token: String): RefreshTokenEntity?
 }
diff --git a/...g-infrastructure/src/main/kotlin/team/comit/simtong/persistence/menu/mapper/MenuMapper.kt b/...g-infrastructure/src/main/kotlin/team/comit/simtong/persistence/menu/mapper/MenuMapper.kt
@@ -22,7 +22,7 @@ abstract class MenuMapper : GenericMapper<MenuJpaEntity, Menu> {
     @Autowired
     protected lateinit var spotJpaRepository: SpotJpaRepository
 
-    @Mapping(target = "spot", expression = "java(spotJpaRepository.querySpotJpaEntityById(model.getSpotId()))")
+    @Mapping(target = "spot", expression = "java(spotJpaRepository.findById(model.getSpotId()).orElse(null))")
     abstract override fun toEntity(model: Menu): MenuJpaEntity
 
     @Mapping(target = "spotId", expression = "java(entity.getSpot().getId())")

diff --git a/...g-infrastructure/src/main/kotlin/team/comit/simtong/persistence/spot/SpotJpaRepository.kt b/...g-infrastructure/src/main/kotlin/team/comit/simtong/persistence/spot/SpotJpaRepository.kt
@@ -17,8 +17,6 @@ import java.util.*
 @Repository
 interface SpotJpaRepository : CrudRepository<SpotJpaEntity, UUID> {
 
-    fun querySpotJpaEntityById(id: UUID): SpotJpaEntity?
-
     fun querySpotJpaEntityByName(name: String): SpotJpaEntity?
 
 }
diff --git a/...rastructure/src/main/kotlin/team/comit/simtong/persistence/spot/SpotPersistenceAdapter.kt b/...rastructure/src/main/kotlin/team/comit/simtong/persistence/spot/SpotPersistenceAdapter.kt
@@ -1,9 +1,10 @@
 package team.comit.simtong.persistence.spot
 
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Component
 import team.comit.simtong.domain.spot.spi.SpotPort
 import team.comit.simtong.persistence.spot.mapper.SpotMapper
-import java.util.UUID
+import java.util.*
 
 /**
  *
@@ -24,7 +25,7 @@ class SpotPersistenceAdapter(
     )
 
     override fun querySpotById(id: UUID) = spotMapper.toDomain(
-        spotJpaRepository.querySpotJpaEntityById(id)
+        spotJpaRepository.findByIdOrNull(id)
     )
 
 }
diff --git a/...g-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/TeamJpaRepository.kt b/...g-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/TeamJpaRepository.kt
@@ -17,8 +17,6 @@ import java.util.*
 @Repository
 interface TeamJpaRepository : CrudRepository<TeamJpaEntity, UUID> {
 
-    fun queryTeamJpaEntityById(id: UUID): TeamJpaEntity?
-
     fun queryTeamJpaEntityByName(name: String): TeamJpaEntity?
 
 }
diff --git a/...g-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/mapper/TeamMapper.kt b/...g-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/mapper/TeamMapper.kt
@@ -22,7 +22,7 @@ abstract class TeamMapper : GenericMapper<TeamJpaEntity, Team> {
     @Autowired
     protected lateinit var spotJpaRepository: SpotJpaRepository
 
-    @Mapping(target = "spot", expression = "java(spotJpaRepository.querySpotJpaEntityById(model.getSpotId()))")
+    @Mapping(target = "spot", expression = "java(spotJpaRepository.findById(model.getSpotId()).orElse(null))")
     abstract override fun toEntity(model: Team): TeamJpaEntity
 
     @Mapping(target = "spotId", expression = "java(entity.getSpot().getId())")

diff --git a/...rastructure/src/main/kotlin/team/comit/simtong/persistence/user/UserPersistenceAdapter.kt b/...rastructure/src/main/kotlin/team/comit/simtong/persistence/user/UserPersistenceAdapter.kt
@@ -1,11 +1,12 @@
 package team.comit.simtong.persistence.user
 
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Component
 import team.comit.simtong.domain.user.model.User
 import team.comit.simtong.domain.user.spi.UserPort
 import team.comit.simtong.persistence.user.mapper.UserMapper
 import team.comit.simtong.persistence.user.repository.UserJpaRepository
-import java.util.UUID
+import java.util.*
 
 /**
  *
@@ -23,7 +24,7 @@ class UserPersistenceAdapter(
 ) : UserPort {
 
     override fun queryUserById(id: UUID) = userMapper.toDomain(
-        userJpaRepository.queryUserJpaEntityById(id)
+        userJpaRepository.findByIdOrNull(id)
     )
 
     override fun queryUserByEmployeeNumber(employeeNumber: Int) = userMapper.toDomain(

diff --git a/...g-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/mapper/UserMapper.kt b/...g-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/mapper/UserMapper.kt
@@ -28,8 +28,8 @@ abstract class UserMapper : GenericMapper<UserJpaEntity, User> {
     protected lateinit var teamJpaRepository: TeamJpaRepository
 
     @Mappings(
-        Mapping(target = "spot", expression = "java(spotJpaRepository.querySpotJpaEntityById(model.getSpotId()))"),
-        Mapping(target = "team", expression = "java(teamJpaRepository.queryTeamJpaEntityById(model.getTeamId()))")
+        Mapping(target = "spot", expression = "java(spotJpaRepository.findById(model.getSpotId()).orElse(null))"),
+        Mapping(target = "team", expression = "java(teamJpaRepository.findById(model.getTeamId()).orElse(null))")
     )
     abstract override fun toEntity(model: User): UserJpaEntity
 

diff --git a/...cture/src/main/kotlin/team/comit/simtong/persistence/user/repository/UserJpaRepository.kt b/...cture/src/main/kotlin/team/comit/simtong/persistence/user/repository/UserJpaRepository.kt
@@ -3,7 +3,7 @@ package team.comit.simtong.persistence.user.repository
 import org.springframework.data.repository.CrudRepository
 import org.springframework.stereotype.Repository
 import team.comit.simtong.persistence.user.entity.UserJpaEntity
-import java.util.UUID
+import java.util.*
 
 /**
  *
@@ -17,8 +17,6 @@ import java.util.UUID
 @Repository
 interface UserJpaRepository : CrudRepository<UserJpaEntity, UUID> {
 
-    fun queryUserJpaEntityById(id: UUID): UserJpaEntity?
-
     fun queryUserJpaEntityByEmployeeNumber(employeeNumber: Int): UserJpaEntity?
 
     fun queryUserJpaEntityByEmail(email: String): UserJpaEntity?

diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/thirdparty/email/AwsSESAdapter.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/thirdparty/email/AwsSESAdapter.kt
@@ -10,7 +10,7 @@ import team.comit.simtong.thirdparty.email.template.MailTemplate
 
 /**
  *
- * AWS SES를 이용해 메일 전송을 처리하는 SesAdapter
+ * AWS SES를 이용해 메일 전송을 처리하는 AwsSESAdapter
  *
  * @author Chokyunghyeon
  * @date 2022/09/08