Skip to content
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.

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

feat: P4ADEV-2037 generate iud if blank #38

Merged
merged 4 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package it.gov.pagopa.pu.debtpositions.service;

import io.micrometer.common.util.StringUtils;
import it.gov.pagopa.pu.debtpositions.dto.Installment;
import it.gov.pagopa.pu.debtpositions.dto.generated.DebtPositionDTO;
import it.gov.pagopa.pu.debtpositions.mapper.DebtPositionMapper;
Expand All @@ -10,6 +11,7 @@
import it.gov.pagopa.pu.debtpositions.repository.InstallmentPIIRepository;
import it.gov.pagopa.pu.debtpositions.repository.PaymentOptionRepository;
import it.gov.pagopa.pu.debtpositions.repository.TransferRepository;
import it.gov.pagopa.pu.debtpositions.util.Utilities;
import jakarta.transaction.Transactional;
import org.springframework.data.util.Pair;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -49,6 +51,9 @@ public DebtPositionDTO saveDebtPosition(DebtPositionDTO debtPositionDTO) {
savedPaymentOption.getInstallments().forEach(installmentNoPII -> {
Installment mappedInstallment = mappedDebtPosition.getSecond().get(installmentNoPII);
mappedInstallment.setPaymentOptionId(savedPaymentOption.getPaymentOptionId());
if (StringUtils.isBlank(mappedInstallment.getIud())) {
mappedInstallment.setIud(Utilities.getRandomIUD());
}
long idInstallment = installmentRepository.save(mappedInstallment);

mappedInstallment.getTransfers().forEach(transfer -> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package it.gov.pagopa.pu.debtpositions.util;

import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.time.LocalDateTime;
Expand Down Expand Up @@ -50,8 +51,11 @@ public static boolean isValidPIVA(String pi) {
return (10 - s % 10) % 10 == pi.charAt(10) - '0';
}

/** It will remove and replace file extension */
public static String replaceFileExtension(String fileName, String newExtension){
return fileName.substring(0, fileName.lastIndexOf(".")) + newExtension;
}
public static String getRandomIUD() {
return "000" + getRandomicUUID();
}

public static String getRandomicUUID() {
return UUID.randomUUID().toString().replace("-", "");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
import it.gov.pagopa.pu.debtpositions.repository.InstallmentPIIRepository;
import it.gov.pagopa.pu.debtpositions.repository.PaymentOptionRepository;
import it.gov.pagopa.pu.debtpositions.repository.TransferRepository;
import it.gov.pagopa.pu.debtpositions.util.Utilities;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.data.util.Pair;
Expand Down Expand Up @@ -64,11 +66,23 @@ void givenValidDebtPositionDTO_WhenSaveDebtPosition_ThenSaveAllEntities() {

DebtPosition debtPosition = buildDebtPosition();
PaymentOption paymentOption = buildPaymentOption();

InstallmentNoPII installmentNoPIINoIud = buildInstallmentNoPII();
Installment installmentNoIud = buildInstallment();
installmentNoIud.setIud("");

InstallmentNoPII installmentNoPII = buildInstallmentNoPII();
Installment installment = buildInstallment();
installment.setInstallmentId(10L);
installmentNoPII.setInstallmentId(10L);

Transfer transfer = buildTransfer();

Map<InstallmentNoPII, Installment> installmentMap = Map.of(installmentNoPII, installment);
Map<InstallmentNoPII, Installment> installmentMap = Map.of(
installmentNoPIINoIud, installmentNoIud,
installmentNoPII, installment
);

Pair<DebtPosition, Map<InstallmentNoPII, Installment>> mappedPair = Pair.of(debtPosition, installmentMap);

DebtPosition savedDebtPosition = new DebtPosition();
Expand All @@ -77,26 +91,32 @@ void givenValidDebtPositionDTO_WhenSaveDebtPosition_ThenSaveAllEntities() {

PaymentOption savedPaymentOption = new PaymentOption();
savedPaymentOption.setPaymentOptionId(1L);
savedPaymentOption.setInstallments(new TreeSet<>(List.of(installmentNoPII)));
savedPaymentOption.setInstallments(new TreeSet<>(List.of(installmentNoPIINoIud, installmentNoPII)));

Installment savedInstallment = new Installment();
savedInstallment.setInstallmentId(1L);

Transfer savedTransfer = new Transfer();
savedTransfer.setTransferId(1L);

String generatedIUD = "RANDOM_IUD_12345";

Mockito.when(debtPositionMapper.mapToModel(debtPositionDTO)).thenReturn(mappedPair);
Mockito.when(debtPositionRepository.save(Mockito.any(DebtPosition.class))).thenReturn(savedDebtPosition);
Mockito.when(paymentOptionRepository.save(Mockito.any(PaymentOption.class))).thenReturn(savedPaymentOption);
Mockito.when(installmentRepository.save(Mockito.any(Installment.class))).thenReturn(savedInstallment.getInstallmentId());
Mockito.when(transferRepository.save(Mockito.any(Transfer.class))).thenReturn(savedTransfer);

debtPositionService.saveDebtPosition(debtPositionDTO);
try (MockedStatic<Utilities> mockedStatic = Mockito.mockStatic(Utilities.class)) {
mockedStatic.when(Utilities::getRandomIUD).thenReturn(generatedIUD);

debtPositionService.saveDebtPosition(debtPositionDTO);

Mockito.verify(debtPositionRepository, Mockito.times(1)).save(debtPosition);
Mockito.verify(paymentOptionRepository, Mockito.times(1)).save(paymentOption);
Mockito.verify(installmentRepository, Mockito.times(1)).save(installment);
Mockito.verify(transferRepository, Mockito.times(1)).save(transfer);
Mockito.verify(debtPositionRepository, Mockito.times(1)).save(debtPosition);
Mockito.verify(paymentOptionRepository, Mockito.times(1)).save(paymentOption);
Mockito.verify(installmentRepository, Mockito.times(1)).save(installment);
Mockito.verify(transferRepository, Mockito.times(2)).save(transfer);
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import static org.junit.jupiter.api.Assertions.assertFalse;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.*;

class UtilitiesTest {

Expand Down Expand Up @@ -44,4 +42,18 @@ void testLocalDatetimeToOffsetDateTimeWithNull() {

assertNull(result, "The result should be null for a null input.");
}

@Test
void testGetRandomIUD() {
String iud = Utilities.getRandomIUD();

assertTrue(iud.startsWith("000"));
}

@Test
void testGetRandomicUUID() {
String uuid = Utilities.getRandomicUUID();

assertEquals(32, uuid.length());
}
}