diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /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 + +### 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/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..bf82ff0 Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..ca5ab4b --- /dev/null +++ b/.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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/docker-compose.yml b/docker-compose.yml index a59bedf..31b7b95 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,9 @@ services: environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=postgres + - POSTGRES_DB=challenge_app + volumes: + - ./init.sql:/docker-entrypoint-initdb.d/init.sql zookeeper: image: confluentinc/cp-zookeeper:5.5.3 environment: @@ -23,6 +26,13 @@ services: KAFKA_JMX_PORT: 9991 ports: - 9092:9092 + redis: + container_name: redis + image: redis:7.0.5-alpine + ports: + - "6379:6379" + command: [ "redis-server", "--requirepass", "REDISPSWD" ] volumes: oracle-data: oracle-backup: + diff --git a/init.sql b/init.sql new file mode 100644 index 0000000..65d2e26 --- /dev/null +++ b/init.sql @@ -0,0 +1 @@ +CREATE DATABASE challenge_app; \ No newline at end of file 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/pom.xml b/pom.xml new file mode 100644 index 0000000..a35ada2 --- /dev/null +++ b/pom.xml @@ -0,0 +1,109 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.4 + + + com.challenge.transaction + challenge + 0.0.1-SNAPSHOT + challenge + challenge for Spring Boot + + 11 + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-validation + + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.mapstruct + mapstruct + 1.5.2.Final + + + + org.springframework.data + spring-data-redis + 2.7.3 + + + redis.clients + jedis + 3.9.0 + + + org.springframework.kafka + spring-kafka + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 11 + 11 + + + org.projectlombok + lombok + 1.18.24 + + + org.mapstruct + mapstruct-processor + 1.4.1.Final + + + + + + + + diff --git a/src/main/java/com/challenge/transaction/ChallengeAplication.java b/src/main/java/com/challenge/transaction/ChallengeAplication.java new file mode 100644 index 0000000..31de7b8 --- /dev/null +++ b/src/main/java/com/challenge/transaction/ChallengeAplication.java @@ -0,0 +1,12 @@ +package com.challenge.transaction; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ChallengeAplication { + + public static void main(String[] args) { + SpringApplication.run(ChallengeAplication.class, args); + } +} diff --git a/src/main/java/com/challenge/transaction/cache/NameSpaceCacheConstant.java b/src/main/java/com/challenge/transaction/cache/NameSpaceCacheConstant.java new file mode 100644 index 0000000..de72231 --- /dev/null +++ b/src/main/java/com/challenge/transaction/cache/NameSpaceCacheConstant.java @@ -0,0 +1,7 @@ +package com.challenge.transaction.cache; + +public class NameSpaceCacheConstant { + + public static final String GENERAL_NAME_CACHE = "challenge:ibk:"; + public static final String TRANSACTION_OPERATION = "transaction:operation"; +} diff --git a/src/main/java/com/challenge/transaction/cache/TransactionCache.java b/src/main/java/com/challenge/transaction/cache/TransactionCache.java new file mode 100644 index 0000000..f95bacf --- /dev/null +++ b/src/main/java/com/challenge/transaction/cache/TransactionCache.java @@ -0,0 +1,12 @@ +package com.challenge.transaction.cache; + +import com.challenge.transaction.model.Transaction; +import com.challenge.transaction.repository.TransactionRepository; +import com.challenge.transaction.repository.converter.TransactionMapper; + +public interface TransactionCache { + + Transaction getTransaction(Integer transactionId); + + void deleteTransactionCache(Integer transactionExternalId); +} diff --git a/src/main/java/com/challenge/transaction/cache/impl/RedisTransactionCacheImpl.java b/src/main/java/com/challenge/transaction/cache/impl/RedisTransactionCacheImpl.java new file mode 100644 index 0000000..b430afe --- /dev/null +++ b/src/main/java/com/challenge/transaction/cache/impl/RedisTransactionCacheImpl.java @@ -0,0 +1,32 @@ +package com.challenge.transaction.cache.impl; + +import com.challenge.transaction.cache.NameSpaceCacheConstant; +import com.challenge.transaction.cache.TransactionCache; +import com.challenge.transaction.model.Transaction; +import com.challenge.transaction.repository.TransactionRepository; +import com.challenge.transaction.repository.converter.TransactionMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class RedisTransactionCacheImpl implements TransactionCache { + + private final TransactionRepository transactionRepository; + private final TransactionMapper transactionMapper; + + @Override + @Cacheable(cacheNames = NameSpaceCacheConstant.TRANSACTION_OPERATION, key = "#transactionId") + public Transaction getTransaction(Integer transactionId) { + return transactionRepository + .findById(transactionId) + .map(transactionMapper::toModelFromEntity) + .orElseThrow(() -> new RuntimeException("Transaction Not found")); + } + + @Override + @CacheEvict(value = NameSpaceCacheConstant.TRANSACTION_OPERATION, key = "#transactionExternalId") + public void deleteTransactionCache(Integer transactionExternalId) {} +} diff --git a/src/main/java/com/challenge/transaction/config/KafkaConfig.java b/src/main/java/com/challenge/transaction/config/KafkaConfig.java new file mode 100644 index 0000000..17a18de --- /dev/null +++ b/src/main/java/com/challenge/transaction/config/KafkaConfig.java @@ -0,0 +1,108 @@ +package com.challenge.transaction.config; + +import java.util.HashMap; +import java.util.Map; +import org.apache.kafka.clients.CommonClientConfigs; +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.config.SaslConfigs; +import org.apache.kafka.common.security.scram.ScramLoginModule; +import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.serialization.StringSerializer; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; +import org.springframework.kafka.core.ConsumerFactory; +import org.springframework.kafka.core.DefaultKafkaConsumerFactory; +import org.springframework.kafka.core.DefaultKafkaProducerFactory; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.kafka.core.ProducerFactory; +import org.springframework.kafka.listener.DefaultErrorHandler; +import org.springframework.kafka.support.serializer.JsonDeserializer; +import org.springframework.kafka.support.serializer.JsonSerializer; +import org.springframework.util.backoff.FixedBackOff; + +@Configuration +public class KafkaConfig { + + private static final String DEFAULT_OFFSET_RESET = "earliest"; + + @Value(value = "${kafka.bootstrap-servers}") + private String bootstrapAddress; + + @Value("${kafka.group-id}") + private String groupId; + + @Value(value = "${kafka.retry-interval}") + private Long retryInterval; + + @Value(value = "${kafka.retry-attempts}") + private Long retryAttempts; + + @Bean + public ProducerFactory producerFactory() { + Map configProps = new HashMap<>(); + configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress); + configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class); + configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, JsonSerializer.class); + return new DefaultKafkaProducerFactory<>(configProps); + } + + @Bean + public KafkaTemplate kafkaTemplate() { + return new KafkaTemplate<>(producerFactory()); + } + + @Bean + public ConsumerFactory consumerFactory() { + Map config = new HashMap<>(); + config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress); + config.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + config.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, JsonDeserializer.class); + config.put(ConsumerConfig.GROUP_ID_CONFIG, groupId); + config.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, DEFAULT_OFFSET_RESET); + config.put( + JsonDeserializer.VALUE_DEFAULT_TYPE, + "com.challenge.transaction.consumer.dto.TransactionDTO"); + config.put(JsonDeserializer.USE_TYPE_INFO_HEADERS, false); + + return new DefaultKafkaConsumerFactory<>(config); + } + + @Bean + public ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory() { + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); + factory.setConsumerFactory(consumerFactory()); + factory.setCommonErrorHandler( + new DefaultErrorHandler(new FixedBackOff(retryInterval, retryAttempts))); + return factory; + } + + public ConsumerFactory transactionsStateConsumerFactory() { + Map config = new HashMap<>(); + config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress); + config.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + config.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, JsonDeserializer.class); + config.put(ConsumerConfig.GROUP_ID_CONFIG, groupId); + config.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, DEFAULT_OFFSET_RESET); + config.put( + JsonDeserializer.VALUE_DEFAULT_TYPE, + "com.challenge.transaction.consumer.dto.TransactionStateDTO"); + config.put(JsonDeserializer.USE_TYPE_INFO_HEADERS, false); + + return new DefaultKafkaConsumerFactory<>(config); + } + + @Bean + public ConcurrentKafkaListenerContainerFactory + transactionsStateListenerContainerFactory() { + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); + factory.setConsumerFactory(transactionsStateConsumerFactory()); + factory.setCommonErrorHandler( + new DefaultErrorHandler(new FixedBackOff(retryInterval, retryAttempts))); + return factory; + } +} diff --git a/src/main/java/com/challenge/transaction/config/RedisConfig.java b/src/main/java/com/challenge/transaction/config/RedisConfig.java new file mode 100644 index 0000000..f2c10e6 --- /dev/null +++ b/src/main/java/com/challenge/transaction/config/RedisConfig.java @@ -0,0 +1,69 @@ +package com.challenge.transaction.config; + +import com.challenge.transaction.cache.NameSpaceCacheConstant; +import com.challenge.transaction.model.Transaction; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import java.time.Duration; +import java.util.Arrays; +import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.cache.RedisCacheManagerBuilderCustomizer; +import org.springframework.boot.autoconfigure.data.redis.RedisProperties; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.cache.RedisCacheConfiguration; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.convert.RedisCustomConversions; +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializationContext; +import org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@Configuration +@EnableCaching +public class RedisConfig { + + private final Logger logger = LoggerFactory.getLogger(RedisConfig.class); + + @Bean + public JedisConnectionFactory jedisConnectionFactory() { + RedisProperties properties = redisProperties(); + RedisStandaloneConfiguration config = + new RedisStandaloneConfiguration(properties.getHost(), properties.getPort()); + + config.setDatabase(properties.getDatabase()); + config.setPassword(properties.getPassword()); + + logger.info( + String.format( + "Spring Redis connection properties. Host: %s, Port:%s", + properties.getHost(), properties.getPort())); + + return new JedisConnectionFactory(config); + } + + @Bean + public RedisProperties redisProperties() { + return new RedisProperties(); + } + + @Bean + public RedisCacheManagerBuilderCustomizer redisCacheManagerBuilderCustomizer() { + RedisCacheConfiguration rcc = + RedisCacheConfiguration.defaultCacheConfig() + .serializeValuesWith( + SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer())) + .prefixCacheNameWith(NameSpaceCacheConstant.GENERAL_NAME_CACHE); + + return (builder) -> + builder.withCacheConfiguration( + NameSpaceCacheConstant.TRANSACTION_OPERATION, rcc.entryTtl(Duration.ofMinutes(10))); + } +} diff --git a/src/main/java/com/challenge/transaction/consumer/AntiFraudConsumer.java b/src/main/java/com/challenge/transaction/consumer/AntiFraudConsumer.java new file mode 100644 index 0000000..caf0104 --- /dev/null +++ b/src/main/java/com/challenge/transaction/consumer/AntiFraudConsumer.java @@ -0,0 +1,25 @@ +package com.challenge.transaction.consumer; + +import com.challenge.transaction.consumer.dto.TransactionDTO; +import com.challenge.transaction.service.impl.AntiFraudService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.kafka.annotation.KafkaListener; +import org.springframework.kafka.support.KafkaHeaders; +import org.springframework.messaging.handler.annotation.Header; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class AntiFraudConsumer { + + private final AntiFraudService antiFraudService; + + @KafkaListener(topics = "${kafka.topic.transactions}", groupId = "${kafka.group-id}") + public void getMessage( + TransactionDTO transactionDTO, @Header(KafkaHeaders.RECEIVED_TOPIC) String topic) { + log.info("Message received from topic {}: {}", topic, transactionDTO); + antiFraudService.evaluateTransaction(transactionDTO); + } +} diff --git a/src/main/java/com/challenge/transaction/consumer/TransactionConsumer.java b/src/main/java/com/challenge/transaction/consumer/TransactionConsumer.java new file mode 100644 index 0000000..3f4a971 --- /dev/null +++ b/src/main/java/com/challenge/transaction/consumer/TransactionConsumer.java @@ -0,0 +1,33 @@ +package com.challenge.transaction.consumer; + +import com.challenge.transaction.consumer.dto.TransactionDTO; +import com.challenge.transaction.consumer.dto.TransactionStateDTO; +import com.challenge.transaction.controller.converter.TransactionResponseMapper; +import com.challenge.transaction.controller.response.TransactionResponse; +import com.challenge.transaction.repository.converter.TransactionMapper; +import com.challenge.transaction.service.ITransactionService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.kafka.annotation.KafkaListener; +import org.springframework.kafka.support.KafkaHeaders; +import org.springframework.messaging.handler.annotation.Header; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class TransactionConsumer { + private final ITransactionService transactionService; + private final TransactionResponseMapper transactionResponseMapper; + + @KafkaListener( + topics = "${kafka.topic.transactions-state}", + groupId = "${kafka.group-id}", + containerFactory = "transactionsStateListenerContainerFactory") + public void getMessage( + TransactionStateDTO transactionStateDTO, @Header(KafkaHeaders.RECEIVED_TOPIC) String topic) { + log.info("Message received from topic {}: {}", topic, transactionStateDTO); + transactionService.updateTransactionState( + transactionResponseMapper.toTransactionFromTransactionStateDTO(transactionStateDTO)); + } +} diff --git a/src/main/java/com/challenge/transaction/consumer/dto/TransactionDTO.java b/src/main/java/com/challenge/transaction/consumer/dto/TransactionDTO.java new file mode 100644 index 0000000..62483f1 --- /dev/null +++ b/src/main/java/com/challenge/transaction/consumer/dto/TransactionDTO.java @@ -0,0 +1,16 @@ +package com.challenge.transaction.consumer.dto; + +import java.math.BigDecimal; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TransactionDTO { + private Integer transactionId; + private BigDecimal value; +} diff --git a/src/main/java/com/challenge/transaction/consumer/dto/TransactionStateDTO.java b/src/main/java/com/challenge/transaction/consumer/dto/TransactionStateDTO.java new file mode 100644 index 0000000..a83e765 --- /dev/null +++ b/src/main/java/com/challenge/transaction/consumer/dto/TransactionStateDTO.java @@ -0,0 +1,19 @@ +package com.challenge.transaction.consumer.dto; + +import java.math.BigDecimal; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.With; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TransactionStateDTO { + private Integer transactionId; + + @With + private Integer transactionStatusId; +} diff --git a/src/main/java/com/challenge/transaction/controller/TransactionController.java b/src/main/java/com/challenge/transaction/controller/TransactionController.java new file mode 100644 index 0000000..fc5cdfb --- /dev/null +++ b/src/main/java/com/challenge/transaction/controller/TransactionController.java @@ -0,0 +1,40 @@ +package com.challenge.transaction.controller; + +import com.challenge.transaction.controller.converter.TransactionResponseMapper; +import com.challenge.transaction.controller.request.TransactionRequest; +import com.challenge.transaction.controller.response.TransactionResponse; +import com.challenge.transaction.service.ITransactionService; +import javax.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +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.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/v1") +@RequiredArgsConstructor +public class TransactionController { + private final ITransactionService transactionService; + private final TransactionResponseMapper transactionResponseMapper; + + @ResponseStatus(HttpStatus.OK) + @GetMapping("/{transactionId}") + public TransactionResponse getTransaction(@PathVariable Integer transactionId) { + return transactionResponseMapper.toTransactionResponseFromTransaction( + transactionService.getTransaction(transactionId)); + } + + @ResponseStatus(HttpStatus.CREATED) + @PostMapping + public TransactionResponse createTransaction( + @Valid @RequestBody TransactionRequest transactionRequest) { + return transactionResponseMapper.toTransactionResponseFromTransaction( + transactionService.createTransaction( + transactionResponseMapper.toTransactionFromTransactionRequest(transactionRequest))); + } +} diff --git a/src/main/java/com/challenge/transaction/controller/converter/TransactionResponseMapper.java b/src/main/java/com/challenge/transaction/controller/converter/TransactionResponseMapper.java new file mode 100644 index 0000000..79ea7af --- /dev/null +++ b/src/main/java/com/challenge/transaction/controller/converter/TransactionResponseMapper.java @@ -0,0 +1,40 @@ +package com.challenge.transaction.controller.converter; + +import com.challenge.transaction.consumer.dto.TransactionStateDTO; +import com.challenge.transaction.controller.request.TransactionRequest; +import com.challenge.transaction.controller.response.TransactionResponse; +import com.challenge.transaction.model.Transaction; +import com.challenge.transaction.repository.entity.TransactionStatusEnum; +import com.challenge.transaction.repository.entity.TransactionTypeEnum; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Named; + +@Mapper(componentModel = "spring") +public interface TransactionResponseMapper { + + @Mapping( + source = "tranferTypeId", + target = "transactionType.name", + qualifiedByName = "mapNameTransactionType") + @Mapping( + source = "transactionStatusId", + target = "transactionStatus.name", + qualifiedByName = "mapNameTransactionStatus") + TransactionResponse toTransactionResponseFromTransaction(Transaction transaction); + + Transaction toTransactionFromTransactionRequest(TransactionRequest transactionRequest); + + @Mapping(source = "transactionId", target = "transactionExternalId") + Transaction toTransactionFromTransactionStateDTO(TransactionStateDTO transactionStateDTO); + + @Named("mapNameTransactionType") + default String mapNameTransactionType(Integer tranferTypeId) { + return TransactionTypeEnum.fromCode(tranferTypeId).getDescription(); + } + + @Named("mapNameTransactionStatus") + default String mapNameTransactionStatus(Integer transactionStatusId) { + return TransactionStatusEnum.fromCode(transactionStatusId).getDescription(); + } +} diff --git a/src/main/java/com/challenge/transaction/controller/request/TransactionRequest.java b/src/main/java/com/challenge/transaction/controller/request/TransactionRequest.java new file mode 100644 index 0000000..9aad8c7 --- /dev/null +++ b/src/main/java/com/challenge/transaction/controller/request/TransactionRequest.java @@ -0,0 +1,20 @@ +package com.challenge.transaction.controller.request; + +import java.math.BigDecimal; +import javax.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Builder +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class TransactionRequest { + private Integer accountExternalIdDebit; + private Integer accountExternalIdCredit; + private Integer tranferTypeId; + + @NotNull private BigDecimal value; +} diff --git a/src/main/java/com/challenge/transaction/controller/response/DetailName.java b/src/main/java/com/challenge/transaction/controller/response/DetailName.java new file mode 100644 index 0000000..5d3636e --- /dev/null +++ b/src/main/java/com/challenge/transaction/controller/response/DetailName.java @@ -0,0 +1,12 @@ +package com.challenge.transaction.controller.response; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Builder; +import lombok.Value; + +@Builder +@Value +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class DetailName { + String name; +} diff --git a/src/main/java/com/challenge/transaction/controller/response/TransactionResponse.java b/src/main/java/com/challenge/transaction/controller/response/TransactionResponse.java new file mode 100644 index 0000000..f583554 --- /dev/null +++ b/src/main/java/com/challenge/transaction/controller/response/TransactionResponse.java @@ -0,0 +1,19 @@ +package com.challenge.transaction.controller.response; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.math.BigDecimal; +import lombok.Builder; +import lombok.Value; + +@Builder +@Value +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class TransactionResponse { + Integer transactionExternalId; + Integer accountExternalIdDebit; + Integer accountExternalIdCredit; + DetailName transactionType; + DetailName transactionStatus; + BigDecimal value; + String createdAt; +} diff --git a/src/main/java/com/challenge/transaction/model/Transaction.java b/src/main/java/com/challenge/transaction/model/Transaction.java new file mode 100644 index 0000000..a26b946 --- /dev/null +++ b/src/main/java/com/challenge/transaction/model/Transaction.java @@ -0,0 +1,21 @@ +package com.challenge.transaction.model; + +import java.math.BigDecimal; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Transaction { + private Integer transactionExternalId; + private Integer accountExternalIdDebit; + private Integer accountExternalIdCredit; + private Integer tranferTypeId; + private Integer transactionStatusId; + private BigDecimal value; + private String createdAt; +} diff --git a/src/main/java/com/challenge/transaction/repository/TransactionRepository.java b/src/main/java/com/challenge/transaction/repository/TransactionRepository.java new file mode 100644 index 0000000..83e8c79 --- /dev/null +++ b/src/main/java/com/challenge/transaction/repository/TransactionRepository.java @@ -0,0 +1,22 @@ +package com.challenge.transaction.repository; + +import com.challenge.transaction.repository.entity.TransactionEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +public interface TransactionRepository extends JpaRepository { + + @Transactional + @Modifying + @Query( + "update TransactionEntity t set t.transactionStatusId = :transactionStatusId " + + "where t.transactionExternalId = :transactionExternalId") + Integer updateTransactionStatusId( + @Param(value = "transactionExternalId") Integer transactionExternalId, + @Param(value = "transactionStatusId") Integer transactionStatusId); +} diff --git a/src/main/java/com/challenge/transaction/repository/converter/TransactionMapper.java b/src/main/java/com/challenge/transaction/repository/converter/TransactionMapper.java new file mode 100644 index 0000000..6fe64a3 --- /dev/null +++ b/src/main/java/com/challenge/transaction/repository/converter/TransactionMapper.java @@ -0,0 +1,12 @@ +package com.challenge.transaction.repository.converter; + +import com.challenge.transaction.model.Transaction; +import com.challenge.transaction.repository.entity.TransactionEntity; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring") +public interface TransactionMapper { + Transaction toModelFromEntity(TransactionEntity transactionEntity); + + TransactionEntity toEntityFromModel(Transaction transaction); +} diff --git a/src/main/java/com/challenge/transaction/repository/entity/TransactionEntity.java b/src/main/java/com/challenge/transaction/repository/entity/TransactionEntity.java new file mode 100644 index 0000000..de85257 --- /dev/null +++ b/src/main/java/com/challenge/transaction/repository/entity/TransactionEntity.java @@ -0,0 +1,54 @@ +package com.challenge.transaction.repository.entity; + +import com.challenge.transaction.util.DateUtils; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.PrePersist; +import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Entity +@Table(name = "transaction") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class TransactionEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer transactionExternalId; + + @Column(name = "account_external_id_debit") + private Integer accountExternalIdDebit; + + @Column(name = "account_external_id_credit") + private Integer accountExternalIdCredit; + + @Column(name = "tranfer_type_id") + private Integer tranferTypeId; + + @Column(name = "value", nullable = false) + private BigDecimal value; + + @Column(name = "created_at", nullable = false) + private LocalDateTime createdAt; + + @Column(name = "transaction_status_id", nullable = false) + private Integer transactionStatusId; + + @PrePersist + private void preInsert() { + this.createdAt = DateUtils.getDateTimeLimaZone(); + this.transactionStatusId = TransactionStatusEnum.PENDING.code; + } +} diff --git a/src/main/java/com/challenge/transaction/repository/entity/TransactionStatusEnum.java b/src/main/java/com/challenge/transaction/repository/entity/TransactionStatusEnum.java new file mode 100644 index 0000000..0ccab12 --- /dev/null +++ b/src/main/java/com/challenge/transaction/repository/entity/TransactionStatusEnum.java @@ -0,0 +1,23 @@ +package com.challenge.transaction.repository.entity; + +import java.util.stream.Stream; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum TransactionStatusEnum { + PENDING(0, "Pending"), + APPROVED(1, "Approved"), + REJECTED(2, "Rejected"); + + final Integer code; + final String description; + + public static TransactionStatusEnum fromCode(Integer code) { + return Stream.of(TransactionStatusEnum.values()) + .filter(eventType -> eventType.getCode().equals(code)) + .findFirst() + .orElseThrow(() -> new RuntimeException("Not Found TransactionStatus: " + code)); + } +} diff --git a/src/main/java/com/challenge/transaction/repository/entity/TransactionTypeEnum.java b/src/main/java/com/challenge/transaction/repository/entity/TransactionTypeEnum.java new file mode 100644 index 0000000..25fe999 --- /dev/null +++ b/src/main/java/com/challenge/transaction/repository/entity/TransactionTypeEnum.java @@ -0,0 +1,22 @@ +package com.challenge.transaction.repository.entity; + +import java.util.stream.Stream; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum TransactionTypeEnum { + DEPOSIT(0, "Deposit"), + WITHDRAWAL(1, "Withdrawal"); + + final Integer code; + final String description; + + public static TransactionTypeEnum fromCode(Integer code) { + return Stream.of(TransactionTypeEnum.values()) + .filter(eventType -> eventType.getCode().equals(code)) + .findFirst() + .orElseThrow(() -> new RuntimeException("Not Found TransactionType: " + code)); + } +} diff --git a/src/main/java/com/challenge/transaction/service/IAntiFraudService.java b/src/main/java/com/challenge/transaction/service/IAntiFraudService.java new file mode 100644 index 0000000..8974f97 --- /dev/null +++ b/src/main/java/com/challenge/transaction/service/IAntiFraudService.java @@ -0,0 +1,8 @@ +package com.challenge.transaction.service; + +import com.challenge.transaction.consumer.dto.TransactionDTO; + +public interface IAntiFraudService { + + void evaluateTransaction(TransactionDTO transactionDTO); +} diff --git a/src/main/java/com/challenge/transaction/service/ITransactionService.java b/src/main/java/com/challenge/transaction/service/ITransactionService.java new file mode 100644 index 0000000..5ec8849 --- /dev/null +++ b/src/main/java/com/challenge/transaction/service/ITransactionService.java @@ -0,0 +1,11 @@ +package com.challenge.transaction.service; + +import com.challenge.transaction.model.Transaction; + +public interface ITransactionService { + Transaction getTransaction(Integer transactionId); + + Transaction createTransaction(Transaction transaction); + + void updateTransactionState(Transaction transaction); +} diff --git a/src/main/java/com/challenge/transaction/service/impl/AntiFraudService.java b/src/main/java/com/challenge/transaction/service/impl/AntiFraudService.java new file mode 100644 index 0000000..466bc1a --- /dev/null +++ b/src/main/java/com/challenge/transaction/service/impl/AntiFraudService.java @@ -0,0 +1,34 @@ +package com.challenge.transaction.service.impl; + +import com.challenge.transaction.consumer.dto.TransactionDTO; +import com.challenge.transaction.consumer.dto.TransactionStateDTO; +import com.challenge.transaction.service.IAntiFraudService; +import java.math.BigDecimal; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.stereotype.Service; + +@RequiredArgsConstructor +@Service +public class AntiFraudService implements IAntiFraudService { + + @Value("${kafka.topic.transactions-state}") + private String transactionStateTopic; + + private final KafkaTemplate kafkaTemplate; + + @Override + public void evaluateTransaction(TransactionDTO transactionDTO) { + + TransactionStateDTO transactionStateDTO = + TransactionStateDTO.builder() + .transactionId(transactionDTO.getTransactionId()) + .transactionStatusId(1) + .build(); + if (transactionDTO.getValue().compareTo(BigDecimal.valueOf(1000.00)) > 0) { + transactionStateDTO = transactionStateDTO.withTransactionStatusId(2); + } + kafkaTemplate.send(transactionStateTopic, transactionStateDTO); + } +} diff --git a/src/main/java/com/challenge/transaction/service/impl/TransactionService.java b/src/main/java/com/challenge/transaction/service/impl/TransactionService.java new file mode 100644 index 0000000..f58ec68 --- /dev/null +++ b/src/main/java/com/challenge/transaction/service/impl/TransactionService.java @@ -0,0 +1,63 @@ +package com.challenge.transaction.service.impl; + +import com.challenge.transaction.cache.TransactionCache; +import com.challenge.transaction.consumer.dto.TransactionDTO; +import com.challenge.transaction.model.Transaction; +import com.challenge.transaction.repository.TransactionRepository; +import com.challenge.transaction.repository.converter.TransactionMapper; +import com.challenge.transaction.service.ITransactionService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.stereotype.Service; + +@RequiredArgsConstructor +@Service +@Slf4j +public class TransactionService implements ITransactionService { + + private final TransactionCache transactionCache; + private final TransactionRepository transactionRepository; + private final TransactionMapper transactionMapper; + + @Value("${kafka.topic.transactions}") + private String transactionTopic; + + private final KafkaTemplate kafkaTemplate; + + @Override + public Transaction getTransaction(Integer transactionId) { + return transactionCache.getTransaction(transactionId); + } + + @Override + public Transaction createTransaction(Transaction transaction) { + Transaction transactionResult = + transactionMapper.toModelFromEntity( + transactionRepository.save(transactionMapper.toEntityFromModel(transaction))); + + kafkaTemplate.send( + transactionTopic, + TransactionDTO.builder() + .transactionId(transactionResult.getTransactionExternalId()) + .value(transactionResult.getValue()) + .build()); + + return transactionResult; + } + + @Override + public void updateTransactionState(Transaction transaction) { + Integer result = + transactionRepository.updateTransactionStatusId( + transaction.getTransactionExternalId(), transaction.getTransactionStatusId()); + if (result == 0) { + log.error( + "Failed in updateTransactionState with transactionId: {}", + transaction.getTransactionExternalId()); + throw new RuntimeException("Failed to updateTransactionState"); + } + transactionCache.deleteTransactionCache(transaction.getTransactionExternalId()); + } +} diff --git a/src/main/java/com/challenge/transaction/util/DateUtils.java b/src/main/java/com/challenge/transaction/util/DateUtils.java new file mode 100644 index 0000000..79c6713 --- /dev/null +++ b/src/main/java/com/challenge/transaction/util/DateUtils.java @@ -0,0 +1,15 @@ +package com.challenge.transaction.util; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; + +public class DateUtils { + + public static final String AMERICA_LIMA = "America/Lima"; + public static final ZoneId LIMA_TIME_ZONE = ZoneId.of(AMERICA_LIMA); + + public static LocalDateTime getDateTimeLimaZone() { + return LocalDateTime.ofInstant(Instant.now(), LIMA_TIME_ZONE); + } +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..e921b98 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,35 @@ +spring: + application: + name: challenge-transaction + jackson: + serialization: + indent-output: true + datasource: + url: jdbc:postgresql://localhost:5432/challenge_app + username: postgres + password: postgres + driver-class-name: org.postgresql.Driver + + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.PostgreSQLDialect + format_sql: true + hibernate: + ddl-auto: update + show-sql: false + redis: + host: localhost + port: 6379 + timeout: 60000 + database: 0 + password: REDISPSWD + +kafka: + bootstrap-servers: 127.0.0.1:9092 + retry-interval: 10_000 + retry-attempts: 1 + group-id: challenge-groupLocal + topic: + transactions: transactions + transactions-state: transactionsState \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..7233e82 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,8 @@ +spring: + profiles: + active: dev + +server: + port: 9090 + servlet: + context-path: /transactions \ No newline at end of file