fix: xml generation set CDATA string as raw content (#222)

project-openubl · Apr 16, 2023 · 0087fd6 · 0087fd6
1 parent 710d1f5
commit 0087fd6
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 25 deletions.
diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/renderer/EngineProducer.java b/core/src/main/java/io/github/project/openubl/xbuilder/renderer/EngineProducer.java
@@ -20,6 +20,7 @@
 import io.github.project.openubl.xbuilder.content.catalogs.Catalog7;
 import io.quarkus.qute.Engine;
 import io.quarkus.qute.HtmlEscaper;
+import io.quarkus.qute.RawString;
 import io.quarkus.qute.ReflectionValueResolver;
 import io.quarkus.qute.TemplateLocator.TemplateLocation;
 import io.quarkus.qute.ValueResolver;
@@ -54,6 +55,15 @@ public class EngineProducer {
             .removeStandaloneLines(true)
             .addResultMapper(new HtmlEscaper(List.of("text/html", "text/xml", "application/xml", "application/xhtml+xml")))
             .addValueResolver(new ReflectionValueResolver())
+            .addValueResolver(ValueResolver.builder()
+                    .applyToBaseClass(String.class)
+                    .applyToName("raw")
+                    .resolveSync(ctx -> {
+                        String value = ((String) ctx.getBase());
+                        return new RawString(value);
+                    })
+                    .build()
+            )
             .addValueResolver(ValueResolver.builder()
                     .applyToBaseClass(LocalDate.class)
                     .applyToName("format")

diff --git a/core/src/main/resources/templates/Renderer/creditNote.xml b/core/src/main/resources/templates/Renderer/creditNote.xml
@@ -5,7 +5,7 @@
     {#include ubl/standard/include/ubl-extensions.xml /}
     {#include ubl/standard/include/general-data.xml item=this /}
     {#for key in leyendas.keySet}
-    <cbc:Note languageLocaleID="{key}"><![CDATA[{leyendas.get(key)}]]></cbc:Note>
+    <cbc:Note languageLocaleID="{key}"><![CDATA[{leyendas.get(key).raw}]]></cbc:Note>
     {/for}
     <cbc:DocumentCurrencyCode listID="ISO 4217 Alpha" listAgencyName="United Nations Economic Commission for Europe" listName="Currency">{moneda}</cbc:DocumentCurrencyCode>
     {#include "ubl/standard/include/note/invoice-reference.xml" item=this /}

diff --git a/core/src/main/resources/templates/Renderer/debitNote.xml b/core/src/main/resources/templates/Renderer/debitNote.xml
@@ -5,7 +5,7 @@
     {#include ubl/standard/include/ubl-extensions.xml /}
     {#include ubl/standard/include/general-data.xml item=this /}
     {#for key in leyendas.keySet}
-    <cbc:Note languageLocaleID="{key}"><![CDATA[{leyendas.get(key)}]]></cbc:Note>
+    <cbc:Note languageLocaleID="{key}"><![CDATA[{leyendas.get(key).raw}]]></cbc:Note>
     {/for}
     <cbc:DocumentCurrencyCode listID="ISO 4217 Alpha" listAgencyName="United Nations Economic Commission for Europe" listName="Currency">{moneda}</cbc:DocumentCurrencyCode>
     {#include "ubl/standard/include/note/invoice-reference.xml" item=this /}

diff --git a/core/src/main/resources/templates/Renderer/despatchAdvice.xml b/core/src/main/resources/templates/Renderer/despatchAdvice.xml
@@ -9,7 +9,7 @@
     {#include ubl/standard/include/general-data.xml item=this /}
     <cbc:DespatchAdviceTypeCode>{tipoComprobante}</cbc:DespatchAdviceTypeCode>
     {#if observaciones}
-    <cbc:Note><![CDATA[{observaciones}]]></cbc:Note>
+    <cbc:Note><![CDATA[{observaciones.raw}]]></cbc:Note>
     {/if}
     {#if documentoBaja}
     <cac:OrderReference>
@@ -31,7 +31,7 @@
                 <cbc:ID schemeID="6" schemeName="Documento de Identidad" schemeAgencyName="PE:SUNAT" schemeURI="urn:pe:gob:sunat:cpe:see:gem:catalogos:catalogo06">{remitente.ruc}</cbc:ID>
             </cac:PartyIdentification>
             <cac:PartyLegalEntity>
-                <cbc:RegistrationName><![CDATA[{remitente.razonSocial}]]></cbc:RegistrationName>
+                <cbc:RegistrationName><![CDATA[{remitente.razonSocial.raw}]]></cbc:RegistrationName>
             </cac:PartyLegalEntity>
         </cac:Party>
     </cac:DespatchSupplierParty>
@@ -41,7 +41,7 @@
                 <cbc:ID schemeID="{destinatario.tipoDocumentoIdentidad}" schemeName="Documento de Identidad" schemeAgencyName="PE:SUNAT" schemeURI="urn:pe:gob:sunat:cpe:see:gem:catalogos:catalogo06">{destinatario.numeroDocumentoIdentidad}</cbc:ID>
             </cac:PartyIdentification>
             <cac:PartyLegalEntity>
-                <cbc:RegistrationName><![CDATA[{destinatario.nombre}]]></cbc:RegistrationName>
+                <cbc:RegistrationName><![CDATA[{destinatario.nombre.raw}]]></cbc:RegistrationName>
             </cac:PartyLegalEntity>
         </cac:Party>
     </cac:DeliveryCustomerParty>
@@ -50,7 +50,7 @@
         <cbc:CustomerAssignedAccountID schemeID="6">{proveedor.ruc}</cbc:CustomerAssignedAccountID>
         <cac:Party>
             <cac:PartyLegalEntity>
-                <cbc:RegistrationName><![CDATA[{proveedor.razonSocial}]]></cbc:RegistrationName>
+                <cbc:RegistrationName><![CDATA[{proveedor.razonSocial.raw}]]></cbc:RegistrationName>
             </cac:PartyLegalEntity>
         </cac:Party>
     </cac:SellerSupplierParty>
@@ -77,7 +77,7 @@
                     <cbc:ID schemeID="{envio.transportista.tipoDocumentoIdentidad}">{envio.transportista.numeroDocumentoIdentidad}</cbc:ID>
                 </cac:PartyIdentification>
                 <cac:PartyName>
-                    <cbc:Name><![CDATA[{envio.transportista.nombre}]]></cbc:Name>
+                    <cbc:Name><![CDATA[{envio.transportista.nombre.raw}]]></cbc:Name>
                 </cac:PartyName>
             </cac:CarrierParty>
             <cac:TransportMeans>
@@ -123,7 +123,9 @@
             <cbc:LineID>{it_index.add(1)}</cbc:LineID>
         </cac:OrderLineReference>
         <cac:Item>
-            <cbc:Name><![CDATA[{it.descripcion}]]></cbc:Name>
+            {#if it.descripcion}
+            <cbc:Name><![CDATA[{it.descripcion.raw}]]></cbc:Name>
+            {/if}
             <cac:SellersItemIdentification>
                 <cbc:ID>{it.codigo}</cbc:ID>
             </cac:SellersItemIdentification>

diff --git a/core/src/main/resources/templates/Renderer/invoice.xml b/core/src/main/resources/templates/Renderer/invoice.xml
@@ -10,11 +10,11 @@
     <cbc:InvoiceTypeCode listID="{tipoOperacion}" listAgencyName="PE:SUNAT" listName="Tipo de Documento" listURI="urn:pe:gob:sunat:cpe:see:gem:catalogos:catalogo01">{tipoComprobante}</cbc:InvoiceTypeCode>
     {#if leyendas}
     {#for key in leyendas.keySet}
-    <cbc:Note languageLocaleID="{key}"><![CDATA[{leyendas.get(key)}]]></cbc:Note>
+    <cbc:Note languageLocaleID="{key}"><![CDATA[{leyendas.get(key).raw}]]></cbc:Note>
     {/for}
     {/if}
     {#if observaciones}
-    <cbc:Note><![CDATA[{observaciones}]]></cbc:Note>
+    <cbc:Note><![CDATA[{observaciones.raw}]]></cbc:Note>
     {/if}
     <cbc:DocumentCurrencyCode listID="ISO 4217 Alpha" listAgencyName="United Nations Economic Commission for Europe" listName="Currency">{moneda}</cbc:DocumentCurrencyCode>
     {#if ordenDeCompra}

diff --git a/core/src/main/resources/templates/Renderer/perception.xml b/core/src/main/resources/templates/Renderer/perception.xml
@@ -24,7 +24,7 @@
     <sac:SUNATPerceptionSystemCode>{tipoRegimen}</sac:SUNATPerceptionSystemCode>
     <sac:SUNATPerceptionPercent>{tipoRegimenPorcentaje}</sac:SUNATPerceptionPercent>
     {#if observacion}
-    <cbc:Note><![CDATA[{observacion}]]></cbc:Note>
+    <cbc:Note><![CDATA[{observacion.raw}]]></cbc:Note>
     {/if}
     <cbc:TotalInvoiceAmount currencyID="{moneda}">{importeTotalPercibido}</cbc:TotalInvoiceAmount>
     <sac:SUNATTotalCashed currencyID="{moneda}">{importeTotalCobrado}</sac:SUNATTotalCashed>

diff --git a/core/src/main/resources/templates/Renderer/retention.xml b/core/src/main/resources/templates/Renderer/retention.xml
@@ -24,7 +24,7 @@
     <sac:SUNATRetentionSystemCode>{tipoRegimen}</sac:SUNATRetentionSystemCode>
     <sac:SUNATRetentionPercent>{tipoRegimenPorcentaje}</sac:SUNATRetentionPercent>
     {#if observacion}
-    <cbc:Note><![CDATA[{observacion}]]></cbc:Note>
+    <cbc:Note><![CDATA[{observacion.raw}]]></cbc:Note>
     {/if}
     <cbc:TotalInvoiceAmount currencyID="{moneda}">{importeTotalRetenido}</cbc:TotalInvoiceAmount>
     <sac:SUNATTotalPaid currencyID="{moneda}">{importeTotalPagado}</sac:SUNATTotalPaid>

diff --git a/core/src/main/resources/templates/ubl/common/signature.xml b/core/src/main/resources/templates/ubl/common/signature.xml
@@ -5,7 +5,7 @@
                 <cbc:ID>{firmante.ruc}</cbc:ID>
             </cac:PartyIdentification>
             <cac:PartyName>
-                <cbc:Name><![CDATA[{firmante.razonSocial}]]></cbc:Name>
+                <cbc:Name><![CDATA[{firmante.razonSocial.raw}]]></cbc:Name>
             </cac:PartyName>
         </cac:SignatoryParty>
         <cac:DigitalSignatureAttachment>

diff --git a/core/src/main/resources/templates/ubl/standard/include/address.xml b/core/src/main/resources/templates/ubl/standard/include/address.xml
@@ -18,7 +18,7 @@
                     {/if}
                     {#if direccion.direccion}
                     <cac:AddressLine>
-                        <cbc:Line><![CDATA[{direccion.direccion}]]></cbc:Line>
+                        <cbc:Line><![CDATA[{direccion.direccion.raw}]]></cbc:Line>
                     </cac:AddressLine>
                     {/if}
                     {#if direccion.codigoPais}

diff --git a/core/src/main/resources/templates/ubl/standard/include/customer.xml b/core/src/main/resources/templates/ubl/standard/include/customer.xml
@@ -4,7 +4,7 @@
                 <cbc:ID schemeID="{cliente.tipoDocumentoIdentidad}" schemeAgencyName="PE:SUNAT" schemeName="Documento de Identidad" schemeURI="urn:pe:gob:sunat:cpe:see:gem:catalogos:catalogo06">{cliente.numeroDocumentoIdentidad}</cbc:ID>
             </cac:PartyIdentification>
             <cac:PartyLegalEntity>
-                <cbc:RegistrationName><![CDATA[{cliente.nombre}]]></cbc:RegistrationName>
+                <cbc:RegistrationName><![CDATA[{cliente.nombre.raw}]]></cbc:RegistrationName>
                 {#if cliente.direccion}
                 <cac:RegistrationAddress>
                     {#include ubl/standard/include/address.xml direccion=cliente.direccion /}

diff --git a/core/src/main/resources/templates/ubl/standard/include/document-line.xml b/core/src/main/resources/templates/ubl/standard/include/document-line.xml
@@ -16,7 +16,7 @@
                 <cbc:TaxableAmount currencyID="{moneda}">{item.iscBaseImponible.scale(2)}</cbc:TaxableAmount>
                 <cbc:TaxAmount currencyID="{moneda}">{item.isc.scale(2)}</cbc:TaxAmount>
                 <cac:TaxCategory>
-                    <cbc:Percent>{item.tasaIsc.multiply(100)}</cbc:Percent>
+                    <cbc:Percent>{item.tasaIsc.multiply(100).scale(2)}</cbc:Percent>
                     <cbc:TierRange>{item.iscTipo}</cbc:TierRange>
                     <cac:TaxScheme>
                         <cbc:ID>2000</cbc:ID>
@@ -56,7 +56,7 @@
             {/if}
         </cac:TaxTotal>
         <cac:Item>
-            <cbc:Description><![CDATA[{item.descripcion}]]></cbc:Description>
+            <cbc:Description><![CDATA[{item.descripcion.raw}]]></cbc:Description>
         </cac:Item>
         <cac:Price>
             <cbc:PriceAmount currencyID="{moneda}">{item.precio.scale(2)}</cbc:PriceAmount>

diff --git a/core/src/main/resources/templates/ubl/standard/include/note/invoice-reference.xml b/core/src/main/resources/templates/ubl/standard/include/note/invoice-reference.xml
@@ -1,7 +1,7 @@
     <cac:DiscrepancyResponse>
         <cbc:ReferenceID>{item.comprobanteAfectadoSerieNumero}</cbc:ReferenceID>
         <cbc:ResponseCode>{item.comprobanteAfectadoTipo}</cbc:ResponseCode>
-        <cbc:Description><![CDATA[{item.sustentoDescripcion}]]></cbc:Description>
+        <cbc:Description><![CDATA[{item.sustentoDescripcion.raw}]]></cbc:Description>
     </cac:DiscrepancyResponse>
     {#if item.ordenDeCompra}
     <cac:OrderReference>

diff --git a/core/src/main/resources/templates/ubl/standard/include/supplier.xml b/core/src/main/resources/templates/ubl/standard/include/supplier.xml
@@ -9,7 +9,7 @@
             </cac:PartyName>
             {/if}
             <cac:PartyLegalEntity>
-                <cbc:RegistrationName><![CDATA[{proveedor.razonSocial}]]></cbc:RegistrationName>
+                <cbc:RegistrationName><![CDATA[{proveedor.razonSocial.raw}]]></cbc:RegistrationName>
                 {#if proveedor.direccion}
                 <cac:RegistrationAddress>
                     {#include ubl/standard/include/address.xml direccion=proveedor.direccion /}

diff --git a/core/src/main/resources/templates/ubl/sunat/include/agent-party.xml b/core/src/main/resources/templates/ubl/sunat/include/agent-party.xml
@@ -4,10 +4,10 @@
         </cac:PartyIdentification>
         {#if proveedor.nombreComercial}
         <cac:PartyName>
-            <cbc:Name><![CDATA[{proveedor.nombreComercial}]]></cbc:Name>
+            <cbc:Name><![CDATA[{proveedor.nombreComercial.raw}]]></cbc:Name>
         </cac:PartyName>
         {/if}
         <cac:PartyLegalEntity>
-            <cbc:RegistrationName><![CDATA[{proveedor.razonSocial}]]></cbc:RegistrationName>
+            <cbc:RegistrationName><![CDATA[{proveedor.razonSocial.raw}]]></cbc:RegistrationName>
         </cac:PartyLegalEntity>
     </cac:AgentParty>
diff --git a/core/src/main/resources/templates/ubl/sunat/include/receiver-party.xml b/core/src/main/resources/templates/ubl/sunat/include/receiver-party.xml
@@ -3,6 +3,6 @@
             <cbc:ID schemeID="{cliente.tipoDocumentoIdentidad}">{cliente.numeroDocumentoIdentidad}</cbc:ID>
         </cac:PartyIdentification>
         <cac:PartyLegalEntity>
-            <cbc:RegistrationName><![CDATA[{cliente.nombre}]]></cbc:RegistrationName>
+            <cbc:RegistrationName><![CDATA[{cliente.nombre.raw}]]></cbc:RegistrationName>
         </cac:PartyLegalEntity>
     </cac:ReceiverParty>
diff --git a/core/src/main/resources/templates/ubl/sunat/include/supplier.xml b/core/src/main/resources/templates/ubl/sunat/include/supplier.xml
@@ -3,7 +3,7 @@
         <cbc:AdditionalAccountID>6</cbc:AdditionalAccountID>
         <cac:Party>
             <cac:PartyLegalEntity>
-                <cbc:RegistrationName><![CDATA[{proveedor.razonSocial}]]></cbc:RegistrationName>
+                <cbc:RegistrationName><![CDATA[{proveedor.razonSocial.raw}]]></cbc:RegistrationName>
             </cac:PartyLegalEntity>
         </cac:Party>
     </cac:AccountingSupplierParty>
diff --git a/core/src/test/resources/e2e/renderer/despatchadvice/DespatchAdviceTest/minData.xml b/core/src/test/resources/e2e/renderer/despatchadvice/DespatchAdviceTest/minData.xml
@@ -83,7 +83,6 @@
             <cbc:LineID>1</cbc:LineID>
         </cac:OrderLineReference>
         <cac:Item>
-            <cbc:Name><![CDATA[]]></cbc:Name>
             <cac:SellersItemIdentification>
                 <cbc:ID>123456</cbc:ID>
             </cac:SellersItemIdentification>

diff --git a/.../test/java/io/github/project/openubl/quarkus/xbuilder/it/QuarkusXbuilderResourceTest.java b/.../test/java/io/github/project/openubl/quarkus/xbuilder/it/QuarkusXbuilderResourceTest.java
@@ -1281,7 +1281,6 @@ public void testDespatchAdvice() {
                         "            <cbc:LineID>1</cbc:LineID>\n" +
                         "        </cac:OrderLineReference>\n" +
                         "        <cac:Item>\n" +
-                        "            <cbc:Name><![CDATA[]]></cbc:Name>\n" +
                         "            <cac:SellersItemIdentification>\n" +
                         "                <cbc:ID>123456</cbc:ID>\n" +
                         "            </cac:SellersItemIdentification>\n" +