Merge branch 'sprint' into 'master'

Open Chain Integration

See merge request open-platform/state!36

Author: Aibek Abykeev

src/main/kotlin/io/openfuture/state/controller/ExceptionHandler.kt

@@ -2,7 +2,7 @@ package io.openfuture.state.controller
 
 import io.openfuture.state.controller.domain.dto.ErrorDto
 import io.openfuture.state.controller.domain.dto.FieldErrorDto
-import io.openfuture.state.exception.ApiException
+import io.openfuture.state.exception.DuplicateEntityException
 import io.openfuture.state.exception.NotFoundException
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.MethodArgumentNotValidException
@@ -19,17 +19,18 @@ class ExceptionHandler {
         return ErrorDto(HttpStatus.NOT_FOUND.value(), ex.message)
     }
 
-    @ResponseStatus(HttpStatus.BAD_REQUEST)
-    @ExceptionHandler(ApiException::class)
-    fun handleApiException(ex: ApiException): ErrorDto {
-        return ErrorDto(HttpStatus.BAD_REQUEST.value(), ex.message)
-    }
-
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(MethodArgumentNotValidException::class)
     fun handleException(ex: MethodArgumentNotValidException): ErrorDto {
         val fieldErrors = ex.bindingResult.fieldErrors.map { FieldErrorDto(it.field, it.defaultMessage) }
         return ErrorDto(HttpStatus.BAD_REQUEST.value(), "Invalid parameters", fieldErrors)
     }
 
+
+    @ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
+    @ExceptionHandler(DuplicateEntityException::class)
+    fun handleDuplicateException(ex: DuplicateEntityException): ErrorDto {
+        return ErrorDto(HttpStatus.UNPROCESSABLE_ENTITY.value(), ex.message)
+    }
+
 }

src/main/kotlin/io/openfuture/state/controller/OpenScaffoldController.kt

@@ -0,0 +1,23 @@
+package io.openfuture.state.controller
+
+import io.openfuture.state.controller.domain.dto.OpenScaffoldDto
+import io.openfuture.state.controller.domain.request.SaveOpenScaffoldRequest
+import io.openfuture.state.service.OpenScaffoldService
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+import javax.validation.Valid
+
+@RestController
+@RequestMapping("/api/open-scaffolds")
+class OpenScaffoldController(
+        private val openScaffoldService: OpenScaffoldService
+) {
+
+    @PostMapping
+    fun save(@RequestBody @Valid request: SaveOpenScaffoldRequest): OpenScaffoldDto {
+        return OpenScaffoldDto(openScaffoldService.save(request))
+    }
+
+}

src/main/kotlin/io/openfuture/state/controller/domain/dto/OpenScaffoldDto.kt

@@ -0,0 +1,17 @@
+package io.openfuture.state.controller.domain.dto
+
+import io.openfuture.state.entity.OpenScaffold
+
+data class OpenScaffoldDto(
+        val id: Long,
+        val recipientAddress: String,
+        val webHook: String
+) {
+
+    constructor(openScaffold: OpenScaffold) : this(
+            openScaffold.id,
+            openScaffold.recipientAddress,
+            openScaffold.webHook
+    )
+
+}

src/main/kotlin/io/openfuture/state/controller/domain/request/SaveOpenScaffoldRequest.kt

@@ -0,0 +1,8 @@
+package io.openfuture.state.controller.domain.request
+
+import javax.validation.constraints.NotBlank
+
+data class SaveOpenScaffoldRequest(
+        @field:NotBlank val address: String,
+        @field:NotBlank val webHook: String
+)

src/main/kotlin/io/openfuture/state/entity/OpenScaffold.kt

@@ -0,0 +1,17 @@
+package io.openfuture.state.entity
+
+import io.openfuture.state.entity.base.BaseModel
+import javax.persistence.Column
+import javax.persistence.Entity
+import javax.persistence.Table
+
+@Entity
+@Table(name = "open_scaffolds")
+class OpenScaffold(
+
+        @Column(name = "recipient_address", nullable = false, unique = true)
+        var recipientAddress: String,
+
+        @Column(name = "web_hook", nullable = false)
+        var webHook: String
+) : BaseModel()

src/main/kotlin/io/openfuture/state/exception/ApiException.kt

@@ -0,0 +1,3 @@
+package io.openfuture.state.exception
+
+class DuplicateEntityException(message: String) : Exception(message)

src/main/kotlin/io/openfuture/state/exception/DuplicateEntityException.kt

@@ -4,7 +4,7 @@ class TransferTransactionDto(
         val timestamp: Long,
         val fee: Long,
         val amount: Long,
-        val recipientAddress: String?,
+        val recipientAddress: String,
         val senderPublicKey: String,
         val senderAddress: String,
         val senderSignature: String,

src/main/kotlin/io/openfuture/state/openchain/component/openrpc/dto/transfertransaction/TransferTransactionDto.kt

@@ -12,25 +12,25 @@ class OpenTransferTransaction(
         @Column(name = "fee")
         var fee: Long,
 
-        @Column(name = "amount", nullable = false)
+        @Column(name = "amount")
         var amount: Long,
 
-        @Column(name = "hash", nullable = false)
+        @Column(name = "hash")
         var hash: String,
 
-        @Column(name = "sender_address", nullable = false)
+        @Column(name = "sender_address")
         var senderAddress: String,
 
-        @Column(name = "recipient_address", nullable = false)
-        var recipientAddress: String,
+        @Column(name = "recipient_address")
+        var recipientAddress: String?,
 
-        @Column(name = "block_hash", nullable = false)
+        @Column(name = "block_hash")
         var blockHash: String,
 
-        @Column(name = "date", nullable = false)
+        @Column(name = "date")
         var date: Long,
 
-        @Column(name = "web_hook", nullable = false)
-        var webHook: String
+        @Column(name = "web_hook")
+        var webHook: String?
 
 ) : BaseModel()