diff --git a/demo/.gitignore b/demo/.gitignore new file mode 100644 index 00000000..c2065bc2 --- /dev/null +++ b/demo/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/demo/Dockerfile b/demo/Dockerfile new file mode 100644 index 00000000..2e83250c --- /dev/null +++ b/demo/Dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:14-jdk-alpine +RUN addgroup -S springdocker && adduser -S springdocker -G springdocker +USER springdocker:springdocker +ARG JAR_FILE=target/*.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file diff --git a/LICENSE b/demo/LICENSE similarity index 100% rename from LICENSE rename to demo/LICENSE diff --git a/README.md b/demo/README.md similarity index 100% rename from README.md rename to demo/README.md diff --git a/demo/build.gradle b/demo/build.gradle new file mode 100644 index 00000000..999cdc57 --- /dev/null +++ b/demo/build.gradle @@ -0,0 +1,33 @@ +plugins { + id 'org.springframework.boot' version '2.5.6' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'com.raiffeisen-socks' +version = '0.0.1-RELEASE' +sourceCompatibility = "14" + +repositories { + mavenCentral() +} + +dependencies { + implementation 'mysql:mysql-connector-java:8.0.25' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.5.5' + implementation 'org.springframework.boot:spring-boot-starter-web:2.5.5' + implementation 'junit:junit:4.13.2' + testImplementation 'org.springframework.boot:spring-boot-starter-test:2.5.5' + implementation 'org.hibernate:hibernate-core:5.5.8.Final' + implementation group: 'org.hibernate', name: 'hibernate-validator', version: '6.1.0.Final' + compileOnly 'org.projectlombok:lombok:1.18.22' + annotationProcessor 'org.projectlombok:lombok:1.18.22' + + testCompileOnly 'org.projectlombok:lombok:1.18.22' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' +} + +test { + useJUnitPlatform() +} +targetCompatibility = JavaVersion.VERSION_14 diff --git a/demo/gradle/wrapper/gradle-wrapper.jar b/demo/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..7454180f Binary files /dev/null and b/demo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/demo/gradle/wrapper/gradle-wrapper.properties b/demo/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..ffed3a25 --- /dev/null +++ b/demo/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/demo/gradlew b/demo/gradlew new file mode 100755 index 00000000..1b6c7873 --- /dev/null +++ b/demo/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/demo/gradlew.bat b/demo/gradlew.bat new file mode 100644 index 00000000..ac1b06f9 --- /dev/null +++ b/demo/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/demo/settings.gradle b/demo/settings.gradle new file mode 100644 index 00000000..0a383dd8 --- /dev/null +++ b/demo/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/demo/socks_scheme.png b/demo/socks_scheme.png new file mode 100644 index 00000000..7b92a4cb Binary files /dev/null and b/demo/socks_scheme.png differ diff --git a/demo/src/main/java/com/raiffeisensocks/app/SocksApplication.java b/demo/src/main/java/com/raiffeisensocks/app/SocksApplication.java new file mode 100644 index 00000000..227299b9 --- /dev/null +++ b/demo/src/main/java/com/raiffeisensocks/app/SocksApplication.java @@ -0,0 +1,11 @@ +package com.raiffeisensocks.app; + +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/demo/src/main/java/com/raiffeisensocks/app/controller/SocksApiController.java b/demo/src/main/java/com/raiffeisensocks/app/controller/SocksApiController.java new file mode 100644 index 00000000..1b918033 --- /dev/null +++ b/demo/src/main/java/com/raiffeisensocks/app/controller/SocksApiController.java @@ -0,0 +1,44 @@ +package com.raiffeisensocks.app.controller; + +import com.raiffeisensocks.app.dto.SocksDto; +import com.raiffeisensocks.app.service.SocksServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.Pattern; + + +@RestController +public class SocksApiController { + + + private final SocksServiceImpl service; + + @Autowired + public SocksApiController(SocksServiceImpl service) { + this.service = service; + } + + @GetMapping("/api/socks") + public ResponseEntity getSocks(@RequestParam String color, + @RequestParam @Pattern(regexp = "moreThan|lessThan|equal") String operation, + @RequestParam Integer cottonPart) { + return new ResponseEntity<>(service.getAllSocksByParams(color, operation, cottonPart), HttpStatus.OK); + } + + @PostMapping("/api/socks/income") + public ResponseEntity income(@Valid @RequestBody SocksDto socks) { + service.addIncome(socks); + return new ResponseEntity<>(HttpStatus.OK); + } + + + @PostMapping("/api/socks/outcome") + public ResponseEntity outcome(@Valid @RequestBody SocksDto socks) { + service.addOutcome(socks); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/demo/src/main/java/com/raiffeisensocks/app/dto/SocksDto.java b/demo/src/main/java/com/raiffeisensocks/app/dto/SocksDto.java new file mode 100644 index 00000000..4f7e7b26 --- /dev/null +++ b/demo/src/main/java/com/raiffeisensocks/app/dto/SocksDto.java @@ -0,0 +1,36 @@ +package com.raiffeisensocks.app.dto; + +import lombok.Data; +import org.hibernate.validator.constraints.Range; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; + +@Data +public class SocksDto { + @NotEmpty(message = "Mustn't be empty") + @Pattern(regexp = "^[a-zа-я]+$", message = "Input only latin or russian lowercase letters") + private String color; + + @NotNull(message = "Mustn't be empty") + @Range(min = 0, max = 100, message = "Must be between 0 and 100") + private Integer cottonPart; + + @NotNull(message = "Mustn't be empty") + @Range(min = 0, max = Integer.MAX_VALUE) + private Integer quantity; + + public SocksDto(String color, Integer cottonPart, Integer quantity) { + // for tests + this.color = color; + this.cottonPart = cottonPart; + this.quantity = quantity; + } + + @Override + public String toString() { + return "{" + "'color': " + "'" + this.color + "'" + ", " + "'cottonPart': " + this.cottonPart + ", " + + "'quantity': " + this.quantity + "}"; + } +} diff --git a/demo/src/main/java/com/raiffeisensocks/app/handler/SocksApiControllerAdvice.java b/demo/src/main/java/com/raiffeisensocks/app/handler/SocksApiControllerAdvice.java new file mode 100644 index 00000000..9804c57d --- /dev/null +++ b/demo/src/main/java/com/raiffeisensocks/app/handler/SocksApiControllerAdvice.java @@ -0,0 +1,50 @@ +package com.raiffeisensocks.app.handler; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingServletRequestParameterException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; + +import javax.validation.ConstraintViolationException; +import java.util.*; + +@RestControllerAdvice +public class SocksApiControllerAdvice { + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity MethodArgumentNotValidExceptionHandler(MethodArgumentNotValidException ex) { + List errors = ex.getFieldErrors(); + LinkedHashMap> body = new LinkedHashMap<>(); + for (FieldError error: errors) { + if (body.containsKey(error.getField())) { + body.get(error.getField()).add(error.getDefaultMessage()); + } else { + List errorsMessage = new ArrayList<>(); + errorsMessage.add(error.getDefaultMessage()); + body.put(error.getField(), errorsMessage); + } + } + return new ResponseEntity<>(Map.of("error", body), HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(ConstraintViolationException.class) + public ResponseEntity ConstraintViolationExceptionHandler(RuntimeException ex) { + return new ResponseEntity<>(Map.of("error", ex.getMessage()), HttpStatus.BAD_REQUEST); + } + + + @ExceptionHandler(MethodArgumentTypeMismatchException.class) + public ResponseEntity MethodArgumentTypeMismatchExceptionHandler(MethodArgumentTypeMismatchException ex) { + String body = "Параметры запроса отсутствуют или имеют некорректный формат: " + ex.getName(); + return new ResponseEntity<>(Map.of("error", body), HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(MissingServletRequestParameterException.class) + public ResponseEntity MissingServletRequestParameterExceptionHandler(MissingServletRequestParameterException ex) { + String body = "Пропущено поле " + ex.getParameterName(); + return new ResponseEntity<>(Map.of("error", body), HttpStatus.BAD_REQUEST); + } +} diff --git a/demo/src/main/java/com/raiffeisensocks/app/model/Socks.java b/demo/src/main/java/com/raiffeisensocks/app/model/Socks.java new file mode 100644 index 00000000..d9cc43c6 --- /dev/null +++ b/demo/src/main/java/com/raiffeisensocks/app/model/Socks.java @@ -0,0 +1,52 @@ +package com.raiffeisensocks.app.model; + +import lombok.*; +import org.hibernate.Hibernate; + +import javax.persistence.*; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import java.util.Objects; + + +@Getter +@Setter +@ToString +@Entity +@Table(name = "socks") +public class Socks { + @Id + @NotNull + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "id", nullable = false, updatable = false) + private Integer id; + + @NotNull + @Column(name = "color", nullable = false) + private String color; + + @Min(0) + @Max(100) + @NotNull + @Column(name = "cotton_part", nullable = false) + private Integer cottonPart; + + @Min(0) + @NotNull + @Column(name = "quantity", nullable = false) + private Integer quantity; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; + Socks socks = (Socks) o; + return id != null && Objects.equals(id, socks.id); + } + + @Override + public int hashCode() { + return 0; + } +} diff --git a/demo/src/main/java/com/raiffeisensocks/app/repository/SocksRepository.java b/demo/src/main/java/com/raiffeisensocks/app/repository/SocksRepository.java new file mode 100644 index 00000000..a63bb16f --- /dev/null +++ b/demo/src/main/java/com/raiffeisensocks/app/repository/SocksRepository.java @@ -0,0 +1,16 @@ +package com.raiffeisensocks.app.repository; + +import com.raiffeisensocks.app.model.Socks; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + + +@Repository +public interface SocksRepository extends JpaRepository { + List findSocksByColorAndCottonPart(String color, Integer cottonPart); + List findSocksByColorAndCottonPartGreaterThan(String color, Integer cottonPart); + List findSocksByColorAndCottonPartEquals(String color, Integer cottonPart); + List findSocksByColorAndCottonPartLessThan(String color, Integer cottonPart); +} diff --git a/demo/src/main/java/com/raiffeisensocks/app/service/SocksService.java b/demo/src/main/java/com/raiffeisensocks/app/service/SocksService.java new file mode 100644 index 00000000..81875f96 --- /dev/null +++ b/demo/src/main/java/com/raiffeisensocks/app/service/SocksService.java @@ -0,0 +1,11 @@ +package com.raiffeisensocks.app.service; + +import com.raiffeisensocks.app.dto.SocksDto; +import org.springframework.stereotype.Service; + +@Service +public interface SocksService { + void addIncome(SocksDto socksDto); + void addOutcome(SocksDto socksDto); + Integer getAllSocksByParams(String color, String operation, Integer cottonPart); +} diff --git a/demo/src/main/java/com/raiffeisensocks/app/service/SocksServiceImpl.java b/demo/src/main/java/com/raiffeisensocks/app/service/SocksServiceImpl.java new file mode 100644 index 00000000..1cbe4d77 --- /dev/null +++ b/demo/src/main/java/com/raiffeisensocks/app/service/SocksServiceImpl.java @@ -0,0 +1,80 @@ +package com.raiffeisensocks.app.service; + +import com.raiffeisensocks.app.dto.SocksDto; +import com.raiffeisensocks.app.model.Socks; +import com.raiffeisensocks.app.repository.SocksRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.validation.ConstraintViolation; +import javax.validation.ConstraintViolationException; +import java.util.HashSet; +import java.util.List; + +@Service +public class SocksServiceImpl implements SocksService { + + private final SocksRepository socksRepository; + + @Autowired + public SocksServiceImpl(SocksRepository socksRepository) { + this.socksRepository = socksRepository; + } + + public Integer getGeneralSocksQuantity(List socksList) { + return socksList.stream() + .map(Socks::getQuantity) + .reduce(0, Integer::sum); + } + + @Override + public void addIncome(SocksDto socksDto) { + List socksList = socksRepository.findSocksByColorAndCottonPart(socksDto.getColor(), + socksDto.getCottonPart()); + if (socksList.isEmpty()) { + Socks newSocks = new Socks(); + newSocks.setColor(socksDto.getColor()); + newSocks.setCottonPart(socksDto.getCottonPart()); + newSocks.setQuantity(socksDto.getQuantity()); + socksRepository.save(newSocks); + } else { + // Находим однозначно по заданному Color и CottonPart + Socks socks = socksList.get(0); + socks.setQuantity(socks.getQuantity() + socksDto.getQuantity()); + socksRepository.save(socks); + } + } + + @Override + public void addOutcome(SocksDto socksDto) { + List socksList = socksRepository.findSocksByColorAndCottonPart(socksDto.getColor(), + socksDto.getCottonPart()); + + if (socksList.isEmpty() || socksList.get(0).getQuantity() < socksDto.getQuantity()) { + throw new ConstraintViolationException("We don't have such SOCKS or so MANY", new HashSet>()); + } else { + Socks updatedSocks = socksList.get(0); + updatedSocks.setQuantity(updatedSocks.getQuantity() - socksDto.getQuantity()); + socksRepository.save(updatedSocks); + } + } + + @Override + public Integer getAllSocksByParams(String color, String operation, Integer cottonPart) { + switch (operation) { + case "moreThan" -> { + return getGeneralSocksQuantity(socksRepository.findSocksByColorAndCottonPartGreaterThan(color, cottonPart)); + } + case "lessThan" -> { + return getGeneralSocksQuantity(socksRepository.findSocksByColorAndCottonPartLessThan(color, cottonPart)); + } + case "equal" -> { + return getGeneralSocksQuantity(socksRepository.findSocksByColorAndCottonPartEquals(color, cottonPart)); + } + default -> { + throw new ConstraintViolationException("Not found this operation in ['equal', 'moreThan', 'lessThan']", + new HashSet>()); + } + } + } +} diff --git a/demo/src/main/resources/application.properties b/demo/src/main/resources/application.properties new file mode 100644 index 00000000..be644391 --- /dev/null +++ b/demo/src/main/resources/application.properties @@ -0,0 +1,8 @@ +server.error.include-message=always +server.error.include-binding-errors=always +spring.datasource.url=jdbc:mysql://localhost:3306/raiffeisen_socks?serverTimezone=Europe/Moscow&useSSL=false +spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver +spring.datasource.username = root +spring.datasource.password = Root1Root1! +spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect +spring.jpa.hibernate.ddl-auto=update diff --git a/demo/src/test/java/com/raiffeisensocks/app/SocksApplicationTests.java b/demo/src/test/java/com/raiffeisensocks/app/SocksApplicationTests.java new file mode 100644 index 00000000..60b9b823 --- /dev/null +++ b/demo/src/test/java/com/raiffeisensocks/app/SocksApplicationTests.java @@ -0,0 +1,13 @@ +package com.raiffeisensocks.app; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SocksApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/demo/src/test/java/com/raiffeisensocks/app/controller/SocksApiControllerTest.java b/demo/src/test/java/com/raiffeisensocks/app/controller/SocksApiControllerTest.java new file mode 100644 index 00000000..879fd580 --- /dev/null +++ b/demo/src/test/java/com/raiffeisensocks/app/controller/SocksApiControllerTest.java @@ -0,0 +1,89 @@ +package com.raiffeisensocks.app.controller; + +import com.raiffeisensocks.app.dto.SocksDto; +import com.raiffeisensocks.app.repository.SocksRepository; +import org.junit.jupiter.api.Test; +import org.junit.runner.RunWith; +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.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.RequestBuilder; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + +import static org.junit.jupiter.api.Assertions.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@RunWith(SpringRunner.class) +@WebMvcTest(SocksApiController.class) +class SocksApiControllerTest { + @Autowired + private MockMvc mockMvc; + + @MockBean + private SocksApiController socksApiController; + + @MockBean + private SocksRepository repository; + + SocksDto socksDto1 = new SocksDto("red", 15, 5); + SocksDto socksDto2 = new SocksDto("", 15, 5); + SocksDto socksDto3 = new SocksDto("green", 50, 1); + SocksDto socksDto4 = new SocksDto("blue", 110, 2); + SocksDto socksDto5 = new SocksDto("orange", 50, -10); + SocksDto socksDto6 = new SocksDto("yellow", 100, 0); + + SocksDto socksDto7 = new SocksDto("yellow", 10, -100); + SocksDto socksDto8 = new SocksDto("red", 110, 1); + SocksDto socksDto9 = new SocksDto("blue", -10, 50); + SocksDto socksDto10 = new SocksDto("green", 0, 0); + SocksDto socksDto11 = new SocksDto("", 100, 2); + SocksDto socksDto12 = new SocksDto("yellow", 50, 3); + + +// @Test +// void testIncome() throws Exception { +// addIncome(socksDto1, HttpStatus.OK); +// addIncome(socksDto2, HttpStatus.BAD_REQUEST); +// addIncome(socksDto3, HttpStatus.OK); +// addIncome(socksDto4, HttpStatus.BAD_REQUEST); +// addIncome(socksDto5, HttpStatus.BAD_REQUEST); +// addIncome(socksDto6, HttpStatus.BAD_REQUEST); +// } +// +// private void addIncome(SocksDto socksDto, HttpStatus expected) throws Exception { +// RequestBuilder request = MockMvcRequestBuilders.post("/api/socks/income") +// .content(String.valueOf(socksDto)) +// .contentType(MediaType.APPLICATION_JSON) +// .accept(MediaType.APPLICATION_JSON); +// +// MvcResult result = mockMvc.perform(request).andExpect(status().isOk()).andReturn(); +// +// assertEquals(String.valueOf(expected), String.valueOf(result)); +// } +// +// @Test +// void testOutcome() throws Exception { +// addOutcome(socksDto7, HttpStatus.BAD_REQUEST); +// addOutcome(socksDto8, HttpStatus.BAD_REQUEST); +// addOutcome(socksDto9, HttpStatus.BAD_REQUEST); +// addOutcome(socksDto10, HttpStatus.OK); +// addOutcome(socksDto11, HttpStatus.BAD_REQUEST); +// addOutcome(socksDto12, HttpStatus.OK); +// } +// +// private void addOutcome(SocksDto socksDto, HttpStatus expected) throws Exception { +// RequestBuilder request = MockMvcRequestBuilders.post("/api/socks/outcome") +// .content(String.valueOf(socksDto)) +// .contentType(MediaType.APPLICATION_JSON) +// .accept(MediaType.APPLICATION_JSON); +// +// MvcResult result = mockMvc.perform(request).andExpect(status().isOk()).andReturn(); +// +// assertEquals(String.valueOf(expected), String.valueOf(result)); +// } +} \ No newline at end of file