diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..549e00a2 --- /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/Dockerfile b/Dockerfile new file mode 100644 index 00000000..dc63dcd3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM bellsoft/liberica-openjdk-alpine-musl:11 +ARG JAR_FILE=/socks-0.0.1-SNAPSHOT.jar +WORKDIR /opt/app +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java","-jar","app.jar"] \ No newline at end of file diff --git a/README_DECRIPTION.md b/README_DECRIPTION.md new file mode 100644 index 00000000..6619c360 --- /dev/null +++ b/README_DECRIPTION.md @@ -0,0 +1,12 @@ +# README # + +Socks Store Project + +### Properties and Tools ### + +* Framework to configure an app - Spring Boot +* Database Server type - PostgreSQL +* Database versioning is implemented by Liquibase +* App and database are deployed in two Docker containers; bind with Docker compose +* Combined containers are deployed on AWS +* Endpoints persistence with Swagger UI is available at: [socks-store](http://ec2-3-145-3-43.us-east-2.compute.amazonaws.com:8090/swagger-ui/#/socks-controller) diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..bcff2315 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,25 @@ +version: '3.1' + +services: + postgres: + image: postgres + ports: + - "5433:5432" + environment: + - POSTGRES_USER=postgres + - POSTGRES_DB=socks_store + - POSTGRES_PASSWORD=password + restart: always + volumes: + - "db-data:/var/lib/postgresql/data" + + app: + build: . + ports: + - "8090:8080" + depends_on: + - postgres + restart: always + +volumes: + db-data: \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100644 index 00000000..a16b5431 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/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 /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="`which 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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$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 \ + -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 00000000..c8d43372 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "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%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..75f4cd5c --- /dev/null +++ b/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.6 + + + com.store + socks + 0.0.1-SNAPSHOT + soks + Demo project for Spring Boot + + 11 + + + + org.springframework.boot + spring-boot-starter-web + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.0 + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.postgresql + postgresql + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + jakarta.validation + jakarta.validation-api + 2.0.2 + + + org.liquibase + liquibase-core + + + io.springfox + springfox-boot-starter + 3.0.0 + + + io.springfox + springfox-swagger-ui + 3.0.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/socks-0.0.1-SNAPSHOT.jar b/socks-0.0.1-SNAPSHOT.jar new file mode 100644 index 00000000..7f12edc0 Binary files /dev/null and b/socks-0.0.1-SNAPSHOT.jar differ diff --git a/src/main/java/com/store/socks/SocksApplication.java b/src/main/java/com/store/socks/SocksApplication.java new file mode 100644 index 00000000..d3746246 --- /dev/null +++ b/src/main/java/com/store/socks/SocksApplication.java @@ -0,0 +1,13 @@ +package com.store.socks; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SocksApplication { + + public static void main(String[] args) { + SpringApplication.run(SocksApplication.class, args); + } + +} diff --git a/src/main/java/com/store/socks/config/SwaggerConfig.java b/src/main/java/com/store/socks/config/SwaggerConfig.java new file mode 100644 index 00000000..a71a62c5 --- /dev/null +++ b/src/main/java/com/store/socks/config/SwaggerConfig.java @@ -0,0 +1,33 @@ +package com.store.socks.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@Configuration +@EnableSwagger2 +public class SwaggerConfig { + @Bean + public Docket api() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("com.store.socks.controller")) + .paths(PathSelectors.any()) + .build(); + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder().title("SocksStore API") + .description("Service for socks registration operations") + .contact(new Contact("Ilona Prisukhina", "", "prisukhinailona@gmail.com")) + .build(); + } +} diff --git a/src/main/java/com/store/socks/controller/SocksController.java b/src/main/java/com/store/socks/controller/SocksController.java new file mode 100644 index 00000000..5295ee2b --- /dev/null +++ b/src/main/java/com/store/socks/controller/SocksController.java @@ -0,0 +1,53 @@ +package com.store.socks.controller; + +import com.store.socks.dto.IncomeOutcomeDtoRequest; +import com.store.socks.service.Operation; +import com.store.socks.service.SocksService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.Optional; + +@Controller +@RequestMapping("/api/socks") +public class SocksController { + @Autowired + private final SocksService socksService; + + public SocksController(SocksService socksService) { + this.socksService = socksService; + } + + @GetMapping + public ResponseEntity getSocksNumberGivenParams(@RequestParam String color, @RequestParam Operation operation, @RequestParam int cottonPart){ + Optional result = socksService.getSocksNumberGivenParams(color, operation, cottonPart); + return new ResponseEntity<>(result.orElse(0), HttpStatus.OK); + } + + @PostMapping("/income") + public ResponseEntity registerSocksIncome(@RequestBody IncomeOutcomeDtoRequest dtoRequest){ + boolean result = socksService.registerSocksIncome(dtoRequest.getColor(), dtoRequest.getCottonPart(), dtoRequest.getQuantity()); + HttpStatus status; + if(result){ + status = HttpStatus.OK; + } else { + status = HttpStatus.BAD_REQUEST; + } + return new ResponseEntity<>(result, status); + } + + @PostMapping("/outcome") + public ResponseEntity registerSocksOutcome(@RequestBody IncomeOutcomeDtoRequest dtoRequest){ + boolean result = socksService.registerSocksOutcome(dtoRequest.getColor(), dtoRequest.getCottonPart(), dtoRequest.getQuantity()); + HttpStatus status; + if(result){ + status = HttpStatus.OK; + } else { + status = HttpStatus.BAD_REQUEST; + } + return new ResponseEntity<>(result, status); + } +} diff --git a/src/main/java/com/store/socks/dto/IncomeOutcomeDtoRequest.java b/src/main/java/com/store/socks/dto/IncomeOutcomeDtoRequest.java new file mode 100644 index 00000000..a9e44e23 --- /dev/null +++ b/src/main/java/com/store/socks/dto/IncomeOutcomeDtoRequest.java @@ -0,0 +1,48 @@ +package com.store.socks.dto; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +public class IncomeOutcomeDtoRequest { + @NotBlank + private String color; + @NotNull + @Min(0) + @Max(100) + private int cottonPart; + @NotNull + @Min(1) + private int quantity; + + public IncomeOutcomeDtoRequest(String color, int cottonPart, int quantity) { + this.color = color; + this.cottonPart = cottonPart; + this.quantity = quantity; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public int getCottonPart() { + return cottonPart; + } + + public void setCottonPart(int cottonPart) { + this.cottonPart = cottonPart; + } + + public int getQuantity() { + return quantity; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } +} diff --git a/src/main/java/com/store/socks/mapper/SocksMapper.java b/src/main/java/com/store/socks/mapper/SocksMapper.java new file mode 100644 index 00000000..55bc4158 --- /dev/null +++ b/src/main/java/com/store/socks/mapper/SocksMapper.java @@ -0,0 +1,39 @@ +package com.store.socks.mapper; + +import com.store.socks.model.Socks; +import org.apache.ibatis.annotations.*; + +import java.util.Optional; + +@Mapper +public interface SocksMapper { + + @Select("SELECT id, color, cotton_part, quantity FROM socks_balance WHERE id = #{id}") + @Results({ + @Result(property = "id", column = "id"), + @Result(property = "color", column = "color"), + @Result(property = "cottonPart", column = "cotton_part"), + @Result(property = "quantity", column = "quantity") + }) + Socks selectSocksById(@Param("id") int id); + + + // @Select("SELECT quantity FROM socks_balance WHERE color = #{color} AND cotton_part = #{cottonPart} LIMIT 1") + // Optional selectSocksByParams(@Param("color") String color, @Param("cottonPart") int cottonPart); + + @Insert("INSERT INTO socks_balance (color, cotton_part, quantity) VALUES (#{color}, #{cottonPart}, #{quantity})") + void insertSocksEntry(@Param("color") String color, @Param("cottonPart") int cottonPart, @Param("quantity") int quantity); + + @Update("UPDATE socks_balance SET quantity = #{quantity} WHERE color = #{color} AND cotton_part = #{cottonPart}") + boolean updateSocksQuantityGivenParams(@Param("color") String color, @Param("cottonPart") int cottonPart, @Param("quantity") int quantity); + + @Select("SELECT SUM (quantity) FROM socks_balance WHERE color = #{color} AND cotton_part > #{cottonPart}") + Optional selectQuantityByParamsMoreThan(@Param("color") String color, @Param("cottonPart") int cottonPart); + + @Select("SELECT SUM (quantity) FROM socks_balance WHERE color = #{color} AND cotton_part < #{cottonPart}") + Optional selectQuantityByParamsLessThan(@Param("color") String color, @Param("cottonPart") int cottonPart); + + @Select("SELECT SUM (quantity) FROM socks_balance WHERE color = #{color} AND cotton_part = #{cottonPart}") + Optional selectQuantityByParamsEqual(@Param("color") String color, @Param("cottonPart") int cottonPart); + +} diff --git a/src/main/java/com/store/socks/model/Socks.java b/src/main/java/com/store/socks/model/Socks.java new file mode 100644 index 00000000..7fa10f89 --- /dev/null +++ b/src/main/java/com/store/socks/model/Socks.java @@ -0,0 +1,47 @@ +package com.store.socks.model; + +public class Socks { + private int id; + private String color; + private int cottonPart; + private int quantity; + + public Socks(int id, String color, int cottonPart, int quantity) { + this.id = id; + this.color = color; + this.cottonPart = cottonPart; + this.quantity = quantity; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public int getCottonPart() { + return cottonPart; + } + + public void setCottonPart(int cottonPart) { + this.cottonPart = cottonPart; + } + + public int getQuantity() { + return quantity; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } +} diff --git a/src/main/java/com/store/socks/service/Operation.java b/src/main/java/com/store/socks/service/Operation.java new file mode 100644 index 00000000..04609e41 --- /dev/null +++ b/src/main/java/com/store/socks/service/Operation.java @@ -0,0 +1,7 @@ +package com.store.socks.service; + +public enum Operation{ + MORE_THAN, + LESS_THAN, + EQUAL +} diff --git a/src/main/java/com/store/socks/service/SocksService.java b/src/main/java/com/store/socks/service/SocksService.java new file mode 100644 index 00000000..eff05a79 --- /dev/null +++ b/src/main/java/com/store/socks/service/SocksService.java @@ -0,0 +1,60 @@ +package com.store.socks.service; + +import com.store.socks.mapper.SocksMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +public class SocksService { + @Autowired + private final SocksMapper socksMapper; + + public SocksService(SocksMapper socksMapper) { + this.socksMapper = socksMapper; + } + + public Optional getSocksNumberGivenParams(String color, Operation operation, int cottonPart) { + Optional quantity; + switch (operation) { + case MORE_THAN: + quantity = socksMapper.selectQuantityByParamsMoreThan(color, cottonPart); + break; + case LESS_THAN: + quantity = socksMapper.selectQuantityByParamsLessThan(color, cottonPart); + break; + case EQUAL: + quantity = socksMapper.selectQuantityByParamsEqual(color, cottonPart); + break; + default: + throw new IllegalStateException("Unexpected value: " + operation); + } + return quantity; + } + + public boolean registerSocksIncome(String color, int cottonPart, int quantity) { + Optional socksQuantity = socksMapper.selectQuantityByParamsEqual(color, cottonPart); + if (socksQuantity.isPresent()) { + int dbQuantity = socksQuantity.get(); + return socksMapper.updateSocksQuantityGivenParams(color, cottonPart, dbQuantity + quantity); + } else { + socksMapper.insertSocksEntry(color, cottonPart, quantity); + return true; + } + } + + public boolean registerSocksOutcome(String color, int cottonPart, int quantity) { + Optional socksQuantity = socksMapper.selectQuantityByParamsEqual(color, cottonPart); + if (socksQuantity.isPresent()) { + int dbQuantity = socksQuantity.get(); + if (quantity > dbQuantity) { + return false; + } else { + return socksMapper.updateSocksQuantityGivenParams(color, cottonPart, dbQuantity - quantity); + } + } else { + return false; + } + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..ba60f598 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,5 @@ +#spring.datasource.url=jdbc:postgresql://localhost:5432/socks_store +spring.datasource.username=postgres +spring.datasource.password=password +spring.datasource.driver-class-name=org.postgresql.Driver +spring.datasource.url=jdbc:postgresql://postgres/socks_store diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml new file mode 100644 index 00000000..7d9f4da9 --- /dev/null +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -0,0 +1,29 @@ +databaseChangeLog: + - changeSet: + id: 1 + author: ilona + changes: + - createTable: + tableName: socks_balance + columns: + - column: + name: id + type: SERIAL + constraints: + primaryKey: true + nullable: false + - column: + name: color + type: VARCHAR (20) + constraints: + nullable: false + - column: + name: cotton_part + type: INT + constraints: + nullable: false + - column: + name: quantity + type: INT + constraints: + nullable: false \ No newline at end of file diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html new file mode 100644 index 00000000..a48e9929 --- /dev/null +++ b/src/main/resources/templates/home.html @@ -0,0 +1,13 @@ + + + + + + + + + + +

Hello, homepage!

+ + diff --git a/src/test/java/com/store/socks/SoksApplicationTests.java b/src/test/java/com/store/socks/SoksApplicationTests.java new file mode 100644 index 00000000..1891f704 --- /dev/null +++ b/src/test/java/com/store/socks/SoksApplicationTests.java @@ -0,0 +1,13 @@ +package com.store.socks; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SoksApplicationTests { + + @Test + void contextLoads() { + } + +}