[PRDP-337] Changed payer taxCode retrieval order (#124)

pagopa · Jan 23, 2024 · c6da3c6 · c6da3c6
1 parent 693bf83
commit c6da3c6
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...n/java/it/gov/pagopa/receipt/pdf/datastore/service/impl/BizEventToReceiptServiceImpl.java b/...n/java/it/gov/pagopa/receipt/pdf/datastore/service/impl/BizEventToReceiptServiceImpl.java
@@ -190,17 +190,17 @@ public void tokenizeFiscalCodes(BizEvent bizEvent, Receipt receipt, EventData ev
             );
             //Tokenize Payer
             if (isValidChannelOrigin(bizEvent)) {
-                if (bizEvent.getPayer() != null && BizEventToReceiptUtils.isValidFiscalCode(bizEvent.getPayer().getEntityUniqueIdentifierValue())) {
-                    eventData.setPayerFiscalCode(
-                            pdvTokenizerService.generateTokenForFiscalCodeWithRetry(bizEvent.getPayer().getEntityUniqueIdentifierValue())
-                    );
-                } else if (bizEvent.getTransactionDetails() != null &&
+                if (bizEvent.getTransactionDetails() != null &&
                         bizEvent.getTransactionDetails().getUser() != null &&
                         BizEventToReceiptUtils.isValidFiscalCode(bizEvent.getTransactionDetails().getUser().getFiscalCode())
                 ) {
                     eventData.setPayerFiscalCode(
                             pdvTokenizerService.generateTokenForFiscalCodeWithRetry(
                                     bizEvent.getTransactionDetails().getUser().getFiscalCode()));
+                } else if (bizEvent.getPayer() != null && BizEventToReceiptUtils.isValidFiscalCode(bizEvent.getPayer().getEntityUniqueIdentifierValue())) {
+                    eventData.setPayerFiscalCode(
+                            pdvTokenizerService.generateTokenForFiscalCodeWithRetry(bizEvent.getPayer().getEntityUniqueIdentifierValue())
+                    );
                 }
             }
         } catch (PDVTokenizerException e) {