diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..614863d Binary files /dev/null and b/.DS_Store differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..50f7572 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Logs ## +/logs/ + +### MacOs ### +.DS_Store +.DS_Store diff --git a/README.md b/README.md index 7f832ad..336b3cf 100644 --- a/README.md +++ b/README.md @@ -81,4 +81,113 @@ You can use Graphql; When you finish your challenge, after forking a repository, you **must** open a pull request to our repository. There are no limitations to the implementation, you can follow the programming paradigm, modularization, and style that you feel is the most appropriate solution. -If you have any questions, please let us know. \ No newline at end of file +If you have any questions, please let us know. + +# Solucion del Challenge # + +Ejecutar el comando +```bash +docker-compose up -d +``` + +Se ejecutara los contenedores necesarios para solucionar +el alcance basico que se solicito en el Challenge + +> [!IMPORTANT] +> Al ser ejecutado el Docker-Compose, las APIs se exponen en el puerto "8092" y cuando se ejecuta de forma local se ejecuta en el puerto "8091". + +API para generar una nueva transferencia. +```bash +curl --location 'http://localhost:8091/transactions' \ +--header 'Content-Type: application/json' \ +--data '{ + "accountExternalIdDebit": "550e8400-e29b-41d4-a716-446655447700", + "accountExternalIdCredit": "550e8400-e29b-41d4-a716-446655447701", + "transferTypeId": 1, + "value": 9900.10 +}' +``` + +La respuesta que nos devolvera es una similar a la siguiente +```bash +{ + "transactionExternalId": "ff2a75b5-9ba0-40a8-9329-e67a2ec19037", + "transactionType": { + "name": "1" + }, + "transactionStatus": { + "name": "pending" + }, + "value": "9900.10", + "createdAt": "2024-06-08T23:47:37.328-05:00" +} +``` + +API para consultar por un Id especifico +```bash +curl --location 'http://localhost:8091/transactions/4b2a815f-090b-4e4d-ba20-760cbad4c43d' +``` +La respuesta sera una similar a la siguientes +```bash +{ + "id": "4b2a815f-090b-4e4d-ba20-760cbad4c43d", + "accountExternalIdDebit": "550e8400-e29b-41d4-a716-446655447700", + "accountExternalIdCredit": "550e8400-e29b-41d4-a716-446655447701", + "transferTypeId": 1, + "value": 99.10, + "transactionStatus": "approved", + "transactionType": "1", + "createdAt": "2024-06-08T23:33:22.081-05:00" +} +``` + +API para consultar todas transferencias almacenadas +```bash +curl --location 'http://localhost:8092/transactions' + +``` + +La respuesta sera una similar a la siguientes +```bash +[ + { + "id": "2a6d9387-238a-4f07-9017-fd7506a6fd68", + "accountExternalIdDebit": "550e8400-e29b-41d4-a716-446655447700", + "accountExternalIdCredit": "550e8400-e29b-41d4-a716-446655447701", + "transferTypeId": 1, + "value": 99.10, + "transactionStatus": "approved", + "transactionType": "1", + "createdAt": "2024-06-08T23:46:47.985-05:00" + }, + { + "id": "ff2a75b5-9ba0-40a8-9329-e67a2ec19037", + "accountExternalIdDebit": "550e8400-e29b-41d4-a716-446655447700", + "accountExternalIdCredit": "550e8400-e29b-41d4-a716-446655447701", + "transferTypeId": 1, + "value": 9900.10, + "transactionStatus": "rejected", + "transactionType": "1", + "createdAt": "2024-06-08T23:47:37.328-05:00" + } +] +``` + +El Flujo consiste en: + + 1.- Se genera una nueva transferencia y se almacena como "pending" + para que pueda ser evaluada por el proceso de anti-fraude. + 2.- El segundo paso se ejecuta una suscripcion + al evento publicado en la "generación de transferencia" + y se ejecuta el proceso de anti-fraude. + 3.- Se cambia el estado en base al resultado del proceso + ejecutado por el proceso de anti-fraude, el cual nos + indicara si la transferencia fue aceptada o rechazada. + + +Como parte de la solucion se tienen las siguientes consideraciones: + + 1.- Se agrego pool de conexiones para la BD. + 2.- Se agrego TTL para los mensaje publicados. + 3.- Se agrego el manejo del logback. + 4.- Se agrego el manejo de perfiles para la creacion de imagenes con docker. diff --git a/codechallenge/.DS_Store b/codechallenge/.DS_Store new file mode 100644 index 0000000..977e1c5 Binary files /dev/null and b/codechallenge/.DS_Store differ diff --git a/codechallenge/.gitignore b/codechallenge/.gitignore new file mode 100644 index 0000000..54e4f91 --- /dev/null +++ b/codechallenge/.gitignore @@ -0,0 +1,39 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Logs ## +/logs/ + +### MacOs ### +.DS_Store diff --git a/codechallenge/.mvn/wrapper/maven-wrapper.properties b/codechallenge/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..aeccdfd --- /dev/null +++ b/codechallenge/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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. +wrapperVersion=3.3.1 +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip diff --git a/codechallenge/DockerFile b/codechallenge/DockerFile new file mode 100644 index 0000000..5f82348 --- /dev/null +++ b/codechallenge/DockerFile @@ -0,0 +1,21 @@ +FROM alpine:3.18.3 + +RUN apk add --no-cache openjdk17 maven + +WORKDIR /app + +COPY ./codechallenge . + +RUN mvn clean package -D skipTests -P docker + +FROM alpine:3.18.3 + +RUN apk add --no-cache openjdk17 + +WORKDIR /app + +COPY --from=0 /app/target/codechallenge-0.0.1-SNAPSHOT.jar . + +ENV SPRING_PROFILES_ACTIVE=docker + +CMD ["/usr/bin/java", "-jar", "codechallenge-0.0.1-SNAPSHOT.jar"] \ No newline at end of file diff --git a/codechallenge/mvnw b/codechallenge/mvnw new file mode 100755 index 0000000..ba9212a --- /dev/null +++ b/codechallenge/mvnw @@ -0,0 +1,250 @@ +#!/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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.1 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl="${value-}" ;; + distributionSha256Sum) distributionSha256Sum="${value-}" ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/codechallenge/mvnw.cmd b/codechallenge/mvnw.cmd new file mode 100644 index 0000000..406932d --- /dev/null +++ b/codechallenge/mvnw.cmd @@ -0,0 +1,146 @@ +<# : batch portion +@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 Apache Maven Wrapper startup batch script, version 3.3.1 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/codechallenge/pom.xml b/codechallenge/pom.xml new file mode 100644 index 0000000..d7813d0 --- /dev/null +++ b/codechallenge/pom.xml @@ -0,0 +1,117 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.0 + + + com.yape + codechallenge + 0.0.1-SNAPSHOT + codechallenge + Demo project for Spring Boot + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.kafka + spring-kafka + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.mysql + mysql-connector-j + runtime + + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.kafka + spring-kafka-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + + docker + + + + maven-resources-plugin + 3.2.0 + + + copy-resources + validate + + copy-resources + + + ${project.build.outputDirectory} + + + src/main/resources + true + + application-docker.yaml + + + + + + + + + + + + + diff --git a/codechallenge/src/.DS_Store b/codechallenge/src/.DS_Store new file mode 100644 index 0000000..e017f1c Binary files /dev/null and b/codechallenge/src/.DS_Store differ diff --git a/codechallenge/src/main/.DS_Store b/codechallenge/src/main/.DS_Store new file mode 100644 index 0000000..c2dc739 Binary files /dev/null and b/codechallenge/src/main/.DS_Store differ diff --git a/codechallenge/src/main/java/.DS_Store b/codechallenge/src/main/java/.DS_Store new file mode 100644 index 0000000..f8db1ee Binary files /dev/null and b/codechallenge/src/main/java/.DS_Store differ diff --git a/codechallenge/src/main/java/com/.DS_Store b/codechallenge/src/main/java/com/.DS_Store new file mode 100644 index 0000000..85e445a Binary files /dev/null and b/codechallenge/src/main/java/com/.DS_Store differ diff --git a/codechallenge/src/main/java/com/yape/.DS_Store b/codechallenge/src/main/java/com/yape/.DS_Store new file mode 100644 index 0000000..8941aef Binary files /dev/null and b/codechallenge/src/main/java/com/yape/.DS_Store differ diff --git a/codechallenge/src/main/java/com/yape/codechallenge/.DS_Store b/codechallenge/src/main/java/com/yape/codechallenge/.DS_Store new file mode 100644 index 0000000..5e25c81 Binary files /dev/null and b/codechallenge/src/main/java/com/yape/codechallenge/.DS_Store differ diff --git a/codechallenge/src/main/java/com/yape/codechallenge/CodechallengeApplication.java b/codechallenge/src/main/java/com/yape/codechallenge/CodechallengeApplication.java new file mode 100644 index 0000000..7722fb2 --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/CodechallengeApplication.java @@ -0,0 +1,13 @@ +package com.yape.codechallenge; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CodechallengeApplication { + + public static void main(String[] args) { + SpringApplication.run(CodechallengeApplication.class, args); + } + +} diff --git a/codechallenge/src/main/java/com/yape/codechallenge/controller/TransactionController.java b/codechallenge/src/main/java/com/yape/codechallenge/controller/TransactionController.java new file mode 100644 index 0000000..af4e560 --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/controller/TransactionController.java @@ -0,0 +1,44 @@ +package com.yape.codechallenge.controller; + + +import java.util.List; +import java.util.UUID; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.yape.codechallenge.dto.TransactionResponseDto; +import com.yape.codechallenge.model.Transaction; +import com.yape.codechallenge.service.TransactionService; + +@RestController +@RequestMapping("/transactions") +public class TransactionController { + + private final TransactionService transactionService; + + public TransactionController(TransactionService transactionService) { + this.transactionService = transactionService; + } + + @PostMapping + public TransactionResponseDto createTransaction(@RequestBody Transaction transaction) { + + return transactionService.createTransaction(transaction); + } + + @GetMapping("/{id}") + public Transaction getTransaction(@PathVariable UUID id) { + return transactionService.getTransaction(id); + } + + @GetMapping + public List getAllTransactions() { + return transactionService.getAllTransactions(); + } + +} diff --git a/codechallenge/src/main/java/com/yape/codechallenge/dto/TransactionResponseDto.java b/codechallenge/src/main/java/com/yape/codechallenge/dto/TransactionResponseDto.java new file mode 100644 index 0000000..c9596dc --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/dto/TransactionResponseDto.java @@ -0,0 +1,37 @@ +package com.yape.codechallenge.dto; + +import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; + +import lombok.Builder; +import lombok.Data; + +@Data +@Builder +public class TransactionResponseDto implements Serializable { + + private static final long serialVersionUID = 1L; + + private String transactionExternalId; + + private Description transactionType; + + private Description transactionStatus; + + private String value; + + private String createdAt; + + @Data + @Builder + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonIgnoreProperties(ignoreUnknown = true) + public static class Description implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name; + } +} diff --git a/codechallenge/src/main/java/com/yape/codechallenge/model/Transaction.java b/codechallenge/src/main/java/com/yape/codechallenge/model/Transaction.java new file mode 100644 index 0000000..752d8c2 --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/model/Transaction.java @@ -0,0 +1,46 @@ +package com.yape.codechallenge.model; + +import java.util.UUID; +import java.math.BigDecimal; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@Entity +@ToString +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "transaccion") +public class Transaction { + + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private UUID id; + + @Column(name = "account_external_id_debit") + private UUID accountExternalIdDebit; + @Column(name = "account_external_id_credit") + private UUID accountExternalIdCredit; + @Column(name = "transfer_type_id") + private int transferTypeId; + @Column(name = "value") + private BigDecimal value; + @Column(name = "transaction_status") + private String transactionStatus; + @Column(name = "transaction_type") + private String transactionType; + @Column(name = "created_at") + private String createdAt; +} diff --git a/codechallenge/src/main/java/com/yape/codechallenge/repository/TransactionRepository.java b/codechallenge/src/main/java/com/yape/codechallenge/repository/TransactionRepository.java new file mode 100644 index 0000000..87ceffd --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/repository/TransactionRepository.java @@ -0,0 +1,10 @@ +package com.yape.codechallenge.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.yape.codechallenge.model.Transaction; +import java.util.UUID; + +public interface TransactionRepository extends JpaRepository{ + +} diff --git a/codechallenge/src/main/java/com/yape/codechallenge/service/TransactionService.java b/codechallenge/src/main/java/com/yape/codechallenge/service/TransactionService.java new file mode 100644 index 0000000..cd238c7 --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/service/TransactionService.java @@ -0,0 +1,16 @@ +package com.yape.codechallenge.service; + +import java.util.UUID; +import java.util.List; + +import com.yape.codechallenge.dto.TransactionResponseDto; +import com.yape.codechallenge.model.Transaction; + +public interface TransactionService { + + TransactionResponseDto createTransaction(Transaction transaction); + + Transaction getTransaction(UUID id); + + List getAllTransactions(); +} diff --git a/codechallenge/src/main/java/com/yape/codechallenge/service/TransactionServiceImpl.java b/codechallenge/src/main/java/com/yape/codechallenge/service/TransactionServiceImpl.java new file mode 100644 index 0000000..7007a7b --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/service/TransactionServiceImpl.java @@ -0,0 +1,55 @@ +package com.yape.codechallenge.service; + +import java.util.List; +import java.util.UUID; + +import org.springframework.stereotype.Service; + +import com.yape.codechallenge.dto.TransactionResponseDto; +import com.yape.codechallenge.model.Transaction; +import com.yape.codechallenge.repository.TransactionRepository; +import com.yape.codechallenge.service.kafka.ProducerService; +import com.yape.codechallenge.service.util.UtilService; + +@Service +public class TransactionServiceImpl implements TransactionService { + + private final TransactionRepository transactionRepository; + private final ProducerService producerService; + private final UtilService utilService; + + public TransactionServiceImpl(TransactionRepository transactionRepository, ProducerService producerService, + UtilService utilService) { + this.transactionRepository = transactionRepository; + this.producerService = producerService; + this.utilService = utilService; + } + + @Override + public TransactionResponseDto createTransaction(Transaction transaction) { + + transaction.setTransactionStatus("pending"); + transaction.setCreatedAt(utilService.getOffsetDateTime()); + transaction.setTransactionType("1"); + var savedTransaction = transactionRepository.save(transaction); + producerService.sendTransaction(savedTransaction); + return TransactionResponseDto.builder().transactionExternalId(savedTransaction.getId().toString()) + .transactionType(TransactionResponseDto.Description.builder() + .name(savedTransaction.getTransactionType()).build()) + .transactionStatus(TransactionResponseDto.Description.builder() + .name(savedTransaction.getTransactionStatus()).build()) + .value(savedTransaction.getValue().toString()).createdAt(savedTransaction.getCreatedAt()).build(); + + } + + @Override + public Transaction getTransaction(UUID id) { + return transactionRepository.findById(id).orElse(null); + } + + @Override + public List getAllTransactions() { + return transactionRepository.findAll(); + } + +} diff --git a/codechallenge/src/main/java/com/yape/codechallenge/service/kafka/AntiFraudService.java b/codechallenge/src/main/java/com/yape/codechallenge/service/kafka/AntiFraudService.java new file mode 100644 index 0000000..c68264d --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/service/kafka/AntiFraudService.java @@ -0,0 +1,37 @@ +package com.yape.codechallenge.service.kafka; + +import java.math.BigDecimal; +import org.springframework.kafka.annotation.KafkaListener; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.stereotype.Service; + +import com.yape.codechallenge.model.Transaction; + +import lombok.extern.log4j.Log4j2; + +@Service +@Log4j2 +public class AntiFraudService { + + private static final String VALIDATION_TOPIC = "transaction_validated"; + + + private final KafkaTemplate kafkaTemplate; + + public AntiFraudService(KafkaTemplate kafkaTemplate + ) { + this.kafkaTemplate = kafkaTemplate; + } + + @KafkaListener(topics = "transaction_created", groupId = "transaction-group") + public void validateTransaction(Transaction transaction) { + if (transaction.getValue().compareTo(BigDecimal.valueOf(1000)) > 0) { + transaction.setTransactionStatus("rejected"); + } else { + transaction.setTransactionStatus("approved"); + } + kafkaTemplate.send(VALIDATION_TOPIC, transaction); + log.info("Transaction validated {} And Topic {}", transaction, VALIDATION_TOPIC); + } + +} diff --git a/codechallenge/src/main/java/com/yape/codechallenge/service/kafka/ConsumerService.java b/codechallenge/src/main/java/com/yape/codechallenge/service/kafka/ConsumerService.java new file mode 100644 index 0000000..2a70f04 --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/service/kafka/ConsumerService.java @@ -0,0 +1,29 @@ +package com.yape.codechallenge.service.kafka; + +import org.springframework.kafka.annotation.KafkaListener; +import org.springframework.stereotype.Service; + +import com.yape.codechallenge.model.Transaction; +import com.yape.codechallenge.repository.TransactionRepository; + +import lombok.extern.log4j.Log4j2; + +@Service +@Log4j2 +public class ConsumerService { + + private final TransactionRepository transactionRepository; + + public ConsumerService(TransactionRepository transactionRepository) { + this.transactionRepository = transactionRepository; + } + + @KafkaListener(topics = "transaction_validated", groupId = "transaction-group") + public void updateTransactionStatus(Transaction transaction) { + Transaction existingTransaction = transactionRepository.findById(transaction.getId()) + .orElseThrow(() -> new RuntimeException("Transaction not found")); + existingTransaction.setTransactionStatus(transaction.getTransactionStatus()); + transactionRepository.save(existingTransaction); + log.info("Transaction status updated: {}", existingTransaction); + } +} diff --git a/codechallenge/src/main/java/com/yape/codechallenge/service/kafka/ProducerService.java b/codechallenge/src/main/java/com/yape/codechallenge/service/kafka/ProducerService.java new file mode 100644 index 0000000..ebcc24c --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/service/kafka/ProducerService.java @@ -0,0 +1,26 @@ +package com.yape.codechallenge.service.kafka; + +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.stereotype.Service; + +import com.yape.codechallenge.model.Transaction; + +import lombok.extern.log4j.Log4j2; + +@Service +@Log4j2 +public class ProducerService { + + private static final String TOPIC = "transaction_created"; + + private final KafkaTemplate kafkaTemplate; + + public ProducerService(KafkaTemplate kafkaTemplate) { + this.kafkaTemplate = kafkaTemplate; + } + + public void sendTransaction(Transaction transaction) { + kafkaTemplate.send(TOPIC, transaction); + log.info("Publishing transaction to Kafka: {}", transaction); + } +} diff --git a/codechallenge/src/main/java/com/yape/codechallenge/service/util/UtilService.java b/codechallenge/src/main/java/com/yape/codechallenge/service/util/UtilService.java new file mode 100644 index 0000000..abf4613 --- /dev/null +++ b/codechallenge/src/main/java/com/yape/codechallenge/service/util/UtilService.java @@ -0,0 +1,28 @@ +package com.yape.codechallenge.service.util; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.util.Date; + +import org.springframework.stereotype.Service; + +@Service +public class UtilService { + + public String getSystemCreationDate() { + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm:ss.SS"); + return now.format(formatter); + } + + public String getOffsetDateTime() { + Date date = new Date(); + Instant instant = date.toInstant(); + ZoneOffset zoneOffset = ZoneOffset.of("-05:00"); // Zona horaria de Lima + var dateCreate = instant.atOffset(zoneOffset); + return dateCreate.toString(); + } + +} diff --git a/codechallenge/src/main/resources/application-docker.yaml b/codechallenge/src/main/resources/application-docker.yaml new file mode 100644 index 0000000..1a43668 --- /dev/null +++ b/codechallenge/src/main/resources/application-docker.yaml @@ -0,0 +1,50 @@ +spring: + kafka: + consumer: + group-id: transaction-group + auto-offset-reset: earliest + key-deserializer: org.apache.kafka.common.serialization.StringDeserializer + value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer + properties: + spring: + json: + trusted: + packages: "*" + producer: + key-serializer: org.apache.kafka.common.serialization.StringSerializer + value-serializer: org.springframework.kafka.support.serializer.JsonSerializer + bootstrap-servers: kafka:29092 + application: + name: codechallenge + datasource: + url: jdbc:mysql://db:3306/core_challenge?useSSL=false&serverTimezone=America/Lima&allowPublicKeyRetrieval=true&characterEncoding=utf8 + username: user + password: password + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + minimum-idle: 5 + maximum-pool-size: 20 + idle-timeout: 30000 + pool-name: PoolNameSpringBootHikariCP-${random.value} + max-lifetime: 60000 + connection-timeout: 30000 + + jpa: + hibernate: + ddl-auto: update + show-sql: 'true' + database-platform: org.hibernate.dialect.MySQL8Dialect + h2: + console: + enabled: 'true' +logging: + pattern: + dateformat: hh:mm + file: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %level %class.%method - %msg%n" + level: + '[org.hibernate.type.descriptor.sql.BasicBinder]': TRACE + '[com.zaxxer.hikari.HikariConfig]': DEBUG + file: + name: ./logs/logfile.log +server: + port: "8092" diff --git a/codechallenge/src/main/resources/application.yaml b/codechallenge/src/main/resources/application.yaml new file mode 100644 index 0000000..9af5e1c --- /dev/null +++ b/codechallenge/src/main/resources/application.yaml @@ -0,0 +1,52 @@ +spring: + kafka: + consumer: + group-id: transaction-group + auto-offset-reset: earliest + key-deserializer: org.apache.kafka.common.serialization.StringDeserializer + value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer + properties: + spring: + json: + trusted: + packages: "*" + producer: + key-serializer: org.apache.kafka.common.serialization.StringSerializer + value-serializer: org.springframework.kafka.support.serializer.JsonSerializer + properties: + retention.ms: 60000 + bootstrap-servers: localhost:9092 + application: + name: codechallenge + datasource: + url: jdbc:mysql://localhost:33061/core_challenge?useSSL=false&serverTimezone=America/Lima&allowPublicKeyRetrieval=true&characterEncoding=utf8 + username: root + password: root + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + minimum-idle: 5 + maximum-pool-size: 20 + idle-timeout: 30000 + pool-name: PoolNameSpringBootHikariCP-${random.value} + max-lifetime: 60000 + connection-timeout: 30000 + + jpa: + hibernate: + ddl-auto: update + show-sql: "true" + database-platform: org.hibernate.dialect.MySQL8Dialect + h2: + console: + enabled: "true" +server: + port: "8091" +logging: + pattern: + dateformat: hh:mm + file: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %level %class.%method - %msg%n" + level: + "[org.hibernate.type.descriptor.sql.BasicBinder]": TRACE + "[com.zaxxer.hikari.HikariConfig]": DEBUG + file: + name: ./logs/logfile.log diff --git a/codechallenge/src/main/resources/logback-spring.xml b/codechallenge/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..a92aedd --- /dev/null +++ b/codechallenge/src/main/resources/logback-spring.xml @@ -0,0 +1,25 @@ + + + + + + + + + ${LOG_FILE} + + + ${FILE_LOG_PATTERN} + + + + ${LOG_FILE}.%d{yyyy-MM-dd}.gz + + 30 + + + + + + + \ No newline at end of file diff --git a/codechallenge/src/test/java/com/yape/codechallenge/CodechallengeApplicationTests.java b/codechallenge/src/test/java/com/yape/codechallenge/CodechallengeApplicationTests.java new file mode 100644 index 0000000..3a13eb5 --- /dev/null +++ b/codechallenge/src/test/java/com/yape/codechallenge/CodechallengeApplicationTests.java @@ -0,0 +1,13 @@ +package com.yape.codechallenge; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CodechallengeApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/docker-compose.yml b/docker-compose.yml index 6e9a9c5..d8e5b77 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,12 @@ version: "3.7" + +volumes: + mysql-data-busness: + driver: local +networks: + mysql-networks-busness: + driver: bridge + services: postgres: image: postgres:14 @@ -7,10 +15,14 @@ services: environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=postgres + networks: + - mysql-networks-busness zookeeper: image: confluentinc/cp-zookeeper:5.5.3 environment: ZOOKEEPER_CLIENT_PORT: 2181 + networks: + - mysql-networks-busness kafka: image: confluentinc/cp-enterprise-kafka:5.5.3 depends_on: [zookeeper] @@ -22,4 +34,40 @@ services: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 KAFKA_JMX_PORT: 9991 ports: - - 9092:9092 \ No newline at end of file + - 9092:9092 + networks: + - mysql-networks-busness + db: + build: . + image: mysql:8.2.0 + #Solo para algunas imagenes y arquitecturas especificas de procesador (MacOs - M2) + platform: linux/amd64 + container_name: mysql-busness-challenge + restart: always + ports: + - "33061:3306" + volumes: + - mysql-data-busness:/var/lib/mysql:delegated + environment: + - MYSQL_DATABASE=core_challenge + - MYSQL_USER=user + - MYSQL_PASSWORD=password + - MYSQL_ROOT_PASSWORD=root + networks: + - mysql-networks-busness + myapp-challenge: + build: + context: . + dockerfile: ./codechallenge/DockerFile + container_name: myapp-challenge + environment: + - SPRING_PROFILES_ACTIVE=docker + restart: always + ports: + - "8092:8092" + image: myapp-challenge:v1.0.0 + networks: + - mysql-networks-busness + depends_on: + - db + - kafka \ No newline at end of file