Lab2
This commit is contained in:
parent
613f3e72fe
commit
93bdee37f3
45
.gitignore
vendored
45
.gitignore
vendored
@ -1,14 +1,37 @@
|
|||||||
# ---> VisualStudioCode
|
HELP.md
|
||||||
.vscode/*
|
.gradle
|
||||||
!.vscode/settings.json
|
build/
|
||||||
!.vscode/tasks.json
|
!gradle/wrapper/gradle-wrapper.jar
|
||||||
!.vscode/launch.json
|
!**/src/main/**/build/
|
||||||
!.vscode/extensions.json
|
!**/src/test/**/build/
|
||||||
!.vscode/*.code-snippets
|
|
||||||
|
|
||||||
# Local History for Visual Studio Code
|
### STS ###
|
||||||
.history/
|
.apt_generated
|
||||||
|
.classpath
|
||||||
|
.factorypath
|
||||||
|
.project
|
||||||
|
.settings
|
||||||
|
.springBeans
|
||||||
|
.sts4-cache
|
||||||
|
bin/
|
||||||
|
!**/src/main/**/bin/
|
||||||
|
!**/src/test/**/bin/
|
||||||
|
|
||||||
# Built Visual Studio Code Extensions
|
### IntelliJ IDEA ###
|
||||||
*.vsix
|
.idea
|
||||||
|
*.iws
|
||||||
|
*.iml
|
||||||
|
*.ipr
|
||||||
|
out/
|
||||||
|
!**/src/main/**/out/
|
||||||
|
!**/src/test/**/out/
|
||||||
|
|
||||||
|
### NetBeans ###
|
||||||
|
/nbproject/private/
|
||||||
|
/nbbuild/
|
||||||
|
/dist/
|
||||||
|
/nbdist/
|
||||||
|
/.nb-gradle/
|
||||||
|
|
||||||
|
### VS Code ###
|
||||||
|
.vscode/
|
||||||
|
28
build.gradle
Normal file
28
build.gradle
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
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'
|
||||||
|
|
||||||
|
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 = 'demo'
|
38
src/main/java/com/example/demo/DemoApplication.java
Normal file
38
src/main/java/com/example/demo/DemoApplication.java
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
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.department.model.DepartmentEntity;
|
||||||
|
import com.example.demo.entrysData.model.EntrysDataEntity;
|
||||||
|
import com.example.demo.entrysData.service.EntrysDataService;
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
public class DemoApplication implements CommandLineRunner {
|
||||||
|
private final Logger log = LoggerFactory.getLogger(DemoApplication.class);
|
||||||
|
|
||||||
|
private final EntrysDataService entrysDataService;
|
||||||
|
|
||||||
|
public DemoApplication(EntrysDataService entrysDataService) {
|
||||||
|
this.entrysDataService = entrysDataService;
|
||||||
|
}
|
||||||
|
|
||||||
|
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("Start work");
|
||||||
|
entrysDataService.create(
|
||||||
|
new EntrysDataEntity(null, "login", "password", "role",
|
||||||
|
new DepartmentEntity(null, "test")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -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));
|
||||||
|
}
|
||||||
|
}
|
20
src/main/java/com/example/demo/core/model/BaseEntity.java
Normal file
20
src/main/java/com/example/demo/core/model/BaseEntity.java
Normal file
@ -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,57 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
public abstract class MapRepository<E extends BaseEntity> implements CommonRepository<E, Long> {
|
||||||
|
private final Map<Long, E> entities = new TreeMap<>();
|
||||||
|
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,64 @@
|
|||||||
|
package com.example.demo.department.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.department.service.DepartmentService;
|
||||||
|
import com.example.demo.department.model.DepartmentEntity;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping(Constants.API_URL + "/departments")
|
||||||
|
public class DepartmentController {
|
||||||
|
private final DepartmentService departmentService;
|
||||||
|
private final ModelMapper modelMapper;
|
||||||
|
|
||||||
|
public DepartmentController(DepartmentService departmentService, ModelMapper modelMapper) {
|
||||||
|
this.departmentService = departmentService;
|
||||||
|
this.modelMapper = modelMapper;
|
||||||
|
}
|
||||||
|
|
||||||
|
private DepartmentDto toDto(DepartmentEntity entity) {
|
||||||
|
return modelMapper.map(entity, DepartmentDto.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
private DepartmentEntity toEntity(DepartmentDto dto) {
|
||||||
|
return modelMapper.map(dto, DepartmentEntity.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public List<DepartmentDto> getAll() {
|
||||||
|
return departmentService.getAll().stream().map(this::toDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public DepartmentDto get(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(departmentService.get(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public DepartmentDto create(@RequestBody @Valid DepartmentDto dto) {
|
||||||
|
return toDto(departmentService.create(toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/{id}")
|
||||||
|
public DepartmentDto update(@PathVariable(name = "id") Long id, @RequestBody DepartmentDto dto) {
|
||||||
|
return toDto(departmentService.update(id, toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public DepartmentDto delete(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(departmentService.delete(id));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
package com.example.demo.department.api;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
public class DepartmentDto {
|
||||||
|
private Long id;
|
||||||
|
@NotNull
|
||||||
|
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,42 @@
|
|||||||
|
package com.example.demo.department.model;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
|
||||||
|
public class DepartmentEntity extends BaseEntity {
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
public DepartmentEntity() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DepartmentEntity(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);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null || getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
final DepartmentEntity other = (DepartmentEntity) obj;
|
||||||
|
return Objects.equals(other.getId(), id)
|
||||||
|
&& Objects.equals(other.getName(), name);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,10 @@
|
|||||||
|
package com.example.demo.department.repository;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import com.example.demo.core.repository.MapRepository;
|
||||||
|
import com.example.demo.department.model.DepartmentEntity;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public class DepartmentRepository extends MapRepository<DepartmentEntity> {
|
||||||
|
}
|
@ -0,0 +1,43 @@
|
|||||||
|
package com.example.demo.department.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.department.model.DepartmentEntity;
|
||||||
|
import com.example.demo.department.repository.DepartmentRepository;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class DepartmentService {
|
||||||
|
private final DepartmentRepository repository;
|
||||||
|
|
||||||
|
public DepartmentService(DepartmentRepository repository) {
|
||||||
|
this.repository = repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<DepartmentEntity> getAll() {
|
||||||
|
return repository.getAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DepartmentEntity get(Long id) {
|
||||||
|
return Optional.ofNullable(repository.get(id))
|
||||||
|
.orElseThrow(() -> new NotFoundException(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
public DepartmentEntity create(DepartmentEntity entity) {
|
||||||
|
return repository.create(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DepartmentEntity update(Long id, DepartmentEntity entity) {
|
||||||
|
final DepartmentEntity existsEntity = get(id);
|
||||||
|
existsEntity.setName(entity.getName());
|
||||||
|
return repository.update(existsEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DepartmentEntity delete(Long id) {
|
||||||
|
final DepartmentEntity existsEntity = get(id);
|
||||||
|
return repository.delete(existsEntity);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,70 @@
|
|||||||
|
package com.example.demo.directions.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.department.service.DepartmentService;
|
||||||
|
import com.example.demo.directions.service.DirectionsService;
|
||||||
|
import com.example.demo.directions.model.DirectionsEntity;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping(Constants.API_URL + "/directions")
|
||||||
|
public class DirectionsController {
|
||||||
|
private final DirectionsService directionsService;
|
||||||
|
private final ModelMapper modelMapper;
|
||||||
|
private final DepartmentService departmentService;
|
||||||
|
|
||||||
|
public DirectionsController(DirectionsService directionsService, ModelMapper modelMapper,
|
||||||
|
DepartmentService departmentService) {
|
||||||
|
this.directionsService = directionsService;
|
||||||
|
this.modelMapper = modelMapper;
|
||||||
|
this.departmentService = departmentService;
|
||||||
|
}
|
||||||
|
|
||||||
|
private DirectionsDto toDto(DirectionsEntity entity) {
|
||||||
|
return modelMapper.map(entity, DirectionsDto.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
private DirectionsEntity toEntity(DirectionsDto dto) {
|
||||||
|
final DirectionsEntity entity = modelMapper.map(dto, DirectionsEntity.class);
|
||||||
|
entity.setDepartment(departmentService.get(dto.getDepartmentId()));
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public List<DirectionsDto> getAll() {
|
||||||
|
return directionsService.getAll().stream().map(this::toDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public DirectionsDto get(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(directionsService.get(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public DirectionsDto create(@RequestBody @Valid DirectionsDto dto) {
|
||||||
|
return toDto(directionsService.create(toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/{id}")
|
||||||
|
public DirectionsDto update(@PathVariable(name = "id") Long id, @RequestBody DirectionsDto dto) {
|
||||||
|
return toDto(directionsService.update(id, toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public DirectionsDto delete(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(directionsService.delete(id));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,60 @@
|
|||||||
|
package com.example.demo.directions.api;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.Min;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
public class DirectionsDto {
|
||||||
|
private Long id;
|
||||||
|
@NotBlank
|
||||||
|
private String code;
|
||||||
|
@NotNull
|
||||||
|
private String name;
|
||||||
|
@NotNull
|
||||||
|
@Min(1)
|
||||||
|
private Long departmentId;
|
||||||
|
private String things;
|
||||||
|
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCode() {
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCode(String code) {
|
||||||
|
this.code = code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getDepartmentId() {
|
||||||
|
return departmentId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDepartmentId(Long departmentId) {
|
||||||
|
this.departmentId = departmentId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getThings() {
|
||||||
|
return things;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setThings(String things) {
|
||||||
|
this.things = things;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,76 @@
|
|||||||
|
package com.example.demo.directions.model;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
import com.example.demo.department.model.DepartmentEntity;
|
||||||
|
|
||||||
|
public class DirectionsEntity extends BaseEntity {
|
||||||
|
private String code;
|
||||||
|
private String name;
|
||||||
|
private DepartmentEntity department;
|
||||||
|
private String things;
|
||||||
|
|
||||||
|
public DirectionsEntity() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DirectionsEntity(Long id, String code, String name, DepartmentEntity department, String things) {
|
||||||
|
super(id);
|
||||||
|
this.code = code;
|
||||||
|
this.name = name;
|
||||||
|
this.department = department;
|
||||||
|
this.things = things;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCode() {
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCode(String code) {
|
||||||
|
this.code = code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DepartmentEntity getDepartment() {
|
||||||
|
return department;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDepartment(DepartmentEntity department) {
|
||||||
|
this.department = department;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getThings() {
|
||||||
|
return things;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setThings(String things) {
|
||||||
|
this.things = things;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(id, code);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null || getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
final DirectionsEntity other = (DirectionsEntity) obj;
|
||||||
|
return Objects.equals(other.getId(), id)
|
||||||
|
&& Objects.equals(other.getCode(), code)
|
||||||
|
&& Objects.equals(other.getName(), name)
|
||||||
|
&& Objects.equals(other.getDepartment(), department)
|
||||||
|
&& Objects.equals(other.getThings(), things);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,10 @@
|
|||||||
|
package com.example.demo.directions.repository;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import com.example.demo.core.repository.MapRepository;
|
||||||
|
import com.example.demo.directions.model.DirectionsEntity;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public class DirectionsRepository extends MapRepository<DirectionsEntity> {
|
||||||
|
}
|
@ -0,0 +1,46 @@
|
|||||||
|
package com.example.demo.directions.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.directions.model.DirectionsEntity;
|
||||||
|
import com.example.demo.directions.repository.DirectionsRepository;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class DirectionsService {
|
||||||
|
private final DirectionsRepository repository;
|
||||||
|
|
||||||
|
public DirectionsService(DirectionsRepository repository) {
|
||||||
|
this.repository = repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<DirectionsEntity> getAll() {
|
||||||
|
return repository.getAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DirectionsEntity get(Long id) {
|
||||||
|
return Optional.ofNullable(repository.get(id))
|
||||||
|
.orElseThrow(() -> new NotFoundException(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
public DirectionsEntity create(DirectionsEntity entity) {
|
||||||
|
return repository.create(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DirectionsEntity update(Long id, DirectionsEntity entity) {
|
||||||
|
final DirectionsEntity existsEntity = get(id);
|
||||||
|
existsEntity.setCode(entity.getCode());
|
||||||
|
existsEntity.setName(entity.getName());
|
||||||
|
existsEntity.setDepartment(entity.getDepartment());
|
||||||
|
existsEntity.setThings(entity.getThings());
|
||||||
|
return repository.update(existsEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DirectionsEntity delete(Long id) {
|
||||||
|
final DirectionsEntity existsEntity = get(id);
|
||||||
|
return repository.delete(existsEntity);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,78 @@
|
|||||||
|
package com.example.demo.entrysData.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.department.service.DepartmentService;
|
||||||
|
import com.example.demo.entrysData.model.EntrysDataEntity;
|
||||||
|
import com.example.demo.entrysData.service.EntrysDataService;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping(Constants.API_URL + "/entrysData")
|
||||||
|
public class EntrysDataController {
|
||||||
|
private final EntrysDataService entrysDataService;
|
||||||
|
private final ModelMapper modelMapper;
|
||||||
|
private final DepartmentService departmentService;
|
||||||
|
|
||||||
|
public EntrysDataController(EntrysDataService entrysDataService, ModelMapper modelMapper,
|
||||||
|
DepartmentService departmentService) {
|
||||||
|
this.entrysDataService = entrysDataService;
|
||||||
|
this.modelMapper = modelMapper;
|
||||||
|
this.departmentService = departmentService;
|
||||||
|
}
|
||||||
|
|
||||||
|
private EntrysDataDto toDto(EntrysDataEntity entity) {
|
||||||
|
return modelMapper.map(entity, EntrysDataDto.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
private EntrysDataEntity toEntity(EntrysDataDto dto) {
|
||||||
|
final EntrysDataEntity entity = modelMapper.map(dto, EntrysDataEntity.class);
|
||||||
|
entity.setDepartment(departmentService.get(dto.getDepartmentId()));
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public List<EntrysDataDto> getAll() {
|
||||||
|
return entrysDataService.getAll().stream().map(this::toDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public EntrysDataDto get(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(entrysDataService.get(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public EntrysDataDto create(@RequestBody @Valid EntrysDataDto dto) {
|
||||||
|
return toDto(entrysDataService.create(toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/{id}")
|
||||||
|
public EntrysDataDto update(@PathVariable(name = "id") Long id, @RequestBody EntrysDataDto dto) {
|
||||||
|
return toDto(entrysDataService.update(id, toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public EntrysDataDto delete(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(entrysDataService.delete(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/{id2}")
|
||||||
|
public EntrysDataDto updatePassword(@PathVariable(name = "id") Long id,
|
||||||
|
@RequestParam(name = "newPassword") String newPas,
|
||||||
|
@RequestParam(name = "oldPassword") String oldPas) {
|
||||||
|
return toDto(entrysDataService.updatePassword(id, newPas, oldPas));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,64 @@
|
|||||||
|
package com.example.demo.entrysData.api;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.Min;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
public class EntrysDataDto {
|
||||||
|
private Long id;
|
||||||
|
@NotNull
|
||||||
|
@Min(1)
|
||||||
|
private Long departmentId;
|
||||||
|
@NotBlank
|
||||||
|
private String login;
|
||||||
|
@NotNull
|
||||||
|
private String role;
|
||||||
|
@NotBlank
|
||||||
|
private String password;
|
||||||
|
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLogin() {
|
||||||
|
return login;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLogin(String login) {
|
||||||
|
this.login = login;
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
public String getRole() {
|
||||||
|
return role;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRole(String role) {
|
||||||
|
role = "user";
|
||||||
|
this.role = role;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPassword() {
|
||||||
|
return password;
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
||||||
|
public void setPassword(String password) {
|
||||||
|
this.password = password;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getDepartmentId() {
|
||||||
|
return departmentId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDepartmentId(Long departmentId) {
|
||||||
|
this.departmentId = departmentId;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,76 @@
|
|||||||
|
package com.example.demo.entrysData.model;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
import com.example.demo.department.model.DepartmentEntity;
|
||||||
|
|
||||||
|
public class EntrysDataEntity extends BaseEntity {
|
||||||
|
private String login;
|
||||||
|
private String password;
|
||||||
|
private String role;
|
||||||
|
private DepartmentEntity department;
|
||||||
|
|
||||||
|
public EntrysDataEntity() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
public EntrysDataEntity(Long id, String login, String password, String role, DepartmentEntity department) {
|
||||||
|
super(id);
|
||||||
|
this.login = login;
|
||||||
|
this.password = password;
|
||||||
|
this.role = role;
|
||||||
|
this.department = department;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLogin() {
|
||||||
|
return login;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLogin(String login) {
|
||||||
|
this.login = login;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPassword() {
|
||||||
|
return password;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPassword(String password) {
|
||||||
|
this.password = password;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRole() {
|
||||||
|
return role;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRole(String role) {
|
||||||
|
this.role = role;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DepartmentEntity getDepartment() {
|
||||||
|
return department;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDepartment(DepartmentEntity department) {
|
||||||
|
this.department = department;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(id, login);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null || getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
final EntrysDataEntity other = (EntrysDataEntity) obj;
|
||||||
|
return Objects.equals(other.getId(), id)
|
||||||
|
&& Objects.equals(other.getLogin(), login)
|
||||||
|
&& Objects.equals(other.getPassword(), password)
|
||||||
|
&& Objects.equals(other.getRole(), role)
|
||||||
|
&& Objects.equals(other.getDepartment(), department);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,10 @@
|
|||||||
|
package com.example.demo.entrysData.repository;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import com.example.demo.core.repository.MapRepository;
|
||||||
|
import com.example.demo.entrysData.model.EntrysDataEntity;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public class EntrysDataRepository extends MapRepository<EntrysDataEntity> {
|
||||||
|
}
|
@ -0,0 +1,63 @@
|
|||||||
|
package com.example.demo.entrysData.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.entrysData.model.EntrysDataEntity;
|
||||||
|
import com.example.demo.entrysData.repository.EntrysDataRepository;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class EntrysDataService {
|
||||||
|
private final EntrysDataRepository repository;
|
||||||
|
|
||||||
|
public EntrysDataService(EntrysDataRepository repository) {
|
||||||
|
this.repository = repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<EntrysDataEntity> getAll() {
|
||||||
|
return repository.getAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
public EntrysDataEntity get(Long id) {
|
||||||
|
return Optional.ofNullable(repository.get(id))
|
||||||
|
.orElseThrow(() -> new NotFoundException(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
public EntrysDataEntity create(EntrysDataEntity entity) {
|
||||||
|
return repository.create(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public EntrysDataEntity update(Long id, EntrysDataEntity entity) {
|
||||||
|
final EntrysDataEntity existsEntity = get(id);
|
||||||
|
existsEntity.setLogin(entity.getLogin());
|
||||||
|
existsEntity.setPassword(entity.getPassword());
|
||||||
|
existsEntity.setDepartment(entity.getDepartment());
|
||||||
|
return repository.update(existsEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public EntrysDataEntity delete(Long id) {
|
||||||
|
final EntrysDataEntity existsEntity = get(id);
|
||||||
|
return repository.delete(existsEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Boolean AuthPassword(Long id, String pas) {
|
||||||
|
final EntrysDataEntity existsEntity = get(id);
|
||||||
|
String truePas = existsEntity.getPassword();
|
||||||
|
if (truePas.equals(pas)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public EntrysDataEntity updatePassword(Long id, String newPas, String oldPas) {
|
||||||
|
final EntrysDataEntity existsEntity = get(id);
|
||||||
|
String truePas = existsEntity.getPassword();
|
||||||
|
if (truePas.equals(oldPas) && !oldPas.equals(newPas)) {
|
||||||
|
existsEntity.setPassword(newPas);
|
||||||
|
}
|
||||||
|
return repository.update(existsEntity);
|
||||||
|
}
|
||||||
|
}
|
70
src/main/java/com/example/demo/news/api/NewsController.java
Normal file
70
src/main/java/com/example/demo/news/api/NewsController.java
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
package com.example.demo.news.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.department.service.DepartmentService;
|
||||||
|
import com.example.demo.news.service.NewsService;
|
||||||
|
import com.example.demo.news.model.NewsEntity;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping(Constants.API_URL + "/news")
|
||||||
|
public class NewsController {
|
||||||
|
private final NewsService newsService;
|
||||||
|
private final ModelMapper modelMapper;
|
||||||
|
private final DepartmentService departmentService;
|
||||||
|
|
||||||
|
public NewsController(NewsService newsService, ModelMapper modelMapper, DepartmentService departmentService) {
|
||||||
|
this.newsService = newsService;
|
||||||
|
this.modelMapper = modelMapper;
|
||||||
|
this.departmentService = departmentService;
|
||||||
|
}
|
||||||
|
|
||||||
|
private NewsDto toDto(NewsEntity entity) {
|
||||||
|
return modelMapper.map(entity, NewsDto.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
private NewsEntity toEntity(NewsDto dto) {
|
||||||
|
final NewsEntity entity = modelMapper.map(dto, NewsEntity.class);
|
||||||
|
entity.setDepartment(departmentService.get(dto.getDepartmentId()));
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public List<NewsDto> getAll(@RequestParam(name = "departmentId", defaultValue = "0") Long departmentId) {
|
||||||
|
return newsService.getAll(departmentId).stream().map(this::toDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public NewsDto get(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(newsService.get(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public NewsDto create(@RequestBody @Valid NewsDto dto) {
|
||||||
|
return toDto(newsService.create(toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/{id}")
|
||||||
|
public NewsDto update(@PathVariable(name = "id") Long id, @RequestBody NewsDto dto) {
|
||||||
|
return toDto(newsService.update(id, toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public NewsDto delete(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(newsService.delete(id));
|
||||||
|
}
|
||||||
|
}
|
60
src/main/java/com/example/demo/news/api/NewsDto.java
Normal file
60
src/main/java/com/example/demo/news/api/NewsDto.java
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
package com.example.demo.news.api;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.Min;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
public class NewsDto {
|
||||||
|
private Long id;
|
||||||
|
@NotNull
|
||||||
|
private String name;
|
||||||
|
@NotNull
|
||||||
|
private String date;
|
||||||
|
@NotNull
|
||||||
|
private String description;
|
||||||
|
@NotNull
|
||||||
|
@Min(1)
|
||||||
|
private Long departmentId;
|
||||||
|
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDate() {
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDate(String date) {
|
||||||
|
this.date = date;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDescription(String description) {
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getDepartmentId() {
|
||||||
|
return departmentId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDepartmentId(Long departmentId) {
|
||||||
|
this.departmentId = departmentId;
|
||||||
|
}
|
||||||
|
}
|
75
src/main/java/com/example/demo/news/model/NewsEntity.java
Normal file
75
src/main/java/com/example/demo/news/model/NewsEntity.java
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
package com.example.demo.news.model;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
import com.example.demo.department.model.DepartmentEntity;
|
||||||
|
|
||||||
|
public class NewsEntity extends BaseEntity {
|
||||||
|
private String date;
|
||||||
|
private String name;
|
||||||
|
private String description;
|
||||||
|
private DepartmentEntity department;
|
||||||
|
|
||||||
|
public NewsEntity() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
public NewsEntity(Long id, String date, String name, String description, DepartmentEntity department) {
|
||||||
|
super(id);
|
||||||
|
this.date = date;
|
||||||
|
this.name = name;
|
||||||
|
this.description = description;
|
||||||
|
this.department = department;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDate() {
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDate(String date) {
|
||||||
|
this.date = date;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDescription(String description) {
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DepartmentEntity getDepartment() {
|
||||||
|
return department;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDepartment(DepartmentEntity department) {
|
||||||
|
this.department = department;
|
||||||
|
}
|
||||||
|
|
||||||
|
@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 NewsEntity other = (NewsEntity) obj;
|
||||||
|
return Objects.equals(other.getId(), id)
|
||||||
|
&& Objects.equals(other.getDate(), date)
|
||||||
|
&& Objects.equals(other.getName(), name)
|
||||||
|
&& Objects.equals(other.getDescription(), description);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,10 @@
|
|||||||
|
package com.example.demo.news.repository;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import com.example.demo.core.repository.MapRepository;
|
||||||
|
import com.example.demo.news.model.NewsEntity;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public class NewsRepository extends MapRepository<NewsEntity> {
|
||||||
|
}
|
51
src/main/java/com/example/demo/news/service/NewsService.java
Normal file
51
src/main/java/com/example/demo/news/service/NewsService.java
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
package com.example.demo.news.service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Objects;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.news.model.NewsEntity;
|
||||||
|
import com.example.demo.news.repository.NewsRepository;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class NewsService {
|
||||||
|
private final NewsRepository repository;
|
||||||
|
|
||||||
|
public NewsService(NewsRepository repository) {
|
||||||
|
this.repository = repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<NewsEntity> getAll(Long departmentId) {
|
||||||
|
if (Objects.equals(departmentId, 0L)) {
|
||||||
|
return repository.getAll();
|
||||||
|
}
|
||||||
|
return repository.getAll().stream()
|
||||||
|
.filter(item -> item.getDepartment().getId().equals(departmentId))
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public NewsEntity get(Long id) {
|
||||||
|
return Optional.ofNullable(repository.get(id))
|
||||||
|
.orElseThrow(() -> new NotFoundException(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
public NewsEntity create(NewsEntity entity) {
|
||||||
|
return repository.create(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public NewsEntity update(Long id, NewsEntity entity) {
|
||||||
|
final NewsEntity existsEntity = get(id);
|
||||||
|
existsEntity.setDate(entity.getDate());
|
||||||
|
existsEntity.setName(entity.getName());
|
||||||
|
existsEntity.setDescription(entity.getDescription());
|
||||||
|
existsEntity.setDepartment(entity.getDepartment());
|
||||||
|
return repository.update(existsEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public NewsEntity delete(Long id) {
|
||||||
|
final NewsEntity existsEntity = get(id);
|
||||||
|
return repository.delete(existsEntity);
|
||||||
|
}
|
||||||
|
}
|
1
src/main/resources/application.properties
Normal file
1
src/main/resources/application.properties
Normal file
@ -0,0 +1 @@
|
|||||||
|
|
64
src/test/java/com/example/demo/DepartmentsTests.java
Normal file
64
src/test/java/com/example/demo/DepartmentsTests.java
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
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.department.model.DepartmentEntity;
|
||||||
|
import com.example.demo.department.service.DepartmentService;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
@TestMethodOrder(OrderAnnotation.class)
|
||||||
|
class DepartmentsTests {
|
||||||
|
@Autowired
|
||||||
|
private DepartmentService departmentService;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> departmentService.get(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(1)
|
||||||
|
void createTest() {
|
||||||
|
departmentService.create(new DepartmentEntity(null, "test1"));
|
||||||
|
departmentService.create(new DepartmentEntity(null, "test2"));
|
||||||
|
final DepartmentEntity last = departmentService.create(new DepartmentEntity(null, "test3"));
|
||||||
|
Assertions.assertEquals(3, departmentService.getAll().size());
|
||||||
|
Assertions.assertEquals(last, departmentService.get(3L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(2)
|
||||||
|
void updateTest() {
|
||||||
|
final String testName = "TESTNAME";
|
||||||
|
final DepartmentEntity entity = departmentService.get(3L);
|
||||||
|
final String oldName = entity.getName();
|
||||||
|
final DepartmentEntity newEntity = departmentService.update(3L,
|
||||||
|
new DepartmentEntity(1L, testName));
|
||||||
|
Assertions.assertEquals(3, departmentService.getAll().size());
|
||||||
|
Assertions.assertEquals(newEntity, departmentService.get(3L));
|
||||||
|
|
||||||
|
Assertions.assertEquals(testName, newEntity.getName());
|
||||||
|
Assertions.assertNotEquals(oldName, newEntity.getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(3)
|
||||||
|
void deleteTest() {
|
||||||
|
departmentService.delete(3L);
|
||||||
|
Assertions.assertEquals(2, departmentService.getAll().size());
|
||||||
|
final DepartmentEntity last = departmentService.get(2L);
|
||||||
|
Assertions.assertEquals(2L, last.getId());
|
||||||
|
|
||||||
|
final DepartmentEntity newEntity = departmentService
|
||||||
|
.create(new DepartmentEntity(null, "testtt"));
|
||||||
|
Assertions.assertEquals(3, departmentService.getAll().size());
|
||||||
|
Assertions.assertEquals(4L, newEntity.getId());
|
||||||
|
}
|
||||||
|
}
|
84
src/test/java/com/example/demo/DirectionsTests.java
Normal file
84
src/test/java/com/example/demo/DirectionsTests.java
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
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.department.model.DepartmentEntity;
|
||||||
|
import com.example.demo.directions.model.DirectionsEntity;
|
||||||
|
import com.example.demo.directions.service.DirectionsService;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
@TestMethodOrder(OrderAnnotation.class)
|
||||||
|
class DirectionsTests {
|
||||||
|
@Autowired
|
||||||
|
private DirectionsService directionsService;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> directionsService.get(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(1)
|
||||||
|
void createTest() {
|
||||||
|
directionsService.create(new DirectionsEntity(null, "09.03.01", "Программная инженерия",
|
||||||
|
new DepartmentEntity(null, "ИСТ"), "Информатика"));
|
||||||
|
directionsService.create(new DirectionsEntity(null, "09.03.02", "ИВТ", new DepartmentEntity(null,
|
||||||
|
"ИСТ"),
|
||||||
|
"Русский язык"));
|
||||||
|
final DirectionsEntity last = directionsService.create(new DirectionsEntity(null, "09.03.03",
|
||||||
|
"АиСД", new DepartmentEntity(null, "Гум"), "Математика"));
|
||||||
|
Assertions.assertEquals(3, directionsService.getAll().size());
|
||||||
|
Assertions.assertEquals(last, directionsService.get(3L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(2)
|
||||||
|
void updateTest() {
|
||||||
|
final String testCode = "TESTCODE";
|
||||||
|
final String testName = "TESTNAME";
|
||||||
|
final DepartmentEntity testDep = new DepartmentEntity(null, "TESTDEP");
|
||||||
|
final String testThin = "TESTTHIN";
|
||||||
|
final DirectionsEntity entity = directionsService.get(3L);
|
||||||
|
final String oldCode = entity.getCode();
|
||||||
|
final String oldName = entity.getName();
|
||||||
|
final DepartmentEntity oldDep = entity.getDepartment();
|
||||||
|
final String oldThin = entity.getThings();
|
||||||
|
final DirectionsEntity newEntity = directionsService.update(3L,
|
||||||
|
new DirectionsEntity(1L, testCode, testName, testDep, testThin));
|
||||||
|
Assertions.assertEquals(3, directionsService.getAll().size());
|
||||||
|
Assertions.assertEquals(newEntity, directionsService.get(3L));
|
||||||
|
Assertions.assertEquals(testCode, newEntity.getCode());
|
||||||
|
Assertions.assertNotEquals(oldCode, newEntity.getCode());
|
||||||
|
|
||||||
|
Assertions.assertEquals(testName, newEntity.getName());
|
||||||
|
Assertions.assertNotEquals(oldName, newEntity.getName());
|
||||||
|
|
||||||
|
Assertions.assertEquals(testDep, newEntity.getDepartment());
|
||||||
|
Assertions.assertNotEquals(oldDep, newEntity.getDepartment());
|
||||||
|
|
||||||
|
Assertions.assertEquals(testThin, newEntity.getThings());
|
||||||
|
Assertions.assertNotEquals(oldThin, newEntity.getThings());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(3)
|
||||||
|
void deleteTest() {
|
||||||
|
directionsService.delete(3L);
|
||||||
|
Assertions.assertEquals(2, directionsService.getAll().size());
|
||||||
|
final DirectionsEntity last = directionsService.get(2L);
|
||||||
|
Assertions.assertEquals(2L, last.getId());
|
||||||
|
|
||||||
|
final DirectionsEntity newEntity = directionsService
|
||||||
|
.create(new DirectionsEntity(null, "test1", "test2",
|
||||||
|
new DepartmentEntity(null, "test3"), "test4"));
|
||||||
|
Assertions.assertEquals(3, directionsService.getAll().size());
|
||||||
|
Assertions.assertEquals(4L, newEntity.getId());
|
||||||
|
}
|
||||||
|
}
|
91
src/test/java/com/example/demo/EntrysDataTests.java
Normal file
91
src/test/java/com/example/demo/EntrysDataTests.java
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
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.department.model.DepartmentEntity;
|
||||||
|
import com.example.demo.entrysData.model.EntrysDataEntity;
|
||||||
|
import com.example.demo.entrysData.service.EntrysDataService;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
@TestMethodOrder(OrderAnnotation.class)
|
||||||
|
class EntrysDataTests {
|
||||||
|
@Autowired
|
||||||
|
private EntrysDataService entrysDataService;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> entrysDataService.get(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(1)
|
||||||
|
void createTest() {
|
||||||
|
entrysDataService
|
||||||
|
.create(new EntrysDataEntity(null, "dyctator", "12345", "user", new DepartmentEntity(null, "ИСТ")));
|
||||||
|
entrysDataService.create(new EntrysDataEntity(null, "user2", "12345", "user",
|
||||||
|
new DepartmentEntity(null, "ИСТ")));
|
||||||
|
final EntrysDataEntity last = entrysDataService.create(new EntrysDataEntity(null, "user3", "12345", "user",
|
||||||
|
new DepartmentEntity(null, "Гум")));
|
||||||
|
Assertions.assertEquals(3, entrysDataService.getAll().size());
|
||||||
|
Assertions.assertEquals(last, entrysDataService.get(3L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(2)
|
||||||
|
void updateTest() {
|
||||||
|
final String testLog = "TESTLOG";
|
||||||
|
final String testPas = "TESTPAS";
|
||||||
|
final DepartmentEntity testDep = new DepartmentEntity(null, "TESTDEP");
|
||||||
|
final EntrysDataEntity entity = entrysDataService.get(3L);
|
||||||
|
final String oldLog = entity.getLogin();
|
||||||
|
final String oldPas = entity.getLogin();
|
||||||
|
final DepartmentEntity oldDep = entity.getDepartment();
|
||||||
|
final EntrysDataEntity newEntity = entrysDataService.update(3L,
|
||||||
|
new EntrysDataEntity(1L, testLog, testPas, entity.getRole(), testDep));
|
||||||
|
Assertions.assertEquals(3, entrysDataService.getAll().size());
|
||||||
|
Assertions.assertEquals(newEntity, entrysDataService.get(3L));
|
||||||
|
|
||||||
|
Assertions.assertEquals(testLog, newEntity.getLogin());
|
||||||
|
Assertions.assertNotEquals(oldLog, newEntity.getLogin());
|
||||||
|
|
||||||
|
Assertions.assertEquals(testPas, newEntity.getPassword());
|
||||||
|
Assertions.assertNotEquals(oldPas, newEntity.getPassword());
|
||||||
|
|
||||||
|
Assertions.assertEquals(testDep, newEntity.getDepartment());
|
||||||
|
Assertions.assertNotEquals(oldDep, newEntity.getDepartment());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(3)
|
||||||
|
void deleteTest() {
|
||||||
|
entrysDataService.delete(3L);
|
||||||
|
Assertions.assertEquals(2, entrysDataService.getAll().size());
|
||||||
|
final EntrysDataEntity last = entrysDataService.get(2L);
|
||||||
|
Assertions.assertEquals(2L, last.getId());
|
||||||
|
|
||||||
|
final EntrysDataEntity newEntity = entrysDataService
|
||||||
|
.create(new EntrysDataEntity(null, "user4", "12345", "user",
|
||||||
|
new DepartmentEntity(null, "testtt")));
|
||||||
|
Assertions.assertEquals(3, entrysDataService.getAll().size());
|
||||||
|
Assertions.assertEquals(4L, newEntity.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(4)
|
||||||
|
void updatePasswordTest() {
|
||||||
|
final String newPas = "TESTPAS";
|
||||||
|
final EntrysDataEntity entity = entrysDataService.get(1L);
|
||||||
|
final String oldPas = entity.getPassword();
|
||||||
|
final EntrysDataEntity newEntity = entrysDataService.updatePassword(1L, oldPas, newPas);
|
||||||
|
|
||||||
|
Assertions.assertEquals(newPas, newEntity.getPassword());
|
||||||
|
Assertions.assertNotEquals(oldPas, newEntity.getPassword());
|
||||||
|
}
|
||||||
|
}
|
83
src/test/java/com/example/demo/NewsTests.java
Normal file
83
src/test/java/com/example/demo/NewsTests.java
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
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.department.model.DepartmentEntity;
|
||||||
|
import com.example.demo.news.model.NewsEntity;
|
||||||
|
import com.example.demo.news.service.NewsService;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
@TestMethodOrder(OrderAnnotation.class)
|
||||||
|
class NewsTests {
|
||||||
|
@Autowired
|
||||||
|
private NewsService newsService;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> newsService.get(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(1)
|
||||||
|
void createTest() {
|
||||||
|
newsService.create(new NewsEntity(null, "2023-12-23", "Новость0",
|
||||||
|
"УлГТУ000", new DepartmentEntity(null, "ИСТ")));
|
||||||
|
newsService.create(new NewsEntity(null, "2023-12-24", "Новость1", "УлГТУ111",
|
||||||
|
new DepartmentEntity(null, "ИСТ")));
|
||||||
|
final NewsEntity last = newsService.create(new NewsEntity(null, "2023-12-25",
|
||||||
|
"Новость2", "УлГТУ222", new DepartmentEntity(null, "Гум")));
|
||||||
|
Assertions.assertEquals(3, newsService.getAll(0L).size());
|
||||||
|
Assertions.assertEquals(last, newsService.get(3L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(2)
|
||||||
|
void updateTest() {
|
||||||
|
final String testDate = "TESTDATE";
|
||||||
|
final String testName = "TESTNAME";
|
||||||
|
final String testDes = "TESTDES";
|
||||||
|
final DepartmentEntity testDep = new DepartmentEntity(null, "TESTDEP");
|
||||||
|
final NewsEntity entity = newsService.get(3L);
|
||||||
|
final String oldDate = entity.getDate();
|
||||||
|
final String oldName = entity.getName();
|
||||||
|
final String oldDes = entity.getDescription();
|
||||||
|
final DepartmentEntity oldDep = entity.getDepartment();
|
||||||
|
final NewsEntity newEntity = newsService.update(3L,
|
||||||
|
new NewsEntity(1L, testDate, testName, testDes, testDep));
|
||||||
|
Assertions.assertEquals(3, newsService.getAll(0L).size());
|
||||||
|
Assertions.assertEquals(newEntity, newsService.get(3L));
|
||||||
|
|
||||||
|
Assertions.assertEquals(testDate, newEntity.getDate());
|
||||||
|
Assertions.assertNotEquals(oldDate, newEntity.getDate());
|
||||||
|
|
||||||
|
Assertions.assertEquals(testName, newEntity.getName());
|
||||||
|
Assertions.assertNotEquals(oldName, newEntity.getName());
|
||||||
|
|
||||||
|
Assertions.assertEquals(testDes, newEntity.getDescription());
|
||||||
|
Assertions.assertNotEquals(oldDes, newEntity.getDescription());
|
||||||
|
|
||||||
|
Assertions.assertEquals(testDep, newEntity.getDepartment());
|
||||||
|
Assertions.assertNotEquals(oldDep, newEntity.getDepartment());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Order(3)
|
||||||
|
void deleteTest() {
|
||||||
|
newsService.delete(3L);
|
||||||
|
Assertions.assertEquals(2, newsService.getAll(0L).size());
|
||||||
|
final NewsEntity last = newsService.get(2L);
|
||||||
|
Assertions.assertEquals(2L, last.getId());
|
||||||
|
|
||||||
|
final NewsEntity newEntity = newsService
|
||||||
|
.create(new NewsEntity(null, "test1", "test2", "test3", new DepartmentEntity(null, "testtt")));
|
||||||
|
Assertions.assertEquals(3, newsService.getAll(0L).size());
|
||||||
|
Assertions.assertEquals(4L, newEntity.getId());
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user