Close #256, Decouple initiate scripts on dev and demo environments

.github/workflows/dev.yml

@@ -25,12 +25,18 @@ jobs:
       - name: Build
         run: mvn -B -T 1C clean install
       - name: Build Docker images
-        run: TAG=dev docker-compose -f docker-compose.build.yml build
+        env:
+          TAG: dev
+          PREFERENCES_IDENTIFIER: dev
+        run: docker-compose -f docker-compose.build.yml build
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Push images to GitHub Container Registry
-        run: TAG=dev docker-compose -f docker-compose.build.yml push
+        env:
+          TAG: dev
+          PREFERENCES_IDENTIFIER: dev
+        run: docker-compose -f docker-compose.build.yml push

.github/workflows/main.yml

@@ -25,12 +25,18 @@ jobs:
       - name: Build
         run: mvn -B -T 1C clean install
       - name: Build Docker images
-        run: TAG=latest docker-compose -f docker-compose.build.yml build
+        env:
+          TAG: latest
+          PREFERENCES_IDENTIFIER: dev
+        run: docker-compose -f docker-compose.build.yml build
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Push images to GitHub Container Registry
-        run: TAG=latest docker-compose -f docker-compose.build.yml push
+        env:
+          TAG: dev
+          PREFERENCES_IDENTIFIER: demo
+        run: docker-compose -f docker-compose.build.yml push

.github/workflows/pr.yml

@@ -24,4 +24,7 @@ jobs:
       - name: Build
         run: mvn -B -T 1C clean install
       - name: Build Docker images
-        run: TAG=latest docker-compose -f docker-compose.build.yml build
+        env:
+          TAG: dev
+          PREFERENCES_IDENTIFIER: dev
+        run: docker-compose -f docker-compose.build.yml build

accountant/accountant-app/pom.xml

@@ -63,6 +63,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility.preferences</groupId>
+            <artifactId>preferences</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

accountant/accountant-app/src/main/kotlin/co/nilin/opex/accountant/app/config/InitializeService.kt

@@ -0,0 +1,54 @@
+package co.nilin.opex.accountant.app.config
+
+import co.nilin.opex.accountant.ports.postgres.dao.PairConfigRepository
+import co.nilin.opex.accountant.ports.postgres.dao.PairFeeConfigRepository
+import co.nilin.opex.accountant.ports.postgres.model.PairFeeConfigModel
+import co.nilin.opex.utility.preferences.Preferences
+import kotlinx.coroutines.reactor.awaitSingleOrNull
+import kotlinx.coroutines.runBlocking
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.context.annotation.DependsOn
+import org.springframework.stereotype.Component
+
+@Component
+@DependsOn("postgresConfig")
+class InitializeService(
+    private val pairConfigRepository: PairConfigRepository,
+    private val pairFeeConfigRepository: PairFeeConfigRepository
+) {
+    @Autowired
+    private lateinit var preferences: Preferences
+
+    @Autowired
+    fun init() = runBlocking {
+        preferences.markets.map {
+            val pair = it.pair ?: "${it.leftSide}_${it.rightSide}"
+            val leftSideCurrency = preferences.currencies.first { c -> it.leftSide == c.symbol }
+            val rightSideCurrency = preferences.currencies.first { c -> it.rightSide == c.symbol }
+            val leftSideFraction = (it.leftSideFraction ?: leftSideCurrency.precision).toDouble()
+            val rightSideFraction = (it.rightSideFraction ?: rightSideCurrency.precision).toDouble()
+            pairConfigRepository.insert(
+                pair,
+                it.leftSide,
+                it.rightSide,
+                leftSideFraction,
+                rightSideFraction,
+                0.0
+            ).awaitSingleOrNull()
+            it.feeConfigs.forEach { f ->
+                runCatching {
+                    pairFeeConfigRepository.save(
+                        PairFeeConfigModel(
+                            null,
+                            pair,
+                            f.direction,
+                            f.userLevel,
+                            f.makerFee.toDouble(),
+                            f.takerFee.toDouble()
+                        )
+                    ).awaitSingleOrNull()
+                }
+            }
+        }
+    }
+}

accountant/accountant-app/src/main/resources/application.yml

@@ -45,7 +45,7 @@ spring:
   config:
     import: vault://secret/${spring.application.name}
 app:
-  coin: nln
+  coin: IRT
   address: 1
   wallet:
     url: lb://opex-wallet/

accountant/accountant-ports/accountant-persister-postgres/src/main/kotlin/co/nilin/opex/accountant/ports/postgres/config/PostgresConfig.kt

@@ -11,17 +11,13 @@ import org.springframework.r2dbc.core.DatabaseClient
 @EnableR2dbcRepositories(basePackages = ["co.nilin.opex"])
 class PostgresConfig(
     db: DatabaseClient,
-    @Value("classpath:schema.sql") private val schemaResource: Resource,
-    @Value("classpath:data.sql") private val dataResource: Resource?
+    @Value("classpath:schema.sql") private val schemaResource: Resource
 ) {
     init {
         val schemaReader = schemaResource.inputStream.reader()
         val schema = schemaReader.readText().trim()
         schemaReader.close()
-        val dataReader = dataResource?.inputStream?.reader()
-        val data = dataReader?.readText()?.trim() ?: ""
-        dataReader?.close()
-        val initDb = db.sql { schema.plus(data) }
+        val initDb = db.sql { schema }
         initDb // initialize the database
             .then()
             .subscribe() // execute

accountant/accountant-ports/accountant-persister-postgres/src/main/kotlin/co/nilin/opex/accountant/ports/postgres/dao/PairConfigRepository.kt

@@ -1,8 +1,20 @@
 package co.nilin.opex.accountant.ports.postgres.dao
 
 import co.nilin.opex.accountant.ports.postgres.model.PairConfigModel
+import org.springframework.data.r2dbc.repository.Query
 import org.springframework.data.repository.reactive.ReactiveCrudRepository
 import org.springframework.stereotype.Repository
+import reactor.core.publisher.Mono
 
 @Repository
-interface PairConfigRepository : ReactiveCrudRepository<PairConfigModel, String>
+interface PairConfigRepository : ReactiveCrudRepository<PairConfigModel, String> {
+    @Query("insert into pair_config values (:pair, :leftSide, :rightSide, :leftSideFraction, :rightSideFraction, :rate) on conflict do nothing")
+    fun insert(
+        pair: String,
+        leftSide: String,
+        rightSide: String,
+        leftSideFraction: Double,
+        rightSideFraction: Double,
+        rate: Double
+    ): Mono<Void>
+}

accountant/pom.xml

@@ -73,6 +73,11 @@
                 <artifactId>logging-handler</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>co.nilin.opex.utility.preferences</groupId>
+                <artifactId>preferences</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>

api/api-app/pom.xml

@@ -68,6 +68,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-vault-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility.preferences</groupId>
+            <artifactId>preferences</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

api/api-app/src/main/kotlin/co/nilin/opex/api/app/config/InitializeService.kt

@@ -0,0 +1,26 @@
+package co.nilin.opex.api.app.config
+
+import co.nilin.opex.api.ports.postgres.dao.SymbolMapRepository
+import co.nilin.opex.api.ports.postgres.model.SymbolMapModel
+import co.nilin.opex.utility.preferences.Preferences
+import kotlinx.coroutines.reactor.awaitSingleOrNull
+import kotlinx.coroutines.runBlocking
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.context.annotation.DependsOn
+import org.springframework.stereotype.Component
+
+@Component
+@DependsOn("postgresConfig")
+class InitializeService(private val symbolMapRepository: SymbolMapRepository) {
+    @Autowired
+    private lateinit var preferences: Preferences
+
+    @Autowired
+    fun init() = runBlocking {
+        preferences.markets.map {
+            val pair = it.pair ?: "${it.leftSide}_${it.rightSide}"
+            val items = it.aliases.map { a -> SymbolMapModel(null, pair, a.key, a.alias) }
+            runCatching { symbolMapRepository.saveAll(items).collectList().awaitSingleOrNull() }
+        }
+    }
+}

api/api-core/src/main/kotlin/co/nilin/opex/api/core/spi/SymbolMapper.kt

@@ -4,7 +4,7 @@ interface SymbolMapper {
 
     suspend fun map(symbol: String?): String?
 
-    suspend fun unmap(value: String?): String?
+    suspend fun unmap(alias: String?): String?
 
-    suspend fun getKeyValues(): Map<String, String>
-}
+    suspend fun getAll(): Map<String, String>
+}

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

@@ -3,5 +3,4 @@ package co.nilin.opex.api.ports.binance.controller
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
-class FiltersController {
-}
+class FiltersController

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

@@ -141,15 +141,15 @@ class MarketController(
         @RequestParam("symbols", required = false)
         symbols: String?
     ): ExchangeInfoResponse {
-        val symbolsMap = symbolMapper.getKeyValues()
+        val symbolsMap = symbolMapper.getAll()
         val pairConfigs = accountantProxy.getPairConfigs()
             .map {
                 ExchangeInfoSymbol(
                     symbolsMap[it.pair] ?: it.pair,
                     "TRADING",
-                    it.leftSideWalletSymbol.toUpperCase(),
+                    it.leftSideWalletSymbol.uppercase(),
                     BigDecimal.valueOf(it.leftSideFraction).scale(),
-                    it.rightSideWalletSymbol.toUpperCase(),
+                    it.rightSideWalletSymbol.uppercase(),
                     BigDecimal.valueOf(it.rightSideFraction).scale()
                 )
             }
@@ -200,4 +200,4 @@ class MarketController(
         return list
     }
 
-}
+}

api/api-ports/api-persister-postgres/src/main/kotlin/co/nilin/opex/api/ports/postgres/config/PostgresConfig.kt

@@ -10,17 +10,13 @@ import org.springframework.r2dbc.core.DatabaseClient
 @EnableR2dbcRepositories(basePackages = ["co.nilin.opex"])
 class PostgresConfig(
     db: DatabaseClient,
-    @Value("classpath:schema.sql") private val schemaResource: Resource,
-    @Value("classpath:data.sql") private val dataResource: Resource?
+    @Value("classpath:schema.sql") private val schemaResource: Resource
 ) {
     init {
         val schemaReader = schemaResource.inputStream.reader()
         val schema = schemaReader.readText().trim()
         schemaReader.close()
-        val dataReader = dataResource?.inputStream?.reader()
-        val data = dataReader?.readText()?.trim() ?: ""
-        dataReader?.close()
-        val initDb = db.sql { schema.plus(data) }
+        val initDb = db.sql { schema }
         initDb // initialize the database
             .then()
             .subscribe() // execute

api/api-ports/api-persister-postgres/src/main/kotlin/co/nilin/opex/api/ports/postgres/dao/SymbolMapRepository.kt

@@ -9,10 +9,9 @@ import reactor.core.publisher.Mono
 
 @Repository
 interface SymbolMapRepository : ReactiveCrudRepository<SymbolMapModel, String> {
+    @Query("select * from symbol_maps where symbol = :symbol and aliasKey = :aliasKey")
+    fun findByAliasKeyAndSymbol(aliasKey: String, @Param("symbol") symbol: String): Mono<SymbolMapModel>
 
-    @Query("select * from symbol_maps where symbol = :symbol")
-    fun findBySymbol(@Param("symbol") symbol: String): Mono<SymbolMapModel>
-
-    @Query("select * from symbol_maps where value = :value")
-    fun findByValue(@Param("value") value: String): Mono<SymbolMapModel>
-}
+    @Query("select * from symbol_maps where aliasKey = :aliasKey and alias = :alias")
+    fun findByAliasKeyAndAlias(aliasKey: String, @Param("alias") alias: String): Mono<SymbolMapModel>
+}

api/api-ports/api-persister-postgres/src/main/kotlin/co/nilin/opex/api/ports/postgres/impl/SymbolMapperImpl.kt

@@ -11,20 +11,21 @@ class SymbolMapperImpl(val symbolMapRepository: SymbolMapRepository) : SymbolMap
 
     override suspend fun map(symbol: String?): String? {
         if (symbol == null) return null
-        return symbolMapRepository.findBySymbol(symbol).awaitFirstOrNull()?.value
+        return symbolMapRepository.findByAliasKeyAndSymbol("binance", symbol).awaitFirstOrNull()?.alias
     }
 
-    override suspend fun unmap(value: String?): String? {
-        if (value == null) return null
-        return symbolMapRepository.findByValue(value).awaitFirstOrNull()?.symbol
+    override suspend fun unmap(alias: String?): String? {
+        if (alias == null) return null
+        return symbolMapRepository.findByAliasKeyAndAlias("binance", alias).awaitFirstOrNull()?.symbol
     }
 
-    override suspend fun getKeyValues(): Map<String, String> {
+    override suspend fun getAll(): Map<String, String> {
         val map = HashMap<String, String>()
         symbolMapRepository.findAll()
             .collectList()
             .awaitFirstOrElse { emptyList() }
-            .forEach { map[it.symbol] = it.value }
+            .filter { it.aliasKey == "binance" }
+            .associate { it.symbol to it.alias }
         return map
     }
-}
+}