Merge pull request #34 from OpenFuturePlatform/track-wallet-#33

Track wallet after Scaffold generation #33

Author: layko-andrey

src/main/kotlin/io/openfuture/api/domain/scaffold/SaveEthereumScaffoldRequest.kt

@@ -1,21 +1,21 @@
 package io.openfuture.api.domain.scaffold
 
-import io.openfuture.api.annotation.Address
+import io.openfuture.api.annotation.Url
 import io.openfuture.api.entity.scaffold.Currency
 import io.openfuture.api.entity.scaffold.ScaffoldVersion
 import javax.validation.Valid
 import javax.validation.constraints.*
 
 data class SaveEthereumScaffoldRequest(
-        @Address @field:NotBlank var address: String? = null,
+        @field:NotBlank var address: String? = null,
         @field:NotBlank var abi: String? = null,
         @field:NotBlank var openKey: String? = null,
-        @field:NotBlank @field:Address var developerAddress: String? = null,
+        @field:NotBlank var developerAddress: String? = null,
         @field:NotBlank var description: String? = null,
         @field:NotBlank @field:Digits(integer = Int.MAX_VALUE, fraction = Int.MAX_VALUE) var fiatAmount: String? = null,
         @field:NotNull var currency: Currency? = null,
         @field:NotBlank @field:Digits(integer = Int.MAX_VALUE, fraction = Int.MAX_VALUE) var conversionAmount: String? = null,
-        var webHook: String? = null,
+        @field:Url var webHook: String? = null,
         @field:NotEmpty @field:Size(max = 9) @field:Valid var properties: List<EthereumScaffoldPropertyDto> = listOf(),
         @field:NotNull var version: ScaffoldVersion = ScaffoldVersion.last()
-)
+)

src/main/kotlin/io/openfuture/api/service/DefaultEthereumScaffoldService.kt

@@ -1,6 +1,7 @@
 package io.openfuture.api.service
 
 import io.openfuture.api.component.scaffold.processor.ScaffoldProcessor
+import io.openfuture.api.component.state.StateApi
 import io.openfuture.api.config.propety.ScaffoldProperties
 import io.openfuture.api.domain.holder.AddEthereumShareHolderRequest
 import io.openfuture.api.domain.holder.UpdateEthereumShareHolderRequest
@@ -9,6 +10,7 @@ import io.openfuture.api.entity.auth.User
 import io.openfuture.api.entity.scaffold.EthereumScaffold
 import io.openfuture.api.entity.scaffold.EthereumScaffoldProperty
 import io.openfuture.api.entity.scaffold.EthereumScaffoldSummary
+import io.openfuture.api.entity.state.Blockchain
 import io.openfuture.api.exception.NotFoundException
 import io.openfuture.api.repository.EthereumScaffoldPropertyRepository
 import io.openfuture.api.repository.EthereumScaffoldRepository
@@ -29,7 +31,8 @@ class DefaultEthereumScaffoldService(
         private val propertyRepository: EthereumScaffoldPropertyRepository,
         private val ethereumScaffoldSummaryRepository: EthereumScaffoldSummaryRepository,
         private val shareHolderRepository: ShareHolderRepository,
-        private val openKeyService: OpenKeyService
+        private val openKeyService: OpenKeyService,
+        private val stateApi: StateApi
 ) : EthereumScaffoldService {
 
     @Transactional(readOnly = true)
@@ -80,6 +83,7 @@ class DefaultEthereumScaffoldService(
         val properties = request.properties.map { propertyRepository.save(EthereumScaffoldProperty.of(scaffold, it)) }
         scaffold.property.addAll(properties)
         getScaffoldSummary(scaffold.address, openKey.user, true)
+        request.webHook?.let { stateApi.createWallet(scaffold.developerAddress, it, Blockchain.Ethereum) }
         return scaffold
     }
 

src/test/kotlin/io/openfuture/api/controller/api/EthereumScaffoldApiControllerTests.kt

@@ -138,7 +138,7 @@ class EthereumScaffoldApiControllerTests : ControllerTests() {
         val openKey = createOpenKey(setOf(Role("ROLE_MASTER")))
         val scaffold = createScaffold(openKey)
         val request = SaveEthereumScaffoldRequest("0x8cf1664B09F216538bc9A32B2c26f85a19fd76B5", "abi", "openKey",
-                "0x8cf1664B09F216538bc9A32B2c26f85a19fd76B5", "description", "2", USD, "0.0023", "webHook",
+                "0x8cf1664B09F216538bc9A32B2c26f85a19fd76B5", "description", "2", USD, "0.0023", "https://www.openfuture.io/api",
                 listOf(createScaffoldPropertyDto()))
         val requestJson = objectMapper.writeValueAsString(request)
 
@@ -154,6 +154,24 @@ class EthereumScaffoldApiControllerTests : ControllerTests() {
                 .andExpect(content().json(expectScaffoldJson(scaffold), true))
     }
 
+    @Test
+    fun saveShouldReturnBadRequestTest() {
+        val openKey = createOpenKey(setOf(Role("ROLE_MASTER")))
+        val request = SaveEthereumScaffoldRequest("0x8cf1664B09F216538bc9A32B2c26f85a19fd76B5", "abi", "openKey",
+                "0x8cf1664B09F216538bc9A32B2c26f85a19fd76B5", "description", "2", USD, "0.0023", "invalid webhhok",
+                listOf(createScaffoldPropertyDto()))
+        val requestJson = objectMapper.writeValueAsString(request)
+
+        given(keyService.find(openKey.value)).willReturn(openKey)
+
+        mvc.perform(post("/api/ethereum-scaffolds")
+                .header(AUTHORIZATION, openKey.value)
+                .contentType(APPLICATION_JSON_UTF8)
+                .content(requestJson))
+
+                .andExpect(status().isBadRequest)
+    }
+
     @Test
     fun updateTest() {
         val openKey = createOpenKey(setOf(Role("ROLE_MASTER")))

src/test/kotlin/io/openfuture/api/service/DefaultEthereumScaffoldServiceTests.kt

@@ -1,6 +1,7 @@
 package io.openfuture.api.service
 
 import io.openfuture.api.component.scaffold.processor.ScaffoldProcessor
+import io.openfuture.api.component.state.StateApi
 import io.openfuture.api.config.UnitTest
 import io.openfuture.api.config.any
 import io.openfuture.api.config.propety.ScaffoldProperties
@@ -40,6 +41,7 @@ internal class DefaultEthereumScaffoldServiceTests : UnitTest() {
     @Mock private lateinit var propertyRepository: EthereumScaffoldPropertyRepository
     @Mock private lateinit var ethereumScaffoldSummaryRepository: EthereumScaffoldSummaryRepository
     @Mock private lateinit var shareHolderRepository: ShareHolderRepository
+    @Mock private lateinit var stateApi: StateApi
 
     @Mock
     private lateinit var pageable: Pageable
@@ -50,7 +52,7 @@ internal class DefaultEthereumScaffoldServiceTests : UnitTest() {
     @Before
     fun setUp() {
         service = DefaultEthereumScaffoldService(processor, properties, repositoryEthereum, propertyRepository, ethereumScaffoldSummaryRepository,
-                shareHolderRepository, openKeyService)
+                shareHolderRepository, openKeyService, stateApi)
     }
 
     @Test