Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
c498fcf21d | |||
a48f044222 | |||
e6288367a5 |
94
.gitignore
vendored
94
.gitignore
vendored
@ -1,63 +1,39 @@
|
||||
# ---> VisualStudioCode
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
!.vscode/*.code-snippets
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
.history/
|
||||
|
||||
# Built Visual Studio Code Extensions
|
||||
*.vsix
|
||||
|
||||
# ---> Java
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Mobile Tools for Java (J2ME)
|
||||
.mtj.tmp/
|
||||
|
||||
# Package Files #
|
||||
*.jar
|
||||
*.war
|
||||
*.nar
|
||||
*.ear
|
||||
*.zip
|
||||
*.tar.gz
|
||||
*.rar
|
||||
|
||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||
hs_err_pid*
|
||||
replay_pid*
|
||||
|
||||
# ---> Gradle
|
||||
HELP.md
|
||||
.gradle
|
||||
**/build/
|
||||
!src/**/build/
|
||||
build/
|
||||
!gradle/wrapper/gradle-wrapper.jar
|
||||
!**/src/main/**/build/
|
||||
!**/src/test/**/build/
|
||||
|
||||
# Ignore Gradle GUI config
|
||||
gradle-app.setting
|
||||
|
||||
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
|
||||
!gradle-wrapper.jar
|
||||
|
||||
# Avoid ignore Gradle wrappper properties
|
||||
!gradle-wrapper.properties
|
||||
|
||||
# Cache of project
|
||||
.gradletasknamecache
|
||||
|
||||
# Eclipse Gradle plugin generated files
|
||||
# Eclipse Core
|
||||
.project
|
||||
# JDT-specific (Eclipse Java Development Tools)
|
||||
### 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/
|
||||
|
||||
data.*.db
|
18
README.md
18
README.md
@ -1,2 +1,18 @@
|
||||
# Internet_Programming_PIbd-21_Putincev_D_M_Backend
|
||||
Swagger UI: \
|
||||
http://localhost:8080/swagger-ui/index.html
|
||||
|
||||
H2 Console: \
|
||||
http://localhost:8080/h2-console
|
||||
|
||||
JDBC URL: jdbc:h2:file:./data \
|
||||
User Name: sa \
|
||||
Password: password
|
||||
|
||||
Почитать:
|
||||
|
||||
- Односторонние и двусторонние связи https://www.baeldung.com/jpa-hibernate-associations
|
||||
- Getters и Setters для двусторонних связей https://en.wikifoods.org/wiki/Java_Persistence/OneToMany#Getters_and_Setters
|
||||
- Многие-ко-многим с доп. атрибутами https://thorben-janssen.com/hibernate-tip-many-to-many-association-with-additional-attributes/
|
||||
- Многие-ко-многим с доп. атрибутами https://www.baeldung.com/jpa-many-to-many
|
||||
- Каскадное удаление сущностей со связями многие-ко-многим https://www.baeldung.com/jpa-remove-entity-many-to-many
|
||||
- Выбор типа коллекции для отношений вида ко-многим в JPA https://thorben-janssen.com/association-mappings-bag-list-set/
|
||||
|
43
build.gradle
Normal file
43
build.gradle
Normal file
@ -0,0 +1,43 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'org.springframework.boot' version '3.2.5'
|
||||
id 'io.spring.dependency-management' version '1.1.4'
|
||||
}
|
||||
|
||||
group = 'com.example'
|
||||
version = '0.0.1-SNAPSHOT'
|
||||
|
||||
defaultTasks 'bootRun'
|
||||
|
||||
jar {
|
||||
enabled = false
|
||||
}
|
||||
|
||||
bootJar {
|
||||
archiveFileName = String.format('%s-%s.jar', rootProject.name, version)
|
||||
}
|
||||
|
||||
assert System.properties['java.specification.version'] == '17' || '21'
|
||||
java {
|
||||
sourceCompatibility = '17'
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-validation'
|
||||
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
|
||||
implementation 'org.modelmapper:modelmapper:3.2.0'
|
||||
|
||||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
||||
implementation 'com.h2database:h2:2.2.224'
|
||||
|
||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||
}
|
||||
|
||||
tasks.named('test') {
|
||||
useJUnitPlatform()
|
||||
}
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
7
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
7
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
249
gradlew
vendored
Normal file
249
gradlew
vendored
Normal file
@ -0,0 +1,249 @@
|
||||
#!/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/HEAD/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
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||
|
||||
# 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
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
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
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
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
|
||||
|
||||
|
||||
# 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"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# 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" "$@"
|
92
gradlew.bat
vendored
Normal file
92
gradlew.bat
vendored
Normal file
@ -0,0 +1,92 @@
|
||||
@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=.
|
||||
@rem This is normally unused
|
||||
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% equ 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% equ 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!
|
||||
set EXIT_CODE=%ERRORLEVEL%
|
||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||
exit /b %EXIT_CODE%
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
1
settings.gradle
Normal file
1
settings.gradle
Normal file
@ -0,0 +1 @@
|
||||
rootProject.name = 'backend'
|
88
src/main/java/com/example/backend/DemoApplication.java
Normal file
88
src/main/java/com/example/backend/DemoApplication.java
Normal file
@ -0,0 +1,88 @@
|
||||
package com.example.backend;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.boot.CommandLineRunner;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
import com.example.backend.core.utils.Formatter;
|
||||
import com.example.backend.foods.model.FoodEntity;
|
||||
import com.example.backend.foods.service.FoodService;
|
||||
import com.example.backend.users.model.UserEntity;
|
||||
import com.example.backend.users.service.UserService;
|
||||
import com.example.backend.orders.model.OrderEntity;
|
||||
import com.example.backend.orders.service.OrderService;
|
||||
import com.example.backend.types.model.TypeEntity;
|
||||
import com.example.backend.types.service.TypeService;
|
||||
|
||||
@SpringBootApplication
|
||||
public class DemoApplication implements CommandLineRunner {
|
||||
private final Logger log = LoggerFactory.getLogger(DemoApplication.class);
|
||||
|
||||
private final TypeService typeService;
|
||||
private final FoodService foodService;
|
||||
private final UserService userService;
|
||||
private final OrderService orderService;
|
||||
|
||||
public DemoApplication(TypeService typeService, FoodService foodService, UserService userService,
|
||||
OrderService orderService) {
|
||||
this.typeService = typeService;
|
||||
this.foodService = foodService;
|
||||
this.userService = userService;
|
||||
this.orderService = orderService;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(DemoApplication.class, args);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run(String... args) throws Exception {
|
||||
if (args.length > 0 && Arrays.asList(args).contains("--populate")) {
|
||||
log.info("Create default categories values");
|
||||
final var type1 = typeService.create(new TypeEntity("Бургер"));
|
||||
final var type2 = typeService.create(new TypeEntity("Шаурма"));
|
||||
final var type3 = typeService.create(new TypeEntity("Напиток"));
|
||||
|
||||
log.info("Create default foods values");
|
||||
final var food1 = foodService.create(new FoodEntity(type1, "Бургер с говядиной",
|
||||
700.00, Formatter.parse("2021-09-11"), 5000));
|
||||
|
||||
final var food2 = foodService.create(new FoodEntity(type2, "Спец шаурма",
|
||||
300.00, Formatter.parse("2021-11-11"), 1000));
|
||||
|
||||
final var food3 = foodService.create(new FoodEntity(type2, "Шаурма с курицей",
|
||||
200.00, Formatter.parse("2021-10-11"), 4000));
|
||||
|
||||
final var food4 = foodService.create(new FoodEntity(type3, "Кола",
|
||||
70.00, Formatter.parse("2021-04-11"), 3000));
|
||||
final var food5 = foodService.create(new FoodEntity(type3, "Чай",
|
||||
50.00, Formatter.parse("2021-05-11"), 2000));
|
||||
|
||||
log.info("Create default users values");
|
||||
final var user1 = userService
|
||||
.create(new UserEntity("Dan", "Daniil@gmail.com", "danil123", "admin"));
|
||||
final var user2 = userService
|
||||
.create(new UserEntity("Ilya", "Ilya@gmail.com", "ilya123", "user"));
|
||||
final var user3 = userService
|
||||
.create(new UserEntity("Test", "Test@gmail.com", "Test123", "user"));
|
||||
|
||||
log.info("Create default orders values");
|
||||
orderService
|
||||
.create(user1.getId(), new OrderEntity("Выполняется"),
|
||||
Map.of(food1.getId(), 6, food2.getId(), 1, food4.getId(), 3));
|
||||
orderService
|
||||
.create(user2.getId(),
|
||||
new OrderEntity("Выдан"),
|
||||
Map.of(food4.getId(), 5, food3.getId(), 3));
|
||||
orderService
|
||||
.create(user3.getId(),
|
||||
new OrderEntity("Готов"),
|
||||
Map.of(food2.getId(), 1, food5.getId(), 1));
|
||||
}
|
||||
}
|
||||
}
|
97
src/main/java/com/example/backend/core/api/PageDto.java
Normal file
97
src/main/java/com/example/backend/core/api/PageDto.java
Normal file
@ -0,0 +1,97 @@
|
||||
package com.example.backend.core.api;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class PageDto<D> {
|
||||
private List<D> items = new ArrayList<>();
|
||||
private int itemsCount;
|
||||
private int currentPage;
|
||||
private int currentSize;
|
||||
private int totalPages;
|
||||
private long totalItems;
|
||||
private boolean isFirst;
|
||||
private boolean isLast;
|
||||
private boolean hasNext;
|
||||
private boolean hasPrevious;
|
||||
|
||||
public List<D> getItems() {
|
||||
return items;
|
||||
}
|
||||
|
||||
public void setItems(List<D> items) {
|
||||
this.items = items;
|
||||
}
|
||||
|
||||
public int getItemsCount() {
|
||||
return itemsCount;
|
||||
}
|
||||
|
||||
public void setItemsCount(int itemsCount) {
|
||||
this.itemsCount = itemsCount;
|
||||
}
|
||||
|
||||
public int getCurrentPage() {
|
||||
return currentPage;
|
||||
}
|
||||
|
||||
public void setCurrentPage(int currentPage) {
|
||||
this.currentPage = currentPage;
|
||||
}
|
||||
|
||||
public int getCurrentSize() {
|
||||
return currentSize;
|
||||
}
|
||||
|
||||
public void setCurrentSize(int currentSize) {
|
||||
this.currentSize = currentSize;
|
||||
}
|
||||
|
||||
public int getTotalPages() {
|
||||
return totalPages;
|
||||
}
|
||||
|
||||
public void setTotalPages(int totalPages) {
|
||||
this.totalPages = totalPages;
|
||||
}
|
||||
|
||||
public long getTotalItems() {
|
||||
return totalItems;
|
||||
}
|
||||
|
||||
public void setTotalItems(long totalItems) {
|
||||
this.totalItems = totalItems;
|
||||
}
|
||||
|
||||
public boolean isFirst() {
|
||||
return isFirst;
|
||||
}
|
||||
|
||||
public void setFirst(boolean isFirst) {
|
||||
this.isFirst = isFirst;
|
||||
}
|
||||
|
||||
public boolean isLast() {
|
||||
return isLast;
|
||||
}
|
||||
|
||||
public void setLast(boolean isLast) {
|
||||
this.isLast = isLast;
|
||||
}
|
||||
|
||||
public boolean isHasNext() {
|
||||
return hasNext;
|
||||
}
|
||||
|
||||
public void setHasNext(boolean hasNext) {
|
||||
this.hasNext = hasNext;
|
||||
}
|
||||
|
||||
public boolean isHasPrevious() {
|
||||
return hasPrevious;
|
||||
}
|
||||
|
||||
public void setHasPrevious(boolean hasPrevious) {
|
||||
this.hasPrevious = hasPrevious;
|
||||
}
|
||||
}
|
@ -0,0 +1,25 @@
|
||||
package com.example.backend.core.api;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
|
||||
public class PageDtoMapper {
|
||||
private PageDtoMapper() {
|
||||
}
|
||||
|
||||
public static <D, E> PageDto<D> toDto(Page<E> page, Function<E, D> mapper) {
|
||||
final PageDto<D> dto = new PageDto<>();
|
||||
dto.setItems(page.getContent().stream().map(mapper::apply).toList());
|
||||
dto.setItemsCount(page.getNumberOfElements());
|
||||
dto.setCurrentPage(page.getNumber());
|
||||
dto.setCurrentSize(page.getSize());
|
||||
dto.setTotalPages(page.getTotalPages());
|
||||
dto.setTotalItems(page.getTotalElements());
|
||||
dto.setFirst(page.isFirst());
|
||||
dto.setLast(page.isLast());
|
||||
dto.setHasNext(page.hasNext());
|
||||
dto.setHasPrevious(page.hasPrevious());
|
||||
return dto;
|
||||
}
|
||||
}
|
@ -0,0 +1,12 @@
|
||||
package com.example.backend.core.configuration;
|
||||
|
||||
public class Constants {
|
||||
public static final String SEQUENCE_NAME = "hibernate_sequence";
|
||||
|
||||
public static final String API_URL = "/api/1.0";
|
||||
|
||||
public static final String DEFAULT_PAGE_SIZE = "5";
|
||||
|
||||
private Constants() {
|
||||
}
|
||||
}
|
@ -0,0 +1,18 @@
|
||||
package com.example.backend.core.configuration;
|
||||
|
||||
import org.modelmapper.ModelMapper;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import com.example.backend.orders.api.OrderDto;
|
||||
import com.example.backend.orders.model.OrderEntity;
|
||||
|
||||
@Configuration
|
||||
public class MapperConfiguration {
|
||||
@Bean
|
||||
ModelMapper modelMapper() {
|
||||
ModelMapper modelMapper = new ModelMapper();
|
||||
modelMapper.typeMap(OrderEntity.class, OrderDto.class).addMappings(mapper -> mapper.skip(OrderDto::setFoods));
|
||||
return modelMapper;
|
||||
}
|
||||
}
|
@ -0,0 +1,15 @@
|
||||
package com.example.backend.core.configuration;
|
||||
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.lang.NonNull;
|
||||
import org.springframework.web.servlet.config.annotation.CorsRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
@Configuration
|
||||
public class WebConfiguration implements WebMvcConfigurer {
|
||||
@Override
|
||||
public void addCorsMappings(@NonNull CorsRegistry registry) {
|
||||
registry.addMapping("/**")
|
||||
.allowedMethods("GET", "POST", "PUT", "DELETE");
|
||||
}
|
||||
}
|
@ -0,0 +1,7 @@
|
||||
package com.example.backend.core.error;
|
||||
|
||||
public class NotFoundException extends RuntimeException {
|
||||
public <T> NotFoundException(Class<T> clazz, Long id) {
|
||||
super(String.format("%s with id [%s] is not found or not exists", clazz.getSimpleName(), id));
|
||||
}
|
||||
}
|
28
src/main/java/com/example/backend/core/model/BaseEntity.java
Normal file
28
src/main/java/com/example/backend/core/model/BaseEntity.java
Normal file
@ -0,0 +1,28 @@
|
||||
package com.example.backend.core.model;
|
||||
|
||||
import com.example.backend.core.configuration.Constants;
|
||||
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.MappedSuperclass;
|
||||
import jakarta.persistence.SequenceGenerator;
|
||||
|
||||
@MappedSuperclass
|
||||
public abstract class BaseEntity {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = Constants.SEQUENCE_NAME)
|
||||
@SequenceGenerator(name = Constants.SEQUENCE_NAME, sequenceName = Constants.SEQUENCE_NAME, allocationSize = 1)
|
||||
protected Long id;
|
||||
|
||||
protected BaseEntity() {
|
||||
}
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
}
|
20
src/main/java/com/example/backend/core/utils/Formatter.java
Normal file
20
src/main/java/com/example/backend/core/utils/Formatter.java
Normal file
@ -0,0 +1,20 @@
|
||||
package com.example.backend.core.utils;
|
||||
|
||||
import java.util.Date;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
|
||||
public final class Formatter {
|
||||
private Formatter() {
|
||||
}
|
||||
|
||||
private static SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd");
|
||||
|
||||
public static String format(Date date) {
|
||||
return dateFormatter.format(date);
|
||||
}
|
||||
|
||||
public static Date parse(String date) throws ParseException {
|
||||
return dateFormatter.parse(date);
|
||||
}
|
||||
}
|
@ -0,0 +1,73 @@
|
||||
package com.example.backend.foods.api;
|
||||
|
||||
import org.modelmapper.ModelMapper;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.example.backend.core.api.PageDto;
|
||||
import com.example.backend.core.api.PageDtoMapper;
|
||||
import com.example.backend.foods.model.FoodEntity;
|
||||
import com.example.backend.foods.service.FoodService;
|
||||
import com.example.backend.types.service.TypeService;
|
||||
import com.example.backend.core.configuration.Constants;
|
||||
|
||||
import jakarta.validation.Valid;
|
||||
|
||||
@RestController
|
||||
@RequestMapping(Constants.API_URL + "/food")
|
||||
public class FoodController {
|
||||
private final FoodService foodService;
|
||||
private final TypeService typeService;
|
||||
private final ModelMapper modelMapper;
|
||||
|
||||
public FoodController(FoodService foodService, TypeService typeService, ModelMapper modelMapper) {
|
||||
this.foodService = foodService;
|
||||
this.typeService = typeService;
|
||||
this.modelMapper = modelMapper;
|
||||
}
|
||||
|
||||
private FoodDto toDto(FoodEntity entity) {
|
||||
return modelMapper.map(entity, FoodDto.class);
|
||||
}
|
||||
|
||||
private FoodEntity toEntity(FoodDto dto) {
|
||||
final FoodEntity entity = modelMapper.map(dto, FoodEntity.class);
|
||||
entity.setType(typeService.get(dto.getTypeId()));
|
||||
return entity;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public PageDto<FoodDto> getAll(
|
||||
@RequestParam(name = "typeId", defaultValue = "0") Long typeId,
|
||||
@RequestParam(name = "page", defaultValue = "0") int page,
|
||||
@RequestParam(name = "size", defaultValue = Constants.DEFAULT_PAGE_SIZE) int size) {
|
||||
return PageDtoMapper.toDto(foodService.getAll(typeId, page, size), this::toDto);
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public FoodDto get(@PathVariable(name = "id") Long id) {
|
||||
return toDto(foodService.get(id));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public FoodDto create(@RequestBody @Valid FoodDto dto) {
|
||||
return toDto(foodService.create(toEntity(dto)));
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public FoodDto update(@PathVariable(name = "id") Long id, @RequestBody @Valid FoodDto dto) {
|
||||
return toDto(foodService.update(id, toEntity(dto)));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public FoodDto delete(@PathVariable(name = "id") Long id) {
|
||||
return toDto(foodService.delete(id));
|
||||
}
|
||||
}
|
79
src/main/java/com/example/backend/foods/api/FoodDto.java
Normal file
79
src/main/java/com/example/backend/foods/api/FoodDto.java
Normal file
@ -0,0 +1,79 @@
|
||||
package com.example.backend.foods.api;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
|
||||
public class FoodDto {
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private Long id;
|
||||
@NotNull
|
||||
@Min(1)
|
||||
private Long typeId;
|
||||
@NotBlank
|
||||
private String name;
|
||||
@NotNull
|
||||
@Min(1)
|
||||
private Double price;
|
||||
@NotNull
|
||||
@Min(1)
|
||||
private String date;
|
||||
@NotNull
|
||||
@Min(1)
|
||||
private Integer count;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getTypeId() {
|
||||
return typeId;
|
||||
}
|
||||
|
||||
public void setTypeId(Long typeId) {
|
||||
this.typeId = typeId;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public Double getPrice() {
|
||||
return price;
|
||||
}
|
||||
|
||||
public void setPrice(Double price) {
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
public String getDate() {
|
||||
return date;
|
||||
}
|
||||
|
||||
public void setDate(String date) {
|
||||
this.date = date;
|
||||
}
|
||||
|
||||
public Integer getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setCount(Integer count) {
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
public Double getSum() {
|
||||
return price * count;
|
||||
}
|
||||
}
|
123
src/main/java/com/example/backend/foods/model/FoodEntity.java
Normal file
123
src/main/java/com/example/backend/foods/model/FoodEntity.java
Normal file
@ -0,0 +1,123 @@
|
||||
package com.example.backend.foods.model;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
import com.example.backend.core.model.BaseEntity;
|
||||
import com.example.backend.ordersfoods.model.OrderFoodEntity;
|
||||
import com.example.backend.types.model.TypeEntity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.OrderBy;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
@Entity
|
||||
@Table(name = "foods")
|
||||
public class FoodEntity extends BaseEntity {
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "typeId", nullable = false)
|
||||
private TypeEntity type;
|
||||
@Column(nullable = false)
|
||||
private String name;
|
||||
@Column(nullable = false)
|
||||
private Double price;
|
||||
@Column(nullable = false)
|
||||
private Date date;
|
||||
@Column(nullable = false)
|
||||
private Integer count;
|
||||
@OneToMany(mappedBy = "food")
|
||||
@OrderBy("id ASC")
|
||||
private Set<OrderFoodEntity> orderFoods = new HashSet<>();
|
||||
|
||||
public FoodEntity() {
|
||||
}
|
||||
|
||||
public FoodEntity(TypeEntity type, String name, Double price, Date date, Integer count) {
|
||||
this.type = type;
|
||||
this.name = name;
|
||||
this.price = price;
|
||||
this.date = date;
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
public TypeEntity getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(TypeEntity type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public Double getPrice() {
|
||||
return price;
|
||||
}
|
||||
|
||||
public void setPrice(Double price) {
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
public Date getDate() {
|
||||
return date;
|
||||
}
|
||||
|
||||
public void setDate(Date date) {
|
||||
this.date = date;
|
||||
}
|
||||
|
||||
public Integer getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setCount(Integer count) {
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
public void setOrderFoods(Set<OrderFoodEntity> orderFoods) {
|
||||
this.orderFoods = orderFoods;
|
||||
}
|
||||
|
||||
public Set<OrderFoodEntity> getOrderFoods() {
|
||||
return orderFoods;
|
||||
}
|
||||
|
||||
public void addOrder(OrderFoodEntity orderFood) {
|
||||
if (orderFood.getFood() != this) {
|
||||
orderFood.setFood(this);
|
||||
}
|
||||
orderFoods.add(orderFood);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id, type, name, price, date, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null || getClass() != obj.getClass())
|
||||
return false;
|
||||
final FoodEntity other = (FoodEntity) obj;
|
||||
return Objects.equals(other.getId(), id)
|
||||
&& Objects.equals(other.getType(), type)
|
||||
&& Objects.equals(other.getName(), name)
|
||||
&& Objects.equals(other.getPrice(), price)
|
||||
&& Objects.equals(other.getDate(), date)
|
||||
&& Objects.equals(other.getCount(), count);
|
||||
}
|
||||
}
|
@ -0,0 +1,17 @@
|
||||
package com.example.backend.foods.repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.data.repository.PagingAndSortingRepository;
|
||||
|
||||
import com.example.backend.foods.model.FoodEntity;
|
||||
|
||||
public interface FoodRepository extends CrudRepository<FoodEntity, Long>, PagingAndSortingRepository<FoodEntity, Long> {
|
||||
List<FoodEntity> findByTypeId(long typeId);
|
||||
|
||||
Page<FoodEntity> findByTypeId(long typeId, Pageable pageable);
|
||||
|
||||
}
|
@ -0,0 +1,77 @@
|
||||
package com.example.backend.foods.service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.StreamSupport;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.backend.core.error.NotFoundException;
|
||||
import com.example.backend.foods.model.FoodEntity;
|
||||
import com.example.backend.foods.repository.FoodRepository;
|
||||
|
||||
@Service
|
||||
public class FoodService {
|
||||
private final FoodRepository repository;
|
||||
|
||||
public FoodService(FoodRepository repository) {
|
||||
this.repository = repository;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<FoodEntity> getAll(long typeId) {
|
||||
if (typeId <= 0L) {
|
||||
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
|
||||
}
|
||||
return repository.findByTypeId(typeId);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<FoodEntity> getAllById(List<Long> foodIds) {
|
||||
return StreamSupport.stream(repository.findAllById(foodIds).spliterator(), false).toList();
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Page<FoodEntity> getAll(long typeId, int page, int size) {
|
||||
final Pageable pageRequest = PageRequest.of(page, size);
|
||||
if (typeId <= 0L) {
|
||||
return repository.findAll(pageRequest);
|
||||
}
|
||||
return repository.findByTypeId(typeId, pageRequest);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public FoodEntity get(long id) {
|
||||
return repository.findById(id)
|
||||
.orElseThrow(() -> new NotFoundException(FoodEntity.class, id));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public FoodEntity create(FoodEntity entity) {
|
||||
if (entity == null) {
|
||||
throw new IllegalArgumentException("Entity is null");
|
||||
}
|
||||
return repository.save(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public FoodEntity update(Long id, FoodEntity entity) {
|
||||
final FoodEntity existsEntity = get(id);
|
||||
existsEntity.setType(entity.getType());
|
||||
existsEntity.setName(entity.getName());
|
||||
existsEntity.setDate(entity.getDate());
|
||||
existsEntity.setPrice(entity.getPrice());
|
||||
existsEntity.setCount(entity.getCount());
|
||||
return repository.save(existsEntity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public FoodEntity delete(Long id) {
|
||||
final FoodEntity existsEntity = get(id);
|
||||
repository.delete(existsEntity);
|
||||
return existsEntity;
|
||||
}
|
||||
}
|
@ -0,0 +1,94 @@
|
||||
package com.example.backend.orders.api;
|
||||
|
||||
import java.text.ParseException;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.modelmapper.ModelMapper;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.example.backend.core.api.PageDto;
|
||||
import com.example.backend.core.api.PageDtoMapper;
|
||||
import com.example.backend.orders.model.OrderEntity;
|
||||
import com.example.backend.orders.service.OrderService;
|
||||
import com.example.backend.core.configuration.Constants;
|
||||
import com.example.backend.core.utils.Formatter;
|
||||
import com.example.backend.foods.api.FoodDto;
|
||||
import com.example.backend.foods.model.FoodEntity;
|
||||
|
||||
import jakarta.validation.Valid;
|
||||
|
||||
@RestController
|
||||
@RequestMapping(Constants.API_URL + "/user/{user}/order")
|
||||
public class OrderController {
|
||||
private final OrderService orderService;
|
||||
private final ModelMapper modelMapper;
|
||||
|
||||
public OrderController(OrderService orderService, ModelMapper modelMapper) {
|
||||
this.orderService = orderService;
|
||||
this.modelMapper = modelMapper;
|
||||
}
|
||||
|
||||
private OrderDto toDto(OrderEntity entity) {
|
||||
final OrderDto dto = modelMapper.map(entity, OrderDto.class);
|
||||
dto.setDate(Formatter.format(entity.getDate()));
|
||||
dto.setSum(orderService.getSum(entity.getUser().getId(), entity.getId()));
|
||||
dto.setCount(orderService.getFullCount(entity.getUser().getId(), entity.getId()));
|
||||
dto.setFoods(orderService.getOrderFoods(entity.getUser().getId(), entity
|
||||
.getId()).stream()
|
||||
.map(orderFood -> toFoodDto(orderFood.getFood()))
|
||||
.toList());
|
||||
return dto;
|
||||
}
|
||||
|
||||
private OrderEntity toEntity(OrderDto dto) throws ParseException {
|
||||
final OrderEntity entity = modelMapper.map(dto, OrderEntity.class);
|
||||
entity.setDate(Formatter.parse(dto.getDate()));
|
||||
return entity;
|
||||
}
|
||||
|
||||
private FoodDto toFoodDto(FoodEntity entity) {
|
||||
return modelMapper.map(entity, FoodDto.class);
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public PageDto<OrderDto> getAll(
|
||||
@PathVariable(name = "user") Long userId,
|
||||
@RequestParam(name = "page", defaultValue = "0") int page,
|
||||
@RequestParam(name = "size", defaultValue = Constants.DEFAULT_PAGE_SIZE) int size) {
|
||||
return PageDtoMapper.toDto(orderService.getAll(userId, page, size), this::toDto);
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public OrderDto get(
|
||||
@PathVariable(name = "user") Long userId,
|
||||
@PathVariable(name = "id") Long id) {
|
||||
return toDto(orderService.get(userId, id));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public OrderDto create(
|
||||
@PathVariable(name = "user") Long userId,
|
||||
@RequestBody @Valid OrderDto dto) throws ParseException {
|
||||
dto.setDate(Formatter.format(new Date()));
|
||||
Map<Long, Integer> foodsIdsCount = dto.getOrderInfo().stream()
|
||||
.collect(Collectors.toMap(OrderFoodDto::getFoodId, OrderFoodDto::getCount));
|
||||
return toDto(orderService.create(userId, toEntity(dto), foodsIdsCount));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public OrderDto delete(
|
||||
@PathVariable(name = "user") Long userId,
|
||||
@PathVariable(name = "id") Long id) {
|
||||
return toDto(orderService.delete(userId, id));
|
||||
}
|
||||
}
|
81
src/main/java/com/example/backend/orders/api/OrderDto.java
Normal file
81
src/main/java/com/example/backend/orders/api/OrderDto.java
Normal file
@ -0,0 +1,81 @@
|
||||
package com.example.backend.orders.api;
|
||||
|
||||
import com.example.backend.foods.api.FoodDto;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
|
||||
public class OrderDto {
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private Long id;
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private Double sum;
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private Integer count;
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private String date;
|
||||
@NotBlank
|
||||
private String status;
|
||||
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
||||
private List<OrderFoodDto> orderInfo;
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private List<FoodDto> foods;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Double getSum() {
|
||||
return sum;
|
||||
}
|
||||
|
||||
public void setSum(Double sum) {
|
||||
this.sum = sum;
|
||||
}
|
||||
|
||||
public Integer getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setCount(Integer count) {
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
public String getDate() {
|
||||
return date;
|
||||
}
|
||||
|
||||
public void setDate(String date) {
|
||||
this.date = date;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public List<OrderFoodDto> getOrderInfo() {
|
||||
return orderInfo;
|
||||
}
|
||||
|
||||
public void setOrderInfo(List<OrderFoodDto> orderInfo) {
|
||||
this.orderInfo = orderInfo;
|
||||
}
|
||||
|
||||
public List<FoodDto> getFoods() {
|
||||
return foods;
|
||||
}
|
||||
|
||||
public void setFoods(List<FoodDto> foods) {
|
||||
this.foods = foods;
|
||||
}
|
||||
}
|
@ -0,0 +1,22 @@
|
||||
package com.example.backend.orders.api;
|
||||
|
||||
public class OrderFoodDto {
|
||||
private Long foodId;
|
||||
private Integer count;
|
||||
|
||||
public Long getFoodId() {
|
||||
return foodId;
|
||||
}
|
||||
|
||||
public void setFoodId(Long foodId) {
|
||||
this.foodId = foodId;
|
||||
}
|
||||
|
||||
public Integer getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setCount(Integer count) {
|
||||
this.count = count;
|
||||
}
|
||||
}
|
105
src/main/java/com/example/backend/orders/model/OrderEntity.java
Normal file
105
src/main/java/com/example/backend/orders/model/OrderEntity.java
Normal file
@ -0,0 +1,105 @@
|
||||
package com.example.backend.orders.model;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
import com.example.backend.users.model.UserEntity;
|
||||
import com.example.backend.core.model.BaseEntity;
|
||||
import com.example.backend.ordersfoods.model.OrderFoodEntity;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.OrderBy;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
@Entity
|
||||
@Table(name = "orders")
|
||||
public class OrderEntity extends BaseEntity {
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "userId", nullable = false)
|
||||
private UserEntity user;
|
||||
@Column(nullable = false)
|
||||
private Date date;
|
||||
@Column(nullable = false, length = 20)
|
||||
private String status;
|
||||
@OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||
@OrderBy("id ASC")
|
||||
private Set<OrderFoodEntity> orderFoods = new HashSet<>();
|
||||
|
||||
public OrderEntity() {
|
||||
}
|
||||
|
||||
public OrderEntity(String status) {
|
||||
this.status = status;
|
||||
this.date = new Date();
|
||||
}
|
||||
|
||||
public UserEntity getUser() {
|
||||
return user;
|
||||
}
|
||||
|
||||
public void setUser(UserEntity user) {
|
||||
this.user = user;
|
||||
if (!user.getOrders().contains(this)) {
|
||||
user.getOrders().add(this);
|
||||
}
|
||||
}
|
||||
|
||||
public Date getDate() {
|
||||
return date;
|
||||
}
|
||||
|
||||
public void setDate(Date date) {
|
||||
this.date = date;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Set<OrderFoodEntity> getOrderFoods() {
|
||||
return orderFoods;
|
||||
}
|
||||
|
||||
public void addFood(OrderFoodEntity orderFood) {
|
||||
if (orderFood.getOrder() != this) {
|
||||
orderFood.setOrder(this);
|
||||
}
|
||||
orderFoods.add(orderFood);
|
||||
}
|
||||
|
||||
public void deleteFood(OrderFoodEntity orderFood) {
|
||||
if (orderFood.getOrder() != this) {
|
||||
return;
|
||||
}
|
||||
orderFoods.remove(orderFood);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id, user.getId(), date, status);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null || getClass() != obj.getClass())
|
||||
return false;
|
||||
final OrderEntity other = (OrderEntity) obj;
|
||||
return Objects.equals(other.getId(), id)
|
||||
&& Objects.equals(other.getUser().getId(), user.getId())
|
||||
&& Objects.equals(other.getDate(), date)
|
||||
&& Objects.equals(other.getStatus(), status);
|
||||
}
|
||||
}
|
@ -0,0 +1,20 @@
|
||||
package com.example.backend.orders.repository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.data.repository.PagingAndSortingRepository;
|
||||
|
||||
import com.example.backend.orders.model.OrderEntity;
|
||||
|
||||
public interface OrderRepository
|
||||
extends CrudRepository<OrderEntity, Long>, PagingAndSortingRepository<OrderEntity, Long> {
|
||||
Optional<OrderEntity> findOneByUserIdAndId(long userId, long id);
|
||||
|
||||
List<OrderEntity> findByUserId(long userId);
|
||||
|
||||
Page<OrderEntity> findByUserId(long userId, Pageable pageable);
|
||||
}
|
@ -0,0 +1,101 @@
|
||||
package com.example.backend.orders.service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.backend.core.error.NotFoundException;
|
||||
import com.example.backend.foods.model.FoodEntity;
|
||||
import com.example.backend.foods.service.FoodService;
|
||||
import com.example.backend.orders.model.OrderEntity;
|
||||
import com.example.backend.orders.repository.OrderRepository;
|
||||
import com.example.backend.ordersfoods.model.OrderFoodEntity;
|
||||
import com.example.backend.users.model.UserEntity;
|
||||
import com.example.backend.users.service.UserService;
|
||||
|
||||
@Service
|
||||
public class OrderService {
|
||||
private final OrderRepository repository;
|
||||
private final UserService userService;
|
||||
private final FoodService foodService;
|
||||
|
||||
public OrderService(OrderRepository repository, UserService userService, FoodService foodService) {
|
||||
this.repository = repository;
|
||||
this.userService = userService;
|
||||
this.foodService = foodService;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<OrderEntity> getAll(Long userId) {
|
||||
userService.get(userId);
|
||||
return repository.findByUserId(userId);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Page<OrderEntity> getAll(long userId, int page, int size) {
|
||||
final Pageable pageRequest = PageRequest.of(page, size);
|
||||
userService.get(userId);
|
||||
return repository.findByUserId(userId, pageRequest);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public OrderEntity get(long userId, long id) {
|
||||
userService.get(userId);
|
||||
return repository.findOneByUserIdAndId(userId, id)
|
||||
.orElseThrow(() -> new NotFoundException(OrderEntity.class, id));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public OrderEntity create(long userId, OrderEntity entity, Map<Long, Integer> foodsIdsCount) {
|
||||
if (entity == null) {
|
||||
throw new IllegalArgumentException("Entity is null");
|
||||
}
|
||||
final UserEntity existsUser = userService.get(userId);
|
||||
entity.setUser(existsUser);
|
||||
List<Long> foodIds = new ArrayList<Long>(foodsIdsCount.keySet());
|
||||
List<FoodEntity> result = foodService.getAllById(foodIds);
|
||||
result.forEach(food -> {
|
||||
final OrderFoodEntity orderFood = new OrderFoodEntity(entity, food, foodsIdsCount.get(food.getId()));
|
||||
orderFood.setOrder(entity);
|
||||
orderFood.setFood(food);
|
||||
});
|
||||
return repository.save(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public OrderEntity delete(long userId, long id) {
|
||||
userService.get(userId);
|
||||
final OrderEntity existsEntity = get(userId, id);
|
||||
repository.delete(existsEntity);
|
||||
return existsEntity;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Double getSum(long userId, long id) {
|
||||
userService.get(userId);
|
||||
return get(userId, id).getOrderFoods().stream()
|
||||
.mapToDouble(orderFood -> orderFood.getCount() * orderFood.getFood().getPrice())
|
||||
.sum();
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Integer getFullCount(long userId, long id) {
|
||||
userService.get(userId);
|
||||
return get(userId, id).getOrderFoods().stream()
|
||||
.mapToInt(OrderFoodEntity::getCount)
|
||||
.sum();
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<OrderFoodEntity> getOrderFoods(long userId, long id) {
|
||||
userService.get(userId);
|
||||
return get(userId, id).getOrderFoods().stream()
|
||||
.toList();
|
||||
}
|
||||
}
|
@ -0,0 +1,96 @@
|
||||
package com.example.backend.ordersfoods.model;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import com.example.backend.foods.model.FoodEntity;
|
||||
import com.example.backend.orders.model.OrderEntity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.EmbeddedId;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.MapsId;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
@Entity
|
||||
@Table(name = "orders_foods")
|
||||
public class OrderFoodEntity {
|
||||
@EmbeddedId
|
||||
private OrderFoodId id = new OrderFoodId();
|
||||
@ManyToOne
|
||||
@MapsId("orderId")
|
||||
@JoinColumn(name = "order_id")
|
||||
private OrderEntity order;
|
||||
@ManyToOne
|
||||
@MapsId("foodId")
|
||||
@JoinColumn(name = "food_id")
|
||||
private FoodEntity food;
|
||||
@Column(nullable = false)
|
||||
private Integer count;
|
||||
|
||||
public OrderFoodEntity() {
|
||||
}
|
||||
|
||||
public OrderFoodEntity(OrderEntity order, FoodEntity food, Integer count) {
|
||||
this.order = order;
|
||||
this.food = food;
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
public OrderFoodId getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(OrderFoodId id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public OrderEntity getOrder() {
|
||||
return order;
|
||||
}
|
||||
|
||||
public void setOrder(OrderEntity order) {
|
||||
this.order = order;
|
||||
if (!order.getOrderFoods().contains(this)) {
|
||||
order.getOrderFoods().add(this);
|
||||
}
|
||||
}
|
||||
|
||||
public FoodEntity getFood() {
|
||||
return food;
|
||||
}
|
||||
|
||||
public void setFood(FoodEntity food) {
|
||||
this.food = food;
|
||||
if (!food.getOrderFoods().contains(this)) {
|
||||
food.getOrderFoods().add(this);
|
||||
}
|
||||
}
|
||||
|
||||
public Integer getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setCount(Integer count) {
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id, order.getId(), food.getId(), count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null || getClass() != obj.getClass())
|
||||
return false;
|
||||
OrderFoodEntity other = (OrderFoodEntity) obj;
|
||||
return Objects.equals(id, other.id)
|
||||
&& Objects.equals(order.getId(), other.order.getId())
|
||||
&& Objects.equals(food.getId(), other.food.getId())
|
||||
&& count == other.count;
|
||||
}
|
||||
}
|
@ -0,0 +1,55 @@
|
||||
package com.example.backend.ordersfoods.model;
|
||||
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
|
||||
import jakarta.persistence.Embeddable;
|
||||
|
||||
@Embeddable
|
||||
public class OrderFoodId {
|
||||
private Long orderId;
|
||||
private Long foodId;
|
||||
|
||||
public OrderFoodId() {
|
||||
}
|
||||
|
||||
public OrderFoodId(Long orderId, Long foodId) {
|
||||
this.orderId = orderId;
|
||||
this.foodId = foodId;
|
||||
}
|
||||
|
||||
public Long getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setOrderId(Long orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
|
||||
public Long getFoodId() {
|
||||
return foodId;
|
||||
}
|
||||
|
||||
public void setFoodId(Long foodId) {
|
||||
this.foodId = foodId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(
|
||||
Optional.ofNullable(orderId).orElse(0L),
|
||||
Optional.ofNullable(foodId).orElse(0L));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null || getClass() != obj.getClass())
|
||||
return false;
|
||||
OrderFoodId other = (OrderFoodId) obj;
|
||||
return Objects.equals(orderId, other.orderId)
|
||||
&& Objects.equals(foodId, other.foodId);
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,64 @@
|
||||
package com.example.backend.types.api;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.modelmapper.ModelMapper;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.example.backend.core.configuration.Constants;
|
||||
import com.example.backend.types.model.TypeEntity;
|
||||
import com.example.backend.types.service.TypeService;
|
||||
|
||||
import jakarta.validation.Valid;
|
||||
|
||||
@RestController
|
||||
@RequestMapping(Constants.API_URL + "/type")
|
||||
public class TypeController {
|
||||
private final TypeService typeService;
|
||||
private final ModelMapper modelMapper;
|
||||
|
||||
public TypeController(TypeService typeService, ModelMapper modelMapper) {
|
||||
this.typeService = typeService;
|
||||
this.modelMapper = modelMapper;
|
||||
}
|
||||
|
||||
private TypeDto toDto(TypeEntity entity) {
|
||||
return modelMapper.map(entity, TypeDto.class);
|
||||
}
|
||||
|
||||
private TypeEntity toEntity(TypeDto dto) {
|
||||
return modelMapper.map(dto, TypeEntity.class);
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public List<TypeDto> getAll() {
|
||||
return typeService.getAll().stream().map(this::toDto).toList();
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public TypeDto get(@PathVariable(name = "id") Long id) {
|
||||
return toDto(typeService.get(id));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public TypeDto create(@RequestBody @Valid TypeDto dto) {
|
||||
return toDto(typeService.create(toEntity(dto)));
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public TypeDto update(@PathVariable(name = "id") Long id, @RequestBody @Valid TypeDto dto) {
|
||||
return toDto(typeService.update(id, toEntity(dto)));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public TypeDto delete(@PathVariable(name = "id") Long id) {
|
||||
return toDto(typeService.delete(id));
|
||||
}
|
||||
}
|
30
src/main/java/com/example/backend/types/api/TypeDto.java
Normal file
30
src/main/java/com/example/backend/types/api/TypeDto.java
Normal file
@ -0,0 +1,30 @@
|
||||
package com.example.backend.types.api;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
public class TypeDto {
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private Long id;
|
||||
@NotBlank
|
||||
@Size(min = 3, max = 50)
|
||||
private String name;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
@ -0,0 +1,48 @@
|
||||
package com.example.backend.types.model;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import com.example.backend.core.model.BaseEntity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
@Entity
|
||||
@Table(name = "categories")
|
||||
public class TypeEntity extends BaseEntity {
|
||||
@Column(nullable = false, unique = true, length = 50)
|
||||
private String name;
|
||||
|
||||
public TypeEntity() {
|
||||
}
|
||||
|
||||
public TypeEntity(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null || getClass() != obj.getClass())
|
||||
return false;
|
||||
final TypeEntity other = (TypeEntity) obj;
|
||||
return Objects.equals(other.getId(), id)
|
||||
&& Objects.equals(other.getName(), name);
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
package com.example.backend.types.repository;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
|
||||
import com.example.backend.types.model.TypeEntity;
|
||||
|
||||
public interface TypeRepository extends CrudRepository<TypeEntity, Long> {
|
||||
Optional<TypeEntity> findByNameIgnoreCase(String name);
|
||||
}
|
@ -0,0 +1,61 @@
|
||||
package com.example.backend.types.service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.StreamSupport;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.backend.core.error.NotFoundException;
|
||||
import com.example.backend.types.model.TypeEntity;
|
||||
import com.example.backend.types.repository.TypeRepository;
|
||||
|
||||
@Service
|
||||
public class TypeService {
|
||||
private final TypeRepository repository;
|
||||
|
||||
public TypeService(TypeRepository repository) {
|
||||
this.repository = repository;
|
||||
}
|
||||
|
||||
private void checkName(String name) {
|
||||
if (repository.findByNameIgnoreCase(name).isPresent()) {
|
||||
throw new IllegalArgumentException(
|
||||
String.format("Type with name %s is already exists", name));
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<TypeEntity> getAll() {
|
||||
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public TypeEntity get(long id) {
|
||||
return repository.findById(id)
|
||||
.orElseThrow(() -> new NotFoundException(TypeEntity.class, id));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public TypeEntity create(TypeEntity entity) {
|
||||
if (entity == null) {
|
||||
throw new IllegalArgumentException("Entity is null");
|
||||
}
|
||||
checkName(entity.getName());
|
||||
return repository.save(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public TypeEntity update(long id, TypeEntity entity) {
|
||||
final TypeEntity existsEntity = get(id);
|
||||
existsEntity.setName(entity.getName());
|
||||
return repository.save(existsEntity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public TypeEntity delete(long id) {
|
||||
final TypeEntity existsEntity = get(id);
|
||||
repository.delete(existsEntity);
|
||||
return existsEntity;
|
||||
}
|
||||
}
|
@ -0,0 +1,67 @@
|
||||
package com.example.backend.users.api;
|
||||
|
||||
import org.modelmapper.ModelMapper;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.example.backend.core.api.PageDto;
|
||||
import com.example.backend.core.api.PageDtoMapper;
|
||||
import com.example.backend.users.model.UserEntity;
|
||||
import com.example.backend.users.service.UserService;
|
||||
import com.example.backend.core.configuration.Constants;
|
||||
|
||||
import jakarta.validation.Valid;
|
||||
|
||||
@RestController
|
||||
@RequestMapping(Constants.API_URL + "/user")
|
||||
public class UserController {
|
||||
private final UserService userService;
|
||||
private final ModelMapper modelMapper;
|
||||
|
||||
public UserController(UserService userService, ModelMapper modelMapper) {
|
||||
this.userService = userService;
|
||||
this.modelMapper = modelMapper;
|
||||
}
|
||||
|
||||
private UserDto toDto(UserEntity entity) {
|
||||
return modelMapper.map(entity, UserDto.class);
|
||||
}
|
||||
|
||||
private UserEntity toEntity(UserDto dto) {
|
||||
return modelMapper.map(dto, UserEntity.class);
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public PageDto<UserDto> getAll(
|
||||
@RequestParam(name = "page", defaultValue = "0") int page,
|
||||
@RequestParam(name = "size", defaultValue = Constants.DEFAULT_PAGE_SIZE) int size) {
|
||||
return PageDtoMapper.toDto(userService.getAll(page, size), this::toDto);
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public UserDto get(@PathVariable(name = "id") Long id) {
|
||||
return toDto(userService.get(id));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public UserDto create(@RequestBody @Valid UserDto dto) {
|
||||
return toDto(userService.create(toEntity(dto)));
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public UserDto update(@PathVariable(name = "id") Long id, @RequestBody @Valid UserDto dto) {
|
||||
return toDto(userService.update(id, toEntity(dto)));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public UserDto delete(@PathVariable(name = "id") Long id) {
|
||||
return toDto(userService.delete(id));
|
||||
}
|
||||
}
|
63
src/main/java/com/example/backend/users/api/UserDto.java
Normal file
63
src/main/java/com/example/backend/users/api/UserDto.java
Normal file
@ -0,0 +1,63 @@
|
||||
package com.example.backend.users.api;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
public class UserDto {
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private Long id;
|
||||
@NotBlank
|
||||
@Size(min = 3, max = 20)
|
||||
private String login;
|
||||
@NotBlank
|
||||
@Size(min = 5, max = 254)
|
||||
private String email;
|
||||
@NotBlank
|
||||
@Size(min = 6, max = 16)
|
||||
private String password;
|
||||
@NotBlank
|
||||
@Size(min = 1, max = 20)
|
||||
private String accessLevel;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getLogin() {
|
||||
return login;
|
||||
}
|
||||
|
||||
public void setLogin(String name) {
|
||||
this.login = name;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String password) {
|
||||
this.password = password;
|
||||
}
|
||||
|
||||
public String getAccessLevel() {
|
||||
return accessLevel;
|
||||
}
|
||||
|
||||
public void setAccessLevel(String accessLevel) {
|
||||
this.accessLevel = accessLevel;
|
||||
}
|
||||
}
|
103
src/main/java/com/example/backend/users/model/UserEntity.java
Normal file
103
src/main/java/com/example/backend/users/model/UserEntity.java
Normal file
@ -0,0 +1,103 @@
|
||||
package com.example.backend.users.model;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.OrderBy;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import com.example.backend.core.model.BaseEntity;
|
||||
import com.example.backend.orders.model.OrderEntity;
|
||||
|
||||
@Entity
|
||||
@Table(name = "users")
|
||||
public class UserEntity extends BaseEntity {
|
||||
@Column(nullable = false, unique = true, length = 20)
|
||||
private String login;
|
||||
@Column(nullable = false, unique = true, length = 254)
|
||||
private String email;
|
||||
@Column(nullable = false, length = 16)
|
||||
private String password;
|
||||
@Column(nullable = false, length = 20)
|
||||
private String accessLevel;
|
||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
|
||||
@OrderBy("id ASC")
|
||||
private Set<OrderEntity> orders = new HashSet<>();
|
||||
|
||||
public UserEntity() {
|
||||
}
|
||||
|
||||
public UserEntity(String login, String email, String password, String accessLevel) {
|
||||
this.login = login;
|
||||
this.email = email;
|
||||
this.password = password;
|
||||
this.accessLevel = accessLevel;
|
||||
}
|
||||
|
||||
public String getLogin() {
|
||||
return login;
|
||||
}
|
||||
|
||||
public void setLogin(String name) {
|
||||
this.login = name;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String password) {
|
||||
this.password = password;
|
||||
}
|
||||
|
||||
public String getAccessLevel() {
|
||||
return accessLevel;
|
||||
}
|
||||
|
||||
public void setAccessLevel(String accessLevel) {
|
||||
this.accessLevel = accessLevel;
|
||||
}
|
||||
|
||||
public Set<OrderEntity> getOrders() {
|
||||
return orders;
|
||||
}
|
||||
|
||||
public void addOrder(OrderEntity order) {
|
||||
if (order.getUser() != this) {
|
||||
order.setUser(this);
|
||||
}
|
||||
orders.add(order);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id, login, email, password, accessLevel);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null || getClass() != obj.getClass())
|
||||
return false;
|
||||
UserEntity other = (UserEntity) obj;
|
||||
return Objects.equals(other.getId(), id)
|
||||
&& Objects.equals(other.getLogin(), login)
|
||||
&& Objects.equals(other.getEmail(), email)
|
||||
&& Objects.equals(other.getPassword(), password)
|
||||
&& Objects.equals(other.getAccessLevel(), accessLevel);
|
||||
}
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package com.example.backend.users.repository;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.data.repository.PagingAndSortingRepository;
|
||||
|
||||
import com.example.backend.users.model.UserEntity;
|
||||
|
||||
public interface UserRepository
|
||||
extends CrudRepository<UserEntity, Long>, PagingAndSortingRepository<UserEntity, Long> {
|
||||
Optional<UserEntity> findByLoginIgnoreCase(String login);
|
||||
}
|
@ -0,0 +1,72 @@
|
||||
package com.example.backend.users.service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.StreamSupport;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.backend.users.model.UserEntity;
|
||||
import com.example.backend.users.repository.UserRepository;
|
||||
import com.example.backend.core.error.NotFoundException;
|
||||
|
||||
@Service
|
||||
public class UserService {
|
||||
private final UserRepository repository;
|
||||
|
||||
public UserService(UserRepository repository) {
|
||||
this.repository = repository;
|
||||
}
|
||||
|
||||
private void checkLogin(String login) {
|
||||
if (repository.findByLoginIgnoreCase(login).isPresent()) {
|
||||
throw new IllegalArgumentException(
|
||||
String.format("User with login %s is already exists", login));
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<UserEntity> getAll() {
|
||||
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Page<UserEntity> getAll(int page, int size) {
|
||||
return repository.findAll(PageRequest.of(page, size));
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public UserEntity get(long id) {
|
||||
return repository.findById(id)
|
||||
.orElseThrow(() -> new NotFoundException(UserEntity.class, id));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public UserEntity create(UserEntity entity) {
|
||||
if (entity == null) {
|
||||
throw new IllegalArgumentException("Entity is null");
|
||||
}
|
||||
checkLogin(entity.getLogin());
|
||||
return repository.save(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public UserEntity update(long id, UserEntity entity) {
|
||||
final UserEntity existsEntity = get(id);
|
||||
existsEntity.setLogin(entity.getLogin());
|
||||
existsEntity.setEmail(entity.getEmail());
|
||||
existsEntity.setPassword(entity.getPassword());
|
||||
existsEntity.setAccessLevel(entity.getAccessLevel());
|
||||
repository.save(existsEntity);
|
||||
return existsEntity;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public UserEntity delete(long id) {
|
||||
final UserEntity existsEntity = get(id);
|
||||
repository.delete(existsEntity);
|
||||
return existsEntity;
|
||||
}
|
||||
}
|
20
src/main/resources/application.properties
Normal file
20
src/main/resources/application.properties
Normal file
@ -0,0 +1,20 @@
|
||||
# Server
|
||||
spring.main.banner-mode=off
|
||||
server.port=8080
|
||||
|
||||
# Logger settings
|
||||
# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
|
||||
logging.level.com.example.demo=DEBUG
|
||||
|
||||
# JPA Settings
|
||||
spring.datasource.url=jdbc:h2:file:./data
|
||||
spring.datasource.username=sa
|
||||
spring.datasource.password=password
|
||||
spring.datasource.driver-class-name=org.h2.Driver
|
||||
spring.jpa.hibernate.ddl-auto=create
|
||||
spring.jpa.open-in-view=false
|
||||
# spring.jpa.show-sql=true
|
||||
# spring.jpa.properties.hibernate.format_sql=true
|
||||
|
||||
# H2 console
|
||||
spring.h2.console.enabled=true
|
99
src/test/java/com/example/backend/FoodServiceTests.java
Normal file
99
src/test/java/com/example/backend/FoodServiceTests.java
Normal file
@ -0,0 +1,99 @@
|
||||
package com.example.backend;
|
||||
|
||||
import java.text.ParseException;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.dao.DataIntegrityViolationException;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.backend.core.error.NotFoundException;
|
||||
import com.example.backend.core.utils.Formatter;
|
||||
import com.example.backend.foods.model.FoodEntity;
|
||||
import com.example.backend.foods.service.FoodService;
|
||||
import com.example.backend.types.model.TypeEntity;
|
||||
import com.example.backend.types.service.TypeService;
|
||||
|
||||
@SpringBootTest
|
||||
class FoodServiceTests {
|
||||
@Autowired
|
||||
private TypeService typeService;
|
||||
|
||||
@Autowired
|
||||
private FoodService foodService;
|
||||
|
||||
private FoodEntity food;
|
||||
|
||||
@BeforeEach
|
||||
void createData() throws ParseException {
|
||||
removeData();
|
||||
|
||||
final var type1 = typeService.create(new TypeEntity("Бургер"));
|
||||
final var type2 = typeService.create(new TypeEntity("Шаурма"));
|
||||
final var type3 = typeService.create(new TypeEntity("Напиток"));
|
||||
|
||||
food = foodService.create(new FoodEntity(type1, "Бургер с ветчиной",
|
||||
700.00, Formatter.parse("2021-04-11"), 5624));
|
||||
foodService.create(new FoodEntity(type2, "Шаурма с курицей",
|
||||
775.00, Formatter.parse("2021-04-11"), 1240));
|
||||
foodService.create(new FoodEntity(type3, "Кола",
|
||||
977.00, Formatter.parse("2021-04-11"), 635));
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void removeData() {
|
||||
foodService.getAll(0L).forEach(item -> foodService.delete(item.getId()));
|
||||
typeService.getAll().forEach(item -> typeService.delete(item.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void getTest() {
|
||||
Assertions.assertThrows(NotFoundException.class, () -> foodService.get(0L));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@Test
|
||||
void createTest() {
|
||||
Assertions.assertEquals(3, foodService.getAll(0L).size());
|
||||
Assertions.assertEquals(food, foodService.get(food.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void createNullableTest() throws ParseException {
|
||||
final FoodEntity nullableFood = new FoodEntity(null, null,
|
||||
700.00, Formatter.parse("2021-04-11"), 5624);
|
||||
Assertions.assertThrows(DataIntegrityViolationException.class, () -> foodService.create(nullableFood));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@Test
|
||||
void updateTest() throws ParseException {
|
||||
final String test = "TEST";
|
||||
final TypeEntity newType = typeService.create(new TypeEntity("Детективы"));
|
||||
final String oldName = food.getName();
|
||||
final TypeEntity oldType = food.getType();
|
||||
final FoodEntity newEntity = foodService.update(food.getId(), new FoodEntity(newType, test,
|
||||
700.00, Formatter.parse("2021-04-11"), 5624));
|
||||
Assertions.assertEquals(3, foodService.getAll(0L).size());
|
||||
Assertions.assertEquals(newEntity, foodService.get(food.getId()));
|
||||
Assertions.assertEquals(test, newEntity.getName());
|
||||
Assertions.assertEquals(newType, newEntity.getType());
|
||||
Assertions.assertNotEquals(oldName, newEntity.getName());
|
||||
Assertions.assertNotEquals(oldType, newEntity.getType());
|
||||
}
|
||||
|
||||
@Test
|
||||
void deleteTest() {
|
||||
foodService.delete(food.getId());
|
||||
Assertions.assertEquals(2, foodService.getAll(0L).size());
|
||||
|
||||
final FoodEntity newEntity = foodService.create(new FoodEntity(food.getType(), food.getName(),
|
||||
food.getPrice(), food.getDate(), food.getCount()));
|
||||
Assertions.assertEquals(3, typeService.getAll().size());
|
||||
Assertions.assertNotEquals(food.getId(), newEntity.getId());
|
||||
}
|
||||
}
|
130
src/test/java/com/example/backend/OrderServiceTests.java
Normal file
130
src/test/java/com/example/backend/OrderServiceTests.java
Normal file
@ -0,0 +1,130 @@
|
||||
package com.example.backend;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.dao.DataIntegrityViolationException;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.backend.orders.model.OrderEntity;
|
||||
import com.example.backend.orders.service.OrderService;
|
||||
import com.example.backend.types.model.TypeEntity;
|
||||
import com.example.backend.types.service.TypeService;
|
||||
import com.example.backend.users.model.UserEntity;
|
||||
import com.example.backend.users.service.UserService;
|
||||
import com.example.backend.core.error.NotFoundException;
|
||||
import com.example.backend.core.utils.Formatter;
|
||||
import com.example.backend.foods.model.FoodEntity;
|
||||
import com.example.backend.foods.service.FoodService;
|
||||
|
||||
@SpringBootTest
|
||||
class OrderServiceTests {
|
||||
@Autowired
|
||||
private TypeService typeService;
|
||||
|
||||
@Autowired
|
||||
private FoodService foodService;
|
||||
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
|
||||
@Autowired
|
||||
private OrderService orderService;
|
||||
|
||||
private OrderEntity order;
|
||||
|
||||
private UserEntity user;
|
||||
|
||||
private FoodEntity food1;
|
||||
private FoodEntity food2;
|
||||
private FoodEntity food3;
|
||||
|
||||
@BeforeEach
|
||||
void createData() throws ParseException {
|
||||
removeData();
|
||||
|
||||
final var type = typeService.create(new TypeEntity("Бургер"));
|
||||
food1 = foodService.create(new FoodEntity(type, "Бургер с салатом",
|
||||
700.00, Formatter.parse("2021-04-11"), 5624));
|
||||
food2 = foodService.create(new FoodEntity(type, "Бургер с говядиной",
|
||||
775.00, Formatter.parse("2021-04-11"), 1240));
|
||||
food3 = foodService.create(new FoodEntity(type, "Бургер с курицей",
|
||||
977.00, Formatter.parse("2021-04-11"), 635));
|
||||
user = userService
|
||||
.create(new UserEntity("Chief", "forum98761@gmail.com", "bth4323", "admin"));
|
||||
order = orderService
|
||||
.create(user.getId(), new OrderEntity("Выполняется"),
|
||||
Map.of(food1.getId(), 3, food2.getId(), 1, food3.getId(), 2));
|
||||
orderService
|
||||
.create(user.getId(),
|
||||
new OrderEntity("Выдан"),
|
||||
Map.of(food1.getId(), 5));
|
||||
orderService
|
||||
.create(user.getId(),
|
||||
new OrderEntity("Готов"),
|
||||
Map.of(food2.getId(), 1, food3.getId(), 1));
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void removeData() {
|
||||
userService.getAll().forEach(item -> userService.delete(item.getId()));
|
||||
foodService.getAll(0L).forEach(item -> foodService.delete(item.getId()));
|
||||
typeService.getAll().forEach(item -> typeService.delete(item.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void getTest() {
|
||||
Assertions.assertThrows(NotFoundException.class, () -> orderService.get(user.getId(), 0L));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@Test
|
||||
void createTest() {
|
||||
Assertions.assertEquals(3, orderService.getAll(user.getId()).size());
|
||||
Assertions.assertEquals(order, orderService.get(user.getId(), order.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void createNullableTest() {
|
||||
final OrderEntity nullableOrder = new OrderEntity(null);
|
||||
Assertions.assertThrows(DataIntegrityViolationException.class,
|
||||
() -> orderService.create(user.getId(), nullableOrder,
|
||||
Map.of(food1.getId(), 3, food2.getId(), 1, food3.getId(), 2)));
|
||||
}
|
||||
|
||||
@Test
|
||||
void deleteTest() {
|
||||
orderService.delete(user.getId(), order.getId());
|
||||
Assertions.assertEquals(2, orderService.getAll(user.getId()).size());
|
||||
|
||||
final OrderEntity newEntity = orderService.create(user.getId(),
|
||||
new OrderEntity(order.getStatus()),
|
||||
Map.of(food1.getId(), 3, food2.getId(), 1, food3.getId(), 2));
|
||||
Assertions.assertEquals(3, orderService.getAll(user.getId()).size());
|
||||
Assertions.assertNotEquals(order.getId(), newEntity.getId());
|
||||
}
|
||||
|
||||
@Test
|
||||
void getSumTest() {
|
||||
Double sum = orderService.getSum(user.getId(), order.getId());
|
||||
Assertions.assertEquals(food1.getPrice() * 3 + food2.getPrice() + food3.getPrice() * 2, sum);
|
||||
}
|
||||
|
||||
@Test
|
||||
void getFullCountTest() {
|
||||
Integer count = orderService.getFullCount(user.getId(), order.getId());
|
||||
Assertions.assertEquals(6, count);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@Test
|
||||
void getOrderFoodsTest() {
|
||||
Assertions.assertEquals(3, orderService.getOrderFoods(user.getId(), order.getId()).size());
|
||||
}
|
||||
}
|
79
src/test/java/com/example/backend/TypeServiceTests.java
Normal file
79
src/test/java/com/example/backend/TypeServiceTests.java
Normal file
@ -0,0 +1,79 @@
|
||||
package com.example.backend;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.dao.DataIntegrityViolationException;
|
||||
|
||||
import com.example.backend.core.error.NotFoundException;
|
||||
import com.example.backend.types.model.TypeEntity;
|
||||
import com.example.backend.types.service.TypeService;
|
||||
|
||||
@SpringBootTest
|
||||
class TypeServiceTests {
|
||||
@Autowired
|
||||
private TypeService typeService;
|
||||
|
||||
private TypeEntity type;
|
||||
|
||||
@BeforeEach
|
||||
void createData() {
|
||||
removeData();
|
||||
|
||||
type = typeService.create(new TypeEntity("Фэнтези"));
|
||||
typeService.create(new TypeEntity("Художественная литература"));
|
||||
typeService.create(new TypeEntity("Книги для подростков"));
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void removeData() {
|
||||
typeService.getAll().forEach(item -> typeService.delete(item.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void getTest() {
|
||||
Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L));
|
||||
}
|
||||
|
||||
@Test
|
||||
void createTest() {
|
||||
Assertions.assertEquals(3, typeService.getAll().size());
|
||||
Assertions.assertEquals(type, typeService.get(type.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void createNotUniqueTest() {
|
||||
final TypeEntity nonUniqueType = new TypeEntity("Фэнтези");
|
||||
Assertions.assertThrows(IllegalArgumentException.class, () -> typeService.create(nonUniqueType));
|
||||
}
|
||||
|
||||
@Test
|
||||
void createNullableTest() {
|
||||
final TypeEntity nullableType = new TypeEntity(null);
|
||||
Assertions.assertThrows(DataIntegrityViolationException.class, () -> typeService.create(nullableType));
|
||||
}
|
||||
|
||||
@Test
|
||||
void updateTest() {
|
||||
final String test = "TEST";
|
||||
final String oldName = type.getName();
|
||||
final TypeEntity newEntity = typeService.update(type.getId(), new TypeEntity(test));
|
||||
Assertions.assertEquals(3, typeService.getAll().size());
|
||||
Assertions.assertEquals(newEntity, typeService.get(type.getId()));
|
||||
Assertions.assertEquals(test, newEntity.getName());
|
||||
Assertions.assertNotEquals(oldName, newEntity.getName());
|
||||
}
|
||||
|
||||
@Test
|
||||
void deleteTest() {
|
||||
typeService.delete(type.getId());
|
||||
Assertions.assertEquals(2, typeService.getAll().size());
|
||||
|
||||
final TypeEntity newEntity = typeService.create(new TypeEntity(type.getName()));
|
||||
Assertions.assertEquals(3, typeService.getAll().size());
|
||||
Assertions.assertNotEquals(type.getId(), newEntity.getId());
|
||||
}
|
||||
}
|
84
src/test/java/com/example/backend/UserServiceTests.java
Normal file
84
src/test/java/com/example/backend/UserServiceTests.java
Normal file
@ -0,0 +1,84 @@
|
||||
package com.example.backend;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.dao.DataIntegrityViolationException;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.backend.users.model.UserEntity;
|
||||
import com.example.backend.users.service.UserService;
|
||||
import com.example.backend.core.error.NotFoundException;
|
||||
|
||||
@SpringBootTest
|
||||
class UserServiceTests {
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
|
||||
private UserEntity user;
|
||||
|
||||
@BeforeEach
|
||||
void createData() {
|
||||
removeData();
|
||||
|
||||
user = userService.create(new UserEntity("Chief", "forum98761@gmail.com", "bth4323", "admin"));
|
||||
userService.create(new UserEntity("Dude23", "ovalinartem25@gmail.com", "dsre32462", "user"));
|
||||
userService.create(new UserEntity("TestUser", "user53262@gmail.com", "lawy7728", "user"));
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void removeData() {
|
||||
userService.getAll().forEach(item -> userService.delete(item.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void getTest() {
|
||||
Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@Test
|
||||
void createTest() {
|
||||
Assertions.assertEquals(3, userService.getAll().size());
|
||||
Assertions.assertEquals(user, userService.get(user.getId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void createNotUniqueTest() {
|
||||
final UserEntity nonUniqueUser = new UserEntity("Chief", "forum98761@gmail.com", "bth4323", "admin");
|
||||
Assertions.assertThrows(IllegalArgumentException.class, () -> userService.create(nonUniqueUser));
|
||||
}
|
||||
|
||||
@Test
|
||||
void createNullableTest() {
|
||||
final UserEntity nullableUser = new UserEntity(null, "forum98761@gmail.com", "bth4323", "admin");
|
||||
Assertions.assertThrows(DataIntegrityViolationException.class, () -> userService.create(nullableUser));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@Test
|
||||
void updateTest() {
|
||||
final String test = "TEST";
|
||||
final String oldLogin = user.getLogin();
|
||||
final UserEntity newEntity = userService.update(user.getId(),
|
||||
new UserEntity(test, "forum98761@gmail.com", "bth4323", "admin"));
|
||||
Assertions.assertEquals(3, userService.getAll().size());
|
||||
Assertions.assertEquals(newEntity, userService.get(user.getId()));
|
||||
Assertions.assertEquals(test, newEntity.getLogin());
|
||||
Assertions.assertNotEquals(oldLogin, newEntity.getLogin());
|
||||
}
|
||||
|
||||
@Test
|
||||
void deleteTest() {
|
||||
userService.delete(user.getId());
|
||||
Assertions.assertEquals(2, userService.getAll().size());
|
||||
|
||||
final UserEntity newEntity = userService
|
||||
.create(new UserEntity("Chief", "forum98761@gmail.com", "bth4323", "admin"));
|
||||
Assertions.assertEquals(3, userService.getAll().size());
|
||||
Assertions.assertNotEquals(user.getId(), newEntity.getId());
|
||||
}
|
||||
}
|
14
src/test/resources/application.properties
Normal file
14
src/test/resources/application.properties
Normal file
@ -0,0 +1,14 @@
|
||||
# Server
|
||||
spring.main.banner-mode=off
|
||||
|
||||
# Logger settings
|
||||
# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
|
||||
logging.level.com.example.demo=DEBUG
|
||||
|
||||
# JPA Settings
|
||||
spring.datasource.url=jdbc:h2:mem:testdb
|
||||
spring.datasource.username=sa
|
||||
spring.datasource.password=password
|
||||
spring.datasource.driver-class-name=org.h2.Driver
|
||||
spring.jpa.hibernate.ddl-auto=create
|
||||
spring.jpa.open-in-view=false
|
Loading…
Reference in New Issue
Block a user