From e8fec5cc70ce44058f2542a572f2e5e08a7782c7 Mon Sep 17 00:00:00 2001 From: "MSI\\migue" Date: Thu, 29 May 2025 15:23:11 -0400 Subject: [PATCH] first --- .drone.yml | 145 ++++++++ .droneBK.yml | 93 +++++ .env | 3 + .gitignore | 33 ++ .gitlab-ci.yml | 131 +++++++ .mvn/maven.config | 4 + .mvn/settings.xml | 77 ++++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 58727 bytes .mvn/wrapper/maven-wrapper.properties | 2 + README.md | 185 ++++++++++ deployment.yml | 222 +++++++++++ entrypoint.sh | 4 + mvnw | 316 ++++++++++++++++ mvnw.cmd | 188 ++++++++++ nexus-settings.xml | 105 ++++++ numerotemporal-service-api.yaml | 184 ++++++++++ pom.xml | 344 ++++++++++++++++++ sonar-project.properties | 22 ++ src/main/docker/app.env | 2 + src/main/docker/dockerfile | 20 + .../service/NumeroTemporalAplicacion.java | 22 ++ .../service/adapters/Adapter.java | 22 ++ .../temporal/NumeroTemporalAdaptador.java | 48 +++ .../temporal/NumeroTemporalRecurso.java | 251 +++++++++++++ .../adapters/dto/common/ErrorStructure.java | 15 + .../dto/common/OperationException.java | 14 + .../adapters/dto/common/ResponseError.java | 10 + .../soap/service/TemporalEndpoint.java | 31 ++ .../soap/service/WebServiceConfig.java | 52 +++ .../soap/service/WebServiceConfig2.java | 38 ++ .../CustomPayloadTransformingInterceptor.java | 73 ++++ .../interceptor/InterceptorConfig.java | 18 + .../configuration/MsTemplateConfig.java | 24 ++ .../controller/core/BaseController.java | 108 ++++++ .../controller/core/ErrorPageController.java | 66 ++++ .../services/AdditionalParameters.java | 71 ++++ .../external/services/ConsultaRequest.java | 61 ++++ .../external/services/ConsultaResponse.java | 293 +++++++++++++++ .../service/external/services/Consultar.java | 63 ++++ .../services/ConsultarNumeroTemporal.java | 31 ++ .../ConsultarNumeroTemporal_Service.java | 88 +++++ .../external/services/ConsultarResponse.java | 62 ++++ .../services/MsisdnInformationType.java | 68 ++++ .../external/services/MsisdnListType.java | 71 ++++ .../service/external/services/Numbers.java | 89 +++++ .../external/services/ObjectFactory.java | 184 ++++++++++ .../external/services/ParameterType.java | 88 +++++ .../service/external/services/Parameters.java | 87 +++++ .../external/services/RequestBody.java | 90 +++++ .../external/services/ResponseBody.java | 335 +++++++++++++++++ .../external/services/ResponseHeader.java | 88 +++++ .../external/services/common/Constants.java | 26 ++ .../external/services/package-info.java | 2 + .../services/personalizado/BodyResponse.java | 34 ++ .../personalizado/ConsultarResponse.java | 17 + .../personalizado/HeaderResponse.java | 33 ++ .../services/personalizado/MsisdnInfo.java | 121 ++++++ .../services/personalizado/MsisdnList.java | 26 ++ .../services/personalizado/ReturnElement.java | 37 ++ .../service/common/GenerateErrorService.java | 14 + .../common/GenerateErrorServiceImp.java | 92 +++++ .../service/messaging/ErrorMapper.java | 99 +++++ .../messaging/MessageIdentifiersImp.java | 80 ++++ .../numero/propiedades/Propiedades.java | 20 + .../PropiedadesImplementacion.java | 60 +++ .../propiedades/map/PropiedadesCabeceras.java | 21 ++ .../propiedades/map/PropiedadesRespuesta.java | 18 + .../map/PropiedadesVariableRuta.java | 20 + .../service/numero/temporal/Consultar.java | 14 + .../temporal/ConsultarImplementacion.java | 78 ++++ src/main/resources/application.properties | 106 ++++++ src/main/resources/applicationDEV.properties | 105 ++++++ src/main/resources/applicationTEST.properties | 105 ++++++ src/main/resources/banner.txt | 9 + .../data/20220817180800_pipeline_view.xml | 40 ++ .../20220822174600_pipeline_configuration.xml | 41 +++ .../20220825154700_oc_adapter_definition.xml | 20 + .../20220825155100_oc_adapter_endpoint.xml | 20 + .../data/20220826171400_error_message.xml | 16 + ...28165609_vt_config_dba_errorcode_table.xml | 21 ++ .../20220811103406_entity_update.xml | 163 +++++++++ src/main/resources/db/data/ERROR_MESSAGE.csv | 13 + .../db/data/OC_ACTION_DEFINITION.csv | 1 + .../db/data/OC_ADAPTER_DEFINITION.csv | 1 + .../resources/db/data/OC_ADAPTER_ENDPOINT.csv | 1 + .../db/data/OC_EXECUTION_PIPELINE.csv | 1 + .../db/data/OC_PIPELINE_DEFINITION.csv | 1 + .../db/data/VT_CONFIG_DBA_ERRORCODE_TABLE.csv | 1 + src/main/resources/db/master.xml | 15 + src/main/resources/workspace/delete.txt | 0 .../wsdl/ConsultarNumeroTemporal.xsd | 102 ++++++ .../wsdl/ConsultarNumeroTemporal_1.wsdl | 37 ++ src/main/resources/wsdl/MAIN.wsdl | 214 +++++++++++ .../service/MsTemplateTestApplication.java | 12 + .../service/controller/delete.txt | 0 .../service/helper/BaseTestAPI.java | 62 ++++ .../service/mock/ExternalSystemsMock.java | 58 +++ .../service/mock/MsTemplateResourceTest.java | 181 +++++++++ .../service/mock/ObjetoNoSerializable.java | 4 + src/test/resources/application.properties | 178 +++++++++ .../resources/expected-message/delete.txt | 0 src/test/resources/mockresponses/delete.txt | 0 .../mockresponses/errorResponse.json | 10 + .../resources/mockresponses/requestFail.json | 1 + .../resources/mockresponses/requestOk.json | 1 + .../mockresponses/successResponse.json | 14 + 106 files changed, 7007 insertions(+) create mode 100644 .drone.yml create mode 100644 .droneBK.yml create mode 100644 .env create mode 100644 .gitignore create mode 100644 .gitlab-ci.yml create mode 100644 .mvn/maven.config create mode 100644 .mvn/settings.xml create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 README.md create mode 100644 deployment.yml create mode 100644 entrypoint.sh create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 nexus-settings.xml create mode 100644 numerotemporal-service-api.yaml create mode 100644 pom.xml create mode 100644 sonar-project.properties create mode 100644 src/main/docker/app.env create mode 100644 src/main/docker/dockerfile create mode 100644 src/main/java/com/millicom/microservice/service/NumeroTemporalAplicacion.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/Adapter.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/controlador/numero/temporal/NumeroTemporalAdaptador.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/controlador/numero/temporal/NumeroTemporalRecurso.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/dto/common/ErrorStructure.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/dto/common/OperationException.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/dto/common/ResponseError.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/soap/service/TemporalEndpoint.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/soap/service/WebServiceConfig.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/soap/service/WebServiceConfig2.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/soap/service/interceptor/CustomPayloadTransformingInterceptor.java create mode 100644 src/main/java/com/millicom/microservice/service/adapters/soap/service/interceptor/InterceptorConfig.java create mode 100644 src/main/java/com/millicom/microservice/service/configuration/MsTemplateConfig.java create mode 100644 src/main/java/com/millicom/microservice/service/controller/core/BaseController.java create mode 100644 src/main/java/com/millicom/microservice/service/controller/core/ErrorPageController.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/AdditionalParameters.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/ConsultaRequest.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/ConsultaResponse.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/Consultar.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/ConsultarNumeroTemporal.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/ConsultarNumeroTemporal_Service.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/ConsultarResponse.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/MsisdnInformationType.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/MsisdnListType.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/Numbers.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/ObjectFactory.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/ParameterType.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/Parameters.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/RequestBody.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/ResponseBody.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/ResponseHeader.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/common/Constants.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/package-info.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/personalizado/BodyResponse.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/personalizado/ConsultarResponse.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/personalizado/HeaderResponse.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/personalizado/MsisdnInfo.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/personalizado/MsisdnList.java create mode 100644 src/main/java/com/millicom/microservice/service/external/services/personalizado/ReturnElement.java create mode 100644 src/main/java/com/millicom/microservice/service/service/common/GenerateErrorService.java create mode 100644 src/main/java/com/millicom/microservice/service/service/common/GenerateErrorServiceImp.java create mode 100644 src/main/java/com/millicom/microservice/service/service/messaging/ErrorMapper.java create mode 100644 src/main/java/com/millicom/microservice/service/service/messaging/MessageIdentifiersImp.java create mode 100644 src/main/java/com/millicom/microservice/service/service/numero/propiedades/Propiedades.java create mode 100644 src/main/java/com/millicom/microservice/service/service/numero/propiedades/PropiedadesImplementacion.java create mode 100644 src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesCabeceras.java create mode 100644 src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesRespuesta.java create mode 100644 src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesVariableRuta.java create mode 100644 src/main/java/com/millicom/microservice/service/service/numero/temporal/Consultar.java create mode 100644 src/main/java/com/millicom/microservice/service/service/numero/temporal/ConsultarImplementacion.java create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/applicationDEV.properties create mode 100644 src/main/resources/applicationTEST.properties create mode 100644 src/main/resources/banner.txt create mode 100644 src/main/resources/db/changelog/data/20220817180800_pipeline_view.xml create mode 100644 src/main/resources/db/changelog/data/20220822174600_pipeline_configuration.xml create mode 100644 src/main/resources/db/changelog/data/20220825154700_oc_adapter_definition.xml create mode 100644 src/main/resources/db/changelog/data/20220825155100_oc_adapter_endpoint.xml create mode 100644 src/main/resources/db/changelog/data/20220826171400_error_message.xml create mode 100644 src/main/resources/db/changelog/data/20221128165609_vt_config_dba_errorcode_table.xml create mode 100644 src/main/resources/db/changelog/structure/20220811103406_entity_update.xml create mode 100644 src/main/resources/db/data/ERROR_MESSAGE.csv create mode 100644 src/main/resources/db/data/OC_ACTION_DEFINITION.csv create mode 100644 src/main/resources/db/data/OC_ADAPTER_DEFINITION.csv create mode 100644 src/main/resources/db/data/OC_ADAPTER_ENDPOINT.csv create mode 100644 src/main/resources/db/data/OC_EXECUTION_PIPELINE.csv create mode 100644 src/main/resources/db/data/OC_PIPELINE_DEFINITION.csv create mode 100644 src/main/resources/db/data/VT_CONFIG_DBA_ERRORCODE_TABLE.csv create mode 100644 src/main/resources/db/master.xml create mode 100644 src/main/resources/workspace/delete.txt create mode 100644 src/main/resources/wsdl/ConsultarNumeroTemporal.xsd create mode 100644 src/main/resources/wsdl/ConsultarNumeroTemporal_1.wsdl create mode 100644 src/main/resources/wsdl/MAIN.wsdl create mode 100644 src/test/java/com/millicom/microservice/service/MsTemplateTestApplication.java create mode 100644 src/test/java/com/millicom/microservice/service/controller/delete.txt create mode 100644 src/test/java/com/millicom/microservice/service/helper/BaseTestAPI.java create mode 100644 src/test/java/com/millicom/microservice/service/mock/ExternalSystemsMock.java create mode 100644 src/test/java/com/millicom/microservice/service/mock/MsTemplateResourceTest.java create mode 100644 src/test/java/com/millicom/microservice/service/mock/ObjetoNoSerializable.java create mode 100644 src/test/resources/application.properties create mode 100644 src/test/resources/expected-message/delete.txt create mode 100644 src/test/resources/mockresponses/delete.txt create mode 100644 src/test/resources/mockresponses/errorResponse.json create mode 100644 src/test/resources/mockresponses/requestFail.json create mode 100644 src/test/resources/mockresponses/requestOk.json create mode 100644 src/test/resources/mockresponses/successResponse.json diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..967c486 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,145 @@ +clone: + disable: true + +kind: pipeline +type: docker +name: spring-boot-java21 + +workspace: + base: /drone/src + +steps: + + + - name: manual-clone + image: alpine/git + commands: + - git clone http://10.0.0.126:3000/${DRONE_REPO}.git . + # Paso 1: Build y tests con Maven (Java 21) + - name: build-and-test + image: maven:3.9-eclipse-temurin-21-alpine + environment: + MAVEN_OPTS: -Xmx2048m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 + commands: + - mvn clean verify + - mvn jacoco:report + volumes: + - name: maven-cache + path: /root/.m2 + + # Paso 2: Análisis SonarQube con Maven + - name: sonarqube-analysis + image: maven:3.9-eclipse-temurin-21-alpine + environment: + SONAR_HOST_URL: http://10.0.0.126:9000 + SONAR_LOGIN: squ_465ae384ffda803d8e58d9ef0111bef1277c874a + SONAR_PROJECT_KEY: hhh + commands: + - mvn clean verify sonar:sonar -DskipTests + volumes: + - name: maven-cache + path: /root/.m2 + when: + event: [push, pull_request] + + # Paso 3: Build y Push de Docker Image a Nexus usando plugin oficial + - name: docker-build-push + image: plugins/docker + settings: + registry: 10.0.0.126:8081 + insecure: true + repo: 10.0.0.126:8081/docker-repository/${DRONE_REPO_NAME} + tags: ${DRONE_BUILD_NUMBER} + username: yandel + password: yandel + dockerfile: src/main/docker/dockerfile + + # Paso 4: Despliegue en Servidor Externo + - name: deploy-to-server + image: appleboy/drone-ssh + environment: + REGISTRY_ADDRESS: 10.0.0.126:8081 + REPOSITORY_NAME: docker-repository + settings: + host: + - 10.0.0.117 + - 10.0.0.116 + username: + from_secret: ssh_usuario_117 + password: + from_secret: ssh_password_117 + port: 22 + command_timeout: 2m + script: + - echo "Iniciando despliegue..." + - docker login -u yandel -p yandel 10.0.0.126:8081 + - docker stop mi-app || true + - docker rm mi-app || true + #- docker pull 10.0.0.126:8081/docker-repository/${DRONE_REPO_NAME}:${DRONE_BUILD_NUMBER} + #- docker run -d --name mi-app -p 8082:8080 10.0.0.126:8081/docker-repository/${DRONE_REPO_NAME}:${DRONE_BUILD_NUMBER} + - docker pull 10.0.0.126:8085/docker-repository/prueba:${DRONE_BUILD_NUMBER} + - docker run -d --restart=always --name mi-app-prueba -p 8082:8080 10.0.0.126:8085/docker-repository/prueba:${DRONE_BUILD_NUMBER} + - echo "Fin despliegue..." + - + - name: send-email + image: drillster/drone-email + settings: + host: smtp.ipage.com + port: 465 + username: + from_secret: email_user + password: + from_secret: email_pass + from: miguel.claure@myapps.com.bo + recipients: + #- sureflatron@gmail.com + - miguel.claure@myapps.com.bo + subject: "Resultado del pipeline: ${DRONE_BUILD_STATUS}" + # no_starttls: true + # skip_verify: true + body: | + + +
+

🚀 Resultado del Pipeline

+ + + + + + + + + + + + + + + + + + + + + +
Pipeline${DRONE_REPO_NAME}
Estado${DRONE_BUILD_STATUS}
Commit${DRONE_COMMIT}
Autor${DRONE_COMMIT_AUTHOR}
Revisión${DRONE_COMMIT_SHA}
+
+ + Ver Detalles del Pipeline + +
+

Este es un correo automático generado por el sistema de CI/CD.

+
+ + + when: + status: + - success + - failure + + +volumes: + - name: maven-cache + host: + path: /tmp/drone-maven-cache diff --git a/.droneBK.yml b/.droneBK.yml new file mode 100644 index 0000000..4459f90 --- /dev/null +++ b/.droneBK.yml @@ -0,0 +1,93 @@ +kind: pipeline +type: docker +name: spring-boot-java21 + +workspace: + base: /drone/src + +steps: + # Paso 1: Build y tests con Maven (Java 21) + - name: build-and-test + image: maven:3.9-eclipse-temurin-21-alpine + environment: + MAVEN_OPTS: -Xmx2048m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 + commands: + - mvn clean verify #-Poffline --settings nexus-settings.xml + - mvn jacoco:report # Generar reporte de cobertura + volumes: + - name: maven-cache + path: /root/.m2 + + # # Paso 2: Análisis SonarQube con Maven + - name: sonarqube-analysis + image: maven:3.9-eclipse-temurin-21-alpine + environment: + #SONAR_HOST_URL: ${SONARQUBE_URL} # URL de tu servidor SonarQube + #SONAR_LOGIN: ${SONARQUBE_TOKEN} # Token de autenticación en SonarQube + #SONAR_PROJECT_KEY: ${SONARQUBE_PROJECT_KEY} # Clave del proyecto en SonarQube + SONAR_HOST_URL: http://10.0.0.126:9000 # URL de tu servidor SonarQube + SONAR_LOGIN: squ_465ae384ffda803d8e58d9ef0111bef1277c874a # Token de autenticación en SonarQube + SONAR_PROJECT_KEY: hhh # Clave del proyecto en SonarQube + commands: + #- mvn sonar:sonar # Ejecuta el análisis de SonarQube usando Maven + - mvn clean verify sonar:sonar -DskipTests #--settings nexus-settings.xml + volumes: + - name: maven-cache + path: /root/.m2 + when: + event: [push, pull_request] + + # Paso 3: Build y Push de Docker Image a Nexus (NUEVO) + - name: docker-build-push + image: docker:20.10.24 + environment: + NEXUS_USER: yandel # Usuario de Nexus con permisos push + NEXUS_PASSWORD: yandel # Contraseña del usuario + REGISTRY_ADDRESS: 10.0.0.126:8081 + REPOSITORY_NAME: docker-repository # Nombre del repositorio Docker en Nexus + commands: + # Login a Nexus Docker Registry + - docker login -u $NEXUS_USER -p $NEXUS_PASSWORD $REGISTRY_ADDRESS + + # Construir imagen con tag dinámico ${DRONE_BUILD_NUMBER} + - docker build -t $REGISTRY_ADDRESS/$REPOSITORY_NAME/${DRONE_REPO_NAME}:${DRONE_BUILD_NUMBER} -f src/main/docker/dockerfile . # -f para especificar ruta + + # Push de la imagen + - docker push $REGISTRY_ADDRESS/$REPOSITORY_NAME/${DRONE_REPO_NAME}:${DRONE_BUILD_NUMBER} + volumes: + - name: docker-sock + path: /var/run/docker.sock + + # Paso 4: Despliegue en Servidor Externo + - name: deploy-to-server + image: appleboy/drone-ssh + environment: + REGISTRY_ADDRESS: 10.0.0.126:8081 + REPOSITORY_NAME: docker-repository # Nombre del repositorio Docker en Nexus + settings: + host: + - 10.0.0.117 + - 10.0.0.116 + username: + from_secret: ssh_usuario_117 + password: + from_secret: ssh_password_117 + port: 22 + command_timeout: 2m + script: + - echo "Iniciando despliegue..." + - docker login -u yandel -p yandel 10.0.0.126:8081 + - docker stop mi-app || true + - docker rm mi-app || true + - docker pull 10.0.0.126:8081/docker-repository/${DRONE_REPO_NAME}:${DRONE_BUILD_NUMBER} + - docker run -d --name mi-app -p 8082:8080 10.0.0.126:8081/docker-repository/${DRONE_REPO_NAME}:${DRONE_BUILD_NUMBER} + #- docker pull $NEXUS_PASSWORD $REGISTRY_ADDRESS/docker-repository/${DRONE_REPO_NAME}:${DRONE_COMMIT_SHA} + #- docker run -d --name mi-app -p 8082:8080 $NEXUS_PASSWORD $REGISTRY_ADDRESS/docker-repository/${DRONE_REPO_NAME}:${DRONE_COMMIT_SHA} + - echo "Fin despliegue..." +volumes: + - name: maven-cache + host: + path: /tmp/drone-maven-cache + - name: docker-sock + host: + path: /var/run/docker.sock # Montar socket de Docker diff --git a/.env b/.env new file mode 100644 index 0000000..8ecd0d8 --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +SONARQUBE_URL=http://10.0.0.126:9000 +SONARQUBE_TOKEN=squ_465ae384ffda803d8e58d9ef0111bef1277c874a +SONARQUBE_PROJECT_KEY=hhh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e6ebef3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..96064cf --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,131 @@ +# Official docker image. +image: docker:dind + +services: + - docker:dind + +stages: + - quality + - test + - compile + - build-image + - deploy + - test-deploy + +.code-quality: + stage: code-quality + image: maven:3.9.6-eclipse-temurin-21-alpine + variables: + SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" + GIT_DEPTH: "0" + cache: + key: "${CI_JOB_NAME}" + paths: + - .sonar/cache + script: + - mvn clean install + - mvn sonar:sonar verify -DskipTests=true -Dmaven.test.failure.ignore=true -Dsonar.projectKey=$PROJECT_KEY -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_TOKEN -Dsonar.java.binaries=**/* + allow_failure: true + +.test: + stage: test + image: maven:latest + script: + - mvn test + artifacts: + paths: + - target/surefire-reports/TEST-*.xml + reports: + junit: + - target/surefire-reports/TEST-*.xml + +.compile: + stage: compile + image: maven:3.9.6-eclipse-temurin-21-alpine + cache: + key: milicom + paths: + - ../.m2/repository + script: + - echo $CI_COMMIT_MESSAGE + - echo $CI_COMMIT_REF_NAME + - mvn package -Drevision=$CI_PIPELINE_IID -DskipTests + artifacts: + paths: + - ./target/*.jar + +.stg-build-image: + stage: build-image + script: + - echo ${PROJECT_CONTAINER_IMAGE} + - docker build -f ./src/main/docker/dockerfile -t ${PROJECT_CONTAINER_IMAGE} . + - docker tag ${PROJECT_CONTAINER_IMAGE} $NEXUS_REGISTER_SERVER/${PROJECT_CONTAINER_IMAGE} + - docker login -u $CI_LON_REGISTRY_USER -p $CI_LON_REGISTRY_PASSWORD $NEXUS_REGISTER_SERVER + - docker push $NEXUS_REGISTER_SERVER/${PROJECT_CONTAINER_IMAGE} + - docker rmi ${PROJECT_CONTAINER_IMAGE} + +.deploy: + stage: deploy + image: dtzar/helm-kubectl + variables: + NAMESPACE: default + POD_ENV: development + K8S_ENV_DEPLOY: deployment.yml + + dependencies: [] + script: + - sed -i "s/PROJECT_NAME/$POD_NAME/g" $K8S_ENV_DEPLOY + - sed -i "s~CONTAINER_IMAGE~$PROJECT_CONTAINER_IMAGE~g" $K8S_ENV_DEPLOY + - sed -i "s/APP_ENV/$POD_ENV/g" $K8S_ENV_DEPLOY + - sed -i "s/APP_ID/$POD_NAME/g" $K8S_ENV_DEPLOY + - sed -i "s/APP_PORT/8080/g" $K8S_ENV_DEPLOY + - kubectl apply -f $K8S_ENV_DEPLOY -n $NAMESPACE + +variables: + IMG_REPOSITORY: $NEXUS_REGISTER_SERVER + PROJECT_KEY: checksuscribers-orchestator-api + CI_DISABLE_CACHE: "true" + POD_NAME: $CI_PROJECT_NAME + AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID_MIC + AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY_MIC + AWS_DEFAULT_REGION: $AWS_DEFAULT_REGION + PROJECT_CONTAINER_IMAGE: longinus/${CI_PROJECT_NAME}:${VERSION} #$CI_PIPELINE_ID + VERSION: stg-v1.0.1 # Deprecated -> Use commit sha as tag for dev/test environments + +### STAGES CLOUD +.cloud-code-quality: + only: + - develop + extends: + - .code-quality + +.cloud-unit-test: + only: + - develop + - feature/performanceEntityResponseWrapper + extends: + - .test + +cloud-compile: + only: + - develop + extends: + - .compile + +cloud-build-image: + only: + - develop + extends: + - .stg-build-image + +#Deployment en lon-bo development +deploy-bo-dev: + before_script: + - export KUBECONFIG=${KUBECONFIG_BO} +# tags: + # - longinus-bo-dev + only: + - develop + + extends: + - .deploy diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..87d863b --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,4 @@ +-s./.mvn/settings.xml +-Dmaven.wagon.http.ssl.insecure=true +-Dmaven.wagon.http.ssl.allowall=true +-Dmaven.wagon.http.ssl.ignore.validity.dates=true \ No newline at end of file diff --git a/.mvn/settings.xml b/.mvn/settings.xml new file mode 100644 index 0000000..87bda78 --- /dev/null +++ b/.mvn/settings.xml @@ -0,0 +1,77 @@ + + + + millicom-nexus-mirror + admin + LTLmv4sPnAp9Hpb + + + + Private-Token + XXXXXXXXXX + + + + + + + millicom-nexus-cbs-mirror + admin + LTLmv4sPnAp9Hpb + + + + Private-Token + XXXXXXXXXX + + + + + + + + + + millicom-nexus-mirror + Mirror + http://3.208.115.4:30081/repository/maven-public + millicom-nexus + + + + millicom-nexus-cbs-mirror + Mirror CBS + http://3.208.115.4:30081/repository/maven-public-cbs + millicom-nexus-cbs + + + + maven-default-http-blocker + external:dummy:* + Pseudo repository to mirror external repositories initially using HTTP. + http://0.0.0.0/ + true + + + + + + org.sonarsource.scanner.maven + + + + sonar + + true + + + + + https://54.81.5.122:31645 + + + + + \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 GIT binary patch literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b74bf7f --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/README.md b/README.md new file mode 100644 index 0000000..0fb642b --- /dev/null +++ b/README.md @@ -0,0 +1,185 @@ +# MS Template + +- Microservice template. +- Has Postgres database + +### Integrations + +| Origin | Target | Operation | HTTP METHOD | +|:------------------|:---------|:--------------------------------|:------------| +| External services | system-x | /api/v2/orderManagement/entityX | GET | + +## Config map + +### Telemetry +- **spring.sleuth.otel.exporter.otlp.endpoint**=#ex.http://localhost:4317 sleuth endpoint +- **spring.sleuth.otel.config.trace-id-ratio-based**= #ex:0.0- 0% rate / 1.0 - 100% rate + +### DATABASE +- **spring.datasource.url**=#ex. jdbc:postgresql://localhost:5432/catalogdomain +- **spring.datasource.username**=#ex. admin +- **spring.datasource.password**=#ex. admin + +### Environment Parametrization +#### External System Endpoints + +#### Events +- **event.processing.kafka.address**=#ex. localhost:9092 Kafka Address +- **event.processing.queue.business**=#ex. event-tracing Topic for business event +- **event.processing.queue.message**=#ex. event-tracing Topic for message event +- **event.processing.queue.application**=#ex. event-tracing Topic for application event +- **event.processing.client.producer.enable**=#ex. false values true/false parameter to on/of publish event to kafka + +#### Logging +- **modules.logging.message.enable** = ex: true +- **modules.logging.message.configuration** = ex: EVENT #listOfValues: CONSOLE,DB,EVENT +- **modules.logging.application.enable** = ex: true +- **modules.logging.application.level** = ex: ERROR #listOfValues: ERROR,DEBUG,WARN +- **modules.logging.application.configuration** = ex:{'*':'CONSOLE,EVENT'} ##listOfValues {'*':{'CONSOLE','DB','FULL','EVENT'}} + + +### Business Configuration + +# Domain Orchestration Template + + +***Project Structure***: + +Note: com.readinessit.microservice should be replaced by the customer domain when working on customer project + +``` bash +com +└── readinessit.microservice.template -> root folder should only have application + ├── adapters -> contains all external system related classes + | ├── externalsystem(customer) -> contains classes related to this system, for example generic filling of header structures and error handling and interpretation + | └── dto -> all external structures devided by corresponding system + | └── crm -> data structure for external system crm + └── configuration -> implementation specific spring boot configuration on startup + | └── security -> spring configuration related to security + └── ece -> External Communication Engine - engine for all outbound communication (adapters) + | ├── action -> All implementations of the action service divided by type + | | ├── courier -> All actions related with external system communication + | | ├── handler -> All actions that will handle a request or response validation/mapping + | | └── mapper -> All actions related to mapping data from/to dtos + | ├── condition -> All implementations of the condition service + | └── service -> Any service related to a common pipeline implementation, tha can be executed anywhere in the code + └── domain/functionality -> Specific entity/domain for example an entity or a domain like customer domain + ├── controller -> Exposed services to the exterior + ├── entity -> Table entity class + ├── persistence -> Repository class + └── service -> Logic to interact with the entity/domain +``` + +ECE Guidelines +- +- An ECE interaction is usually defined by a pipeline execution of 3 actions as follows: + - a mapper ("PRE_RUN_ACTION_ID") that maps the controller request DTO to the external system request DTO structure; + - a courier ("EXECUTION_ACTION_ID") to make the actual call to the external system; + - an handler ("POST_RUN_ACTION_ID") to treat the external system response DTO and apply business logic and/or map the information to the execution context or final response; +- A Courier action must only contain the logic for the actual external system call. + **No mappings or data validation** -> this must be done in a Mapper action; + **No business logic or response handling** -> this must be done in an Handler action; +- A Courier action external system call must be done via an Adapter; +- A Mapper action should only do request info validation and/or map information from a DTO to the execution context or another DTO; +- An Handler action should handle all business logic and/or the external system response validations and mapping to the execution context; +- A pipeline may be one single execution or be composed of several execution steps in an ordered sequence; +- A pipeline execution may be one handler or sequence up to 3 handlers, a mapper or a sequence up to 3 mappers or an external system call (as explained above); +- Any action may (and should) be used in multiple pipeline executions, wherever the same logic applies; +--- + + +HOW TO DEVELOP AN ECE INTERFACE +- + +With the "EXECUTION_CODE" being the "baseService.operation" name defined in a controller: (ex: CustomerRequest.createCustomerRequest) +1) configure the new service in the OC_SERVICES table; +2) configure the pipeline in the correct sequence ("EXECUTION_INDEX"), in the OC_EXECUTION_PIPELINE table. + - each step is defined by a "PIPELINE_ID" and the "STATUS" (0 or 1) defines if the step is active for execution; + - if a step must be executed on condition, define the condition class path in "EXECUTION_CONDITION"; +3) (if it does not exist already) configure each individual pipeline step ("PIPELINE_ID") in the OC_PIPELINE_DEFINITION table. + - pipeline executions may (and should) be used in multiple pipelines definitions; + - an ECE interaction is usually defined by a pipeline execution of 3 actions as follows: + - a mapper ("PRE_RUN_ACTION_ID") that maps the controller request DTO to the external system request DTO structure; + - a courier ("EXECUTION_ACTION_ID") to make the actual call to the external system; + - an handler ("POST_RUN_ACTION_ID") to treat the external system response DTO and apply business logic and/or map the information to the execution context or final response; + - a pipeline execution may also be just composed of handler(s) action(s) for business logic ("EXECUTION_ACTION_ID"); + - a pipeline execution may also be just composed of mapper(s) action(s) for the pipeline ("EXECUTION_ACTION_ID"); example: a multiple executions pipeline final execution being a mapper to the controller's request final response DTO; +4) (if it does not exist already) configure the class path of each individual pipeline execution action ("EXECUTION_ACTION_ID") in the OC_ACTION_DEFINITION table; + - actions may (and should) be used in multiple pipelines executions; +5) (if it does not exist already) configure the external system interface information to be used by the adapter for the actual messaging communication in the OC_ADAPTER_DEFINITION; +6) for each adapter interface definition: configure the endpoint of the interface for each environment in the OC_ADAPTER_ENDPOINT table; + +--- + +HOW TO generate liquibase changeset +- +If you are creating or updating an existing table you will need to generate a loquibase changeset, to perform this you will need to do the following: + +1) mvn clean +2) mvn compile +3) mvn liquibase:diff + +This will generate a new file under resources\db\changelog something like +20220811103406_entity_update.xml + +4) Add a more user-friendly message than, entity_update example update_tableName or create_tableName + +--- + +HOW TO UPDATE THE DATABASE +- + +***Is it a new Virtual Configuration Table?*** + +1) create the table data csv file in the resources\db\data folder; +2) generate/create the liquibase changeset in the resources\db\changelog\data folder; +3) include the DB update in the liquibase file: resources\db\master.xml file; + +***Is it a new Configuration Table?*** +1) create all the necessary JPA entities, repositories, etc; +2) generate/create the liquibase changeset for the table creation in the resources\db\changelog\structure folder; +3) include the DB update in the liquibase file: resources\db\master.xml file; +4) create the table data csv file in the resources\db\data folder; +5) generate/create the liquibase changeset in the resources\db\changelog\data folder; +6) include the DB update in the liquibase file: resources\db\master.xml file under **update data**; + +***Is it a structure update to an existing table?*** +1) update all the necessary JPA entities, repositories, etc; +2) generate/create the liquibase changeset for the table update in the resources\db\changelog\structure folder; +3) include the DB update in the liquibase file: resources\db\master.xml file under **update structure**; + +***Is it a data update to an existing table?*** +- just update the respective resources\db\data\*.csv file + +--- + +HOW TO CREATE A NEW CONTROLLER +- +1) Always create a interface class that contains all the relevant operation details + 1) Request Parameters / Headers + 2) Request structure + 3) ExecutionContextDTO + 4) Httpcodes with there corresponding output structure ex: 200 SuccessDto, 400 ErrorDto +2) Implementation class for the created interface, this class will contain the following + 1) Add @RestController annotation to the class + 2) Add @RequestMapping annotation with the path to the api to the class + 3) Add @ControllerECE annotation to each implemented method + 4) The response is always ResponseEntity without the type declaration ex:ResponseEntity in interface equals to ResponseEntity in implementation, this allows you to responde with error structure on error +--- + +HOW TO RUN THE UNIT TESTS +- + +Note: **unit tests must be run after every implementation to assure regression** + +Either: +- run the test maven command + +or + +- right-click the test\java folder and choose "Run/Debug All Tests"; + +A single specific unit test may be run individually by right-clicking the implementing class and choosing "Run/Debug Test"; + +--- + diff --git a/deployment.yml b/deployment.yml new file mode 100644 index 0000000..090318e --- /dev/null +++ b/deployment.yml @@ -0,0 +1,222 @@ +apiVersion: v1 +kind: Service +metadata: + name: PROJECT_NAME + labels: + app: PROJECT_NAME + service: PROJECT_NAME + plaftorm: lon-customer +spec: + ports: + - port: 8080 + name: http + selector: + app: PROJECT_NAME + sessionAffinity: None + type: ClusterIP +--- + +apiVersion: v1 +kind: ServiceAccount +metadata: + name: PROJECT_NAME-sa + labels: + account: PROJECT_NAME-sa +--- + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: PROJECT_NAME + labels: + app: PROJECT_NAME + version: v1 + plaftorm: lon-customer +spec: + replicas: 1 + selector: + matchLabels: + app: PROJECT_NAME + version: v1 + template: + metadata: + labels: + app: PROJECT_NAME + version: v1 + + spec: + serviceAccountName: PROJECT_NAME-sa + containers: + - name: PROJECT_NAME + image: 34.233.44.173.nip.io/repository/docker-hosted/CONTAINER_IMAGE + args: ["--spring.config.location=$APP_BASE/applicationDEV.properties"] + command: ["sh", "-c", "java $JAVA_OPTS -Dserver.port=8080 -Dapplication.container.version=1.0 -Djava.security.egd=file:/dev/./urandom -Dapplication.log=/home/microservice/logs -Dspring.config.location=/home/microservice/application.properties -jar 'app.jar' '$@'"] + resources: + requests: + memory: "4Mi" + cpu: "3m" + limits: + memory: "1408Mi" + cpu: "500m" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + privileged: false + runAsNonRoot: true + runAsUser: 101 + imagePullPolicy: Always + env: + - name: APP_BASE + value: "/home/microservice" + - name: APP_BOOTSTRAP + value: "/usr/config" + - name: APPPROPERTIES_FILE + value: "./src/main/resources/application.properties" + - name: SERVER_PORT + value: "8080" + - name: MODULES_LOGGING_MESSAGE_ENABLE_INTERCEPTORS + value: "true" + - name: MODULES_LOGGING_MESSAGE_ENABLE + value: "true" + - name: MODULES_LOGGING_MESSAGE_CONFIGURATION + value: "CONSOLE,EVENT" + - name: MODULES_LOGGING_APPLICATION_ENABLE + value: "true" + - name: MODULES_LOGGING_APPLICATION_LEVEL + value: "DEBUG" + - name: MODULES_LOGGING_APPLICATION_CONFIGURATION + value: "{'*':'CONSOLE,EVENT'}" + - name: MODULES_COMMON_VTCONFIG_ENABLE + value: "true" + - name: MODULES_COMMON_VTCONFIG_USE_CACHE + value: "true" + - name: MODULES_COMMON_I18N_ERRORMESSAGE_ENABLE + value: "true" + - name: MODULES_COMMON_I18N_ERRORMESSAGE_DEFAULT_LANG + value: "en-US" + - name: MODULES_COMMON_I18N_LOCALE + value: "en-US,es-ES" + - name: MODULES_COMMON_I18N_DEFAULT_LANG + value: "en-US" + - name: MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE + value: "health,info,metrics,prometheus" + - name: MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED + value: "true" + - name: MANAGEMENT_ENDPOINT_HEALTH_PROBES_ENABLED + value: "true" + - name: MANAGEMENT_METRICS_TAGS_APPLICATION + - name: SPRING_APPLICATION_NAME + value: "numerotemporal-service-api" + - name: SPRING_SLEUTH_OTEL_CONFIG_TRACE_ID_RATIO_BASED + value: "0" + - name: SPRING_SLEUTH_OTEL_EXPORTER_OTLP_ENDPOINT + value: "http://localhost:4317" + - name: SPRING_SLEUTH_OTEL_LOG_EXPORTER_ENABLED + value: "false" + - name: SPRING_SLEUTH_ASYNC_ENABLED + value: "false" + - name: SPRING_SLEUTH_PROPAGATION_TYPE + value: "b3" + - name: SPRING_SLEUTH_BAGGAGE_REMOTE_FIELDS + value: "x-consumer-username" + - name: EVENT_PROCESSING_CLIENT_PRODUCER_ENABLE + value: "true" + - name: EVENT_PROCESSING_QUEUE_ENGINE + value: "KAFKA" + - name: EVENT_PROCESSING_KAFKA_ADDRESS + value: "kf-cluster-kafka-bootstrap.msg-prod.svc.cluster.local:9092" + - name: EVENT_PROCESSING_QUEUE_BUSINESS + value: "event-tracing" + - name: EVENT_PROCESSING_QUEUE_MESSAGE + value: "event-tracing" + - name: EVENT_PROCESSING_QUEUE_APPLICATION + value: "event-tracing" + - name: EVENT_PROCESSING_LOGGER_EVENT_ENABLE + value: "true" + - name: APP_ENVIRONMENT + value: "PROD" + - name: MODULES_MESSAGING_BASEURL_ISPROPERTY + value: "true" + - name: MODULES_LOGGING_OBFUSCATION_ENABLED + value: "true" + - name: MODULES_LOGGING_OBFUSCATION_DEFAULTREPLACETYPE + value: "-" + - name: MODULES_LOGGING_OBFUSCATION_REPLACETYPE_NUMBER + value: "000000" + - name: MODULES_LOGGING_OBFUSCATION_REPLACETYPE_STRING + value: "XXXXXX" + - name: MODULES_LOGGING_OBFUSCATION_CONFIGURATIONLIST[0] + value: "GET,.*,$[0].name.common,string" + - name: SPRING_NATIVE_REMOVE_UNUSED_AUTOCONFIG + value: "true" + - name: SPRING_NATIVE_REMOVE_YAML_SUPPORT + value: "true" + - name: SERVICE_NUMEROTEMPORAL_OPERACION + value: "numerotemporal" + - name: SERVICE_NUMEROTEMPORAL_SISTEMA + value: "numerotemporal" + - name: SERVICE_NUMEROTEMPORAL_METODO + value: "POST" + - name: MODULES_MESSAGING_CONFIGURATION_ADAPTERDEFINITIONS[0] + value: "AD_COD_0001,com.millicom.microservice.service.service.numero.temporal.ConsultarImplementacion,${service.numerotemporal.operacion},${service.numerotemporal.metodo},,com.millicom.microservice.service.external.services.personalizado.ConsultarResponse,${service.numerotemporal.sistema}" + - name: MODULES_MESSAGING_CONFIGURATION_ADAPTERENDPOINTS[0] + value: "AE_COD_0001,AD_COD_0001,messaging.baseUrl.numerotemporal.orquestador,PROD,,," + - name: MESSAGING_BASEURL_NUMEROTEMPORAL_ORQUESTADOR + value: "http://numerotemporal-orchestrator-api:8080/api/v1/resourceValidation" + - name: SERVICE_NUMEROTEMPORAL_LEGADO_HEADER_CONTENT_TYPE + value: "application/json" + - name: SERVICE_NUMEROTEMPORAL_DEVOLVER_CABECERAS_DEL_LEGADO + value: "false" + - name: SERVICE_NUMEROTEMPORAL_PATCH + value: "/api/v1/numerotemporal" + - name: SERVICE_NUMEROTEMPORAL_CODIGOS_HTTP_A_CONTROLAR + value: "502" + - name: RESPONSE_ERRORS_400_ERRORS[0]_MESSAGE + value: "Cannot query field 'lifecycleStatus6' on type 'Products'. Did you mean 'lifecycleStatus', 'lifecycles' or 'lifecyclesList'? (line 6, column 11):\n statusPhone_status: lifecycleStatus6\n ^" + - name: RESPONSE_ERRORS_400_ERRORS[0]_LOCATIONS[0]_LINE + value: "2" + - name: RESPONSE_ERRORS_400_ERRORS[0]_LOCATIONS[0]_COLUMN + value: "3" + - name: RESPONSE_ERRORS_405_ERRORS[0]_MESSAGE + value: "Method Not Allowed" + - name: RESPONSE_ERRORS_405_ERRORS[0]_LOCATIONS[0]_LINE + value: "2" + - name: RESPONSE_ERRORS_405_ERRORS[0]_LOCATIONS[0]_COLUMN + value: "3" + - name: RESPONSE_ERRORS_500_ERRORS[0]_MESSAGE + value: "unknown_error" + - name: RESPONSE_ERRORS_500_ERRORS[0]_LOCATIONS[0]_LINE + value: "1" + - name: RESPONSE_ERRORS_500_ERRORS[0]_LOCATIONS[0]_COLUMN + value: "2" + - name: RESPONSE_ERRORS_503_ERRORS[0]_MESSAGE + value: "server that is down for maintenance or that is overloaded" + - name: RESPONSE_ERRORS_503_ERRORS[0]_LOCATIONS[0]_LINE + value: "1" + - name: RESPONSE_ERRORS_503_ERRORS[0]_LOCATIONS[0]_COLUMN + value: "2" + - name: RESPONSE_ERRORS_502_ERRORS[0]_MESSAGE + value: "No se pudo establecer conexion con el Servidor: ${messaging.baseUrl.numerotemporal.orquestador}" + - name: RESPONSE_ERRORS_502_ERRORS[0]_LOCATIONS[0]_LINE + value: "1" + - name: RESPONSE_ERRORS_502_ERRORS[0]_LOCATIONS[0]_COLUMN + value: "2" + - name: RESPONSE_ERRORS_415_ERRORS[0]_MESSAGE + value: "The request's Content-Type is not supported. Expected:application/json or application/vnd.api+json" + - name: RESPONSE_ERRORS_415_ERRORS[0]_LOCATIONS[0]_LINE + value: "1" + - name: RESPONSE_ERRORS_415_ERRORS[0]_LOCATIONS[0]_COLUMN + value: "2" + - name: RESPONSE_ERRORS_DEFAULT_ERRORS[0]_MESSAGE + value: "Error Interno del Adaptador" + - name: RESPONSE_ERRORS_DEFAULT_ERRORS[0]_LOCATIONS[0]_LINE + value: "1" + - name: RESPONSE_ERRORS_DEFAULT_ERRORS[0]_LOCATIONS[0]_COLUMN + value: "2" + + ports: + - containerPort: APP_PORT + imagePullSecrets: + - name: docker-hosted2 diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..8c08463 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +echo "The application will start in ${START_SLEEP}s..." && sleep ${START_SLEEP} +exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar "${HOME}/app.jar" "$@" diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..8a8fb22 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# 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 +# +# 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/nexus-settings.xml b/nexus-settings.xml new file mode 100644 index 0000000..c870a99 --- /dev/null +++ b/nexus-settings.xml @@ -0,0 +1,105 @@ + + + + nexus + yandel + yandel + + + + + millicom-nexus-mirror + admin + LTLmv4sPnAp9Hpb + + + + Private-Token + XXXXXXXXXX + + + + + + + millicom-nexus-cbs-mirror + admin + LTLmv4sPnAp9Hpb + + + + Private-Token + XXXXXXXXXX + + + + + + + + + + + millicom-nexus-mirror + Mirror + http://3.208.115.4:30081/repository/maven-public + millicom-nexus + + + + millicom-nexus-cbs-mirror + Mirror CBS + http://3.208.115.4:30081/repository/maven-public-cbs + millicom-nexus-cbs + + + + maven-default-http-blocker + external:dummy:* + Pseudo repository to mirror external repositories initially using HTTP. + http://0.0.0.0/ + + + + + + nexus + * + + http://10.0.0.126:8084/repository/maven-public/ + + + + + + org.sonarsource.scanner.maven + + + + + sonar + + true + + + http://10.0.0.126:9000 + squ_465ae384ffda803d8e58d9ef0111bef1277c874a + + + + + offline + + true + + + + + + sonar + + + \ No newline at end of file diff --git a/numerotemporal-service-api.yaml b/numerotemporal-service-api.yaml new file mode 100644 index 0000000..f926a80 --- /dev/null +++ b/numerotemporal-service-api.yaml @@ -0,0 +1,184 @@ +# replace values: +# numerotemporal-service-api +# snc-isd +# IMAGE_REPOSITORY_URL +# CONTAINER_IMAGE_URL + +apiVersion: v1 +kind: Service +metadata: + name: numerotemporal-service-api + labels: + app: numerotemporal-service-api + service: numerotemporal-service-api + plaftorm: lon-customer + namespace: snc-isd +spec: + ports: + - port: 8080 + name: http + selector: + app: numerotemporal-service-api + sessionAffinity: None + type: ClusterIP +--- + +apiVersion: v1 +kind: ServiceAccount +metadata: + name: numerotemporal-service-api-sa + labels: + account: numerotemporal-service-api-sa + namespace: snc-isd +--- + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: numerotemporal-service-api + labels: + app: numerotemporal-service-api + version: v1 + plaftorm: lon-customer + namespace: snc-isd +spec: + replicas: 1 + selector: + matchLabels: + app: numerotemporal-service-api + version: v1 + template: + metadata: + labels: + app: numerotemporal-service-api + version: v1 + + spec: + serviceAccountName: numerotemporal-service-api-sa + containers: + - name: numerotemporal-service-api + image: emstrgprdapp01.tigo.net.bo:8084/longinus/snc/tbb/facade/numerotemporal-service-api:prd-v1.0.0 #example: emstrgprdapp01.tigo.net.bo:8084/longinus/snc/isd/adapter/query-adapter-api:prd-v1.0.0 + args: ["--spring.config.location=$APP_BASE/applicationDEV.properties"] + command: ["sh", "-c", "java $JAVA_OPTS -Dserver.port=8080 -Dapplication.container.version=1.0 -Djava.security.egd=file:/dev/./urandom -Dapplication.log=/home/microservice/logs -Dspring.config.location=/home/microservice/applicationDEV.properties -jar 'app.jar' '$@'"] + resources: + requests: + memory: "4Mi" + cpu: "3m" + limits: + memory: "1408Mi" + cpu: "500m" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + privileged: false + runAsNonRoot: true + runAsUser: 101 + imagePullPolicy: Always + env: + - name: APP_BASE + value: "/home/microservice" + - name: APP_BOOTSTRAP + value: "/usr/config" + - name: APPPROPERTIES_FILE + value: "./src/main/resources/application.properties" + - name: START_SLEEP + value: "5" + - name: SERVER_PORT + value: "8080" + - name: MODULES_LOGGING_MESSAGE_ENABLE_INTERCEPTORS + value: "true" + - name: MODULES_LOGGING_MESSAGE_ENABLE + value: "true" + - name: MODULES_LOGGING_MESSAGE_CONFIGURATION + value: "CONSOLE,EVENT" + - name: MODULES_LOGGING_APPLICATION_ENABLE + value: "true" + - name: MODULES_LOGGING_APPLICATION_LEVEL + value: "DEBUG" + - name: MODULES_LOGGING_APPLICATION_CONFIGURATION + value: "{'*':'CONSOLE,EVENT'}" + - name: MODULES_COMMON_VTCONFIG_ENABLE + value: "true" + - name: MODULES_COMMON_VTCONFIG_USE_CACHE + value: "true" + - name: MODULES_COMMON_I18N_ERRORMESSAGE_ENABLE + value: "true" + - name: MODULES_COMMON_I18N_ERRORMESSAGE_DEFAULT_LANG + value: "en-US" + - name: MODULES_COMMON_I18N_LOCALE + value: "en-US,es-ES" + - name: MODULES_COMMON_I18N_DEFAULT_LANG + value: "en-US" + - name: MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE + value: "health,info,metrics,prometheus" + - name: MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED + value: "true" + - name: MANAGEMENT_ENDPOINT_HEALTH_PROBES_ENABLED + value: "true" + - name: MANAGEMENT_METRICS_TAGS_APPLICATION + - name: SPRING_APPLICATION_NAME + value: "numerotemporal-service-api" + - name: SPRING_SLEUTH_OTEL_CONFIG_TRACE_ID_RATIO_BASED + value: "0" + - name: SPRING_SLEUTH_OTEL_EXPORTER_OTLP_ENDPOINT + value: "http://localhost:4317" + - name: SPRING_SLEUTH_OTEL_LOG_EXPORTER_ENABLED + value: "false" + - name: SPRING_SLEUTH_ASYNC_ENABLED + value: "false" + - name: SPRING_SLEUTH_PROPAGATION_TYPE + value: "b3" + - name: SPRING_SLEUTH_BAGGAGE_REMOTE_FIELDS + value: "x-consumer-username" + - name: EVENT_PROCESSING_CLIENT_PRODUCER_ENABLE + value: "true" + - name: EVENT_PROCESSING_QUEUE_ENGINE + value: "KAFKA" + - name: EVENT_PROCESSING_KAFKA_ADDRESS + value: "kf-cluster-kafka-bootstrap.msg-prod.svc.cluster.local:9092" + - name: EVENT_PROCESSING_QUEUE_BUSINESS + value: topic-business-bo + - name: EVENT_PROCESSING_QUEUE_MESSAGE + value: topic-message-bo + - name: EVENT_PROCESSING_QUEUE_APPLICATION + value: topic-application-bo + - name: EVENT_PROCESSING_LOGGER_EVENT_ENABLE + value: "true" + - name: APP_ENVIRONMENT + value: "PROD" + - name: MODULES_MESSAGING_BASEURL_ISPROPERTY + value: "true" + - name: MODULES_LOGGING_OBFUSCATION_ENABLED + value: "true" + - name: MODULES_LOGGING_OBFUSCATION_DEFAULTREPLACETYPE + value: "-" + - name: MODULES_LOGGING_OBFUSCATION_REPLACETYPE_NUMBER + value: "000000" + - name: MODULES_LOGGING_OBFUSCATION_REPLACETYPE_STRING + value: "XXXXXX" + - name: SPRING_NATIVE_REMOVE_UNUSED_AUTOCONFIG + value: "true" + - name: SPRING_NATIVE_REMOVE_YAML_SUPPORT + value: "true" + - name: SERVICE_NUMEROTEMPORAL_OPERACION + value: "numerotemporal" + - name: SERVICE_NUMEROTEMPORAL_SISTEMA + value: "numerotemporal" + - name: SERVICE_NUMEROTEMPORAL_METODO + value: "POST" + - name: MESSAGING_BASEURL_NUMEROTEMPORAL_ORQUESTADOR + value: "http://numerotemporal-orchestrator-api.snc-isd.svc.cluster.local:8080/api/v1/resourceValidation" + - name: SERVICE_NUMEROTEMPORAL_LEGADO_HEADER_CONTENT_TYPE + value: "application/json" + - name: SERVICE_NUMEROTEMPORAL_DEVOLVER_CABECERAS_DEL_LEGADO + value: "false" + - name: SERVICE_NUMEROTEMPORAL_PATCH + value: "/api/v1/consultaNumeroTemporalV2" + - name: SERVICE_NUMEROTEMPORAL_CODIGOS_HTTP_A_CONTROLAR + value: "502" + ports: + - containerPort: 8080 + imagePullSecrets: + - name: nexus-secret diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a4207a0 --- /dev/null +++ b/pom.xml @@ -0,0 +1,344 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.2.2 + + + com.millicom.microservice + numerotemporal-service-api + 0.0.1-SNAPSHOT + + + + io.micrometer + micrometer-tracing-bom + ${micrometer-tracing.version} + pom + import + + + + + 21 + + + ${project.build.directory}/test-results + 1.1.0 + 0.8.11 + ${project.testresult.directory}/integrationTest + true + + + 2.0.4 + 2.0.4 + 2.0.3 + 2.0.1 + + 1.0.0 + + + + yyyyMMddHHmmss + UTF-8 + 21 + 21 + + + + + + + nexus + http://10.0.0.126:8084/repository/maven-public/ + + + + + + + spring-milestones + https://repo.spring.io/milestone + + + millicom-nexus-mirror + http://3.208.115.4:30081/repository/maven-public + + + + nexus + http://10.0.0.126:8084/repository/maven-public/ + + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springdoc + springdoc-openapi-ui + 1.6.9 + + + org.springframework.boot + spring-boot-starter-actuator + + + io.micrometer + micrometer-registry-prometheus + + + org.wiremock + wiremock-standalone + 3.4.2 + test + + + org.springframework.cloud + spring-cloud-starter-sleuth + 3.1.11 + + + org.springframework.cloud + spring-cloud-sleuth-brave + + + + + org.springframework.cloud + spring-cloud-sleuth-otel-autoconfigure + 1.1.0-M6 + + + io.opentelemetry + opentelemetry-exporter-otlp-trace + 1.14.0 + + + io.swagger.core.v3 + swagger-annotations + 2.2.2 + + + + org.springframework.kafka + spring-kafka-test + test + + + + io.micrometer + micrometer-observation + + + io.micrometer + micrometer-tracing + + + io.micrometer + micrometer-tracing-bridge-otel + + + org.slf4j + slf4j-api + + + + org.slf4j + slf4j-simple + test + + + + org.springframework.boot + spring-boot-starter-web-services + + + + + + com.readinessit.library + common-interfaces + ${rit.library.common-interfaces.version} + + + com.readinessit.library + logging + ${rit.library.logging.version} + + + com.readinessit.library + messaging + ${rit.library.messaging.version} + + + com.readinessit.library + event-processing-client + ${rit.library.eventprocessingclient.version} + + + + + + + + + org.graalvm.buildtools + native-maven-plugin + + + + true + + + + ch.qos.logback.core.util.Loader,ch.qos.logback.classic.Logger,ch.qos.logback.core.status.StatusBase,com.ctc.wstx.stax.WstxInputFactory,ch.qos.logback.core.util.StatusPrinter,com.ctc.wstx.util.DefaultXmlSymbolTable,com.ctc.wstx.api.CommonConfig,ch.qos.logback.core.status.InfoStatus,ch.qos.logback.classic.Level,com.ctc.wstx.api.ReaderConfig,ch.qos.logback.core.CoreConstants,org.slf4j.LoggerFactory + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + native-image-build + package + + + + --initialize-at-build-time=com.ctc.wstx.stax.WstxInputFactory + + + + + + + + + + + ${java.version} + + --initialize-at-build-time=com.ctc.wstx.stax.WstxInputFactory + + + + + + + org.codehaus.mojo + properties-maven-plugin + ${properties-maven-plugin.version} + + + initialize + + read-project-properties + + + + sonar-project.properties + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + prepare-agent + + prepare-agent + + + + report + prepare-package + + report + + + + post-unit-test + test + + report + + + + target/jacoco.exec + + ${junit.itReportFolder} + + + + + + org.liquibase + liquibase-maven-plugin + + src/main/resources/liquibase.properties + + ${project.basedir}/src/main/resources/db/changelog/${maven.build.timestamp}_changelog.xml + + + ${project.basedir}/src/main/resources/db/changelog/structure/${maven.build.timestamp}_entity_update.xml + + true + !test + + + + org.liquibase.ext + liquibase-hibernate5 + 4.15.0 + + + org.springframework.boot + spring-boot-starter-data-jpa + 2.7.2 + + + javax.validation + validation-api + 2.0.1.Final + + + org.springframework + spring-beans + 5.3.22 + + + org.slf4j + slf4j-simple + 2.0.11 + + + + + + + + \ No newline at end of file diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..73693ab --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,22 @@ +sonar.projectKey=hhh +sonar.projectName=numerotemporal-service-api2 + +sonar.sources=src/main/ +#sonar.host.url=http://192.168.1.90:9000 +#sonar.token=sqp_be04510fcd7f726558c210489203cc8cb9a3b799 + +sonar.tests=src/test/ + +sonar.exclusions=**/controller/core/**,**/graphql/** + + +sonar.host.url=http://sonarqube:9000 +#sonar.token=squ_095e01f2e60e4d77838a5a114356927fb1c99861 +sonar.login=squ_465ae384ffda803d8e58d9ef0111bef1277c874a +#sonar.login=sqp_249804bd04cbc7f86f7441a227ed7408b6b584ca +#sonar.login=channel +#sonar.password=Arroyo2024* + +#mvn clean verify sonar:sonar -DskipTests + + diff --git a/src/main/docker/app.env b/src/main/docker/app.env new file mode 100644 index 0000000..aa51bea --- /dev/null +++ b/src/main/docker/app.env @@ -0,0 +1,2 @@ +JAVA_OPTS=-Xmx1024m -Xms256m +START_SLEEP=5 \ No newline at end of file diff --git a/src/main/docker/dockerfile b/src/main/docker/dockerfile new file mode 100644 index 0000000..affbe78 --- /dev/null +++ b/src/main/docker/dockerfile @@ -0,0 +1,20 @@ +FROM amazoncorretto:21.0.2-alpine3.19 + +ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS + +RUN adduser --system --shell /bin/sh microservice +WORKDIR /home/microservice + +ADD entrypoint.sh entrypoint.sh +COPY /src/main/resources/application.properties /home/microservice/application.properties +RUN chmod 755 entrypoint.sh && chown microservice entrypoint.sh +USER microservice + +RUN mkdir data +RUN chmod -R 766 data/ + +EXPOSE 8080 + +ADD target/*.jar app.jar + +ENTRYPOINT ["./entrypoint.sh"] \ No newline at end of file diff --git a/src/main/java/com/millicom/microservice/service/NumeroTemporalAplicacion.java b/src/main/java/com/millicom/microservice/service/NumeroTemporalAplicacion.java new file mode 100644 index 0000000..26be0e8 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/NumeroTemporalAplicacion.java @@ -0,0 +1,22 @@ +package com.millicom.microservice.service; + +import com.readinessit.library.logging.application.services.LoggerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.scheduling.annotation.EnableAsync; + +@SpringBootApplication(scanBasePackages = {"com.readinessit","com.millicom"}) +@EntityScan(basePackages = {"com.readinessit","com.millicom"}) +@EnableAsync +public class NumeroTemporalAplicacion { + + @Autowired + LoggerService loggerService; + + public static void main(String[] args) { + SpringApplication.run(NumeroTemporalAplicacion.class, args); + + } +} \ No newline at end of file diff --git a/src/main/java/com/millicom/microservice/service/adapters/Adapter.java b/src/main/java/com/millicom/microservice/service/adapters/Adapter.java new file mode 100644 index 0000000..f30f5a3 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/Adapter.java @@ -0,0 +1,22 @@ +package com.millicom.microservice.service.adapters; + +import com.readinessit.library.messaging.api.services.SendMessageOperations; +import com.readinessit.library.messaging.data.MessageResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class Adapter { + @Autowired + SendMessageOperations sendOutgoingMessage; + + private MessageResponse sendMessage(Class classType, String operation, Object request, Map dynamicParams, Map headers, Map queryStr,String system) { + return sendOutgoingMessage.processMessage(system, classType.getName(), operation, request, queryStr, dynamicParams, headers); + } + + public MessageResponse sendMessage(Class classType, String operation, Object request, Map pathVars, Map headers , String system) { + return sendMessage(classType, operation, request, pathVars, headers, null, system); + } +} diff --git a/src/main/java/com/millicom/microservice/service/adapters/controlador/numero/temporal/NumeroTemporalAdaptador.java b/src/main/java/com/millicom/microservice/service/adapters/controlador/numero/temporal/NumeroTemporalAdaptador.java new file mode 100644 index 0000000..b782acb --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/controlador/numero/temporal/NumeroTemporalAdaptador.java @@ -0,0 +1,48 @@ +package com.millicom.microservice.service.adapters.controlador.numero.temporal; + + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.constraints.NotNull; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + + +@RequestMapping("") +public interface NumeroTemporalAdaptador { + @Operation(summary = "Obtener la respuesta de SimCard", description = "POST method to retrieve service Individuals", tags = {"Individuals"}) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "successful operation", content = @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = String.class))), + @ApiResponse(responseCode = "204", description = "GET means no record found DELETE means sucessfully deletion"), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = Error.class))), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = Error.class))), + @ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = Error.class))), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = Error.class))), + @ApiResponse(responseCode = "405", description = "Method Not allowed", content = @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = Error.class))), + @ApiResponse(responseCode = "409", description = "Conflict", content = @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = Error.class))), + @ApiResponse(responseCode = "500", description = "Internal Server Error", content = @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = Error.class))), + @ApiResponse(responseCode = "503", description = "Service Unavailable", content = @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = Error.class))), + @ApiResponse(responseCode = "504", description = "Gateway Timeout", content = @Content(mediaType = "application/json;charset=utf-8", schema = @Schema(implementation = Error.class)))}) + /** + * Obtiene información de la tarjeta SIM a partir del cuerpo de la solicitud. + * + * @param cuerpo El cuerpo de la solicitud que contiene información de la tarjeta SIM. + * @return Una ResponseEntity con la información de la tarjeta SIM o una estructura de error en caso de problemas. + */ + @PostMapping(value = "${service.numerotemporal.patch}**", consumes = {MediaType.TEXT_XML_VALUE}, produces = {"text/xml;charset=utf-8"}) + ResponseEntity consultarNumeroTemporal(@RequestBody @NotNull String cuerpo, HttpServletRequest solicitudHttp); + + + @GetMapping(path = "${service.numerotemporal.patch}**", produces = {"text/xml;charset=utf-8"}) + ResponseEntity obtenerFirma(HttpServletRequest solicitudHttp); + + +} diff --git a/src/main/java/com/millicom/microservice/service/adapters/controlador/numero/temporal/NumeroTemporalRecurso.java b/src/main/java/com/millicom/microservice/service/adapters/controlador/numero/temporal/NumeroTemporalRecurso.java new file mode 100644 index 0000000..9db279e --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/controlador/numero/temporal/NumeroTemporalRecurso.java @@ -0,0 +1,251 @@ +package com.millicom.microservice.service.adapters.controlador.numero.temporal; + + +import com.millicom.microservice.service.adapters.dto.common.OperationException; +import com.millicom.microservice.service.external.services.personalizado.ConsultarResponse; +import com.millicom.microservice.service.service.numero.temporal.Consultar; +import com.readinessit.library.logging.application.services.LoggerService; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.xml.bind.*; +import jakarta.xml.soap.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.Resource; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; +import org.w3c.dom.Document; +import org.w3c.dom.ls.DOMImplementationLS; +import org.w3c.dom.ls.LSSerializer; +import org.xml.sax.SAXException; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.stream.StreamSource; +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.util.Iterator; + +import static com.millicom.microservice.service.external.services.common.Constants.MODULO; + + +@RestController +public class NumeroTemporalRecurso implements NumeroTemporalAdaptador { + + + private final Consultar consultar; + + @Value("classpath:wsdl/MAIN.wsdl") + private Resource recurso; + + @Autowired + public NumeroTemporalRecurso(Consultar consultar) { + this.consultar = consultar; + } + + /** + * Obtiene información de una Simcard. + * + * @param cuerpoSolicitud Datos de la solicitud. + * @return ResponseEntity con la respuesta. + */ + @Override + public ResponseEntity consultarNumeroTemporal(String cuerpoSolicitud, HttpServletRequest solicitudHttp) { + try { + SOAPMessage mensajeSoap = obtenerSoapMessageDeXml(cuerpoSolicitud); + SOAPElement elementoSoap = obtenerPrimerSoapElement(mensajeSoap.getSOAPBody()); + if (elementoSoap != null) { + if (elementoSoap.getLocalName().equals("Consultar")) { + String xml = obtenerXmlDeSoapElement(elementoSoap, false, true); + com.millicom.microservice.service.external.services.Consultar solicitud = obtenerObjetoDeXml(xml, com.millicom.microservice.service.external.services.Consultar.class, false); + com.millicom.microservice.service.external.services.personalizado.ConsultarResponse response = consultar.consultar(solicitud.getConsultaRequest()); + return new ResponseEntity<>(obtenerSoapMessage(response), null, HttpStatus.OK); + } else { + return new ResponseEntity<>(obtenerSoapFault("Metodo no implementado"), HttpStatus.OK); + } + } + + } catch (OperationException e) { + try { + return new ResponseEntity<>(obtenerSoapFault(e.getErrorStructure().getValor()), e.getErrorStatus()); + } catch (Exception ex) { + LoggerService.logBusiness(MODULO, "Exception: " + e.getMessage(), e); + } + } catch (Exception e) { + try { + return new ResponseEntity<>(obtenerSoapFault(e.toString()), HttpStatus.BAD_GATEWAY); + } catch (Exception ex) { + LoggerService.logBusiness(MODULO, "Exception: " + e.getMessage(), e); + } + } + return ResponseEntity.badRequest().body(""); + } + + + @Override + public ResponseEntity obtenerFirma(HttpServletRequest request) { + try { + // Obtener el esquema (http o https) + String scheme = request.getHeader("X-Forwarded-Proto"); + if (scheme == null) { + scheme = request.getScheme(); // Usa el esquema de la solicitud si no está presente en los encabezados + } + + // Obtener el nombre del servidor (dominio) + String serverName = request.getHeader("X-Forwarded-Host"); + if (serverName == null) { + serverName = request.getServerName(); // Usa el nombre del servidor de la solicitud si no está presente en los encabezados + } + + // Obtener el puerto (si no es el puerto por defecto) + String port = request.getHeader("X-Forwarded-Port"); + if (port == null) { + int serverPort = request.getServerPort(); + // El puerto 80 para HTTP y 443 para HTTPS son por defecto y generalmente no se muestran + if (serverPort == 80 || serverPort == 443) { + port = ""; + } else { + port = ":" + serverPort; + } + } else { + port = ":" + port; + } + + // Obtener el contexto de la aplicación + String contextPath = request.getContextPath(); + // Obtener la URI completa + String requestUri = request.getRequestURI(); + // Obtener los parámetros de la consulta (query string) + String queryString = request.getQueryString(); + + // Construir la URL absoluta + String absoluteUrl = scheme + "://" + serverName + port + contextPath + requestUri; + if (queryString != null) { + absoluteUrl += "?" + queryString; + } + String firma = new String(recurso.getInputStream().readAllBytes(), StandardCharsets.UTF_8); + firma = firma.replace("LOCALHOST", absoluteUrl); + return new ResponseEntity<>(firma, HttpStatus.OK); + } catch (Exception e) { + return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + } + } + + + /** + * Permite convertir a un Objeto serializable a paratir de un xml + * + * @param xml Objeto a convertir en formato xml + * @param clase Clase al cual se va convertir el xml + * @param conJaxElement Indica si va convertir a objeto usando JAXElement + * @param Objeto generico a convertir el xml + * @return Retorna un Objeto de tipo clase + * @throws JAXBException + */ + public static T obtenerObjetoDeXml(String xml, Class clase, Boolean conJaxElement) throws JAXBException { + StringReader sr = new StringReader(xml); + JAXBContext jaxbContext = JAXBContext.newInstance(clase); + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + if (Boolean.TRUE.equals(conJaxElement)) { + return (T) ((JAXBElement) unmarshaller.unmarshal(sr)).getValue(); + } else { + return (T) unmarshaller.unmarshal(sr); + } + } + + /** + * Permite convertir un xml a partir de un SoapElement + * + * @param elemento Objeto SOAPElement + * @param declaracionXml Indicador que señala si el xml tendrá el tag de declaracion xml + * @param tabularXml Indicador que señala si el xml estará formateado + * @return Retorna un xml de un SoapElement + */ + private String obtenerXmlDeSoapElement(SOAPElement elemento, boolean declaracionXml, boolean tabularXml) { + DOMImplementationLS implementacionDom = (DOMImplementationLS) elemento.getOwnerDocument().getImplementation().getFeature("LS", "3.0"); + LSSerializer serializador = implementacionDom.createLSSerializer(); + serializador.getDomConfig().setParameter("xml-declaration", declaracionXml); + serializador.getDomConfig().setParameter("format-pretty-print", tabularXml); + return serializador.writeToString(elemento); + } + + + /** + * Permite obtener en formato texto un SoapFault a partir del detalle del error + * + * @param detalle Detalle del error con el cual se generará el SoapFault + * @return Retorna un SoapFault en formato texto + * @throws SOAPException + * @throws IOException + */ + private String obtenerSoapFault(String detalle) throws SOAPException, IOException { + SOAPMessage mensajeSoap = MessageFactory.newInstance().createMessage(); + mensajeSoap.getSOAPPart().getEnvelope().getBody().addFault().setFaultString(detalle); + ByteArrayOutputStream flujoSalida = new ByteArrayOutputStream(); + mensajeSoap.writeTo(flujoSalida); + return flujoSalida.toString(StandardCharsets.UTF_8); + } + + /** + * Permite obtener un objeto SoapMessage a partir de un xml + * + * @param requestXml SoapMessage en formato texto + * @return retorna un objeto SoapMessage a partir de un xml + * @throws SOAPException + */ + private SOAPMessage obtenerSoapMessageDeXml(String requestXml) throws SOAPException { + SOAPMessage mensajeSoap = MessageFactory.newInstance().createMessage(); + SOAPPart seccionSoap = mensajeSoap.getSOAPPart(); + InputStream flujoEntrada = new ByteArrayInputStream(requestXml.getBytes(StandardCharsets.UTF_8)); + StreamSource flujoOrigen = new StreamSource(flujoEntrada); + seccionSoap.setContent(flujoOrigen); + mensajeSoap.saveChanges(); + return mensajeSoap; + } + + /** + * Permite obtener el primer objeto SoapElement del cuerpo de un SoapMessage + * + * @param cuerpoSoap Objeto SoapBody + * @return Retorna el primer objeto de tipo SoapElement de un SoapBody + */ + private SOAPElement obtenerPrimerSoapElement(SOAPBody cuerpoSoap) { + for (Iterator iterador = cuerpoSoap.getChildElements(); iterador.hasNext(); ) { + Object hijo = iterador.next(); + if (hijo instanceof SOAPElement) { + return (SOAPElement) hijo; + } + } + return null; + } + + private String convertirAXml(ConsultarResponse response) throws JAXBException { + JAXBContext context = JAXBContext.newInstance(ConsultarResponse.class); + Marshaller marshaller = context.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.FALSE); + StringWriter writer = new StringWriter(); + marshaller.marshal(response, writer); + return writer.toString(); + } + + private Document obtenerDocumento(String xmlString) throws ParserConfigurationException, IOException, SAXException { + DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); + dbFactory.setNamespaceAware(true); + DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); + return dBuilder.parse(new ByteArrayInputStream(xmlString.getBytes(StandardCharsets.UTF_8))); + } + + private String obtenerSoapMessage(ConsultarResponse response) throws SOAPException, IOException, JAXBException, ParserConfigurationException, SAXException { + SOAPMessage mensajeSoap = MessageFactory.newInstance().createMessage(); + String xml = convertirAXml(response); + LoggerService.logBusiness(MODULO, xml, null); + Document documento = obtenerDocumento(xml); + mensajeSoap.getSOAPPart().getEnvelope().getBody().addDocument(documento); + mensajeSoap.saveChanges(); + ByteArrayOutputStream flujoSalida = new ByteArrayOutputStream(); + mensajeSoap.writeTo(flujoSalida); + return new String(flujoSalida.toByteArray(), StandardCharsets.UTF_8); + } +} diff --git a/src/main/java/com/millicom/microservice/service/adapters/dto/common/ErrorStructure.java b/src/main/java/com/millicom/microservice/service/adapters/dto/common/ErrorStructure.java new file mode 100644 index 0000000..b2f1077 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/dto/common/ErrorStructure.java @@ -0,0 +1,15 @@ +package com.millicom.microservice.service.adapters.dto.common; + + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Getter; +import lombok.Setter; +import org.springframework.http.HttpStatus; + +@Getter +@Setter +public class ErrorStructure extends ResponseError { + @JsonIgnore + private HttpStatus httpStatus; + +} diff --git a/src/main/java/com/millicom/microservice/service/adapters/dto/common/OperationException.java b/src/main/java/com/millicom/microservice/service/adapters/dto/common/OperationException.java new file mode 100644 index 0000000..caf2f80 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/dto/common/OperationException.java @@ -0,0 +1,14 @@ +package com.millicom.microservice.service.adapters.dto.common; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public class OperationException extends RuntimeException { + + private HttpStatus errorStatus; + private ErrorStructure errorStructure; + +} diff --git a/src/main/java/com/millicom/microservice/service/adapters/dto/common/ResponseError.java b/src/main/java/com/millicom/microservice/service/adapters/dto/common/ResponseError.java new file mode 100644 index 0000000..0e05f59 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/dto/common/ResponseError.java @@ -0,0 +1,10 @@ +package com.millicom.microservice.service.adapters.dto.common; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ResponseError { + private String valor; +} diff --git a/src/main/java/com/millicom/microservice/service/adapters/soap/service/TemporalEndpoint.java b/src/main/java/com/millicom/microservice/service/adapters/soap/service/TemporalEndpoint.java new file mode 100644 index 0000000..7e99005 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/soap/service/TemporalEndpoint.java @@ -0,0 +1,31 @@ +package com.millicom.microservice.service.adapters.soap.service; + +import com.millicom.microservice.service.external.services.personalizado.ConsultarResponse; +import com.millicom.microservice.service.service.numero.temporal.Consultar; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ws.server.endpoint.annotation.Endpoint; +import org.springframework.ws.server.endpoint.annotation.PayloadRoot; +import org.springframework.ws.server.endpoint.annotation.RequestPayload; +import org.springframework.ws.server.endpoint.annotation.ResponsePayload; + + +@Endpoint +public class TemporalEndpoint { + private static final String NAMESPACE_URI = "http://services.tigo.com.bo/"; + + + private final Consultar consultar; + + @Autowired + public TemporalEndpoint(Consultar consultar) { + this.consultar = consultar; + } + + + @PayloadRoot(localPart = "Consultar", namespace = NAMESPACE_URI) + @ResponsePayload + public ConsultarResponse consultar(@RequestPayload com.millicom.microservice.service.external.services.Consultar consultaRequest) { + return consultar.consultar(consultaRequest.getConsultaRequest()); + + } +} diff --git a/src/main/java/com/millicom/microservice/service/adapters/soap/service/WebServiceConfig.java b/src/main/java/com/millicom/microservice/service/adapters/soap/service/WebServiceConfig.java new file mode 100644 index 0000000..07ebe80 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/soap/service/WebServiceConfig.java @@ -0,0 +1,52 @@ +package com.millicom.microservice.service.adapters.soap.service; + +import org.springframework.context.annotation.Configuration; +import org.springframework.ws.config.annotation.EnableWs; +import org.springframework.ws.config.annotation.WsConfigurerAdapter; + + +@EnableWs +@Configuration +public class WebServiceConfig extends WsConfigurerAdapter { + + /*private final EndpointInterceptor payloadLoggingInterceptor; + private final CustomPayloadTransformingInterceptor interceptor; + + @Autowired + public WebServiceConfig(EndpointInterceptor payloadLoggingInterceptor, CustomPayloadTransformingInterceptor interceptor) { + this.payloadLoggingInterceptor = payloadLoggingInterceptor; + this.interceptor = interceptor; + } + + + @Override + public void addInterceptors(List interceptors) { + interceptors.add(payloadLoggingInterceptor); + interceptors.add(interceptor); + + } + + + @Bean + public ServletRegistrationBean messageDispatcherServlet(ApplicationContext applicationContext) { + // LoggerService.logBusiness(MODULO, "Ingresando a messageDispatcherServlet", null); + MessageDispatcherServlet servlet = new MessageDispatcherServlet(); + servlet.setApplicationContext(applicationContext); + servlet.setTransformWsdlLocations(true); + //servlet.setContentType("application/soap+xml"); // Configurar el tipo de contenido de las respuestas SOAP + return new ServletRegistrationBean(servlet, "/*"); + + } + + @Bean(name = "consultaNumeroTemporalV2") + public Wsdl11Definition defaultWsdl11Definition() { + // LoggerService.logBusiness(MODULO,"Ingresando a defaultWsdl11Definition",null); + SimpleWsdl11Definition wsdl11Definition = new SimpleWsdl11Definition(); + + wsdl11Definition.setWsdl(new ClassPathResource("wsdl/MAIN.wsdl")); + // wsdl11Definition.setContentType("application/soap+xml"); + + return wsdl11Definition; + }*/ + +} \ No newline at end of file diff --git a/src/main/java/com/millicom/microservice/service/adapters/soap/service/WebServiceConfig2.java b/src/main/java/com/millicom/microservice/service/adapters/soap/service/WebServiceConfig2.java new file mode 100644 index 0000000..77150c9 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/soap/service/WebServiceConfig2.java @@ -0,0 +1,38 @@ +package com.millicom.microservice.service.adapters.soap.service; + +/* + +@EnableWs +@Configuration +public class WebServiceConfig2 extends WsConfigurerAdapter { + + @Bean + public ServletRegistrationBean messageDispatcherServlet(ApplicationContext applicationContext) { + MessageDispatcherServlet servlet = new MessageDispatcherServlet(); + servlet.setApplicationContext(applicationContext); + servlet.setTransformWsdlLocations(true); + return new ServletRegistrationBean(servlet, "/*"); + } + + + @Bean(name = "consultaNumeroTemporalV2") + public DefaultWsdl11Definition defaultWsdl11Definition(XsdSchema countriesSchema) { + DefaultWsdl11Definition wsdl11Definition = new DefaultWsdl11Definition(); + wsdl11Definition.setPortTypeName("ConsultarNumeroTemporalPortBinding"); + //wsdl11Definition.setLocationUri("/mnp-services/bccsneuvo"); + wsdl11Definition.setLocationUri("/consultaNumeroTemporalV2"); + wsdl11Definition.setTargetNamespace("http://services.tigo.com.bo/"); + wsdl11Definition.setSchema(countriesSchema); + wsdl11Definition.setCreateSoap11Binding(true); + // wsdl11Definition.setCreateSoap12Binding(true); + wsdl11Definition.setServiceName("PortabilityProcessPortType"); + + return wsdl11Definition; + } + + @Bean + public XsdSchema countriesSchema() { + return new SimpleXsdSchema(new ClassPathResource("wsdl/ConsultarNumeroTemporal.xsd")); + } + +}*/ diff --git a/src/main/java/com/millicom/microservice/service/adapters/soap/service/interceptor/CustomPayloadTransformingInterceptor.java b/src/main/java/com/millicom/microservice/service/adapters/soap/service/interceptor/CustomPayloadTransformingInterceptor.java new file mode 100644 index 0000000..42cffe5 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/soap/service/interceptor/CustomPayloadTransformingInterceptor.java @@ -0,0 +1,73 @@ +package com.millicom.microservice.service.adapters.soap.service.interceptor; + +import com.readinessit.library.logging.application.services.LoggerService; +import com.readinessit.library.messaging.logs.MessagingLogger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.Resource; +import org.springframework.stereotype.Component; +import org.springframework.util.Assert; +import org.springframework.ws.server.endpoint.interceptor.PayloadTransformingInterceptor; +import org.springframework.xml.transform.ResourceSource; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.XMLReaderFactory; + +import javax.xml.transform.Templates; +import javax.xml.transform.TransformerFactory; + +import static com.millicom.microservice.service.external.services.common.Constants.MODULO; + +@Component +public class CustomPayloadTransformingInterceptor extends PayloadTransformingInterceptor { + + + private final MessagingLogger messagingLogger; + + private Resource requestXslt; + private Resource responseXslt; + private Templates requestTemplates; + private Templates responseTemplates; + + @Autowired + public CustomPayloadTransformingInterceptor(MessagingLogger messagingLogger) { + this.messagingLogger = messagingLogger; + } + + + @Override + public void afterPropertiesSet() throws Exception { + if (this.requestXslt == null && this.responseXslt == null) { + // LoggerService.logBusiness(MODULO, "NULL", requestXslt); + } else { + TransformerFactory transformerFactory = this.getTransformerFactory(); + XMLReader xmlReader = XMLReaderFactory.createXMLReader(); + xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); + ResourceSource responseSource; + if (this.requestXslt != null) { + Assert.isTrue(this.requestXslt.exists(), "requestXslt \"" + this.requestXslt + "\" does not exit"); + LoggerService.logBusiness(MODULO, "Transforming request using " + this.requestXslt, null); + + + responseSource = new ResourceSource(xmlReader, this.requestXslt); + this.requestTemplates = transformerFactory.newTemplates(responseSource); + + LoggerService.logBusiness(MODULO, "Request", requestXslt); + } + + if (this.responseXslt != null) { + Assert.isTrue(this.responseXslt.exists(), "responseXslt \"" + this.responseXslt + "\" does not exit"); + LoggerService.logBusiness(MODULO, "Transforming response using " + this.responseXslt, null); + responseSource = new ResourceSource(xmlReader, this.responseXslt); + this.responseTemplates = transformerFactory.newTemplates(responseSource); + LoggerService.logBusiness(MODULO, "Response", responseXslt); + } + + + // this.messagingLogger.createMessageLog(requestBodyUriSpec, sentDate, request, adapterDefinition, url, clientResponse, respBody); + // this.messagingLogger.createMessageLog(requestBodyUriSpec, sentDate, requestXslt, adapterDefinition, url, clientResponse, responseXslt); + + } + } +} + + + diff --git a/src/main/java/com/millicom/microservice/service/adapters/soap/service/interceptor/InterceptorConfig.java b/src/main/java/com/millicom/microservice/service/adapters/soap/service/interceptor/InterceptorConfig.java new file mode 100644 index 0000000..1a32fbc --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/adapters/soap/service/interceptor/InterceptorConfig.java @@ -0,0 +1,18 @@ +package com.millicom.microservice.service.adapters.soap.service.interceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.ws.server.EndpointInterceptor; +import org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor; + +@Configuration +public class InterceptorConfig { + + @Bean + public EndpointInterceptor payloadLoggingInterceptor() { + PayloadLoggingInterceptor interceptor = new PayloadLoggingInterceptor(); + interceptor.setLogRequest(true); + interceptor.setLogResponse(true); + interceptor.setLoggerName("org.springframework.ws.server.MessageTracing"); + return interceptor; + } +} diff --git a/src/main/java/com/millicom/microservice/service/configuration/MsTemplateConfig.java b/src/main/java/com/millicom/microservice/service/configuration/MsTemplateConfig.java new file mode 100644 index 0000000..704cdc2 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/configuration/MsTemplateConfig.java @@ -0,0 +1,24 @@ +package com.millicom.microservice.service.configuration; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import jakarta.annotation.PostConstruct; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; + + +@Configuration +public class MsTemplateConfig { + + @Autowired + ObjectMapper objectMapper; + + @PostConstruct + public void setUp() { + objectMapper.registerModule(new JavaTimeModule()); + objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + objectMapper.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + } +} diff --git a/src/main/java/com/millicom/microservice/service/controller/core/BaseController.java b/src/main/java/com/millicom/microservice/service/controller/core/BaseController.java new file mode 100644 index 0000000..cfda3ba --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/controller/core/BaseController.java @@ -0,0 +1,108 @@ +package com.millicom.microservice.service.controller.core; + +import com.millicom.microservice.service.adapters.dto.common.ErrorStructure; +import com.millicom.microservice.service.service.common.GenerateErrorService; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.springframework.beans.ConversionNotSupportedException; +import org.springframework.beans.TypeMismatchException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.http.converter.HttpMessageNotWritableException; +import org.springframework.lang.Nullable; +import org.springframework.validation.BindException; +import org.springframework.web.HttpMediaTypeNotAcceptableException; +import org.springframework.web.HttpMediaTypeNotSupportedException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingPathVariableException; +import org.springframework.web.bind.MissingServletRequestParameterException; +import org.springframework.web.bind.ServletRequestBindingException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.HttpServerErrorException; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.context.request.async.AsyncRequestTimeoutException; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.multipart.support.MissingServletRequestPartException; +import org.springframework.web.servlet.NoHandlerFoundException; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +//import com.readinessit.library.internationalization.interceptor.RequestInterceptor; + + +@RestControllerAdvice +public class BaseController { + @Autowired + GenerateErrorService generateErrorService; + private ResponseEntityExceptionHandler responseEntityExceptionHandler; + + // @Autowired + // RequestInterceptor requestInterceptor; + + public BaseController() { + responseEntityExceptionHandler = new ResponseEntityExceptionHandler() { + + @Override + protected ResponseEntity handleExceptionInternal(Exception ex, @Nullable Object body, HttpHeaders headers, HttpStatusCode status, WebRequest request) { + return handleErrorResponseCreation(ex, headers, status, request); + } + }; + } + + @ExceptionHandler({HttpMediaTypeNotSupportedException.class, HttpMediaTypeNotAcceptableException.class, MissingPathVariableException.class, MissingServletRequestParameterException.class, ServletRequestBindingException.class, ConversionNotSupportedException.class, TypeMismatchException.class, HttpMessageNotReadableException.class, HttpMessageNotWritableException.class, MethodArgumentNotValidException.class, MissingServletRequestPartException.class, BindException.class, AsyncRequestTimeoutException.class}) + public final ResponseEntity handleException(Exception ex, WebRequest request, HandlerMethod handlerMethod) throws Exception { + ResponseEntity error = responseEntityExceptionHandler.handleException(ex, request); + + if(error != null ) { + ErrorStructure body = error.hasBody() ? (ErrorStructure) error.getBody() : null; + if(body != null) + // body.getLonginusInternalErrorCode().set_atMoreInfo(handlerMethod.getBeanType().getName() + ":" + handlerMethod.getMethod().getName()); + return error; + } + throw ex; + } + + @ExceptionHandler({HttpRequestMethodNotSupportedException.class, NoHandlerFoundException.class}) + public final ResponseEntity handleException(Exception ex, WebRequest request) throws Exception { + // requestInterceptor.preHandle(((ServletWebRequest)request).getRequest(), ((ServletWebRequest)request).getResponse(), null); + return responseEntityExceptionHandler.handleException(ex, request); + } + + @ExceptionHandler({Exception.class}) + public final ResponseEntity handleUnknownException(Exception ex, WebRequest request, HandlerMethod handlerMethod) { + ResponseEntity error = handleErrorResponseCreation(ex, null, HttpStatus.INTERNAL_SERVER_ERROR, request); + + ErrorStructure body = error.hasBody() ? (ErrorStructure) error.getBody() : null; + if(body != null){} + // body.getLonginusInternalErrorCode().set_atMoreInfo(handlerMethod.getBeanType().getName() + ":" + handlerMethod.getMethod().getName()); + return error; + } + + @ExceptionHandler({ HttpClientErrorException.class, HttpServerErrorException.class }) + public final ResponseEntity handleClientError(HttpClientErrorException ex, WebRequest request, HandlerMethod handlerMethod) { + ResponseEntity error = handleErrorResponseCreation(ex, null, ex.getStatusCode(), request); + + ErrorStructure body = error.hasBody() ? (ErrorStructure) error.getBody() : null; + if (body != null){} + //body.getLonginusInternalErrorCode().set_atMoreInfo(handlerMethod.getBeanType().getName() + ":" + handlerMethod.getMethod().getName()); + + //body.getBackendErrorCode().setErrorDescription(ex.getResponseBodyAsString()); + return error; + } + + private ResponseEntity handleErrorResponseCreation(Exception ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) { + String stacktrace = null; + if (HttpStatus.INTERNAL_SERVER_ERROR.equals(status)) { + request.setAttribute("javax.servlet.error.exception", ex, 0); + stacktrace = ExceptionUtils.getStackTrace(ex); + } + + String simpleStackTrace = ex.getMessage(); + ErrorStructure error = generateErrorService.generateError(status, "MT_ERR_GEN_0001", new String[]{simpleStackTrace}, stacktrace, getClass()); + return new ResponseEntity<>(error, headers, status); + } +} diff --git a/src/main/java/com/millicom/microservice/service/controller/core/ErrorPageController.java b/src/main/java/com/millicom/microservice/service/controller/core/ErrorPageController.java new file mode 100644 index 0000000..c3427b1 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/controller/core/ErrorPageController.java @@ -0,0 +1,66 @@ +package com.millicom.microservice.service.controller.core; + +import com.millicom.microservice.service.adapters.controlador.numero.temporal.NumeroTemporalRecurso; +import com.millicom.microservice.service.adapters.dto.common.ErrorStructure; +import com.millicom.microservice.service.service.common.GenerateErrorServiceImp; +import com.millicom.microservice.service.service.numero.propiedades.map.PropiedadesRespuesta; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.servlet.error.ErrorController; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import static com.millicom.microservice.service.external.services.common.Constants.ERROR_CODE_EXCEPTION; +import static com.millicom.microservice.service.external.services.common.Constants.ERROR_CODE_NOT_FOUND; + +@RestController +public class ErrorPageController implements ErrorController { + + @Autowired + PropiedadesRespuesta propiedadesRespuesta; + + @Autowired + GenerateErrorServiceImp generateErrorService; + + @Autowired + NumeroTemporalRecurso createOrderRecurso; + + @RequestMapping(value = "/error", method = { + RequestMethod.GET, + RequestMethod.POST, + RequestMethod.DELETE, + RequestMethod.PATCH, + RequestMethod.OPTIONS}) + public ResponseEntity handleError(HttpServletRequest request) { + + Object status = request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE); + + if (status != null) { + + int statusCode = Integer.parseInt(status.toString()); + HttpStatus httpStatus = HttpStatus.valueOf(statusCode); + + + if (httpStatus == HttpStatus.NOT_FOUND) { + // String requestedPath = request.getAttribute("javax.servlet.error.request_uri").toString(); + //ErrorStructure error = generateErrorService.generateError(httpStatus, ERROR_CODE_NOT_FOUND, null, "There is no controller for this operation" + requestedPath, getClass()); + return ResponseEntity.status(httpStatus).body("The requested resource could not be found."); + // return ResponseEntity.status(200).contentType(MediaType.TEXT_XML).body(createOrderRecurso.obtenerFirma(request)); + } + + + if (propiedadesRespuesta.getErrors().containsKey(String.valueOf(httpStatus.value()))) { + ErrorStructure error = generateErrorService.generateError(httpStatus, ERROR_CODE_NOT_FOUND, null, "N/A", getClass()); + return ResponseEntity.status(httpStatus).body(error); + } + + } + + ErrorStructure error = generateErrorService.generateError(HttpStatus.INTERNAL_SERVER_ERROR, ERROR_CODE_EXCEPTION, null, "Default /error mapping", getClass()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/AdditionalParameters.java b/src/main/java/com/millicom/microservice/service/external/services/AdditionalParameters.java new file mode 100644 index 0000000..1468997 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/AdditionalParameters.java @@ -0,0 +1,71 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + +import java.util.ArrayList; +import java.util.List; + + + +/** + *

Clase Java para AdditionalParameters complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="AdditionalParameters">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="parametersList" type="{http://services.tigo.com.bo/}Parameters" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "AdditionalParameters", propOrder = { + "parametersList" +}) +public class AdditionalParameters { + + @XmlElement(required = true) + protected List parametersList; + + /** + * Gets the value of the parametersList property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the parametersList property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getParametersList().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Parameters } + * + * + */ + public List getParametersList() { + if (parametersList == null) { + parametersList = new ArrayList(); + } + return this.parametersList; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/ConsultaRequest.java b/src/main/java/com/millicom/microservice/service/external/services/ConsultaRequest.java new file mode 100644 index 0000000..86fc6ea --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/ConsultaRequest.java @@ -0,0 +1,61 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + +/** + *

Clase Java para ConsultaRequest complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="ConsultaRequest">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="bodyRequest" type="{http://services.tigo.com.bo/}RequestBody"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ConsultaRequest", propOrder = { + "bodyRequest" +}) +public class ConsultaRequest { + + @XmlElement(required = true) + protected RequestBody bodyRequest; + + /** + * Obtiene el valor de la propiedad bodyRequest. + * + * @return + * possible object is + * {@link RequestBody } + * + */ + public RequestBody getBodyRequest() { + return bodyRequest; + } + + /** + * Define el valor de la propiedad bodyRequest. + * + * @param value + * allowed object is + * {@link RequestBody } + * + */ + public void setBodyRequest(RequestBody value) { + this.bodyRequest = value; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/ConsultaResponse.java b/src/main/java/com/millicom/microservice/service/external/services/ConsultaResponse.java new file mode 100644 index 0000000..a51e98d --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/ConsultaResponse.java @@ -0,0 +1,293 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + + +/** + *

Clase Java para ConsultaResponse complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="ConsultaResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="headerResponse" type="{http://services.tigo.com.bo/}ResponseHeader"/>
+ *         <element name="bodyResponse">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="msisdnList" type="{http://services.tigo.com.bo/}MsisdnInformationType" minOccurs="0"/>
+ *                   <element name="transactionStatus" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   <element name="additionalResults" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element ref="{http://services.tigo.com.bo/}ParameterType" maxOccurs="unbounded"/>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ConsultaResponse", propOrder = { + "headerResponse", + "bodyResponse" +}) + +@XmlRootElement(name = "consultaResponse") +public class ConsultaResponse { + + @XmlElement(required = true) + protected ResponseHeader headerResponse; + @XmlElement(required = true) + protected ConsultaResponse.BodyResponse bodyResponse; + + /** + * Obtiene el valor de la propiedad headerResponse. + * + * @return + * possible object is + * {@link ResponseHeader } + * + */ + public ResponseHeader getHeaderResponse() { + return headerResponse; + } + + /** + * Define el valor de la propiedad headerResponse. + * + * @param value + * allowed object is + * {@link ResponseHeader } + * + */ + public void setHeaderResponse(ResponseHeader value) { + this.headerResponse = value; + } + + /** + * Obtiene el valor de la propiedad bodyResponse. + * + * @return + * possible object is + * {@link ConsultaResponse.BodyResponse } + * + */ + public ConsultaResponse.BodyResponse getBodyResponse() { + return bodyResponse; + } + + /** + * Define el valor de la propiedad bodyResponse. + * + * @param value + * allowed object is + * {@link ConsultaResponse.BodyResponse } + * + */ + public void setBodyResponse(ConsultaResponse.BodyResponse value) { + this.bodyResponse = value; + } + + + /** + *

Clase Java para anonymous complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="msisdnList" type="{http://services.tigo.com.bo/}MsisdnInformationType" minOccurs="0"/>
+     *         <element name="transactionStatus" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     *         <element name="additionalResults" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element ref="{http://services.tigo.com.bo/}ParameterType" maxOccurs="unbounded"/>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "msisdnList", + "transactionStatus", + "additionalResults" + }) + @XmlRootElement(name = "bodyResponse") + public static class BodyResponse { + + protected MsisdnInformationType msisdnList; + @XmlElement(required = true) + protected String transactionStatus; + protected ConsultaResponse.BodyResponse.AdditionalResults additionalResults; + + /** + * Obtiene el valor de la propiedad msisdnList. + * + * @return + * possible object is + * {@link MsisdnInformationType } + * + */ + public MsisdnInformationType getMsisdnList() { + return msisdnList; + } + + /** + * Define el valor de la propiedad msisdnList. + * + * @param value + * allowed object is + * {@link MsisdnInformationType } + * + */ + public void setMsisdnList(MsisdnInformationType value) { + this.msisdnList = value; + } + + /** + * Obtiene el valor de la propiedad transactionStatus. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTransactionStatus() { + return transactionStatus; + } + + /** + * Define el valor de la propiedad transactionStatus. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTransactionStatus(String value) { + this.transactionStatus = value; + } + + /** + * Obtiene el valor de la propiedad additionalResults. + * + * @return + * possible object is + * {@link ConsultaResponse.BodyResponse.AdditionalResults } + * + */ + public ConsultaResponse.BodyResponse.AdditionalResults getAdditionalResults() { + return additionalResults; + } + + /** + * Define el valor de la propiedad additionalResults. + * + * @param value + * allowed object is + * {@link ConsultaResponse.BodyResponse.AdditionalResults } + * + */ + public void setAdditionalResults(ConsultaResponse.BodyResponse.AdditionalResults value) { + this.additionalResults = value; + } + + + /** + *

Clase Java para anonymous complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element ref="{http://services.tigo.com.bo/}ParameterType" maxOccurs="unbounded"/>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "parameterType" + }) + public static class AdditionalResults { + @XmlElement(name = "ParameterType", namespace = "http://services.tigo.com.bo/", required = true) + protected List parameterType; + + /** + * Gets the value of the parameterType property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the parameterType property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getParameterType().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ParameterType } + * + * + */ + public List getParameterType() { + if (parameterType == null) { + parameterType = new ArrayList(); + } + return this.parameterType; + } + + } + + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/Consultar.java b/src/main/java/com/millicom/microservice/service/external/services/Consultar.java new file mode 100644 index 0000000..e7841f5 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/Consultar.java @@ -0,0 +1,63 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + +/** + *

Clase Java para Consultar complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="Consultar">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="consultaRequest" type="{http://services.tigo.com.bo/}ConsultaRequest" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Consultar", propOrder = { + "consultaRequest" +}) + +//nuevo +@XmlRootElement(name = "Consultar") +public class Consultar { + + protected ConsultaRequest consultaRequest; + + /** + * Obtiene el valor de la propiedad consultaRequest. + * + * @return + * possible object is + * {@link ConsultaRequest } + * + */ + public ConsultaRequest getConsultaRequest() { + return consultaRequest; + } + + /** + * Define el valor de la propiedad consultaRequest. + * + * @param value + * allowed object is + * {@link ConsultaRequest } + * + */ + public void setConsultaRequest(ConsultaRequest value) { + this.consultaRequest = value; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/ConsultarNumeroTemporal.java b/src/main/java/com/millicom/microservice/service/external/services/ConsultarNumeroTemporal.java new file mode 100644 index 0000000..8ceea46 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/ConsultarNumeroTemporal.java @@ -0,0 +1,31 @@ +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.XmlSeeAlso; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + + +@WebService(targetNamespace = "http://services.tigo.com.bo/", name = "ConsultarNumeroTemporal") +@XmlSeeAlso({ObjectFactory.class}) +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface ConsultarNumeroTemporal { + + @WebMethod(operationName = "Consultar") + //@RequestWrapper(localName = "Consultar", targetNamespace = "http://services.tigo.com.bo/", className = "bo.com.tigo.services.Consultar") + //@ResponseWrapper(localName = "ConsultarResponse", targetNamespace = "http://services.tigo.com.bo/", className = "bo.com.tigo.services.ConsultarResponse") + // @WebResult(name = "return", targetNamespace = "") + // @WebResult(name = "ConsultarResponse", targetNamespace = "http://services.tigo.com.bo/", partName = "part1") + @WebResult(name = "ConsultarResponse", targetNamespace = "http://services.tigo.com.bo/") + public com.millicom.microservice.service.external.services.personalizado.ConsultarResponse consultar( + + //@WebParam(name = "consultaRequest", targetNamespace = "") + //com.millicom.microservice.adaptador.external.services.ConsultaRequest consultaRequest + + @WebParam(partName = "part1", name = "Consultar", targetNamespace = "http://services.tigo.com.bo/") + com.millicom.microservice.service.external.services.Consultar consultaRequest + ); +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/ConsultarNumeroTemporal_Service.java b/src/main/java/com/millicom/microservice/service/external/services/ConsultarNumeroTemporal_Service.java new file mode 100644 index 0000000..b95e4eb --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/ConsultarNumeroTemporal_Service.java @@ -0,0 +1,88 @@ +package com.millicom.microservice.service.external.services; + +import jakarta.xml.ws.Service; +import jakarta.xml.ws.WebEndpoint; +import jakarta.xml.ws.WebServiceClient; +import jakarta.xml.ws.WebServiceFeature; + +import javax.xml.namespace.QName; +import java.net.MalformedURLException; +import java.net.URL; + +/** + * This class was generated by Apache CXF 3.5.5 + * 2024-05-01T11:12:44.275-04:00 + * Generated source version: 3.5.5 + * + */ +@WebServiceClient(name = "ConsultarNumeroTemporal", + wsdlLocation = "file:/C:/TIGO/DESAROLLO/REPOSITORIO/NUMERO_TEMPORAL/numerotemporal-service-api/src/main/resources/wsdl/ConsultarNumeroTemporal_1.wsdl", + targetNamespace = "http://services.tigo.com.bo/") +public class ConsultarNumeroTemporal_Service extends Service { + + public final static URL WSDL_LOCATION; + + public final static QName SERVICE = new QName("http://services.tigo.com.bo/", "ConsultarNumeroTemporal"); + public final static QName ConsultarNumeroTemporalPort = new QName("http://services.tigo.com.bo/", "ConsultarNumeroTemporalPort"); + static { + URL url = null; + try { + url = new URL("file:/C:/TIGO/DESAROLLO/REPOSITORIO/NUMERO_TEMPORAL/numerotemporal-service-api/src/main/resources/wsdl/ConsultarNumeroTemporal_1.wsdl"); + } catch (MalformedURLException e) { + java.util.logging.Logger.getLogger(ConsultarNumeroTemporal_Service.class.getName()) + .log(java.util.logging.Level.INFO, + "Can not initialize the default wsdl from {0}", "file:/C:/TIGO/DESAROLLO/REPOSITORIO/NUMERO_TEMPORAL/numerotemporal-service-api/src/main/resources/wsdl/ConsultarNumeroTemporal_1.wsdl"); + } + WSDL_LOCATION = url; + } + + public ConsultarNumeroTemporal_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public ConsultarNumeroTemporal_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public ConsultarNumeroTemporal_Service() { + super(WSDL_LOCATION, SERVICE); + } + + public ConsultarNumeroTemporal_Service(WebServiceFeature... features) { + super(WSDL_LOCATION, SERVICE, features); + } + + public ConsultarNumeroTemporal_Service(URL wsdlLocation, WebServiceFeature ... features) { + super(wsdlLocation, SERVICE, features); + } + + public ConsultarNumeroTemporal_Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + super(wsdlLocation, serviceName, features); + } + + + + + /** + * + * @return + * returns ConsultarNumeroTemporal + */ + @WebEndpoint(name = "ConsultarNumeroTemporalPort") + public ConsultarNumeroTemporal getConsultarNumeroTemporalPort() { + return super.getPort(ConsultarNumeroTemporalPort, ConsultarNumeroTemporal.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns ConsultarNumeroTemporal + */ + @WebEndpoint(name = "ConsultarNumeroTemporalPort") + public ConsultarNumeroTemporal getConsultarNumeroTemporalPort(WebServiceFeature... features) { + return super.getPort(ConsultarNumeroTemporalPort, ConsultarNumeroTemporal.class, features); + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/ConsultarResponse.java b/src/main/java/com/millicom/microservice/service/external/services/ConsultarResponse.java new file mode 100644 index 0000000..69ecb00 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/ConsultarResponse.java @@ -0,0 +1,62 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + + +/** + *

Clase Java para ConsultarResponse complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="ConsultarResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://services.tigo.com.bo/}ConsultaResponse" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ConsultarResponse", propOrder = { + "_return" +}) +public class ConsultarResponse { + + @XmlElement(name = "return") + protected ConsultaResponse _return; + + /** + * Obtiene el valor de la propiedad return. + * + * @return + * possible object is + * {@link ConsultaResponse } + * + */ + public ConsultaResponse getReturn() { + return _return; + } + + /** + * Define el valor de la propiedad return. + * + * @param value + * allowed object is + * {@link ConsultaResponse } + * + */ + public void setReturn(ConsultaResponse value) { + this._return = value; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/MsisdnInformationType.java b/src/main/java/com/millicom/microservice/service/external/services/MsisdnInformationType.java new file mode 100644 index 0000000..99301a5 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/MsisdnInformationType.java @@ -0,0 +1,68 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + + +/** + *

Clase Java para MsisdnInformationType complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="MsisdnInformationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="msisdnInfo" type="{http://services.tigo.com.bo/}ResponseBody" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "MsisdnInformationType", propOrder = { + "msisdnInfo" +}) +@XmlRootElement(name = "msisdnList") +public class MsisdnInformationType { + + @XmlElement(required = true) + protected List msisdnInfo; + + /** + * Gets the value of the msisdnInfo property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the msisdnInfo property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getMsisdnInfo().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ResponseBody } + * + * + */ + public List getMsisdnInfo() { + if (msisdnInfo == null) { + msisdnInfo = new ArrayList(); + } + return this.msisdnInfo; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/MsisdnListType.java b/src/main/java/com/millicom/microservice/service/external/services/MsisdnListType.java new file mode 100644 index 0000000..a7db70f --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/MsisdnListType.java @@ -0,0 +1,71 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + +import java.util.ArrayList; +import java.util.List; + + +/** + *

Clase Java para MsisdnListType complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="MsisdnListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="numbers" type="{http://services.tigo.com.bo/}Numbers" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "MsisdnListType", propOrder = { + "numbers" +}) +//@XmlRootElement(name = "msisdnList") +public class MsisdnListType { + + @XmlElement(required = true) + protected List numbers; + + /** + * Gets the value of the numbers property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the numbers property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getNumbers().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Numbers } + * + * + */ + public List getNumbers() { + if (numbers == null) { + numbers = new ArrayList(); + } + return this.numbers; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/Numbers.java b/src/main/java/com/millicom/microservice/service/external/services/Numbers.java new file mode 100644 index 0000000..6cf2fd9 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/Numbers.java @@ -0,0 +1,89 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + + +/** + *

Clase Java para Numbers complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="Numbers">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="temporaryNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="portNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Numbers", propOrder = { + "temporaryNumber", + "portNumber" +}) +@XmlRootElement(name = "numbers") +public class Numbers { + + protected String temporaryNumber; + protected String portNumber; + + /** + * Obtiene el valor de la propiedad temporaryNumber. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTemporaryNumber() { + return temporaryNumber; + } + + /** + * Define el valor de la propiedad temporaryNumber. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTemporaryNumber(String value) { + this.temporaryNumber = value; + } + + /** + * Obtiene el valor de la propiedad portNumber. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPortNumber() { + return portNumber; + } + + /** + * Define el valor de la propiedad portNumber. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPortNumber(String value) { + this.portNumber = value; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/ObjectFactory.java b/src/main/java/com/millicom/microservice/service/external/services/ObjectFactory.java new file mode 100644 index 0000000..45b8846 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/ObjectFactory.java @@ -0,0 +1,184 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; + +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the bo.com.tigo.services package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _Consultar_QNAME = new QName("http://services.tigo.com.bo/", "Consultar"); + private final static QName _ConsultarResponse_QNAME = new QName("http://services.tigo.com.bo/", "ConsultarResponse"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: bo.com.tigo.services + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link ConsultaResponse } + * + */ + public ConsultaResponse createConsultaResponse() { + return new ConsultaResponse(); + } + + /** + * Create an instance of {@link ConsultaResponse.BodyResponse } + * + */ + public ConsultaResponse.BodyResponse createConsultaResponseBodyResponse() { + return new ConsultaResponse.BodyResponse(); + } + + /** + * Create an instance of {@link Consultar } + * + */ + public Consultar createConsultar() { + return new Consultar(); + } + + /** + * Create an instance of {@link ConsultarResponse } + * + */ + public ConsultarResponse createConsultarResponse() { + return new ConsultarResponse(); + } + + /** + * Create an instance of {@link ParameterType } + * + */ + public ParameterType createParameterType() { + return new ParameterType(); + } + + /** + * Create an instance of {@link ConsultaRequest } + * + */ + public ConsultaRequest createConsultaRequest() { + return new ConsultaRequest(); + } + + /** + * Create an instance of {@link RequestBody } + * + */ + public RequestBody createRequestBody() { + return new RequestBody(); + } + + /** + * Create an instance of {@link MsisdnListType } + * + */ + public MsisdnListType createMsisdnListType() { + return new MsisdnListType(); + } + + /** + * Create an instance of {@link Numbers } + * + */ + public Numbers createNumbers() { + return new Numbers(); + } + + /** + * Create an instance of {@link AdditionalParameters } + * + */ + public AdditionalParameters createAdditionalParameters() { + return new AdditionalParameters(); + } + + /** + * Create an instance of {@link Parameters } + * + */ + public Parameters createParameters() { + return new Parameters(); + } + + /** + * Create an instance of {@link ResponseHeader } + * + */ + public ResponseHeader createResponseHeader() { + return new ResponseHeader(); + } + + /** + * Create an instance of {@link MsisdnInformationType } + * + */ + public MsisdnInformationType createMsisdnInformationType() { + return new MsisdnInformationType(); + } + + /** + * Create an instance of {@link ResponseBody } + * + */ + public ResponseBody createResponseBody() { + return new ResponseBody(); + } + + /** + * Create an instance of {@link ConsultaResponse.BodyResponse.AdditionalResults } + * + */ + public ConsultaResponse.BodyResponse.AdditionalResults createConsultaResponseBodyResponseAdditionalResults() { + return new ConsultaResponse.BodyResponse.AdditionalResults(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Consultar }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Consultar }{@code >} + */ + @XmlElementDecl(namespace = "http://services.tigo.com.bo/", name = "Consultar") + public JAXBElement createConsultar(Consultar value) { + return new JAXBElement(_Consultar_QNAME, Consultar.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ConsultarResponse }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link ConsultarResponse }{@code >} + */ + @XmlElementDecl(namespace = "http://services.tigo.com.bo/", name = "ConsultarResponse") + public JAXBElement createConsultarResponse(ConsultarResponse value) { + return new JAXBElement(_ConsultarResponse_QNAME, ConsultarResponse.class, null, value); + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/ParameterType.java b/src/main/java/com/millicom/microservice/service/external/services/ParameterType.java new file mode 100644 index 0000000..4f6b2bf --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/ParameterType.java @@ -0,0 +1,88 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.*; + + +/** + *

Clase Java para anonymous complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="parameterName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="parameterValue" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "parameterName", + "parameterValue" +}) +@XmlRootElement(name = "ParameterType") +public class ParameterType { + + @XmlElement(required = true) + protected String parameterName; + @XmlElement(required = true) + protected String parameterValue; + + /** + * Obtiene el valor de la propiedad parameterName. + * + * @return + * possible object is + * {@link String } + * + */ + public String getParameterName() { + return parameterName; + } + + /** + * Define el valor de la propiedad parameterName. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setParameterName(String value) { + this.parameterName = value; + } + + /** + * Obtiene el valor de la propiedad parameterValue. + * + * @return + * possible object is + * {@link String } + * + */ + public String getParameterValue() { + return parameterValue; + } + + /** + * Define el valor de la propiedad parameterValue. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setParameterValue(String value) { + this.parameterValue = value; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/Parameters.java b/src/main/java/com/millicom/microservice/service/external/services/Parameters.java new file mode 100644 index 0000000..068555d --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/Parameters.java @@ -0,0 +1,87 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; + + +/** + *

Clase Java para Parameters complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="Parameters">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Parameters", propOrder = { + "name", + "value" +}) +public class Parameters { + + protected String name; + protected String value; + + /** + * Obtiene el valor de la propiedad name. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Define el valor de la propiedad name. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Obtiene el valor de la propiedad value. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Define el valor de la propiedad value. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/RequestBody.java b/src/main/java/com/millicom/microservice/service/external/services/RequestBody.java new file mode 100644 index 0000000..347e6a1 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/RequestBody.java @@ -0,0 +1,90 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + + +/** + *

Clase Java para RequestBody complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="RequestBody">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="msisdnList" type="{http://services.tigo.com.bo/}MsisdnListType"/>
+ *         <element name="additionalParameters" type="{http://services.tigo.com.bo/}AdditionalParameters" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "RequestBody", propOrder = { + "msisdnList", + "additionalParameters" +}) +//@XmlRootElement(name = "requestBody") +public class RequestBody { + + @XmlElement(required = true) + protected MsisdnListType msisdnList; + protected AdditionalParameters additionalParameters; + + /** + * Obtiene el valor de la propiedad msisdnList. + * + * @return + * possible object is + * {@link MsisdnListType } + * + */ + public MsisdnListType getMsisdnList() { + return msisdnList; + } + + /** + * Define el valor de la propiedad msisdnList. + * + * @param value + * allowed object is + * {@link MsisdnListType } + * + */ + public void setMsisdnList(MsisdnListType value) { + this.msisdnList = value; + } + + /** + * Obtiene el valor de la propiedad additionalParameters. + * + * @return + * possible object is + * {@link AdditionalParameters } + * + */ + public AdditionalParameters getAdditionalParameters() { + return additionalParameters; + } + + /** + * Define el valor de la propiedad additionalParameters. + * + * @param value + * allowed object is + * {@link AdditionalParameters } + * + */ + public void setAdditionalParameters(AdditionalParameters value) { + this.additionalParameters = value; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/ResponseBody.java b/src/main/java/com/millicom/microservice/service/external/services/ResponseBody.java new file mode 100644 index 0000000..3b706e8 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/ResponseBody.java @@ -0,0 +1,335 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.*; + +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Clase Java para ResponseBody complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="ResponseBody">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="code" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="temporaryNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="portInNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="iccid" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dateAssociation" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         <element name="dateEnabling" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         <element name="state" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="modality" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="commercialPlan" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="idPlan" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ResponseBody", propOrder = { + "code", + "description", + "temporaryNumber", + "portInNumber", + "iccid", + "dateAssociation", + "dateEnabling", + "state", + "modality", + "commercialPlan", + "idPlan" +}) +@XmlRootElement(name = "msisdnInfo") +public class ResponseBody { + + @XmlElement(required = true) + protected String code; + @XmlElement(required = true) + protected String description; + protected String temporaryNumber; + protected String portInNumber; + protected String iccid; + @XmlSchemaType(name = "dateTime") + protected XMLGregorianCalendar dateAssociation; + @XmlSchemaType(name = "dateTime") + protected XMLGregorianCalendar dateEnabling; + protected String state; + protected String modality; + protected String commercialPlan; + protected String idPlan; + + /** + * Obtiene el valor de la propiedad code. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCode() { + return code; + } + + /** + * Define el valor de la propiedad code. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCode(String value) { + this.code = value; + } + + /** + * Obtiene el valor de la propiedad description. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescription() { + return description; + } + + /** + * Define el valor de la propiedad description. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescription(String value) { + this.description = value; + } + + /** + * Obtiene el valor de la propiedad temporaryNumber. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTemporaryNumber() { + return temporaryNumber; + } + + /** + * Define el valor de la propiedad temporaryNumber. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTemporaryNumber(String value) { + this.temporaryNumber = value; + } + + /** + * Obtiene el valor de la propiedad portInNumber. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPortInNumber() { + return portInNumber; + } + + /** + * Define el valor de la propiedad portInNumber. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPortInNumber(String value) { + this.portInNumber = value; + } + + /** + * Obtiene el valor de la propiedad iccid. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIccid() { + return iccid; + } + + /** + * Define el valor de la propiedad iccid. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIccid(String value) { + this.iccid = value; + } + + /** + * Obtiene el valor de la propiedad dateAssociation. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getDateAssociation() { + return dateAssociation; + } + + /** + * Define el valor de la propiedad dateAssociation. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setDateAssociation(XMLGregorianCalendar value) { + this.dateAssociation = value; + } + + /** + * Obtiene el valor de la propiedad dateEnabling. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getDateEnabling() { + return dateEnabling; + } + + /** + * Define el valor de la propiedad dateEnabling. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setDateEnabling(XMLGregorianCalendar value) { + this.dateEnabling = value; + } + + /** + * Obtiene el valor de la propiedad state. + * + * @return + * possible object is + * {@link String } + * + */ + public String getState() { + return state; + } + + /** + * Define el valor de la propiedad state. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setState(String value) { + this.state = value; + } + + /** + * Obtiene el valor de la propiedad modality. + * + * @return + * possible object is + * {@link String } + * + */ + public String getModality() { + return modality; + } + + /** + * Define el valor de la propiedad modality. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setModality(String value) { + this.modality = value; + } + + /** + * Obtiene el valor de la propiedad commercialPlan. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCommercialPlan() { + return commercialPlan; + } + + /** + * Define el valor de la propiedad commercialPlan. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCommercialPlan(String value) { + this.commercialPlan = value; + } + + /** + * Obtiene el valor de la propiedad idPlan. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIdPlan() { + return idPlan; + } + + /** + * Define el valor de la propiedad idPlan. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIdPlan(String value) { + this.idPlan = value; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/ResponseHeader.java b/src/main/java/com/millicom/microservice/service/external/services/ResponseHeader.java new file mode 100644 index 0000000..73d3083 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/ResponseHeader.java @@ -0,0 +1,88 @@ + +package com.millicom.microservice.service.external.services; + +import jakarta.xml.bind.annotation.*; + + +/** + *

Clase Java para ResponseHeader complex type. + * + *

El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. + * + * 

+ * <complexType name="ResponseHeader">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="code" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ResponseHeader", propOrder = { + "code", + "description" +}) +@XmlRootElement(name = "headerResponse") +public class ResponseHeader { + + @XmlElement(required = true) + protected String code; + @XmlElement(required = true) + protected String description; + + /** + * Obtiene el valor de la propiedad code. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCode() { + return code; + } + + /** + * Define el valor de la propiedad code. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCode(String value) { + this.code = value; + } + + /** + * Obtiene el valor de la propiedad description. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescription() { + return description; + } + + /** + * Define el valor de la propiedad description. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescription(String value) { + this.description = value; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/common/Constants.java b/src/main/java/com/millicom/microservice/service/external/services/common/Constants.java new file mode 100644 index 0000000..126bcac --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/common/Constants.java @@ -0,0 +1,26 @@ +package com.millicom.microservice.service.external.services.common; + +public class Constants { + + + //Error Codes: + public static final String ERROR_CODE_EXCEPTION = "ERR_GEN_0000"; + public static final String ERROR_DESC_EXCEPTION = "An Exception has occured."; + public static final String ERROR_MISSING_FIELD_EXCEPTION = "Missing required field: "; + public static final String ERROR_CODE_NOT_FOUND = "ERR_GEN_0001"; + + + public static final String GET_COUNTRY = "getCountryName"; + public static final String CAPITAL_ID = "capital"; + public static final String CONTENT_TYPE = "content-type"; + public static final String SYSTEM_COMMON_DOMAIN = "getCountryName"; + + public static final String VALIDACION_FALIIDA = "Validacion Fallida"; + public static final String MODULO ="numerotemporal-service-api"; + + + + + private Constants() { + } +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/package-info.java b/src/main/java/com/millicom/microservice/service/external/services/package-info.java new file mode 100644 index 0000000..ddd6ae0 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/package-info.java @@ -0,0 +1,2 @@ +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://services.tigo.com.bo/") +package com.millicom.microservice.service.external.services; diff --git a/src/main/java/com/millicom/microservice/service/external/services/personalizado/BodyResponse.java b/src/main/java/com/millicom/microservice/service/external/services/personalizado/BodyResponse.java new file mode 100644 index 0000000..57ade1a --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/personalizado/BodyResponse.java @@ -0,0 +1,34 @@ +package com.millicom.microservice.service.external.services.personalizado; + + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "bodyResponse") +@XmlAccessorType(XmlAccessType.FIELD) +public class BodyResponse { + + @XmlElement(name = "msisdnList") + private MsisdnList msisdnList; + + @XmlElement(name = "transactionStatus") + private String transactionStatus; + + public MsisdnList getMsisdnList() { + return msisdnList; + } + + public void setMsisdnList(MsisdnList msisdnList) { + this.msisdnList = msisdnList; + } + + public String getTransactionStatus() { + return transactionStatus; + } + + public void setTransactionStatus(String transactionStatus) { + this.transactionStatus = transactionStatus; + } +} \ No newline at end of file diff --git a/src/main/java/com/millicom/microservice/service/external/services/personalizado/ConsultarResponse.java b/src/main/java/com/millicom/microservice/service/external/services/personalizado/ConsultarResponse.java new file mode 100644 index 0000000..ef6f325 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/personalizado/ConsultarResponse.java @@ -0,0 +1,17 @@ +package com.millicom.microservice.service.external.services.personalizado; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import lombok.Getter; + +@XmlRootElement(name = "ConsultarResponse", namespace = "http://services.tigo.com.bo/") +@XmlAccessorType(XmlAccessType.FIELD) +@Getter +public class ConsultarResponse { + + @XmlElement(name = "return") + private ReturnElement returnElement; + +} diff --git a/src/main/java/com/millicom/microservice/service/external/services/personalizado/HeaderResponse.java b/src/main/java/com/millicom/microservice/service/external/services/personalizado/HeaderResponse.java new file mode 100644 index 0000000..fb77701 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/personalizado/HeaderResponse.java @@ -0,0 +1,33 @@ +package com.millicom.microservice.service.external.services.personalizado; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "headerResponse") +@XmlAccessorType(XmlAccessType.FIELD) +public class HeaderResponse { + + @XmlElement(name = "code") + private String code; + + @XmlElement(name = "description") + private String description; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} \ No newline at end of file diff --git a/src/main/java/com/millicom/microservice/service/external/services/personalizado/MsisdnInfo.java b/src/main/java/com/millicom/microservice/service/external/services/personalizado/MsisdnInfo.java new file mode 100644 index 0000000..0bf67ac --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/personalizado/MsisdnInfo.java @@ -0,0 +1,121 @@ +package com.millicom.microservice.service.external.services.personalizado; + + +import jakarta.xml.bind.annotation.*; + +import javax.xml.datatype.XMLGregorianCalendar; + +@XmlRootElement(name = "msisdnInfo") +@XmlAccessorType(XmlAccessType.FIELD) +public class MsisdnInfo { + + @XmlElement(name = "code") + private String code; + + @XmlElement(name = "description") + private String description; + + @XmlElement(name = "temporaryNumber") + private String temporaryNumber; + + @XmlElement(name = "portInNumber") + private String portInNumber; + + protected String iccid; + @XmlSchemaType(name = "dateTime") + protected XMLGregorianCalendar dateAssociation; + @XmlSchemaType(name = "dateTime") + protected XMLGregorianCalendar dateEnabling; + protected String state; + protected String modality; + protected String commercialPlan; + protected String idPlan; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getTemporaryNumber() { + return temporaryNumber; + } + + public void setTemporaryNumber(String temporaryNumber) { + this.temporaryNumber = temporaryNumber; + } + + public String getPortInNumber() { + return portInNumber; + } + + public void setPortInNumber(String portInNumber) { + this.portInNumber = portInNumber; + } + + public String getIccid() { + return iccid; + } + + public void setIccid(String iccid) { + this.iccid = iccid; + } + + public XMLGregorianCalendar getDateAssociation() { + return dateAssociation; + } + + public void setDateAssociation(XMLGregorianCalendar dateAssociation) { + this.dateAssociation = dateAssociation; + } + + public XMLGregorianCalendar getDateEnabling() { + return dateEnabling; + } + + public void setDateEnabling(XMLGregorianCalendar dateEnabling) { + this.dateEnabling = dateEnabling; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getModality() { + return modality; + } + + public void setModality(String modality) { + this.modality = modality; + } + + public String getCommercialPlan() { + return commercialPlan; + } + + public void setCommercialPlan(String commercialPlan) { + this.commercialPlan = commercialPlan; + } + + public String getIdPlan() { + return idPlan; + } + + public void setIdPlan(String idPlan) { + this.idPlan = idPlan; + } +} \ No newline at end of file diff --git a/src/main/java/com/millicom/microservice/service/external/services/personalizado/MsisdnList.java b/src/main/java/com/millicom/microservice/service/external/services/personalizado/MsisdnList.java new file mode 100644 index 0000000..b457f0d --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/personalizado/MsisdnList.java @@ -0,0 +1,26 @@ +package com.millicom.microservice.service.external.services.personalizado; + + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; + +import java.util.List; + +@XmlRootElement(name = "msisdnList") +@XmlAccessorType(XmlAccessType.FIELD) +public class MsisdnList { + + @XmlElement(name = "msisdnInfo") + private List msisdnInfo; + + public List getMsisdnInfo() { + return msisdnInfo; + } + + public void setMsisdnInfo(List msisdnInfo) { + this.msisdnInfo = msisdnInfo; + } +} + diff --git a/src/main/java/com/millicom/microservice/service/external/services/personalizado/ReturnElement.java b/src/main/java/com/millicom/microservice/service/external/services/personalizado/ReturnElement.java new file mode 100644 index 0000000..15a5277 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/external/services/personalizado/ReturnElement.java @@ -0,0 +1,37 @@ +package com.millicom.microservice.service.external.services.personalizado; + + +import jakarta.xml.bind.annotation.*; +import lombok.Getter; + +@XmlRootElement(name = "return") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "return", propOrder = { + "headerResponse", + "bodyResponse" +}) +@Getter +public class ReturnElement { + + @XmlElement(name = "headerResponse") + private HeaderResponse headerResponse; + + @XmlElement(name = "bodyResponse") + private BodyResponse bodyResponse; + + public HeaderResponse getHeaderResponse() { + return headerResponse; + } + + public void setHeaderResponse(HeaderResponse headerResponse) { + this.headerResponse = headerResponse; + } + + public BodyResponse getBodyResponse() { + return bodyResponse; + } + + public void setBodyResponse(BodyResponse bodyResponse) { + this.bodyResponse = bodyResponse; + } +} \ No newline at end of file diff --git a/src/main/java/com/millicom/microservice/service/service/common/GenerateErrorService.java b/src/main/java/com/millicom/microservice/service/service/common/GenerateErrorService.java new file mode 100644 index 0000000..e6af152 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/common/GenerateErrorService.java @@ -0,0 +1,14 @@ +package com.millicom.microservice.service.service.common; + +import com.millicom.microservice.service.adapters.dto.common.ErrorStructure; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.stereotype.Service; + + +@Service +public interface GenerateErrorService { + ErrorStructure generateError(HttpStatusCode httpStatus, String errorCode, String[] params, String description, Class ownerObject); + + void generarExcepcion( HttpStatus httpStatus, String descripcion); +} diff --git a/src/main/java/com/millicom/microservice/service/service/common/GenerateErrorServiceImp.java b/src/main/java/com/millicom/microservice/service/service/common/GenerateErrorServiceImp.java new file mode 100644 index 0000000..a58c05d --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/common/GenerateErrorServiceImp.java @@ -0,0 +1,92 @@ +package com.millicom.microservice.service.service.common; + +import com.millicom.microservice.service.adapters.dto.common.ErrorStructure; +import com.millicom.microservice.service.adapters.dto.common.OperationException; +import com.millicom.microservice.service.service.numero.propiedades.Propiedades; +import com.readinessit.library.logging.application.services.LoggerService; +import io.micrometer.tracing.Tracer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.stereotype.Service; + +import static com.millicom.microservice.service.external.services.common.Constants.MODULO; + + +@Service +public class GenerateErrorServiceImp implements GenerateErrorService { + + public final Tracer tracer; + private final Propiedades propiedades; + + @Value("${modules.common.i18n.errorMessage.default.lang:en-US}") + public String defaultCountry; + + @Autowired + public GenerateErrorServiceImp(Tracer tracer, Propiedades propiedades) { + this.tracer = tracer; + this.propiedades = propiedades; + } + + + @Override + public ErrorStructure generateError(HttpStatusCode httpStatus, String errorCode, String[] params, String description, Class ownerObject) { + return generarErrorNuevo((HttpStatus) httpStatus, description); + } + + + /** + * Genera una estructura de error para una respuesta HTTP y descripción proporcionadas. + * + * @param httpStatus El estado HTTP de la respuesta. + * @param description La descripción del error. + * @return Una estructura de error que contiene el estado HTTP y la lista de errores correspondiente. + */ + public ErrorStructure generarErrorNuevo(HttpStatus httpStatus, String description) { + ErrorStructure errorStructure = new ErrorStructure(); + errorStructure.setHttpStatus(httpStatus); + String status = String.valueOf(httpStatus.value()); + String error = propiedades.getMapResponse().getOrDefault(status, null); + if (error != null) { + errorStructure.setHttpStatus(httpStatus); + errorStructure.setValor(error); + } + + if (errorStructure.getValor() == null) { + LoggerService.logBusiness(MODULO, "Devolviendo Respuesta por Default", null); + errorStructure.setValor(propiedades.getMapResponse().getOrDefault("default", "SoapFault Exception")); + errorStructure.setHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR); + } + + return errorStructure; + } + + /** + * Obtiene la lista de errores a partir del estado y la respuesta proporcionados. + * + * @param status El estado de la respuesta. + * @param response La respuesta en formato JSON. + * @return Una lista de errores, o una lista vacía si el estado no está mapeado o hay problemas de procesamiento. + */ + + + /** + * Método para generar y lanzar una excepción de operación. + * + * @param httpStatus Estado HTTP que se utilizará en la excepción. + * @throws OperationException Excepción de operación generada con el error correspondiente. + */ + @Override + public void generarExcepcion(HttpStatus httpStatus, String descripcion) { + throw new OperationException(httpStatus, generateError( + httpStatus, + descripcion, + new String[]{descripcion}, + descripcion, + this.getClass() + )); + } + +} + diff --git a/src/main/java/com/millicom/microservice/service/service/messaging/ErrorMapper.java b/src/main/java/com/millicom/microservice/service/service/messaging/ErrorMapper.java new file mode 100644 index 0000000..74e0221 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/messaging/ErrorMapper.java @@ -0,0 +1,99 @@ +package com.millicom.microservice.service.service.messaging; + + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.millicom.microservice.service.adapters.dto.common.ErrorStructure; +import com.millicom.microservice.service.service.common.GenerateErrorService; +import com.readinessit.library.logging.application.services.LoggerService; +import com.readinessit.library.messaging.data.MessageResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +import java.util.List; + +import static com.millicom.microservice.service.external.services.common.Constants.*; + +@Service +public class ErrorMapper { + + private final GenerateErrorService generateErrorService; + private final ObjectMapper mapper; + + @Value("${service.numerotemporal.codigos.http.a.controlar}") + private List httpCodes; + + @Autowired + public ErrorMapper(GenerateErrorService generateErrorService, ObjectMapper mapper) { + this.generateErrorService = generateErrorService; + this.mapper = mapper; + } + + + public ErrorStructure validate(Object response) { + if (response == null) { + return generateErrorService.generateError(HttpStatus.BAD_GATEWAY, ERROR_CODE_EXCEPTION, + new String[]{ERROR_DESC_EXCEPTION}, ERROR_DESC_EXCEPTION, this.getClass()); + } else if (response instanceof MessageResponse resp && resp.isError()) { + if (httpCodes.contains(resp.getResponseStatus().value())) { + + ResponseEntity error = handleErrorResponseCreation(resp.getResponseHeaders(), + resp.getResponseStatus(), resp.getResponse()); + + ErrorStructure errorStructure = error.hasBody() ? (ErrorStructure) error.getBody() : null; + + if (errorStructure != null && errorStructure.getValor() != null) { + return generateErrorService.generateError(resp.getResponseStatus(), errorStructure.toString(), + new String[]{errorStructure.toString()}, obtenerJsonDeMessageResponse(resp), getClass()); + } + return errorStructure; + } else { + LoggerService.logBusiness(MODULO, "No se controlara el http: " + resp.getResponseStatus().toString(), null); + } + } + return null; + } + + + private ResponseEntity handleErrorResponseCreation(HttpHeaders headers, HttpStatusCode status, Object response) { + ErrorStructure error; + try { + error = mapper.convertValue(response, ErrorStructure.class); + if (error == null || error.getValor() == null) { + if (HttpStatus.INTERNAL_SERVER_ERROR.equals(status)) + response = ERROR_DESC_EXCEPTION; + String description; + try { + description = response != null ? mapper.writeValueAsString(response) : null; + } catch (JsonProcessingException e) { + LoggerService.logException(MODULO, "JsonProcessingException: " + e.getMessage(), e); + description = ERROR_DESC_EXCEPTION; + } + error = generateErrorService.generateError(status, ERROR_CODE_EXCEPTION, new String[]{ERROR_DESC_EXCEPTION}, description, getClass()); + } + } catch (Exception ex) { + error = generateErrorService.generateError(HttpStatus.INTERNAL_SERVER_ERROR, ERROR_CODE_EXCEPTION, new String[]{ERROR_DESC_EXCEPTION}, ERROR_DESC_EXCEPTION, getClass()); + } + return new ResponseEntity<>(error, headers, status); + } + + + public String obtenerJsonDeMessageResponse(MessageResponse messageResponse) { + try { + return mapper.writeValueAsString(messageResponse.getResponse()); + } catch (JsonProcessingException jsonProcessingException) { + LoggerService.logException(MODULO, "JsonProcessingException: " + jsonProcessingException.getMessage(), jsonProcessingException); + // Manejar la excepción o registrarla si es necesario + return null; + } + } + + +} + + \ No newline at end of file diff --git a/src/main/java/com/millicom/microservice/service/service/messaging/MessageIdentifiersImp.java b/src/main/java/com/millicom/microservice/service/service/messaging/MessageIdentifiersImp.java new file mode 100644 index 0000000..9c86fc6 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/messaging/MessageIdentifiersImp.java @@ -0,0 +1,80 @@ +package com.millicom.microservice.service.service.messaging; + +import com.readinessit.library.commoninterfaces.common.ISessionInfo; +import com.readinessit.library.commoninterfaces.messages.MessageIdentifiers; +import io.micrometer.tracing.Tracer; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.server.ServerHttpResponse; +import org.springframework.stereotype.Service; + +import java.util.UUID; + +@Service +public class MessageIdentifiersImp implements MessageIdentifiers { + + @Autowired + ISessionInfo sessionDTO; + + @Autowired + Tracer tracer; + + @Override + public String calculateInternalId(HttpServletRequest httpServletRequest) { + return handleInternalId(); + } + + @Override + public String calculateInteractionId(HttpServletRequest httpServletRequest) { + return handleInteractionId(); + } + + @Override + public String calculateNegotiationId(HttpServletRequest httpServletRequest) { + return sessionDTO.getExternalId(); + } + + @Override + public String calculateUserId(ServerHttpResponse httpServletRequest) { + return sessionDTO.getUserId(); + } + + @Override + public String calculateInternalId(ServerHttpResponse httpServletResponse) { + return handleInternalId(); + } + + @Override + public String calculateInteractionId(ServerHttpResponse httpServletRequest) { + return handleInteractionId(); + } + + @Override + public String calculateNegotiationId(ServerHttpResponse httpServletRequest) { + return null; + } + + @Override + public String calculateUserId(HttpServletRequest httpServletResponse) { + String userId = httpServletResponse.getHeader("x-consumer-username"); + if(sessionDTO.getUserId() == null) + sessionDTO.setUserId(userId); + + return userId; + } + + private String handleInteractionId() { + if(sessionDTO.getTransactionId() == null) + sessionDTO.setTransactionId(UUID.randomUUID().toString()); + + return sessionDTO.getTransactionId(); + } + + private String handleInternalId() { + var currentSpan = tracer.currentSpan(); + if (currentSpan != null && sessionDTO.getInternalId() == null) + sessionDTO.setInternalId(currentSpan.context().traceId()); + + return sessionDTO.getInternalId(); + } +} \ No newline at end of file diff --git a/src/main/java/com/millicom/microservice/service/service/numero/propiedades/Propiedades.java b/src/main/java/com/millicom/microservice/service/service/numero/propiedades/Propiedades.java new file mode 100644 index 0000000..09551be --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/numero/propiedades/Propiedades.java @@ -0,0 +1,20 @@ +package com.millicom.microservice.service.service.numero.propiedades; + + +import java.util.Map; + +public interface Propiedades { + + Map getMapHeader(); + + Map getMapPathVars(); + + Map getMapResponse(); + + String getOperacion(); + + String getSistema(); + + boolean isDevolverCabeceras(); + +} diff --git a/src/main/java/com/millicom/microservice/service/service/numero/propiedades/PropiedadesImplementacion.java b/src/main/java/com/millicom/microservice/service/service/numero/propiedades/PropiedadesImplementacion.java new file mode 100644 index 0000000..ed3a607 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/numero/propiedades/PropiedadesImplementacion.java @@ -0,0 +1,60 @@ +package com.millicom.microservice.service.service.numero.propiedades; + +import com.millicom.microservice.service.service.numero.propiedades.map.PropiedadesCabeceras; +import com.millicom.microservice.service.service.numero.propiedades.map.PropiedadesRespuesta; +import com.millicom.microservice.service.service.numero.propiedades.map.PropiedadesVariableRuta; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class PropiedadesImplementacion implements Propiedades { + + @Autowired + private PropiedadesCabeceras propiedadesCabeceras; + @Autowired + private PropiedadesVariableRuta propiedadesVariableRuta; + @Autowired + private PropiedadesRespuesta propiedadesRespuesta; + @Value("${service.numerotemporal.operacion}") + private String operacion; + @Value("${service.numerotemporal.sistema}") + private String sistema; + @Value("${service.numerotemporal.devolver.cabeceras.del.legado}") + private boolean devolverCabeceras; + + + + @Override + public Map getMapHeader() { + return propiedadesCabeceras.getHeader(); + } + + @Override + public Map getMapPathVars() { + return propiedadesVariableRuta.getVars(); + } + + @Override + public Map getMapResponse() { + return propiedadesRespuesta.getErrors(); + } + + @Override + public String getOperacion() { + return operacion; + } + + @Override + public String getSistema() { + return sistema; + } + + @Override + public boolean isDevolverCabeceras() { + return devolverCabeceras; + } + +} diff --git a/src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesCabeceras.java b/src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesCabeceras.java new file mode 100644 index 0000000..75d777a --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesCabeceras.java @@ -0,0 +1,21 @@ +package com.millicom.microservice.service.service.numero.propiedades.map; + +import lombok.Getter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +@Configuration +@PropertySource("classpath:application.properties") +@ConfigurationProperties("service.numerotemporal.legado") +@Getter +@Component +public class PropiedadesCabeceras { + + private final Map header = new HashMap<>(); + +} \ No newline at end of file diff --git a/src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesRespuesta.java b/src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesRespuesta.java new file mode 100644 index 0000000..1e468d6 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesRespuesta.java @@ -0,0 +1,18 @@ +package com.millicom.microservice.service.service.numero.propiedades.map; + +import lombok.Getter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +@Configuration +@ConfigurationProperties("response") +@Getter +@Component +public class PropiedadesRespuesta { + + private final Map errors = new HashMap<>(); +} diff --git a/src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesVariableRuta.java b/src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesVariableRuta.java new file mode 100644 index 0000000..31f0131 --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/numero/propiedades/map/PropiedadesVariableRuta.java @@ -0,0 +1,20 @@ +package com.millicom.microservice.service.service.numero.propiedades.map; + +import lombok.Getter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +@Configuration +@PropertySource("classpath:application.properties") +@ConfigurationProperties("service.numerotemporal.path") +@Getter +@Component +public class PropiedadesVariableRuta { + private final Map vars = new HashMap<>(); + +} diff --git a/src/main/java/com/millicom/microservice/service/service/numero/temporal/Consultar.java b/src/main/java/com/millicom/microservice/service/service/numero/temporal/Consultar.java new file mode 100644 index 0000000..1f32d7c --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/numero/temporal/Consultar.java @@ -0,0 +1,14 @@ +package com.millicom.microservice.service.service.numero.temporal; + + +import com.millicom.microservice.service.external.services.ConsultaRequest; +import com.millicom.microservice.service.external.services.personalizado.ConsultarResponse; + +/** + * Interfaz que define operaciones relacionadas con individuos. + */ +public interface Consultar { + + + ConsultarResponse consultar(ConsultaRequest requestSoap); +} diff --git a/src/main/java/com/millicom/microservice/service/service/numero/temporal/ConsultarImplementacion.java b/src/main/java/com/millicom/microservice/service/service/numero/temporal/ConsultarImplementacion.java new file mode 100644 index 0000000..2fe7d0f --- /dev/null +++ b/src/main/java/com/millicom/microservice/service/service/numero/temporal/ConsultarImplementacion.java @@ -0,0 +1,78 @@ +package com.millicom.microservice.service.service.numero.temporal; + + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.millicom.microservice.service.adapters.Adapter; +import com.millicom.microservice.service.adapters.dto.common.OperationException; +import com.millicom.microservice.service.external.services.ConsultaRequest; +import com.millicom.microservice.service.external.services.personalizado.ConsultarResponse; +import com.millicom.microservice.service.service.messaging.ErrorMapper; +import com.millicom.microservice.service.service.numero.propiedades.Propiedades; +import com.readinessit.library.logging.application.services.LoggerService; +import com.readinessit.library.messaging.data.MessageResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.HashMap; + +import static com.millicom.microservice.service.external.services.common.Constants.MODULO; + + +@Service +public class ConsultarImplementacion implements Consultar { + + private final Propiedades propiedades; + private final Adapter adapter; + private final ErrorMapper errorMapperImp; + + + @Value("${service.numerotemporal.operacion}") + private String operacion; + @Value("${service.numerotemporal.sistema}") + private String sistema; + + @Autowired + public ConsultarImplementacion(Propiedades propiedades, Adapter adapter, ErrorMapper errorMapperImp) { + this.propiedades = propiedades; + this.adapter = adapter; + this.errorMapperImp = errorMapperImp; + } + + + /** + * Ejecuta una transacción. + * + * @param requestSoap La solicitud de transacción. + * @return La respuesta de la transacción ejecutada. + * @throws OperationException Si ocurre un error durante la ejecución de la transacción. + */ + @Override + public ConsultarResponse consultar(ConsultaRequest requestSoap) throws OperationException { + long tiempoInicio = System.currentTimeMillis(); + MessageResponse respuestaServicio = enviarMensaje(requestSoap); + var errorStructure = errorMapperImp.validate(respuestaServicio); + if (errorStructure != null) { + throw new OperationException(errorStructure.getHttpStatus(), errorStructure); + } + LoggerService.logBusiness(MODULO, "Tiempo obtener consultar: " + (System.currentTimeMillis() - tiempoInicio) + " ms.", null); + if (respuestaServicio.getResponse() instanceof HashMap) { + ObjectMapper objectMapper = new ObjectMapper(); + return objectMapper.convertValue(respuestaServicio.getResponse(), ConsultarResponse.class); + } + return (ConsultarResponse) respuestaServicio.getResponse(); + } + + + /** + * Envía un mensaje. + * + * @param pedido El pedido a enviar. + * @return La respuesta del mensaje enviado. + */ + private MessageResponse enviarMensaje(Object pedido) { + return adapter.sendMessage(this.getClass(), operacion, pedido, propiedades.getMapPathVars(), propiedades.getMapHeader(), sistema); + } + + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..b464a84 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,106 @@ +#DB +# spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect +#spring.jpa.show-sql=false +#spring.jpa.hibernate.ddl-auto=none +#spring.database.driverClassName=org.postgresql.Driver +#spring.datasource.url=jdbc:postgresql://localhost:5432/mstemplate +#spring.datasource.username=admin +#spring.datasource.password=admin + +# LIQUIBASE settings +#logging.level.liquibase=ERROR +#spring.liquibase.change-log=classpath:/db/master.xml + +#APP +server.port=${SERVER_PORT:8080} + +#Rit Modules + +modules.logging.message.enable-interceptors=${MODULES_LOGGING_MESSAGE_ENABLE_INTERCEPTORS:true} +modules.logging.message.enable=${MODULES_LOGGING_MESSAGE_ENABLE:true} +modules.logging.message.configuration=${MODULES_LOGGING_MESSAGE_CONFIGURATION:CONSOLE,EVENT} +modules.logging.application.enable=${MODULES_LOGGING_APPLICATION_ENABLE:true} +modules.logging.application.level=${MODULES_LOGGING_APPLICATION_LEVEL:DEBUG} +modules.logging.application.configuration=${MODULES_LOGGING_APPLICATION_CONFIGURATION:{'*':'CONSOLE,EVENT'}} +modules.common.vtconfig.enable=${MODULES_COMMON_VTCONFIG_ENABLE:true} +modules.common.vtconfig.use-cache=${MODULES_COMMON_VTCONFIG_USE_CACHE:true} +modules.common.i18n.errorMessage.enable=${MODULES_COMMON_I18N_ERRORMESSAGE_ENABLE:true} +modules.common.i18n.errorMessage.default.lang=${MODULES_COMMON_I18N_ERRORMESSAGE_DEFAULT_LANG:en-US} +modules.common.i18n.locale=${MODULES_COMMON_I18N_LOCALE:en-US,es-ES} +modules.common.i18n.default-lang=${MODULES_COMMON_I18N_DEFAULT_LANG:en-US} + +#Management and Metrics +management.endpoints.web.exposure.include=${MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE:health,info,metrics,prometheus} +management.prometheus.metrics.export.enabled=${MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED:true} +management.endpoint.health.probes.enabled=${MANAGEMENT_ENDPOINT_HEALTH_PROBES_ENABLED:true} +management.metrics.tags.application=${spring.application.name} + + +spring.application.name=${SPRING_APPLICATION_NAME:numerotemporal-service-api} +spring.sleuth.otel.config.trace-id-ratio-based=${SPRING_SLEUTH_OTEL_CONFIG_TRACE_ID_RATIO_BASED:0} +spring.sleuth.otel.exporter.otlp.endpoint=${SPRING_SLEUTH_OTEL_EXPORTER_OTLP_ENDPOINT:http://localhost:4317} +spring.sleuth.otel.log.exporter.enabled=${SPRING_SLEUTH_OTEL_LOG_EXPORTER_ENABLED:false} +spring.sleuth.async.enabled=${SPRING_SLEUTH_ASYNC_ENABLED:false} +spring.sleuth.propagation.type=${SPRING_SLEUTH_PROPAGATION_TYPE:b3} +spring.sleuth.baggage.remote-fields=${SPRING_SLEUTH_BAGGAGE_REMOTE_FIELDS:x-consumer-username} + +event.processing.client.producer.enable=${EVENT_PROCESSING_CLIENT_PRODUCER_ENABLE:false} +event.processing.queue.engine=${EVENT_PROCESSING_QUEUE_ENGINE:KAFKA} +event.processing.kafka.address=${EVENT_PROCESSING_KAFKA_ADDRESS:kf-cluster-kafka-bootstrap.msg-prod.svc.cluster.local:9092} +event.processing.queue.business=${EVENT_PROCESSING_QUEUE_BUSINESS:event-tracing} +event.processing.queue.message=${EVENT_PROCESSING_QUEUE_MESSAGE:event-tracing} +event.processing.queue.application=${EVENT_PROCESSING_QUEUE_APPLICATION:event-tracing} +event.processing.logger.event.enable=${EVENT_PROCESSING_LOGGER_EVENT_ENABLE:true} + +## Messaging +app.environment=${APP_ENVIRONMENT:PROD} +modules.messaging.baseurl.isProperty=${MODULES_MESSAGING_BASEURL_ISPROPERTY:true} + +modules.logging.obfuscation.enabled=${MODULES_LOGGING_OBFUSCATION_ENABLED:true} +modules.logging.obfuscation.defaultReplaceType=${MODULES_LOGGING_OBFUSCATION_DEFAULTREPLACETYPE:-} +modules.logging.obfuscation.replaceType.number=${MODULES_LOGGING_OBFUSCATION_REPLACETYPE_NUMBER:000000} +modules.logging.obfuscation.replaceType.string=${MODULES_LOGGING_OBFUSCATION_REPLACETYPE_STRING:XXXXXX} +modules.logging.obfuscation.configurationList[0]=${MODULES_LOGGING_OBFUSCATION_CONFIGURATIONLIST[0]:GET,.*,$[0].name.common,string} + +#Native options: +spring.native.remove-unused-autoconfig=${SPRING_NATIVE_REMOVE_UNUSED_AUTOCONFIG:true} +spring.native.remove-yaml-support=${SPRING_NATIVE_REMOVE_YAML_SUPPORT:true} + + +#VALOR DE OPERACION +service.numerotemporal.operacion=${SERVICE_NUMEROTEMPORAL_OPERACION:numerotemporal} +#VALOR DE SISTEMA +service.numerotemporal.sistema=${SERVICE_NUMEROTEMPORAL_SISTEMA:numerotemporal} +service.numerotemporal.metodo=${SERVICE_NUMEROTEMPORAL_METODO:POST} +#Messaging configuration for external services +modules.messaging.configuration.adapterDefinitions[0]=${MODULES_MESSAGING_CONFIGURATION_ADAPTERDEFINITIONS[0]:AD_COD_0001,com.millicom.microservice.service.service.numero.temporal.ConsultarImplementacion,${service.numerotemporal.operacion},${service.numerotemporal.metodo},,com.millicom.microservice.service.external.services.personalizado.ConsultarResponse,${service.numerotemporal.sistema}} +#Adapter endpoints +modules.messaging.configuration.adapterEndpoints[0]=${MODULES_MESSAGING_CONFIGURATION_ADAPTERENDPOINTS[0]:AE_COD_0001,AD_COD_0001,messaging.baseUrl.numerotemporal.orquestador,PROD,,,} +#LEGADO +messaging.baseUrl.numerotemporal.orquestador=${MESSAGING_BASEURL_NUMEROTEMPORAL_ORQUESTADOR:http://172.28.66.196:8143/api/v1/resourceValidation} + + + + +#CABECERAS QUE SE ENVIAN DEL ADAPTADOR AL LEGADO (N cabeceras) +service.numerotemporal.legado.header.content-type=${SERVICE_NUMEROTEMPORAL_LEGADO_HEADER_CONTENT_TYPE:application/json} +#PATCH que recibe el adaptador (N var) +#service.numerotemporal.path.vars.content-type=application/json +#BANDERA PARA DEVOLVER CABECERAS DEL LEGADO +service.numerotemporal.devolver.cabeceras.del.legado=${SERVICE_NUMEROTEMPORAL_DEVOLVER_CABECERAS_DEL_LEGADO:false} +#PATCH SERVICIO numerotemporal +service.numerotemporal.patch=${SERVICE_NUMEROTEMPORAL_PATCH:/api/v1/consultaNumeroTemporalV2} +service.numerotemporal.codigos.http.a.controlar=${SERVICE_NUMEROTEMPORAL_CODIGOS_HTTP_A_CONTROLAR:502} + +response.errors.400=${RESPONSE_ERRORS_400_ERRORS[0]_MESSAGE:Cannot query field 'lifecycleStatus6' on type 'Products'. Did you mean 'lifecycleStatus', 'lifecycles' or 'lifecyclesList'? (line 6, column 11):\n statusPhone_status: lifecycleStatus6\n ^} +response.errors.405=${RESPONSE_ERRORS_405_ERRORS[0]_MESSAGE:Method Not Allowed} +response.errors.500=${RESPONSE_ERRORS_500_ERRORS[0]_MESSAGE:unknown_error} +response.errors.503=${RESPONSE_ERRORS_503_ERRORS[0]_MESSAGE:server that is down for maintenance or that is overloaded} +response.errors.502=${RESPONSE_ERRORS_502_ERRORS[0]_MESSAGE:No se pudo establecer conexion con el Servidor: ${messaging.baseUrl.numerotemporal.orquestador}} +response.errors.415=${RESPONSE_ERRORS_415_ERRORS[0]_MESSAGE:The request's Content-Type is not supported. Expected:application/json or application/vnd.api+json} +response.errors.default=${RESPONSE_ERRORS_DEFAULT_ERRORS[0]_MESSAGE:Error Interno del Adaptador} + +#logging.level.org.springframework.ws.client.MessageTracing.sent=DEBUG +#logging.level.org.springframework.ws.server.MessageTracing.sent=DEBUG +#logging.level.org.springframework.ws.client.MessageTracing.received=TRACE +#logging.level.org.springframework.ws.server.MessageTracing.received=TRACE \ No newline at end of file diff --git a/src/main/resources/applicationDEV.properties b/src/main/resources/applicationDEV.properties new file mode 100644 index 0000000..ad9e890 --- /dev/null +++ b/src/main/resources/applicationDEV.properties @@ -0,0 +1,105 @@ +#DB +# spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect +#spring.jpa.show-sql=false +#spring.jpa.hibernate.ddl-auto=none +#spring.database.driverClassName=org.postgresql.Driver +#spring.datasource.url=jdbc:postgresql://localhost:5432/mstemplate +#spring.datasource.username=admin +#spring.datasource.password=admin + +# LIQUIBASE settings +#logging.level.liquibase=ERROR +#spring.liquibase.change-log=classpath:/db/master.xml + +#APP +server.port=8142 +#Rit Modules + +modules.logging.message.enable-interceptors=true +modules.logging.message.enable=true +modules.logging.message.configuration=CONSOLE,EVENT +modules.logging.application.enable=true +modules.logging.application.level=DEBUG +modules.logging.application.configuration={'*':'CONSOLE,EVENT'} +modules.common.vtconfig.enable=true +modules.common.vtconfig.use-cache=true +modules.common.i18n.errorMessage.enable=true +modules.common.i18n.errorMessage.default.lang=en-US +modules.common.i18n.locale=en-US,es-ES +modules.common.i18n.default-lang=en-US + +#Management and Metrics +management.endpoints.web.exposure.include=health,info,metrics,prometheus +management.prometheus.metrics.export.enabled = true +management.endpoint.health.probes.enabled=true +management.metrics.tags.application=${spring.application.name} + + +spring.application.name=numerotemporal-service-api +spring.sleuth.otel.config.trace-id-ratio-based=0 +spring.sleuth.otel.exporter.otlp.endpoint=http://localhost:4317 +spring.sleuth.otel.log.exporter.enabled=false +spring.sleuth.async.enabled=false +spring.sleuth.propagation.type=b3 +spring.sleuth.baggage.remote-fields=x-consumer-username + +event.processing.client.producer.enable=true +event.processing.queue.engine=KAFKA +event.processing.kafka.address=172.28.66.196:9092 +event.processing.queue.business=event-tracing +event.processing.queue.message=event-tracing +event.processing.queue.application=event-tracing +event.processing.logger.event.enable=true + +## Messaging +app.environment=PROD +modules.messaging.baseurl.isProperty=true + +modules.logging.obfuscation.enabled=false +modules.logging.obfuscation.defaultReplaceType=- +modules.logging.obfuscation.replaceType.number=000000 +modules.logging.obfuscation.replaceType.string=XXXXXX +modules.logging.obfuscation.configurationList[0]=GET,.*,$[0].name.common,string + +#Native options: +spring.native.remove-unused-autoconfig=true +spring.native.remove-yaml-support=true + +#VALOR DE OPERACION +service.numerotemporal.operacion=numerotemporal +#VALOR DE SISTEMA +service.numerotemporal.sistema=numerotemporal +service.numerotemporal.metodo=POST +#Messaging configuration for external services +modules.messaging.configuration.adapterDefinitions[0]=AD_COD_0001,com.millicom.microservice.service.service.numero.temporal.ConsultarImplementacion,${service.numerotemporal.operacion},${service.numerotemporal.metodo},,com.millicom.microservice.service.external.services.personalizado.ConsultarResponse,${service.numerotemporal.sistema} +#Adapter endpoints +modules.messaging.configuration.adapterEndpoints[0]=AE_COD_0001,AD_COD_0001,messaging.baseUrl.numerotemporal.orquestador,PROD,,, +#LEGADO +#messaging.baseUrl.numerotemporal.orquestador=http://numerotemporal-orchestrator-api:8080/api/v1/resourceValidation +messaging.baseUrl.numerotemporal.orquestador=http://172.28.66.196:8143/api/v1/resourceValidation + +#CABECERAS QUE SE ENVIAN DEL ADAPTADOR AL LEGADO (N cabeceras) +service.numerotemporal.legado.header.content-type=application/json + +#PATCH que recibe el adaptador (N var) +#service.numerotemporal.path.vars.content-type=application/json + +#BANDERA PARA DEVOLVER CABECERAS DEL LEGADO +service.numerotemporal.devolver.cabeceras.del.legado=false + +#PATCH SERVICIO numerotemporal +service.numerotemporal.patch=/api/v1/consultaNumeroTemporalV2 +service.numerotemporal.codigos.http.a.controlar=502 + +response.errors.400=Cannot query field 'lifecycleStatus6' on type 'Products'. Did you mean 'lifecycleStatus', 'lifecycles' or 'lifecyclesList'? (line 6, column 11):\n statusPhone_status: lifecycleStatus6\n ^ +response.errors.405=Method Not Allowed +response.errors.500=unknown_error +response.errors.503=server that is down for maintenance or that is overloaded +response.errors.502=No se pudo establecer conexion con el Servidor: ${messaging.baseUrl.numerotemporal.orquestador} +response.errors.415=The request's Content-Type is not supported. Expected:application/json or application/vnd.api+json +response.errors.default=Error Interno del Servicio + +logging.level.org.springframework.ws.client.MessageTracing.sent=DEBUG +logging.level.org.springframework.ws.server.MessageTracing.sent=DEBUG +logging.level.org.springframework.ws.client.MessageTracing.received=TRACE +logging.level.org.springframework.ws.server.MessageTracing.received=TRACE \ No newline at end of file diff --git a/src/main/resources/applicationTEST.properties b/src/main/resources/applicationTEST.properties new file mode 100644 index 0000000..2c7c3b7 --- /dev/null +++ b/src/main/resources/applicationTEST.properties @@ -0,0 +1,105 @@ +#DB +# spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect +#spring.jpa.show-sql=false +#spring.jpa.hibernate.ddl-auto=none +#spring.database.driverClassName=org.postgresql.Driver +#spring.datasource.url=jdbc:postgresql://localhost:5432/mstemplate +#spring.datasource.username=admin +#spring.datasource.password=admin + +# LIQUIBASE settings +#logging.level.liquibase=ERROR +#spring.liquibase.change-log=classpath:/db/master.xml + +#APP +server.port=${SERVER_PORT:8142} +#Rit Modules + +modules.logging.message.enable-interceptors=${MODULES_LOGGING_MESSAGE_ENABLE_INTERCEPTORS:true} +modules.logging.message.enable=${MODULES_LOGGING_MESSAGE_ENABLE:true} +modules.logging.message.configuration=${MODULES_LOGGING_MESSAGE_CONFIGURATION:CONSOLE,EVENT} +modules.logging.application.enable=${MODULES_LOGGING_APPLICATION_ENABLE:true} +modules.logging.application.level=${MODULES_LOGGING_APPLICATION_LEVEL:DEBUG} +modules.logging.application.configuration=${MODULES_LOGGING_APPLICATION_CONFIGURATION:{'*':'CONSOLE,EVENT'}} +modules.common.vtconfig.enable=${MODULES_COMMON_VTCONFIG_ENABLE:true} +modules.common.vtconfig.use-cache=${MODULES_COMMON_VTCONFIG_USE_CACHE:true} +modules.common.i18n.errorMessage.enable=${MODULES_COMMON_I18N_ERRORMESSAGE_ENABLE:true} +modules.common.i18n.errorMessage.default.lang=${MODULES_COMMON_I18N_ERRORMESSAGE_DEFAULT_LANG:en-US} +modules.common.i18n.locale=${MODULES_COMMON_I18N_LOCALE:en-US,es-ES} +modules.common.i18n.default-lang=${MODULES_COMMON_I18N_DEFAULT_LANG:en-US} + +#Management and Metrics +management.endpoints.web.exposure.include=${MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE:health,info,metrics,prometheus} +management.prometheus.metrics.export.enabled=${MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED:true} +management.endpoint.health.probes.enabled=${MANAGEMENT_ENDPOINT_HEALTH_PROBES_ENABLED:true} +management.metrics.tags.application=${spring.application.name} + + +spring.application.name=${SPRING_APPLICATION_NAME:numerotemporal-service-api} +spring.sleuth.otel.config.trace-id-ratio-based=${SPRING_SLEUTH_OTEL_CONFIG_TRACE_ID_RATIO_BASED:0} +spring.sleuth.otel.exporter.otlp.endpoint=${SPRING_SLEUTH_OTEL_EXPORTER_OTLP_ENDPOINT:http://localhost:4317} +spring.sleuth.otel.log.exporter.enabled=${SPRING_SLEUTH_OTEL_LOG_EXPORTER_ENABLED:false} +spring.sleuth.async.enabled=${SPRING_SLEUTH_ASYNC_ENABLED:false} +spring.sleuth.propagation.type=${SPRING_SLEUTH_PROPAGATION_TYPE:b3} +spring.sleuth.baggage.remote-fields=${SPRING_SLEUTH_BAGGAGE_REMOTE_FIELDS:x-consumer-username} + +event.processing.client.producer.enable=${EVENT_PROCESSING_CLIENT_PRODUCER_ENABLE:true} +event.processing.queue.engine=${EVENT_PROCESSING_QUEUE_ENGINE:KAFKA} +event.processing.kafka.address=${EVENT_PROCESSING_KAFKA_ADDRESS:172.28.66.196:9092} +event.processing.queue.business=${EVENT_PROCESSING_QUEUE_BUSINESS:event-tracing} +event.processing.queue.message=${EVENT_PROCESSING_QUEUE_MESSAGE:event-tracing} +event.processing.queue.application=${EVENT_PROCESSING_QUEUE_APPLICATION:event-tracing} +event.processing.logger.event.enable=${EVENT_PROCESSING_LOGGER_EVENT_ENABLE:true} + +## Messaging +app.environment=${APP_ENVIRONMENT:PROD} +modules.messaging.baseurl.isProperty=${MODULES_MESSAGING_BASEURL_ISPROPERTY:true} + +modules.logging.obfuscation.enabled=${MODULES_LOGGING_OBFUSCATION_ENABLED:false} +modules.logging.obfuscation.defaultReplaceType=${MODULES_LOGGING_OBFUSCATION_DEFAULTREPLACETYPE:-} +modules.logging.obfuscation.replaceType.number=${MODULES_LOGGING_OBFUSCATION_REPLACETYPE_NUMBER:000000} +modules.logging.obfuscation.replaceType.string=${MODULES_LOGGING_OBFUSCATION_REPLACETYPE_STRING:XXXXXX} +modules.logging.obfuscation.configurationList[0]=${MODULES_LOGGING_OBFUSCATION_CONFIGURATIONLIST[0]:GET,.*,$[0].name.common,string} + +#Native options: +spring.native.remove-unused-autoconfig=${SPRING_NATIVE_REMOVE_UNUSED_AUTOCONFIG:true} +spring.native.remove-yaml-support=${SPRING_NATIVE_REMOVE_YAML_SUPPORT:true} + +#VALOR DE OPERACION +service.numerotemporal.operacion=${SERVICE_NUMEROTEMPORAL_OPERACION:numerotemporal} +#VALOR DE SISTEMA +service.numerotemporal.sistema=${SERVICE_NUMEROTEMPORAL_SISTEMA:numerotemporal} +service.numerotemporal.metodo=${SERVICE_NUMEROTEMPORAL_METODO:POST} +#Messaging configuration for external services +modules.messaging.configuration.adapterDefinitions[0]=${MODULES_MESSAGING_CONFIGURATION_ADAPTERDEFINITIONS[0]:AD_COD_0001,com.millicom.microservice.service.service.numero.temporal.ConsultarImplementacion,${service.numerotemporal.operacion},${service.numerotemporal.metodo},,com.millicom.microservice.service.external.services.personalizado.ConsultarResponse,${service.numerotemporal.sistema}} +#Adapter endpoints +modules.messaging.configuration.adapterEndpoints[0]=${MODULES_MESSAGING_CONFIGURATION_ADAPTERENDPOINTS[0]:AE_COD_0001,AD_COD_0001,messaging.baseUrl.numerotemporal.orquestador,PROD,,,} +#LEGADO +#messaging.baseUrl.numerotemporal.orquestador=http://numerotemporal-orchestrator-api:8080/api/v1/resourceValidation +messaging.baseUrl.numerotemporal.orquestador=${MESSAGING_BASEURL_NUMEROTEMPORAL_ORQUESTADOR:http://172.28.66.196:8143/api/v1/resourceValidation} + +#CABECERAS QUE SE ENVIAN DEL ADAPTADOR AL LEGADO (N cabeceras) +service.numerotemporal.legado.header.content-type=${SERVICE_NUMEROTEMPORAL_LEGADO_HEADER_CONTENT_TYPE:application/json} + +#PATCH que recibe el adaptador (N var) +#service.numerotemporal.path.vars.content-type=application/json + +#BANDERA PARA DEVOLVER CABECERAS DEL LEGADO +service.numerotemporal.devolver.cabeceras.del.legado=${SERVICE_NUMEROTEMPORAL_DEVOLVER_CABECERAS_DEL_LEGADO:false} + +#PATCH SERVICIO numerotemporal +service.numerotemporal.patch=${SERVICE_NUMEROTEMPORAL_PATCH:/api/v1/consultaNumeroTemporalV2} +service.numerotemporal.codigos.http.a.controlar=${SERVICE_NUMEROTEMPORAL_CODIGOS_HTTP_A_CONTROLAR:502} + +response.errors.400=${RESPONSE_ERRORS_400:Cannot query field 'lifecycleStatus6' on type 'Products'. Did you mean 'lifecycleStatus', 'lifecycles' or 'lifecyclesList'? (line 6, column 11):\n statusPhone_status: lifecycleStatus6\n ^} +response.errors.405=${RESPONSE_ERRORS_405:Method Not Allowed} +response.errors.500=${RESPONSE_ERRORS_500:unknown_error} +response.errors.503=${RESPONSE_ERRORS_503:server that is down for maintenance or that is overloaded} +response.errors.502=${RESPONSE_ERRORS_502:No se pudo establecer conexion con el Servidor: ${messaging.baseUrl.numerotemporal.orquestador}} +response.errors.415=${RESPONSE_ERRORS_415:The request's Content-Type is not supported. Expected:application/json or application/vnd.api+json} +response.errors.default=${RESPONSE_ERRORS_DEFAULT:Error Interno del Servicio} + +#logging.level.org.springframework.ws.client.MessageTracing.sent=${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WS_CLIENT_MESSAGETRACING_SENT:DEBUG} +#logging.level.org.springframework.ws.server.MessageTracing.sent=${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WS_SERVER_MESSAGETRACING_SENT:DEBUG} +#logging.level.org.springframework.ws.client.MessageTracing.received=${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WS_CLIENT_MESSAGETRACING_RECEIVED:TRACE} +#logging.level.org.springframework.ws.server.MessageTracing.received=${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WS_SERVER_MESSAGETRACING_RECEIVED:TRACE} \ No newline at end of file diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt new file mode 100644 index 0000000..5e06276 --- /dev/null +++ b/src/main/resources/banner.txt @@ -0,0 +1,9 @@ + + ,--. ,--. ,--. ,--. +,--,--, ,--.,--.,--,--,--.,---. ,--.--. ,---. ,-' '-. ,---. ,--,--,--. ,---. ,---. ,--.--.,--,--.| |,-----. ,---. ,---. ,--.--.,--. ,--.`--' ,---. ,---. ,-----.,--,--. ,---. `--' +| \| || || | .-. :| .--'| .-. |'-. .-'| .-. :| || .-. | .-. || .--' ,-. || |'-----'( .-'| .-. :| .--' \ `' / ,--.| .--'| .-. :'-----' ,-. || .-. |,--. +| || |' '' '| | | \ --.| | ' '-' ' | | \ --.| | | || '-' ' '-' '| | \ '-' || | .-' `) --.| | \ / | |\ `--.\ --. \ '-' || '-' '| | +`--''--' `----' `--`--`--'`----'`--' `---' `--' `----'`--`--`--'| |-' `---' `--' `--`--'`--' `----' `----'`--' `--' `--' `---' `----' `--`--'| |-' `--' + `--' `--' +${application.title} ${application.version} +:: Spring Boot${spring-boot.formatted-version} :: ${Ansi.DEFAULT} diff --git a/src/main/resources/db/changelog/data/20220817180800_pipeline_view.xml b/src/main/resources/db/changelog/data/20220817180800_pipeline_view.xml new file mode 100644 index 0000000..7400f2e --- /dev/null +++ b/src/main/resources/db/changelog/data/20220817180800_pipeline_view.xml @@ -0,0 +1,40 @@ + + + + + + SELECT tmp.PIPELINE_ID, + tmp.execution_code, + tmp.execution_index, + tmp.execution_condition, + act_def.fqn AS pre_run_fqn, + act_def2.fqn AS exec_fqn, + act_def3.fqn AS post_run_fqn + FROM + (SELECT pipe_exec.execution_code, + pipe_exec.execution_index, + pipe_exec.execution_condition, + pipe_def.PIPELINE_ID, + pipe_def.PRE_RUN_ACTION_ID, + pipe_def.EXECUTION_ACTION_ID, + pipe_def.POST_RUN_ACTION_ID + FROM oc_execution_pipeline pipe_exec, + oc_pipeline_definition pipe_def + WHERE 1 = 1 + AND pipe_exec.pipeline_id = pipe_def.pipeline_id + ORDER BY pipe_exec.execution_code, + pipe_exec.execution_index + ) tmp + LEFT OUTER JOIN OC_ACTION_DEFINITION act_def + ON tmp.PRE_RUN_ACTION_ID = act_def.ACTION_ID + LEFT OUTER JOIN OC_ACTION_DEFINITION act_def2 + ON tmp.EXECUTION_ACTION_ID = act_def2.ACTION_ID + LEFT OUTER JOIN OC_ACTION_DEFINITION act_def3 + ON tmp.POST_RUN_ACTION_ID = act_def3.ACTION_ID + order by tmp.execution_code, tmp.execution_index; + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/data/20220822174600_pipeline_configuration.xml b/src/main/resources/db/changelog/data/20220822174600_pipeline_configuration.xml new file mode 100644 index 0000000..07100d7 --- /dev/null +++ b/src/main/resources/db/changelog/data/20220822174600_pipeline_configuration.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/data/20220825154700_oc_adapter_definition.xml b/src/main/resources/db/changelog/data/20220825154700_oc_adapter_definition.xml new file mode 100644 index 0000000..d80d5ac --- /dev/null +++ b/src/main/resources/db/changelog/data/20220825154700_oc_adapter_definition.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/data/20220825155100_oc_adapter_endpoint.xml b/src/main/resources/db/changelog/data/20220825155100_oc_adapter_endpoint.xml new file mode 100644 index 0000000..b21b2c2 --- /dev/null +++ b/src/main/resources/db/changelog/data/20220825155100_oc_adapter_endpoint.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/data/20220826171400_error_message.xml b/src/main/resources/db/changelog/data/20220826171400_error_message.xml new file mode 100644 index 0000000..2453d57 --- /dev/null +++ b/src/main/resources/db/changelog/data/20220826171400_error_message.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/data/20221128165609_vt_config_dba_errorcode_table.xml b/src/main/resources/db/changelog/data/20221128165609_vt_config_dba_errorcode_table.xml new file mode 100644 index 0000000..40bbdbe --- /dev/null +++ b/src/main/resources/db/changelog/data/20221128165609_vt_config_dba_errorcode_table.xml @@ -0,0 +1,21 @@ + + + + + + ENTITY_TYPE = 'dba_errorcode_table' + + + + + + + + + + + + diff --git a/src/main/resources/db/changelog/structure/20220811103406_entity_update.xml b/src/main/resources/db/changelog/structure/20220811103406_entity_update.xml new file mode 100644 index 0000000..354814b --- /dev/null +++ b/src/main/resources/db/changelog/structure/20220811103406_entity_update.xml @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/db/data/ERROR_MESSAGE.csv b/src/main/resources/db/data/ERROR_MESSAGE.csv new file mode 100644 index 0000000..3617a64 --- /dev/null +++ b/src/main/resources/db/data/ERROR_MESSAGE.csv @@ -0,0 +1,13 @@ +ID;COUNTRY_CODE;ERROR_CODE;MESSAGE +1;en-US;MT_ERR_GEN_0000;An Exception has occured. +2;en-US;MT_ERR_GEN_0001;An Exception has occured, detail : (%s). +3;en-US;MT_ERR_GEN_0002;Missing required field: %s.%s +4;en-US;MT_ERR_GEN_0003;Missing required field: %s.%s, this field must have one of these values %s +5;en-US;MT_ERR_GEN_0004;The requested path: (%s) does not exist. +6;es-ES;MT_ERR_GEN_0000;Hubo una excepción. +7;es-ES;MT_ERR_GEN_0001;Hubo una excepción, detalles : (%s). +8;es-ES;MT_ERR_GEN_0002;Falta el campo obligatorio: %s.%s +9;es-ES;MT_ERR_GEN_0003;Falta el campo obligatorio: %s.%s, este campo debe tener uno de estos valores %s +10;es-ES;MT_ERR_GEN_0004;La ruta de solicitud: (%s) no existe. + + diff --git a/src/main/resources/db/data/OC_ACTION_DEFINITION.csv b/src/main/resources/db/data/OC_ACTION_DEFINITION.csv new file mode 100644 index 0000000..39d8aa5 --- /dev/null +++ b/src/main/resources/db/data/OC_ACTION_DEFINITION.csv @@ -0,0 +1 @@ +ACTION_ID;FQN diff --git a/src/main/resources/db/data/OC_ADAPTER_DEFINITION.csv b/src/main/resources/db/data/OC_ADAPTER_DEFINITION.csv new file mode 100644 index 0000000..c4daaf7 --- /dev/null +++ b/src/main/resources/db/data/OC_ADAPTER_DEFINITION.csv @@ -0,0 +1 @@ +ADAPTER_ID;INTERFACE_NAME;INTERFACE_OPERATION;INTERFACE_PROTOCOL;REQUEST_FQN;RESPONSE_FQN;SYSTEM diff --git a/src/main/resources/db/data/OC_ADAPTER_ENDPOINT.csv b/src/main/resources/db/data/OC_ADAPTER_ENDPOINT.csv new file mode 100644 index 0000000..26b532b --- /dev/null +++ b/src/main/resources/db/data/OC_ADAPTER_ENDPOINT.csv @@ -0,0 +1 @@ +ENDPOINT_ID;ADAPTER_ID;BASE_URL;ENVIRONMENT;OPERATION;USER_NAME;USER_PASSWORD diff --git a/src/main/resources/db/data/OC_EXECUTION_PIPELINE.csv b/src/main/resources/db/data/OC_EXECUTION_PIPELINE.csv new file mode 100644 index 0000000..a2e3edf --- /dev/null +++ b/src/main/resources/db/data/OC_EXECUTION_PIPELINE.csv @@ -0,0 +1 @@ +EXECUTION_ID;EXECUTION_CODE;EXECUTION_CONDITION;EXECUTION_INDEX;PIPELINE_ID;STATUS diff --git a/src/main/resources/db/data/OC_PIPELINE_DEFINITION.csv b/src/main/resources/db/data/OC_PIPELINE_DEFINITION.csv new file mode 100644 index 0000000..ed5920d --- /dev/null +++ b/src/main/resources/db/data/OC_PIPELINE_DEFINITION.csv @@ -0,0 +1 @@ +PIPELINE_ID;EXECUTION_ACTION_ID;PIPELINE_NAME;POST_RUN_ACTION_ID;PRE_RUN_ACTION_ID;STATUS diff --git a/src/main/resources/db/data/VT_CONFIG_DBA_ERRORCODE_TABLE.csv b/src/main/resources/db/data/VT_CONFIG_DBA_ERRORCODE_TABLE.csv new file mode 100644 index 0000000..ad90b43 --- /dev/null +++ b/src/main/resources/db/data/VT_CONFIG_DBA_ERRORCODE_TABLE.csv @@ -0,0 +1 @@ +ID;CACHED;ENTITY_KEY;ENTITY_KEY_VALUE;ENTITY_TYPE;PAYLOAD diff --git a/src/main/resources/db/master.xml b/src/main/resources/db/master.xml new file mode 100644 index 0000000..25571c9 --- /dev/null +++ b/src/main/resources/db/master.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/workspace/delete.txt b/src/main/resources/workspace/delete.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/wsdl/ConsultarNumeroTemporal.xsd b/src/main/resources/wsdl/ConsultarNumeroTemporal.xsd new file mode 100644 index 0000000..a46d75f --- /dev/null +++ b/src/main/resources/wsdl/ConsultarNumeroTemporal.xsd @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/wsdl/ConsultarNumeroTemporal_1.wsdl b/src/main/resources/wsdl/ConsultarNumeroTemporal_1.wsdl new file mode 100644 index 0000000..8f68897 --- /dev/null +++ b/src/main/resources/wsdl/ConsultarNumeroTemporal_1.wsdl @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/wsdl/MAIN.wsdl b/src/main/resources/wsdl/MAIN.wsdl new file mode 100644 index 0000000..04ee511 --- /dev/null +++ b/src/main/resources/wsdl/MAIN.wsdl @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/com/millicom/microservice/service/MsTemplateTestApplication.java b/src/test/java/com/millicom/microservice/service/MsTemplateTestApplication.java new file mode 100644 index 0000000..8cd78d4 --- /dev/null +++ b/src/test/java/com/millicom/microservice/service/MsTemplateTestApplication.java @@ -0,0 +1,12 @@ +package com.millicom.microservice.service; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class MsTemplateTestApplication { + + @Test + void contextLoads() { + } +} diff --git a/src/test/java/com/millicom/microservice/service/controller/delete.txt b/src/test/java/com/millicom/microservice/service/controller/delete.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/test/java/com/millicom/microservice/service/helper/BaseTestAPI.java b/src/test/java/com/millicom/microservice/service/helper/BaseTestAPI.java new file mode 100644 index 0000000..54838d4 --- /dev/null +++ b/src/test/java/com/millicom/microservice/service/helper/BaseTestAPI.java @@ -0,0 +1,62 @@ +package com.millicom.microservice.service.helper; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.github.tomakehurst.wiremock.WireMockServer; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.util.StreamUtils; +import org.springframework.web.util.UriComponentsBuilder; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Map; + +public class BaseTestAPI { + + @Value("${configs.MOCK_PORT}") + public int DEFAULT_PORT; + protected WireMockServer externalSystemsMock; + + @Autowired + protected ObjectMapper objectMapper; + + + public ObjectMapper getObjectMapper() { + return objectMapper; + } + + @BeforeEach + protected void preSetup() throws Exception { + //Initialize Mock + if (externalSystemsMock == null) { + externalSystemsMock = new WireMockServer(DEFAULT_PORT); + } + + externalSystemsMock.start(); + JavaTimeModule module = new JavaTimeModule(); + objectMapper.registerModule(module); + + } + + @AfterEach + protected void afterTest() { + externalSystemsMock.stop(); + } + + + public String resourceToString(org.springframework.core.io.Resource resource) throws IOException { + return StreamUtils.copyToString(resource.getInputStream(), StandardCharsets.UTF_8); + } + + public String replaceDynamicParams(String endpoint, Map dynamicParams) { + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(""); + builder.path(endpoint); + if (dynamicParams != null && dynamicParams.size() > 0) { + endpoint = builder.build(false).expand(dynamicParams).toUriString(); + } + return endpoint; + } +} diff --git a/src/test/java/com/millicom/microservice/service/mock/ExternalSystemsMock.java b/src/test/java/com/millicom/microservice/service/mock/ExternalSystemsMock.java new file mode 100644 index 0000000..4238163 --- /dev/null +++ b/src/test/java/com/millicom/microservice/service/mock/ExternalSystemsMock.java @@ -0,0 +1,58 @@ +package com.millicom.microservice.service.mock; + +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.MappingBuilder; +import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; +import com.github.tomakehurst.wiremock.matching.StringValuePattern; + +import java.util.Map; + +import static com.github.tomakehurst.wiremock.client.WireMock.*; + +public class ExternalSystemsMock { + + + public static WireMockServer openPort(WireMockServer server) throws InterruptedException { + return server; + } + + public static WireMockServer closePort(WireMockServer server) { + server.stop(); + return server; + } + + public static void externalSystemsResponse(WireMockServer mockServer, String protocol, String operation, String endpoint, String response, int httpStatus, Map params) { + + String header = protocol == "SOAP" ? "text/xml" : "application/json"; + + MappingBuilder mappingBuilder = switch (operation) { + case "POST" -> post(urlPathMatching(endpoint)); + case "GET" -> get(urlPathMatching(endpoint)); + case "PATCH" -> patch(urlPathMatching(endpoint)); + case "PUT" -> put(urlPathMatching(endpoint)); + case "DELETE" -> delete(urlPathMatching(endpoint)); + default -> get(urlPathMatching(endpoint)); + }; + if (params != null) mappingBuilder.withQueryParams(params); + + if(endpoint.endsWith("/slowresponse")) + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + ResponseDefinitionBuilder responseDefinitionBuilder = aResponse() + .withStatus(httpStatus) + .withHeader("Content-Type", header); + + if (response != null) responseDefinitionBuilder.withBody(response); + mappingBuilder + .willReturn(responseDefinitionBuilder); + + + mockServer.stubFor(mappingBuilder); + } +} \ No newline at end of file diff --git a/src/test/java/com/millicom/microservice/service/mock/MsTemplateResourceTest.java b/src/test/java/com/millicom/microservice/service/mock/MsTemplateResourceTest.java new file mode 100644 index 0000000..fa402d7 --- /dev/null +++ b/src/test/java/com/millicom/microservice/service/mock/MsTemplateResourceTest.java @@ -0,0 +1,181 @@ +package com.millicom.microservice.service.mock; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.millicom.microservice.service.service.common.GenerateErrorServiceImp; +import com.millicom.microservice.service.service.messaging.ErrorMapper; +import com.readinessit.library.logging.application.services.LoggerService; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.web.servlet.MockMvc; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@AutoConfigureMockMvc +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +class MsTemplateResourceTest extends com.millicom.microservice.service.helper.BaseTestAPI { + + @Autowired + LoggerService loggerService; + + @Autowired + private ObjectMapper objectMapper; + + @Autowired + private MockMvc mockMvc; + + @Autowired + private ErrorMapper errorMapper; + @Autowired + private GenerateErrorServiceImp generateErrorServiceImp; + + + + + @Value("classpath:mockresponses/errorResponse.json") + private org.springframework.core.io.Resource errorResponse; + + @Value("classpath:mockresponses/successResponse.json") + private org.springframework.core.io.Resource successResponse; + + @Value("classpath:mockresponses/requestOk.json") + private org.springframework.core.io.Resource requestOk; + + @Value("classpath:mockresponses/requestFail.json") + private org.springframework.core.io.Resource requestFail; + + + @Value("${service.createorder.patch}") + private String patchService; + +/* + @Test + @Order(1) + void testSucessfull() throws Exception { + + ExternalSystemsMock.externalSystemsResponse(externalSystemsMock, "REST", "POST", "/api/v1/createOrder", + resourceToString(successResponse), 200, isNull()); + + MvcResult requestResult = mockMvc.perform(post(patchService).content(resourceToString(requestOk)).contentType(MediaType.APPLICATION_JSON_VALUE) + .accept(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(status().is2xxSuccessful()).andReturn(); + assertEquals(200, requestResult.getResponse().getStatus()); + } + + + @Test + @Order(2) + void testbadRequest() throws Exception { + MvcResult requestResult = mockMvc.perform(post(patchService).content(anyString()).contentType(MediaType.APPLICATION_JSON_VALUE) + .accept(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(status().isBadRequest()).andReturn(); + assertEquals(400, requestResult.getResponse().getStatus()); + } + + + @Test + @Order(3) + void testUnsuported() throws Exception { + MvcResult requestResult = mockMvc.perform(post(patchService).content(anyString()).contentType(MediaType.APPLICATION_XML) + .accept(MediaType.APPLICATION_XML_VALUE)) + .andExpect(status().isUnsupportedMediaType()).andReturn(); + assertEquals(415, requestResult.getResponse().getStatus()); + } + + + @Test + @Order(4) + void testValidacionFallida() throws Exception { + MvcResult requestResult = mockMvc.perform(post(patchService).content(resourceToString(requestFail)).contentType(MediaType.APPLICATION_JSON_VALUE) + .accept(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(status().isBadRequest()).andReturn(); + assertEquals(400, requestResult.getResponse().getStatus()); + } + + + @Test + @Order(5) + void testUnathorized() throws Exception { + Thread.sleep(2000); + ExternalSystemsMock.externalSystemsResponse(externalSystemsMock, "REST", "POST", "/api/v1/createOrder", + anyString(), 401, isNull()); + + MvcResult requestResult = mockMvc.perform(post(patchService).content(resourceToString(requestOk)).contentType(MediaType.APPLICATION_JSON_VALUE) + .accept(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(status().isUnauthorized()).andReturn(); + assertEquals(401, requestResult.getResponse().getStatus()); + } + + + @Test + @Order(6) + void testFailServer() throws Exception { + Thread.sleep(2000); + ExternalSystemsMock.externalSystemsResponse(externalSystemsMock, "REST", "POST", "/api/v1/createOrder", + resourceToString(errorResponse), 400, isNull()); + + MvcResult requestResult = mockMvc.perform(post(patchService).content(resourceToString(requestOk)).contentType(MediaType.APPLICATION_JSON_VALUE) + .accept(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(status().isBadRequest()).andReturn(); + assertEquals(400, requestResult.getResponse().getStatus()); + ErrorResponse response = objectMapper.readValue(requestResult.getResponse().getContentAsString(), ErrorResponse.class); + + } + + + @Test + @Order(7) + void validateErrorMapper(){ + + ErrorStructure errorStructure=errorMapper.validate(null); + assertEquals(errorStructure.getHttpStatus(), HttpStatus.BAD_GATEWAY); + + MessageResponse response= new MessageResponse(); + response.setResponse(new ObjetoNoSerializable()); + String json= errorMapper.obtenerJsonDeMessageResponse(response); + assertNull(json); + } + + + + @Test + @Order(8) + void validateGenerateErrorServiceImp () throws IOException { + + ErrorStructure errorStructure=generateErrorServiceImp.generarErrorNuevo(HttpStatus.CHECKPOINT,null); + assertEquals(errorStructure.getHttpStatus(), HttpStatus.INTERNAL_SERVER_ERROR); + assertEquals(errorStructure.getErrors().getFirst().getMessage(),"Error Interno del Adaptador"); + + + ErrorResponse errorResponse1= generateErrorServiceImp.obtenerResponse("200",""); + assertNull(errorResponse1.getErrors()); + + + //List listFull= generateErrorServiceImp.obtenerResponse("200",resourceToString(errorResponse)); + // assertEquals(listFull.getFirst().getMessage(),""); + + + PortabilidadAplicacion.main(new String[]{}); + + // Verificar si el servicio de registro se utiliza correctamente + //verify(loggerService); + } + + + @Test + @Order(1) + void testFailConexion() throws Exception { + + ExternalSystemsMock.externalSystemsResponse(externalSystemsMock, "REST", "POST", "/api/v1/createOrder", + resourceToString(successResponse), 502, isNull()); + + MvcResult requestResult = mockMvc.perform(post(patchService).content(resourceToString(requestOk)).contentType(MediaType.APPLICATION_JSON_VALUE) + .accept(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(status().is5xxServerError()).andReturn(); + assertEquals(502, requestResult.getResponse().getStatus()); + } + +*/ +} diff --git a/src/test/java/com/millicom/microservice/service/mock/ObjetoNoSerializable.java b/src/test/java/com/millicom/microservice/service/mock/ObjetoNoSerializable.java new file mode 100644 index 0000000..8f97770 --- /dev/null +++ b/src/test/java/com/millicom/microservice/service/mock/ObjetoNoSerializable.java @@ -0,0 +1,4 @@ +package com.millicom.microservice.service.mock; + +public class ObjetoNoSerializable { +} diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties new file mode 100644 index 0000000..3b81a2f --- /dev/null +++ b/src/test/resources/application.properties @@ -0,0 +1,178 @@ + +#Rit Modules + +#APP +server.port=9081 + +modules.logging.message.enable-interceptors=true +modules.logging.message.enable=true +modules.logging.message.configuration=CONSOLE,EVENT +modules.logging.application.enable=true +modules.logging.application.level=DEBUG +modules.logging.application.configuration={'*':'CONSOLE,EVENT'} +modules.common.vtconfig.enable=true +modules.common.vtconfig.use-cache=true +modules.common.i18n.errorMessage.enable=true +modules.common.i18n.errorMessage.default.lang=en-US +modules.common.i18n.locale=en-US,es-ES +modules.common.i18n.default-lang=en-US + +#Management and Metrics +#PRUEBAS UNITARIAS +#management.endpoint.health.group.liveness.include= livenessState,livenessProbe +#management.endpoint.health.group.readiness.include= readinessState,readinessProbe +management.endpoints.web.exposure.include=health,info,metrics,prometheus +management.health.livenessState.enabled= true +management.health.readinessState.enabled= true +#management.metrics.export.prometheus.enabled=true +management.metrics.tags.application=${spring.application.name} + + +spring.application.name=ms-template +spring.sleuth.otel.config.trace-id-ratio-based=0 +spring.sleuth.otel.exporter.otlp.endpoint=http://localhost:4317 +spring.sleuth.otel.log.exporter.enabled=false +spring.sleuth.async.enabled=false +spring.sleuth.propagation.type=b3 +spring.sleuth.baggage.remote-fields=x-consumer-username + +event.processing.client.producer.enable=false +event.processing.queue.engine=KAFKA +event.processing.kafka.address=localhost:9092 +event.processing.queue.business=event-tracing +event.processing.queue.message=event-tracing +event.processing.queue.application=event-tracing +event.processing.logger.event.enable=true + +#Tiempo de keep alive por defecto +rest-client.defaultKeepAliveTime: 60000 +#Tiempo que una conexion puede estar idle +rest-client.idleConnectionWaitTime: 30000 +#Maximo de conexiones por ruta de conexion +rest-client.maxRouteConnections: 100 +#Maximo de conexiones entre todas las rutas +rest-client.maxTotalConnections: 900 +#Tiempo de espera mientras se establece la conexion +rest-client.connectionTimeout: 1000 +#Tiempo de espera para obtener una conexion del pool +rest-client.requestTimeout: 900 +#Tiempo de espera de respuesta (data) +rest-client.socketTimeout: 900 + + +configs.MOCK_PORT=9080 + + +## Messaging +app.environment=PROD +modules.messaging.baseurl.isProperty=true +messaging.baseUrl.getCountryName=http://localhost:${configs.MOCK_PORT} + + + + +#VALOR DE OPERACION +service.createorder.operacion=createorder +#VALOR DE SISTEMA +service.createorder.sistema=createorder +service.createorder.metodo=POST + +#Messaging configuration for external services +modules.messaging.configuration.adapterDefinitions[0]=AD_COD_0002,com.millicom.microservice.service.adapters.controlador.createorder.CreateOrderRecurso,${service.createorder.operacion},${service.createorder.metodo},,java.util.ArrayList,${service.createorder.sistema} +#Adapter endpoints +modules.messaging.configuration.adapterEndpoints[0]=AE_COD_0002,AD_COD_0002,messaging.baseUrl.createorder.orquestador,PROD,,, + +#LEGADO +#messaging.baseUrl.createorder.graphql=https://csr-staging.digitalback.tigo.net.bo:8180/graphql + +#MOCKUP +messaging.baseUrl.createorder.orquestador=http://127.0.0.1:${configs.MOCK_PORT}/api/v1/createOrder + +modules.logging.obfuscation.enabled=true +modules.logging.obfuscation.defaultReplaceType=- +modules.logging.obfuscation.replaceType.number=000000 +modules.logging.obfuscation.replaceType.string=XXXXXX +modules.logging.obfuscation.configurationList[0]=GET,.*,$[0].name.common,string + +#Native options: +spring.native.remove-unused-autoconfig=true +spring.native.remove-yaml-support=true + +#CABECERAS QUE SE ENVIAN DEL ADAPTADOR AL LEGADO (N cabeceras) +service.createorder.legado.header.content-type=application/json + +#PATCH que recibe el adaptador (N var) +#service.createorder.path.vars.content-type=application/json + +#BANDERA PARA DEVOLVER CABECERAS DEL LEGADO +service.createorder.devolver.cabeceras.del.legado=false + +#PATCH SERVICIO createorder +service.createorder.patch=/api/v1/createorder + +service.createorder.ofertas.creacion=PO_Tigo_Pre_Pago_3;PO_NumberPortIn +service.createorder.ofertas.cambio.plan=PO_Change_Plan;PO_Tigo_Prepago_Tarifa_Baja + +#VALIDACIONES +service.createorder.expresion.regular.oferta=productOfferingId: \\\\\\s*\\"(.*?)\\\\" +service.createorder.expresion.regular.validar.oferta=PO_\\w+ + +service.createorder.expresion.regular.customer.account=customerAccountId: \\\\\\s*\\"(.*?)\\\\" +service.createorder.expresion.regular.validar.customer.account=^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$ + +service.createorder.expresion.regular.reference.number=referenceNumber: \\\\\\s*\\"(.*?)\\\\" +service.createorder.expresion.regular.validar.reference.number=^[a-zA-Z0-9_-]+$ + +service.createorder.expresion.regular.channel=channel: \\\\\\s*\\"(.*?)\\\\" +service.createorder.expresion.regular.validar.channel=^[a-zA-Z0-9_-]+$ + +service.createorder.expresion.regular.sales.person=salespersonId: \\\\\\s*\\"(.*?)\\\\" +service.createorder.expresion.regular.validar.sales.person=^[a-zA-Z0-9_-]+$ + +service.createorder.expresion.regular.created=createdAt: \\\\\\s*\\"(.*?)\\\\" +service.createorder.expresion.regular.validar.created=^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z$ + +service.createorder.expresion.regular.icc=CH_ICC\\\\"\\s*,\\\\s*n\\s*value\\s*:\\s*\\\\"(.*?)\\\\" +service.createorder.expresion.regular.validar.icc=^[a-zA-Z0-9_-]+$ + +service.createorder.expresion.regular.port.number.resource=CH_PortInNumberResource\\\\"\\s*,\\\\s*n\\s*value\\s*:\\s*\\\\"(.*?)\\\\" +service.createorder.expresion.regular.validar.port.number.resource=^[a-zA-Z0-9_-]+$ + +service.createorder.expresion.regular.donor.id=CH_DonorId\\\\"\\s*,\\\\s*n\\s*value\\s*:\\s*\\\\"(.*?)\\\\" +service.createorder.expresion.regular.validar.donor.id=^[a-zA-Z0-9_-]+$ + +service.createorder.expresion.regular.nuevo.plan=CH_New_Plan_Offer_ID\\\\"\\s*,\\\\s*n\\s*value\\s*:\\s*\\\\"(.*?)\\\\" +service.createorder.expresion.regular.validar.nuevo.plan=^[a-zA-Z0-9_-]+$ + + +service.createorder.codigos.http.a.controlar=502 + + +response.errors.400.errors[0].message=Cannot query field 'lifecycleStatus6' on type 'Products'. Did you mean 'lifecycleStatus', 'lifecycles' or 'lifecyclesList'? (line 6, column 11):\n statusPhone_status: lifecycleStatus6\n ^ +response.errors.400.errors[0].locations[0].line=2 +response.errors.400.errors[0].locations[0].column=3 + +response.errors.405.errors[0].message=Method Not Allowed +response.errors.405.errors[0].locations[0].line=2 +response.errors.405.errors[0].locations[0].column=3 + +response.errors.500.errors[0].message=unknown_error +response.errors.500.errors[0].locations[0].line=1 +response.errors.500.errors[0].locations[0].column=2 + +response.errors.503.errors[0].message=server that is down for maintenance or that is overloaded +response.errors.503.errors[0].locations[0].line=1 +response.errors.503.errors[0].locations[0].column=2 + +response.errors.502.errors[0].message=No se pudo establecer conexion con el Servidor: ${messaging.baseUrl.createorder.orquestador} +response.errors.502.errors[0].locations[0].line=1 +response.errors.502.errors[0].locations[0].column=2 + +response.errors.415.errors[0].message=The request's Content-Type is not supported. Expected:application/json or application/vnd.api+json +response.errors.415.errors[0].locations[0].line=1 +response.errors.415.errors[0].locations[0].column=2 + +response.errors.default.errors[0].message=Error Interno del Adaptador +response.errors.default.errors[0].locations[0].line=1 +response.errors.default.errors[0].locations[0].column=2 + diff --git a/src/test/resources/expected-message/delete.txt b/src/test/resources/expected-message/delete.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/test/resources/mockresponses/delete.txt b/src/test/resources/mockresponses/delete.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/test/resources/mockresponses/errorResponse.json b/src/test/resources/mockresponses/errorResponse.json new file mode 100644 index 0000000..e765e82 --- /dev/null +++ b/src/test/resources/mockresponses/errorResponse.json @@ -0,0 +1,10 @@ +{ + "data": { + "orderCreate": { + "id": "41e9f625-e1ed-49c1-a9f6-25e1eda9c186", + "lifecycleStatus": "accepted", + "function": "orders-create", + "requestedAt": "2019-12-12T05:00:15.279Z" + } + } +} \ No newline at end of file diff --git a/src/test/resources/mockresponses/requestFail.json b/src/test/resources/mockresponses/requestFail.json new file mode 100644 index 0000000..e8b563a --- /dev/null +++ b/src/test/resources/mockresponses/requestFail.json @@ -0,0 +1 @@ +{"query":"mutation createOrder {\n orderCreate(\n input: {\n included: {\n newInstance: {\n attributes: {\n referenceNumber: \"9647c78e-c450-4433-874f-843dda94d164\"\n salesInfo: {\n channel: \"MNPPDA\"\n salesType: acquisition\n salespersonId: \"15023\"\n }\n createdAt: \"2019-07-01T08:33:37Z\"\n }\n relationships: {\n customerAccountId: \"AAAa64f8c2b-32ca-41e5-891f-21b821fbfe51\"\n }\n included: {\n orderItems: [\n {\n relationships: {\n }\n attributes: {\n quantity: 1,\n action: \"create\"\n }\n included: {\n orderProduct: {\n included: {\n }\n relationships: {\n productOfferingId: \"PO_Tigo_Pre_Pago_3\",\n } \n attributes: {\n inputtedCharacteristics: [\n {\n key: \"CH_Activation_model\",\n value: \"direct\"\n }\n {\n key: \"CH_ICC\",\n value: \"8959103000434626821\"\n }\n {\n key: \"CH_DocSigned\",\n value: \"true\"\n }\n \n ]\n }\n }\n childOrderItems: {\n relationships: {\n } \n attributes: {\n quantity: 1,\n action: \"create\"\n }\n included: {\n orderProduct: {\n included: {\n }\n relationships: {\n productOfferingId: \"PO_NumberPortIn\"\n }\n attributes: {\n inputtedCharacteristics: [\n {\n key: \"CH_PortInNumberResource\",\n value: \"59172120020\"\n }\n {\n key: \"CH_DonorId\",\n value: \"VIVA\"\n }\n ]\n }\n }\n } \n }\n }\n }\n ]\n }\n }\n }\n }\n sync: 5) {\n id\n lifecycleStatus\n function\n requestedAt\n resource {\n id\n type\n }\n }\n }","operationName":"createOrder"} \ No newline at end of file diff --git a/src/test/resources/mockresponses/requestOk.json b/src/test/resources/mockresponses/requestOk.json new file mode 100644 index 0000000..b8a32e8 --- /dev/null +++ b/src/test/resources/mockresponses/requestOk.json @@ -0,0 +1 @@ +{"query":"mutation createOrder {\n orderCreate(\n input: {\n included: {\n newInstance: {\n attributes: {\n referenceNumber: \"9647c78e-c450-4433-874f-843dda94d164\"\n salesInfo: {\n channel: \"MNPPDA\"\n salesType: acquisition\n salespersonId: \"15023\"\n }\n createdAt: \"2019-07-01T08:33:37Z\"\n }\n relationships: {\n customerAccountId: \"d64f8c2b-32ca-41e5-891f-21b821fbfe51\"\n }\n included: {\n orderItems: [\n {\n relationships: {\n }\n attributes: {\n quantity: 1,\n action: \"create\"\n }\n included: {\n orderProduct: {\n included: {\n }\n relationships: {\n productOfferingId: \"PO_Tigo_Pre_Pago_3\",\n } \n attributes: {\n inputtedCharacteristics: [\n {\n key: \"CH_Activation_model\",\n value: \"direct\"\n }\n {\n key: \"CH_ICC\",\n value: \"8959103000434626821\"\n }\n {\n key: \"CH_DocSigned\",\n value: \"true\"\n }\n \n ]\n }\n }\n childOrderItems: {\n relationships: {\n } \n attributes: {\n quantity: 1,\n action: \"create\"\n }\n included: {\n orderProduct: {\n included: {\n }\n relationships: {\n productOfferingId: \"PO_NumberPortIn\"\n }\n attributes: {\n inputtedCharacteristics: [\n {\n key: \"CH_PortInNumberResource\",\n value: \"59172120020\"\n }\n {\n key: \"CH_DonorId\",\n value: \"VIVA\"\n }\n ]\n }\n }\n } \n }\n }\n }\n ]\n }\n }\n }\n }\n sync: 5) {\n id\n lifecycleStatus\n function\n requestedAt\n resource {\n id\n type\n }\n }\n }","operationName":"createOrder"} \ No newline at end of file diff --git a/src/test/resources/mockresponses/successResponse.json b/src/test/resources/mockresponses/successResponse.json new file mode 100644 index 0000000..306b2f8 --- /dev/null +++ b/src/test/resources/mockresponses/successResponse.json @@ -0,0 +1,14 @@ +{ + "data": { + "orderCreate": { + "id": "5e608a40-58ee-4c98-a08a-4058ee1c98ac", + "lifecycleStatus": "accepted", + "function": "orders-create", + "requestedAt": "2020-06-18T17:34:50.468Z", + "resource": { + "id": "6599", + "type": "orders" + } + } + } +} \ No newline at end of file