Merge branch 'OP-170-improve-getting-events' into 'sprint'

OP-170 add hash to transaction

See merge request open-platform/api!169

Author: evgeny-krylov

frontend/src/actions/scaffold-transactions.js

@@ -35,24 +35,24 @@ export const fetchScaffoldTransactionsFromChain = scaffold => async () => {
 let isSubscribed = false;
 
 const updateTransactions = address => async dispatch => {
-  setTimeout(async () => {
-    console.log('>> start update');
-    const transactions = await dispatch(apiGet(updateScaffoldTransactions(address)));
-    console.log('>> updates: ', transactions);
-    if (transactions.totalCount) {
-      dispatch({ type: UPDATE_SCAFFOLD_TRANSACTIONS, payload: { address, transactions } });
-    }
-    if (isSubscribed) {
-      dispatch(updateTransactions(address));
-    }
-  }, 1000);
+  console.timeEnd('>> start update');
+  const transactions = await dispatch(apiGet(updateScaffoldTransactions(address)));
+  console.log('>> updates: ', transactions);
+  if (isSubscribed) {
+    console.time('>> start update');
+    dispatch(updateTransactions(address));
+  }
+  if (transactions.totalCount) {
+    dispatch({ type: UPDATE_SCAFFOLD_TRANSACTIONS, payload: { address, transactions } });
+  }
 };
 
 export const subscribeTransactionsByApi = address => async dispatch => {
   if (isSubscribed) {
     return;
   }
   isSubscribed = true;
+  console.time('>> start update');
   dispatch(updateTransactions(address));
 };
 

src/main/kotlin/io/openfuture/api/component/web3/TransactionHandler.kt

@@ -29,9 +29,10 @@ class TransactionHandler(
     @Transactional
     fun handle(transactionLog: Log) {
         val contract = repository.findByAddressIgnoreCase(transactionLog.address) ?: return
+        if (null != service.find(transactionLog.transactionHash)) return
+        val transaction = service.save(Transaction.of(contract, transactionLog))
 
         try {
-            val transaction = service.save(Transaction.of(contract, transactionLog))
             val event = eventDecoder.getEvent(contract.address, transaction.data)
             val transactionDto = TransactionDto(transaction, event)
             contract.webHook?.let { RestTemplate().postForLocation(it, transactionDto) }

src/main/kotlin/io/openfuture/api/entity/scaffold/Transaction.kt

@@ -9,6 +9,9 @@ import javax.persistence.*
 @Table(name = "transactions")
 class Transaction(
 
+        @Column(name = "hash", nullable = false, unique = true)
+        val hash: String,
+
         @ManyToOne
         @JoinColumn(name = "scaffold_id", nullable = false)
         val scaffold: Scaffold,
@@ -22,7 +25,7 @@ class Transaction(
 ) : BaseModel() {
 
     companion object {
-        fun of(scaffold: Scaffold, log: Log): Transaction = Transaction(scaffold, log.data)
+        fun of(scaffold: Scaffold, log: Log): Transaction = Transaction(log.transactionHash, scaffold, log.data)
     }
 
 }

src/main/kotlin/io/openfuture/api/repository/Repository.kt

@@ -51,6 +51,8 @@ interface TransactionRepository : BaseRepository<Transaction> {
 
     fun findAllByScaffoldOrderByDateDesc(scaffold: Scaffold, pageable: Pageable): Page<Transaction>
 
+    fun findByHash(hash: String): Transaction?
+
 }
 
 @Repository

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

@@ -17,6 +17,9 @@ class DefaultTransactionService(
     override fun getAll(scaffold: Scaffold, pageRequest: Pageable): Page<Transaction> =
             repository.findAllByScaffoldOrderByDateDesc(scaffold, pageRequest)
 
+    @Transactional(readOnly = true)
+    override fun find(hash: String): Transaction? = repository.findByHash(hash)
+
     @Transactional
     override fun save(transaction: Transaction): Transaction = repository.save(transaction)
 

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

@@ -83,6 +83,8 @@ interface TransactionService {
 
     fun getAll(scaffold: Scaffold, pageRequest: Pageable): Page<Transaction>
 
+    fun find(hash: String): Transaction?
+
     fun save(transaction: Transaction): Transaction
 
 }

src/main/resources/db/migration/V1_15__add_hash_to_transaction.sql

@@ -0,0 +1,3 @@
+TRUNCATE transactions;
+
+ALTER TABLE transactions ADD COLUMN hash VARCHAR NOT NULL UNIQUE;

src/test/kotlin/io/openfuture/api/component/web3/TransactionHandlerTests.kt

@@ -57,5 +57,6 @@ internal class TransactionHandlerTests : UnitTest() {
         verify(transactionService, never()).save(any(Transaction::class.java))
     }
 
-    private fun createLog(): Log = Log().apply { address = "0xba37163625b3f2e96112562858c12b75963af138"; data = "data" ; type = "type"}
+    private fun createLog(): Log = Log().apply { transactionHash = "hash";
+        address = "0xba37163625b3f2e96112562858c12b75963af138"; data = "data" ; type = "type"}
 }

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

@@ -40,7 +40,7 @@ class TransactionApiControllerTests : ControllerTests() {
         val openKey = createOpenKey(setOf(Role("ROLE_MASTER")))
         val scaffold = createScaffold(openKey)
         val pageRequest = PageRequest()
-        val transaction = Transaction(scaffold, "data", Date(1531128228590))
+        val transaction = Transaction("hash", scaffold, "data", Date(1531128228590))
 
         given(keyService.find(openKey.value)).willReturn(openKey)
         given(scaffoldService.get(scaffold.address, openKey.user)).willReturn(scaffold)

src/test/kotlin/io/openfuture/api/repository/TransactionRepositoryTests.kt

@@ -29,7 +29,7 @@ internal class TransactionRepositoryTests : RepositoryTests() {
                 "conversionAmount", "webHook", Collections.emptyList())
         entityManager.persist(scaffold)
 
-        val transaction = Transaction(scaffold, "data binary")
+        val transaction = Transaction("hash", scaffold, "data binary")
         entityManager.persist(transaction)
 
         val actualOpenKeys = repository.findAllByScaffoldOrderByDateDesc(scaffold, PageRequest())