Merge pull request #49 from Staketab/dev

fix bug with remove tx with null amount
Staketab · Apr 30, 2024 · f0a0694 · f0a0694
2 parents cc3dc98 + 000ae4c
commit f0a0694
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/com/staketab/minanames/repository/PayableTransactionRepository.java b/src/main/java/com/staketab/minanames/repository/PayableTransactionRepository.java
@@ -14,6 +14,8 @@ public interface PayableTransactionRepository extends JpaRepository<PayableTrans
 
     List<PayableTransactionEntity> findAllByTxStatus(TxStatus txStatus);
 
+    List<PayableTransactionEntity> findAllByTxStatusAndTxAmountIsNotNull(TxStatus txStatus);
+
     @Modifying
     void deleteAllByTxHashIn(Collection<String> txHash);
 

diff --git a/src/main/java/com/staketab/minanames/service/impl/TxServiceImpl.java b/src/main/java/com/staketab/minanames/service/impl/TxServiceImpl.java
@@ -59,7 +59,7 @@ public void checkTransactions() {
     @Override
     @Transactional
     public void deleteTxsWithIncorrectAmount() {
-        List<PayableTransactionEntity> pendingTxs = payableTransactionRepository.findAllByTxStatus(TxStatus.PENDING);
+        List<PayableTransactionEntity> pendingTxs = payableTransactionRepository.findAllByTxStatusAndTxAmountIsNotNull(TxStatus.PENDING);
         List<PayableTransactionEntity> correctAppliedTxs = txsWithIncorrectAmount(pendingTxs);
         pendingTxs.retainAll(correctAppliedTxs);
         saveLogInfo(pendingTxs, INCORRECT_AMOUNT);