From ec6ae9c06333aeed6aa39cca37d0a5a6d14dcdfd Mon Sep 17 00:00:00 2001
From: Philip Helger <philip@helger.com>
Date: Mon, 29 Jan 2024 17:03:55 +0100
Subject: [PATCH] Added fallback to ZZ

---
 .../Phase4PeppolServletMessageProcessorSPI.java        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/phase4-peppol-servlet/src/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java b/phase4-peppol-servlet/src/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java
index 0a75975db..54e80c112 100644
--- a/phase4-peppol-servlet/src/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java
+++ b/phase4-peppol-servlet/src/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java
@@ -90,6 +90,7 @@
 import com.helger.xml.serialize.write.XMLWriter;
 import com.helger.xsds.peppol.smp1.EndpointType;
 import com.helger.xsds.peppol.smp1.SignedServiceMetadataType;
+import com.helper.peppol.reporting.api.CPeppolReporting;
 import com.helper.peppol.reporting.api.PeppolReportingItem;
 
 /**
@@ -509,6 +510,13 @@ public static PeppolReportingItem createPeppolReportingItemForReceivedMessage (@
 
     try
     {
+      String sC1CountryCode = aPeppolSBD.getCountryC1 ();
+      if (StringHelper.hasNoText (sC1CountryCode))
+      {
+        // Fallback to ZZ to make sure the item can be created
+        sC1CountryCode = CPeppolReporting.REPLACEMENT_COUNTRY_CODE;
+      }
+
       return PeppolReportingItem.builder ()
                                 .exchangeDateTime (aExchangeDT)
                                 .directionReceiving ()
@@ -517,7 +525,7 @@ public static PeppolReportingItem createPeppolReportingItemForReceivedMessage (@
                                 .docTypeID (aPeppolSBD.getDocumentTypeAsIdentifier ())
                                 .processID (aPeppolSBD.getProcessAsIdentifier ())
                                 .transportProtocolPeppolAS4v2 ()
-                                .c1CountryCode (aPeppolSBD.getCountryC1 ())
+                                .c1CountryCode (sC1CountryCode)
                                 .c4CountryCode (sC4CountryCode)
                                 .endUserID (sEndUserID)
                                 .build ();