Add user fee service

AmirRajabii · AmirRajabii · commit 9cf8c3572200 · 2025-08-30T19:59:49.000+03:30
diff --git a/accountant/accountant-app/src/main/kotlin/co/nilin/opex/accountant/app/controller/FeeController.kt b/accountant/accountant-app/src/main/kotlin/co/nilin/opex/accountant/app/controller/FeeController.kt
@@ -0,0 +1,27 @@
+package co.nilin.opex.accountant.app.controller
+
+import co.nilin.opex.accountant.core.api.FeeCalculator
+import co.nilin.opex.accountant.core.model.FeeConfig
+import co.nilin.opex.accountant.core.model.UserFee
+import co.nilin.opex.accountant.core.spi.FeeConfigService
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/fee")
+class FeeController(
+    private val feeConfigService: FeeConfigService,
+    private val feeCalculator: FeeCalculator,
+) {
+    @GetMapping("/config")
+    suspend fun getFeeConfigs(): List<FeeConfig> {
+        return feeConfigService.loadFeeConfigs()
+    }
+
+    @GetMapping("/{uuid}")
+    suspend fun getUserFee(@PathVariable uuid: String): UserFee {
+        return feeCalculator.getUserFee(uuid)
+    }
+}
diff --git a/accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/api/FeeCalculator.kt b/accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/api/FeeCalculator.kt
@@ -1,14 +1,14 @@
 package co.nilin.opex.accountant.core.api
 
-import co.nilin.opex.accountant.core.model.FeeConfig
 import co.nilin.opex.accountant.core.model.FeeFinancialActions
 import co.nilin.opex.accountant.core.model.FinancialAction
 import co.nilin.opex.accountant.core.model.Order
+import co.nilin.opex.accountant.core.model.UserFee
 import co.nilin.opex.matching.engine.core.eventh.events.TradeEvent
 
 interface FeeCalculator {
 
-    suspend fun getUserFee(uuid: String): FeeConfig
+    suspend fun getUserFee(uuid: String): UserFee
 
     suspend fun createFeeActions(
         trade: TradeEvent,
diff --git a/accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/model/UserFee.kt b/accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/model/UserFee.kt
@@ -0,0 +1,10 @@
+package co.nilin.opex.accountant.core.model
+
+import java.math.BigDecimal
+
+data class UserFee(
+    val name: String,
+    val displayOrder: Int,
+    val makerFee: BigDecimal,
+    val takerFee: BigDecimal,
+)
diff --git a/accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/service/FeeCalculatorImpl.kt b/accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/service/FeeCalculatorImpl.kt
@@ -20,7 +20,7 @@ class FeeCalculatorImpl(
     private val walletProxy: WalletProxy,
     private val feeConfigService: FeeConfigService,
     private val userVolumePersister: UserVolumePersister,
-    private val cacheManager: CacheManager<String, FeeConfig>,
+    private val cacheManager: CacheManager<String, UserFee>,
     @Value("\${app.address}") private val platformAddress: String,
     private val jsonMapper: JsonMapper
 ) : FeeCalculator {
@@ -30,11 +30,11 @@ class FeeCalculatorImpl(
     private fun remainingMillisUntil1AM(zone: ZoneId = ZoneId.of("GMT+03:30")): Long {
         val now = ZonedDateTime.now(zone)
         val target = now.toLocalDate().plusDays(1).atTime(1, 0).atZone(zone)
-        val  remainingMillis = Duration.between(now, target).toMillis()
-        return if ( remainingMillis > 0)  remainingMillis else Duration.ofHours(1).toMillis()
+        val remainingMillis = Duration.between(now, target).toMillis()
+        return if (remainingMillis > 0) remainingMillis else Duration.ofHours(1).toMillis()
     }
 
-    override suspend fun getUserFee(uuid: String): FeeConfig {
+    override suspend fun getUserFee(uuid: String): UserFee {
         val cached = cacheManager.get(uuid)
         if (cached != null) {
             return cached
@@ -47,8 +47,8 @@ class FeeCalculatorImpl(
             totalAssets?.totalUSDT ?: BigDecimal.ZERO,
             userVolumeData?.valueUSDT ?: BigDecimal.ZERO
         )
-        val  remainingMillis = remainingMillisUntil1AM()
-        cacheManager.put(uuid, feeConfig,  remainingMillis, TimeUnit.MILLISECONDS)
+        val remainingMillis = remainingMillisUntil1AM()
+        cacheManager.put(uuid, feeConfig, remainingMillis, TimeUnit.MILLISECONDS)
         return feeConfig
     }
 
diff --git a/accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/spi/FeeConfigService.kt b/accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/spi/FeeConfigService.kt
@@ -1,6 +1,7 @@
 package co.nilin.opex.accountant.core.spi
 
 import co.nilin.opex.accountant.core.model.FeeConfig
+import co.nilin.opex.accountant.core.model.UserFee
 import java.math.BigDecimal
 
 interface FeeConfigService {
@@ -9,6 +10,6 @@ interface FeeConfigService {
     suspend fun saveFee(config: FeeConfig)
     suspend fun updateFee(config: FeeConfig)
     suspend fun loadFeeConfig(name: String): FeeConfig
-    suspend fun loadMatchingFeeConfig(assetVolume: BigDecimal, tradeVolume: BigDecimal): FeeConfig
+    suspend fun loadMatchingFeeConfig(assetVolume: BigDecimal, tradeVolume: BigDecimal): UserFee
 
 }
diff --git a/accountant/accountant-core/src/test/kotlin/co/nilin/opex/accountant/core/service/FeeCalculatorImplTest.kt b/accountant/accountant-core/src/test/kotlin/co/nilin/opex/accountant/core/service/FeeCalculatorImplTest.kt
@@ -1,8 +1,8 @@
 package co.nilin.opex.accountant.core.service
 
-import co.nilin.opex.accountant.core.model.FeeConfig
 import co.nilin.opex.accountant.core.model.FinancialAction
 import co.nilin.opex.accountant.core.model.FinancialActionCategory
+import co.nilin.opex.accountant.core.model.UserFee
 import co.nilin.opex.accountant.core.model.WalletType
 import co.nilin.opex.accountant.core.spi.FeeConfigService
 import co.nilin.opex.accountant.core.spi.UserVolumePersister
@@ -18,7 +18,7 @@ internal class FeeCalculatorImplTest {
     private val walletProxy = mockk<WalletProxy>()
     private val feeConfigService = mockk<FeeConfigService>()
     private val userVolumePersister = mockk<UserVolumePersister>()
-    private val cacheManager = mockk<CacheManager<String, FeeConfig>>()
+    private val cacheManager = mockk<CacheManager<String, UserFee>>()
 
     private val receiverAddress = "0x0"
     private val feeCalculator = FeeCalculatorImpl(
diff --git a/accountant/accountant-core/src/test/kotlin/co/nilin/opex/accountant/core/service/OrderManagerImplTest.kt b/accountant/accountant-core/src/test/kotlin/co/nilin/opex/accountant/core/service/OrderManagerImplTest.kt
@@ -80,8 +80,8 @@ internal class OrderManagerImplTest {
 
         coEvery {
             feeCalculator.getUserFee(submitOrderEvent.uuid)
-        } returns FeeConfig(
-            "Test", 1, BigDecimal.ONE, BigDecimal.ONE, BigDecimal.ONE, BigDecimal.ONE, BigDecimal.valueOf(0.08), BigDecimal.valueOf(0.1), Condition.OR
+        } returns UserFee(
+            "Test", 1, BigDecimal.valueOf(0.08), BigDecimal.valueOf(0.1)
         )
         //when
         val financialActions = orderManager.handleRequestOrder(submitOrderEvent)
@@ -136,8 +136,8 @@ internal class OrderManagerImplTest {
 
         coEvery {
             feeCalculator.getUserFee(submitOrderEvent.uuid)
-        } returns FeeConfig(
-            "Test", 1, BigDecimal.ONE, BigDecimal.ONE, BigDecimal.ONE, BigDecimal.ONE, BigDecimal.valueOf(0.08), BigDecimal.valueOf(0.1), Condition.OR
+        } returns UserFee(
+            "Test", 1, BigDecimal.valueOf(0.08), BigDecimal.valueOf(0.1)
         )
 
         //when
diff --git a/accountant/accountant-core/src/test/kotlin/co/nilin/opex/accountant/core/service/TradeManagerImplTest.kt b/accountant/accountant-core/src/test/kotlin/co/nilin/opex/accountant/core/service/TradeManagerImplTest.kt
@@ -17,7 +17,6 @@ import io.mockk.runs
 import kotlinx.coroutines.runBlocking
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import org.mockito.kotlin.any
 import java.math.BigDecimal
 
 internal class TradeManagerImplTest {
@@ -35,7 +34,7 @@ internal class TradeManagerImplTest {
     private val feeCalculator = mockk<FeeCalculator>()
     private val walletProxy = mockk<WalletProxy>()
     private val feeConfigService = mockk<FeeConfigService>()
-    private val cacheManager = mockk<CacheManager<String, FeeConfig>>()
+    private val cacheManager = mockk<CacheManager<String, UserFee>>()
 
     private val jsonMapper = JsonMapperTestImpl()
 
@@ -80,7 +79,7 @@ internal class TradeManagerImplTest {
         coEvery { financialActionPersister.updateStatus(any<FinancialAction>(), any()) } returns Unit
         coEvery { financialActionPersister.updateStatus(any<String>(), any()) } returns Unit
         coEvery { currencyRatePersister.updateRate(any(), any(), any()) } just runs
-        coEvery { userVolumePersister.update(any(), any(), any(),any(),any(),any()) } just runs
+        coEvery { userVolumePersister.update(any(), any(), any(), any(), any(), any()) } just runs
     }
 
     @Test
@@ -329,9 +328,8 @@ internal class TradeManagerImplTest {
     ) {
         coEvery {
             feeCalculator.getUserFee(submitOrderEvent.uuid)
-        } returns FeeConfig(
-            "Test", 1, BigDecimal.ONE, BigDecimal.ONE, BigDecimal.ONE, BigDecimal.ONE, makerFee, takerFee,
-            Condition.OR
+        } returns UserFee(
+            "Test", 1, makerFee, takerFee
         )
 
         coEvery {
diff --git a/accountant/accountant-ports/accountant-persister-postgres/src/main/kotlin/co/nilin/opex/accountant/ports/postgres/dao/FeeConfigRepository.kt b/accountant/accountant-ports/accountant-persister-postgres/src/main/kotlin/co/nilin/opex/accountant/ports/postgres/dao/FeeConfigRepository.kt
@@ -1,6 +1,7 @@
 package co.nilin.opex.accountant.ports.postgres.dao
 
 import co.nilin.opex.accountant.core.model.FeeConfig
+import co.nilin.opex.accountant.core.model.UserFee
 import co.nilin.opex.accountant.ports.postgres.model.FeeConfigModel
 import org.springframework.data.r2dbc.repository.Query
 import org.springframework.data.repository.reactive.ReactiveCrudRepository
@@ -19,7 +20,7 @@ interface FeeConfigRepository : ReactiveCrudRepository<FeeConfigModel, Long> {
 
     @Query(
         """
-    SELECT *
+    SELECT name,display_order,maker_fee,taker_fee
     FROM fee_config
     WHERE
         (
@@ -39,6 +40,6 @@ interface FeeConfigRepository : ReactiveCrudRepository<FeeConfigModel, Long> {
     LIMIT 1
     """
     )
-    fun findMatchingConfig(assetVolume: BigDecimal, tradeVolume: BigDecimal): Mono<FeeConfig>
+    fun findMatchingConfig(assetVolume: BigDecimal, tradeVolume: BigDecimal): Mono<UserFee>
 
 }
diff --git a/accountant/accountant-ports/accountant-persister-postgres/src/main/kotlin/co/nilin/opex/accountant/ports/postgres/impl/FeeConfigServiceImpl.kt b/accountant/accountant-ports/accountant-persister-postgres/src/main/kotlin/co/nilin/opex/accountant/ports/postgres/impl/FeeConfigServiceImpl.kt
@@ -1,6 +1,7 @@
 package co.nilin.opex.accountant.ports.postgres.impl
 
 import co.nilin.opex.accountant.core.model.FeeConfig
+import co.nilin.opex.accountant.core.model.UserFee
 import co.nilin.opex.accountant.core.spi.FeeConfigService
 import co.nilin.opex.accountant.ports.postgres.dao.FeeConfigRepository
 import co.nilin.opex.accountant.ports.postgres.model.FeeConfigModel
@@ -45,7 +46,7 @@ class FeeConfigServiceImpl(
     override suspend fun loadMatchingFeeConfig(
         assetVolume: BigDecimal,
         tradeVolume: BigDecimal
-    ): FeeConfig {
+    ): UserFee {
         return feeConfigRepository.findMatchingConfig(assetVolume, tradeVolume).awaitFirst()
     }
 
diff --git a/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/UserFee.kt b/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/UserFee.kt
@@ -0,0 +1,13 @@
+package co.nilin.opex.api.core.inout
+
+import java.math.BigDecimal
+
+data class UserFee(
+    val name: String,
+    val displayOrder: Int,
+    val makerFee: BigDecimal,
+    val takerFee: BigDecimal,
+
+    )
+
+
diff --git a/api/api-core/src/main/kotlin/co/nilin/opex/api/core/spi/AccountantProxy.kt b/api/api-core/src/main/kotlin/co/nilin/opex/api/core/spi/AccountantProxy.kt
@@ -1,15 +1,14 @@
 package co.nilin.opex.api.core.spi
 
 import co.nilin.opex.api.core.inout.FeeConfig
-import co.nilin.opex.api.core.inout.PairFeeResponse
 import co.nilin.opex.api.core.inout.PairConfigResponse
+import co.nilin.opex.api.core.inout.UserFee
 
 interface AccountantProxy {
 
     fun getPairConfigs(): List<PairConfigResponse>
 
     fun getFeeConfigs(): List<FeeConfig>
 
-    fun getFeeConfig(symbol: String): PairFeeResponse
-
+    fun getUserFee(uuid: String): UserFee
 }
diff --git a/api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/controller/MarketController.kt b/api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/controller/MarketController.kt
@@ -8,6 +8,8 @@ import co.nilin.opex.api.ports.opex.data.OrderBookResponse
 import co.nilin.opex.api.ports.opex.data.RecentTradeResponse
 import co.nilin.opex.common.OpexError
 import co.nilin.opex.common.utils.Interval
+import org.springframework.security.core.annotation.CurrentSecurityContext
+import org.springframework.security.core.context.SecurityContext
 import org.springframework.web.bind.annotation.*
 import java.math.BigDecimal
 import java.time.ZoneId
@@ -57,7 +59,7 @@ class MarketController(
     }
 
     @GetMapping("/fee")
-    fun getPairFees(): List<FeeConfig> {
+    fun getFeeConfigs(): List<FeeConfig> {
         return accountantProxy.getFeeConfigs()
     }
 
diff --git a/api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/controller/UserDataController.kt b/api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/controller/UserDataController.kt
@@ -1,17 +1,25 @@
 package co.nilin.opex.api.ports.opex.controller
 
 import co.nilin.opex.api.core.inout.UserCurrencyVolume
+import co.nilin.opex.api.core.inout.UserFee
 import co.nilin.opex.api.core.inout.UserTotalVolumeValue
+import co.nilin.opex.api.core.spi.AccountantProxy
 import co.nilin.opex.api.core.spi.MarketUserDataProxy
 import co.nilin.opex.common.OpexError
 import co.nilin.opex.common.utils.Interval
 import org.springframework.security.core.annotation.CurrentSecurityContext
 import org.springframework.security.core.context.SecurityContext
-import org.springframework.web.bind.annotation.*
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RestController
 
 @RestController
 @RequestMapping("/opex/v1/user/data")
-class UserDataController(private val proxy: MarketUserDataProxy) {
+class UserDataController(
+    private val proxy: MarketUserDataProxy,
+    private val accountantProxy: AccountantProxy,
+) {
 
     @GetMapping("/trade/volume")
     suspend fun getTradeVolumeByCurrency(
@@ -34,6 +42,11 @@ class UserDataController(private val proxy: MarketUserDataProxy) {
         return proxy.getTotalTradeVolumeValue(uuid, interval)
     }
 
+    @GetMapping("/fee")
+    fun getUserFee(@CurrentSecurityContext securityContext: SecurityContext): UserFee {
+        return accountantProxy.getUserFee(securityContext.authentication.name)
+    }
+
     private fun checkValidInterval(interval: Interval) {
         if (interval == Interval.Day || interval == Interval.Week || interval == Interval.Month || interval == Interval.Year)
             return
diff --git a/api/api-ports/api-proxy-rest/src/main/kotlin/co/nilin/opex/api/ports/proxy/impl/AccountantProxyImpl.kt b/api/api-ports/api-proxy-rest/src/main/kotlin/co/nilin/opex/api/ports/proxy/impl/AccountantProxyImpl.kt
@@ -2,9 +2,10 @@ package co.nilin.opex.api.ports.proxy.impl
 
 import co.nilin.opex.api.core.inout.FeeConfig
 import co.nilin.opex.api.core.inout.PairConfigResponse
-import co.nilin.opex.api.core.inout.PairFeeResponse
+import co.nilin.opex.api.core.inout.UserFee
 import co.nilin.opex.api.core.spi.AccountantProxy
 import co.nilin.opex.api.ports.proxy.utils.noBody
+import co.nilin.opex.common.OpexError
 import co.nilin.opex.common.utils.LoggerDelegate
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.http.HttpMethod
@@ -32,18 +33,18 @@ class AccountantProxyImpl(private val restTemplate: RestTemplate) : AccountantPr
     override fun getFeeConfigs(): List<FeeConfig> {
         logger.info("fetching fee configs")
         return restTemplate.exchange<Array<FeeConfig>>(
-            "$baseUrl/config/fee",
+            "$baseUrl/fee/config",
             HttpMethod.GET,
             noBody()
         ).body?.toList() ?: emptyList()
     }
 
-    override fun getFeeConfig(symbol: String): PairFeeResponse {
-        logger.info("fetching fee configs for $symbol")
-        return restTemplate.exchange<PairFeeResponse>(
-            "$baseUrl/config/fee/$symbol",
+    override fun getUserFee(uuid: String): UserFee {
+        logger.info("fetching user fee")
+        return restTemplate.exchange<UserFee>(
+            "$baseUrl/fee/${uuid}",
             HttpMethod.GET,
             noBody()
-        ).body!!
+        ).body ?: throw OpexError.FeeConfigNotFound.exception()
     }
 }
