From 4a5801465505d9893d5b889596642d248e5f52e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=83=9C=EC=9A=A9?= Date: Tue, 17 Sep 2024 00:35:26 +0900 Subject: [PATCH] =?UTF-8?q?Refactor=20|=20CAKK-82=20|=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EA=B3=B5=EB=B0=B1=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B0=9C=ED=96=89=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../facade/cake/BusinessInformationReadFacade.kt | 2 ++ .../com/cakk/core/facade/cake/CakeReadFacade.kt | 2 ++ .../com/cakk/core/facade/cake/CakeShopReadFacade.kt | 2 ++ .../cakk/core/facade/cake/CakeShopUserReadFacade.kt | 2 ++ .../com/cakk/core/facade/tag/TagReadFacade.kt | 1 + .../com/cakk/core/facade/user/UserReadFacade.kt | 2 ++ .../cakk/domain/mysql/config/DataSourceConfig.kt | 1 + .../com/cakk/domain/mysql/config/JacksonConfig.kt | 1 + .../com/cakk/domain/mysql/config/P6spyConfig.kt | 1 + .../domain/mysql/config/P6spySqlFormatterConfig.kt | 4 +++- .../com/cakk/domain/mysql/config/QuerydslConfig.kt | 2 ++ .../domain/mysql/converter/DayOfWeekConverter.kt | 4 +++- .../domain/mysql/converter/LinkKindConverter.kt | 4 +++- .../mysql/converter/VerificationStatusConverter.kt | 4 +++- .../jpa/BusinessInformationJpaRepository.kt | 4 +++- .../repository/jpa/CakeCategoryJpaRepository.kt | 4 +++- .../mysql/repository/jpa/CakeHeartJpaRepository.kt | 4 +++- .../repository/jpa/CakeShopHeartJpaRepository.kt | 13 ------------- .../repository/jpa/CakeShopLikeJpaRepository.kt | 9 --------- .../repository/jpa/CakeShopLinkJpaRepository.kt | 4 +++- .../jpa/CakeShopOperationJpaRepository.kt | 4 +++- .../domain/mysql/repository/jpa/TagJpaRepository.kt | 4 +++- .../mysql/repository/jpa/UserJpaRepository.kt | 2 ++ .../test/java/com/cakk/domain/base/DomainTest.kt | 4 +++- .../test/java/com/cakk/domain/base/FacadeTest.kt | 1 + .../domain/entity/user/BusinessInformationTest.kt | 4 +++- .../domain/entity/user/VerificationPolicyTest.kt | 4 +++- 27 files changed, 58 insertions(+), 35 deletions(-) delete mode 100644 cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopHeartJpaRepository.kt delete mode 100644 cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopLikeJpaRepository.kt diff --git a/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/BusinessInformationReadFacade.kt b/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/BusinessInformationReadFacade.kt index 89172a28..86d3c061 100644 --- a/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/BusinessInformationReadFacade.kt +++ b/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/BusinessInformationReadFacade.kt @@ -12,6 +12,7 @@ import com.cakk.domain.mysql.repository.jpa.BusinessInformationJpaRepository class BusinessInformationReadFacade( private val businessInformationJpaRepository: BusinessInformationJpaRepository ) { + fun isExistBusinessInformation(owner: User, cakeShopId: Long): Boolean { return businessInformationJpaRepository.existsBusinessInformationByUserAndCakeShop_Id(owner, cakeShopId) } @@ -28,3 +29,4 @@ class BusinessInformationReadFacade( return businessInformationJpaRepository.findBusinessInformationByUserId(userId) ?: throw CakkException(ReturnCode.NOT_EXIST_CAKE_SHOP) } } + diff --git a/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeReadFacade.kt b/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeReadFacade.kt index 8906e461..2b2f8a09 100644 --- a/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeReadFacade.kt +++ b/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeReadFacade.kt @@ -21,6 +21,7 @@ class CakeReadFacade( private val cakeCategoryJpaRepository: CakeCategoryJpaRepository, private val cakeQueryRepository: CakeQueryRepository ) { + fun findById(cakeId: Long): Cake { return cakeJpaRepository.findById(cakeId).orElseThrow { CakkException(ReturnCode.NOT_EXIST_CAKE) } } @@ -79,3 +80,4 @@ class CakeReadFacade( return cakeCategoryJpaRepository.findByCakeId(cakeId) ?: throw CakkException(ReturnCode.NOT_EXIST_CAKE_CATEGORY) } } + diff --git a/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeShopReadFacade.kt b/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeShopReadFacade.kt index 042ec666..847588a8 100644 --- a/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeShopReadFacade.kt +++ b/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeShopReadFacade.kt @@ -28,6 +28,7 @@ class CakeShopReadFacade( private val cakeShopLinkJpaRepository: CakeShopLinkJpaRepository, private val businessInformationJpaRepository: BusinessInformationJpaRepository ) { + fun findById(cakeShopId: Long): CakeShop { return cakeShopJpaRepository.findById(cakeShopId).orElseThrow { CakkException(ReturnCode.NOT_EXIST_CAKE_SHOP) } } @@ -100,3 +101,4 @@ class CakeShopReadFacade( return cakeShopLinkJpaRepository.findAllByCakeShopId(cakeShopId) } } + diff --git a/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeShopUserReadFacade.kt b/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeShopUserReadFacade.kt index cf7aef76..634f03b7 100644 --- a/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeShopUserReadFacade.kt +++ b/cakk-core/src/main/kotlin/com/cakk/core/facade/cake/CakeShopUserReadFacade.kt @@ -12,6 +12,7 @@ class CakeShopUserReadFacade( private val cakeShopHeartQueryRepository: CakeShopHeartQueryRepository, private val cakeHeartQueryRepository: CakeHeartQueryRepository ) { + fun searchAllCakeShopsByCursorAndHeart( cakeShopHeartId: Long?, userId: Long?, @@ -29,3 +30,4 @@ class CakeShopUserReadFacade( return cakeHeartQueryRepository.searchCakeImagesByCursorAndHeart(cakeHeartId, userId, pageSize) } } + diff --git a/cakk-core/src/main/kotlin/com/cakk/core/facade/tag/TagReadFacade.kt b/cakk-core/src/main/kotlin/com/cakk/core/facade/tag/TagReadFacade.kt index dd7737be..4a8aa2ca 100644 --- a/cakk-core/src/main/kotlin/com/cakk/core/facade/tag/TagReadFacade.kt +++ b/cakk-core/src/main/kotlin/com/cakk/core/facade/tag/TagReadFacade.kt @@ -19,3 +19,4 @@ class TagReadFacade( }.toList() } } + diff --git a/cakk-core/src/main/kotlin/com/cakk/core/facade/user/UserReadFacade.kt b/cakk-core/src/main/kotlin/com/cakk/core/facade/user/UserReadFacade.kt index 5f510ba5..b9973265 100644 --- a/cakk-core/src/main/kotlin/com/cakk/core/facade/user/UserReadFacade.kt +++ b/cakk-core/src/main/kotlin/com/cakk/core/facade/user/UserReadFacade.kt @@ -15,6 +15,7 @@ class UserReadFacade( private val userJpaRepository: UserJpaRepository, private val userQueryRepository: UserQueryRepository ) { + fun findByUserId(userId: Long): User { return userJpaRepository.findById(userId).orElseThrow { CakkException(ReturnCode.NOT_EXIST_USER) } } @@ -31,3 +32,4 @@ class UserReadFacade( return userJpaRepository.findAll() } } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/DataSourceConfig.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/DataSourceConfig.kt index 3bb9b48f..254273b9 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/DataSourceConfig.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/DataSourceConfig.kt @@ -22,3 +22,4 @@ class DataSourceConfig { return HikariDataSource(hikariConfig()) } } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/JacksonConfig.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/JacksonConfig.kt index 7028ac33..96635745 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/JacksonConfig.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/JacksonConfig.kt @@ -16,3 +16,4 @@ class JacksonConfig { return objectMapper } } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/P6spyConfig.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/P6spyConfig.kt index ce59199c..8d8ed345 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/P6spyConfig.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/P6spyConfig.kt @@ -11,3 +11,4 @@ class P6spyConfig { P6SpyOptions.getActiveInstance().logMessageFormat = P6spySqlFormatterConfig::class.java.name } } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/P6spySqlFormatterConfig.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/P6spySqlFormatterConfig.kt index 8019cd17..3fb5f2bd 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/P6spySqlFormatterConfig.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/P6spySqlFormatterConfig.kt @@ -8,7 +8,8 @@ import java.util.* import java.util.function.Predicate class P6spySqlFormatterConfig : MessageFormattingStrategy { - override fun formatMessage( + + override fun formatMessage( connectionId: Int, now: String, elapsed: Long, @@ -96,3 +97,4 @@ class P6spySqlFormatterConfig : MessageFormattingStrategy { private const val COMMENT = "comment" } } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/QuerydslConfig.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/QuerydslConfig.kt index e740d9d2..0de280c0 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/QuerydslConfig.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/config/QuerydslConfig.kt @@ -9,6 +9,7 @@ import org.springframework.context.annotation.Configuration @Configuration class QuerydslConfig { + @PersistenceContext private val entityManager: EntityManager? = null @Bean @@ -16,3 +17,4 @@ class QuerydslConfig { return JPAQueryFactory(JPQLTemplates.DEFAULT, entityManager) } } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/DayOfWeekConverter.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/DayOfWeekConverter.kt index 8dc4f1db..3be243de 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/DayOfWeekConverter.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/DayOfWeekConverter.kt @@ -7,7 +7,8 @@ import jakarta.persistence.AttributeConverter import java.util.stream.Stream class DayOfWeekConverter : AttributeConverter { - override fun convertToDatabaseColumn(days: Days?): Int? { + + override fun convertToDatabaseColumn(days: Days?): Int? { return days?.code } @@ -20,3 +21,4 @@ class DayOfWeekConverter : AttributeConverter { .orElseThrow { CakkException(ReturnCode.INTERNAL_SERVER_ERROR) } } } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/LinkKindConverter.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/LinkKindConverter.kt index 05f52e01..9bf4d2ed 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/LinkKindConverter.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/LinkKindConverter.kt @@ -7,7 +7,8 @@ import jakarta.persistence.AttributeConverter import java.util.stream.Stream class LinkKindConverter : AttributeConverter { - override fun convertToDatabaseColumn(linkKind: LinkKind?): String? { + + override fun convertToDatabaseColumn(linkKind: LinkKind?): String? { return linkKind?.value } @@ -20,3 +21,4 @@ class LinkKindConverter : AttributeConverter { .orElseThrow { CakkException(ReturnCode.INTERNAL_SERVER_ERROR) } } } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/VerificationStatusConverter.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/VerificationStatusConverter.kt index 47143b97..db5705e8 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/VerificationStatusConverter.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/converter/VerificationStatusConverter.kt @@ -7,7 +7,8 @@ import jakarta.persistence.AttributeConverter import java.util.stream.Stream class VerificationStatusConverter : AttributeConverter { - override fun convertToDatabaseColumn(verificationStatus: VerificationStatus?): Int? { + + override fun convertToDatabaseColumn(verificationStatus: VerificationStatus?): Int? { return verificationStatus?.code } @@ -20,3 +21,4 @@ class VerificationStatusConverter : AttributeConverter { - @Query("select bi from BusinessInformation as bi join fetch bi.cakeShop " + + @Query("select bi from BusinessInformation as bi join fetch bi.cakeShop " + "where bi.cakeShop.id =:cakeShopId") fun findBusinessInformationWithCakeShop(@Param("cakeShopId") cakeShopId: Long): BusinessInformation? @@ -28,3 +29,4 @@ interface BusinessInformationJpaRepository : JpaRepository { - fun findByCakeId(cakeId: Long?): CakeCategory? + + fun findByCakeId(cakeId: Long?): CakeCategory? } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeHeartJpaRepository.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeHeartJpaRepository.kt index c6f46605..abf4112a 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeHeartJpaRepository.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeHeartJpaRepository.kt @@ -7,7 +7,9 @@ import org.springframework.data.jpa.repository.JpaRepository import java.util.* interface CakeHeartJpaRepository : JpaRepository { - fun findAllByUser(user: User): List + + fun findAllByUser(user: User): List fun findByUserAndCake(user: User, cake: Cake): CakeHeart? fun existsByUserAndCake(user: User, cake: Cake): Boolean } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopHeartJpaRepository.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopHeartJpaRepository.kt deleted file mode 100644 index 787eb2d7..00000000 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopHeartJpaRepository.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.cakk.domain.mysql.repository.jpa - -import com.cakk.domain.mysql.entity.shop.CakeShop -import com.cakk.domain.mysql.entity.shop.CakeShopHeart -import com.cakk.domain.mysql.entity.user.User -import org.springframework.data.jpa.repository.JpaRepository -import java.util.* - -interface CakeShopHeartJpaRepository : JpaRepository { - fun findAllByUser(user: User): List - fun findByUserAndCakeShop(user: User, cakeShop: CakeShop): CakeShopHeart? - fun existsByUserAndCakeShop(user: User, cakeShop: CakeShop): Boolean -} diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopLikeJpaRepository.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopLikeJpaRepository.kt deleted file mode 100644 index def381bc..00000000 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopLikeJpaRepository.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.cakk.domain.mysql.repository.jpa - -import com.cakk.domain.mysql.entity.shop.CakeShopLike -import com.cakk.domain.mysql.entity.user.User -import org.springframework.data.jpa.repository.JpaRepository - -interface CakeShopLikeJpaRepository : JpaRepository { - fun countByCakeShopIdAndUser(cakeShopId: Long, user: User): Int -} diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopLinkJpaRepository.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopLinkJpaRepository.kt index b1879451..61db8abb 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopLinkJpaRepository.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopLinkJpaRepository.kt @@ -4,5 +4,7 @@ import com.cakk.domain.mysql.entity.shop.CakeShopLink import org.springframework.data.jpa.repository.JpaRepository interface CakeShopLinkJpaRepository : JpaRepository { - fun findAllByCakeShopId(cakeShopId: Long): List + + fun findAllByCakeShopId(cakeShopId: Long): List } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopOperationJpaRepository.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopOperationJpaRepository.kt index c540b84a..8b494520 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopOperationJpaRepository.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/CakeShopOperationJpaRepository.kt @@ -4,5 +4,7 @@ import com.cakk.domain.mysql.entity.shop.CakeShopOperation import org.springframework.data.jpa.repository.JpaRepository interface CakeShopOperationJpaRepository : JpaRepository { - fun findAllByCakeShopId(cakeShopId: Long): List + + fun findAllByCakeShopId(cakeShopId: Long): List } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/TagJpaRepository.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/TagJpaRepository.kt index 5fadc618..eaf1c2f5 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/TagJpaRepository.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/TagJpaRepository.kt @@ -7,6 +7,8 @@ import java.util.* @Repository interface TagJpaRepository : JpaRepository { - fun findTagByTagName(tagName: String?): Tag? + + fun findTagByTagName(tagName: String?): Tag? fun findTagsByTagNameIsIn(tagNames: List): List } + diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/UserJpaRepository.kt b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/UserJpaRepository.kt index 1ff70520..489b63ee 100644 --- a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/UserJpaRepository.kt +++ b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/repository/jpa/UserJpaRepository.kt @@ -5,5 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository import java.util.* interface UserJpaRepository : JpaRepository { + fun findByProviderId(providerId: String): User? } + diff --git a/cakk-domain/mysql/src/test/java/com/cakk/domain/base/DomainTest.kt b/cakk-domain/mysql/src/test/java/com/cakk/domain/base/DomainTest.kt index a41503fe..b2f171e3 100644 --- a/cakk-domain/mysql/src/test/java/com/cakk/domain/base/DomainTest.kt +++ b/cakk-domain/mysql/src/test/java/com/cakk/domain/base/DomainTest.kt @@ -22,7 +22,8 @@ import org.locationtech.jts.geom.Point import org.locationtech.jts.geom.PrecisionModel abstract class DomainTest { - protected val reflectionMonkey: FixtureMonkey + + protected val reflectionMonkey: FixtureMonkey protected get() = FixtureMonkey.builder() .plugin(JakartaValidationPlugin()) .objectIntrospector(FieldReflectionArbitraryIntrospector.INSTANCE) @@ -99,3 +100,4 @@ abstract class DomainTest { } } } + diff --git a/cakk-domain/mysql/src/test/java/com/cakk/domain/base/FacadeTest.kt b/cakk-domain/mysql/src/test/java/com/cakk/domain/base/FacadeTest.kt index f98ab245..468db72d 100644 --- a/cakk-domain/mysql/src/test/java/com/cakk/domain/base/FacadeTest.kt +++ b/cakk-domain/mysql/src/test/java/com/cakk/domain/base/FacadeTest.kt @@ -85,3 +85,4 @@ abstract class FacadeTest { } } } + diff --git a/cakk-domain/mysql/src/test/java/com/cakk/domain/entity/user/BusinessInformationTest.kt b/cakk-domain/mysql/src/test/java/com/cakk/domain/entity/user/BusinessInformationTest.kt index 285a1f2c..2317228d 100644 --- a/cakk-domain/mysql/src/test/java/com/cakk/domain/entity/user/BusinessInformationTest.kt +++ b/cakk-domain/mysql/src/test/java/com/cakk/domain/entity/user/BusinessInformationTest.kt @@ -11,7 +11,8 @@ import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test internal class BusinessInformationTest : DomainTest() { - private fun getBusinessInformationFixtureWithUser(verificationStatus: VerificationStatus, role: Role): BusinessInformation { + + private fun getBusinessInformationFixtureWithUser(verificationStatus: VerificationStatus, role: Role): BusinessInformation { return constructorMonkey.giveMeBuilder(BusinessInformation::class.java) .setNotNull("businessNumber") .set("businessNumber", Arbitraries.strings().withCharRange('a', 'z').ofMaxLength(20)) @@ -102,3 +103,4 @@ internal class BusinessInformationTest : DomainTest() { Assertions.assertThat(businessInformation.isBusinessOwnerCandidate(verificationPolicy)).isFalse } } + diff --git a/cakk-domain/mysql/src/test/java/com/cakk/domain/entity/user/VerificationPolicyTest.kt b/cakk-domain/mysql/src/test/java/com/cakk/domain/entity/user/VerificationPolicyTest.kt index 24b5b52d..db4148c1 100644 --- a/cakk-domain/mysql/src/test/java/com/cakk/domain/entity/user/VerificationPolicyTest.kt +++ b/cakk-domain/mysql/src/test/java/com/cakk/domain/entity/user/VerificationPolicyTest.kt @@ -9,7 +9,8 @@ import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test class VerificationPolicyTest : DomainTest() { - @Test + + @Test @DisplayName("인증 정책은 사용자를 케이크샵 주인으로 승격시켜준다") fun approveToBusinessOwner() { val verificationPolicy = verificationPolicy @@ -67,3 +68,4 @@ class VerificationPolicyTest : DomainTest() { ) { verificationPolicy.requestCertificationBusinessOwner(businessInformation, param) } } } +