OPEN State integration #18

Author: trenatov

src/main/kotlin/io/openfuture/api/client/BodyConverter.kt

@@ -1,103 +1,18 @@
 package io.openfuture.api.component.state
 
-import io.openfuture.api.client.BodyConverter
-import io.openfuture.api.client.HttpClientWrapper
-import io.openfuture.api.domain.PageResponse
-import io.openfuture.api.domain.state.*
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.data.domain.PageRequest
+import io.openfuture.api.domain.state.CreateStateWalletRequest
+import io.openfuture.api.domain.state.StateWalletDto
+import io.openfuture.api.entity.state.Blockchain
 import org.springframework.stereotype.Component
+import org.springframework.web.client.RestTemplate
 
 @Component
-class DefaultStateApi(
-        private val clientHttp: HttpClientWrapper,
-        @Value("\${open.state.url}") private val stateUrl: String
-) : StateApi {
+class DefaultStateApi(private val stateRestTemplate: RestTemplate) : StateApi {
 
-    override fun saveOpenScaffold(webHook: String, address: String) :OpenScaffoldDto {
-        val url = "$stateUrl/open-scaffolds"
-        val request = SaveScaffoldRequest(address, webHook)
-        val response = clientHttp.post(url, prepareHeader(), request)
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    override fun createAccount(webHook: String?, address: String, blockchainId: Int): AccountDto {
-        val url = "$stateUrl/accounts"
-        val request = CreateAccountRequest(webHook, setOf(CreateIntegrationRequest(address, blockchainId)))
-        val response = clientHttp.post(url, prepareHeader(), request)
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    override fun getAccount(id: Long): AccountDto {
-        val url = "$stateUrl/accounts/$id"
-        val response = clientHttp.get(url, prepareHeader())
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    override fun updateWebhook(accountId: Long, webHook: String): AccountDto {
-        val url = "$stateUrl/accounts"
-        val request = UpdateAccountWebHookRequest(accountId, webHook)
-        val response = clientHttp.put(url, prepareHeader(), request)
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    override fun deleteAccount(id: Long): AccountDto {
-        val url = "$stateUrl/accounts/$id"
-        val response = clientHttp.delete(url, prepareHeader())
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    override fun addWallet(accountId: Long, address: String, blockchainId: Int): AccountDto {
-        val url = "$stateUrl/accounts/$accountId/wallets"
-        val request = AddWalletRequest(setOf(CreateIntegrationRequest(address, blockchainId)))
-        val response = clientHttp.post(url, prepareHeader(), request)
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    override fun deleteWallet(accountId: Long, address: String, blockchainId: Int): AccountDto {
-        val url = "$stateUrl/accounts/$accountId/wallets/delete"
-        val request = DeleteWalletRequest(accountId, address, blockchainId)
-        val response = clientHttp.post(url, prepareHeader(), request)
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    override fun getAllWalletsByAccount(accountId: Long): List<WalletDto> {
-        val url = "$stateUrl/accounts/$accountId/wallets"
-        val response = clientHttp.get(url, prepareHeader())
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    override fun getWalletByAccount(id: Long, accountId: Long): WalletDto {
-        val url = "$stateUrl/accounts/$accountId/wallets/$id"
-        val response = clientHttp.get(url, prepareHeader())
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    override fun getTransaction(id: Long, walletId: Long): StateTransactionDto {
-        val url = "$stateUrl/wallets/$walletId/transactions/$id"
-        val response = clientHttp.get(url, prepareHeader())
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    override fun getAllTransactionsByWalletId(walletId: Long, pageRequest: PageRequest): PageResponse<StateTransactionDto> {
-        val url = "$stateUrl/wallets/$walletId/transactions"
-        val response = clientHttp.getPageable(url, prepareHeader(), pageRequest)
-
-        return BodyConverter.deserialize(response.entity)
-    }
-
-    private fun prepareHeader(): Map<String, String> {
-        return mapOf("Content-Type" to "application/json")
+    override fun createWallet(address: String, webHook: String, blockchain: Blockchain): StateWalletDto {
+        val request = CreateStateWalletRequest(address, webHook, blockchain)
+        val result = stateRestTemplate.postForEntity("/wallets", request, StateWalletDto::class.java)
+        return result.body!!
     }
 
 }

src/main/kotlin/io/openfuture/api/client/DefaultHttpClientWrapper.kt

@@ -1,45 +1,10 @@
 package io.openfuture.api.component.state
 
-import io.openfuture.api.domain.PageResponse
-import io.openfuture.api.domain.state.AccountDto
-import io.openfuture.api.domain.state.OpenScaffoldDto
-import io.openfuture.api.domain.state.StateTransactionDto
-import io.openfuture.api.domain.state.WalletDto
-import org.springframework.data.domain.PageRequest
+import io.openfuture.api.domain.state.StateWalletDto
+import io.openfuture.api.entity.state.Blockchain
 
 interface StateApi {
 
-    // accounts
-
-    fun createAccount(webHook: String?, address: String, blockchainId: Int): AccountDto
-
-    fun getAccount(id: Long): AccountDto
-
-    fun updateWebhook(accountId: Long, webHook: String): AccountDto
-
-    fun deleteAccount(id: Long): AccountDto
-
-    fun addWallet(accountId: Long, address: String, blockchainId: Int): AccountDto
-
-    fun deleteWallet(accountId: Long, address: String, blockchainId: Int): AccountDto
-
-
-    // wallets
-
-    fun getAllWalletsByAccount(accountId: Long): List<WalletDto>
-
-    fun getWalletByAccount(id: Long, accountId: Long): WalletDto
-
-
-    // transactions
-
-    fun getTransaction(id: Long, walletId: Long): StateTransactionDto
-
-    fun getAllTransactionsByWalletId(walletId: Long, pageRequest: PageRequest): PageResponse<StateTransactionDto>
-
-
-    // open scaffolds
-
-    fun saveOpenScaffold(webHook: String, address: String): OpenScaffoldDto
+    fun createWallet(address: String, webHook: String, blockchain: Blockchain): StateWalletDto
 
 }

src/main/kotlin/io/openfuture/api/client/HttpClientWrapper.kt

@@ -0,0 +1,19 @@
+package io.openfuture.api.config
+
+import io.openfuture.api.config.propety.StateProperties
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.web.client.RestTemplate
+import org.springframework.web.util.DefaultUriBuilderFactory
+
+@Configuration
+class StateConfig {
+
+    @Bean
+    fun stateRestTemplate(stateProperties: StateProperties): RestTemplate {
+        val restTemplate = RestTemplate()
+        restTemplate.uriTemplateHandler = DefaultUriBuilderFactory(stateProperties.baseUrl!!)
+        return restTemplate
+    }
+
+}

src/main/kotlin/io/openfuture/api/client/HttpResponse.kt

@@ -0,0 +1,12 @@
+package io.openfuture.api.config.propety
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.stereotype.Component
+import org.springframework.validation.annotation.Validated
+import javax.validation.constraints.NotBlank
+import javax.validation.constraints.NotNull
+
+@ConfigurationProperties(prefix = "state")
+@Validated
+@Component
+data class StateProperties(@field:NotNull @field:NotBlank var baseUrl: String?)