Merge pull request #446 from opexdev/hot-fix_fi-retry

Fix wallet amount condition and fi status when giving up
opexdev · Jun 2, 2024 · a098e97 · a098e97
2 parents fd49c92 + b153906
commit a098e97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.../main/kotlin/co/nilin/opex/accountant/ports/postgres/impl/FinancialActionPersisterImpl.kt b/.../main/kotlin/co/nilin/opex/accountant/ports/postgres/impl/FinancialActionPersisterImpl.kt
@@ -103,14 +103,15 @@ class FinancialActionPersisterImpl(
             //Do nothing
         } else {
             with(retryModel) {
+                val giveUp = retries + 1 >= retryCount
                 faRetryRepository.scheduleNext(
                     id!!,
                     retries + 1,
                     LocalDateTime.now().plusSeconds(retries * delayMultiplier * delaySeconds),
-                    retries >= retryCount
+                    giveUp
                 ).awaitSingleOrNull()
 
-                if (hasGivenUp)
+                if (giveUp)
                     status = FinancialActionStatus.ERROR
             }
         }

diff --git a/...er-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/impl/WalletManagerImpl.kt b/...er-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/impl/WalletManagerImpl.kt
@@ -79,7 +79,7 @@ class WalletManagerImpl(
     }
 
     override suspend fun isWithdrawAllowed(wallet: Wallet, amount: BigDecimal): Boolean {
-        if (amount <= BigDecimal.ZERO)
+        if (amount < BigDecimal.ZERO)
             throw OpexError.InvalidAmount.exception()
 
         var evaluate = wallet.balance.amount >= amount