Merge pull request #1309 from fiterlatam/SU-198

[SU-198] Facturación electrónica: Parametrizaciones
fiterlatam · Nov 21, 2024 · 96d3a44 · 96d3a44
2 parents 7ec61f2 + 89c4cda
commit 96d3a44
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 3 deletions.
diff --git a/.../fineract/portfolio/loanproductparameterization/data/LoanProductParameterizationData.java b/.../fineract/portfolio/loanproductparameterization/data/LoanProductParameterizationData.java
@@ -51,4 +51,8 @@ public class LoanProductParameterizationData {
     private Long lastCreditNoteNumber;
 
     private Long lastDebitNoteNumber;
+
+    private String technicalKey;
+
+    private String note;
 }
diff --git a/...he/fineract/portfolio/loanproductparameterization/domain/LoanProductParameterization.java b/...he/fineract/portfolio/loanproductparameterization/domain/LoanProductParameterization.java
@@ -71,9 +71,16 @@ public class LoanProductParameterization extends AbstractAuditableWithUTCDateTim
     @Column(name = "last_debit_note_number")
     private Long lastDebitNoteNumber;
 
+    @Column(name = "clave_tecnica")
+    private String technicalKey;
+
+    @Column(name = "nota")
+    private String note;
+
     public LoanProductParameterizationData toData() {
         return new LoanProductParameterizationData(getId(), productType, billingPrefix, billingResolutionNumber, generationDate,
-                expirationDate, rangeStartNumber, rangeEndNumber, lastInvoiceNumber, lastCreditNoteNumber, lastDebitNoteNumber);
+                expirationDate, rangeStartNumber, rangeEndNumber, lastInvoiceNumber, lastCreditNoteNumber, lastDebitNoteNumber,
+                technicalKey, note);
     }
 
     public static LoanProductParameterization create(JsonCommand command) {
@@ -113,6 +120,12 @@ public void update(JsonCommand command) {
         if (updatedParameters.getLastDebitNoteNumber() != null) {
             this.lastDebitNoteNumber = updatedParameters.getLastDebitNoteNumber();
         }
+        if (StringUtils.isNotBlank(updatedParameters.getTechnicalKey())) {
+            this.technicalKey = updatedParameters.getTechnicalKey();
+        }
+        if (StringUtils.isNotBlank(updatedParameters.getNote())) {
+            this.note = updatedParameters.getNote();
+        }
     }
 
     private static LoanProductParameterization extractParameters(JsonCommand command) {
@@ -126,6 +139,8 @@ private static LoanProductParameterization extractParameters(JsonCommand command
         final Long lastInvoiceNumber = command.longValueOfParameterNamed("lastInvoiceNumber");
         final Long lastCreditNoteNumber = command.longValueOfParameterNamed("lastCreditNoteNumber");
         final Long lastDebitNoteNumber = command.longValueOfParameterNamed("lastDebitNoteNumber");
+        final String note = command.stringValueOfParameterNamed("note");
+        final String technicalKey = command.stringValueOfParameterNamed("technicalKey");
 
         // validate that rangeStartNumber is less than rangeEndNumber
         if (rangeStartNumber > rangeEndNumber) {
@@ -141,7 +156,7 @@ private static LoanProductParameterization extractParameters(JsonCommand command
         }
 
         return new LoanProductParameterization(productType, billingPrefix, billingResolutionNumber, generationDate, expirationDate,
-                rangeStartNumber, rangeEndNumber, lastInvoiceNumber, lastCreditNoteNumber, lastDebitNoteNumber);
+                rangeStartNumber, rangeEndNumber, lastInvoiceNumber, lastCreditNoteNumber, lastDebitNoteNumber, technicalKey, note);
     }
 
     public boolean isInvoiceResolutionExpiring(Long daysPrior) {

diff --git a/...olio/loanproductparameterization/service/LoanProductParameterizationWriteServiceImpl.java b/...olio/loanproductparameterization/service/LoanProductParameterizationWriteServiceImpl.java
@@ -45,8 +45,8 @@ public class LoanProductParameterizationWriteServiceImpl implements LoanProductP
     @Override
     public CommandProcessingResult createProductParameterization(JsonCommand command) {
 
-        LoanProductParameterization productParameterization = LoanProductParameterization.create(command);
         loanProductParameterDataValidator.validateForCreate(command.json());
+        LoanProductParameterization productParameterization = LoanProductParameterization.create(command);
         LoanProductParameterization savedProductParameterization = productParameterizationRepository.save(productParameterization);
 
         return CommandProcessingResult.commandOnlyResult(savedProductParameterization.getId());

diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
@@ -320,4 +320,5 @@
     <include file="parts/20243008011009140_SU_441_update_report.xml" relativeToChangelogFile="true"/>
     <include file="parts/20242708011009113_SU-199_invoice_job.xml" relativeToChangelogFile="true"/>
     <include file="parts/20243008011009141_SU_441_update_report.xml" relativeToChangelogFile="true"/>
+    <include file="parts/20240529122200_SU_198_loan-product-parameters-1.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/...n/resources/db/changelog/tenant/parts/20240529122200_SU_198_loan-product-parameters-1.xml b/...n/resources/db/changelog/tenant/parts/20240529122200_SU_198_loan-product-parameters-1.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 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
+
+    http://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.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+    <changeSet author="fineract" id="1">
+        <addColumn tableName="m_product_type_parameters">
+            <column name="clave_tecnica" type="varchar(100)" remarks="Clave técnica de la resolución"/>
+            <column name="nota" type="text" remarks="Nota completa de la resolución"/>
+        </addColumn>
+    </changeSet>
+
+
+</databaseChangeLog>