diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/enricher/config/Defaults.java b/core/src/main/java/io/github/project/openubl/xbuilder/enricher/config/Defaults.java index 4fc9d656..40926af4 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/enricher/config/Defaults.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/enricher/config/Defaults.java @@ -24,10 +24,7 @@ @Getter @Builder public class Defaults { - - private String moneda; - private String unidadMedida; - private BigDecimal icbTasa; - private BigDecimal igvTasa; - private BigDecimal ivapTasa; + private BigDecimal icbTasa = new BigDecimal("0.5"); + private BigDecimal igvTasa = new BigDecimal("0.18"); + private BigDecimal ivapTasa = new BigDecimal("0.04"); } diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/enricher/kie/rules/enrich/body/detalle/UnidadDeMedidaRule.java b/core/src/main/java/io/github/project/openubl/xbuilder/enricher/kie/rules/enrich/body/detalle/UnidadDeMedidaRule.java index 6b85532f..aa313f81 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/enricher/kie/rules/enrich/body/detalle/UnidadDeMedidaRule.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/enricher/kie/rules/enrich/body/detalle/UnidadDeMedidaRule.java @@ -30,15 +30,15 @@ public class UnidadDeMedidaRule extends AbstractBodyRule { @Override public boolean test(Object object) { - return ( - isSalesDocumentItem.test(object) && - whenSalesDocumentItem.apply(object).map(documento -> documento.getUnidadMedida() == null).orElse(false) + return (isSalesDocumentItem.test(object) && whenSalesDocumentItem.apply(object) + .map(documento -> documento.getUnidadMedida() == null) + .orElse(false) ); } @Override public void modify(Object object) { - Consumer consumer = detalle -> detalle.setUnidadMedida(getDefaults().getUnidadMedida()); + Consumer consumer = detalle -> detalle.setUnidadMedida("NIU"); whenSalesDocumentItem.apply(object).ifPresent(consumer); } } diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/enricher/kie/rules/enrich/header/MonedaRule.java b/core/src/main/java/io/github/project/openubl/xbuilder/enricher/kie/rules/enrich/header/MonedaRule.java index 4ad6699f..a2a081ae 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/enricher/kie/rules/enrich/header/MonedaRule.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/enricher/kie/rules/enrich/header/MonedaRule.java @@ -38,7 +38,7 @@ public boolean test(Object object) { @Override public void modify(Object object) { - Consumer consumer = document -> document.setMoneda(getDefaults().getMoneda()); + Consumer consumer = document -> document.setMoneda("PEN"); whenDocument.apply(object).ifPresent(consumer); } } diff --git a/core/src/test/java/e2e/AbstractTest.java b/core/src/test/java/e2e/AbstractTest.java index 13f121e6..743fd2bf 100644 --- a/core/src/test/java/e2e/AbstractTest.java +++ b/core/src/test/java/e2e/AbstractTest.java @@ -32,8 +32,6 @@ public class AbstractTest { protected static final Defaults defaults = Defaults.builder() - .moneda("PEN") - .unidadMedida("NIU") .icbTasa(new BigDecimal("0.2")) .igvTasa(new BigDecimal("0.18")) .ivapTasa(new BigDecimal("0.04")) diff --git a/core/src/test/java/e2e/enricher/enrich/DetalleTest.java b/core/src/test/java/e2e/enricher/enrich/DetalleTest.java index 405625e1..4ddffb46 100644 --- a/core/src/test/java/e2e/enricher/enrich/DetalleTest.java +++ b/core/src/test/java/e2e/enricher/enrich/DetalleTest.java @@ -41,7 +41,7 @@ public void testEnrichUnidadMedida() { input .getDetalles() .forEach(detalle -> { - assertEquals(defaults.getUnidadMedida(), detalle.getUnidadMedida()); + assertEquals("NIU", detalle.getUnidadMedida()); }); } diff --git a/core/src/test/java/e2e/enricher/enrich/GeneralDocumentTest.java b/core/src/test/java/e2e/enricher/enrich/GeneralDocumentTest.java index fcd98d69..7604da6f 100644 --- a/core/src/test/java/e2e/enricher/enrich/GeneralDocumentTest.java +++ b/core/src/test/java/e2e/enricher/enrich/GeneralDocumentTest.java @@ -43,7 +43,7 @@ public void testEnrichMoneda() { enricher.enrich(input); // Then - assertEquals(defaults.getMoneda(), input.getMoneda()); + assertEquals("PEN", input.getMoneda()); } @Test diff --git a/quarkus-extension/runtime/src/main/java/io/github/project/openubl/quarkus/xbuilder/runtime/DefaultXBuilder.java b/quarkus-extension/runtime/src/main/java/io/github/project/openubl/quarkus/xbuilder/runtime/DefaultXBuilder.java index 8f63277a..c8c982da 100644 --- a/quarkus-extension/runtime/src/main/java/io/github/project/openubl/quarkus/xbuilder/runtime/DefaultXBuilder.java +++ b/quarkus-extension/runtime/src/main/java/io/github/project/openubl/quarkus/xbuilder/runtime/DefaultXBuilder.java @@ -54,10 +54,7 @@ public Template getTemplate(Type type) { @Override public Defaults getDefaults() { - return Defaults - .builder() - .moneda(config.moneda.orElse("PEN")) - .unidadMedida(config.unidadMedida.orElse("NIU")) + return Defaults.builder() .igvTasa(config.igvTasa.orElse(new BigDecimal("0.18"))) .icbTasa(config.icbTasa.orElse(new BigDecimal("0.2"))) .build();