From 05dda183a1aedc00eae408fda59fad7556f88325 Mon Sep 17 00:00:00 2001 From: yb__char Date: Mon, 13 Jan 2025 17:38:58 +0900 Subject: [PATCH] refactor: ktlint versioning by kotlin 2.1.0 --- .editorconfig | 4 +++- build.gradle.kts | 10 ++++++--- .../tech/sipe/fintech/account/Account.kt | 3 +-- .../tech/sipe/fintech/account/AccountApi.kt | 7 +++--- .../sipe/fintech/account/AccountEntity.kt | 3 +-- .../fintech/account/AccountModuleMetadata.kt | 3 +-- .../sipe/fintech/account/AccountRepository.kt | 1 + .../sipe/fintech/account/AccountService.kt | 3 +-- .../tech/sipe/fintech/common/LoggerUtil.kt | 6 +++-- .../tech/sipe/fintech/payment/Payment.kt | 2 -- .../tech/sipe/fintech/payment/PaymentApi.kt | 5 +---- .../sipe/fintech/payment/PaymentEntity.kt | 3 +-- .../fintech/payment/PaymentJpaRepository.kt | 3 +-- .../fintech/payment/PaymentModuleMetadata.kt | 2 +- .../sipe/fintech/payment/PaymentService.kt | 3 +-- .../tech/sipe/fintech/payment/package-info.kt | 8 ------- .../transfer/TransferModuleMetadata.kt | 5 ++--- .../fintech/transfer/internal/Transfer.kt | 5 ++--- .../fintech/transfer/internal/TransferApi.kt | 10 ++++----- .../transfer/internal/TransferEntity.kt | 3 +-- .../internal/TransferJpaRepository.kt | 3 +-- .../transfer/internal/TransferRepository.kt | 2 -- .../transfer/internal/TransferService.kt | 10 ++------- .../tech/sipe/fintech/wallet/PayWalletApi.kt | 12 ++++++++-- .../fintech/wallet/WalletModuleMetadata.kt | 2 +- .../wallet/internal/domain/PayWallet.kt | 8 ++++--- .../wallet/internal/domain/PayWalletMapper.kt | 22 +++++++++---------- .../internal/domain/PayWalletRepository.kt | 2 +- .../wallet/internal/domain/WalletStatus.kt | 2 +- .../wallet/internal/infra/PayWalletEntity.kt | 2 +- .../internal/infra/PayWalletJpaRepository.kt | 4 ++-- .../internal/infra/PayWalletRepositoryImpl.kt | 8 +++---- .../internal/presentation/PayWalletApiImpl.kt | 12 +++++++--- .../internal/service/PayWalletService.kt | 13 +++++++---- .../sipe/fintech/FintechApplicationTests.kt | 2 +- 35 files changed, 93 insertions(+), 100 deletions(-) delete mode 100644 src/main/kotlin/tech/sipe/fintech/payment/package-info.kt diff --git a/.editorconfig b/.editorconfig index 9c12031..ece82ae 100644 --- a/.editorconfig +++ b/.editorconfig @@ -27,4 +27,6 @@ max_line_length = 120 # [no-wildcard-imports] ktlint_no-wildcard-imports = disabled ktlint_standard_no-wildcard-imports = disabled -ktlint_standard_package-name = disabled \ No newline at end of file +ktlint_standard_package-name = disabled + +ktlint_function_naming_ignore_when_annotated_with = Composable \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 3a5f62f..f4e5b42 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,11 @@ plugins { kotlin("plugin.jpa") version "2.1.0" id("org.springframework.boot") version "3.4.1" id("io.spring.dependency-management") version "1.1.7" - id("org.jlleitschuh.gradle.ktlint") version "12.1.1" + id("org.jlleitschuh.gradle.ktlint") version "12.1.2" +} + +ktlint { + version.set("1.5.0") } version = "${property("applicationVersion")}" @@ -18,7 +22,6 @@ java { extra["springModulithVersion"] = "1.3.1" - repositories { mavenCentral() } @@ -70,7 +73,6 @@ dependencyManagement { } } - kotlin { compilerOptions { freeCompilerArgs.addAll("-Xjsr305=strict") @@ -85,8 +87,10 @@ tasks.register("addLintPreCommitHook", DefaultTask::class) { val hooksDir = project.file(".git/hooks") val scriptDir = project.file("scripts") val preCommit = scriptDir.resolve("pre-commit") + Runtime.getRuntime().exec("chmod +x .git/hooks/pre-commit") preCommit.copyTo(hooksDir.resolve("pre-commit"), overwrite = true) hooksDir.resolve("pre-commit").setExecutable(true) + // chmod +x .git/hooks/pre-commit } } diff --git a/src/main/kotlin/tech/sipe/fintech/account/Account.kt b/src/main/kotlin/tech/sipe/fintech/account/Account.kt index 5c97da9..f80dcf3 100644 --- a/src/main/kotlin/tech/sipe/fintech/account/Account.kt +++ b/src/main/kotlin/tech/sipe/fintech/account/Account.kt @@ -1,4 +1,3 @@ package tech.sipe.fintech.account -class Account { -} +class Account diff --git a/src/main/kotlin/tech/sipe/fintech/account/AccountApi.kt b/src/main/kotlin/tech/sipe/fintech/account/AccountApi.kt index e07b152..7ef31de 100644 --- a/src/main/kotlin/tech/sipe/fintech/account/AccountApi.kt +++ b/src/main/kotlin/tech/sipe/fintech/account/AccountApi.kt @@ -6,19 +6,18 @@ import org.springframework.web.bind.annotation.RestController @RestController class AccountApi( - private val accountService: AccountService + private val accountService: AccountService, ) { - @PostMapping("/accounts/registration") fun register( - @RequestParam memberId: Long + @RequestParam memberId: Long, ) { accountService.register() } @PostMapping("/accounts/cancellation") fun cancel( - @RequestParam memberId: Long + @RequestParam memberId: Long, ) { accountService.cancel() } diff --git a/src/main/kotlin/tech/sipe/fintech/account/AccountEntity.kt b/src/main/kotlin/tech/sipe/fintech/account/AccountEntity.kt index 65a5cf6..05ddf06 100644 --- a/src/main/kotlin/tech/sipe/fintech/account/AccountEntity.kt +++ b/src/main/kotlin/tech/sipe/fintech/account/AccountEntity.kt @@ -1,4 +1,3 @@ package tech.sipe.fintech.account -class AccountEntity { -} +class AccountEntity diff --git a/src/main/kotlin/tech/sipe/fintech/account/AccountModuleMetadata.kt b/src/main/kotlin/tech/sipe/fintech/account/AccountModuleMetadata.kt index e28d22b..8e62f1c 100644 --- a/src/main/kotlin/tech/sipe/fintech/account/AccountModuleMetadata.kt +++ b/src/main/kotlin/tech/sipe/fintech/account/AccountModuleMetadata.kt @@ -2,9 +2,8 @@ package tech.sipe.fintech.account import org.springframework.modulith.ApplicationModule - @ApplicationModule( type = ApplicationModule.Type.CLOSED, - allowedDependencies = [] + allowedDependencies = [], ) class AccountModuleMetadata diff --git a/src/main/kotlin/tech/sipe/fintech/account/AccountRepository.kt b/src/main/kotlin/tech/sipe/fintech/account/AccountRepository.kt index 84636dc..78fc309 100644 --- a/src/main/kotlin/tech/sipe/fintech/account/AccountRepository.kt +++ b/src/main/kotlin/tech/sipe/fintech/account/AccountRepository.kt @@ -2,5 +2,6 @@ package tech.sipe.fintech.account interface AccountRepository { fun save(account: Account) + fun delete(account: Account) } diff --git a/src/main/kotlin/tech/sipe/fintech/account/AccountService.kt b/src/main/kotlin/tech/sipe/fintech/account/AccountService.kt index 6725224..f32f163 100644 --- a/src/main/kotlin/tech/sipe/fintech/account/AccountService.kt +++ b/src/main/kotlin/tech/sipe/fintech/account/AccountService.kt @@ -4,10 +4,9 @@ import org.springframework.stereotype.Service @Service class AccountService { - fun register() { } fun cancel() { } -} \ No newline at end of file +} diff --git a/src/main/kotlin/tech/sipe/fintech/common/LoggerUtil.kt b/src/main/kotlin/tech/sipe/fintech/common/LoggerUtil.kt index 29a4924..1bfe9f6 100644 --- a/src/main/kotlin/tech/sipe/fintech/common/LoggerUtil.kt +++ b/src/main/kotlin/tech/sipe/fintech/common/LoggerUtil.kt @@ -8,8 +8,10 @@ fun Any.logInfo(message: String) { logger.info(message) } -fun Any.logError(message: String? = null, e: Exception) { +fun Any.logError( + message: String? = null, + e: Exception, +) { val logger = org.slf4j.LoggerFactory.getLogger(this.javaClass) logger.error(message ?: e.message ?: e.localizedMessage, e) } - diff --git a/src/main/kotlin/tech/sipe/fintech/payment/Payment.kt b/src/main/kotlin/tech/sipe/fintech/payment/Payment.kt index f7250a3..ccf8820 100644 --- a/src/main/kotlin/tech/sipe/fintech/payment/Payment.kt +++ b/src/main/kotlin/tech/sipe/fintech/payment/Payment.kt @@ -1,5 +1,3 @@ package tech.sipe.fintech.payment class Payment -{ -} diff --git a/src/main/kotlin/tech/sipe/fintech/payment/PaymentApi.kt b/src/main/kotlin/tech/sipe/fintech/payment/PaymentApi.kt index d236924..d53c612 100644 --- a/src/main/kotlin/tech/sipe/fintech/payment/PaymentApi.kt +++ b/src/main/kotlin/tech/sipe/fintech/payment/PaymentApi.kt @@ -6,12 +6,9 @@ import org.springframework.web.bind.annotation.RestController @RestController class PaymentApi { - @PostMapping("/payments") fun pay( - @RequestParam memberId: Long + @RequestParam memberId: Long, ) { - } - } diff --git a/src/main/kotlin/tech/sipe/fintech/payment/PaymentEntity.kt b/src/main/kotlin/tech/sipe/fintech/payment/PaymentEntity.kt index 3eace65..13a3ff1 100644 --- a/src/main/kotlin/tech/sipe/fintech/payment/PaymentEntity.kt +++ b/src/main/kotlin/tech/sipe/fintech/payment/PaymentEntity.kt @@ -1,4 +1,3 @@ package tech.sipe.fintech.payment -class PaymentEntity { -} +class PaymentEntity diff --git a/src/main/kotlin/tech/sipe/fintech/payment/PaymentJpaRepository.kt b/src/main/kotlin/tech/sipe/fintech/payment/PaymentJpaRepository.kt index 4d94a49..e6f43f1 100644 --- a/src/main/kotlin/tech/sipe/fintech/payment/PaymentJpaRepository.kt +++ b/src/main/kotlin/tech/sipe/fintech/payment/PaymentJpaRepository.kt @@ -1,4 +1,3 @@ package tech.sipe.fintech.payment -interface PaymentJpaRepository { -} +interface PaymentJpaRepository diff --git a/src/main/kotlin/tech/sipe/fintech/payment/PaymentModuleMetadata.kt b/src/main/kotlin/tech/sipe/fintech/payment/PaymentModuleMetadata.kt index c633bd2..47fae70 100644 --- a/src/main/kotlin/tech/sipe/fintech/payment/PaymentModuleMetadata.kt +++ b/src/main/kotlin/tech/sipe/fintech/payment/PaymentModuleMetadata.kt @@ -4,6 +4,6 @@ import org.springframework.modulith.ApplicationModule @ApplicationModule( type = ApplicationModule.Type.CLOSED, - allowedDependencies = [] + allowedDependencies = [], ) class PaymentModuleMetadata diff --git a/src/main/kotlin/tech/sipe/fintech/payment/PaymentService.kt b/src/main/kotlin/tech/sipe/fintech/payment/PaymentService.kt index 2abc0e4..9de67b1 100644 --- a/src/main/kotlin/tech/sipe/fintech/payment/PaymentService.kt +++ b/src/main/kotlin/tech/sipe/fintech/payment/PaymentService.kt @@ -1,4 +1,3 @@ package tech.sipe.fintech.payment -class PaymentService { -} +class PaymentService diff --git a/src/main/kotlin/tech/sipe/fintech/payment/package-info.kt b/src/main/kotlin/tech/sipe/fintech/payment/package-info.kt deleted file mode 100644 index 26f8c63..0000000 --- a/src/main/kotlin/tech/sipe/fintech/payment/package-info.kt +++ /dev/null @@ -1,8 +0,0 @@ -//@file:ApplicationModule( -// type = ApplicationModule.Type.CLOSED, -// allowedDependencies = ["account", "wallet"] -//) -// -//package tech.sipe.fintech.payment -// -//import org.springframework.modulith.ApplicationModule diff --git a/src/main/kotlin/tech/sipe/fintech/transfer/TransferModuleMetadata.kt b/src/main/kotlin/tech/sipe/fintech/transfer/TransferModuleMetadata.kt index df8c679..67ee765 100644 --- a/src/main/kotlin/tech/sipe/fintech/transfer/TransferModuleMetadata.kt +++ b/src/main/kotlin/tech/sipe/fintech/transfer/TransferModuleMetadata.kt @@ -3,7 +3,6 @@ package tech.sipe.fintech.transfer import org.springframework.modulith.ApplicationModule @ApplicationModule( - allowedDependencies = ["wallet"] + allowedDependencies = ["wallet"], ) -class TransferModuleMetadata { -} +class TransferModuleMetadata diff --git a/src/main/kotlin/tech/sipe/fintech/transfer/internal/Transfer.kt b/src/main/kotlin/tech/sipe/fintech/transfer/internal/Transfer.kt index d8dd1ee..dc804db 100644 --- a/src/main/kotlin/tech/sipe/fintech/transfer/internal/Transfer.kt +++ b/src/main/kotlin/tech/sipe/fintech/transfer/internal/Transfer.kt @@ -2,6 +2,5 @@ package tech.sipe.fintech.transfer.internal class Transfer( val id: Long, - val money: Long -) { -} + val money: Long, +) diff --git a/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferApi.kt b/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferApi.kt index 2ee5151..474e488 100644 --- a/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferApi.kt +++ b/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferApi.kt @@ -8,12 +8,11 @@ import tech.sipe.fintech.wallet.PayWalletApi @RestController class TransferApi( private val transferService: TransferService, - private val payWalletApi: PayWalletApi + private val payWalletApi: PayWalletApi, ) { - @PostMapping("/transfers/charge") fun charge( - @RequestParam memberId: Long + @RequestParam memberId: Long, ) { val balance = payWalletApi.getBalance(123) transferService.charge() @@ -21,14 +20,13 @@ class TransferApi( @PostMapping("/transfers/withdrawal") fun withdraw( - @RequestParam memberId: Long + @RequestParam memberId: Long, ) {} @PostMapping("/transfers") fun transfer( - @RequestParam memberId: Long + @RequestParam memberId: Long, ) { transferService.transfer() } - } diff --git a/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferEntity.kt b/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferEntity.kt index b5b8492..f107bc2 100644 --- a/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferEntity.kt +++ b/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferEntity.kt @@ -1,4 +1,3 @@ package tech.sipe.fintech.transfer.internal -class TransferEntity { -} +class TransferEntity diff --git a/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferJpaRepository.kt b/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferJpaRepository.kt index ae6f76e..9fcbbb5 100644 --- a/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferJpaRepository.kt +++ b/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferJpaRepository.kt @@ -1,4 +1,3 @@ package tech.sipe.fintech.transfer.internal -interface TransferJpaRepository { -} +interface TransferJpaRepository diff --git a/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferRepository.kt b/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferRepository.kt index 677e67f..8a53423 100644 --- a/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferRepository.kt +++ b/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferRepository.kt @@ -1,5 +1,3 @@ package tech.sipe.fintech.transfer.internal interface TransferRepository -{ -} diff --git a/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferService.kt b/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferService.kt index ca8d00e..3643b5d 100644 --- a/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferService.kt +++ b/src/main/kotlin/tech/sipe/fintech/transfer/internal/TransferService.kt @@ -1,18 +1,12 @@ package tech.sipe.fintech.transfer.internal import org.springframework.stereotype.Service -import tech.sipe.fintech.wallet.internal.domain.Currency -import tech.sipe.fintech.wallet.internal.domain.PayWallet -import tech.sipe.fintech.wallet.internal.domain.WalletStatus -import java.math.BigDecimal - @Service -class TransferService( -) { +class TransferService { fun charge() { } - fun transfer() { + fun transfer() { } } diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/PayWalletApi.kt b/src/main/kotlin/tech/sipe/fintech/wallet/PayWalletApi.kt index df35414..46e010c 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/PayWalletApi.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/PayWalletApi.kt @@ -4,7 +4,15 @@ package tech.sipe.fintech.wallet * @author 김재영 (jaeyeong.kim@navercorp.com) */ interface PayWalletApi { - fun charge(amount: Long, payWalletId: Long) - fun pay(amount: Long, payWalletId: Long) + fun charge( + amount: Long, + payWalletId: Long, + ) + + fun pay( + amount: Long, + payWalletId: Long, + ) + fun getBalance(payWalletId: Long): Long } diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/WalletModuleMetadata.kt b/src/main/kotlin/tech/sipe/fintech/wallet/WalletModuleMetadata.kt index 48deb57..f2959c1 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/WalletModuleMetadata.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/WalletModuleMetadata.kt @@ -4,6 +4,6 @@ import org.springframework.modulith.ApplicationModule @ApplicationModule( type = ApplicationModule.Type.CLOSED, - allowedDependencies = [] + allowedDependencies = [], ) class WalletModuleMetadata diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWallet.kt b/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWallet.kt index 4d2bea6..76cd923 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWallet.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWallet.kt @@ -10,11 +10,13 @@ class PayWallet( balance: BigDecimal, val currency: Currency, ) { + companion object { + private const val MINIMUM_CHARGE_AMOUNT = 1000 + } + var balance: BigDecimal = balance private set - private val MINIMUM_CHARGE_AMOUNT = 1000 - /** * 충전 */ @@ -22,7 +24,7 @@ class PayWallet( if (amount < MINIMUM_CHARGE_AMOUNT) { throw IllegalArgumentException("최소 충전 금액은 1,000원입니다.") } - balance += BigDecimal.valueOf(amount) + balance += BigDecimal.valueOf(amount) } /** diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWalletMapper.kt b/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWalletMapper.kt index ada7988..1877910 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWalletMapper.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWalletMapper.kt @@ -5,23 +5,23 @@ import tech.sipe.fintech.wallet.internal.infra.PayWalletEntity class PayWalletMapper { companion object { - fun toDomain(entity: PayWalletEntity): PayWallet { - return PayWallet( + fun toDomain(entity: PayWalletEntity): PayWallet = + PayWallet( id = entity.id ?: throw DataIntegrityViolationException("Id is null"), userId = entity.userId, accountId = entity.accountId, walletStatus = entity.walletStatus, balance = entity.balance, - currency = entity.currency + currency = entity.currency, ) - } - fun toEntity(domain: PayWallet) = PayWalletEntity( - userId = domain.userId, - accountId = domain.accountId, - walletStatus = domain.walletStatus, - balance = domain.balance, - currency = domain.currency - ) + fun toEntity(domain: PayWallet) = + PayWalletEntity( + userId = domain.userId, + accountId = domain.accountId, + walletStatus = domain.walletStatus, + balance = domain.balance, + currency = domain.currency, + ) } } diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWalletRepository.kt b/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWalletRepository.kt index 37071f8..1a03a6f 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWalletRepository.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/PayWalletRepository.kt @@ -1,7 +1,7 @@ package tech.sipe.fintech.wallet.internal.domain - interface PayWalletRepository { fun findByUserId(userId: Long): PayWallet + fun save(payWalletEntity: PayWallet): PayWallet } diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/WalletStatus.kt b/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/WalletStatus.kt index 98884f6..ad899ad 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/WalletStatus.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/internal/domain/WalletStatus.kt @@ -6,5 +6,5 @@ package tech.sipe.fintech.wallet.internal.domain enum class WalletStatus { ACTIVE, INACTIVE, - SUSPENDED + SUSPENDED, } diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletEntity.kt b/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletEntity.kt index 890135c..98f3136 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletEntity.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletEntity.kt @@ -19,4 +19,4 @@ class PayWalletEntity( val balance: BigDecimal = BigDecimal.ZERO, @Enumerated(value = EnumType.STRING) val currency: Currency, -): BaseEntity() +) : BaseEntity() diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletJpaRepository.kt b/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletJpaRepository.kt index 750141b..c58dac5 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletJpaRepository.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletJpaRepository.kt @@ -2,6 +2,6 @@ package tech.sipe.fintech.wallet.internal.infra import org.springframework.data.jpa.repository.JpaRepository -interface PayWalletJpaRepository : JpaRepository{ - fun findByUserId(userId: Long) : PayWalletEntity? +interface PayWalletJpaRepository : JpaRepository { + fun findByUserId(userId: Long): PayWalletEntity? } diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletRepositoryImpl.kt b/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletRepositoryImpl.kt index 7b69875..a459ded 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletRepositoryImpl.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/internal/infra/PayWalletRepositoryImpl.kt @@ -7,16 +7,14 @@ import tech.sipe.fintech.wallet.internal.domain.PayWalletRepository @Component class PayWalletRepositoryImpl( - private val payWalletJpaRepository: PayWalletJpaRepository + private val payWalletJpaRepository: PayWalletJpaRepository, ) : PayWalletRepository { - override fun findByUserId(userId: Long): PayWallet { payWalletJpaRepository.findByUserId(userId)?.let { return PayWalletMapper.toDomain(it) } ?: throw RuntimeException("PayWallet not found") } - override fun save(payWalletEntity: PayWallet): PayWallet { - return PayWalletMapper.toDomain(payWalletJpaRepository.save(PayWalletMapper.toEntity(payWalletEntity))) - } + override fun save(payWalletEntity: PayWallet): PayWallet = + PayWalletMapper.toDomain(payWalletJpaRepository.save(PayWalletMapper.toEntity(payWalletEntity))) } diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/internal/presentation/PayWalletApiImpl.kt b/src/main/kotlin/tech/sipe/fintech/wallet/internal/presentation/PayWalletApiImpl.kt index 0a12c75..c77a2ab 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/internal/presentation/PayWalletApiImpl.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/internal/presentation/PayWalletApiImpl.kt @@ -9,13 +9,19 @@ import tech.sipe.fintech.wallet.internal.service.PayWalletService */ @Service class PayWalletApiImpl( - private val payWalletService: PayWalletService + private val payWalletService: PayWalletService, ) : PayWalletApi { - override fun charge(amount: Long, payWalletId: Long) { + override fun charge( + amount: Long, + payWalletId: Long, + ) { TODO("Not yet implemented") } - override fun pay(amount: Long, payWalletId: Long) { + override fun pay( + amount: Long, + payWalletId: Long, + ) { TODO("Not yet implemented") } diff --git a/src/main/kotlin/tech/sipe/fintech/wallet/internal/service/PayWalletService.kt b/src/main/kotlin/tech/sipe/fintech/wallet/internal/service/PayWalletService.kt index 7cf9be6..c493ba7 100644 --- a/src/main/kotlin/tech/sipe/fintech/wallet/internal/service/PayWalletService.kt +++ b/src/main/kotlin/tech/sipe/fintech/wallet/internal/service/PayWalletService.kt @@ -7,10 +7,13 @@ import tech.sipe.fintech.wallet.internal.domain.PayWalletRepository @Service class PayWalletService( - private val payWalletRepository: PayWalletRepository + private val payWalletRepository: PayWalletRepository, ) { @Transactional - fun charge(amount: Long, userId: Long) { + fun charge( + amount: Long, + userId: Long, + ) { /** * 1. 지갑 조회 * 2. amount 만큼 충전 @@ -22,7 +25,10 @@ class PayWalletService( } @Transactional - fun pay(amount: Long, payWalletId: Long) { + fun pay( + amount: Long, + payWalletId: Long, + ) { /** * 1. 지갑 조회 * 2. amount 만큼 차감 @@ -37,5 +43,4 @@ class PayWalletService( */ return 0 } - } diff --git a/src/test/kotlin/tech/sipe/fintech/FintechApplicationTests.kt b/src/test/kotlin/tech/sipe/fintech/FintechApplicationTests.kt index aa2cde7..b456911 100644 --- a/src/test/kotlin/tech/sipe/fintech/FintechApplicationTests.kt +++ b/src/test/kotlin/tech/sipe/fintech/FintechApplicationTests.kt @@ -10,7 +10,7 @@ class FintechApplicationTests { @Test fun contextLoads() { - println("modules: ${modules}") + println("modules: $modules") modules.verify() }