diff --git a/src/main/java/com/banesco/module/instruction/domain/model/Instruction.java b/src/main/java/com/banesco/module/instruction/domain/model/Instruction.java index 0e741e0..8c1f700 100644 --- a/src/main/java/com/banesco/module/instruction/domain/model/Instruction.java +++ b/src/main/java/com/banesco/module/instruction/domain/model/Instruction.java @@ -2,11 +2,14 @@ package com.banesco.module.instruction.domain.model; import com.banesco.common.domain.exception.HttpStatusCodeException; import com.banesco.common.domain.model.Identifier; +import com.banesco.module.party.domain.model.Party; +import com.banesco.module.party.domain.model.PartyIdentification; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import lombok.*; import java.util.Arrays; +import java.util.List; import java.util.Objects; @Getter @@ -17,14 +20,16 @@ import java.util.Objects; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) public class Instruction { - private InstructionIdentification instructionIdentifier; // Request JSON: "recipientId" - private String instructionDescription; // Request JSON: "signature" + private InstructionInvolvement instructionInvolvement; // Request JSON: "recipientId" + private List instructionDate; // Request JSON: "dateCreate" + private InstructionIdentification instructionIdentifier; // Request JSON: "id" private InstructionPurposeType instructionPurposeType; // Request JSON: "channelOrigin" (BOLE) public static Instruction fromResource( String partyReferenceId, - String channelCode, - String signatureIdentifier + String initiatedDate, + String instructionRequestId, + String channelCode ) { boolean isChannelCodeValid = (Arrays.stream( InstructionPurposeType.values() @@ -35,18 +40,39 @@ public class Instruction { } return Instruction.builder() + .instructionInvolvement( + InstructionInvolvement.builder() + .partyReference( + Party.builder() + .partyIdentification(List.of( + PartyIdentification.builder() + .partyIdentification( + Identifier.builder() + .identifierValue(Objects.toString(partyReferenceId, "")) + .build() + ) + .build() + )) + .build() + ) + .build() + ) .instructionIdentifier( InstructionIdentification.builder() .identification( Identifier.builder() - .identifierValue(partyReferenceId) + .identifierValue(Objects.toString(instructionRequestId, "")) .build() ) .identificationType(InstructionIdentificationType.INSTRUCTION_NUMBER) .build() ) + .instructionDate(List.of( + InstructionDateTime.builder() + .date(Objects.toString(initiatedDate, "")) + .build() + )) .instructionPurposeType(InstructionPurposeType.valueOf(channelCode)) - .instructionDescription(signatureIdentifier) .build(); } } diff --git a/src/main/java/com/banesco/module/instruction/domain/model/InstructionDateTime.java b/src/main/java/com/banesco/module/instruction/domain/model/InstructionDateTime.java new file mode 100644 index 0000000..b9ac89f --- /dev/null +++ b/src/main/java/com/banesco/module/instruction/domain/model/InstructionDateTime.java @@ -0,0 +1,14 @@ +package com.banesco.module.instruction.domain.model; + +import io.quarkus.runtime.annotations.RegisterForReflection; +import lombok.*; + +@Getter +@ToString +@Builder +@NoArgsConstructor +@AllArgsConstructor +@RegisterForReflection +public class InstructionDateTime { + private String date; +} diff --git a/src/main/java/com/banesco/module/instruction/domain/model/InstructionInvolvement.java b/src/main/java/com/banesco/module/instruction/domain/model/InstructionInvolvement.java new file mode 100644 index 0000000..618f96e --- /dev/null +++ b/src/main/java/com/banesco/module/instruction/domain/model/InstructionInvolvement.java @@ -0,0 +1,15 @@ +package com.banesco.module.instruction.domain.model; + +import com.banesco.module.party.domain.model.Party; +import io.quarkus.runtime.annotations.RegisterForReflection; +import lombok.*; + +@Getter +@ToString +@Builder +@NoArgsConstructor +@AllArgsConstructor +@RegisterForReflection +public class InstructionInvolvement { + private Party partyReference; +} diff --git a/src/main/java/com/banesco/module/service_order_payment_search/application/service/ServiceOrderPaymentSearchService.java b/src/main/java/com/banesco/module/service_order_payment_search/application/service/ServiceOrderPaymentSearchService.java index 5ce0e1a..eb73a02 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/application/service/ServiceOrderPaymentSearchService.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/application/service/ServiceOrderPaymentSearchService.java @@ -45,10 +45,10 @@ public class ServiceOrderPaymentSearchService implements ServiceOrderPaymentSear public ApiResponse execute( ServiceOrderPaymentSearchRequest request ) { - log.info("Iniciando ejecucion para la transaccion: {}", request.getId()); + log.info("Iniciando ejecucion para la transaccion: {}", request.getPartyId()); if(!isServiceStatusActive(request)) { - log.info("Estatus del servicio no disponible: {}", request.getId()); + log.info("Estatus del servicio no disponible: {}", request.getPartyId()); throw HttpStatusCodeException.serviceUnavailable("VRN04"); } @@ -79,7 +79,7 @@ public class ServiceOrderPaymentSearchService implements ServiceOrderPaymentSear private ApiResponse domain( ServiceOrderPaymentSearchRequest request ) { - log.info("Ejecutando llamada al api de dominio: {}", request.getId()); + log.info("Ejecutando llamada al api de dominio: {}", request.getPartyId()); return domainUseCase.execute(request, ServiceOrderPaymentSearchResponse.class); } diff --git a/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java b/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java index 51f3b8b..97881c1 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/domain/dto/request/ServiceOrderPaymentSearchRequest.java @@ -1,6 +1,7 @@ package com.banesco.module.service_order_payment_search.domain.dto.request; import com.banesco.module.instruction.domain.model.Instruction; +import com.banesco.module.instruction.domain.model.InstructionPurposeType; import io.quarkus.runtime.annotations.RegisterForReflection; import lombok.*; @@ -23,22 +24,51 @@ public class ServiceOrderPaymentSearchRequest { @NonNull private Instruction procedureRequest; - public String getId() { - return getProcedureRequest().getInstructionIdentifier().getIdentification().getIdentifierValue(); + public String getPartyId() { + return getProcedureRequest() + .getInstructionInvolvement() + .getPartyReference() + .getPartyIdentification() + .get(0) + .getPartyIdentification() + .getIdentifierValue(); + } + + public String getInitiatedDate() { + return getProcedureRequest() + .getInstructionDate() + .get(0) + .getDate(); + } + + public String getPaymentRequestId() { + return getProcedureRequest() + .getInstructionIdentifier() + .getIdentification() + .getIdentifierValue(); } public String getChannelCode() { return getProcedureRequest().getInstructionPurposeType().name(); } - public String getSignatureIdentifier() { - return getProcedureRequest().getInstructionDescription(); + public boolean isBole() { + return getProcedureRequest().getInstructionPurposeType() == InstructionPurposeType.BOLE; + } + + public Map toParams() { + return Map.ofEntries( + entry("partyReferenceId", Objects.toString(getPartyId(), "")), + entry("channelCode", Objects.toString(getChannelCode(), "")) + ); } public Map toQueryString() { return Map.ofEntries( entry("appId", Objects.toString(getAppId(), "")), - entry("customerReferenceFintechId", Objects.toString(getCustomerReferenceFintechId(), "")) + entry("customerReferenceFintechId", Objects.toString(getCustomerReferenceFintechId(), "")), + entry("initiatedDate", Objects.toString(getInitiatedDate(), "")), + entry("paymentRequestId", Objects.toString(getPaymentRequestId(), "")) ); } } \ No newline at end of file diff --git a/src/main/java/com/banesco/module/service_order_payment_search/domain/model/ServicingOrderProcedure.java b/src/main/java/com/banesco/module/service_order_payment_search/domain/model/ServicingOrderProcedure.java index 65a58e4..40710f0 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/domain/model/ServicingOrderProcedure.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/domain/model/ServicingOrderProcedure.java @@ -2,6 +2,7 @@ package com.banesco.module.service_order_payment_search.domain.model; import com.banesco.module.document.domain.model.Document; import com.banesco.module.transaction.domain.model.Transaction; +import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import lombok.*; @@ -11,7 +12,10 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @RegisterForReflection +@JsonInclude(JsonInclude.Include.NON_NULL) public class ServicingOrderProcedure { - private Document document; // fileName - private Transaction transaction; // status, accepted, rejected, expired + private Document document; // BOLE: fileName + // BOLE: nroRequest, status, accepted, rejected, expired, dispatchDate, quantity + // BOL: id, requestType, emitterReceptor, status, amount, currency, concept, dateCreate + private Transaction transaction; } diff --git a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/client/DomServiceOrderPaymentSearchClient.java b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/client/DomServiceOrderPaymentSearchClient.java index 281d83e..240e13d 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/client/DomServiceOrderPaymentSearchClient.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/client/DomServiceOrderPaymentSearchClient.java @@ -13,8 +13,6 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import lombok.extern.slf4j.Slf4j; -import java.util.Map; - @Slf4j @ApplicationScoped public class DomServiceOrderPaymentSearchClient implements DomainUseCase { @@ -36,19 +34,13 @@ public class DomServiceOrderPaymentSearchClient implements DomainUseCase { ServiceOrderPaymentSearchRequest params, Class responseType ) { - String partyReferenceId = params.getId(); - String channelCode = params.getChannelCode(); - String signatureIdentifier = params.getSignatureIdentifier(); + String partyReferenceId = params.getPartyId(); HttpRequest request = HttpRequest.forApiResponse( domainConfig.getUrl(), HttpRequest.HttpMethod.GET, responseType ) - .withPathParams(Map.of( - "partyReferenceId", partyReferenceId, - "channelCode", channelCode, - "signatureIdentifier", signatureIdentifier - )) + .withPathParams(params.toParams()) .withQueryParams(params.toQueryString()) .withTimeout( domainConfig.getTimeout().getConnect(), diff --git a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/resource/ServiceOrderPaymentSearchResource.java b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/resource/ServiceOrderPaymentSearchResource.java index e294384..9e3fc81 100644 --- a/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/resource/ServiceOrderPaymentSearchResource.java +++ b/src/main/java/com/banesco/module/service_order_payment_search/infrastructure/resource/ServiceOrderPaymentSearchResource.java @@ -43,7 +43,7 @@ public class ServiceOrderPaymentSearchResource { } @GET - @Path("/retrieve/{partyReferenceId}/{channelCode}/{signatureIdentifier}") + @Path("/retrieve/{partyReferenceId}/{channelCode}") @Operation( summary = "Recuperar informacion de la transaccion", description = "Consulta de una trasanccion de pago por id de archivo" @@ -67,73 +67,234 @@ public class ServiceOrderPaymentSearchResource { ) } ), - examples = @ExampleObject( - name = "Ejemplo exitoso", - value = """ - { - "data": { - "servicingOrderProcedure": [ - { - "document": { - "documentName": "TESTING.CSV" - }, - "transaction": { - "transactionIdentification": { - "identifierValue": "2" + examples = { + @ExampleObject( + name = "Ejemplo exitoso (BOLE)", + value = """ + { + "data": { + "servicingOrderProcedure": [ + { + "document": { + "documentName": "TESTING.CSV" }, - "transactionStatus": { - "statusType": "PENDING", - "statusName": "PENDIENTE", - "statusAccepted": 0, - "statusRejected": 0, - "statusExpired": 2 - }, - "transactionDate": [ - { - "dateType": "EXECUTED_DATE", - "date": "2026-01-05 14:35:45.0372395" + "transaction": { + "transactionIdentification": { + "identifierValue": "2" + }, + "transactionStatus": { + "statusType": "PENDING", + "statusName": "PENDIENTE", + "statusAccepted": 0, + "statusRejected": 0, + "statusExpired": 2 + }, + "transactionDate": [ + { + "dateType": "EXECUTED_DATE", + "date": "2026-01-05 14:35:45.0372395" + } + ], + "transactionDetails": { + "transactionQuantity": 1000 + } + } + }, + { + "document": { + "documentName": "TESTING.CSV" + }, + "transaction": { + "transactionIdentification": { + "identifierValue": "3" + }, + "transactionStatus": { + "statusType": "IN_PROGRESS", + "statusName": "EN CURSO", + "statusAccepted": 0, + "statusRejected": 0, + "statusExpired": 5 + }, + "transactionDate": [ + { + "dateType": "EXECUTED_DATE", + "date": "2026-01-05 14:39:52.3840159" + } + ], + "transactionDetails": { + "transactionQuantity": 1000 } - ], - "transactionDetails": { - "transactionQuantity": 1000 } } - }, + ] + }, + "statusResponse": { + "statusCode": "200", + "message": "Operacion exitosa" + } + } + """ + ), + @ExampleObject( + name = "Ejemplo exitoso (BOL)", + value = """ { - "document": { - "documentName": "TESTING.CSV" - }, - "transaction": { - "transactionIdentification": { - "identifierValue": "3" - }, - "transactionStatus": { - "statusType": "IN_PROGRESS", - "statusName": "EN CURSO", - "statusAccepted": 0, - "statusRejected": 0, - "statusExpired": 5 - }, - "transactionDate": [ - { - "dateType": "EXECUTED_DATE", - "date": "2026-01-05 14:39:52.3840159" + "data": { + "servicingOrderProcedure": [ + { + "transaction": { + "transactionIdentification": { + "identifierValue": "1" + }, + "transactionStatus": { + "statusType": "APPROVED", + "statusName": "Aprobada" + }, + "transactionDate": [ + { + "dateType": "INITIATED_DATE", + "date": "2024-06-15T10:30:00Z" + } + ], + "transactionInvolvement": [ + { + "partyReference": { + "partyIdentification": [ + { + "partyIdentification": { + "identifierValue": "V20132859" + } + } + ] + } + } + ], + "financialTransaction": { + "amount": 150.75, + "currencyCode": "VES" + }, + "name": "Enviada", + "description": "cobro a pepito" + } + }, + { + "transaction": { + "transactionIdentification": { + "identifierValue": "2" + }, + "transactionStatus": { + "statusType": "PENDING", + "statusName": "Pendiente" + }, + "transactionDate": [ + { + "dateType": "INITIATED_DATE", + "date": "2024-06-16T14:49:00Z" + } + ], + "transactionInvolvement": [ + { + "partyReference": { + "partyIdentification": [ + { + "partyIdentification": { + "identifierValue": "V20132859" + } + } + ] + } + } + ], + "financialTransaction": { + "amount": 350.0, + "currencyCode": "VES" + }, + "name": "Recibida", + "description": "pago a proveedor" + } + }, + { + "transaction": { + "transactionIdentification": { + "identifierValue": "3" + }, + "transactionStatus": { + "statusType": "REJECTED", + "statusName": "Rechazado" + }, + "transactionDate": [ + { + "dateType": "INITIATED_DATE", + "date": "2024-06-17T09:15:00Z" + } + ], + "transactionInvolvement": [ + { + "partyReference": { + "partyIdentification": [ + { + "partyIdentification": { + "identifierValue": "V20132859" + } + } + ] + } + } + ], + "financialTransaction": { + "amount": 200.0, + "currencyCode": "VES" + }, + "name": "Enviada", + "description": "cobro a cliente" + } + }, + { + "transaction": { + "transactionIdentification": { + "identifierValue": "4" + }, + "transactionStatus": { + "statusType": "APPROVED", + "statusName": "Aprobada" + }, + "transactionDate": [ + { + "dateType": "INITIATED_DATE", + "date": "2024-06-18T11:20:00Z" + } + ], + "transactionInvolvement": [ + { + "partyReference": { + "partyIdentification": [ + { + "partyIdentification": { + "identifierValue": "V20132859" + } + } + ] + } + } + ], + "financialTransaction": { + "amount": 750.0, + "currencyCode": "VES" + }, + "name": "Recibida", + "description": "pago a proveedor" } - ], - "transactionDetails": { - "transactionQuantity": 1000 } - } + ] + }, + "statusResponse": { + "statusCode": "200", + "message": "Operacion exitosa" + } } - ] - }, - "statusResponse": { - "statusCode": "200", - "message": "Operacion exitosa" - } - } - """ - ) + """ + ) + } ) ), @APIResponse( @@ -272,17 +433,21 @@ public class ServiceOrderPaymentSearchResource { @Parameter(description = "Codigo del canal (BOL, BOLE)", required = true, example = "BOLE") String channelCode, - @PathParam("signatureIdentifier") - @Parameter(description = "Firma del archivo", required = true, example = "f8c226f844339c55bf898162c5d7de5d8116cee6028e1b357414dcc686b3ea85") - String signatureIdentifier, - @QueryParam("customerReferenceFintechId") @Parameter(description = "ID de la fintech", example = "pranical-test") String customerReferenceFintechId, @QueryParam("appId") @Parameter(description = "ID de la aplicacion", example = "DANIAPP") - String appId + String appId, + + @QueryParam("initiatedDate") + @Parameter(description = "Fecha de creación", example = "2024-06-15T10:30:00Z") + String initiatedDate, + + @QueryParam("instructionRequestId") + @Parameter(description = "ID de la peticion de pago", example = "1") + String instructionRequestId ) { log.info("Iniciando consulta para instruccion de archivo id: {}", partyReferenceId); @@ -292,7 +457,10 @@ public class ServiceOrderPaymentSearchResource { .customerReferenceFintechId(Objects.toString(customerReferenceFintechId, "")) .appId(Objects.toString(appId, "")) .procedureRequest(Instruction.fromResource( - partyReferenceId, channelCode, signatureIdentifier + partyReferenceId, + initiatedDate, + instructionRequestId, + channelCode )) .build() )).build(); diff --git a/src/main/java/com/banesco/module/transaction/domain/model/FinancialTransaction.java b/src/main/java/com/banesco/module/transaction/domain/model/FinancialTransaction.java new file mode 100644 index 0000000..3b2c285 --- /dev/null +++ b/src/main/java/com/banesco/module/transaction/domain/model/FinancialTransaction.java @@ -0,0 +1,19 @@ +package com.banesco.module.transaction.domain.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.quarkus.runtime.annotations.RegisterForReflection; +import lombok.*; + +import java.math.BigDecimal; + +@Getter +@ToString +@Builder +@NoArgsConstructor +@AllArgsConstructor +@RegisterForReflection +@JsonInclude(JsonInclude.Include.NON_NULL) +public class FinancialTransaction { + private BigDecimal amount; // BOL: amount + private String currencyCode; // BOL: currency +} diff --git a/src/main/java/com/banesco/module/transaction/domain/model/Transaction.java b/src/main/java/com/banesco/module/transaction/domain/model/Transaction.java index cf0b0b4..b43875b 100644 --- a/src/main/java/com/banesco/module/transaction/domain/model/Transaction.java +++ b/src/main/java/com/banesco/module/transaction/domain/model/Transaction.java @@ -1,6 +1,7 @@ package com.banesco.module.transaction.domain.model; import com.banesco.common.domain.model.Identifier; +import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import lombok.*; @@ -12,9 +13,14 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @RegisterForReflection +@JsonInclude(JsonInclude.Include.NON_NULL) public class Transaction { - private Identifier transactionIdentification; // nroRequest - private TransactionStatus transactionStatus; // status, accepted, rejected, expired - private List transactionDate; // dispatchDate - private TransactionDetails transactionDetails; // quantity + private Identifier transactionIdentification; // BOLE: nroRequest | BOL: id + private TransactionStatus transactionStatus; // BOLE: status, accepted, rejected, expired | BOL: status + private List transactionDate; // BOLE: dispatchDate | BOL: dateCreate + private TransactionDetails transactionDetails; // BOLE: quantity + private List transactionInvolvement; // BOL: emitterReceptor + private FinancialTransaction financialTransaction; // BOL: amount, currency + private String name; // BOL: requestType + private String description; // BOL: concept } diff --git a/src/main/java/com/banesco/module/transaction/domain/model/TransactionDateTime.java b/src/main/java/com/banesco/module/transaction/domain/model/TransactionDateTime.java index 3381fef..6ff6115 100644 --- a/src/main/java/com/banesco/module/transaction/domain/model/TransactionDateTime.java +++ b/src/main/java/com/banesco/module/transaction/domain/model/TransactionDateTime.java @@ -11,5 +11,5 @@ import lombok.*; @RegisterForReflection public class TransactionDateTime { private TransactionDateTimeType dateType; - private String date; + private String date; // BOLE: dispatchDate | BOL: dateCreate } diff --git a/src/main/java/com/banesco/module/transaction/domain/model/TransactionDetails.java b/src/main/java/com/banesco/module/transaction/domain/model/TransactionDetails.java index 1db29f0..4c0633e 100644 --- a/src/main/java/com/banesco/module/transaction/domain/model/TransactionDetails.java +++ b/src/main/java/com/banesco/module/transaction/domain/model/TransactionDetails.java @@ -1,5 +1,6 @@ package com.banesco.module.transaction.domain.model; +import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import lombok.*; @@ -11,6 +12,7 @@ import java.math.BigDecimal; @NoArgsConstructor @AllArgsConstructor @RegisterForReflection +@JsonInclude(JsonInclude.Include.NON_NULL) public class TransactionDetails { - private BigDecimal transactionQuantity; // quantity + private BigDecimal transactionQuantity; // BOLE: quantity } diff --git a/src/main/java/com/banesco/module/transaction/domain/model/TransactionInvolvement.java b/src/main/java/com/banesco/module/transaction/domain/model/TransactionInvolvement.java new file mode 100644 index 0000000..b7a859b --- /dev/null +++ b/src/main/java/com/banesco/module/transaction/domain/model/TransactionInvolvement.java @@ -0,0 +1,17 @@ +package com.banesco.module.transaction.domain.model; + +import com.banesco.module.party.domain.model.Party; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.quarkus.runtime.annotations.RegisterForReflection; +import lombok.*; + +@Getter +@ToString +@Builder +@NoArgsConstructor +@AllArgsConstructor +@RegisterForReflection +@JsonInclude(JsonInclude.Include.NON_NULL) +public class TransactionInvolvement { + private Party partyReference; // BOL: emitterReceptor +} diff --git a/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatus.java b/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatus.java index 7cbd2d3..2f007d9 100644 --- a/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatus.java +++ b/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatus.java @@ -1,5 +1,6 @@ package com.banesco.module.transaction.domain.model; +import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import lombok.*; @@ -9,10 +10,11 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @RegisterForReflection +@JsonInclude(JsonInclude.Include.NON_NULL) public class TransactionStatus { - private TransactionStatusType statusType; // status - private String statusName; // status - private Long statusAccepted; // accepted - private Long statusRejected; // rejected - private Long statusExpired; // expired + private TransactionStatusType statusType; // BOLE: status | BOL: status + private String statusName; // BOLE: status | BOL: status + private Long statusAccepted; // BOLE: accepted + private Long statusRejected; // BOLE: rejected + private Long statusExpired; // BOLE: expired } diff --git a/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatusType.java b/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatusType.java index 6680ba4..1ed587d 100644 --- a/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatusType.java +++ b/src/main/java/com/banesco/module/transaction/domain/model/TransactionStatusType.java @@ -7,6 +7,7 @@ public enum TransactionStatusType { EXECUTED, CANCELLED, CONFIRMED, + APPROVED, SUSPENDED, PENDING, COMPLETED, @@ -15,4 +16,5 @@ public enum TransactionStatusType { REJECTED, EXPIRED, SENT, + RECEIVED, } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c5be901..7cb50b9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -17,6 +17,6 @@ api: key: 'bus-service-order-payment-search' content: '[{"backendCode":"200","httpCode":200,"statusCode":"200","description":"Operacion exitosa"},{"backendCode":"R404","httpCode":404,"statusCode":"404","description":"Datos de validacion no encontrado."},{"backendCode":"503","httpCode":503,"statusCode":"503","description":"Uso interno"},{"backendCode":"422","httpCode":422,"statusCode":"422","description":"Uso interno"},{"backendCode":"500","httpCode":500,"statusCode":"500","description":"Uso interno"},{"backendCode":"100","httpCode":503,"statusCode":"503","description":"VDR13 - OSB Disponible"},{"backendCode":"OSB-382505","httpCode":503,"statusCode":"503","description":"VDR13 - OSB Disponible"},{"backendCode":"OSB-380002","httpCode":503,"statusCode":"503","description":"VDR13 - OSB Disponible"},{"backendCode":"ERROR","httpCode":400,"statusCode":"400","description":"Uso interno"},{"backendCode":"400","httpCode":400,"statusCode":"400","description":"Uso interno"},{"backendCode":"401","httpCode":401,"statusCode":"401","description":"Uso interno"},{"backendCode":"403","httpCode":403,"statusCode":"403","description":"Uso interno"},{"backendCode":"404","httpCode":404,"statusCode":"404","description":"Uso interno"},{"backendCode":"default","httpCode":409,"statusCode":"409","description":"Conflicto"},{"backendCode":"424","httpCode":424,"statusCode":"424","description":"Error de dependencia"},{"backendCode":"VDE01","httpCode":400,"statusCode":"VDE01","description":"VDE01 - Error en dato de entrada obligatorio: %s"},{"backendCode":"VDE02","httpCode":400,"statusCode":"VDE02","description":"VDE02 - Error en valor permitido para campo: %s"},{"backendCode":"VRN04","httpCode":"503","statusCode":"VRN04","description":"Servicio en horario de mantenimiento","status":"error"},{"backendCode":"204","httpCode":"200","statusCode":"200","description":"Cliente sin productos","status":"ok"}]' rest-client: - dom-service-order-payment-search: '{"url":"http://localhost:8083/service-order-payment-search/retrieve/{partyReferenceId}/{channelCode}/{signatureIdentifier}","timeout":{"connect":10000,"response":10000}}' + dom-service-order-payment-search: '{"url":"http://localhost:8083/service-order-payment-search/retrieve/{partyReferenceId}/{channelCode}","timeout":{"connect":10000,"response":10000}}' security-trace: '{"url":"http://api-register-security-route-apis-banesco-dev.apps.desplakur3.desintra.banesco.com/register-security/save","timeout":{"connect":10000,"response":10000},"request":{"sp":"spAPI_Traza","eventCod":"CANCTARJ","bankCod":"01","curCod":"BS"}}' service-status: '{"url":"http://api-get-service-status-route-apis-banesco-dev.apps.desplakur3.desintra.banesco.com/service/status","timeout":{"connect":10000,"response":10000},"request":{"applicationId": "","transactionId": "","bankService": {"bankCode": "01","serviceCode": "APIFI","eventCode": "P2PVUEL"}}}' \ No newline at end of file