Optimize market and accountant

accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/inout/RichOrder.kt

@@ -4,6 +4,7 @@ import co.nilin.opex.matching.engine.core.model.MatchConstraint
 import co.nilin.opex.matching.engine.core.model.OrderDirection
 import co.nilin.opex.matching.engine.core.model.OrderType
 import java.math.BigDecimal
+import java.time.LocalDateTime
 
 data class RichOrder(
     val orderId: Long? = 0,
@@ -23,5 +24,6 @@ data class RichOrder(
     val quoteQuantity: BigDecimal,
     val executedQuantity: BigDecimal,
     val accumulativeQuoteQty: BigDecimal,
-    val status: Int = 0
+    val status: Int = 0,
+    val createDate: LocalDateTime?
 ) : RichOrderEvent

accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/inout/RichOrderUpdate.kt

@@ -1,13 +1,15 @@
 package co.nilin.opex.accountant.core.inout
 
 import java.math.BigDecimal
+import java.time.LocalDateTime
 
 data class RichOrderUpdate(
     val ouid: String,
     val price: BigDecimal,
     val quantity: BigDecimal,
     val remainedQuantity: BigDecimal,
-    val status: OrderStatus = OrderStatus.NEW
+    val status: OrderStatus = OrderStatus.NEW,
+    val updateDate: LocalDateTime?= LocalDateTime.now()
 ) : RichOrderEvent {
 
     fun executedQuantity(): BigDecimal = quantity.minus(remainedQuantity)

accountant/accountant-core/src/main/kotlin/co/nilin/opex/accountant/core/service/OrderManagerImpl.kt

@@ -212,12 +212,13 @@ open class OrderManagerImpl(
         richOrderPublisher.publish(
             RichOrderUpdate(
                 order.ouid,
-                order.price.toBigDecimal(),
-                order.quantity.toBigDecimal(),
-                cancelOrderEvent.remainedQuantity.toBigDecimal(),
+                order.price.toBigDecimal().multiply(order.rightSideFraction),
+                order.origQuantity,
+                cancelOrderEvent.remainedQuantity.toBigDecimal().multiply(order.leftSideFraction),
                 OrderStatus.CANCELED
             )
         )
+
         return financialActionPersister.persist(listOf(financialAction))
         /*publishFinancialAction(financialAction)
         return fa*/
@@ -253,7 +254,8 @@ open class OrderManagerImpl(
                     OrderStatus.NEW.code
                 } else {
                     OrderStatus.PARTIALLY_FILLED.code
-                }
+                },
+                LocalDateTime.now()
             )
         )
     }

accountant/accountant-ports/accountant-eventlistener-kafka/src/main/kotlin/co/nilin/opex/accountant/ports/kafka/listener/config/AccountantKafkaConfig.kt

@@ -1,4 +1,4 @@
-package co.nilin.opex.accountant.ports.kafka.listener.config
+package co.nilin.opex.accountant.ports.kafka.listener.config
 
 import co.nilin.opex.accountant.core.inout.KycLevelUpdatedEvent
 import co.nilin.opex.accountant.ports.kafka.listener.consumer.*
@@ -9,7 +9,6 @@ import co.nilin.opex.matching.engine.core.eventh.events.CoreEvent
 import org.apache.kafka.clients.consumer.ConsumerConfig
 import org.apache.kafka.common.TopicPartition
 import org.apache.kafka.common.serialization.StringDeserializer
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
@@ -61,85 +60,83 @@ class AccountantKafkaConfig {
     fun withdrawRequestConsumerFactory(@Qualifier("consumerConfig") consumerConfigs: Map<String, Any?>): ConsumerFactory<String, WithdrawRequestEvent> {
         return DefaultKafkaConsumerFactory(consumerConfigs)
     }
+
     @Bean("depositConsumerFactory")
     fun depositConsumerFactory(@Qualifier("consumerConfig") consumerConfigs: Map<String, Any?>): ConsumerFactory<String, DepositEvent> {
         return DefaultKafkaConsumerFactory(consumerConfigs)
     }
 
-    @Autowired
+    @Bean("tradeKafkaListenerContainer")
     @ConditionalOnBean(TradeKafkaListener::class)
-    fun configureTradeListener(
+    fun tradeListenerContainer(
         tradeListener: TradeKafkaListener,
         @Qualifier("accountantEventKafkaTemplate") template: KafkaTemplate<String?, CoreEvent>,
         @Qualifier("accountantConsumerFactory") consumerFactory: ConsumerFactory<String, CoreEvent>
-    ) {
+    ): ConcurrentMessageListenerContainer<String, CoreEvent> {
         val containerProps = ContainerProperties(Pattern.compile("trades_.*"))
         containerProps.messageListener = tradeListener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
         container.setBeanName("TradeKafkaListenerContainer")
         container.commonErrorHandler = createConsumerErrorHandler(template, "trades.DLT")
-        container.start()
+        return container
     }
 
-    @Autowired
+    @Bean("eventKafkaListenerContainer")
     @ConditionalOnBean(EventKafkaListener::class)
-    fun configureEventListener(
+    fun eventListenerContainer(
         eventListener: EventKafkaListener,
         @Qualifier("accountantEventKafkaTemplate") template: KafkaTemplate<String?, CoreEvent>,
         @Qualifier("accountantConsumerFactory") consumerFactory: ConsumerFactory<String, CoreEvent>
-    ) {
+    ): ConcurrentMessageListenerContainer<String, CoreEvent> {
         val containerProps = ContainerProperties(Pattern.compile("events_.*"))
         containerProps.messageListener = eventListener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
         container.setBeanName("EventKafkaListenerContainer")
         container.commonErrorHandler = createConsumerErrorHandler(template, "events.DLT")
-        container.start()
+        return container
     }
 
-    @Autowired
+    @Bean("orderKafkaListenerContainer")
     @ConditionalOnBean(OrderKafkaListener::class)
-    fun configureOrderListener(
+    fun orderListenerContainer(
         orderListener: OrderKafkaListener,
         @Qualifier("accountantEventKafkaTemplate") template: KafkaTemplate<String?, CoreEvent>,
         @Qualifier("accountantConsumerFactory") consumerFactory: ConsumerFactory<String, CoreEvent>
-    ) {
+    ): ConcurrentMessageListenerContainer<String, CoreEvent> {
         val containerProps = ContainerProperties(Pattern.compile("orders_.*"))
         containerProps.messageListener = orderListener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
         container.setBeanName("OrderKafkaListenerContainer")
         container.commonErrorHandler = createConsumerErrorHandler(template, "orders.DLT")
-        container.start()
+        return container
     }
 
-    @Autowired
+    @Bean("tempEventKafkaListenerContainer")
     @ConditionalOnBean(TempEventKafkaListener::class)
-    fun configureTempEventListener(
+    fun tempEventListenerContainer(
         eventListener: TempEventKafkaListener,
         @Qualifier("accountantEventKafkaTemplate") template: KafkaTemplate<String?, CoreEvent>,
         @Qualifier("accountantConsumerFactory") consumerFactory: ConsumerFactory<String, CoreEvent>
-    ) {
+    ): ConcurrentMessageListenerContainer<String, CoreEvent> {
         val containerProps = ContainerProperties(Pattern.compile("tempevents"))
         containerProps.messageListener = eventListener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
         container.setBeanName("TempEventKafkaListenerContainer")
         container.commonErrorHandler = createConsumerErrorHandler(template, "tempevents.DLT")
-        container.start()
+        return container
     }
 
-    @Autowired
+    @Bean("faResponseKafkaListenerContainer")
     @ConditionalOnBean(FAResponseKafkaListener::class)
-    fun configureEventListener(
+    fun faResponseListenerContainer(
         eventListener: FAResponseKafkaListener,
-        //@Qualifier("accountantEventKafkaTemplate") template: KafkaTemplate<String?, CoreEvent>,
         @Qualifier("faResponseConsumerFactory") consumerFactory: ConsumerFactory<String, FinancialActionResponseEvent>
-    ) {
+    ): ConcurrentMessageListenerContainer<String, FinancialActionResponseEvent> {
         val containerProps = ContainerProperties(Pattern.compile("fiAction_response"))
         containerProps.messageListener = eventListener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
         container.setBeanName("FAResponseKafkaListenerContainer")
-        //TODO add error handler
-        //container.commonErrorHandler = createConsumerErrorHandler(template, "events.DLT")
-        container.start()
+        return container
     }
 
     @Bean("kycLevelUpdatedProducerFactory")
@@ -152,69 +149,69 @@ class AccountantKafkaConfig {
         return KafkaTemplate(producerFactory)
     }
 
-    @Bean("withdrawRequestProducerFactory")
-    fun withdrawRequestProducerFactory(@Qualifier("consumerConfig") producerConfigs: Map<String, Any>): ProducerFactory<String, WithdrawRequestEvent> {
-        return DefaultKafkaProducerFactory(producerConfigs)
-    }
-
-    @Bean("withdrawRequestKafkaTemplate")
-    fun withdrawRequestKafkaTemplate(@Qualifier("withdrawRequestProducerFactory") producerFactory: ProducerFactory<String, WithdrawRequestEvent>): KafkaTemplate<String, WithdrawRequestEvent> {
-        return KafkaTemplate(producerFactory)
-    }
-
-    @Bean("depositProducerFactory")
-    fun depositProducerFactory(@Qualifier("consumerConfig") producerConfigs: Map<String, Any>): ProducerFactory<String, DepositEvent> {
-        return DefaultKafkaProducerFactory(producerConfigs)
-    }
-
-    @Bean("depositKafkaTemplate")
-    fun depositKafkaTemplate(@Qualifier("depositProducerFactory") producerFactory: ProducerFactory<String, DepositEvent>): KafkaTemplate<String, DepositEvent> {
-        return KafkaTemplate(producerFactory)
-    }
-
-    @Autowired
+    @Bean("kycLevelUpdatedKafkaListenerContainer")
     @ConditionalOnBean(KycLevelUpdatedKafkaListener::class)
-    fun configureKycLevelUpdatedListener(
+    fun kycListenerContainer(
         listener: KycLevelUpdatedKafkaListener,
         @Qualifier("kycLevelUpdatedKafkaTemplate") template: KafkaTemplate<String, KycLevelUpdatedEvent>,
         @Qualifier("KycConsumerFactory") consumerFactory: ConsumerFactory<String, KycLevelUpdatedEvent>
-    ) {
+    ): ConcurrentMessageListenerContainer<String, KycLevelUpdatedEvent> {
         val containerProps = ContainerProperties(Pattern.compile("kyc_level_updated"))
         containerProps.messageListener = listener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
         container.setBeanName("KycLevelUpdatedKafkaListenerContainer")
         container.commonErrorHandler = createConsumerErrorHandler(template, "kyc_level_updated.DLT")
-        container.start()
+        return container
     }
 
-    @Autowired
+    @Bean("withdrawRequestProducerFactory")
+    fun withdrawRequestProducerFactory(@Qualifier("consumerConfig") producerConfigs: Map<String, Any>): ProducerFactory<String, WithdrawRequestEvent> {
+        return DefaultKafkaProducerFactory(producerConfigs)
+    }
+
+    @Bean("withdrawRequestKafkaTemplate")
+    fun withdrawRequestKafkaTemplate(@Qualifier("withdrawRequestProducerFactory") producerFactory: ProducerFactory<String, WithdrawRequestEvent>): KafkaTemplate<String, WithdrawRequestEvent> {
+        return KafkaTemplate(producerFactory)
+    }
+
+    @Bean("withdrawRequestKafkaListenerContainer")
     @ConditionalOnBean(WithdrawRequestKafkaListener::class)
-    fun configureWithdrawRequestEventListener(
+    fun withdrawRequestListenerContainer(
         listener: WithdrawRequestKafkaListener,
         @Qualifier("withdrawRequestKafkaTemplate") template: KafkaTemplate<String, WithdrawRequestEvent>,
         @Qualifier("withdrawRequestConsumerFactory") consumerFactory: ConsumerFactory<String, WithdrawRequestEvent>
-    ) {
+    ): ConcurrentMessageListenerContainer<String, WithdrawRequestEvent> {
         val containerProps = ContainerProperties(Pattern.compile("withdraw_request"))
         containerProps.messageListener = listener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
         container.setBeanName("WithdrawRequestKafkaListenerContainer")
         container.commonErrorHandler = createConsumerErrorHandler(template, "withdraw_request.DLT")
-        container.start()
+        return container
     }
 
-    @Autowired
+    @Bean("depositProducerFactory")
+    fun depositProducerFactory(@Qualifier("consumerConfig") producerConfigs: Map<String, Any>): ProducerFactory<String, DepositEvent> {
+        return DefaultKafkaProducerFactory(producerConfigs)
+    }
+
+    @Bean("depositKafkaTemplate")
+    fun depositKafkaTemplate(@Qualifier("depositProducerFactory") producerFactory: ProducerFactory<String, DepositEvent>): KafkaTemplate<String, DepositEvent> {
+        return KafkaTemplate(producerFactory)
+    }
+
+    @Bean("depositKafkaListenerContainer")
     @ConditionalOnBean(DepositKafkaListener::class)
-    fun configureDepositRequestEventListener(
+    fun depositListenerContainer(
         listener: DepositKafkaListener,
         @Qualifier("depositKafkaTemplate") template: KafkaTemplate<String, DepositEvent>,
         @Qualifier("depositConsumerFactory") consumerFactory: ConsumerFactory<String, DepositEvent>
-    ) {
+    ): ConcurrentMessageListenerContainer<String, DepositEvent> {
         val containerProps = ContainerProperties(Pattern.compile("deposit"))
         containerProps.messageListener = listener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
         container.setBeanName("DepositKafkaListenerContainer")
         container.commonErrorHandler = createConsumerErrorHandler(template, "deposit.DLT")
-        container.start()
+        return container
     }
 
     private fun createConsumerErrorHandler(kafkaTemplate: KafkaTemplate<*, *>, dltTopic: String): CommonErrorHandler {
@@ -224,5 +221,4 @@ class AccountantKafkaConfig {
         }
         return DefaultErrorHandler(recoverer, FixedBackOff(5_000, 20))
     }
-
 }

api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/PairInfoResponse.kt

@@ -10,7 +10,4 @@ data class PairInfoResponse(
     val minOrder : BigDecimal,
     val maxOrder : BigDecimal,
     val orderTypes : String,
-    val internalChart: Boolean,
-    val globalChart: Boolean,
-    val categories: List<PairCategory> = emptyList()
 )

api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/PairSetting.kt

@@ -10,7 +10,4 @@ class PairSetting(
     val maxOrder : BigDecimal,
     val orderTypes : String,
     val updateDate: LocalDateTime? = null,
-    val internalChart: Boolean,
-    val globalChart: Boolean,
-    val categories: List<PairCategory> = emptyList()
 )

api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/controller/MarketController.kt

@@ -18,7 +18,11 @@ import io.swagger.v3.oas.annotations.tags.Tag
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.web.bind.annotation.*
+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.RequestParam
+import org.springframework.web.bind.annotation.RestController
 import java.math.BigDecimal
 import java.time.ZoneId
 
@@ -100,45 +104,12 @@ Response body:
                     isAvailable = isAvailable,
                     minOrder = minOrder,
                     maxOrder = maxOrder,
-                    orderTypes = orderTypes,
-                    internalChart = internalChart,
-                    globalChart = globalChart,
-                    categories = categories
+                    orderTypes = orderTypes
                 )
             }
         }
     }
 
-    @GetMapping("/pair/categories")
-    @Operation(
-        summary = "Get trading pair categories",
-        description = """
-Security:
-- Public endpoint. No Bearer token is required.
-
-Source of values:
-- Category names returned here can be used by clients to filter pairs.
-
-Response body:
-- Array of pair category names.
-        """,
-        responses = [
-            ApiResponse(
-                responseCode = "200",
-                description = "Trading pair categories returned successfully.",
-                content = [
-                    Content(
-                        mediaType = "application/json",
-                        array = ArraySchema(schema = Schema(type = "string"))
-                    )
-                ]
-            )
-        ]
-    )
-    fun getPairCategories(): List<String> {
-        return PairCategory.entries.map { it.name }
-    }
-
     @GetMapping("/chain")
     @Operation(
         summary = "Get chains",

market/market-core/src/main/kotlin/co/nilin/opex/market/core/event/RichOrderUpdate.kt

@@ -2,13 +2,15 @@ package co.nilin.opex.market.core.event
 
 import co.nilin.opex.market.core.inout.OrderStatus
 import java.math.BigDecimal
+import java.time.LocalDateTime
 
 data class RichOrderUpdate(
     val ouid: String,
     val price: BigDecimal,
     val quantity: BigDecimal,
     val remainedQuantity: BigDecimal,
-    val status: OrderStatus = OrderStatus.NEW
+    val status: OrderStatus = OrderStatus.NEW,
+    val updateDate: LocalDateTime? = LocalDateTime.now()
 ) : RichOrderEvent {
 
     fun executedQuantity(): BigDecimal = quantity.minus(remainedQuantity)