Залил лаб2 (забыл залить после сдачи)
This commit is contained in:
parent
5b99ae8ed3
commit
2e2e61f900
14
.vscode/launch.json
vendored
Normal file
14
.vscode/launch.json
vendored
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"type": "java",
|
||||||
|
"name": "Spring Boot-DemoApplication<Lab2>",
|
||||||
|
"request": "launch",
|
||||||
|
"cwd": "${workspaceFolder}",
|
||||||
|
"mainClass": "com.example.demo.DemoApplication",
|
||||||
|
"projectName": "Lab2",
|
||||||
|
"args": "--populate",
|
||||||
|
"envFile": "${workspaceFolder}/.env"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
3
.vscode/settings.json
vendored
Normal file
3
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"java.configuration.updateBuildConfiguration": "automatic"
|
||||||
|
}
|
||||||
37
Lab2/.gitignore
vendored
Normal file
37
Lab2/.gitignore
vendored
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
HELP.md
|
||||||
|
.gradle
|
||||||
|
build/
|
||||||
|
!gradle/wrapper/gradle-wrapper.jar
|
||||||
|
!**/src/main/**/build/
|
||||||
|
!**/src/test/**/build/
|
||||||
|
|
||||||
|
### STS ###
|
||||||
|
.apt_generated
|
||||||
|
.classpath
|
||||||
|
.factorypath
|
||||||
|
.project
|
||||||
|
.settings
|
||||||
|
.springBeans
|
||||||
|
.sts4-cache
|
||||||
|
bin/
|
||||||
|
!**/src/main/**/bin/
|
||||||
|
!**/src/test/**/bin/
|
||||||
|
|
||||||
|
### IntelliJ IDEA ###
|
||||||
|
.idea
|
||||||
|
*.iws
|
||||||
|
*.iml
|
||||||
|
*.ipr
|
||||||
|
out/
|
||||||
|
!**/src/main/**/out/
|
||||||
|
!**/src/test/**/out/
|
||||||
|
|
||||||
|
### NetBeans ###
|
||||||
|
/nbproject/private/
|
||||||
|
/nbbuild/
|
||||||
|
/dist/
|
||||||
|
/nbdist/
|
||||||
|
/.nb-gradle/
|
||||||
|
|
||||||
|
### VS Code ###
|
||||||
|
.vscode/
|
||||||
29
Lab2/build.gradle
Normal file
29
Lab2/build.gradle
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java'
|
||||||
|
id 'org.springframework.boot' version '3.2.3'
|
||||||
|
id 'io.spring.dependency-management' version '1.1.4'
|
||||||
|
}
|
||||||
|
|
||||||
|
group = 'com.example'
|
||||||
|
version = '0.0.1-SNAPSHOT'
|
||||||
|
|
||||||
|
java {
|
||||||
|
sourceCompatibility = '17'
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
|
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-validation'
|
||||||
|
|
||||||
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('test') {
|
||||||
|
useJUnitPlatform()
|
||||||
|
}
|
||||||
BIN
Lab2/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
Lab2/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
7
Lab2/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
7
Lab2/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
Lab2/gradlew
vendored
Normal file
249
Lab2/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
Lab2/gradlew.bat
vendored
Normal file
92
Lab2/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
Lab2/settings.gradle
Normal file
1
Lab2/settings.gradle
Normal file
@ -0,0 +1 @@
|
|||||||
|
rootProject.name = 'demo'
|
||||||
60
Lab2/src/main/java/com/example/demo/DemoApplication.java
Normal file
60
Lab2/src/main/java/com/example/demo/DemoApplication.java
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
package com.example.demo;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
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.demo.games.model.GameEntity;
|
||||||
|
import com.example.demo.games.service.GameService;
|
||||||
|
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.service.UserService;
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
public class DemoApplication implements CommandLineRunner {
|
||||||
|
private final Logger log = LoggerFactory.getLogger(DemoApplication.class);
|
||||||
|
|
||||||
|
private final TypeService typeService;
|
||||||
|
|
||||||
|
private final GameService gameService;
|
||||||
|
|
||||||
|
private final UserService userService;
|
||||||
|
|
||||||
|
// private final ItemService itemService;
|
||||||
|
|
||||||
|
public DemoApplication(TypeService typeService, GameService gameService, UserService userService) {
|
||||||
|
this.typeService = typeService;
|
||||||
|
this.gameService = gameService;
|
||||||
|
this.userService = userService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
SpringApplication.run(DemoApplication.class, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Создавать данные
|
||||||
|
@Override
|
||||||
|
public void run(String... args) throws Exception {
|
||||||
|
if (args.length > 0 && Objects.equals("--populate", args[0])) {
|
||||||
|
log.info("Create default types");
|
||||||
|
final var type1 = typeService.create(new TypeEntity(null, "FMV"));
|
||||||
|
final var type2 = typeService.create(new TypeEntity(null, "Экшен"));
|
||||||
|
final var type3 = typeService.create(new TypeEntity(null, "Стратегия"));
|
||||||
|
|
||||||
|
log.info("Create default games");
|
||||||
|
gameService.create(new GameEntity(null, type1, "Пробная игра 1", 100, "Пробное описание 1"));
|
||||||
|
gameService.create(new GameEntity(null, type2, "Пробная игра 2", 200, "Пробное описание 2"));
|
||||||
|
gameService.create(new GameEntity(null, type3, "Пробная игра 3", 300, "Пробное описание 3"));
|
||||||
|
|
||||||
|
log.info("Create default users");
|
||||||
|
userService.create(new UserEntity(null, "Пробный пользователь 1", "proba1@mail.ru", "password1"));
|
||||||
|
userService.create(new UserEntity(null, "Пробный пользователь 2", "proba2@mail.ru", "password2"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,8 @@
|
|||||||
|
package com.example.demo.core.configuration;
|
||||||
|
|
||||||
|
public class Constants {
|
||||||
|
public static final String API_URL = "/api/1.0";
|
||||||
|
|
||||||
|
private Constants() {
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
package com.example.demo.core.configuration;
|
||||||
|
|
||||||
|
import org.modelmapper.ModelMapper;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class MapperConfiguration {
|
||||||
|
@Bean
|
||||||
|
ModelMapper modelMapper() {
|
||||||
|
return new ModelMapper();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
package com.example.demo.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.demo.core.error;
|
||||||
|
|
||||||
|
public class NotFoundException extends RuntimeException {
|
||||||
|
public NotFoundException(Long id) {
|
||||||
|
super(String.format("Entity with id [%s] is not found or not exists", id));
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
package com.example.demo.core.model;
|
||||||
|
|
||||||
|
public abstract class BaseEntity {
|
||||||
|
protected Long id;
|
||||||
|
|
||||||
|
protected BaseEntity() {
|
||||||
|
}
|
||||||
|
|
||||||
|
protected BaseEntity(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
package com.example.demo.core.repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface CommonRepository<E, T> {
|
||||||
|
List<E> getAll();
|
||||||
|
|
||||||
|
E get(T id);
|
||||||
|
|
||||||
|
E create(E entity);
|
||||||
|
|
||||||
|
E update(E entity);
|
||||||
|
|
||||||
|
E delete(E entity);
|
||||||
|
|
||||||
|
void deleteAll();
|
||||||
|
}
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
package com.example.demo.core.repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.TreeMap;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
|
||||||
|
// Родительский класс хранилища (в виде словаря с Id и основными данными) для всех остальных сущностей
|
||||||
|
// CommonRepository - кастомный интерфейс хранилища
|
||||||
|
|
||||||
|
public abstract class MapRepository<E extends BaseEntity> implements CommonRepository<E, Long> {
|
||||||
|
private final Map<Long, E> entities = new TreeMap<>();
|
||||||
|
// 0L - 0, но не int, а long
|
||||||
|
private Long lastId = 0L;
|
||||||
|
|
||||||
|
protected MapRepository() {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<E> getAll() {
|
||||||
|
return entities.values().stream().toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public E get(Long id) {
|
||||||
|
return entities.get(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public E create(E entity) {
|
||||||
|
lastId++;
|
||||||
|
entity.setId(lastId);
|
||||||
|
entities.put(lastId, entity);
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public E update(E entity) {
|
||||||
|
if (get(entity.getId()) == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
entities.put(entity.getId(), entity);
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public E delete(E entity) {
|
||||||
|
if (get(entity.getId()) == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
entities.remove(entity.getId());
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteAll() {
|
||||||
|
lastId = 0L;
|
||||||
|
entities.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,76 @@
|
|||||||
|
package com.example.demo.games.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.RequestParam;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import com.example.demo.core.configuration.Constants;
|
||||||
|
import com.example.demo.games.model.GameEntity;
|
||||||
|
import com.example.demo.games.service.GameService;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping(Constants.API_URL + "/game")
|
||||||
|
public class GameController {
|
||||||
|
private final GameService gameService;
|
||||||
|
private final TypeService typeService;
|
||||||
|
private final ModelMapper modelMapper;
|
||||||
|
|
||||||
|
public GameController(GameService gameService, TypeService typeService, ModelMapper modelMapper) {
|
||||||
|
this.gameService = gameService;
|
||||||
|
this.typeService = typeService;
|
||||||
|
this.modelMapper = modelMapper;
|
||||||
|
}
|
||||||
|
|
||||||
|
private GameDto toDto(GameEntity entity) {
|
||||||
|
return modelMapper.map(entity, GameDto.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
private GameEntity toEntity(GameDto dto) {
|
||||||
|
final GameEntity entity = modelMapper.map(dto, GameEntity.class);
|
||||||
|
entity.setType(typeService.get(dto.getTypeId()));
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Получение всех игр по id жанра, по умолчанию id = 0 => (из бизнес-логики) вывод игр всех жанров по умолчанию
|
||||||
|
@GetMapping
|
||||||
|
public List<GameDto> getAll(@RequestParam(name = "typeId", defaultValue = "0") Long typeId) {
|
||||||
|
return gameService.getAll(typeId).stream().map(this::toDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public GameDto get(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(gameService.get(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public GameDto create(@RequestBody @Valid GameDto dto) {
|
||||||
|
return toDto(gameService.create(toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@PutMapping("/{id}")
|
||||||
|
public GameDto update(@PathVariable(name = "id") Long id, @RequestBody @Valid GameDto dto) {
|
||||||
|
return toDto(gameService.update(id, toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public GameDto delete(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(gameService.delete(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
76
Lab2/src/main/java/com/example/demo/games/api/GameDto.java
Normal file
76
Lab2/src/main/java/com/example/demo/games/api/GameDto.java
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
package com.example.demo.games.api;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.Min;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
public class GameDto {
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Min(1)
|
||||||
|
private Long typeId;
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
private String title;
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Min(1)
|
||||||
|
private Integer price;
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
private String description;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
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 getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTitle(String title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public Integer getPrice() {
|
||||||
|
return price;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPrice(Integer price) {
|
||||||
|
this.price = price;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDescription(String description) {
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,65 @@
|
|||||||
|
package com.example.demo.games.model;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
|
||||||
|
// Сама сущность игры (ДОБАВИТЬ ФОТО)
|
||||||
|
public class GameEntity extends BaseEntity {
|
||||||
|
private TypeEntity type;
|
||||||
|
private String title;
|
||||||
|
private Integer price;
|
||||||
|
private String description;
|
||||||
|
|
||||||
|
public GameEntity() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
public GameEntity(Long id, TypeEntity type, String title, Integer price, String description) {
|
||||||
|
super(id);
|
||||||
|
this.type = type;
|
||||||
|
this.title = title;
|
||||||
|
this.price = price;
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public TypeEntity getType() {
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setType(TypeEntity type) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTitle(String title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public Integer getPrice() {
|
||||||
|
return price;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPrice(Integer price) {
|
||||||
|
this.price = price;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDescription(String description) {
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
package com.example.demo.games.repository;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import com.example.demo.core.repository.MapRepository;
|
||||||
|
import com.example.demo.games.model.GameEntity;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public class GameRepository extends MapRepository<GameEntity> {
|
||||||
|
}
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
package com.example.demo.games.service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.games.model.GameEntity;
|
||||||
|
import com.example.demo.games.repository.GameRepository;
|
||||||
|
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class GameService {
|
||||||
|
private final GameRepository repository;
|
||||||
|
|
||||||
|
public GameService(GameRepository repository) {
|
||||||
|
this.repository = repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
//ПОЛУЧЕНИЕ ВСЕХ ИГР (С ВОЗМОЖНОЙ ФИЛЬТРАЦИЕЙ ПО ЖАНРУ (по его id))
|
||||||
|
//МБ СДЕЛАТЬ отдельный getAll для получения всех игр всех жанров
|
||||||
|
public List<GameEntity> getAll(Long typeId) {
|
||||||
|
//Если передан typeId=0, то возвращение всех игр (всех жанров)
|
||||||
|
if (Objects.equals(typeId, 0L)) {
|
||||||
|
return repository.getAll();
|
||||||
|
}
|
||||||
|
// возвращение всех игр, у которых у жанра тот же id, что и был передан
|
||||||
|
return repository.getAll().stream().filter(item -> item.getType().getId().equals(typeId)).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public GameEntity get(Long id) {
|
||||||
|
// Если объект не null, вернёт его; если null, вернёт кастомное исключение
|
||||||
|
return Optional.ofNullable(repository.get(id)).orElseThrow(() -> new NotFoundException(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
public GameEntity create(GameEntity entity) {
|
||||||
|
return repository.create(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public GameEntity update(Long id, GameEntity entity) {
|
||||||
|
final GameEntity existedEntity = get(id);
|
||||||
|
|
||||||
|
existedEntity.setType(entity.getType());
|
||||||
|
existedEntity.setTitle(entity.getTitle());
|
||||||
|
existedEntity.setPrice(entity.getPrice());
|
||||||
|
existedEntity.setDescription(entity.getDescription());
|
||||||
|
|
||||||
|
return repository.update(existedEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public GameEntity delete(Long id) {
|
||||||
|
final GameEntity existsEntity = get(id);
|
||||||
|
return repository.delete(existsEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteAll() {
|
||||||
|
repository.deleteAll();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,68 @@
|
|||||||
|
package com.example.demo.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.demo.core.configuration.Constants;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
//RequestMapping - доступ ко всем методам контроллера только по адресу в скобках
|
||||||
|
@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 - обработка HTTP GET-запросов; более короткий аналог RequestMapping(value = "/", method = RequestMethod.GET)
|
||||||
|
@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 - добавление
|
||||||
|
@PostMapping
|
||||||
|
public TypeDto create(@RequestBody @Valid TypeDto dto) {
|
||||||
|
return toDto(typeService.create(toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
//PutMapping - обновление
|
||||||
|
@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));
|
||||||
|
}
|
||||||
|
}
|
||||||
29
Lab2/src/main/java/com/example/demo/types/api/TypeDto.java
Normal file
29
Lab2/src/main/java/com/example/demo/types/api/TypeDto.java
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
package com.example.demo.types.api;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
|
||||||
|
public class TypeDto {
|
||||||
|
private Long id;
|
||||||
|
//название не null
|
||||||
|
@NotBlank
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
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,50 @@
|
|||||||
|
package com.example.demo.types.model;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
// Сама сущность вида игры
|
||||||
|
public class TypeEntity extends BaseEntity {
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
public TypeEntity() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
public TypeEntity(Long id, String name) {
|
||||||
|
super(id);
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Сравнение 2 типов (жанров) игр
|
||||||
|
//перегрузка метода equals
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Если пришедший объект пустой или другого класса, то жанры не равны
|
||||||
|
if (obj == null || getClass() != obj.getClass()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final TypeEntity second = (TypeEntity) obj;
|
||||||
|
//Сравнение по id и названию
|
||||||
|
return Objects.equals(second.getId(), id) && Objects.equals(second.getName(), name);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
package com.example.demo.types.repository;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import com.example.demo.core.repository.MapRepository;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public class TypeRepository extends MapRepository<TypeEntity> {
|
||||||
|
}
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
package com.example.demo.types.service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.types.repository.TypeRepository;
|
||||||
|
|
||||||
|
//Бизнес-логика жанров (типов) игр
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class TypeService {
|
||||||
|
// Словарь со всеми жанрами
|
||||||
|
private final TypeRepository repository;
|
||||||
|
|
||||||
|
public TypeService(TypeRepository repository) {
|
||||||
|
this.repository = repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<TypeEntity> getAll() {
|
||||||
|
return repository.getAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
public TypeEntity get(Long id) {
|
||||||
|
// Если объект не null, вернёт его; если null, вернёт кастомное исключение
|
||||||
|
return Optional.ofNullable(repository.get(id)).orElseThrow(() -> new NotFoundException(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
public TypeEntity create(TypeEntity entity) {
|
||||||
|
return repository.create(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TypeEntity update(Long id, TypeEntity entity) {
|
||||||
|
//Получение жанра по id
|
||||||
|
final TypeEntity existedEntity = get(id);
|
||||||
|
//Установка такого же имени, как у переданного жанра
|
||||||
|
existedEntity.setName(entity.getName());
|
||||||
|
//Обновление жанра с переданным id в словаре
|
||||||
|
return repository.update(existedEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TypeEntity delete(Long id) {
|
||||||
|
//Получение жанра по id
|
||||||
|
final TypeEntity existedEntity = get(id);
|
||||||
|
//Удаление этого жанра из словаря
|
||||||
|
return repository.delete(existedEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteAll() {
|
||||||
|
repository.deleteAll();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,93 @@
|
|||||||
|
package com.example.demo.users.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.demo.core.configuration.Constants;
|
||||||
|
import com.example.demo.games.model.GameEntity;
|
||||||
|
import com.example.demo.games.service.GameService;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.service.UserService;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
//RequestMapping - доступ ко всем методам контроллера только по адресу в скобках
|
||||||
|
@RequestMapping(Constants.API_URL + "/user")
|
||||||
|
public class UserController {
|
||||||
|
//бизнес-логика
|
||||||
|
private final UserService userService;
|
||||||
|
|
||||||
|
private final GameService gameService;
|
||||||
|
|
||||||
|
private final ModelMapper modelMapper;
|
||||||
|
|
||||||
|
public UserController(UserService userService, ModelMapper modelMapper, GameService gameService) {
|
||||||
|
this.userService = userService;
|
||||||
|
this.gameService = gameService;
|
||||||
|
this.modelMapper = modelMapper;
|
||||||
|
}
|
||||||
|
|
||||||
|
private UserDto toDto(UserEntity entity) {
|
||||||
|
// return modelMapper.map(entity, UserDto.class);
|
||||||
|
final var dto = new UserDto();
|
||||||
|
dto.setId(entity.getId());
|
||||||
|
dto.setName(entity.getName());
|
||||||
|
dto.setEmail(entity.getEmail());
|
||||||
|
dto.setPassword(entity.getPassword());
|
||||||
|
dto.setGames(entity.getGames().stream().map(GameEntity::getId).toList());
|
||||||
|
return dto;
|
||||||
|
}
|
||||||
|
|
||||||
|
private UserEntity toEntity(UserDto dto) {
|
||||||
|
return modelMapper.map(dto, UserEntity.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
//GetMapping - обработка HTTP GET-запросов; более короткий аналог RequestMapping(value = "/", method = RequestMethod.GET)
|
||||||
|
@GetMapping
|
||||||
|
public List<UserDto> getAll() {
|
||||||
|
return userService.getAll().stream().map(this::toDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public UserDto get(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(userService.get(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
//PostMapping - добавление
|
||||||
|
@PostMapping
|
||||||
|
public UserDto create(@Valid @RequestBody UserDto dto) {
|
||||||
|
return toDto(userService.create(toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
//PostMapping - добавление
|
||||||
|
@PostMapping("/{id}/game/{gameId}")
|
||||||
|
public UserDto addGame(@PathVariable(name="id") Long id, @PathVariable(name="gameId") Long gameId) {
|
||||||
|
return toDto(userService.addGame(id, gameService.get(gameId)));
|
||||||
|
}
|
||||||
|
|
||||||
|
//PutMapping - обновление
|
||||||
|
@PutMapping("/{id}")
|
||||||
|
public UserDto update(@PathVariable(name = "id") Long id, @Valid @RequestBody UserDto dto) {
|
||||||
|
return toDto(userService.update(id, toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public UserDto delete(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(userService.delete(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}/game/{gameId}")
|
||||||
|
public UserDto deleteGame(@PathVariable(name="id") Long id, @PathVariable(name="gameId") Long gameId) {
|
||||||
|
return toDto(userService.deleteGame(id, gameService.get(gameId)));
|
||||||
|
}
|
||||||
|
}
|
||||||
76
Lab2/src/main/java/com/example/demo/users/api/UserDto.java
Normal file
76
Lab2/src/main/java/com/example/demo/users/api/UserDto.java
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
package com.example.demo.users.api;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.Email;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
|
||||||
|
|
||||||
|
import com.example.demo.games.model.GameEntity;
|
||||||
|
|
||||||
|
public class UserDto {
|
||||||
|
private Long id;
|
||||||
|
//ник, почта и пароль не null
|
||||||
|
@NotBlank
|
||||||
|
private String name;
|
||||||
|
@NotBlank
|
||||||
|
@Email(message = "Email должен быть валидным", regexp = "^([\\w\\.-]+)@([a-zA-Z\\d\\.-]+)\\.([a-zA-Z]{2,})$")
|
||||||
|
private String email;
|
||||||
|
@NotBlank
|
||||||
|
private String password;
|
||||||
|
//У пользователя может не быть игр, поэтому нет NotEmptyv
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
private List<Long> games = new ArrayList<>();
|
||||||
|
|
||||||
|
//можно только читать для сериализации, нельзя записывать (устанавливать) во время десериализации
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
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 List<Long> getGames() {
|
||||||
|
return games;
|
||||||
|
}
|
||||||
|
public void setGames(List<Long> games) {
|
||||||
|
this.games = games;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,94 @@
|
|||||||
|
package com.example.demo.users.model;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
import com.example.demo.games.model.GameEntity;
|
||||||
|
|
||||||
|
// Сама сущность пользователя
|
||||||
|
public class UserEntity extends BaseEntity {
|
||||||
|
private String name;
|
||||||
|
private String email;
|
||||||
|
private String password;
|
||||||
|
private final Set<GameEntity> games = new LinkedHashSet<>();
|
||||||
|
|
||||||
|
public UserEntity() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserEntity(Long id, String name, String email, String password) {
|
||||||
|
super(id);
|
||||||
|
this.name = name;
|
||||||
|
this.email = email;
|
||||||
|
this.password = password;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Получение - установление значения имени (ника) пользователя
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = 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 void addGame(GameEntity game) {
|
||||||
|
games.add(game);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteGame(GameEntity game) {
|
||||||
|
games.remove(game);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Set<GameEntity> getGames() {
|
||||||
|
return games;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(id, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Сравнение 2 пользователей
|
||||||
|
//перегрузка метода equals
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Если пришедший объект пустой или другого класса, то пользователи не равны
|
||||||
|
if (obj == null || getClass() != obj.getClass()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final UserEntity second = (UserEntity) obj;
|
||||||
|
//Сравнение по id, нику, почте, паролю
|
||||||
|
return Objects.equals(second.getId(), id) && Objects.equals(second.getName(), name)
|
||||||
|
&& Objects.equals(second.getEmail(), email) && Objects.equals(second.getPassword(), password)
|
||||||
|
&& second.getGames().equals(games);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
package com.example.demo.users.repository;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import com.example.demo.core.repository.MapRepository;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public class UserRepository extends MapRepository<UserEntity> {
|
||||||
|
}
|
||||||
@ -0,0 +1,77 @@
|
|||||||
|
package com.example.demo.users.service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.games.model.GameEntity;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.repository.UserRepository;
|
||||||
|
|
||||||
|
//Бизнес-логика пользователей
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class UserService {
|
||||||
|
// Словарь со всеми пользователями
|
||||||
|
private final UserRepository repository;
|
||||||
|
|
||||||
|
public UserService(UserRepository repository) {
|
||||||
|
this.repository = repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<UserEntity> getAll() {
|
||||||
|
return repository.getAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserEntity get(Long id) {
|
||||||
|
// Если объект не null, вернёт его; если null, вернёт кастомное исключение
|
||||||
|
return Optional.ofNullable(repository.get(id)).orElseThrow(() -> new NotFoundException(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserEntity create(UserEntity entity) {
|
||||||
|
return repository.create(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserEntity update(Long id, UserEntity entity) {
|
||||||
|
//Получение пользователя по id
|
||||||
|
final UserEntity existedEntity = get(id);
|
||||||
|
|
||||||
|
//Установка такого же имени, как у переданного пользователя
|
||||||
|
existedEntity.setName(entity.getName());
|
||||||
|
|
||||||
|
//Установка такой же почты, как у переданного пользователя
|
||||||
|
existedEntity.setEmail(entity.getEmail());
|
||||||
|
|
||||||
|
//Установка такого же пароля, как у переданного пользователя
|
||||||
|
existedEntity.setPassword(entity.getPassword());
|
||||||
|
|
||||||
|
//Обновление пользователя с переданным id в словаре
|
||||||
|
return repository.update(existedEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserEntity delete(Long id) {
|
||||||
|
//Получение жанра по id
|
||||||
|
final UserEntity existedEntity = get(id);
|
||||||
|
//Удаление этого жанра из словаря
|
||||||
|
return repository.delete(existedEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserEntity addGame(Long id, GameEntity game) {
|
||||||
|
final UserEntity existedEntity = get(id);
|
||||||
|
existedEntity.addGame(game);
|
||||||
|
return existedEntity;
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserEntity deleteGame(Long id, GameEntity game) {
|
||||||
|
final UserEntity existedEntity = get(id);
|
||||||
|
existedEntity.deleteGame(game);
|
||||||
|
return existedEntity;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteAll() {
|
||||||
|
repository.deleteAll();
|
||||||
|
}
|
||||||
|
}
|
||||||
1
Lab2/src/main/resources/application.properties
Normal file
1
Lab2/src/main/resources/application.properties
Normal file
@ -0,0 +1 @@
|
|||||||
|
|
||||||
137
Lab2/src/test/java/com/example/demo/GameServiceTests.java
Normal file
137
Lab2/src/test/java/com/example/demo/GameServiceTests.java
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
package com.example.demo;
|
||||||
|
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
|
||||||
|
import org.junit.jupiter.api.Order;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.TestMethodOrder;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.context.annotation.DependsOn;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.games.model.GameEntity;
|
||||||
|
import com.example.demo.games.service.GameService;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
|
||||||
|
//DependsOn("TypeServiceTests") - запуск теста после TypeServiceTests
|
||||||
|
//В некоторых местах 4L, т.к. последний жанр после удаления и обратного добавления будет иметь id не 3, а 4
|
||||||
|
@SpringBootTest
|
||||||
|
@TestMethodOrder(OrderAnnotation.class)
|
||||||
|
// @DependsOn("TypeServiceTests")
|
||||||
|
public class GameServiceTests {
|
||||||
|
//Автоматическое внедрение зависимостей в сервис
|
||||||
|
@Autowired
|
||||||
|
private GameService gameService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private TypeService typeService;
|
||||||
|
|
||||||
|
//Проверка того, что get выдаст кастомное исключение, если в него передать несуществующий id
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> gameService.get(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
//Проверка добавления в хранилище
|
||||||
|
@Test
|
||||||
|
@Order(1)
|
||||||
|
void createTest() {
|
||||||
|
typeService.deleteAll();
|
||||||
|
gameService.deleteAll();
|
||||||
|
|
||||||
|
typeService.create(new TypeEntity(null, "FMV"));
|
||||||
|
typeService.create(new TypeEntity(null, "Экшен"));
|
||||||
|
typeService.create(new TypeEntity(null, "Стратегия"));
|
||||||
|
|
||||||
|
gameService.create(new GameEntity(null, typeService.get(1L), "Пробная игра 1", 100, "Пробное описание 1"));
|
||||||
|
|
||||||
|
gameService.create(new GameEntity(null, typeService.get(2L), "Пробная игра 2", 450, "Пробное описание 2"));
|
||||||
|
|
||||||
|
final GameEntity last = gameService.create(new GameEntity(null, typeService.get(3L), "Пробная игра 3", 330, "Пробное описание 3"));
|
||||||
|
|
||||||
|
//проверка, что кол-во игр в хранилище равно кол-ву добавленных (проверка, что все добавились)
|
||||||
|
Assertions.assertEquals(3, gameService.getAll(0L).size());
|
||||||
|
//проверка, что в хранилище последняя игра та, которую добавили последней (проверка, что всё правильно добавилось)
|
||||||
|
Assertions.assertEquals(last, gameService.get(3L));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//Проверка правильности обновления на примере последней игры (замена значений всех полей)
|
||||||
|
@Test
|
||||||
|
@Order(2)
|
||||||
|
void updateTest() {
|
||||||
|
//на какой жанр будем менять (со Стратегии на FMV)
|
||||||
|
final TypeEntity testEntity = typeService.get(1L);
|
||||||
|
|
||||||
|
//на какое название будем менять название игры
|
||||||
|
final String testTitle = "TEST";
|
||||||
|
|
||||||
|
//на какую цену будем менять цену игры
|
||||||
|
final Integer testPrice = 1000;
|
||||||
|
|
||||||
|
//на какое описание будем менять описание игры
|
||||||
|
final String testDescription = "TEST DESCRIPTION";
|
||||||
|
|
||||||
|
|
||||||
|
//получение последней в списке игры
|
||||||
|
final GameEntity entity = gameService.get(3L);
|
||||||
|
|
||||||
|
//запоминание старого жанра игры
|
||||||
|
final TypeEntity oldTypeEntity = entity.getType();
|
||||||
|
|
||||||
|
//запоминание её названия до обновления
|
||||||
|
final String oldTitle = entity.getTitle();
|
||||||
|
|
||||||
|
//запоминание её цены до обновления
|
||||||
|
final Integer oldPrice = entity.getPrice();
|
||||||
|
|
||||||
|
//запоминание её описания до обновления
|
||||||
|
final String oldDescription = entity.getDescription();
|
||||||
|
|
||||||
|
//запоминание новых данных жанра
|
||||||
|
final GameEntity newEntity = gameService.update(3L, new GameEntity(1L, testEntity, testTitle, testPrice, testDescription));
|
||||||
|
|
||||||
|
//Проверка, что кол-во игр до сих пор 3
|
||||||
|
Assertions.assertEquals(3, gameService.getAll(0L).size());
|
||||||
|
|
||||||
|
|
||||||
|
Assertions.assertEquals(newEntity, gameService.get(3L));
|
||||||
|
|
||||||
|
//Проверка, что жанр поменялся
|
||||||
|
Assertions.assertEquals(testEntity, newEntity.getType());
|
||||||
|
Assertions.assertNotEquals(oldTypeEntity, newEntity.getType());
|
||||||
|
|
||||||
|
//Проверка, что название поменялось
|
||||||
|
Assertions.assertEquals(testTitle, newEntity.getTitle());
|
||||||
|
Assertions.assertNotEquals(oldTitle, newEntity.getTitle());
|
||||||
|
|
||||||
|
//Проверка, что цена поменялась
|
||||||
|
Assertions.assertEquals(testPrice, newEntity.getPrice());
|
||||||
|
Assertions.assertNotEquals(oldPrice, newEntity.getPrice());
|
||||||
|
|
||||||
|
//Проверка, что описание поменялось
|
||||||
|
Assertions.assertEquals(testDescription, newEntity.getDescription());
|
||||||
|
Assertions.assertNotEquals(oldDescription, newEntity.getDescription());
|
||||||
|
}
|
||||||
|
|
||||||
|
//Проверка правильности удаления на примере последней игры
|
||||||
|
@Test
|
||||||
|
@Order(3)
|
||||||
|
void deleteTest() {
|
||||||
|
gameService.delete(3L);
|
||||||
|
//Проверка, что после удаления в хранилище осталось 2 игры
|
||||||
|
Assertions.assertEquals(2, gameService.getAll(0L).size());
|
||||||
|
|
||||||
|
final GameEntity last = gameService.get(2L);
|
||||||
|
Assertions.assertEquals(2L, last.getId());
|
||||||
|
|
||||||
|
final GameEntity newEntity = gameService.create(new GameEntity(null, typeService.get(3L), "Пробная игра 3", 330, "Пробное описание 3"));
|
||||||
|
//Проверка, что в хранилище теперь снова 3 игры
|
||||||
|
Assertions.assertEquals(3, typeService.getAll().size());
|
||||||
|
//Проверка, что id у добавленной игры стал 4
|
||||||
|
Assertions.assertEquals(4L, newEntity.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
76
Lab2/src/test/java/com/example/demo/TypeServiceTests.java
Normal file
76
Lab2/src/test/java/com/example/demo/TypeServiceTests.java
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
package com.example.demo;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
|
||||||
|
import org.junit.jupiter.api.Order;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.TestMethodOrder;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
@TestMethodOrder(OrderAnnotation.class)
|
||||||
|
class TypeServiceTests {
|
||||||
|
//Автоматическое внедрение зависимостей в сервис
|
||||||
|
@Autowired
|
||||||
|
private TypeService typeService;
|
||||||
|
|
||||||
|
//Проверка того, что get выдаст кастомное исключение, если в него передать несуществующий id
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
//Проверка добавления в хранилище
|
||||||
|
@Test
|
||||||
|
@Order(1)
|
||||||
|
void createTest() {
|
||||||
|
typeService.deleteAll();
|
||||||
|
typeService.create(new TypeEntity(null, "FMV"));
|
||||||
|
typeService.create(new TypeEntity(null, "Экшен"));
|
||||||
|
final TypeEntity last = typeService.create(new TypeEntity(null, "Стратегия"));
|
||||||
|
|
||||||
|
//Проверки, что значения равны. Первый параметр - эталон (ожидаемое значение), второй - получаемое значение
|
||||||
|
//проверка, что кол-во жанров в хранилище равно кол-ву добавленных (проверка, что все добавились)
|
||||||
|
|
||||||
|
Assertions.assertEquals(3, typeService.getAll().size());
|
||||||
|
//проверка, что в хранилище последний жанр тот жанр, который добавили последним (проверка, что всё правильно добавилось)
|
||||||
|
Assertions.assertEquals(last, typeService.get(3L));
|
||||||
|
}
|
||||||
|
|
||||||
|
//Проверка правильности обновления на примере последнего жанра
|
||||||
|
@Test
|
||||||
|
@Order(2)
|
||||||
|
void updateTest() {
|
||||||
|
//на какое название будем менять название жанра
|
||||||
|
final String test = "TEST";
|
||||||
|
//получение последнего в списке жанра
|
||||||
|
final TypeEntity entity = typeService.get(3L);
|
||||||
|
//запоминание его названия до обновления
|
||||||
|
final String oldName = entity.getName();
|
||||||
|
//запоминание новых данных жанра
|
||||||
|
final TypeEntity newEntity = typeService.update(3L, new TypeEntity(1L, test));
|
||||||
|
//Проверка, что название поменялось
|
||||||
|
Assertions.assertEquals(test, newEntity.getName());
|
||||||
|
Assertions.assertNotEquals(oldName, newEntity.getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
//Проверка правильности удаления на примере последнего жанра
|
||||||
|
@Test
|
||||||
|
@Order(3)
|
||||||
|
void deleteTest() {
|
||||||
|
typeService.delete(3L);
|
||||||
|
//Проверка, что после удаления в хранилище осталось 2 жанра
|
||||||
|
Assertions.assertEquals(2, typeService.getAll().size());
|
||||||
|
|
||||||
|
final TypeEntity newEntity = typeService.create(new TypeEntity(null, "Стратегия"));
|
||||||
|
//Проверка, что в хранилище теперь снова 3 жанра
|
||||||
|
Assertions.assertEquals(3, typeService.getAll().size());
|
||||||
|
//Проверка, что id у добавленного жанра стал 4
|
||||||
|
Assertions.assertEquals(4L, newEntity.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
113
Lab2/src/test/java/com/example/demo/UserServiceTests.java
Normal file
113
Lab2/src/test/java/com/example/demo/UserServiceTests.java
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
package com.example.demo;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
|
||||||
|
import org.junit.jupiter.api.Order;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.TestMethodOrder;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.context.annotation.DependsOn;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.games.model.GameEntity;
|
||||||
|
import com.example.demo.games.service.GameService;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.service.UserService;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
@TestMethodOrder(OrderAnnotation.class)
|
||||||
|
@DependsOn("GameServiceTests")
|
||||||
|
public class UserServiceTests {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private UserService userService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private GameService gameService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private TypeService typeService;
|
||||||
|
|
||||||
|
//Проверка того, что get выдаст кастомное исключение, если в него передать несуществующий id
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
//Проверка добавления в хранилище
|
||||||
|
@Test
|
||||||
|
@Order(1)
|
||||||
|
void createTest() {
|
||||||
|
userService.deleteAll();
|
||||||
|
gameService.deleteAll();
|
||||||
|
typeService.deleteAll();
|
||||||
|
|
||||||
|
typeService.create(new TypeEntity(null, "FMV"));
|
||||||
|
typeService.create(new TypeEntity(null, "Экшен"));
|
||||||
|
typeService.create(new TypeEntity(null, "Стратегия"));
|
||||||
|
|
||||||
|
gameService.create(new GameEntity(null, typeService.get(1L), "Пробная игра 1", 100, "Пробное описание 1"));
|
||||||
|
gameService.create(new GameEntity(null, typeService.get(2L), "Пробная игра 2", 450, "Пробное описание 2"));
|
||||||
|
gameService.create(new GameEntity(null, typeService.get(3L), "Пробная игра 3", 330, "Пробное описание 3"));
|
||||||
|
|
||||||
|
userService.create(new UserEntity(null, "Пробный ник 1", "Пробная_почта_1@mail.ru", "Пробный пароль 1"));
|
||||||
|
userService.create(new UserEntity(null, "Пробный ник 2", "Пробная_почта_2@mail.ru", "Пробный пароль 2"));
|
||||||
|
|
||||||
|
Assertions.assertEquals(2, userService.getAll().size());
|
||||||
|
}
|
||||||
|
|
||||||
|
//Проверка правильности обновления на примере первого
|
||||||
|
@Test
|
||||||
|
@Order(2)
|
||||||
|
void updateTest() {
|
||||||
|
//на какой ник будем менять ник пользователя
|
||||||
|
final String testName = "TEST";
|
||||||
|
|
||||||
|
//на какую почту будем менять почту пользователя
|
||||||
|
final String testEmail = "test@mail.ru";
|
||||||
|
|
||||||
|
//на какой пароль будем менять пароль пользователя
|
||||||
|
final String testPassword = "TEST PASSWORD";
|
||||||
|
|
||||||
|
//запоминание обновлённого пользователя
|
||||||
|
final UserEntity newEntity = userService.update(1L, new UserEntity(1L, testName, testEmail, testPassword));
|
||||||
|
|
||||||
|
//Проверка, что кол-во пользователей до сих пор 2
|
||||||
|
Assertions.assertEquals(2, userService.getAll().size());
|
||||||
|
|
||||||
|
Assertions.assertEquals(newEntity, userService.get(1L));
|
||||||
|
|
||||||
|
//Проверка, что у пользователя нет игр
|
||||||
|
Assertions.assertEquals(0, userService.get(1L).getGames().size());
|
||||||
|
|
||||||
|
//Добавление пользователю 2 игр
|
||||||
|
userService.addGame(1L, gameService.get(3L));
|
||||||
|
userService.addGame(1L, gameService.get(2L));
|
||||||
|
//Проверка, что у пользователя теперь есть 2 игры
|
||||||
|
Assertions.assertEquals(2, userService.get(1L).getGames().size());
|
||||||
|
|
||||||
|
//Удаление у пользователя игры
|
||||||
|
userService.deleteGame(1L, gameService.get(2L));
|
||||||
|
//Проверка, что у пользователя 1 игра
|
||||||
|
Assertions.assertEquals(1, userService.get(1L).getGames().size());
|
||||||
|
}
|
||||||
|
|
||||||
|
//Проверка правильности удаления
|
||||||
|
@Test
|
||||||
|
@Order(3)
|
||||||
|
void deleteTest() {
|
||||||
|
userService.delete(1L);
|
||||||
|
//Проверка, что после удаления в хранилище осталcя пользователей
|
||||||
|
Assertions.assertEquals(1, userService.getAll().size());
|
||||||
|
|
||||||
|
userService.create(new UserEntity(null, "Пробный ник 1", "Пробная_почта_1@mail.ru", "Пробный пароль 1"));
|
||||||
|
//Проверка, что в хранилище теперь снова 2 пользователя
|
||||||
|
Assertions.assertEquals(2, userService.getAll().size());
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user