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/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..a45eb6ba --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed 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. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..2cc7d4a5 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 00000000..a9f1ef87 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/README.md b/README.md index 32f74df9..de8986a5 100644 --- a/README.md +++ b/README.md @@ -1,43 +1,22 @@ -# Тестовое задание для Java стажеров - -Привет! - -Мы ищем стажера, который в перспективе станет Junior Java-разработчиком в нашей команде. -Чтобы понять, что мы подходим друг другу, предлагаем вам написать простое web-приложение. Такое задание поможет нам понять, что вы: - -* можете понимать поставленную задачу; -* умеете находить необходимую техническую информацию для реализации решения; -* просто умеете кодить. - -На задание у вас уйдет ориентировочно один-два вечера. Главное условие — решение должно быть написано с использованием платформы JVM. Библиотеки и фреймворки можно выбирать на свой вкус. - -## Что нужно сделать - -Реализовать приложение для автоматизации учёта носков на складе магазина. Кладовщик должен иметь возможность: +## Склад носков. +Приложение для автоматизации учёта носков на складе магазина. Кладовщик имеет возможность: * учесть приход и отпуск носков; * узнать общее количество носков определенного цвета и состава в данный момент времени. -Внешний интерфейс приложения представлен в виде HTTP API (REST, если хочется). +Приложение основано на Spring Framework, а для версионирования схемы бд используется Liquibase. Порт 9090. ## Список URL HTTP-методов ### POST /api/socks/income Регистрирует приход носков на склад. - Параметры запроса передаются в теле запроса в виде JSON-объекта со следующими атрибутами: * color — цвет носков, строка (например, black, red, yellow); -* cottonPart — процентное содержание хлопка в составе носков, целое число от 0 до 100 (например, 30, 18, 42); +* cottonPart — процентное содержание хлопка в составе носков, целое число от 0 до 100; * quantity — количество пар носков, целое число больше 0. -Результаты: - -* HTTP 200 — удалось добавить приход; -* HTTP 400 — параметры запроса отсутствуют или имеют некорректный формат; -* HTTP 500 — произошла ошибка, не зависящая от вызывающей стороны (например, база данных недоступна). - ### POST /api/socks/outcome Регистрирует отпуск носков со склада. Здесь параметры и результаты аналогичные, но общее количество носков указанного цвета и состава не увеличивается, а уменьшается. @@ -52,7 +31,7 @@ * operation — оператор сравнения значения количества хлопка в составе носков, одно значение из: moreThan, lessThan, equal; * cottonPart — значение процента хлопка в составе носков из сравнения. -Результаты: +### Результаты: * HTTP 200 — запрос выполнен, результат в теле ответа в виде строкового представления целого числа; * HTTP 400 — параметры запроса отсутствуют или имеют некорректный формат; @@ -61,22 +40,5 @@ Примеры запросов: * /api/socks?color=red&operation=moreThan&cottonPart=90 — должен вернуть общее количество красных носков с долей хлопка более 90%; -* /api/socks?color=black&operation=lessThan?cottonPart=10 — должен вернуть общее количество черных носков с долей хлопка менее 10%. - -Для хранения данных системы можно использовать любую реляционную базу данных. Схему БД желательно хранить в репозитории в любом удобном виде. - -## Как это сделать - -Мы ждем, что решение будет: - -* написано на языке Java; -* standalone - состоять из одного выполняемого компонента верхнего уровня; -* headless - без UI; -* оформлено как форк к репозитарию и создан пул реквест. - -Будет плюсом, если: +* /api/socks?color=black&operation=equal&cottonPart=10 — должен вернуть общее количество черных носков с долей хлопка 10%. -* приложение будет основано на Spring(Boot) Framework; -* для версионирования схемы базы данных будет использоваться Liquibase или Flyway; -* база данных будет подниматься рядом с приложением в докер-контейнере; -* приложение будет развернуто на любом облачном сервисе, например Heroku, и его API будет доступно для вызова. 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..294f805b --- /dev/null +++ b/pom.xml @@ -0,0 +1,75 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.6 + + + ru + raiff + 0.0.1-SNAPSHOT + raiff + raiff + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.springframework.boot + spring-boot-starter-validation + + + org.liquibase + liquibase-core + 4.6.2 + + + org.projectlombok + lombok + ${lombok.version} + provided + + + com.h2database + h2 + runtime + + + org.testcontainers + junit-jupiter + 1.16.2 + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/ru/testJava/TestJavaApp.java b/src/main/java/ru/testJava/TestJavaApp.java new file mode 100644 index 00000000..a534e087 --- /dev/null +++ b/src/main/java/ru/testJava/TestJavaApp.java @@ -0,0 +1,13 @@ +package ru.testJava; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TestJavaApp { + + public static void main(String[] args) { + SpringApplication.run(TestJavaApp.class, args); + } + +} diff --git a/src/main/java/ru/testJava/controller/SocksController.java b/src/main/java/ru/testJava/controller/SocksController.java new file mode 100644 index 00000000..da8902ce --- /dev/null +++ b/src/main/java/ru/testJava/controller/SocksController.java @@ -0,0 +1,46 @@ +package ru.testJava.controller; + + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import ru.testJava.dto.SocksDto; +import ru.testJava.exception.OutcomeImpossibleException; +import ru.testJava.service.SocksService; + +import javax.validation.Valid; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + +@Validated +@RestController +@RequestMapping("api/socks") +public class SocksController { + + private final SocksService service; + + public SocksController(SocksService service) { + this.service = service; + } + + @GetMapping + public ResponseEntity getAllSocks(@RequestParam @NotBlank String color, @RequestParam @NotBlank String operation, + @RequestParam @Min(0) @Max(100) int cottonPart) { + int quantity = service.getAll(color, operation, cottonPart); + return new ResponseEntity<>(Integer.toString(quantity), HttpStatus.OK); + } + + @PostMapping(value = "income") + public ResponseEntity income(@Valid @RequestBody SocksDto socks) { + service.income(socks); + return new ResponseEntity<>("Income: " + socks, HttpStatus.OK); + } + + @PostMapping(value = "outcome") + public ResponseEntity outcome(@Valid @RequestBody SocksDto socks) throws OutcomeImpossibleException { + service.outcome(socks); + return new ResponseEntity<>("Outcome: " + socks, HttpStatus.OK); + } +} diff --git a/src/main/java/ru/testJava/dto/SocksDto.java b/src/main/java/ru/testJava/dto/SocksDto.java new file mode 100644 index 00000000..7c4f773d --- /dev/null +++ b/src/main/java/ru/testJava/dto/SocksDto.java @@ -0,0 +1,31 @@ +package ru.testJava.dto; + + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + +@Setter +@Getter +@AllArgsConstructor +public class SocksDto { + @NotBlank + private String color; + @Min(value = 1) + @Max(value = 100) + private int cottonPart; + @Min(2) + private int quantity; + + + @Override + public String toString() { + return "Socks - color: " + color + + ", cottonPart: " + cottonPart + + ", quantity: " + quantity; + } +} diff --git a/src/main/java/ru/testJava/entity/Socks.java b/src/main/java/ru/testJava/entity/Socks.java new file mode 100644 index 00000000..a679d0d9 --- /dev/null +++ b/src/main/java/ru/testJava/entity/Socks.java @@ -0,0 +1,31 @@ +package ru.testJava.entity; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import javax.persistence.*; + +@Entity +@NoArgsConstructor +@Getter +@Setter +@Table +public class Socks { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + @Column + private String color; + @Column + private int cottonPart; + @Column + private int quantity; + + public Socks(String color, int cottonPart, int quantity) { + this.color = color; + this.cottonPart = cottonPart; + this.quantity = quantity; + } +} diff --git a/src/main/java/ru/testJava/exception/OutcomeImpossibleException.java b/src/main/java/ru/testJava/exception/OutcomeImpossibleException.java new file mode 100644 index 00000000..88ba8e63 --- /dev/null +++ b/src/main/java/ru/testJava/exception/OutcomeImpossibleException.java @@ -0,0 +1,7 @@ +package ru.testJava.exception; + +public class OutcomeImpossibleException extends Exception { + public OutcomeImpossibleException(String message) { + super(message); + } +} diff --git a/src/main/java/ru/testJava/exception/handling/RaiffExceptionHandler.java b/src/main/java/ru/testJava/exception/handling/RaiffExceptionHandler.java new file mode 100644 index 00000000..fd954b4a --- /dev/null +++ b/src/main/java/ru/testJava/exception/handling/RaiffExceptionHandler.java @@ -0,0 +1,29 @@ +package ru.testJava.exception.handling; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingServletRequestParameterException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import ru.testJava.exception.OutcomeImpossibleException; + +import javax.validation.ValidationException; + +@ControllerAdvice +public class RaiffExceptionHandler { + @ExceptionHandler({ + ValidationException.class, + MethodArgumentNotValidException.class, + HttpMessageNotReadableException.class, + MissingServletRequestParameterException.class} ) + public ResponseEntity handleValidationException (Exception e) { + return new ResponseEntity<>("Request parameters are missing/ have incorrect format", HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(OutcomeImpossibleException.class) + public ResponseEntity handleOutcomeImpossibleException(OutcomeImpossibleException e) { + return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST); + } +} diff --git a/src/main/java/ru/testJava/repository/SocksRepository.java b/src/main/java/ru/testJava/repository/SocksRepository.java new file mode 100644 index 00000000..d36da2ad --- /dev/null +++ b/src/main/java/ru/testJava/repository/SocksRepository.java @@ -0,0 +1,25 @@ +package ru.testJava.repository; + + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import ru.testJava.entity.Socks; + +import java.util.Optional; + +public interface SocksRepository extends JpaRepository { + + @Query("SELECT socks.id FROM Socks AS socks WHERE socks.color = :color AND socks.cottonPart = :cottonPart") + Optional getIdByColorAndCottonPart (String color, int cottonPart); + + @Query("SELECT SUM (socks.quantity) FROM Socks AS socks WHERE socks.color = :color AND socks.cottonPart = :cottonPart") + Optional getSocksEqual(String color, int cottonPart); + + @Query("SELECT SUM (socks.quantity) FROM Socks AS socks WHERE socks.color = :color AND socks.cottonPart > :cottonPart") + Optional getSocksMoreThan(String color, int cottonPart); + + @Query("SELECT SUM (socks.quantity) FROM Socks AS socks WHERE socks.color = :color AND socks.cottonPart < :cottonPart") + Optional getSocksLessThan (String color, int cottonPart); +} + + diff --git a/src/main/java/ru/testJava/service/SocksService.java b/src/main/java/ru/testJava/service/SocksService.java new file mode 100644 index 00000000..c524ed14 --- /dev/null +++ b/src/main/java/ru/testJava/service/SocksService.java @@ -0,0 +1,52 @@ +package ru.testJava.service; + +import org.springframework.stereotype.Service; +import ru.testJava.dto.SocksDto; +import ru.testJava.entity.Socks; +import ru.testJava.exception.OutcomeImpossibleException; +import ru.testJava.repository.SocksRepository; + + +import javax.validation.ValidationException; +import java.util.Optional; + +@Service +public class SocksService { + private final SocksRepository socksRepository; + + public SocksService(SocksRepository socksRepository) { + this.socksRepository = socksRepository; + } + + public void income(SocksDto socksDto) { + Optional id = socksRepository.getIdByColorAndCottonPart(socksDto.getColor(), socksDto.getCottonPart()); + if (id.isPresent()) { + Socks socks = socksRepository.findById(id.get()).get(); + socks.setQuantity(socks.getQuantity() + socksDto.getQuantity()); + socksRepository.save(socks); + } else socksRepository.save(new Socks(socksDto.getColor(), socksDto.getCottonPart(), socksDto.getQuantity())); + } + + public void outcome(SocksDto socksDto) throws OutcomeImpossibleException { + Optional id = socksRepository.getIdByColorAndCottonPart(socksDto.getColor(), socksDto.getCottonPart()); + if (id.isPresent()) { + Socks socks = socksRepository.findById(id.get()).get(); + if (socks.getQuantity() - socksDto.getQuantity() > 0) { + socks.setQuantity(socks.getQuantity() - socksDto.getQuantity()); + socksRepository.save(socks); + } else if (socks.getQuantity() - socksDto.getQuantity() == 0) socksRepository.delete(socks); + else throw new OutcomeImpossibleException("Error, not enough product"); + } else throw new OutcomeImpossibleException("There are no such socks now"); + } + + public int getAll(String color, String operation, int cottonPart) { + Optional count = switch (operation) { + case "moreThan" -> socksRepository.getSocksMoreThan(color, cottonPart); + case "lessThan" -> socksRepository.getSocksLessThan(color, cottonPart); + case "equal" -> socksRepository.getSocksEqual(color, cottonPart); + default -> throw new ValidationException("Invalid value operation: " + operation); + }; + return count.orElse(0); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..488cbfa4 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,12 @@ + +server.port=9090 + +spring.datasource.url=jdbc:h2:mem:socks +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=h2 +spring.datasource.password= + + +spring.jpa.show-sql=true +spring.jpa.hibernate.ddl-auto=none +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect \ No newline at end of file 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..206c33e0 --- /dev/null +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -0,0 +1,30 @@ +databaseChangeLog: + - logicalFilePath: db.changelog/db.changelog-db.yaml + - changeSet: + id: 1 + author: socks_admin + changes: + - createTable: + tableName: socks + columns: + - column: + name: id + type: BIGINT + autoIncrement: true + constraints: + primaryKey: true + nullable: false + - column: + name: color + type: varchar(50) + constraints: + nullable: false + - column: + name: cotton_part + type: int + - column: + name: quantity + type: int + constraints: + nullable: false + diff --git a/src/main/resources/socks.http b/src/main/resources/socks.http new file mode 100644 index 00000000..6ecabed2 --- /dev/null +++ b/src/main/resources/socks.http @@ -0,0 +1,23 @@ +POST http://localhost:9090/api/socks/income +Content-Type: application/json + +{ + "color": "black", + "cottonPart": 10, + "quantity": 10 +} + + +### +POST http://localhost:9090/api/socks/outcome +Content-Type: application/json + +{ + "color": "black", + "cottonPart": 10, + "quantity": 10 +} + +### +GET http://localhost:9090/api/socks?color=black&operation=equal&cottonPart=10 + diff --git a/src/test/java/ru/testJava/SocksControllerTest.java b/src/test/java/ru/testJava/SocksControllerTest.java new file mode 100644 index 00000000..70d5af7e --- /dev/null +++ b/src/test/java/ru/testJava/SocksControllerTest.java @@ -0,0 +1,66 @@ +package ru.testJava; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.ResultMatcher; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import ru.testJava.controller.SocksController; +import ru.testJava.dto.SocksDto; +import ru.testJava.service.SocksService; + +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@WebMvcTest(SocksController.class) +public class SocksControllerTest { + + @Autowired + MockMvc mockMvc; + + @Autowired + private ObjectMapper objectMapper; + + @MockBean + SocksService serviceMock; + + @Test + void incomeSocksTest() throws Exception { + SocksDto socksDto = new SocksDto("black", 100, 10); + mockMvc.perform(MockMvcRequestBuilders.post("/api/socks/income") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(socksDto))) + .andExpect(status().isOk()); + } + + @Test + void outcomeSocksTest() throws Exception{ + SocksDto socksDto = new SocksDto("red", 50, 100); + mockMvc.perform(MockMvcRequestBuilders.post("/api/socks/outcome") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(socksDto))) + .andExpect(status().isOk()); + } + + @Test + void allSocksTest() throws Exception { + socksTest(status().isOk()); + verify(serviceMock, times(1)).getAll("red", "equals", 100); + } + + private void socksTest(ResultMatcher resultMatcher) throws Exception { + mockMvc.perform( + get("/api/socks") + .param("color", "red") + .param("operation", "equals") + .param("cottonPart", String.valueOf(100))) + .andExpect(resultMatcher); + } + +} diff --git a/src/test/java/ru/testJava/TestJavaAppTests.java b/src/test/java/ru/testJava/TestJavaAppTests.java new file mode 100644 index 00000000..0bb7c9e8 --- /dev/null +++ b/src/test/java/ru/testJava/TestJavaAppTests.java @@ -0,0 +1,13 @@ +package ru.testJava; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TestJavaAppTests { + + @Test + void contextLoads() { + } + +}