ADd documentos relacionados (#84)

carlosthe19916 · web-flow · commit 6f7fc9504b74 · 2022-04-09T17:08:20.000+02:00
diff --git a/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/CreditNote.java b/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/CreditNote.java
@@ -16,7 +16,6 @@
  */
 package io.github.project.openubl.xbuilder.content.models.standard.general;
 
-import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
@@ -29,7 +28,4 @@
 @Data
 @SuperBuilder
 @EqualsAndHashCode(callSuper = true)
-public class CreditNote extends Note {
-
-    private List<DocumentoTributarioRelacionado_CreditNote> otrosDocumentosTributariosRelacionados;
-}
+public class CreditNote extends Note {}
diff --git a/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/DebitNote.java b/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/DebitNote.java
@@ -16,15 +16,11 @@
  */
 package io.github.project.openubl.xbuilder.content.models.standard.general;
 
-import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 
 @Data
 @SuperBuilder
 @EqualsAndHashCode(callSuper = true)
-public class DebitNote extends Note {
-
-    private List<DocumentoTributarioRelacionado_DebitNote> otrosDocumentosTributariosRelacionados;
-}
+public class DebitNote extends Note {}
diff --git a/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/Document.java b/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/Document.java
@@ -109,4 +109,10 @@ public abstract class Document {
      */
     @Singular
     private List<Guia> guias;
+
+    /**
+     * Otros documentos relacionados
+     */
+    @Singular
+    private List<DocumentoRelacionado> documentosRelacionados;
 }
diff --git a/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/DocumentoRelacionado.java b/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/DocumentoRelacionado.java
@@ -16,16 +16,13 @@
  */
 package io.github.project.openubl.xbuilder.content.models.standard.general;
 
+import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.SuperBuilder;
 
 @Data
-@SuperBuilder
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class DocumentoTributarioRelacionado_Invoice extends BaseDocumentoTributarioRelacionado {
+@Builder
+public class DocumentoRelacionado {
 
     private String tipoDocumento;
+    private String serieNumero;
 }
diff --git a/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/DocumentoTributarioRelacionado_CreditNote.java b/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/DocumentoTributarioRelacionado_CreditNote.java
diff --git a/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/DocumentoTributarioRelacionado_DebitNote.java b/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/DocumentoTributarioRelacionado_DebitNote.java
diff --git a/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/Invoice.java b/src/main/java/io/github/project/openubl/xbuilder/content/models/standard/general/Invoice.java
@@ -53,5 +53,5 @@ public class Invoice extends Document {
     private List<Anticipo> anticipos;
 
     @Singular
-    private List<DocumentoTributarioRelacionado_Invoice> otrosDocumentosTributariosRelacionados;
+    private List<DocumentoRelacionado> otrosDocumentosTributariosRelacionados;
 }
diff --git a/src/main/resources/templates/Renderer/creditNote.xml b/src/main/resources/templates/Renderer/creditNote.xml
@@ -10,6 +10,7 @@
     <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 /}
     {#include ubl/standard/include/guias.xml item=this /}
+    {#include ubl/standard/include/documentos-relacionados.xml item=this /}
     {#include ubl/common/signature.xml firmante=this.firmante /}
     {#include ubl/standard/include/supplier.xml proveedor=this.proveedor /}
     {#include ubl/standard/include/customer.xml cliente=this.cliente /}
diff --git a/src/main/resources/templates/Renderer/debitNote.xml b/src/main/resources/templates/Renderer/debitNote.xml
@@ -10,6 +10,7 @@
     <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 /}
     {#include ubl/standard/include/guias.xml item=this /}
+    {#include ubl/standard/include/documentos-relacionados.xml item=this /}
     {#include ubl/common/signature.xml firmante=this.firmante /}
     {#include ubl/standard/include/supplier.xml proveedor=this.proveedor /}
     {#include ubl/standard/include/customer.xml cliente=this.cliente /}
diff --git a/src/main/resources/templates/Renderer/invoice.xml b/src/main/resources/templates/Renderer/invoice.xml
@@ -21,6 +21,7 @@
     </cac:OrderReference>
     {/if}
     {#include ubl/standard/include/guias.xml item=this /}
+    {#include ubl/standard/include/documentos-relacionados.xml item=this /}
     {#each anticipos.orEmpty}
     <cac:AdditionalDocumentReference>
         <cbc:ID>{it.comprobanteSerieNumero}</cbc:ID>
diff --git a/src/main/resources/templates/ubl/standard/include/documentos-relacionados.xml b/src/main/resources/templates/ubl/standard/include/documentos-relacionados.xml
@@ -0,0 +1,6 @@
+    {#each item.documentosRelacionados.orEmpty}
+    <cac:AdditionalDocumentReference>
+        <cbc:ID>{it.serieNumero}</cbc:ID>
+        <cbc:DocumentTypeCode>{it.tipoDocumento}</cbc:DocumentTypeCode>
+    </cac:AdditionalDocumentReference>
+    {/each}
diff --git a/src/test/java/e2e/renderer/invoice/InvoiceDocumentoRelacionadoTest.java b/src/test/java/e2e/renderer/invoice/InvoiceDocumentoRelacionadoTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2019 Project OpenUBL, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License - 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package e2e.renderer.invoice;
+
+import e2e.AbstractTest;
+import e2e.renderer.XMLAssertUtils;
+import io.github.project.openubl.xbuilder.content.catalogs.Catalog1;
+import io.github.project.openubl.xbuilder.content.catalogs.Catalog12;
+import io.github.project.openubl.xbuilder.content.catalogs.Catalog6;
+import io.github.project.openubl.xbuilder.content.models.common.Cliente;
+import io.github.project.openubl.xbuilder.content.models.common.Proveedor;
+import io.github.project.openubl.xbuilder.content.models.standard.general.DocumentoDetalle;
+import io.github.project.openubl.xbuilder.content.models.standard.general.DocumentoRelacionado;
+import io.github.project.openubl.xbuilder.content.models.standard.general.Invoice;
+import io.github.project.openubl.xbuilder.enricher.ContentEnricher;
+import io.github.project.openubl.xbuilder.renderer.TemplateProducer;
+import io.quarkus.qute.Template;
+import java.math.BigDecimal;
+import org.junit.jupiter.api.Test;
+
+public class InvoiceDocumentoRelacionadoTest extends AbstractTest {
+
+    @Test
+    public void testDocumentoRelacionado() throws Exception {
+        // Given
+        Invoice input = Invoice
+            .builder()
+            .serie("F001")
+            .numero(1)
+            .ordenDeCompra("123456")
+            .proveedor(Proveedor.builder().ruc("12345678912").razonSocial("Softgreen S.A.C.").build())
+            .cliente(
+                Cliente
+                    .builder()
+                    .nombre("Carlos Feria")
+                    .numeroDocumentoIdentidad("12121212121")
+                    .tipoDocumentoIdentidad(Catalog6.RUC.toString())
+                    .build()
+            )
+            .detalle(
+                DocumentoDetalle
+                    .builder()
+                    .descripcion("Item1")
+                    .cantidad(new BigDecimal("2"))
+                    .precio(new BigDecimal("100"))
+                    .build()
+            )
+            .detalle(
+                DocumentoDetalle
+                    .builder()
+                    .descripcion("Item2")
+                    .cantidad(new BigDecimal("2"))
+                    .precio(new BigDecimal("100"))
+                    .build()
+            )
+            .documentosRelacionado(
+                DocumentoRelacionado
+                    .builder()
+                    .serieNumero("B111-1")
+                    .tipoDocumento(Catalog12.DECLARACION_SIMPLIFICADA_DE_IMPORTACION.getCode())
+                    .build()
+            )
+            .build();
+
+        ContentEnricher enricher = new ContentEnricher(defaults, dateProvider);
+        enricher.enrich(input);
+
+        // When
+        Template template = TemplateProducer.getInstance().getInvoice();
+        String xml = template.data(input).render();
+
+        // Then
+        XMLAssertUtils.assertSnapshot(xml, getClass(), "documentoRelacionado.xml");
+        XMLAssertUtils.assertSendSunat(xml);
+    }
+}
diff --git a/src/test/resources/e2e/renderer/invoice/InvoiceDocumentoRelacionadoTest/documentoRelacionado.xml b/src/test/resources/e2e/renderer/invoice/InvoiceDocumentoRelacionadoTest/documentoRelacionado.xml

Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,5 @@ public class Invoice extends Document {`
`53`	`53`	`private List<Anticipo> anticipos;`
`54`	`54`
`55`	`55`	`@Singular`
`56`		`- private List<DocumentoTributarioRelacionado_Invoice> otrosDocumentosTributariosRelacionados;`
	`56`	`+ private List<DocumentoRelacionado> otrosDocumentosTributariosRelacionados;`
`57`	`57`	`}`