[MODFISTO-488] Fixed encumbrance changes after cancelling a payment o…

…r credit
folio-org · Jun 21, 2024 · 12c36da · 12c36da
1 parent 808aa04
commit 12c36da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/org/folio/service/transactions/batch/BatchPaymentCreditService.java b/src/main/java/org/folio/service/transactions/batch/BatchPaymentCreditService.java
@@ -76,10 +76,12 @@ private void updateEncumbranceToCancelTransaction(Transaction transaction, Trans
     double amount = encumbrance.getAmount();
     if (transaction.getTransactionType() == PAYMENT) {
       expended = subtractMoney(expended, transaction.getAmount(), currency);
-      amount = sumMoney(amount, transaction.getAmount(), currency);
+      if (encumbrance.getEncumbrance().getStatus() == Encumbrance.Status.UNRELEASED) {
+        amount = sumMoney(amount, transaction.getAmount(), currency);
+      }
     } else {
       credited = subtractMoney(credited, transaction.getAmount(), currency);
-      if (Encumbrance.Status.RELEASED != encumbrance.getEncumbrance().getStatus()) {
+      if (encumbrance.getEncumbrance().getStatus() == Encumbrance.Status.UNRELEASED) {
         amount = subtractMoney(amount, transaction.getAmount(), currency);
       }
     }

diff --git a/src/test/java/org/folio/service/transactions/PaymentCreditTest.java b/src/test/java/org/folio/service/transactions/PaymentCreditTest.java
@@ -589,7 +589,8 @@ void testCancelPaymentWithLinkedEncumbrance(VertxTestContext testContext) {
           assertThat(savedEncumbrance.getTransactionType(), equalTo(ENCUMBRANCE));
           assertThat(savedEncumbrance.getEncumbrance().getStatus(), equalTo(RELEASED));
           assertNotNull(savedEncumbrance.getMetadata().getUpdatedDate());
-          assertThat(savedEncumbrance.getAmount(), equalTo(5d));
+          assertThat(savedEncumbrance.getAmount(), equalTo(0d));
+          assertThat(savedEncumbrance.getEncumbrance().getInitialAmountEncumbered(), equalTo(5d));
           assertThat(savedEncumbrance.getEncumbrance().getAmountAwaitingPayment(), equalTo(0d));
           assertThat(savedEncumbrance.getEncumbrance().getAmountExpended(), equalTo(0d));
 
@@ -689,6 +690,7 @@ void testCancelCreditWithLinkedEncumbrance(VertxTestContext testContext) {
           assertThat(savedEncumbrance.getEncumbrance().getStatus(), equalTo(RELEASED));
           assertNotNull(savedEncumbrance.getMetadata().getUpdatedDate());
           assertThat(savedEncumbrance.getAmount(), equalTo(0d));
+          assertThat(savedEncumbrance.getEncumbrance().getInitialAmountEncumbered(), equalTo(5d));
           assertThat(savedEncumbrance.getEncumbrance().getAmountAwaitingPayment(), equalTo(0d));
           assertThat(savedEncumbrance.getEncumbrance().getAmountExpended(), equalTo(5d));
           assertThat(savedEncumbrance.getEncumbrance().getAmountCredited(), equalTo(0d));