Skip to content

fix: P4ADEV-3972 balance import pagati #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 16, 2025
Merged

fix: P4ADEV-3972 balance import pagati #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
683e820
P4ADEV-3972 fix balance import pagati
RiccardoGiuliani Oct 15, 2025
3b5bb20
P4ADEV-3972 fix
RiccardoGiuliani Oct 15, 2025
828ada5
P4ADEV-3972 fix junits
RiccardoGiuliani Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .../java/it/gov/pagopa/pu/debtpositions/service/create/receipt/InstallmentUpdateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package it.gov.pagopa.pu.debtpositions.service.create.receipt;

import it.gov.pagopa.pu.debtpositions.dto.generated.InstallmentStatus;
import it.gov.pagopa.pu.debtpositions.dto.generated.ReceiptDTO;
import it.gov.pagopa.pu.debtpositions.dto.generated.ReceiptWithAdditionalNodeDataDTO;
import it.gov.pagopa.pu.debtpositions.exception.custom.NotFoundException;
import it.gov.pagopa.pu.debtpositions.model.DebtPosition;
Expand Down Expand Up @@ -88,10 +87,13 @@ private void invalidOtherPaymentOptions(PaymentOption paymentOption) {
});
}

private void updateInstallmentStatusAndFeeOfDebtPosition(InstallmentNoPII installment, InstallmentStatus status, ReceiptDTO receipt) {
private void updateInstallmentStatusAndFeeOfDebtPosition(InstallmentNoPII installment, InstallmentStatus status, ReceiptWithAdditionalNodeDataDTO receipt) {
if (receipt != null) {
installment.setReceiptId(receipt.getReceiptId());
installment.setIur(receipt.getPaymentReceiptId());
if (StringUtils.isNotBlank(receipt.getBalance())) {
installment.setBalance(receipt.getBalance());
}
long feeAmountCents = receipt.getPaymentAmountCents() - installment.getAmountCents();
if (feeAmountCents > 0) {
log.debug("Set NotificationFeeCents for installmentId {} with amount: {}", installment.getInstallmentId(), feeAmountCents);
Expand Down
44 changes: 33 additions & 11 deletions ...a/it/gov/pagopa/pu/debtpositions/service/create/receipt/InstallmentUpdateServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@
import it.gov.pagopa.pu.debtpositions.util.InstallmentUtils;
import it.gov.pagopa.pu.debtpositions.util.TestUtils;
import it.gov.pagopa.pu.debtpositions.util.faker.PaymentOptionFaker;

import java.util.*;

import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
import uk.co.jemos.podam.api.PodamFactory;

import java.util.*;

import static it.gov.pagopa.pu.debtpositions.util.faker.DebtPositionTypeOrgFaker.buildDebtPositionTypeOrg;

@Slf4j
Expand All @@ -44,10 +45,12 @@ class InstallmentUpdateServiceTest {
private final PodamFactory podamFactory = TestUtils.getPodamFactory();
private static final String ACCESS_TOKEN = "accessToken";

@Test
void givenFoundDebtPositionWhenUpdateInstallmentStatusOfDebtPositionThenOk() {
@ParameterizedTest
@ValueSource(strings = { "", "BAL123" })
void givenFoundDebtPositionWhenUpdateInstallmentStatusOfDebtPositionThenOk(String balance) {
//given
ReceiptWithAdditionalNodeDataDTO receiptDTO = podamFactory.manufacturePojo(ReceiptWithAdditionalNodeDataDTO.class);
receiptDTO.setBalance(balance.isEmpty() ? null : balance);
InstallmentNoPII targetInstallment = PrimaryOrgInstallmentPaidVerifierServiceTest.getInstallment(
InstallmentStatus.UNPAID);
targetInstallment.setBalance(null);
Expand Down Expand Up @@ -115,10 +118,15 @@ void givenFoundDebtPositionWhenUpdateInstallmentStatusOfDebtPositionThenOk() {
targetInstallment.getInstallmentId())).thenReturn(debtPosition);
DebtPositionTypeOrg debtPositionTypeOrg = buildDebtPositionTypeOrg();
debtPositionTypeOrg.setBalance(null);
Mockito.when(debtPositionTypeOrgRepositoryMock.getDebtPositionTypeOrgByInstallmentId(targetInstallment.getInstallmentId()))
.thenReturn(debtPositionTypeOrg);
Mockito.when(balanceResolverServiceMock.getBalanceDefault(debtPosition.getOrganizationId(), debtPositionTypeOrg, ACCESS_TOKEN))
.thenReturn(null);
if (balance.isEmpty()) {
Mockito.when(debtPositionTypeOrgRepositoryMock.getDebtPositionTypeOrgByInstallmentId(targetInstallment.getInstallmentId()))
.thenReturn(debtPositionTypeOrg);
Mockito.when(balanceResolverServiceMock.getBalanceDefault(debtPosition.getOrganizationId(), debtPositionTypeOrg, ACCESS_TOKEN))
.thenReturn(null);
} else {
Mockito.when(balanceResolverServiceMock.resolveAmountBalance(debtPosition.getOrganizationId(), targetInstallment, ACCESS_TOKEN))
.thenReturn("balanceResolved");
}

//when
DebtPosition response = installmentUpdateService.updateInstallmentStatusOfDebtPosition(
Expand Down Expand Up @@ -159,14 +167,28 @@ void givenFoundDebtPositionWhenUpdateInstallmentStatusOfDebtPositionThenOk() {
});
Mockito.verify(debtPositionRepositoryMock, Mockito.times(1))
.findEntityGraphByInstallmentId(targetInstallment.getInstallmentId());
Mockito.verify(balanceResolverServiceMock, Mockito.times(0))
.resolveAmountBalance(debtPosition.getOrganizationId(), targetInstallment, ACCESS_TOKEN);
if (balance.isEmpty()) {
Mockito.verify(balanceResolverServiceMock, Mockito.times(0))
.resolveAmountBalance(debtPosition.getOrganizationId(), targetInstallment, ACCESS_TOKEN);
Mockito.verify(debtPositionTypeOrgRepositoryMock, Mockito.times(1))
.getDebtPositionTypeOrgByInstallmentId(targetInstallment.getInstallmentId());
Mockito.verify(balanceResolverServiceMock, Mockito.times(1))
.getBalanceDefault(debtPosition.getOrganizationId(), debtPositionTypeOrg, ACCESS_TOKEN);
} else {
Mockito.verify(balanceResolverServiceMock, Mockito.times(1))
.resolveAmountBalance(debtPosition.getOrganizationId(), targetInstallment, ACCESS_TOKEN);
Mockito.verify(debtPositionTypeOrgRepositoryMock, Mockito.times(0))
.getDebtPositionTypeOrgByInstallmentId(targetInstallment.getInstallmentId());
Mockito.verify(balanceResolverServiceMock, Mockito.times(0))
.getBalanceDefault(debtPosition.getOrganizationId(), debtPositionTypeOrg, ACCESS_TOKEN);
}
}

@Test
void givenDebtPositionWithBalanceNullWhenDebtPositionTypeOrgNotFoundThenException() {
//given
ReceiptWithAdditionalNodeDataDTO receiptDTO = podamFactory.manufacturePojo(ReceiptWithAdditionalNodeDataDTO.class);
receiptDTO.setBalance(null);
InstallmentNoPII targetInstallment = PrimaryOrgInstallmentPaidVerifierServiceTest.getInstallment(
InstallmentStatus.UNPAID);
targetInstallment.setBalance(null);
Expand Down