[PIDM-42] fix(payment-status): payment position/option status not coherent

src/main/java/it/gov/pagopa/debtposition/model/enumeration/DebtPositionStatus.java

@@ -2,6 +2,8 @@
 
 import it.gov.pagopa.debtposition.entity.PaymentOption;
 import it.gov.pagopa.debtposition.entity.PaymentPosition;
+import it.gov.pagopa.debtposition.exception.AppError;
+import it.gov.pagopa.debtposition.exception.AppException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.EnumSet;
@@ -93,4 +95,24 @@ public static PaymentPosition expirationCheckAndUpdate(PaymentOption po) {
     }
     return pp;
   }
+
+  /**
+   * Checks if the user is trying to pay the full amount for the payment position but there is an
+   * installment already paid, in which case
+   *
+   * @param paymentOptionToPay the payment option being paid
+   * @param nav the identifier of the notice being paid
+   */
+  public static void checkAlreadyPaidInstallments(PaymentOption paymentOptionToPay, String nav) {
+
+    PaymentPosition paymentPosition = paymentOptionToPay.getPaymentPosition();
+    if (Boolean.FALSE.equals(paymentOptionToPay.getIsPartialPayment())
+        && paymentPosition.getStatus().equals(DebtPositionStatus.PARTIALLY_PAID)) {
+
+      throw new AppException(
+          AppError.PAYMENT_OPTION_ALREADY_PAID,
+          paymentOptionToPay.getOrganizationFiscalCode(),
+          nav);
+    }
+  }
 }

src/main/java/it/gov/pagopa/debtposition/service/payments/PaymentsService.java

@@ -6,6 +6,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import javax.validation.Valid;
@@ -69,6 +70,7 @@ public PaymentOption getPaymentOptionByNAV(@NotBlank String organizationFiscalCo
         // PaymentPosition used when converting PaymentOption to POWithDebtor
         DebtPositionStatus.validityCheckAndUpdate(paymentOption);
         DebtPositionStatus.expirationCheckAndUpdate(paymentOption);
+        DebtPositionStatus.checkAlreadyPaidInstallments(paymentOption, nav);
 
         return paymentOption;
     }
@@ -233,7 +235,10 @@ private PaymentOption updatePaymentStatus(PaymentPosition pp, String nav, Paymen
         }
 
         // aggiorno lo stato della payment position
-        if (countPaidPartialPayment > 0 && countPaidPartialPayment < numberOfPartialPayment) {
+        // PIDM-42 if paying the full amount when there is already a paid partial payment
+        // then update the payment position status to PAID
+        if (countPaidPartialPayment > 0 && countPaidPartialPayment < numberOfPartialPayment
+                && Boolean.TRUE.equals(Objects.requireNonNull(poToPay).getIsPartialPayment())) {
             pp.setStatus(DebtPositionStatus.PARTIALLY_PAID);
         } else {
             pp.setStatus(DebtPositionStatus.PAID);

src/main/java/it/gov/pagopa/debtposition/util/DebtPositionValidation.java

@@ -270,10 +270,31 @@
 
     // La posizione debitoria è già in PARTIALLY_PAID ed arriva una richiesta di pagamento su una
     // payment option non rateizzata (isPartialPayment = false) => errore
+    // PIDM-42: if this is a full payment and the position is partially paid then
+    // log this but allow the payment option status to be changed to PO_PAID instead of throwing an
+    // error
+    // NOTE: the exception handling has been moved to the get/activate validation
+    // (checkAlreadyPaidInstallments)
     if (ppToPay.getStatus().equals(DebtPositionStatus.PARTIALLY_PAID)
         && Boolean.FALSE.equals(poToPay.getIsPartialPayment())) {
-      throw new AppException(
-          AppError.PAYMENT_OPTION_ALREADY_PAID, poToPay.getOrganizationFiscalCode(), nav);
+
+      // log detailed information about this edge case
+      log.warn(
+          "Potential payment state inconsistency detected || "
+              + "Organization: {} || "
+              + "IUPD: {} || "
+              + "NAV: {} || "
+              + "Position Status: {} || "
+              + "Payment Option Status: {} || "
+              + "Is Partial Payment: {} || "
+              + "Timestamp: {}",
+          ppToPay.getOrganizationFiscalCode(),
+          ppToPay.getIupd(),
+          nav,
+          ppToPay.getStatus(),
+          poToPay.getStatus(),
+          poToPay.getIsPartialPayment(),
+          LocalDateTime.now());
     }
   }
 

src/test/java/it/gov/pagopa/debtposition/controller/PaymentsControllerTest.java

@@ -610,7 +610,7 @@ void payPaymentOption_Multiple_Partial_409() throws Exception {
   }
 
   @Test
-  void payPaymentOption_Multiple_Partial2_409() throws Exception {
+  void getPaymentOption_Multiple_Partial_409() throws Exception {
     // creo una posizione debitoria (senza 'validity date' impostata e nav non valorizzato) con più
     // opzioni di pagamento
     mvc.perform(
@@ -652,13 +652,12 @@ void payPaymentOption_Multiple_Partial2_409() throws Exception {
             MockMvcResultMatchers.jsonPath("$.status")
                 .value(DebtPositionStatus.PARTIALLY_PAID.toString()));
 
-    // effettuo un nuovo pagamento sulla payment option non rateizzabile (isPartialPayment = false)
-    // e ottengo errore
+    // effettuo una GET/ACTIVATE sulla payment option corrispondente alla rata unica/intero importo
+    // e ottengo errore 409
     mvc.perform(
-            post("/organizations/PAY_Multiple_Partial2_409_12345678901/paymentoptions/"
-                    + auxDigit
-                    + "123456IUVMULTIPLEMOCK3/pay")
-                .content(TestUtil.toJson(DebtPositionMock.getPayPOMock1()))
+            get("/organizations/PAY_Multiple_Partial2_409_12345678901/paymentoptions/"
+                + auxDigit
+                + "123456IUVMULTIPLEMOCK3")
                 .contentType(MediaType.APPLICATION_JSON))
         .andExpect(status().isConflict());
   }