diff --git a/Laba1/.vscode/launch.json b/Laba1/.vscode/launch.json new file mode 100644 index 0000000..edb9da4 --- /dev/null +++ b/Laba1/.vscode/launch.json @@ -0,0 +1,14 @@ +{ + "configurations": [ + { + "type": "java", + "name": "Spring Boot-DemoApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "demo", + "args": "", + "envFile": "${workspaceFolder}/.env" + } + ] +} \ No newline at end of file diff --git a/Laba1/demo/.gitignore b/Laba1/demo/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/Laba1/demo/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/Laba1/demo/build.gradle b/Laba1/demo/build.gradle new file mode 100644 index 0000000..e30a834 --- /dev/null +++ b/Laba1/demo/build.gradle @@ -0,0 +1,27 @@ +plugins { +id 'java' +id 'org.springframework.boot' version '3.2.2' +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' + +testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { +useJUnitPlatform() +} diff --git a/Laba1/demo/gradle/wrapper/gradle-wrapper.jar b/Laba1/demo/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/Laba1/demo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Laba1/demo/gradle/wrapper/gradle-wrapper.properties b/Laba1/demo/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/Laba1/demo/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/Laba1/demo/gradlew b/Laba1/demo/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/Laba1/demo/gradlew @@ -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" "$@" diff --git a/Laba1/demo/gradlew.bat b/Laba1/demo/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/Laba1/demo/gradlew.bat @@ -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 diff --git a/Laba1/demo/index.html b/Laba1/demo/index.html new file mode 100644 index 0000000..55419a6 --- /dev/null +++ b/Laba1/demo/index.html @@ -0,0 +1,61 @@ + + + + + + Document + + +

Push the button

+ +
+ +
+ +
+ +
+ + + + \ No newline at end of file diff --git a/Laba1/demo/settings.gradle b/Laba1/demo/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/Laba1/demo/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/Laba1/demo/src/main/java/com/example/demo/ApiController.java b/Laba1/demo/src/main/java/com/example/demo/ApiController.java new file mode 100644 index 0000000..7d6e175 --- /dev/null +++ b/Laba1/demo/src/main/java/com/example/demo/ApiController.java @@ -0,0 +1,56 @@ +package com.example.demo; + +import java.util.Date; +import java.util.List; +import java.util.ArrayList; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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; + + + +@RestController +@RequestMapping("/user") +public class ApiController { + + private List Users = new ArrayList(); + + @PostMapping + public User CreateUser(@RequestBody User user) { + Users.add(user); + return user; + } + + @GetMapping + public List readAllUsers() { + return Users; + } + + @GetMapping("/{id}") + public User readUser(@PathVariable int id) { + return Users.get(id); + } + + @PutMapping("/{id}") + public User updateUser(@RequestBody User user, @PathVariable int id) { + Users.remove(id); + Users.add(id, user); + return user; + } + + @DeleteMapping("/{id}") + public User deleteUser(@PathVariable int id) { + User tmp = Users.get(id); + Users.remove(id); + return tmp; + } +} diff --git a/Laba1/demo/src/main/java/com/example/demo/DemoApplication.java b/Laba1/demo/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..64b538a --- /dev/null +++ b/Laba1/demo/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/Laba1/demo/src/main/java/com/example/demo/User.java b/Laba1/demo/src/main/java/com/example/demo/User.java new file mode 100644 index 0000000..3f5affc --- /dev/null +++ b/Laba1/demo/src/main/java/com/example/demo/User.java @@ -0,0 +1,42 @@ +package com.example.demo; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class User { + private String name; + private String phoneNumber; + private String mail; + private String year; + + public User() { + } + + @JsonCreator + public User( + @JsonProperty(value = "name") String name, + @JsonProperty(value = "phoneNumber") String phoneNumber, + @JsonProperty(value = "mail") String mail, + @JsonProperty(value = "year") String year) { + this.name = name; + this.phoneNumber = phoneNumber; + this.mail = mail; + this.year = year; + } + + public String getName() { + return name; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public String getMail() { + return mail; + } + + public String getYear() { + return year; + } +} diff --git a/Laba1/demo/src/main/java/com/example/demo/WebConfig.java b/Laba1/demo/src/main/java/com/example/demo/WebConfig.java new file mode 100644 index 0000000..d5585a1 --- /dev/null +++ b/Laba1/demo/src/main/java/com/example/demo/WebConfig.java @@ -0,0 +1,15 @@ +package com.example.demo; + +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 WebConfig implements WebMvcConfigurer { + @Override + public void addCorsMappings(@NonNull CorsRegistry registry) { + registry.addMapping("/**") + .allowedMethods("GET", "POST", "PUT", "DELETE"); + } +} diff --git a/Laba1/demo/src/main/resources/application.properties b/Laba1/demo/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Laba1/demo/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/Laba1/demo/src/test/java/com/example/demo/DemoApplicationTests.java b/Laba1/demo/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 0000000..2778a6a --- /dev/null +++ b/Laba1/demo/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/Laba2/2.zip b/Laba2/2.zip new file mode 100644 index 0000000..4ab5a36 Binary files /dev/null and b/Laba2/2.zip differ diff --git a/Laba2/Лекция2-src/.gitignore b/Laba2/Лекция2-src/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/Laba2/Лекция2-src/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/Laba2/Лекция2-src/build.gradle b/Laba2/Лекция2-src/build.gradle new file mode 100644 index 0000000..b7867b9 --- /dev/null +++ b/Laba2/Лекция2-src/build.gradle @@ -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() +} diff --git a/Laba2/Лекция2-src/gradle/wrapper/gradle-wrapper.jar b/Laba2/Лекция2-src/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/Laba2/Лекция2-src/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Laba2/Лекция2-src/gradle/wrapper/gradle-wrapper.properties b/Laba2/Лекция2-src/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/Laba2/Лекция2-src/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/Laba2/Лекция2-src/gradlew b/Laba2/Лекция2-src/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/Laba2/Лекция2-src/gradlew @@ -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" "$@" diff --git a/Laba2/Лекция2-src/gradlew.bat b/Laba2/Лекция2-src/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/Laba2/Лекция2-src/gradlew.bat @@ -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 diff --git a/Laba2/Лекция2-src/package-lock.json b/Laba2/Лекция2-src/package-lock.json new file mode 100644 index 0000000..210e76c --- /dev/null +++ b/Laba2/Лекция2-src/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "Лекция2-src", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/Laba2/Лекция2-src/settings.gradle b/Laba2/Лекция2-src/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/Laba2/Лекция2-src/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/DemoApplication.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..741175f --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,78 @@ +package com.example.demo; + +import java.util.Objects; +import java.util.ArrayList; +import java.util.List; + +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.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; +import com.example.demo.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.service.SubscribeService; +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 FilmService filmService; + private final GenreService genreService; + private final SubscribeService subscribeService; + private final UserService userService; + + public DemoApplication(GenreService genreService, FilmService filmService, SubscribeService subscribeService, + UserService userService) { + this.genreService = genreService; + this.filmService = filmService; + this.subscribeService = subscribeService; + 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])) { + + final List emptyList = new ArrayList<>(); + + log.info("Create default genres values"); + final var genre1 = genreService.create(new GenreEntity(null, "Drama")); + final var genre2 = genreService.create(new GenreEntity(null, "Comedy")); + final var genre3 = genreService.create(new GenreEntity(null, "Sport")); + final var genre4 = genreService.create(new GenreEntity(null, "Triller")); + + log.info("Create default subscribes values"); + final var subscribe1 = subscribeService.create(new SubscribeEntity(null, "Standart", 200d)); + final var subscribe2 = subscribeService.create(new SubscribeEntity(null, "Premium", 300d)); + + log.info("Create default films values"); + final var film1 = filmService.create(new FilmEntity(null, "film1", genre1, 200d, 20)); + final var film2 = filmService.create(new FilmEntity(null, "film2", genre2, 2000d, 40)); + final var film3 = filmService.create(new FilmEntity(null, "film3", genre3, 4800d, 30)); + final var film4 = filmService.create(new FilmEntity(null, "film4", genre4, 8800d, 21)); + final var film5 = filmService.create(new FilmEntity(null, "film5", genre1, 2700d, 10)); + + log.info("Create default users values"); + final var user1 = userService.create(new UserEntity(null, subscribe1, "user1", "mail", "phone", emptyList)); + final var user2 = userService.create(new UserEntity(null, subscribe2, "user1", "mail", "phone", emptyList)); + user1.addFilm(film1); + user1.addFilm(film2); + user1.addFilm(film3); + user1.addFilm(film4); + user1.addFilm(film5); + user2.addFilm(film2); + user2.addFilm(film5); + } + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/core/configuration/Constants.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/configuration/Constants.java new file mode 100644 index 0000000..d9c6b7c --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/configuration/Constants.java @@ -0,0 +1,8 @@ +package com.example.demo.core.configuration; + +public class Constants { + public static final String API_URL = "/api/1.0"; + + private Constants() { + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java new file mode 100644 index 0000000..a5ad6f3 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java @@ -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(); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java new file mode 100644 index 0000000..762e85a --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java @@ -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"); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/core/error/NotFoundException.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/error/NotFoundException.java new file mode 100644 index 0000000..586af3c --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/error/NotFoundException.java @@ -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)); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/core/model/BaseEntity.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/model/BaseEntity.java new file mode 100644 index 0000000..674ddfb --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/model/BaseEntity.java @@ -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; + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/core/repository/CommonRepository.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/repository/CommonRepository.java new file mode 100644 index 0000000..85e1e6d --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/repository/CommonRepository.java @@ -0,0 +1,17 @@ +package com.example.demo.core.repository; + +import java.util.List; + +public interface CommonRepository { + List getAll(); + + E get(T id); + + E create(E entity); + + E update(E entity); + + E delete(E entity); + + void deleteAll(); +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/core/repository/MapRepository.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/repository/MapRepository.java new file mode 100644 index 0000000..6809ac2 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/core/repository/MapRepository.java @@ -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 implements CommonRepository { + private final Map entities = new TreeMap<>(); + private Long lastId = 0L; + + protected MapRepository() { + } + + @Override + public List 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(); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/films/api/FilmController.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/films/api/FilmController.java new file mode 100644 index 0000000..2a100b9 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/films/api/FilmController.java @@ -0,0 +1,70 @@ +package com.example.demo.films.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.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.service.GenreService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/film") +public class FilmController { + private final FilmService filmService; + private final GenreService genreService; + private final ModelMapper modelMapper; + + public FilmController(FilmService filmService, GenreService genreService, ModelMapper modelMapper) { + this.filmService = filmService; + this.genreService = genreService; + this.modelMapper = modelMapper; + } + + private FilmDto toDto(FilmEntity entity) { + return modelMapper.map(entity, FilmDto.class); + } + + private FilmEntity toEntity(FilmDto dto) { + final FilmEntity entity = modelMapper.map(dto, FilmEntity.class); + entity.setGenre(genreService.get(dto.getGenreId())); + return entity; + } + + @GetMapping + public List getAll(@RequestParam(name = "genreId", defaultValue = "0") Long typeId) { + return filmService.getAll(typeId).stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public FilmDto get(@PathVariable(name = "id") Long id) { + return toDto(filmService.get(id)); + } + + @PostMapping + public FilmDto create(@RequestBody @Valid FilmDto dto) { + return toDto(filmService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public FilmDto update(@PathVariable(name = "id") Long id, @RequestBody FilmDto dto) { + return toDto(filmService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public FilmDto delete(@PathVariable(name = "id") Long id) { + return toDto(filmService.delete(id)); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/films/api/FilmDto.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/films/api/FilmDto.java new file mode 100644 index 0000000..fafcd95 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/films/api/FilmDto.java @@ -0,0 +1,59 @@ +package com.example.demo.films.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class FilmDto { + private Long id; + @NotNull + private String name; + @NotNull + @Min(1) + private Long genreId; + @NotNull + @Min(1) + private Double price; + @NotNull + @Min(1) + private Integer discount; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getGenreId() { + return genreId; + } + + public void setGenreId(Long genreId) { + this.genreId = genreId; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getDiscount() { + return discount; + } + + public void setDiscount(Integer discount) { + this.discount = discount; + } + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Double getSum() { + return price - ((price * discount) * 0.01); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/films/model/FilmEntity.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/films/model/FilmEntity.java new file mode 100644 index 0000000..e40b14a --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/films/model/FilmEntity.java @@ -0,0 +1,76 @@ +package com.example.demo.films.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.genres.model.GenreEntity; + +public class FilmEntity extends BaseEntity { + private String name; + private GenreEntity genre; + private Double price; + private Integer discount; + + public FilmEntity() { + super(); + } + + public FilmEntity(Long id, String name, GenreEntity genre, Double price, Integer discount) { + super(id); + this.name = name; + this.genre = genre; + this.price = price; + this.discount = discount; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public GenreEntity getGenre() { + return genre; + } + + public void setGenre(GenreEntity genre) { + this.genre = genre; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getDiscount() { + return discount; + } + + public void setDiscount(Integer discount) { + this.discount = discount; + } + + @Override + public int hashCode() { + return Objects.hash(id, name, genre, price, discount); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final FilmEntity other = (FilmEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name) + && Objects.equals(other.getGenre(), genre) + && Objects.equals(other.getPrice(), price) + && Objects.equals(other.getDiscount(), discount); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/films/repository/FilmRepository.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/films/repository/FilmRepository.java new file mode 100644 index 0000000..ff69db5 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/films/repository/FilmRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.films.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.films.model.FilmEntity; + +@Repository +public class FilmRepository extends MapRepository { +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/films/service/FilmService.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/films/service/FilmService.java new file mode 100644 index 0000000..f36ea31 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/films/service/FilmService.java @@ -0,0 +1,56 @@ +package com.example.demo.films.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.films.model.FilmEntity; +import com.example.demo.films.repository.FilmRepository; + +@Service +public class FilmService { + private final FilmRepository repository; + + public FilmService(FilmRepository repository) { + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public List getAll(Long typeId) { + if (Objects.equals(typeId, 0L)) { + return repository.getAll(); + } + return repository.getAll().stream() + .filter(film -> film.getGenre().getId().equals(typeId)) + .toList(); + } + + public FilmEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public FilmEntity create(FilmEntity entity) { + return repository.create(entity); + } + + public FilmEntity update(Long id, FilmEntity entity) { + final FilmEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + existsEntity.setGenre(entity.getGenre()); + existsEntity.setPrice(entity.getPrice()); + existsEntity.setDiscount(entity.getDiscount()); + return repository.update(existsEntity); + } + + public FilmEntity delete(Long id) { + final FilmEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/api/GenreController.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/api/GenreController.java new file mode 100644 index 0000000..2b3d9d8 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/api/GenreController.java @@ -0,0 +1,65 @@ +package com.example.demo.genres.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.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/genre") +public class GenreController { + private final GenreService genreService; + private final ModelMapper modelMapper; + + public GenreController(GenreService genreService, ModelMapper modelMapper) { + this.genreService = genreService; + this.modelMapper = modelMapper; + } + + private GenreDto toDto(GenreEntity entity) { + return modelMapper.map(entity, GenreDto.class); + } + + private GenreEntity toEntity(GenreDto dto) { + final GenreEntity entity = modelMapper.map(dto, GenreEntity.class); + return entity; + } + + @GetMapping + public List getAll() { + return genreService.getAll().stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public GenreDto get(@PathVariable(name = "id") Long id) { + return toDto(genreService.get(id)); + } + + @PostMapping + public GenreDto create(@RequestBody @Valid GenreDto dto) { + return toDto(genreService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public GenreDto update(@PathVariable(name = "id") Long id, @RequestBody GenreDto dto) { + return toDto(genreService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public GenreDto delete(@PathVariable(name = "id") Long id) { + return toDto(genreService.delete(id)); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/api/GenreDto.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/api/GenreDto.java new file mode 100644 index 0000000..b456060 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/api/GenreDto.java @@ -0,0 +1,28 @@ +package com.example.demo.genres.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotNull; + +public class GenreDto { + 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; + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/model/GenreEntity.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/model/GenreEntity.java new file mode 100644 index 0000000..28b3737 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/model/GenreEntity.java @@ -0,0 +1,42 @@ +package com.example.demo.genres.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +public class GenreEntity extends BaseEntity { + private String name; + + public GenreEntity() { + super(); + } + + public GenreEntity(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 GenreEntity other = (GenreEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/repository/GenreRepository.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/repository/GenreRepository.java new file mode 100644 index 0000000..ad92c2a --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/repository/GenreRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.genres.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.genres.model.GenreEntity; + +@Repository +public class GenreRepository extends MapRepository { +} \ No newline at end of file diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/service/GenreService.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/service/GenreService.java new file mode 100644 index 0000000..0510d45 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/genres/service/GenreService.java @@ -0,0 +1,42 @@ +package com.example.demo.genres.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.genres.model.GenreEntity; +import com.example.demo.genres.repository.GenreRepository; + +@Service +public class GenreService { + private final GenreRepository repository; + + public GenreService(GenreRepository repository) { + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public GenreEntity get(Long id) { + return Optional.ofNullable(repository.get(id)).orElseThrow(() -> new NotFoundException(id)); + } + + public GenreEntity create(GenreEntity entity) { + return repository.create(entity); + } + + public GenreEntity update(Long id, GenreEntity entity) { + final GenreEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + return repository.update(existsEntity); + } + + public GenreEntity delete(Long id) { + final GenreEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/speaker/configuration/SpeakerConfiguration.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/speaker/configuration/SpeakerConfiguration.java new file mode 100644 index 0000000..a34db6b --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/speaker/configuration/SpeakerConfiguration.java @@ -0,0 +1,5 @@ +package com.example.demo.speaker.configuration; + +public class SpeakerConfiguration { + +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/api/SubscribeController.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/api/SubscribeController.java new file mode 100644 index 0000000..d5ba202 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/api/SubscribeController.java @@ -0,0 +1,64 @@ +package com.example.demo.subscribes.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.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.service.SubscribeService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/subscribe") +public class SubscribeController { + private final SubscribeService subscribeService; + private final ModelMapper modelMapper; + + public SubscribeController(SubscribeService subscribeService, ModelMapper modelMapper) { + this.subscribeService = subscribeService; + this.modelMapper = modelMapper; + } + + private SubscribeDto toDto(SubscribeEntity entity) { + return modelMapper.map(entity, SubscribeDto.class); + } + + private SubscribeEntity toEntity(SubscribeDto dto) { + return modelMapper.map(dto, SubscribeEntity.class); + } + + @GetMapping + public List getAll() { + return subscribeService.getAll().stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public SubscribeDto get(@PathVariable(name = "id") Long id) { + return toDto(subscribeService.get(id)); + } + + @PostMapping + public SubscribeDto create(@RequestBody @Valid SubscribeDto dto) { + return toDto(subscribeService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public SubscribeDto update(@PathVariable(name = "id") Long id, @RequestBody SubscribeDto dto) { + return toDto(subscribeService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public SubscribeDto delete(@PathVariable(name = "id") Long id) { + return toDto(subscribeService.delete(id)); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/api/SubscribeDto.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/api/SubscribeDto.java new file mode 100644 index 0000000..be42ce5 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/api/SubscribeDto.java @@ -0,0 +1,41 @@ +package com.example.demo.subscribes.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; + +public class SubscribeDto { + private Long id; + @NotBlank + private String name; + @NotNull + @Min(1) + private Double cost; + + @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 Double getCost() { + return cost; + } + + public void setCost(Double cost) { + this.cost = cost; + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/model/SubscribeEntity.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/model/SubscribeEntity.java new file mode 100644 index 0000000..6dfe493 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/model/SubscribeEntity.java @@ -0,0 +1,54 @@ +package com.example.demo.subscribes.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +public class SubscribeEntity extends BaseEntity { + private String name; + private Double cost; + + public SubscribeEntity() { + super(); + } + + public SubscribeEntity(Long id, String name, Double cost) { + super(id); + this.name = name; + this.cost = cost; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Double getCost() { + return cost; + } + + public void setCost(Double cost) { + this.cost = cost; + } + + @Override + public int hashCode() { + return Objects.hash(id, name, cost); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final SubscribeEntity other = (SubscribeEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name) + && Objects.equals(other.getCost(), cost); + } + +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/repository/SubscribeRepository.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/repository/SubscribeRepository.java new file mode 100644 index 0000000..a68d7d3 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/repository/SubscribeRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.subscribes.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.subscribes.model.SubscribeEntity; + +@Repository +public class SubscribeRepository extends MapRepository { +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/service/SubscribeService.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/service/SubscribeService.java new file mode 100644 index 0000000..0941af0 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/subscribes/service/SubscribeService.java @@ -0,0 +1,44 @@ +package com.example.demo.subscribes.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.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.repository.SubscribeRepository; + +@Service +public class SubscribeService { + private final SubscribeRepository repository; + + public SubscribeService(SubscribeRepository repository) { + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public SubscribeEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public SubscribeEntity create(SubscribeEntity entity) { + return repository.create(entity); + } + + public SubscribeEntity update(Long id, SubscribeEntity entity) { + final SubscribeEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + existsEntity.setCost(entity.getCost()); + return repository.update(existsEntity); + } + + public SubscribeEntity delete(Long id) { + final SubscribeEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/users/api/UserController.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/users/api/UserController.java new file mode 100644 index 0000000..d59cd74 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/users/api/UserController.java @@ -0,0 +1,85 @@ +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; +import com.example.demo.subscribes.service.SubscribeService; + +import com.example.demo.films.service.FilmService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/user") +public class UserController { + private final UserService userService; + private final SubscribeService subscribeService; + private final ModelMapper modelMapper; + private final FilmService filmService; + + public UserController(UserService userService, SubscribeService subscribeService, ModelMapper modelMapper, + FilmService filmService) { + this.userService = userService; + this.subscribeService = subscribeService; + this.modelMapper = modelMapper; + this.filmService = filmService; + } + + private UserDto toDto(UserEntity entity) { + return modelMapper.map(entity, UserDto.class); + } + + private UserEntity toEntity(UserDto dto) { + final UserEntity entity = modelMapper.map(dto, UserEntity.class); + entity.setSubscribe(subscribeService.get(dto.getSubscribeId())); + return entity; + } + + @GetMapping + public List getAll(@RequestParam(name = "subscribeId", defaultValue = "0") Long subscribeId) { + return userService.getAll(subscribeId).stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public UserDto get(@PathVariable(name = "id") Long id) { + return toDto(userService.get(id)); + } + + @PostMapping + public UserDto create(@RequestBody @Valid UserDto dto) { + return toDto(userService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public UserDto update(@PathVariable(name = "id") Long id, @RequestBody UserDto dto) { + return toDto(userService.update(id, toEntity(dto))); + } + + @PutMapping("/addFilm/{id}") + public UserDto addFilm(@PathVariable(name = "id") Long id, @RequestBody Long filmId) { + return toDto(userService.addFilm(id, filmService.get(filmId))); + } + + @PutMapping("/deleteFilm/{id}") + public UserDto deleteFilm(@PathVariable(name = "id") Long id, @RequestBody Long filmId) { + return toDto(userService.deleteFilm(id, filmService.get(filmId))); + } + + @DeleteMapping("/{id}") + public UserDto delete(@PathVariable(name = "id") Long id) { + return toDto(userService.delete(id)); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/users/api/UserDto.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/users/api/UserDto.java new file mode 100644 index 0000000..cb74cf6 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/users/api/UserDto.java @@ -0,0 +1,84 @@ +package com.example.demo.users.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import com.example.demo.films.model.FilmEntity; + +public class UserDto { + private Long id; + @NotNull + @Min(1) + private Long subscribeId; + @NotBlank + private String name; + @NotBlank + private String mail; + @NotBlank + private String phone; + + private final List listFilms = new ArrayList(); + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getSubscribeId() { + return subscribeId; + } + + public void setSubscribeId(Long subscribeId) { + this.subscribeId = subscribeId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getMail() { + return mail; + } + + public void setMail(String mail) { + this.mail = mail; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getListFilms() { + return listFilms; + } + + public void setListFilms(List listFilms) { + this.listFilms.clear(); + this.listFilms.addAll(listFilms); + } + + public void addFilm(FilmEntity film) { + this.listFilms.add(film); + } + + public void deletefilm(FilmEntity film) { + this.listFilms.remove(film); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/users/model/UserEntity.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/users/model/UserEntity.java new file mode 100644 index 0000000..0384400 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/users/model/UserEntity.java @@ -0,0 +1,102 @@ +package com.example.demo.users.model; + +import java.util.Objects; +import java.util.ArrayList; +import java.util.List; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.subscribes.model.SubscribeEntity; +import com.example.demo.films.model.FilmEntity; + +public class UserEntity extends BaseEntity { + private SubscribeEntity subscribe; + private String name; + private String mail; + private String phone; + private final List listFilms = new ArrayList(); + + public UserEntity() { + super(); + } + + public UserEntity(Long id, SubscribeEntity subscribe, String name, String mail, String phone, + List listFims) { + super(id); + this.subscribe = subscribe; + this.name = name; + this.mail = mail; + this.phone = phone; + if (!listFims.isEmpty()) { + this.listFilms.clear(); + this.listFilms.addAll(listFims); + } + } + + public SubscribeEntity getSubscribe() { + return subscribe; + } + + public void setSubscribe(SubscribeEntity subscribe) { + this.subscribe = subscribe; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getMail() { + return mail; + } + + public void setMail(String mail) { + this.mail = mail; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getListFilms() { + return listFilms; + } + + public void setListFilms(List listFilms) { + this.listFilms.addAll(listFilms); + } + + public void addFilm(FilmEntity film) { + this.listFilms.add(film); + } + + public void deleteFilm(FilmEntity film) { + this.listFilms.remove(film); + } + + @Override + public int hashCode() { + return Objects.hash(id, subscribe, name, mail, phone, listFilms); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final UserEntity other = (UserEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getSubscribe(), subscribe) + && Objects.equals(other.getName(), name) + && Objects.equals(other.getMail(), mail) + && Objects.equals(other.getPhone(), phone) + && Objects.equals(other.getListFilms(), listFilms); + } +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/users/repository/UserRepository.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/users/repository/UserRepository.java new file mode 100644 index 0000000..fa4b654 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/users/repository/UserRepository.java @@ -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 { +} diff --git a/Laba2/Лекция2-src/src/main/java/com/example/demo/users/service/UserService.java b/Laba2/Лекция2-src/src/main/java/com/example/demo/users/service/UserService.java new file mode 100644 index 0000000..17ecd10 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/java/com/example/demo/users/service/UserService.java @@ -0,0 +1,71 @@ +package com.example.demo.users.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.users.model.UserEntity; +import com.example.demo.films.model.FilmEntity; +import com.example.demo.users.repository.UserRepository; + +@Service +public class UserService { + private final UserRepository repository; + + public UserService(UserRepository repository) { + this.repository = repository; + } + + public List getAll(Long subscribeId) { + if (Objects.equals(subscribeId, 0L)) { + return repository.getAll(); + } + return repository.getAll().stream() + .filter(user -> user.getSubscribe().getId().equals(subscribeId)) + .toList(); + } + + public List getAll() { + return repository.getAll(); + } + + public UserEntity get(Long id) { + 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) { + final UserEntity existsEntity = get(id); + existsEntity.setSubscribe(entity.getSubscribe()); + existsEntity.setName(entity.getName()); + existsEntity.setMail(entity.getMail()); + existsEntity.setPhone(entity.getPhone()); + return repository.update(existsEntity); + } + + public UserEntity delete(Long id) { + final UserEntity existsEntity = get(id); + return repository.delete(existsEntity); + } + + public UserEntity addFilm(Long id, FilmEntity film) { + final UserEntity existsEntity = get(id); + if (!existsEntity.getListFilms().contains(film)) + existsEntity.addFilm(film); + return repository.update(existsEntity); + } + + public UserEntity deleteFilm(Long id, FilmEntity film) { + final UserEntity existsEntity = get(id); + if (existsEntity.getListFilms().contains(film)) + existsEntity.deleteFilm(film); + return repository.update(existsEntity); + } +} diff --git a/Laba2/Лекция2-src/src/main/resources/application.properties b/Laba2/Лекция2-src/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Laba2/Лекция2-src/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/Laba2/Лекция2-src/src/test/java/com/example/demo/FilmsServiceTests.java b/Laba2/Лекция2-src/src/test/java/com/example/demo/FilmsServiceTests.java new file mode 100644 index 0000000..35a96a8 --- /dev/null +++ b/Laba2/Лекция2-src/src/test/java/com/example/demo/FilmsServiceTests.java @@ -0,0 +1,79 @@ +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.films.service.FilmService; +import com.example.demo.films.model.FilmEntity; +import com.example.demo.genres.model.GenreEntity; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +public class FilmsServiceTests { + @Autowired + private FilmService filmService; + + @Test + void getFilmTest() { + Assertions.assertThrows(NotFoundException.class, () -> filmService.get(0L)); + } + + @Test + @Order(1) + void createFilmTest() { + final GenreEntity genre = new GenreEntity(null, "genre"); + + filmService.create(new FilmEntity(null, "name", genre, 100d, 20)); + filmService.create(new FilmEntity(null, "name", genre, 100d, 20)); + final FilmEntity last = filmService.create(new FilmEntity(null, "name", genre, 100d, 20)); + Assertions.assertEquals(3, filmService.getAll().size()); + Assertions.assertEquals(last, filmService.get(3L)); + } + + @Test + @Order(2) + void updateFilmTest() { + final String testName = "TEST"; + final GenreEntity testGenre = new GenreEntity(null, "test"); + final Double testPrice = 123d; + final int testDiscount = 12; + final FilmEntity entity = filmService.get(3L); + final String oldName = entity.getName(); + final GenreEntity oldGenre = entity.getGenre(); + final Double oldPrice = entity.getPrice(); + final int oldDiscount = entity.getDiscount(); + final FilmEntity newEntity = filmService.update(3L, + new FilmEntity(3L, testName, testGenre, testPrice, testDiscount)); + Assertions.assertEquals(3, filmService.getAll().size()); + Assertions.assertEquals(newEntity, filmService.get(3L)); + Assertions.assertEquals(testName, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + Assertions.assertEquals(testGenre, newEntity.getGenre()); + Assertions.assertNotEquals(oldGenre, newEntity.getGenre()); + Assertions.assertEquals(testPrice, newEntity.getPrice()); + Assertions.assertNotEquals(oldPrice, newEntity.getPrice()); + Assertions.assertEquals(testDiscount, newEntity.getDiscount()); + Assertions.assertNotEquals(oldDiscount, newEntity.getDiscount()); + } + + @Test + @Order(3) + void deleteFilmTest() { + final GenreEntity genre = new GenreEntity(null, "genre"); + + filmService.delete(3L); + Assertions.assertEquals(2, filmService.getAll().size()); + final FilmEntity last = filmService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final FilmEntity newEntity = filmService.create(new FilmEntity(null, "film", genre, 500d, 10)); + Assertions.assertEquals(3, filmService.getAll().size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +} diff --git a/Laba2/Лекция2-src/src/test/java/com/example/demo/GenreServiceTests.java b/Laba2/Лекция2-src/src/test/java/com/example/demo/GenreServiceTests.java new file mode 100644 index 0000000..5b589a6 --- /dev/null +++ b/Laba2/Лекция2-src/src/test/java/com/example/demo/GenreServiceTests.java @@ -0,0 +1,61 @@ +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.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class GenreServiceTests { + @Autowired + private GenreService genreService; + + @Test + void getGenreTest() { + Assertions.assertThrows(NotFoundException.class, () -> genreService.get(0L)); + } + + @Test + @Order(1) + void createGenreTest() { + genreService.create(new GenreEntity(null, "Drama")); + genreService.create(new GenreEntity(null, "Comedy")); + final GenreEntity last = genreService.create(new GenreEntity(null, "Triller")); + Assertions.assertEquals(3, genreService.getAll().size()); + Assertions.assertEquals(last, genreService.get(3L)); + } + + @Test + @Order(2) + void updateGenreTest() { + final String test = "TEST"; + final GenreEntity entity = genreService.get(3L); + final String oldName = entity.getName(); + final GenreEntity newEntity = genreService.update(3L, new GenreEntity(1L, test)); + Assertions.assertEquals(3, genreService.getAll().size()); + Assertions.assertEquals(newEntity, genreService.get(3L)); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + @Order(3) + void deleteGenreTest() { + genreService.delete(3L); + Assertions.assertEquals(2, genreService.getAll().size()); + final GenreEntity last = genreService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final GenreEntity newEntity = genreService.create(new GenreEntity(null, "Drama")); + Assertions.assertEquals(3, genreService.getAll().size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +} diff --git a/Laba2/Лекция2-src/src/test/java/com/example/demo/SubscribeServiceTests.java b/Laba2/Лекция2-src/src/test/java/com/example/demo/SubscribeServiceTests.java new file mode 100644 index 0000000..1ea30b8 --- /dev/null +++ b/Laba2/Лекция2-src/src/test/java/com/example/demo/SubscribeServiceTests.java @@ -0,0 +1,65 @@ +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.subscribes.service.SubscribeService; +import com.example.demo.subscribes.model.SubscribeEntity; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +public class SubscribeServiceTests { + @Autowired + private SubscribeService subscribeService; + + @Test + void getSubscribeTest() { + Assertions.assertThrows(NotFoundException.class, () -> subscribeService.get(0L)); + } + + @Test + @Order(1) + void createSubscribeTest() { + subscribeService.create(new SubscribeEntity(null, "sub1", 100d)); + subscribeService.create(new SubscribeEntity(null, "sub2", 200d)); + final SubscribeEntity last = subscribeService.create(new SubscribeEntity(null, "sub3", 300d)); + Assertions.assertEquals(3, subscribeService.getAll().size()); + Assertions.assertEquals(last, subscribeService.get(3L)); + } + + @Test + @Order(2) + void updateSubscribeTest() { + final String testName = "TEST"; + final Double testPrice = 123d; + final SubscribeEntity entity = subscribeService.get(3L); + final String oldName = entity.getName(); + final Double oldPrice = entity.getCost(); + final SubscribeEntity newEntity = subscribeService.update(3L, new SubscribeEntity(3L, testName, testPrice)); + Assertions.assertEquals(3, subscribeService.getAll().size()); + Assertions.assertEquals(newEntity, subscribeService.get(3L)); + Assertions.assertEquals(testName, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + Assertions.assertEquals(testPrice, newEntity.getCost()); + Assertions.assertNotEquals(oldPrice, newEntity.getCost()); + } + + @Test + @Order(3) + void deleteSubscribeTest() { + subscribeService.delete(3L); + Assertions.assertEquals(2, subscribeService.getAll().size()); + final SubscribeEntity last = subscribeService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final SubscribeEntity newEntity = subscribeService.create(new SubscribeEntity(null, "sub8", 500d)); + Assertions.assertEquals(3, subscribeService.getAll().size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +} diff --git a/Laba2/Лекция2-src/src/test/java/com/example/demo/UsersServiceTests.java b/Laba2/Лекция2-src/src/test/java/com/example/demo/UsersServiceTests.java new file mode 100644 index 0000000..a46c8df --- /dev/null +++ b/Laba2/Лекция2-src/src/test/java/com/example/demo/UsersServiceTests.java @@ -0,0 +1,110 @@ +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 java.util.ArrayList; +import java.util.List; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.films.model.FilmEntity; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.subscribes.model.SubscribeEntity; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class UsersServiceTests { + @Autowired + private UserService userService; + + final List emptyList = new ArrayList(); + final GenreEntity genre = new GenreEntity(null, "genre"); + final FilmEntity film = new FilmEntity(null, "name", genre, 100d, 10); + + @Test + void getUserTest() { + Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L)); + } + + @Test + @Order(1) + void createUserTest() { + final SubscribeEntity sub = new SubscribeEntity(null, "sub", 100d); + + userService.create(new UserEntity(null, sub, "name", "mail", "phone", emptyList)); + userService.create(new UserEntity(null, sub, "name", "mail", "phone", emptyList)); + final UserEntity last = userService.create(new UserEntity(null, sub, "name", "mail", "phone", emptyList)); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(last, userService.get(3L)); + } + + @Test + @Order(2) + void updateUserTest() { + final SubscribeEntity testSub = new SubscribeEntity(null, "test", 100d); + final String testName = "TEST"; + final String testMail = "TEST"; + final String testPhone = "TEST"; + final UserEntity entity = userService.get(3L); + final SubscribeEntity oldSub = entity.getSubscribe(); + final String oldName = entity.getName(); + final String oldMail = entity.getMail(); + final String oldPhone = entity.getPhone(); + final UserEntity newEntity = userService.update(3L, + new UserEntity(3L, testSub, testName, testMail, testPhone, emptyList)); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(newEntity, userService.get(3L)); + Assertions.assertEquals(testSub, newEntity.getSubscribe()); + Assertions.assertNotEquals(oldSub, newEntity.getSubscribe()); + Assertions.assertEquals(testName, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + Assertions.assertEquals(testMail, newEntity.getMail()); + Assertions.assertNotEquals(oldMail, newEntity.getMail()); + Assertions.assertEquals(testPhone, newEntity.getPhone()); + Assertions.assertNotEquals(oldPhone, newEntity.getPhone()); + } + + @Test + @Order(3) + void deleteUserTest() { + final SubscribeEntity sub = new SubscribeEntity(null, "sub", 100d); + + userService.delete(3L); + Assertions.assertEquals(2, userService.getAll().size()); + final UserEntity last = userService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final UserEntity newEntity = userService.create(new UserEntity(null, sub, "name", "mail", "phone", emptyList)); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(4L, newEntity.getId()); + } + + @Test + @Order(4) + void addFilmTest() { + + userService.addFilm(4L, film); + userService.addFilm(4L, film); + + Assertions.assertEquals(true, userService.get(4L).getListFilms().contains(film)); + Assertions.assertEquals(1, userService.get(4L).getListFilms().size()); + } + + @Test + @Order(5) + void deleteFilmTest() { + Assertions.assertEquals(true, userService.get(4L).getListFilms().contains(film)); + Assertions.assertEquals(1, userService.get(4L).getListFilms().size()); + + userService.deleteFilm(4L, film); + + Assertions.assertEquals(false, userService.get(4L).getListFilms().contains(film)); + Assertions.assertEquals(0, userService.get(4L).getListFilms().size()); + } +} \ No newline at end of file diff --git a/Laba3/Лекция3-src/.gitignore b/Laba3/Лекция3-src/.gitignore new file mode 100644 index 0000000..546ecee --- /dev/null +++ b/Laba3/Лекция3-src/.gitignore @@ -0,0 +1,36 @@ +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/ + +data.*.db \ No newline at end of file diff --git a/Laba3/Лекция3-src/.vscode/extensions.json b/Laba3/Лекция3-src/.vscode/extensions.json new file mode 100644 index 0000000..42cf79d --- /dev/null +++ b/Laba3/Лекция3-src/.vscode/extensions.json @@ -0,0 +1,12 @@ +{ + "recommendations": [ + // fronted + "AndersEAndersen.html-class-suggestions", + "dbaeumer.vscode-eslint", + // backend + "vscjava.vscode-java-pack", + "vmware.vscode-boot-dev-pack", + "vscjava.vscode-gradle", + "redhat.vscode-xml" + ] +} \ No newline at end of file diff --git a/Laba3/Лекция3-src/.vscode/launch.json b/Laba3/Лекция3-src/.vscode/launch.json new file mode 100644 index 0000000..60a4fe1 --- /dev/null +++ b/Laba3/Лекция3-src/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + "configurations": [ + { + "type": "java", + "name": "Demo", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "lec3", + "args": "--populate", + "envFile": "${workspaceFolder}/.env" + }, + { + "type": "java", + "name": "Spring Boot-DemoApplication<Лекция3-src>", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "Лекция3-src", + "args": "", + "envFile": "${workspaceFolder}/.env" + } + ] +} \ No newline at end of file diff --git a/Laba3/Лекция3-src/.vscode/settings.json b/Laba3/Лекция3-src/.vscode/settings.json new file mode 100644 index 0000000..eab3db6 --- /dev/null +++ b/Laba3/Лекция3-src/.vscode/settings.json @@ -0,0 +1,21 @@ +{ + "editor.tabSize": 4, + "editor.detectIndentation": false, + "editor.insertSpaces": true, + "editor.formatOnPaste": true, + "editor.formatOnSave": true, + "editor.formatOnType": false, + "java.compile.nullAnalysis.mode": "disabled", + "java.configuration.updateBuildConfiguration": "automatic", + "[java]": { + "editor.pasteAs.enabled": false, + }, + "gradle.nestedProjects": true, + "java.saveActions.organizeImports": true, + "java.dependency.packagePresentation": "hierarchical", + "spring-boot.ls.problem.boot2.JAVA_CONSTRUCTOR_PARAMETER_INJECTION": "WARNING", + "spring.initializr.defaultLanguage": "Java", + "java.format.settings.url": ".vscode/eclipse-formatter.xml", + "java.project.explorer.showNonJavaResources": true, + "java.codeGeneration.hashCodeEquals.useJava7Objects": true, +} \ No newline at end of file diff --git a/Laba3/Лекция3-src/build.gradle b/Laba3/Лекция3-src/build.gradle new file mode 100644 index 0000000..1f5a14c --- /dev/null +++ b/Laba3/Лекция3-src/build.gradle @@ -0,0 +1,43 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.4' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +defaultTasks 'bootRun' + +jar { + enabled = false +} + +bootJar { + archiveFileName = String.format('%s-%s.jar', rootProject.name, version) +} + +assert System.properties['java.specification.version'] == '17' || '21' +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'org.modelmapper:modelmapper:3.2.0' + + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'com.h2database:h2:2.2.224' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/Laba3/Лекция3-src/gradle/wrapper/gradle-wrapper.jar b/Laba3/Лекция3-src/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/Laba3/Лекция3-src/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Laba3/Лекция3-src/gradle/wrapper/gradle-wrapper.properties b/Laba3/Лекция3-src/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/Laba3/Лекция3-src/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/Laba3/Лекция3-src/gradlew b/Laba3/Лекция3-src/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/Laba3/Лекция3-src/gradlew @@ -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" "$@" diff --git a/Laba3/Лекция3-src/gradlew.bat b/Laba3/Лекция3-src/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/Laba3/Лекция3-src/gradlew.bat @@ -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 diff --git a/Laba3/Лекция3-src/readme.md b/Laba3/Лекция3-src/readme.md new file mode 100644 index 0000000..6eea3e5 --- /dev/null +++ b/Laba3/Лекция3-src/readme.md @@ -0,0 +1,18 @@ +Swagger UI: \ +http://localhost:8080/swagger-ui/index.html + +H2 Console: \ +http://localhost:8080/h2-console + +JDBC URL: jdbc:h2:file:./data \ +User Name: sa \ +Password: password + +Почитать: + +- Односторонние и двусторонние связи https://www.baeldung.com/jpa-hibernate-associations +- Getters и Setters для двусторонних связей https://en.wikibooks.org/wiki/Java_Persistence/OneToMany#Getters_and_Setters +- Многие-ко-многим с доп. атрибутами https://thorben-janssen.com/hibernate-tip-many-to-many-association-with-additional-attributes/ +- Многие-ко-многим с доп. атрибутами https://www.baeldung.com/jpa-many-to-many +- Каскадное удаление сущностей со связями многие-ко-многим https://www.baeldung.com/jpa-remove-entity-many-to-many +- Выбор типа коллекции для отношений вида ко-многим в JPA https://thorben-janssen.com/association-mappings-bag-list-set/ diff --git a/Laba3/Лекция3-src/settings.gradle b/Laba3/Лекция3-src/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/Laba3/Лекция3-src/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/DemoApplication.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..e89a1ae --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,74 @@ +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.users.model.UserEntity; +import com.example.demo.users.service.UserService; +import com.example.demo.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; +import com.example.demo.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.service.SubscribeService; + +@SpringBootApplication +public class DemoApplication implements CommandLineRunner { + private final Logger log = LoggerFactory.getLogger(DemoApplication.class); + + private final UserService userService; + private final FilmService filmService; + private final GenreService genreService; + private final SubscribeService subscribeService; + + public DemoApplication( + UserService userService, + FilmService filmService, + GenreService genreService, + SubscribeService subscribeService) { + this.userService = userService; + this.filmService = filmService; + this.genreService = genreService; + this.subscribeService = subscribeService; + } + + 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 genre values"); + + // final var genre1 = genreService.create(new GenreEntity("жанр1")); + // final var genre2 = genreService.create(new GenreEntity("жанр2")); + // final var genre3 = genreService.create(new GenreEntity("жанр3")); + + // log.info("Create default film values"); + // final var film1 = filmService.create(new FilmEntity("film1", genre1, 100d, + // 20)); + // final var film2 = filmService.create(new FilmEntity("film2", genre1, 100d, + // 20)); + // final var film3 = filmService.create(new FilmEntity("film3", genre2, 100d, + // 20)); + // final var film4 = filmService.create(new FilmEntity("film4", genre3, 100d, + // 20)); + // final var film5 = filmService.create(new FilmEntity("film5", genre1, 100d, + // 20)); + + log.info("Create default subscribe values"); + final var subscribe1 = subscribeService.create(new SubscribeEntity("Подписка 1", 100d)); + final var subscribe2 = subscribeService.create(new SubscribeEntity("Подписка 2", 200d)); + + log.info("Create default user values"); + final var user1 = userService.create(new UserEntity(subscribe1, "user1", "mail", "phone")); + userService.create(new UserEntity(subscribe2, "user2", "mail", "phone")); + } + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/core/configuration/Constants.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/core/configuration/Constants.java new file mode 100644 index 0000000..2474c0f --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/core/configuration/Constants.java @@ -0,0 +1,10 @@ +package com.example.demo.core.configuration; + +public class Constants { + public static final String SEQUENCE_NAME = "hibernate_sequence"; + + public static final String API_URL = "/api/1.0"; + + private Constants() { + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java new file mode 100644 index 0000000..a5ad6f3 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java @@ -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(); + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java new file mode 100644 index 0000000..762e85a --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java @@ -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"); + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/core/error/NotFoundException.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/core/error/NotFoundException.java new file mode 100644 index 0000000..a61d118 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/core/error/NotFoundException.java @@ -0,0 +1,7 @@ +package com.example.demo.core.error; + +public class NotFoundException extends RuntimeException { + public NotFoundException(Class clazz, Long id) { + super(String.format("%s with id [%s] is not found or not exists", clazz.getSimpleName(), id)); + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/core/model/BaseEntity.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/core/model/BaseEntity.java new file mode 100644 index 0000000..eba74ad --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/core/model/BaseEntity.java @@ -0,0 +1,28 @@ +package com.example.demo.core.model; + +import com.example.demo.core.configuration.Constants; + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.SequenceGenerator; + +@MappedSuperclass +public abstract class BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = Constants.SEQUENCE_NAME) + @SequenceGenerator(name = Constants.SEQUENCE_NAME, sequenceName = Constants.SEQUENCE_NAME, allocationSize = 1) + protected Long id; + + protected BaseEntity() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/films/api/FilmController.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/api/FilmController.java new file mode 100644 index 0000000..35e93bf --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/api/FilmController.java @@ -0,0 +1,73 @@ +package com.example.demo.films.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.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.service.GenreService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/film") +public class FilmController { + private final FilmService filmService; + private final GenreService genreService; + private final ModelMapper modelMapper; + + public FilmController(FilmService filmService, GenreService genreService, ModelMapper modelMapper) { + this.filmService = filmService; + this.genreService = genreService; + this.modelMapper = modelMapper; + } + + private FilmDto toDto(FilmEntity entity) { + return modelMapper.map(entity, FilmDto.class); + } + + private FilmEntity toEntity(FilmDto dto) { + final FilmEntity entity = modelMapper.map(dto, FilmEntity.class); + entity.setGenre(genreService.get(dto.getGenreId())); + return entity; + } + + @GetMapping + public List getAll() { + return filmService.getAll().stream() + .map(this::toDto) + .toList(); + } + + @GetMapping("/{id}") + public FilmDto get(@PathVariable(name = "id") Long id) { + return toDto(filmService.get(id)); + } + + @PostMapping + public FilmDto create(@RequestBody @Valid FilmDto dto) { + return toDto(filmService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public FilmDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid FilmDto dto) { + return toDto(filmService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public FilmDto delete(@PathVariable(name = "id") Long id) { + return toDto(filmService.delete(id)); + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/films/api/FilmDto.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/api/FilmDto.java new file mode 100644 index 0000000..fafcd95 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/api/FilmDto.java @@ -0,0 +1,59 @@ +package com.example.demo.films.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class FilmDto { + private Long id; + @NotNull + private String name; + @NotNull + @Min(1) + private Long genreId; + @NotNull + @Min(1) + private Double price; + @NotNull + @Min(1) + private Integer discount; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getGenreId() { + return genreId; + } + + public void setGenreId(Long genreId) { + this.genreId = genreId; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getDiscount() { + return discount; + } + + public void setDiscount(Integer discount) { + this.discount = discount; + } + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Double getSum() { + return price - ((price * discount) * 0.01); + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/films/model/FilmEntity.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/model/FilmEntity.java new file mode 100644 index 0000000..048036d --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/model/FilmEntity.java @@ -0,0 +1,106 @@ +package com.example.demo.films.model; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.userFilm.model.UserFilmEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; + +@Entity +@Table(name = "films") +public class FilmEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 100) + private String name; + @ManyToOne + @JoinColumn(name = "genreId", nullable = false) + private GenreEntity genre; + @Column(nullable = false) + private Double price; + @Column(nullable = false) + private Integer discount; + @OneToMany(mappedBy = "film") + @OrderBy("id ASC") + private Set userFilms = new HashSet<>(); + + public FilmEntity() { + } + + public FilmEntity(String name, GenreEntity genre, Double price, Integer discount) { + this.name = name; + this.genre = genre; + this.price = price; + this.discount = discount; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public GenreEntity getGenre() { + return genre; + } + + public void setGenre(GenreEntity genre) { + this.genre = genre; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getDiscount() { + return discount; + } + + public void setDiscount(Integer discount) { + this.discount = discount; + } + + public Set getUserFilms() { + return userFilms; + } + + public void addUser(UserFilmEntity userFilm) { + if (userFilm.getFilm() != this) { + userFilm.setFilm(this); + } + userFilms.add(userFilm); + } + + @Override + public int hashCode() { + return Objects.hash(id, name, genre, price, discount); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final FilmEntity other = (FilmEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name) + && Objects.equals(other.getGenre(), genre) + && Objects.equals(other.getPrice(), price) + && Objects.equals(other.getDiscount(), discount); + } +} \ No newline at end of file diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/films/model/UserFilmEntity.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/model/UserFilmEntity.java new file mode 100644 index 0000000..944d2cf --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/model/UserFilmEntity.java @@ -0,0 +1,15 @@ +package com.example.demo.films.model; + +public class UserFilmEntity { + + public FilmEntity getFilm() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'getFilm'"); + } + + public void setFilm(FilmEntity filmEntity) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'setFilm'"); + } + +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/films/repository/FilmRepository.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/repository/FilmRepository.java new file mode 100644 index 0000000..4b0d4bd --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/repository/FilmRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.films.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; + +import com.example.demo.films.model.FilmEntity; + +public interface FilmRepository extends CrudRepository { + Optional findByNameIgnoreCase(String name); +} \ No newline at end of file diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/films/service/FilmService.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/service/FilmService.java new file mode 100644 index 0000000..001f0de --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/films/service/FilmService.java @@ -0,0 +1,64 @@ +package com.example.demo.films.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.films.model.FilmEntity; +import com.example.demo.films.repository.FilmRepository; + +@Service +public class FilmService { + private final FilmRepository repository; + + public FilmService(FilmRepository repository) { + this.repository = repository; + } + + private void checkName(String name) { + if (repository.findByNameIgnoreCase(name).isPresent()) { + throw new IllegalArgumentException( + String.format("Type with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public FilmEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(FilmEntity.class, id)); + } + + @Transactional + public FilmEntity create(FilmEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(entity.getName()); + return repository.save(entity); + } + + @Transactional + public FilmEntity update(Long id, FilmEntity entity) { + final FilmEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + existsEntity.setGenre(entity.getGenre()); + existsEntity.setPrice(entity.getPrice()); + existsEntity.setDiscount(entity.getDiscount()); + return repository.save(existsEntity); + } + + @Transactional + public FilmEntity delete(Long id) { + final FilmEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreController.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreController.java new file mode 100644 index 0000000..3d483b1 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreController.java @@ -0,0 +1,68 @@ +package com.example.demo.genres.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.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/genre") +public class GenreController { + private final GenreService genreService; + private final ModelMapper modelMapper; + + public GenreController(GenreService genreService, ModelMapper modelMapper) { + this.genreService = genreService; + this.modelMapper = modelMapper; + } + + private GenreDto toDto(GenreEntity entity) { + return modelMapper.map(entity, GenreDto.class); + } + + private GenreEntity toEntity(GenreDto dto) { + return modelMapper.map(dto, GenreEntity.class); + } + + @GetMapping + public List getAll() { + return genreService.getAll().stream() + .map(this::toDto) + .toList(); + } + + @GetMapping("/{id}") + public GenreDto get(@PathVariable(name = "id") Long id) { + return toDto(genreService.get(id)); + } + + @PostMapping + public GenreDto create(@RequestBody @Valid GenreDto dto) { + return toDto(genreService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public GenreDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid GenreDto dto) { + return toDto(genreService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public GenreDto delete(@PathVariable(name = "id") Long id) { + return toDto(genreService.delete(id)); + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreDto.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreDto.java new file mode 100644 index 0000000..c743956 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreDto.java @@ -0,0 +1,30 @@ +package com.example.demo.genres.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public class GenreDto { + private Long id; + @NotNull + @Size(min = 5, max = 50) + 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; + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/model/GenreEntity.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/model/GenreEntity.java new file mode 100644 index 0000000..07cf9bd --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/model/GenreEntity.java @@ -0,0 +1,47 @@ +package com.example.demo.genres.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "genres") +public class GenreEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + + public GenreEntity() { + } + + public GenreEntity(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final GenreEntity other = (GenreEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/repository/GenreRepository.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/repository/GenreRepository.java new file mode 100644 index 0000000..5a52ab6 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/repository/GenreRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.genres.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; + +import com.example.demo.genres.model.GenreEntity; + +public interface GenreRepository extends CrudRepository { + Optional findByNameIgnoreCase(String name); +} \ No newline at end of file diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/service/GenreService.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/service/GenreService.java new file mode 100644 index 0000000..a19e39b --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/genres/service/GenreService.java @@ -0,0 +1,62 @@ +package com.example.demo.genres.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.repository.GenreRepository; + +@Service +public class GenreService { + private final GenreRepository repository; + + public GenreService(GenreRepository repository) { + this.repository = repository; + } + + private void checkName(String name) { + if (repository.findByNameIgnoreCase(name).isPresent()) { + throw new IllegalArgumentException( + String.format("Type with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public GenreEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(GenreEntity.class, id)); + } + + @Transactional + public GenreEntity create(GenreEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(entity.getName()); + return repository.save(entity); + } + + @Transactional + public GenreEntity update(Long id, GenreEntity entity) { + final GenreEntity existsEntity = get(id); + checkName(entity.getName()); + existsEntity.setName(entity.getName()); + return repository.save(existsEntity); + } + + @Transactional + public GenreEntity delete(Long id) { + final GenreEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeController.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeController.java new file mode 100644 index 0000000..595897f --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeController.java @@ -0,0 +1,68 @@ +package com.example.demo.subscribes.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.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.service.SubscribeService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/subscribe") +public class SubscribeController { + private final SubscribeService subscribeService; + private final ModelMapper modelMapper; + + public SubscribeController(SubscribeService subscribeService, ModelMapper modelMapper) { + this.subscribeService = subscribeService; + this.modelMapper = modelMapper; + } + + private SubscribeDto toDto(SubscribeEntity entity) { + return modelMapper.map(entity, SubscribeDto.class); + } + + private SubscribeEntity toEntity(SubscribeDto dto) { + return modelMapper.map(dto, SubscribeEntity.class); + } + + @GetMapping + public List getAll() { + return subscribeService.getAll().stream() + .map(this::toDto) + .toList(); + } + + @GetMapping("/{id}") + public SubscribeDto get(@PathVariable(name = "id") Long id) { + return toDto(subscribeService.get(id)); + } + + @PostMapping + public SubscribeDto create(@RequestBody @Valid SubscribeDto dto) { + return toDto(subscribeService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public SubscribeDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid SubscribeDto dto) { + return toDto(subscribeService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public SubscribeDto delete(@PathVariable(name = "id") Long id) { + return toDto(subscribeService.delete(id)); + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeDto.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeDto.java new file mode 100644 index 0000000..24cbfd3 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeDto.java @@ -0,0 +1,42 @@ +package com.example.demo.subscribes.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + +public class SubscribeDto { + private Long id; + @NotNull + @Size(min = 3, max = 50) + private String name; + @NotNull + @Min(1) + private Double cost; + + @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 Double getCost() { + return cost; + } + + public void setCost(Double cost) { + this.cost = cost; + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/model/SubscribeEntity.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/model/SubscribeEntity.java new file mode 100644 index 0000000..d8e99db --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/model/SubscribeEntity.java @@ -0,0 +1,60 @@ +package com.example.demo.subscribes.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "subscribes") +public class SubscribeEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + @Column(nullable = false) + private Double cost; + + public SubscribeEntity() { + } + + public SubscribeEntity(String name, Double cost) { + this.name = name; + this.cost = cost; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Double getCost() { + return cost; + } + + public void setCost(Double cost) { + this.cost = cost; + } + + @Override + public int hashCode() { + return Objects.hash(id, name, cost); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final SubscribeEntity other = (SubscribeEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name) + && Objects.equals(other.getCost(), cost); + } + +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/repository/SubscribeRepository.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/repository/SubscribeRepository.java new file mode 100644 index 0000000..5ea8080 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/repository/SubscribeRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.subscribes.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; + +import com.example.demo.subscribes.model.SubscribeEntity; + +public interface SubscribeRepository extends CrudRepository { + Optional findByNameIgnoreCase(String name); +} \ No newline at end of file diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/service/SubscribeService.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/service/SubscribeService.java new file mode 100644 index 0000000..7f3754e --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/subscribes/service/SubscribeService.java @@ -0,0 +1,62 @@ +package com.example.demo.subscribes.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.repository.SubscribeRepository; + +@Service +public class SubscribeService { + private final SubscribeRepository repository; + + public SubscribeService(SubscribeRepository repository) { + this.repository = repository; + } + + private void checkName(String name) { + if (repository.findByNameIgnoreCase(name).isPresent()) { + throw new IllegalArgumentException( + String.format("Type with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public SubscribeEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(SubscribeEntity.class, id)); + } + + @Transactional + public SubscribeEntity create(SubscribeEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(entity.getName()); + return repository.save(entity); + } + + @Transactional + public SubscribeEntity update(Long id, SubscribeEntity entity) { + final SubscribeEntity existsEntity = get(id); + checkName(entity.getName()); + existsEntity.setName(entity.getName()); + return repository.save(existsEntity); + } + + @Transactional + public SubscribeEntity delete(Long id) { + final SubscribeEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/userFilm/model/UserFilmEntity.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/userFilm/model/UserFilmEntity.java new file mode 100644 index 0000000..90a591f --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/userFilm/model/UserFilmEntity.java @@ -0,0 +1,95 @@ +package com.example.demo.userFilm.model; + +import com.example.demo.films.model.FilmEntity; +import com.example.demo.users.model.UserEntity; + +import java.util.Objects; + +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users_films") +public class UserFilmEntity { + @EmbeddedId + private UserFilmId id = new UserFilmId(); + @ManyToOne + @MapsId("userId") + @JoinColumn(name = "user_id") + private UserEntity user; + @ManyToOne + @MapsId("filmId") + @JoinColumn(name = "film_id") + private FilmEntity film; + private boolean viewed; + + public UserFilmEntity() { + } + + public UserFilmEntity(UserEntity user, FilmEntity film, boolean viewed) { + this.user = user; + this.film = film; + this.viewed = viewed; + } + + public UserFilmId getId() { + return id; + } + + public void setId(UserFilmId id) { + this.id = id; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + if (!user.getUserFilms().contains(this)) { + user.getUserFilms().add(this); + } + } + + public FilmEntity getFilm() { + return film; + } + + public void setFilm(FilmEntity film) { + this.film = film; + if (!film.getUserFilms().contains(this)) { + film.getUserFilms().add(this); + } + } + + public boolean isViewed() { + return viewed; + } + + public void setActive(boolean viewed) { + this.viewed = viewed; + } + + @Override + public int hashCode() { + return Objects.hash(id, user.getId(), film.getId(), viewed); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserFilmEntity other = (UserFilmEntity) obj; + return Objects.equals(id, other.id) + && Objects.equals(user.getId(), other.user.getId()) + && Objects.equals(film.getId(), other.film.getId()) + && viewed == other.viewed; + } + +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/userFilm/model/UserFilmId.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/userFilm/model/UserFilmId.java new file mode 100644 index 0000000..5667384 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/userFilm/model/UserFilmId.java @@ -0,0 +1,55 @@ +package com.example.demo.userFilm.model; + +import java.util.Objects; +import java.util.Optional; + +import jakarta.persistence.Embeddable; + +@Embeddable +public class UserFilmId { + private Long userId; + private Long filmId; + + public UserFilmId() { + } + + public UserFilmId(Long userId, Long filmId) { + this.userId = userId; + this.filmId = filmId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getFilmId() { + return filmId; + } + + public void setFilmId(Long filmId) { + this.filmId = filmId; + } + + @Override + public int hashCode() { + return Objects.hash( + Optional.ofNullable(userId).orElse(0L), + Optional.ofNullable(filmId).orElse(0L)); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserFilmId other = (UserFilmId) obj; + return Objects.equals(userId, other.userId) + && Objects.equals(filmId, other.filmId); + } + +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/users/api/UserController.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/users/api/UserController.java new file mode 100644 index 0000000..b62cf83 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/users/api/UserController.java @@ -0,0 +1,80 @@ +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.users.model.UserEntity; +import com.example.demo.users.service.UserService; +import com.example.demo.films.service.FilmService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/user") +public class UserController { + private final UserService userService; + private final FilmService filmService; + private final ModelMapper modelMapper; + + public UserController(UserService userService, FilmService filmService, ModelMapper modelMapper) { + this.userService = userService; + this.filmService = filmService; + this.modelMapper = modelMapper; + } + + private UserDto toDto(UserEntity entity) { + return modelMapper.map(entity, UserDto.class); + } + + private UserEntity toEntity(UserDto dto) { + return modelMapper.map(dto, UserEntity.class); + } + + @GetMapping + public List 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 + public UserDto create(@RequestBody @Valid UserDto dto) { + return toDto(userService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public UserDto update(@PathVariable(name = "id") Long id, @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)); + } + + @PutMapping("/addFilm/{id}") + public UserDto addFilm(@PathVariable(name = "id") Long id, @RequestBody Long filmId) { + return toDto(userService.addFilm(id, filmService.get(filmId))); + } + + @PutMapping("/deleteFilm/{id}") + public UserDto deleteFilm(@PathVariable(name = "id") Long id, @RequestBody Long filmId) { + return toDto(userService.deleteFilm(id, filmService.get(filmId))); + } + +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/users/api/UserDto.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/users/api/UserDto.java new file mode 100644 index 0000000..2009716 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/users/api/UserDto.java @@ -0,0 +1,89 @@ +package com.example.demo.users.api; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty.Access; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import com.example.demo.films.model.FilmEntity; + +public class UserDto { + @JsonProperty(access = Access.READ_ONLY) + private Long id; + @NotBlank + @Size(min = 3, max = 50) + private String name; + @NotBlank + @Size(min = 3, max = 50) + private String mail; + @NotBlank + @Size(min = 8, max = 30) + private String phone; + @NotNull + @Min(1) + private Long suscribeId; + + private final List listFilms = new ArrayList(); + + 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 getMail() { + return mail; + } + + public void setMail(String mail) { + this.mail = mail; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Long getSubscribeId() { + return suscribeId; + } + + public void setSubscribe(Long subscribeId) { + this.suscribeId = subscribeId; + } + + public List getListFilms() { + return listFilms; + } + + public void setListFilms(List listFilms) { + this.listFilms.clear(); + this.listFilms.addAll(listFilms); + } + + public void addFilm(FilmEntity film) { + this.listFilms.add(film); + } + + public void deletefilm(FilmEntity film) { + this.listFilms.remove(film); + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/users/model/UserEntity.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/users/model/UserEntity.java new file mode 100644 index 0000000..41273d7 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/users/model/UserEntity.java @@ -0,0 +1,116 @@ +package com.example.demo.users.model; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.subscribes.model.SubscribeEntity; +import com.example.demo.userFilm.model.UserFilmEntity; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users") +public class UserEntity extends BaseEntity { + + @Column(nullable = false, unique = true, length = 50) + private String name; + @Column(nullable = false, unique = true, length = 50) + private String mail; + @Column(nullable = false, unique = true, length = 20) + private String phone; + @ManyToOne + @JoinColumn(name = "subscribeId", nullable = false) + private SubscribeEntity subscribe; + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) + @OrderBy("id ASC") + private Set userFilms = new HashSet<>(); + + public UserEntity() { + } + + public UserEntity(SubscribeEntity subscribe, String name, String mail, String phone) { + this.subscribe = subscribe; + this.name = name; + this.mail = mail; + this.phone = phone; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getMail() { + return mail; + } + + public void setMail(String mail) { + this.mail = mail; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Set getUserFilms() { + return userFilms; + } + + public void addFilm(UserFilmEntity userFilm) { + if (userFilm.getUser() != this) { + userFilm.setUser(this); + } + userFilms.add(userFilm); + } + + public void deleteFilm(UserFilmEntity userFilm) { + if (userFilm.getUser() != this) { + return; + } + userFilms.remove(userFilm); + } + + public SubscribeEntity getSubscribe() { + return subscribe; + } + + public void setSubscribe(SubscribeEntity subscribe) { + this.subscribe = subscribe; + } + + @Override + public int hashCode() { + return Objects.hash(id, name, mail, phone, userFilms, subscribe); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserEntity other = (UserEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name) + && Objects.equals(other.getMail(), mail) + && Objects.equals(other.getPhone(), phone) + && Objects.equals(other.getSubscribe(), subscribe) + && Objects.equals(other.getUserFilms(), userFilms); + } +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/users/repository/UserRepository.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/users/repository/UserRepository.java new file mode 100644 index 0000000..25e7ba2 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/users/repository/UserRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.users.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; + +import com.example.demo.users.model.UserEntity; + +public interface UserRepository extends CrudRepository { + Optional findByNameIgnoreCase(String name); +} diff --git a/Laba3/Лекция3-src/src/main/java/com/example/demo/users/service/UserService.java b/Laba3/Лекция3-src/src/main/java/com/example/demo/users/service/UserService.java new file mode 100644 index 0000000..1657b82 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/java/com/example/demo/users/service/UserService.java @@ -0,0 +1,218 @@ +package com.example.demo.users.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.modelmapper.internal.util.Objects; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.repository.UserRepository; +import com.example.demo.userFilm.model.UserFilmEntity; + +@Service +public class UserService { + // private final UserRepository repository; + + // public UserService(UserRepository repository) { + // this.repository = repository; + // } + + // private void checkName(String name) { + // if (repository.findByNameIgnoreCase(name).isPresent()) { + // throw new IllegalArgumentException( + // String.format("Type with name %s is already exists", name)); + // } + // } + + // @Transactional(readOnly = true) + // public List getAll() { + // return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + // } + + // @Transactional(readOnly = true) + // public UserEntity get(long id) { + // return repository.findById(id) + // .orElseThrow(() -> new NotFoundException(UserEntity.class, id)); + // } + + // @Transactional + // public UserEntity create(UserEntity entity) { + // if (entity == null) { + // throw new IllegalArgumentException("Entity is null"); + // } + // checkName(entity.getName()); + // return repository.save(entity); + // } + + // @Transactional + // public UserEntity update(long id, UserEntity entity) { + // final UserEntity existsEntity = get(id); + // checkName(entity.getName()); + // existsEntity.setName(entity.getName()); + // existsEntity.setMail(entity.getMail()); + // existsEntity.setPhone(entity.getPhone()); + // existsEntity.setSubscribe(entity.getSubscribe()); + // repository.save(existsEntity); + // return existsEntity; + // } + + // @Transactional + // public UserEntity delete(long id) { + // final UserEntity existsEntity = get(id); + // repository.delete(existsEntity); + // return existsEntity; + // } + + // @Transactional(readOnly = true) + // public List getUserFilms(long id) { + // return get(id).getUserFilms().stream().toList(); + // } + + // @Transactional + // public UserEntity addFilm(Long id, UserFilmEntity film1) { + // final UserEntity existsEntity = get(id); + // if (!existsEntity.getUserFilms().contains(film1)) + // existsEntity.addFilm(film1); + // return repository.save(existsEntity); + // } + + // @Transactional + // public UserEntity deleteFilm(Long id, UserFilmEntity film) { + // final UserEntity existsEntity = get(id); + // if (existsEntity.getUserFilms().contains(film)) + // existsEntity.deleteFilm(film); + // return repository.save(existsEntity); + // } + + + + + + + + + + + + + + + + private final UserRepository repository; + private final FilmService filmService; + + public UserService( + UserRepository repository, + FilmService filmService) { + this.repository = repository; + this.filmService = filmService; + } + + private void checkLogin(String login) { + if (repository.findByNameIgnoreCase(login).isPresent()) { + throw new IllegalArgumentException( + String.format("User with login %s is already exists", login)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public UserEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(UserEntity.class, id)); + } + + @Transactional + public UserEntity create(UserEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkLogin(entity.getName()); + repository.save(entity); + filmService.getAll().forEach(film -> { + final UserFilmEntity userFilm = new UserFilmEntity(entity, film, true); + userFilm.setUser(entity); + userFilm.setFilm(film); + }); + return repository.save(entity); + } + + @Transactional + public UserEntity update(long id, UserEntity entity) { + final UserEntity existsEntity = get(id); + checkLogin(entity.getName()); + existsEntity.setName(entity.getName()); + repository.save(existsEntity); + return existsEntity; + } + + @Transactional + public UserEntity delete(long id) { + final UserEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } + + @Transactional(readOnly = true) + public List getUserFilms(long id) { + return get(id).getUserFilms().stream() + .filter(UserFilmEntity::isViewed) + .map(UserFilmEntity::getFilm) + .toList(); + } + + private List changeUserFilmsState( + UserEntity existsUser, + List filmsIds, + boolean state) { + return existsUser.getUserFilms().stream() + .filter(film -> Objects.nonNull(film.getFilm())) + .filter(film -> filmsIds.contains(film.getFilm().getId())) + .filter(film -> film.isViewed() == !state) + .map(film -> { + film.setActive(state); + return film.getFilm(); + }) + .toList(); + } + + @Transactional + public List enableUserFilms(long id, List filmsIds) { + final UserEntity existsUser = get(id); + final List changedFilms = changeUserFilmsState( + existsUser, filmsIds, true); + repository.save(existsUser); + return changedFilms; + } + + @Transactional + public List disableUserFilms(long id, List filmsIds) { + final UserEntity existsUser = get(id); + final List changedFilms = changeUserFilmsState( + existsUser, filmsIds, false); + repository.save(existsUser); + return changedFilms; + } + + @Transactional + public List deleteAllUserFilms(long id) { + final UserEntity existsUser = get(id); + final List films = existsUser.getUserFilms().stream() + .filter(film -> Objects.nonNull(film.getFilm())) + .toList(); + films.forEach(existsUser::deleteFilm); + repository.save(existsUser); + return films.stream() + .map(UserFilmEntity::getFilm) + .toList(); + } +} diff --git a/Laba3/Лекция3-src/src/main/resources/application.properties b/Laba3/Лекция3-src/src/main/resources/application.properties new file mode 100644 index 0000000..62ab433 --- /dev/null +++ b/Laba3/Лекция3-src/src/main/resources/application.properties @@ -0,0 +1,20 @@ +# Server +spring.main.banner-mode=off +server.port=8080 + +# Logger settings +# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF +logging.level.com.example.demo=DEBUG + +# JPA Settings +spring.datasource.url=jdbc:h2:file:./data +spring.datasource.username=sa +spring.datasource.password=password +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=false +# spring.jpa.show-sql=true +# spring.jpa.properties.hibernate.format_sql=true + +# H2 console +spring.h2.console.enabled=true \ No newline at end of file diff --git a/Laba3/Лекция3-src/src/test/java/com/example/demo/FilmServiceTests.java b/Laba3/Лекция3-src/src/test/java/com/example/demo/FilmServiceTests.java new file mode 100644 index 0000000..bcb5bf3 --- /dev/null +++ b/Laba3/Лекция3-src/src/test/java/com/example/demo/FilmServiceTests.java @@ -0,0 +1,102 @@ +package com.example.demo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +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.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; + +import org.springframework.dao.DataIntegrityViolationException; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class FilmServiceTests { + + @Autowired + private GenreService genreService; + + @Autowired + private FilmService filmService; + private FilmEntity film; + + @BeforeEach + void createData() { + removeData(); + + final GenreEntity genre = genreService.create(new GenreEntity("Ноутбук")); + + film = filmService.create(new FilmEntity("name3", genre, 100d, 20)); + filmService.create(new FilmEntity("name31", genre, 100d, 20)); + filmService.create(new FilmEntity("name32", genre, 100d, 20)); + } + + @AfterEach + void removeData() { + genreService.getAll().forEach(item -> genreService.delete(item.getId())); + filmService.getAll().forEach(item -> filmService.delete(item.getId())); + } + + @Test + @Order(1) + void createTest() { + Assertions.assertEquals(3, filmService.getAll().size()); + Assertions.assertEquals(film, filmService.get(film.getId())); + } + + @Test + void createNotUniqueTest() { + final FilmEntity nonUniquefilm = new FilmEntity("film1", new GenreEntity("genre1"), 100d, 20); + Assertions.assertThrows(IllegalArgumentException.class, () -> filmService.create(nonUniquefilm)); + } + + @Test + void createNullableTest() { + final FilmEntity nullablefilm = new FilmEntity(null, null, null, null); + Assertions.assertThrows(DataIntegrityViolationException.class, () -> filmService.create(nullablefilm)); + } + + @Test + void updateTest() { + final String testName = "TEST"; + final GenreEntity testGenre = new GenreEntity("TEST"); + final Double testPrice = 333d; + final int testDiscount = 100; + + final String oldName = film.getName(); + final GenreEntity oldGenre = film.getGenre(); + final Double oldPrice = film.getPrice(); + final int oldDiscount = film.getDiscount(); + final FilmEntity newEntity = filmService.update(film.getId(), + new FilmEntity(testName, testGenre, testPrice, testDiscount)); + Assertions.assertEquals(3, filmService.getAll().size()); + Assertions.assertEquals(newEntity, filmService.get(film.getId())); + Assertions.assertEquals(testName, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + Assertions.assertEquals(testGenre, newEntity.getGenre()); + Assertions.assertNotEquals(oldGenre, newEntity.getGenre()); + Assertions.assertEquals(testPrice, newEntity.getPrice()); + Assertions.assertNotEquals(oldPrice, newEntity.getPrice()); + Assertions.assertEquals(testDiscount, newEntity.getDiscount()); + Assertions.assertNotEquals(oldDiscount, newEntity.getDiscount()); + } + + @Test + void deleteTest() { + filmService.delete(film.getId()); + Assertions.assertEquals(2, filmService.getAll().size()); + + final FilmEntity newEntity = filmService + .create(new FilmEntity(film.getName(), film.getGenre(), film.getPrice(), film.getDiscount())); + Assertions.assertEquals(3, filmService.getAll().size()); + Assertions.assertNotEquals(film.getId(), newEntity.getId()); + } +} diff --git a/Laba3/Лекция3-src/src/test/java/com/example/demo/GenreServiceTests.java b/Laba3/Лекция3-src/src/test/java/com/example/demo/GenreServiceTests.java new file mode 100644 index 0000000..858b9b1 --- /dev/null +++ b/Laba3/Лекция3-src/src/test/java/com/example/demo/GenreServiceTests.java @@ -0,0 +1,79 @@ +package com.example.demo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; + +@SpringBootTest +class GenreServiceTests { + @Autowired + private GenreService genreService; + + private GenreEntity genre; + + @BeforeEach + void createData() { + removeData(); + + genre = genreService.create(new GenreEntity("жанр1")); + genreService.create(new GenreEntity("жанр2")); + genreService.create(new GenreEntity("жанр3")); + } + + @AfterEach + void removeData() { + genreService.getAll().forEach(item -> genreService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> genreService.get(0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(3, genreService.getAll().size()); + Assertions.assertEquals(genre, genreService.get(genre.getId())); + } + + @Test + void createNotUniqueTest() { + final GenreEntity nonUniquegenre = new GenreEntity("Ноутбук"); + Assertions.assertThrows(IllegalArgumentException.class, () -> genreService.create(nonUniquegenre)); + } + + @Test + void createNullableTest() { + final GenreEntity nullablegenre = new GenreEntity(null); + Assertions.assertThrows(DataIntegrityViolationException.class, () -> genreService.create(nullablegenre)); + } + + @Test + void updateTest() { + final String test = "TEST"; + final String oldName = genre.getName(); + final GenreEntity newEntity = genreService.update(genre.getId(), new GenreEntity(test)); + Assertions.assertEquals(3, genreService.getAll().size()); + Assertions.assertEquals(newEntity, genreService.get(genre.getId())); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + void deleteTest() { + genreService.delete(genre.getId()); + Assertions.assertEquals(2, genreService.getAll().size()); + + final GenreEntity newEntity = genreService.create(new GenreEntity(genre.getName())); + Assertions.assertEquals(3, genreService.getAll().size()); + Assertions.assertNotEquals(genre.getId(), newEntity.getId()); + } +} diff --git a/Laba3/Лекция3-src/src/test/resources/application.properties b/Laba3/Лекция3-src/src/test/resources/application.properties new file mode 100644 index 0000000..d5f355c --- /dev/null +++ b/Laba3/Лекция3-src/src/test/resources/application.properties @@ -0,0 +1,14 @@ +# Server +spring.main.banner-mode=off + +# Logger settings +# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF +logging.level.com.example.demo=DEBUG + +# JPA Settings +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.username=sa +spring.datasource.password=password +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=false \ No newline at end of file diff --git a/laba3.1/Лекция4-src/.gitignore b/laba3.1/Лекция4-src/.gitignore new file mode 100644 index 0000000..546ecee --- /dev/null +++ b/laba3.1/Лекция4-src/.gitignore @@ -0,0 +1,36 @@ +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/ + +data.*.db \ No newline at end of file diff --git a/laba3.1/Лекция4-src/.vscode/extensions.json b/laba3.1/Лекция4-src/.vscode/extensions.json new file mode 100644 index 0000000..42cf79d --- /dev/null +++ b/laba3.1/Лекция4-src/.vscode/extensions.json @@ -0,0 +1,12 @@ +{ + "recommendations": [ + // fronted + "AndersEAndersen.html-class-suggestions", + "dbaeumer.vscode-eslint", + // backend + "vscjava.vscode-java-pack", + "vmware.vscode-boot-dev-pack", + "vscjava.vscode-gradle", + "redhat.vscode-xml" + ] +} \ No newline at end of file diff --git a/laba3.1/Лекция4-src/.vscode/launch.json b/laba3.1/Лекция4-src/.vscode/launch.json new file mode 100644 index 0000000..5992c40 --- /dev/null +++ b/laba3.1/Лекция4-src/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + "configurations": [ + { + "type": "java", + "name": "Demo", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "lec4", + "args": "", + "envFile": "${workspaceFolder}/.env" + }, + { + "type": "java", + "name": "Demo (populate)", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "lec4", + "args": "--populate", + "envFile": "${workspaceFolder}/.env" + } + ] +} \ No newline at end of file diff --git a/laba3.1/Лекция4-src/.vscode/settings.json b/laba3.1/Лекция4-src/.vscode/settings.json new file mode 100644 index 0000000..eab3db6 --- /dev/null +++ b/laba3.1/Лекция4-src/.vscode/settings.json @@ -0,0 +1,21 @@ +{ + "editor.tabSize": 4, + "editor.detectIndentation": false, + "editor.insertSpaces": true, + "editor.formatOnPaste": true, + "editor.formatOnSave": true, + "editor.formatOnType": false, + "java.compile.nullAnalysis.mode": "disabled", + "java.configuration.updateBuildConfiguration": "automatic", + "[java]": { + "editor.pasteAs.enabled": false, + }, + "gradle.nestedProjects": true, + "java.saveActions.organizeImports": true, + "java.dependency.packagePresentation": "hierarchical", + "spring-boot.ls.problem.boot2.JAVA_CONSTRUCTOR_PARAMETER_INJECTION": "WARNING", + "spring.initializr.defaultLanguage": "Java", + "java.format.settings.url": ".vscode/eclipse-formatter.xml", + "java.project.explorer.showNonJavaResources": true, + "java.codeGeneration.hashCodeEquals.useJava7Objects": true, +} \ No newline at end of file diff --git a/laba3.1/Лекция4-src/build.gradle b/laba3.1/Лекция4-src/build.gradle new file mode 100644 index 0000000..66b678e --- /dev/null +++ b/laba3.1/Лекция4-src/build.gradle @@ -0,0 +1,68 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.4' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +defaultTasks 'bootRun' + +ext { + springProfiles = [] + if (project.hasProperty('prod')) { + springProfiles.add('prod') + } else { + springProfiles.add('dev') + } +} + +bootRun { + def currentProfiles = springProfiles.join(',') + println('Current profiles are: ' + currentProfiles) + def currentArgs = ['--spring.profiles.active=' + currentProfiles] + if (project.hasProperty('args')) { + currentArgs.addAll(project.args.split(',')) + } + args currentArgs +} + +jar { + enabled = false +} + +bootJar { + archiveFileName = String.format('%s-%s.jar', rootProject.name, version) +} + +assert System.properties['java.specification.version'] == '17' || '21' +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + if (project.hasProperty('prod')) { + implementation 'org.postgresql:postgresql:42.7.3' + } else { + implementation 'com.h2database:h2:2.2.224' + } + + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'org.modelmapper:modelmapper:3.2.0' + + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.liquibase:liquibase-core:4.26.0' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} \ No newline at end of file diff --git a/laba3.1/Лекция4-src/gradle/wrapper/gradle-wrapper.jar b/laba3.1/Лекция4-src/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/laba3.1/Лекция4-src/gradle/wrapper/gradle-wrapper.jar differ diff --git a/laba3.1/Лекция4-src/gradle/wrapper/gradle-wrapper.properties b/laba3.1/Лекция4-src/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/laba3.1/Лекция4-src/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/laba3.1/Лекция4-src/gradlew b/laba3.1/Лекция4-src/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/laba3.1/Лекция4-src/gradlew @@ -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" "$@" diff --git a/laba3.1/Лекция4-src/gradlew.bat b/laba3.1/Лекция4-src/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/laba3.1/Лекция4-src/gradlew.bat @@ -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 diff --git a/laba3.1/Лекция4-src/readme.md b/laba3.1/Лекция4-src/readme.md new file mode 100644 index 0000000..8eef312 --- /dev/null +++ b/laba3.1/Лекция4-src/readme.md @@ -0,0 +1,28 @@ +Swagger UI: \ +http://localhost:8080/swagger-ui/index.html + +H2 Console: \ +http://localhost:8080/h2-console + +JDBC URL: jdbc:h2:file:./data \ +User Name: sa \ +Password: password + +Для профиля prod необходимо наличие СУБД PostgreSQL и БД demo-app. + +Создать БД можно так: \ +createdb -h localhost -U postgres demo-app + +Пример запуска приложения с профилем prod и заполнением БД с помощью аргумента --populate: + +- nix => bash ./gradlew.bat -Pprod -Pargs='--populate' +- windows =>.\gradlew.bat -Pprod -Pargs='--populate' + +Почитать: + +- Односторонние и двусторонние связи https://www.baeldung.com/jpa-hibernate-associations +- Getters и Setters для двусторонних связей https://en.wikibooks.org/wiki/Java_Persistence/OneToMany#Getters_and_Setters +- Многие-ко-многим с доп. атрибутами https://thorben-janssen.com/hibernate-tip-many-to-many-association-with-additional-attributes/ +- Многие-ко-многим с доп. атрибутами https://www.baeldung.com/jpa-many-to-many +- Каскадное удаление сущностей со связями многие-ко-многим https://www.baeldung.com/jpa-remove-entity-many-to-many +- Выбор типа коллекции для отношений вида ко-многим в JPA https://thorben-janssen.com/association-mappings-bag-list-set/ diff --git a/laba3.1/Лекция4-src/settings.gradle b/laba3.1/Лекция4-src/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/laba3.1/Лекция4-src/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/DemoApplication.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..cf48dfa --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,74 @@ +package com.example.demo; + +import java.util.Arrays; +import java.util.List; + +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.orders.model.OrderEntity; +import com.example.demo.orders.service.OrderService; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; +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 SubscriptionService subscriptionService; + private final UserService userService; + private final OrderService orderService; + + public DemoApplication( + TypeService typeService, + SubscriptionService subscriptionService, + UserService userService, + OrderService orderService) { + this.typeService = typeService; + this.subscriptionService = subscriptionService; + this.userService = userService; + this.orderService = orderService; + } + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + + @Override + public void run(String... args) throws Exception { + if (args.length > 0 && Arrays.asList(args).contains("--populate")) { + log.info("Create default type values"); + final var type1 = typeService.create(new TypeEntity("Ноутбук")); + final var type2 = typeService.create(new TypeEntity("Телефон")); + final var type3 = typeService.create(new TypeEntity("Игровая приставка")); + + log.info("Create default subscription values"); + subscriptionService.create(new SubscriptionEntity("Подписка 1")); + subscriptionService.create(new SubscriptionEntity("Подписка 2")); + subscriptionService.create(new SubscriptionEntity("Подписка 3")); + + log.info("Create default user values"); + final var user1 = userService.create(new UserEntity("user1")); + userService.create(new UserEntity("user2")); + + log.info("Create default order values"); + final var orders = List.of( + new OrderEntity(type1, 49999.00, 20), + new OrderEntity(type1, 129999.00, 3), + new OrderEntity(type2, 15450.50, 30), + new OrderEntity(type2, 69900.50, 10), + new OrderEntity(type2, 150000.00, 6), + new OrderEntity(type3, 75000.00, 6), + new OrderEntity(type3, 67800.00, 3)); + orders.forEach(order -> orderService.create(user1.getId(), order)); + } + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/api/PageDto.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/api/PageDto.java new file mode 100644 index 0000000..4cae429 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/api/PageDto.java @@ -0,0 +1,97 @@ +package com.example.demo.core.api; + +import java.util.ArrayList; +import java.util.List; + +public class PageDto { + private List items = new ArrayList<>(); + private int itemsCount; + private int currentPage; + private int currentSize; + private int totalPages; + private long totalItems; + private boolean isFirst; + private boolean isLast; + private boolean hasNext; + private boolean hasPrevious; + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } + + public int getItemsCount() { + return itemsCount; + } + + public void setItemsCount(int itemsCount) { + this.itemsCount = itemsCount; + } + + public int getCurrentPage() { + return currentPage; + } + + public void setCurrentPage(int currentPage) { + this.currentPage = currentPage; + } + + public int getCurrentSize() { + return currentSize; + } + + public void setCurrentSize(int currentSize) { + this.currentSize = currentSize; + } + + public int getTotalPages() { + return totalPages; + } + + public void setTotalPages(int totalPages) { + this.totalPages = totalPages; + } + + public long getTotalItems() { + return totalItems; + } + + public void setTotalItems(long totalItems) { + this.totalItems = totalItems; + } + + public boolean isFirst() { + return isFirst; + } + + public void setFirst(boolean isFirst) { + this.isFirst = isFirst; + } + + public boolean isLast() { + return isLast; + } + + public void setLast(boolean isLast) { + this.isLast = isLast; + } + + public boolean isHasNext() { + return hasNext; + } + + public void setHasNext(boolean hasNext) { + this.hasNext = hasNext; + } + + public boolean isHasPrevious() { + return hasPrevious; + } + + public void setHasPrevious(boolean hasPrevious) { + this.hasPrevious = hasPrevious; + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/api/PageDtoMapper.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/api/PageDtoMapper.java new file mode 100644 index 0000000..e8d3dd0 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/api/PageDtoMapper.java @@ -0,0 +1,25 @@ +package com.example.demo.core.api; + +import java.util.function.Function; + +import org.springframework.data.domain.Page; + +public class PageDtoMapper { + private PageDtoMapper() { + } + + public static PageDto toDto(Page page, Function mapper) { + final PageDto dto = new PageDto<>(); + dto.setItems(page.getContent().stream().map(mapper::apply).toList()); + dto.setItemsCount(page.getNumberOfElements()); + dto.setCurrentPage(page.getNumber()); + dto.setCurrentSize(page.getSize()); + dto.setTotalPages(page.getTotalPages()); + dto.setTotalItems(page.getTotalElements()); + dto.setFirst(page.isFirst()); + dto.setLast(page.isLast()); + dto.setHasNext(page.hasNext()); + dto.setHasPrevious(page.hasPrevious()); + return dto; + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/configuration/Constants.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/configuration/Constants.java new file mode 100644 index 0000000..4bd6a8d --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/configuration/Constants.java @@ -0,0 +1,12 @@ +package com.example.demo.core.configuration; + +public class Constants { + public static final String SEQUENCE_NAME = "hibernate_sequence"; + + public static final String API_URL = "/api/1.0"; + + public static final String DEFAULT_PAGE_SIZE = "5"; + + private Constants() { + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java new file mode 100644 index 0000000..a5ad6f3 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java @@ -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(); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java new file mode 100644 index 0000000..762e85a --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java @@ -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"); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/AdviceController.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/AdviceController.java new file mode 100644 index 0000000..9aa33cc --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/AdviceController.java @@ -0,0 +1,54 @@ +package com.example.demo.core.error; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class AdviceController { + private final Logger log = LoggerFactory.getLogger(AdviceController.class); + + public static ErrorCauseDto getRootCause(Throwable throwable) { + Throwable rootCause = throwable; + while (rootCause.getCause() != null && rootCause.getCause() != rootCause) { + rootCause = rootCause.getCause(); + } + final StackTraceElement firstError = rootCause.getStackTrace()[0]; + return new ErrorCauseDto( + rootCause.getClass().getName(), + firstError.getMethodName(), + firstError.getFileName(), + firstError.getLineNumber()); + } + + private ResponseEntity handleException(Throwable throwable, HttpStatusCode httpCode) { + log.error("{}", throwable.getMessage()); + throwable.printStackTrace(); + final ErrorDto errorDto = new ErrorDto(throwable.getMessage(), AdviceController.getRootCause(throwable)); + return new ResponseEntity<>(errorDto, httpCode); + } + + @ExceptionHandler(NotFoundException.class) + @ResponseStatus(HttpStatus.NOT_FOUND) + public ResponseEntity handleNotFoundException(Throwable throwable) { + return handleException(throwable, HttpStatus.NOT_FOUND); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public ResponseEntity handleDataIntegrityViolationException(Throwable throwable) { + return handleException(throwable, HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(Exception.class) + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ResponseEntity handleAnyException(Throwable throwable) { + return handleException(throwable, HttpStatus.INTERNAL_SERVER_ERROR); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/ErrorCauseDto.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/ErrorCauseDto.java new file mode 100644 index 0000000..602ce70 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/ErrorCauseDto.java @@ -0,0 +1,31 @@ +package com.example.demo.core.error; + +class ErrorCauseDto { + private String exception; + private String methodName; + private String fineName; + private int lineNumber; + + ErrorCauseDto(String exception, String methodName, String fineName, int lineNumber) { + this.exception = exception; + this.methodName = methodName; + this.fineName = fineName; + this.lineNumber = lineNumber; + } + + public String getException() { + return exception; + } + + public String getMethodName() { + return methodName; + } + + public String getFineName() { + return fineName; + } + + public int getLineNumber() { + return lineNumber; + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/ErrorDto.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/ErrorDto.java new file mode 100644 index 0000000..457975c --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/ErrorDto.java @@ -0,0 +1,20 @@ +package com.example.demo.core.error; + +public class ErrorDto { + private String error; + private ErrorCauseDto rootCause; + + public ErrorDto(String error, ErrorCauseDto rootCause) { + this.error = error; + this.rootCause = rootCause; + } + + public String getError() { + return error; + } + + public ErrorCauseDto getRootCause() { + return rootCause; + } + +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/NotFoundException.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/NotFoundException.java new file mode 100644 index 0000000..a61d118 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/error/NotFoundException.java @@ -0,0 +1,7 @@ +package com.example.demo.core.error; + +public class NotFoundException extends RuntimeException { + public NotFoundException(Class clazz, Long id) { + super(String.format("%s with id [%s] is not found or not exists", clazz.getSimpleName(), id)); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/model/BaseEntity.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/model/BaseEntity.java new file mode 100644 index 0000000..eba74ad --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/core/model/BaseEntity.java @@ -0,0 +1,28 @@ +package com.example.demo.core.model; + +import com.example.demo.core.configuration.Constants; + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.SequenceGenerator; + +@MappedSuperclass +public abstract class BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = Constants.SEQUENCE_NAME) + @SequenceGenerator(name = Constants.SEQUENCE_NAME, sequenceName = Constants.SEQUENCE_NAME, allocationSize = 1) + protected Long id; + + protected BaseEntity() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/api/OrderController.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/api/OrderController.java new file mode 100644 index 0000000..c8675f8 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/api/OrderController.java @@ -0,0 +1,98 @@ +package com.example.demo.orders.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.api.PageDto; +import com.example.demo.core.api.PageDtoMapper; +import com.example.demo.core.configuration.Constants; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.model.OrderGrouped; +import com.example.demo.orders.service.OrderService; +import com.example.demo.types.service.TypeService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/user/{user}/order") +public class OrderController { + private final OrderService orderService; + private final TypeService typeService; + private final ModelMapper modelMapper; + + public OrderController(OrderService orderService, TypeService typeService, ModelMapper modelMapper) { + this.orderService = orderService; + this.typeService = typeService; + this.modelMapper = modelMapper; + } + + private OrderDto toDto(OrderEntity entity) { + return modelMapper.map(entity, OrderDto.class); + } + + private OrderEntity toEntity(OrderDto dto) { + final OrderEntity entity = modelMapper.map(dto, OrderEntity.class); + entity.setType(typeService.get(dto.getTypeId())); + return entity; + } + + private OrderGroupedDto toGroupedDto(OrderGrouped entity) { + return modelMapper.map(entity, OrderGroupedDto.class); + } + + @GetMapping + public PageDto getAll( + @PathVariable(name = "user") Long userId, + @RequestParam(name = "typeId", defaultValue = "0") Long typeId, + @RequestParam(name = "page", defaultValue = "0") int page, + @RequestParam(name = "size", defaultValue = Constants.DEFAULT_PAGE_SIZE) int size) { + return PageDtoMapper.toDto(orderService.getAll(userId, typeId, page, size), this::toDto); + } + + @GetMapping("/{id}") + public OrderDto get( + @PathVariable(name = "user") Long userId, + @PathVariable(name = "id") Long id) { + return toDto(orderService.get(userId, id)); + } + + @PostMapping + public OrderDto create( + @PathVariable(name = "user") Long userId, + @RequestBody @Valid OrderDto dto) { + return toDto(orderService.create(userId, toEntity(dto))); + } + + @PutMapping("/{id}") + public OrderDto update( + @PathVariable(name = "user") Long userId, + @PathVariable(name = "id") Long id, + @RequestBody @Valid OrderDto dto) { + return toDto(orderService.update(userId, id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public OrderDto delete( + @PathVariable(name = "user") Long userId, + @PathVariable(name = "id") Long id) { + return toDto(orderService.delete(userId, id)); + } + + @GetMapping("/total") + public List getMethodName(@PathVariable(name = "user") Long userId) { + return orderService.getTotal(userId).stream() + .map(this::toGroupedDto) + .toList(); + } + +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/api/OrderDto.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/api/OrderDto.java new file mode 100644 index 0000000..78e0ca2 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/api/OrderDto.java @@ -0,0 +1,57 @@ +package com.example.demo.orders.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class OrderDto { + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private Long id; + @NotNull + @Min(1) + private Long typeId; + @NotNull + @Min(1) + private Double price; + @NotNull + @Min(1) + private Integer count; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTypeId() { + return typeId; + } + + public void setTypeId(Long typeId) { + this.typeId = typeId; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Double getSum() { + return price * count; + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/api/OrderGroupedDto.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/api/OrderGroupedDto.java new file mode 100644 index 0000000..e073ed7 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/api/OrderGroupedDto.java @@ -0,0 +1,31 @@ +package com.example.demo.orders.api; + +public class OrderGroupedDto { + private Long typeId; + private Long totalPrice; + private Integer totalCount; + + public Long getTypeId() { + return typeId; + } + + public void setTypeId(Long typeId) { + this.typeId = typeId; + } + + public Long getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(Long totalPrice) { + this.totalPrice = totalPrice; + } + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/model/OrderEntity.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/model/OrderEntity.java new file mode 100644 index 0000000..d4e6b90 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/model/OrderEntity.java @@ -0,0 +1,91 @@ +package com.example.demo.orders.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.users.model.UserEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "orders") +public class OrderEntity extends BaseEntity { + @ManyToOne + @JoinColumn(name = "typeId", nullable = false) + private TypeEntity type; + @ManyToOne + @JoinColumn(name = "userId", nullable = false) + private UserEntity user; + @Column(nullable = false) + private Double price; + @Column(nullable = false) + private Integer count; + + public OrderEntity() { + } + + public OrderEntity(TypeEntity type, Double price, Integer count) { + this.type = type; + this.price = price; + this.count = count; + } + + public TypeEntity getType() { + return type; + } + + public void setType(TypeEntity type) { + this.type = type; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + if (!user.getOrders().contains(this)) { + user.getOrders().add(this); + } + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + @Override + public int hashCode() { + return Objects.hash(id, type, user.getId(), price, count); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final OrderEntity other = (OrderEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getType(), type) + && Objects.equals(other.getUser().getId(), user.getId()) + && Objects.equals(other.getPrice(), price) + && Objects.equals(other.getCount(), count); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/model/OrderGrouped.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/model/OrderGrouped.java new file mode 100644 index 0000000..4d55f18 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/model/OrderGrouped.java @@ -0,0 +1,11 @@ +package com.example.demo.orders.model; + +import com.example.demo.types.model.TypeEntity; + +public interface OrderGrouped { + TypeEntity getType(); + + double getTotalPrice(); + + int getTotalCount(); +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/repository/OrderRepository.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/repository/OrderRepository.java new file mode 100644 index 0000000..81b7b7a --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/repository/OrderRepository.java @@ -0,0 +1,41 @@ +package com.example.demo.orders.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.model.OrderGrouped; + +public interface OrderRepository + extends CrudRepository, PagingAndSortingRepository { + Optional findOneByUserIdAndId(long userId, long id); + + List findByUserId(long userId); + + Page findByUserId(long userId, Pageable pageable); + + List findByUserIdAndTypeId(long userId, long typeId); + + Page findByUserIdAndTypeId(long userId, long typeId, Pageable pageable); + + // select + // tpe.name, + // coalesce(sum(order.price), 0), + // coalesce(sum(order.count), 0) + // from types as tpe + // left join orders as order on tpe.id = order.type_id and order.user_id = ? + // group by tpe.name order by tpe.id + @Query("select " + + "t as type, " + + "coalesce(sum(o.price), 0) as totalPrice, " + + "coalesce(sum(o.count), 0) as totalCount " + + "from TypeEntity t left join OrderEntity o on o.type = t and o.user.id = ?1 " + + "group by t order by t.id") + List getOrdersTotalByType(long userId); +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/service/OrderService.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/service/OrderService.java new file mode 100644 index 0000000..21a5cbe --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/orders/service/OrderService.java @@ -0,0 +1,88 @@ +package com.example.demo.orders.service; + +import java.util.List; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.model.OrderGrouped; +import com.example.demo.orders.repository.OrderRepository; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +@Service +public class OrderService { + private final OrderRepository repository; + private final UserService userService; + + public OrderService(OrderRepository repository, UserService userService) { + this.repository = repository; + this.userService = userService; + } + + @Transactional(readOnly = true) + public List getAll(long userId, long typeId) { + userService.get(userId); + if (typeId <= 0L) { + return repository.findByUserId(userId); + } else { + return repository.findByUserIdAndTypeId(userId, typeId); + } + } + + @Transactional(readOnly = true) + public Page getAll(long userId, long typeId, int page, int size) { + final Pageable pageRequest = PageRequest.of(page, size); + userService.get(userId); + if (typeId <= 0L) { + return repository.findByUserId(userId, pageRequest); + } + return repository.findByUserIdAndTypeId(userId, typeId, pageRequest); + } + + @Transactional(readOnly = true) + public OrderEntity get(long userId, long id) { + userService.get(userId); + return repository.findOneByUserIdAndId(userId, id) + .orElseThrow(() -> new NotFoundException(OrderEntity.class, id)); + } + + @Transactional + public OrderEntity create(long userId, OrderEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + final UserEntity existsUser = userService.get(userId); + entity.setUser(existsUser); + return repository.save(entity); + } + + @Transactional + public OrderEntity update(long userId, long id, OrderEntity entity) { + userService.get(userId); + final OrderEntity existsEntity = get(userId, id); + existsEntity.setType(entity.getType()); + existsEntity.setPrice(entity.getPrice()); + existsEntity.setCount(entity.getCount()); + return repository.save(existsEntity); + } + + @Transactional + public OrderEntity delete(long userId, long id) { + userService.get(userId); + final OrderEntity existsEntity = get(userId, id); + repository.delete(existsEntity); + return existsEntity; + } + + @Transactional(readOnly = true) + public List getTotal(long userId) { + userService.get(userId); + return repository.getOrdersTotalByType(userId); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/api/SubscriptionController.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/api/SubscriptionController.java new file mode 100644 index 0000000..1a7dd9b --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/api/SubscriptionController.java @@ -0,0 +1,68 @@ +package com.example.demo.subscriptions.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.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/subsciption") +public class SubscriptionController { + private final SubscriptionService subscriptionService; + private final ModelMapper modelMapper; + + public SubscriptionController(SubscriptionService subscriptionService, ModelMapper modelMapper) { + this.subscriptionService = subscriptionService; + this.modelMapper = modelMapper; + } + + private SubscriptionDto toDto(SubscriptionEntity entity) { + return modelMapper.map(entity, SubscriptionDto.class); + } + + private SubscriptionEntity toEntity(SubscriptionDto dto) { + return modelMapper.map(dto, SubscriptionEntity.class); + } + + @GetMapping + public List getAll() { + return subscriptionService.getAll().stream() + .map(this::toDto) + .toList(); + } + + @GetMapping("/{id}") + public SubscriptionDto get(@PathVariable(name = "id") Long id) { + return toDto(subscriptionService.get(id)); + } + + @PostMapping + public SubscriptionDto create(@RequestBody @Valid SubscriptionDto dto) { + return toDto(subscriptionService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public SubscriptionDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid SubscriptionDto dto) { + return toDto(subscriptionService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public SubscriptionDto delete(@PathVariable(name = "id") Long id) { + return toDto(subscriptionService.delete(id)); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/api/SubscriptionDto.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/api/SubscriptionDto.java new file mode 100644 index 0000000..bae4693 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/api/SubscriptionDto.java @@ -0,0 +1,30 @@ +package com.example.demo.subscriptions.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class SubscriptionDto { + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private Long id; + @NotBlank + @Size(min = 5, max = 50) + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/model/SubscriptionEntity.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/model/SubscriptionEntity.java new file mode 100644 index 0000000..59214e4 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/model/SubscriptionEntity.java @@ -0,0 +1,67 @@ +package com.example.demo.subscriptions.model; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.usersubscription.model.UserSubscriptionEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; + +@Entity +@Table(name = "subscriptions") +public class SubscriptionEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + @OneToMany(mappedBy = "subscription") + @OrderBy("id ASC") + private Set userSubscriptions = new HashSet<>(); + + public SubscriptionEntity() { + } + + public SubscriptionEntity(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Set getUserSubscriptions() { + return userSubscriptions; + } + + public void addUser(UserSubscriptionEntity userSubscription) { + if (userSubscription.getSubscription() != this) { + userSubscription.setSubscription(this); + } + userSubscriptions.add(userSubscription); + } + + @Override + public int hashCode() { + return Objects.hash(id, name, userSubscriptions); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + SubscriptionEntity other = (SubscriptionEntity) obj; + return Objects.equals(id, other.id) + && Objects.equals(name, other.name) + && Objects.equals(userSubscriptions, other.userSubscriptions); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/repository/SubscriptionRepository.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/repository/SubscriptionRepository.java new file mode 100644 index 0000000..0ce4dc9 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/repository/SubscriptionRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.subscriptions.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; + +import com.example.demo.subscriptions.model.SubscriptionEntity; + +public interface SubscriptionRepository extends CrudRepository { + Optional findByNameIgnoreCase(String name); +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/service/SubscriptionService.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/service/SubscriptionService.java new file mode 100644 index 0000000..03cfbc7 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/subscriptions/service/SubscriptionService.java @@ -0,0 +1,63 @@ +package com.example.demo.subscriptions.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.repository.SubscriptionRepository; + +@Service +public class SubscriptionService { + private final SubscriptionRepository repository; + + public SubscriptionService(SubscriptionRepository repository) { + this.repository = repository; + } + + private void checkName(String name) { + if (repository.findByNameIgnoreCase(name).isPresent()) { + throw new IllegalArgumentException( + String.format("Type with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public SubscriptionEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(SubscriptionEntity.class, id)); + } + + @Transactional + public SubscriptionEntity create(SubscriptionEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(entity.getName()); + return repository.save(entity); + } + + @Transactional + public SubscriptionEntity update(Long id, SubscriptionEntity entity) { + final SubscriptionEntity existsEntity = get(id); + checkName(entity.getName()); + existsEntity.setName(entity.getName()); + return repository.save(existsEntity); + } + + @Transactional + public SubscriptionEntity delete(Long id) { + final SubscriptionEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } + +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/api/TypeController.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/api/TypeController.java new file mode 100644 index 0000000..9966a15 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/api/TypeController.java @@ -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(Constants.API_URL + "/type") +public class TypeController { + private final TypeService typeService; + private final ModelMapper modelMapper; + + public TypeController(TypeService typeService, ModelMapper modelMapper) { + this.typeService = typeService; + this.modelMapper = modelMapper; + } + + private TypeDto toDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private TypeEntity toEntity(TypeDto dto) { + return modelMapper.map(dto, TypeEntity.class); + } + + @GetMapping + public List getAll() { + return typeService.getAll().stream() + .map(this::toDto) + .toList(); + } + + @GetMapping("/{id}") + public TypeDto get(@PathVariable(name = "id") Long id) { + return toDto(typeService.get(id)); + } + + @PostMapping + public TypeDto create(@RequestBody @Valid TypeDto dto) { + return toDto(typeService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public TypeDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid TypeDto dto) { + return toDto(typeService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public TypeDto delete(@PathVariable(name = "id") Long id) { + return toDto(typeService.delete(id)); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/api/TypeDto.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/api/TypeDto.java new file mode 100644 index 0000000..9ed9864 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/api/TypeDto.java @@ -0,0 +1,30 @@ +package com.example.demo.types.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class TypeDto { + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private Long id; + @NotBlank + @Size(min = 5, max = 50) + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/model/TypeEntity.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/model/TypeEntity.java new file mode 100644 index 0000000..14df9ea --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/model/TypeEntity.java @@ -0,0 +1,48 @@ +package com.example.demo.types.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "types") +public class TypeEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + + public TypeEntity() { + } + + public TypeEntity(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final TypeEntity other = (TypeEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } + +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/repository/TypeRepository.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/repository/TypeRepository.java new file mode 100644 index 0000000..9fea284 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/repository/TypeRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.types.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; + +import com.example.demo.types.model.TypeEntity; + +public interface TypeRepository extends CrudRepository { + Optional findByNameIgnoreCase(String name); +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/service/TypeService.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/service/TypeService.java new file mode 100644 index 0000000..f098a64 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/types/service/TypeService.java @@ -0,0 +1,62 @@ +package com.example.demo.types.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.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; + } + + private void checkName(String name) { + if (repository.findByNameIgnoreCase(name).isPresent()) { + throw new IllegalArgumentException( + String.format("Type with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public TypeEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(TypeEntity.class, id)); + } + + @Transactional + public TypeEntity create(TypeEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(entity.getName()); + return repository.save(entity); + } + + @Transactional + public TypeEntity update(Long id, TypeEntity entity) { + final TypeEntity existsEntity = get(id); + checkName(entity.getName()); + existsEntity.setName(entity.getName()); + return repository.save(existsEntity); + } + + @Transactional + public TypeEntity delete(Long id) { + final TypeEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/api/UserController.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/api/UserController.java new file mode 100644 index 0000000..75e0f35 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/api/UserController.java @@ -0,0 +1,109 @@ +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.api.PageDto; +import com.example.demo.core.api.PageDtoMapper; +import com.example.demo.core.configuration.Constants; +import com.example.demo.subscriptions.api.SubscriptionDto; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/user") +public class UserController { + private final UserService userService; + private final ModelMapper modelMapper; + + public UserController(UserService userService, ModelMapper modelMapper) { + this.userService = userService; + this.modelMapper = modelMapper; + } + + private UserDto toDto(UserEntity entity) { + return modelMapper.map(entity, UserDto.class); + } + + private SubscriptionDto toSubscriptionDto(SubscriptionEntity entity) { + return modelMapper.map(entity, SubscriptionDto.class); + } + + private UserEntity toEntity(UserDto dto) { + return modelMapper.map(dto, UserEntity.class); + } + + @GetMapping + public PageDto getAll( + @RequestParam(name = "page", defaultValue = "0") int page, + @RequestParam(name = "size", defaultValue = Constants.DEFAULT_PAGE_SIZE) int size) { + return PageDtoMapper.toDto(userService.getAll(page, size), this::toDto); + } + + @GetMapping("/{id}") + public UserDto get(@PathVariable(name = "id") Long id) { + return toDto(userService.get(id)); + } + + @PostMapping + public UserDto create(@RequestBody @Valid UserDto dto) { + return toDto(userService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public UserDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid UserDto dto) { + return toDto(userService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public UserDto delete(@PathVariable(name = "id") Long id) { + return toDto(userService.delete(id)); + } + + @GetMapping("/{id}/subscription") + public List getUserSubscriptions(@PathVariable(name = "id") Long id) { + return userService.getUserSubscriptions(id).stream() + .map(this::toSubscriptionDto) + .toList(); + } + + @PostMapping("/{id}/subscription") + public List enableUserSubscriptions( + @PathVariable(name = "id") Long id, + @RequestParam(name = "subscriptions", defaultValue = "") List subscriptionsIds) { + return userService.enableUserSubscriptions(id, subscriptionsIds).stream() + .map(this::toSubscriptionDto) + .toList(); + } + + @DeleteMapping("/{id}/subscription") + public List disableUserSubscriptions( + @PathVariable(name = "id") Long id, + @RequestParam(name = "subscriptions", defaultValue = "") List subscriptionsIds) { + return userService.disableUserSubscriptions(id, subscriptionsIds).stream() + .map(this::toSubscriptionDto) + .toList(); + } + + @DeleteMapping("/{id}/subscription/all") + public List deleteAllUserSubscriptions(@PathVariable(name = "id") Long id) { + return userService.deleteAllUserSubscriptions(id).stream() + .map(this::toSubscriptionDto) + .toList(); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/api/UserDto.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/api/UserDto.java new file mode 100644 index 0000000..7288ee9 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/api/UserDto.java @@ -0,0 +1,31 @@ +package com.example.demo.users.api; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty.Access; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class UserDto { + @JsonProperty(access = Access.READ_ONLY) + private Long id; + @NotBlank + @Size(min = 3, max = 20) + private String login; + + 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; + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/model/UserEntity.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/model/UserEntity.java new file mode 100644 index 0000000..e1c48f7 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/model/UserEntity.java @@ -0,0 +1,91 @@ +package com.example.demo.users.model; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.usersubscription.model.UserSubscriptionEntity; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users") +public class UserEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 20) + private String login; + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + @OrderBy("id ASC") + private Set orders = new HashSet<>(); + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) + @OrderBy("id ASC") + private Set userSubscriptions = new HashSet<>(); + + public UserEntity() { + } + + public UserEntity(String login) { + this.login = login; + } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public Set getOrders() { + return orders; + } + + public void addOrder(OrderEntity order) { + if (order.getUser() != this) { + order.setUser(this); + } + orders.add(order); + } + + public Set getUserSubscriptions() { + return userSubscriptions; + } + + public void addSubscription(UserSubscriptionEntity userSubscription) { + if (userSubscription.getUser() != this) { + userSubscription.setUser(this); + } + userSubscriptions.add(userSubscription); + } + + public void deleteSubscription(UserSubscriptionEntity userSubscription) { + if (userSubscription.getUser() != this) { + return; + } + userSubscriptions.remove(userSubscription); + } + + @Override + public int hashCode() { + return Objects.hash(id, login, orders, userSubscriptions); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserEntity other = (UserEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getLogin(), login) + && Objects.equals(other.getOrders(), orders) + && Objects.equals(other.getUserSubscriptions(), userSubscriptions); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/repository/UserRepository.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/repository/UserRepository.java new file mode 100644 index 0000000..9bf3cae --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/repository/UserRepository.java @@ -0,0 +1,13 @@ +package com.example.demo.users.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.demo.users.model.UserEntity; + +public interface UserRepository + extends CrudRepository, PagingAndSortingRepository { + Optional findByLoginIgnoreCase(String login); +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/service/UserService.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/service/UserService.java new file mode 100644 index 0000000..00fd3ef --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/users/service/UserService.java @@ -0,0 +1,138 @@ +package com.example.demo.users.service; + +import java.util.List; +import java.util.Objects; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.repository.UserRepository; +import com.example.demo.usersubscription.model.UserSubscriptionEntity; + +@Service +public class UserService { + private final UserRepository repository; + private final SubscriptionService subscriptionService; + + public UserService( + UserRepository repository, + SubscriptionService subscriptionService) { + this.repository = repository; + this.subscriptionService = subscriptionService; + } + + private void checkLogin(String login) { + if (repository.findByLoginIgnoreCase(login).isPresent()) { + throw new IllegalArgumentException( + String.format("User with login %s is already exists", login)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public Page getAll(int page, int size) { + return repository.findAll(PageRequest.of(page, size)); + } + + @Transactional(readOnly = true) + public UserEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(UserEntity.class, id)); + } + + @Transactional + public UserEntity create(UserEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkLogin(entity.getLogin()); + repository.save(entity); + subscriptionService.getAll().forEach(subscription -> { + final UserSubscriptionEntity userSubscription = new UserSubscriptionEntity(entity, subscription, true); + userSubscription.setUser(entity); + userSubscription.setSubscription(subscription); + }); + return repository.save(entity); + } + + @Transactional + public UserEntity update(long id, UserEntity entity) { + final UserEntity existsEntity = get(id); + checkLogin(entity.getLogin()); + existsEntity.setLogin(entity.getLogin()); + repository.save(existsEntity); + return existsEntity; + } + + @Transactional + public UserEntity delete(long id) { + final UserEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } + + @Transactional(readOnly = true) + public List getUserSubscriptions(long id) { + return get(id).getUserSubscriptions().stream() + .filter(UserSubscriptionEntity::isActive) + .map(UserSubscriptionEntity::getSubscription) + .toList(); + } + + private List changeUserSubscriptionsState( + UserEntity existsUser, + List subscriptionsIds, + boolean state) { + return existsUser.getUserSubscriptions().stream() + .filter(subscription -> Objects.nonNull(subscription.getSubscription())) + .filter(subscription -> subscriptionsIds.contains(subscription.getSubscription().getId())) + .filter(subscription -> subscription.isActive() == !state) + .map(subscription -> { + subscription.setActive(state); + return subscription.getSubscription(); + }) + .toList(); + } + + @Transactional + public List enableUserSubscriptions(long id, List subscriptionsIds) { + final UserEntity existsUser = get(id); + final List changedSubscriptions = changeUserSubscriptionsState( + existsUser, subscriptionsIds, true); + repository.save(existsUser); + return changedSubscriptions; + } + + @Transactional + public List disableUserSubscriptions(long id, List subscriptionsIds) { + final UserEntity existsUser = get(id); + final List changedSubscriptions = changeUserSubscriptionsState( + existsUser, subscriptionsIds, false); + repository.save(existsUser); + return changedSubscriptions; + } + + @Transactional + public List deleteAllUserSubscriptions(long id) { + final UserEntity existsUser = get(id); + final List subscriptions = existsUser.getUserSubscriptions().stream() + .filter(subscription -> Objects.nonNull(subscription.getSubscription())) + .toList(); + subscriptions.forEach(existsUser::deleteSubscription); + repository.save(existsUser); + return subscriptions.stream() + .map(UserSubscriptionEntity::getSubscription) + .toList(); + } +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionEntity.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionEntity.java new file mode 100644 index 0000000..1f280f9 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionEntity.java @@ -0,0 +1,95 @@ +package com.example.demo.usersubscription.model; + +import java.util.Objects; + +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.users.model.UserEntity; + +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users_subscriptions") +public class UserSubscriptionEntity { + @EmbeddedId + private UserSubscriptionId id = new UserSubscriptionId(); + @ManyToOne + @MapsId("userId") + @JoinColumn(name = "user_id") + private UserEntity user; + @ManyToOne + @MapsId("subscriptionId") + @JoinColumn(name = "subscription_id") + private SubscriptionEntity subscription; + private boolean active; + + public UserSubscriptionEntity() { + } + + public UserSubscriptionEntity(UserEntity user, SubscriptionEntity subscription, boolean active) { + this.user = user; + this.subscription = subscription; + this.active = active; + } + + public UserSubscriptionId getId() { + return id; + } + + public void setId(UserSubscriptionId id) { + this.id = id; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + if (!user.getUserSubscriptions().contains(this)) { + user.getUserSubscriptions().add(this); + } + } + + public SubscriptionEntity getSubscription() { + return subscription; + } + + public void setSubscription(SubscriptionEntity subscription) { + this.subscription = subscription; + if (!subscription.getUserSubscriptions().contains(this)) { + subscription.getUserSubscriptions().add(this); + } + } + + public boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } + + @Override + public int hashCode() { + return Objects.hash(id, user.getId(), subscription.getId(), active); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserSubscriptionEntity other = (UserSubscriptionEntity) obj; + return Objects.equals(id, other.id) + && Objects.equals(user.getId(), other.user.getId()) + && Objects.equals(subscription.getId(), other.subscription.getId()) + && active == other.active; + } + +} diff --git a/laba3.1/Лекция4-src/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionId.java b/laba3.1/Лекция4-src/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionId.java new file mode 100644 index 0000000..0b23f19 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionId.java @@ -0,0 +1,55 @@ +package com.example.demo.usersubscription.model; + +import java.util.Objects; +import java.util.Optional; + +import jakarta.persistence.Embeddable; + +@Embeddable +public class UserSubscriptionId { + private Long userId; + private Long subscriptionId; + + public UserSubscriptionId() { + } + + public UserSubscriptionId(Long userId, Long subscriptionId) { + this.userId = userId; + this.subscriptionId = subscriptionId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getSubscriptionId() { + return subscriptionId; + } + + public void setSubscriptionId(Long subscriptionId) { + this.subscriptionId = subscriptionId; + } + + @Override + public int hashCode() { + return Objects.hash( + Optional.ofNullable(userId).orElse(0L), + Optional.ofNullable(subscriptionId).orElse(0L)); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserSubscriptionId other = (UserSubscriptionId) obj; + return Objects.equals(userId, other.userId) + && Objects.equals(subscriptionId, other.subscriptionId); + } + +} diff --git a/laba3.1/Лекция4-src/src/main/resources/application-dev.properties b/laba3.1/Лекция4-src/src/main/resources/application-dev.properties new file mode 100644 index 0000000..4ed3960 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/application-dev.properties @@ -0,0 +1,8 @@ +# Dev H2 JPA Settings +spring.datasource.url=jdbc:h2:file:./data +spring.datasource.username=sa +spring.datasource.password=password +spring.datasource.driver-class-name=org.h2.Driver + +# H2 console +spring.h2.console.enabled=true \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/application-prod.properties b/laba3.1/Лекция4-src/src/main/resources/application-prod.properties new file mode 100644 index 0000000..aaf9d7d --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/application-prod.properties @@ -0,0 +1,9 @@ +# Logger settings +# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF +logging.level.com.example.demo=INFO + +# Prod PostgreSQL JPA Settings +spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/demo-app +spring.datasource.username=postgres +spring.datasource.password=postgres +spring.datasource.driver-class-name=org.postgresql.Driver diff --git a/laba3.1/Лекция4-src/src/main/resources/application.properties b/laba3.1/Лекция4-src/src/main/resources/application.properties new file mode 100644 index 0000000..8f5373c --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/application.properties @@ -0,0 +1,21 @@ +# Server +spring.main.banner-mode=off +server.port=8080 + +# Logger settings +# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF +logging.level.com.example.demo=DEBUG + +# Set default orofile +spring.profiles.default=dev + +# Common JPA Settings +spring.jpa.hibernate.ddl-auto=validate +spring.jpa.open-in-view=false +# spring.jpa.show-sql=true +# spring.jpa.properties.hibernate.format_sql=true + +# Liquibase Settings +spring.liquibase.enabled=true +spring.liquibase.drop-first=false +spring.liquibase.change-log=classpath:db/changelog.xml \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/0-sequence.xml b/laba3.1/Лекция4-src/src/main/resources/db/0-sequence.xml new file mode 100644 index 0000000..a790c65 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/0-sequence.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/1-types-data.xml b/laba3.1/Лекция4-src/src/main/resources/db/1-types-data.xml new file mode 100644 index 0000000..3af16a8 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/1-types-data.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/1-types-schema.xml b/laba3.1/Лекция4-src/src/main/resources/db/1-types-schema.xml new file mode 100644 index 0000000..152834b --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/1-types-schema.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/2-items-data.xml b/laba3.1/Лекция4-src/src/main/resources/db/2-items-data.xml new file mode 100644 index 0000000..8688505 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/2-items-data.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/2-items-schema.xml b/laba3.1/Лекция4-src/src/main/resources/db/2-items-schema.xml new file mode 100644 index 0000000..85ab9e2 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/2-items-schema.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/3-users-constraint.xml b/laba3.1/Лекция4-src/src/main/resources/db/3-users-constraint.xml new file mode 100644 index 0000000..69b1dfb --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/3-users-constraint.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/3-users-data.xml b/laba3.1/Лекция4-src/src/main/resources/db/3-users-data.xml new file mode 100644 index 0000000..516f72c --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/3-users-data.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + user_id IS NULL + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/3-users-schema.xml b/laba3.1/Лекция4-src/src/main/resources/db/3-users-schema.xml new file mode 100644 index 0000000..88ade2d --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/3-users-schema.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/4-items-to-orders.xml b/laba3.1/Лекция4-src/src/main/resources/db/4-items-to-orders.xml new file mode 100644 index 0000000..639b9c5 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/4-items-to-orders.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/5-subscriptions-data.xml b/laba3.1/Лекция4-src/src/main/resources/db/5-subscriptions-data.xml new file mode 100644 index 0000000..0c42c84 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/5-subscriptions-data.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/5-subscriptions-schema.xml b/laba3.1/Лекция4-src/src/main/resources/db/5-subscriptions-schema.xml new file mode 100644 index 0000000..f6cfeb9 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/5-subscriptions-schema.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/6-users-subscriptions-data.xml b/laba3.1/Лекция4-src/src/main/resources/db/6-users-subscriptions-data.xml new file mode 100644 index 0000000..0eab1dd --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/6-users-subscriptions-data.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/6-users-subscriptions-schema.xml b/laba3.1/Лекция4-src/src/main/resources/db/6-users-subscriptions-schema.xml new file mode 100644 index 0000000..49624e0 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/6-users-subscriptions-schema.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/main/resources/db/changelog.xml b/laba3.1/Лекция4-src/src/main/resources/db/changelog.xml new file mode 100644 index 0000000..2075b39 --- /dev/null +++ b/laba3.1/Лекция4-src/src/main/resources/db/changelog.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laba3.1/Лекция4-src/src/test/java/com/example/demo/TypeServiceTests.java b/laba3.1/Лекция4-src/src/test/java/com/example/demo/TypeServiceTests.java new file mode 100644 index 0000000..10043cd --- /dev/null +++ b/laba3.1/Лекция4-src/src/test/java/com/example/demo/TypeServiceTests.java @@ -0,0 +1,79 @@ +package com.example.demo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +@SpringBootTest +class TypeServiceTests { + @Autowired + private TypeService typeService; + + private TypeEntity type; + + @BeforeEach + void createData() { + removeData(); + + type = typeService.create(new TypeEntity("Ноутбук")); + typeService.create(new TypeEntity("Телефон")); + typeService.create(new TypeEntity("Игровая приставка")); + } + + @AfterEach + void removeData() { + typeService.getAll().forEach(item -> typeService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(type, typeService.get(type.getId())); + } + + @Test + void createNotUniqueTest() { + final TypeEntity nonUniqueType = new TypeEntity("Ноутбук"); + Assertions.assertThrows(IllegalArgumentException.class, () -> typeService.create(nonUniqueType)); + } + + @Test + void createNullableTest() { + final TypeEntity nullableType = new TypeEntity(null); + Assertions.assertThrows(DataIntegrityViolationException.class, () -> typeService.create(nullableType)); + } + + @Test + void updateTest() { + final String test = "TEST"; + final String oldName = type.getName(); + final TypeEntity newEntity = typeService.update(type.getId(), new TypeEntity(test)); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(newEntity, typeService.get(type.getId())); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + void deleteTest() { + typeService.delete(type.getId()); + Assertions.assertEquals(2, typeService.getAll().size()); + + final TypeEntity newEntity = typeService.create(new TypeEntity(type.getName())); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertNotEquals(type.getId(), newEntity.getId()); + } +} diff --git a/laba3.1/Лекция4-src/src/test/java/com/example/demo/UserOrderServiceTest.java b/laba3.1/Лекция4-src/src/test/java/com/example/demo/UserOrderServiceTest.java new file mode 100644 index 0000000..5305797 --- /dev/null +++ b/laba3.1/Лекция4-src/src/test/java/com/example/demo/UserOrderServiceTest.java @@ -0,0 +1,140 @@ +package com.example.demo; + +import java.util.List; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +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.orders.model.OrderEntity; +import com.example.demo.orders.service.OrderService; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; +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; + +import jakarta.persistence.EntityManager; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class UserOrderServiceTest { + @Autowired + private EntityManager entityManager; + @Autowired + private TypeService typeService; + @Autowired + private SubscriptionService subscriptionService; + @Autowired + private OrderService orderService; + @Autowired + private UserService userService; + + private TypeEntity type1; + private TypeEntity type2; + private TypeEntity type3; + + private SubscriptionEntity subscription; + + private UserEntity user1; + private UserEntity user2; + + @BeforeEach + void createData() { + removeData(); + + type1 = typeService.create(new TypeEntity("Ноутбук")); + type2 = typeService.create(new TypeEntity("Телефон")); + type3 = typeService.create(new TypeEntity("Игровая приставка")); + + subscription = subscriptionService.create(new SubscriptionEntity("Подписка 1")); + subscriptionService.create(new SubscriptionEntity("Подписка 2")); + subscriptionService.create(new SubscriptionEntity("Подписка 3")); + + user1 = userService.create(new UserEntity("user1")); + user2 = userService.create(new UserEntity("user2")); + + final var orders = List.of( + new OrderEntity(type1, 49999.00, 20), + new OrderEntity(type1, 129999.00, 3), + new OrderEntity(type2, 15450.50, 30), + new OrderEntity(type2, 69900.50, 10), + new OrderEntity(type2, 150000.00, 6), + new OrderEntity(type3, 75000.00, 6), + new OrderEntity(type3, 67800.00, 3)); + orders.forEach(order -> orderService.create(user1.getId(), order)); + } + + @AfterEach + void removeData() { + userService.getAll().forEach(item -> userService.delete(item.getId())); + typeService.getAll().forEach(item -> typeService.delete(item.getId())); + subscriptionService.getAll().forEach(item -> subscriptionService.delete(item.getId())); + } + + @Test + @Order(1) + void createTest() { + Assertions.assertEquals(7, orderService.getAll(user1.getId(), 0).size()); + Assertions.assertEquals(0, orderService.getAll(user2.getId(), 0).size()); + } + + @Test + @Order(2) + void orderFilterTest() { + Assertions.assertEquals(2, orderService.getAll(user1.getId(), type1.getId()).size()); + Assertions.assertEquals(3, orderService.getAll(user1.getId(), type2.getId()).size()); + Assertions.assertEquals(2, orderService.getAll(user1.getId(), type3.getId()).size()); + } + + @Test + @Order(3) + void subscriptionsTest() { + Assertions.assertEquals(3, userService.getUserSubscriptions(user1.getId()).size()); + } + + @Test + @Order(4) + void subscriptionDisableTest() { + userService.disableUserSubscriptions(user1.getId(), List.of(subscription.getId())); + Assertions.assertEquals(subscriptionService.getAll().size() - 1, + userService.getUserSubscriptions(user1.getId()).size()); + } + + @Test + @Order(5) + void subscriptionEnableTest() { + userService.enableUserSubscriptions(user1.getId(), List.of(subscription.getId())); + Assertions.assertEquals(subscriptionService.getAll().size(), + userService.getUserSubscriptions(user1.getId()).size()); + } + + @Test + @Order(6) + void subscriptionsDeleteTest() { + userService.deleteAllUserSubscriptions(user1.getId()); + Assertions.assertTrue(userService.getUserSubscriptions(user1.getId()).isEmpty()); + } + + @Test + @Order(6) + void userCascadeDeleteTest() { + userService.delete(user1.getId()); + final var orders = entityManager.createQuery( + "select count(o) from OrderEntity o where o.user.id = :userId"); + orders.setParameter("userId", user1.getId()); + Assertions.assertEquals(0, orders.getFirstResult()); + final var subscriptions = entityManager.createQuery( + "select count(us) from UserSubscriptionEntity us where us.user.id = :userId"); + subscriptions.setParameter("userId", user1.getId()); + Assertions.assertEquals(0, subscriptions.getFirstResult()); + + } +} diff --git a/laba3.1/Лекция4-src/src/test/resources/application.properties b/laba3.1/Лекция4-src/src/test/resources/application.properties new file mode 100644 index 0000000..75a566b --- /dev/null +++ b/laba3.1/Лекция4-src/src/test/resources/application.properties @@ -0,0 +1,20 @@ +# Server +spring.main.banner-mode=off + +# Set default orofile +spring.profiles.default=dev + +# Logger settings +# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF +logging.level.com.example.demo=DEBUG + +# JPA Settings +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.username=sa +spring.datasource.password=password +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=false + +# Liquibase Settings +spring.liquibase.enabled=false \ No newline at end of file diff --git a/laba3.2/.vscode/launch.json b/laba3.2/.vscode/launch.json new file mode 100644 index 0000000..d4c695a --- /dev/null +++ b/laba3.2/.vscode/launch.json @@ -0,0 +1,21 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Current File", + "request": "launch", + "mainClass": "${file}" + }, + { + "type": "java", + "name": "DemoApplication", + "request": "launch", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "Лекция3-src" + } + ] +} \ No newline at end of file diff --git a/laba3.2/.vscode/settings.json b/laba3.2/.vscode/settings.json new file mode 100644 index 0000000..a5eed8b --- /dev/null +++ b/laba3.2/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.dependency.packagePresentation": "hierarchical" +} \ No newline at end of file diff --git a/laba3.2/data.mv.db b/laba3.2/data.mv.db new file mode 100644 index 0000000..8f6262f Binary files /dev/null and b/laba3.2/data.mv.db differ diff --git a/laba3.2/Лекция3-src/.gitignore b/laba3.2/Лекция3-src/.gitignore new file mode 100644 index 0000000..546ecee --- /dev/null +++ b/laba3.2/Лекция3-src/.gitignore @@ -0,0 +1,36 @@ +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/ + +data.*.db \ No newline at end of file diff --git a/laba3.2/Лекция3-src/.vscode/extensions.json b/laba3.2/Лекция3-src/.vscode/extensions.json new file mode 100644 index 0000000..42cf79d --- /dev/null +++ b/laba3.2/Лекция3-src/.vscode/extensions.json @@ -0,0 +1,12 @@ +{ + "recommendations": [ + // fronted + "AndersEAndersen.html-class-suggestions", + "dbaeumer.vscode-eslint", + // backend + "vscjava.vscode-java-pack", + "vmware.vscode-boot-dev-pack", + "vscjava.vscode-gradle", + "redhat.vscode-xml" + ] +} \ No newline at end of file diff --git a/laba3.2/Лекция3-src/.vscode/launch.json b/laba3.2/Лекция3-src/.vscode/launch.json new file mode 100644 index 0000000..60a4fe1 --- /dev/null +++ b/laba3.2/Лекция3-src/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + "configurations": [ + { + "type": "java", + "name": "Demo", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "lec3", + "args": "--populate", + "envFile": "${workspaceFolder}/.env" + }, + { + "type": "java", + "name": "Spring Boot-DemoApplication<Лекция3-src>", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "Лекция3-src", + "args": "", + "envFile": "${workspaceFolder}/.env" + } + ] +} \ No newline at end of file diff --git a/laba3.2/Лекция3-src/.vscode/settings.json b/laba3.2/Лекция3-src/.vscode/settings.json new file mode 100644 index 0000000..eab3db6 --- /dev/null +++ b/laba3.2/Лекция3-src/.vscode/settings.json @@ -0,0 +1,21 @@ +{ + "editor.tabSize": 4, + "editor.detectIndentation": false, + "editor.insertSpaces": true, + "editor.formatOnPaste": true, + "editor.formatOnSave": true, + "editor.formatOnType": false, + "java.compile.nullAnalysis.mode": "disabled", + "java.configuration.updateBuildConfiguration": "automatic", + "[java]": { + "editor.pasteAs.enabled": false, + }, + "gradle.nestedProjects": true, + "java.saveActions.organizeImports": true, + "java.dependency.packagePresentation": "hierarchical", + "spring-boot.ls.problem.boot2.JAVA_CONSTRUCTOR_PARAMETER_INJECTION": "WARNING", + "spring.initializr.defaultLanguage": "Java", + "java.format.settings.url": ".vscode/eclipse-formatter.xml", + "java.project.explorer.showNonJavaResources": true, + "java.codeGeneration.hashCodeEquals.useJava7Objects": true, +} \ No newline at end of file diff --git a/laba3.2/Лекция3-src/build.gradle b/laba3.2/Лекция3-src/build.gradle new file mode 100644 index 0000000..1f5a14c --- /dev/null +++ b/laba3.2/Лекция3-src/build.gradle @@ -0,0 +1,43 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.4' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +defaultTasks 'bootRun' + +jar { + enabled = false +} + +bootJar { + archiveFileName = String.format('%s-%s.jar', rootProject.name, version) +} + +assert System.properties['java.specification.version'] == '17' || '21' +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'org.modelmapper:modelmapper:3.2.0' + + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'com.h2database:h2:2.2.224' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/laba3.2/Лекция3-src/gradle/wrapper/gradle-wrapper.jar b/laba3.2/Лекция3-src/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/laba3.2/Лекция3-src/gradle/wrapper/gradle-wrapper.jar differ diff --git a/laba3.2/Лекция3-src/gradle/wrapper/gradle-wrapper.properties b/laba3.2/Лекция3-src/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/laba3.2/Лекция3-src/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/laba3.2/Лекция3-src/gradlew b/laba3.2/Лекция3-src/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/laba3.2/Лекция3-src/gradlew @@ -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" "$@" diff --git a/laba3.2/Лекция3-src/gradlew.bat b/laba3.2/Лекция3-src/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/laba3.2/Лекция3-src/gradlew.bat @@ -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 diff --git a/laba3.2/Лекция3-src/package-lock.json b/laba3.2/Лекция3-src/package-lock.json new file mode 100644 index 0000000..3863983 --- /dev/null +++ b/laba3.2/Лекция3-src/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "Лекция3-src", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/laba3.2/Лекция3-src/readme.md b/laba3.2/Лекция3-src/readme.md new file mode 100644 index 0000000..6eea3e5 --- /dev/null +++ b/laba3.2/Лекция3-src/readme.md @@ -0,0 +1,18 @@ +Swagger UI: \ +http://localhost:8080/swagger-ui/index.html + +H2 Console: \ +http://localhost:8080/h2-console + +JDBC URL: jdbc:h2:file:./data \ +User Name: sa \ +Password: password + +Почитать: + +- Односторонние и двусторонние связи https://www.baeldung.com/jpa-hibernate-associations +- Getters и Setters для двусторонних связей https://en.wikibooks.org/wiki/Java_Persistence/OneToMany#Getters_and_Setters +- Многие-ко-многим с доп. атрибутами https://thorben-janssen.com/hibernate-tip-many-to-many-association-with-additional-attributes/ +- Многие-ко-многим с доп. атрибутами https://www.baeldung.com/jpa-many-to-many +- Каскадное удаление сущностей со связями многие-ко-многим https://www.baeldung.com/jpa-remove-entity-many-to-many +- Выбор типа коллекции для отношений вида ко-многим в JPA https://thorben-janssen.com/association-mappings-bag-list-set/ diff --git a/laba3.2/Лекция3-src/settings.gradle b/laba3.2/Лекция3-src/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/laba3.2/Лекция3-src/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/DemoApplication.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..7a305a3 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,79 @@ +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.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.service.GenreService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; +import com.example.demo.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.service.SubscribeService; +import com.example.demo.userfilms.model.UserFilmEntity; +import com.example.demo.userfilms.service.UserFilmService; +import com.example.demo.genres.model.GenreEntity; + +@SpringBootApplication +public class DemoApplication implements CommandLineRunner { + private final Logger log = LoggerFactory.getLogger(DemoApplication.class); + + private final FilmService filmService; + private final UserService userService; + private final SubscribeService subscribeService; + private final GenreService genreService; + private final UserFilmService userFilmService; + + public DemoApplication( + FilmService filmService, + UserService userService, + SubscribeService subscribeService, + GenreService genreService, + UserFilmService userFilmService) { + this.filmService = filmService; + this.userService = userService; + this.subscribeService = subscribeService; + this.genreService = genreService; + this.userFilmService = userFilmService; + } + + 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 type values"); + final var genre1 = genreService.create(new GenreEntity("Комедия")); + final var genre2 = genreService.create(new GenreEntity("Триллер")); + final var genre3 = genreService.create(new GenreEntity("Драма")); + + log.info("Create default film values"); + final var film1 = filmService.create(new FilmEntity("film 1", genre1, 123d, 10)); + final var film2 = filmService.create(new FilmEntity("film 2", genre2, 123d, 10)); + final var film3 = filmService.create(new FilmEntity("film 3", genre3, 123d, 10)); + final var film4 = filmService.create(new FilmEntity("film 4", genre3, 123d, 10)); + final var film5 = filmService.create(new FilmEntity("film 5", genre3, 123d, 10)); + + log.info("Create default subscribe values"); + final var subscribe1 = subscribeService.create(new SubscribeEntity("ffffff", 100d)); + + log.info("Create default user values"); + final var user = userService.create(new UserEntity("user1", subscribe1, "mail1", "phone1")); + userService.create(new UserEntity("user2", subscribe1, "mail2", "phone2")); + + log.info("Create default userFilms"); + userFilmService.create(new UserFilmEntity(user, film1, false)); + userFilmService.create(new UserFilmEntity(user, film2, false)); + userFilmService.create(new UserFilmEntity(user, film3, false)); + userFilmService.create(new UserFilmEntity(user, film4, false)); + userFilmService.create(new UserFilmEntity(user, film5, false)); + } + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/configuration/Constants.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/configuration/Constants.java new file mode 100644 index 0000000..2474c0f --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/configuration/Constants.java @@ -0,0 +1,10 @@ +package com.example.demo.core.configuration; + +public class Constants { + public static final String SEQUENCE_NAME = "hibernate_sequence"; + + public static final String API_URL = "/api/1.0"; + + private Constants() { + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java new file mode 100644 index 0000000..a5ad6f3 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java @@ -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(); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java new file mode 100644 index 0000000..762e85a --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java @@ -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"); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/error/NotFoundException.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/error/NotFoundException.java new file mode 100644 index 0000000..a61d118 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/error/NotFoundException.java @@ -0,0 +1,7 @@ +package com.example.demo.core.error; + +public class NotFoundException extends RuntimeException { + public NotFoundException(Class clazz, Long id) { + super(String.format("%s with id [%s] is not found or not exists", clazz.getSimpleName(), id)); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/model/BaseEntity.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/model/BaseEntity.java new file mode 100644 index 0000000..eba74ad --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/core/model/BaseEntity.java @@ -0,0 +1,28 @@ +package com.example.demo.core.model; + +import com.example.demo.core.configuration.Constants; + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.SequenceGenerator; + +@MappedSuperclass +public abstract class BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = Constants.SEQUENCE_NAME) + @SequenceGenerator(name = Constants.SEQUENCE_NAME, sequenceName = Constants.SEQUENCE_NAME, allocationSize = 1) + protected Long id; + + protected BaseEntity() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/api/FilmController.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/api/FilmController.java new file mode 100644 index 0000000..35e93bf --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/api/FilmController.java @@ -0,0 +1,73 @@ +package com.example.demo.films.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.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.service.GenreService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/film") +public class FilmController { + private final FilmService filmService; + private final GenreService genreService; + private final ModelMapper modelMapper; + + public FilmController(FilmService filmService, GenreService genreService, ModelMapper modelMapper) { + this.filmService = filmService; + this.genreService = genreService; + this.modelMapper = modelMapper; + } + + private FilmDto toDto(FilmEntity entity) { + return modelMapper.map(entity, FilmDto.class); + } + + private FilmEntity toEntity(FilmDto dto) { + final FilmEntity entity = modelMapper.map(dto, FilmEntity.class); + entity.setGenre(genreService.get(dto.getGenreId())); + return entity; + } + + @GetMapping + public List getAll() { + return filmService.getAll().stream() + .map(this::toDto) + .toList(); + } + + @GetMapping("/{id}") + public FilmDto get(@PathVariable(name = "id") Long id) { + return toDto(filmService.get(id)); + } + + @PostMapping + public FilmDto create(@RequestBody @Valid FilmDto dto) { + return toDto(filmService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public FilmDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid FilmDto dto) { + return toDto(filmService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public FilmDto delete(@PathVariable(name = "id") Long id) { + return toDto(filmService.delete(id)); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/api/FilmDto.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/api/FilmDto.java new file mode 100644 index 0000000..0a5ca24 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/api/FilmDto.java @@ -0,0 +1,70 @@ +package com.example.demo.films.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public class FilmDto { + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private Long id; + @NotBlank + @Size(min = 5, max = 50) + private String name; + @NotNull + @Min(1) + private Long genreId; + @NotNull + @Min(1) + private Double price; + @NotNull + @Min(1) + private Integer discount; + + 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 Long getGenreId() { + return genreId; + } + + public void setGenreId(Long genreId) { + this.genreId = genreId; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getDiscount() { + return discount; + } + + public void setDiscount(Integer discount) { + this.discount = discount; + } + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Double getSum() { + return price - ((price * discount) * 0.01); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/model/FilmEntity.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/model/FilmEntity.java new file mode 100644 index 0000000..5f41b62 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/model/FilmEntity.java @@ -0,0 +1,87 @@ +package com.example.demo.films.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.genres.model.GenreEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "films") +public class FilmEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + @ManyToOne + @JoinColumn(name = "genreId", nullable = false) + private GenreEntity genre; + @Column(nullable = false) + private Double price; + @Column(nullable = false) + private Integer discount; + + public FilmEntity() { + } + + public FilmEntity(String name, GenreEntity genre, Double price, Integer discount) { + this.name = name; + this.genre = genre; + this.price = price; + this.discount = discount; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public GenreEntity getGenre() { + return genre; + } + + public void setGenre(GenreEntity genre) { + this.genre = genre; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getDiscount() { + return discount; + } + + public void setDiscount(Integer discount) { + this.discount = discount; + } + + @Override + public int hashCode() { + return Objects.hash(id, name, genre, price, discount); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + FilmEntity other = (FilmEntity) obj; + return Objects.equals(id, other.id) + && Objects.equals(name, other.name) + && Objects.equals(genre, other.genre) + && Objects.equals(price, other.price) + && Objects.equals(discount, other.discount); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/repository/FilmRepository.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/repository/FilmRepository.java new file mode 100644 index 0000000..495e722 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/repository/FilmRepository.java @@ -0,0 +1,14 @@ +package com.example.demo.films.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; + +import com.example.demo.films.model.FilmEntity; + +public interface FilmRepository extends CrudRepository { + Optional findByNameIgnoreCase(String name); + + List findByGenreId(long genreId); +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/service/FilmService.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/service/FilmService.java new file mode 100644 index 0000000..ed82706 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/films/service/FilmService.java @@ -0,0 +1,72 @@ +package com.example.demo.films.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.films.model.FilmEntity; +import com.example.demo.films.repository.FilmRepository; + +@Service +public class FilmService { + private final FilmRepository repository; + + public FilmService(FilmRepository repository) { + this.repository = repository; + } + + private void checkName(String name) { + if (repository.findByNameIgnoreCase(name).isPresent()) { + throw new IllegalArgumentException( + String.format("Type with name %s is already exists", name)); + } + } + + // @Transactional(readOnly = true) + // public List getAll(long genreId) { + // return repository.findByGenreId(genreId); + // } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), + false).toList(); + } + + @Transactional(readOnly = true) + public FilmEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(FilmEntity.class, id)); + } + + @Transactional + public FilmEntity create(FilmEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(entity.getName()); + return repository.save(entity); + } + + @Transactional + public FilmEntity update(Long id, FilmEntity entity) { + final FilmEntity existsEntity = get(id); + checkName(entity.getName()); + existsEntity.setName(entity.getName()); + existsEntity.setPrice(entity.getPrice()); + existsEntity.setDiscount(entity.getDiscount()); + existsEntity.setGenre(entity.getGenre()); + return repository.save(existsEntity); + } + + @Transactional + public FilmEntity delete(Long id) { + final FilmEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } + +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreController.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreController.java new file mode 100644 index 0000000..3d483b1 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreController.java @@ -0,0 +1,68 @@ +package com.example.demo.genres.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.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/genre") +public class GenreController { + private final GenreService genreService; + private final ModelMapper modelMapper; + + public GenreController(GenreService genreService, ModelMapper modelMapper) { + this.genreService = genreService; + this.modelMapper = modelMapper; + } + + private GenreDto toDto(GenreEntity entity) { + return modelMapper.map(entity, GenreDto.class); + } + + private GenreEntity toEntity(GenreDto dto) { + return modelMapper.map(dto, GenreEntity.class); + } + + @GetMapping + public List getAll() { + return genreService.getAll().stream() + .map(this::toDto) + .toList(); + } + + @GetMapping("/{id}") + public GenreDto get(@PathVariable(name = "id") Long id) { + return toDto(genreService.get(id)); + } + + @PostMapping + public GenreDto create(@RequestBody @Valid GenreDto dto) { + return toDto(genreService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public GenreDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid GenreDto dto) { + return toDto(genreService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public GenreDto delete(@PathVariable(name = "id") Long id) { + return toDto(genreService.delete(id)); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreDto.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreDto.java new file mode 100644 index 0000000..6598b12 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/api/GenreDto.java @@ -0,0 +1,30 @@ +package com.example.demo.genres.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class GenreDto { + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private Long id; + @NotBlank + @Size(min = 5, max = 50) + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/model/GenreEntity.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/model/GenreEntity.java new file mode 100644 index 0000000..b36a926 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/model/GenreEntity.java @@ -0,0 +1,48 @@ +package com.example.demo.genres.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "genres") +public class GenreEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + + public GenreEntity() { + } + + public GenreEntity(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final GenreEntity other = (GenreEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } + +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/repository/GenreRepository.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/repository/GenreRepository.java new file mode 100644 index 0000000..13d6932 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/repository/GenreRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.genres.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; + +import com.example.demo.genres.model.GenreEntity; + +public interface GenreRepository extends CrudRepository { + Optional findByNameIgnoreCase(String name); +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/service/GenreService.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/service/GenreService.java new file mode 100644 index 0000000..57358b0 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/genres/service/GenreService.java @@ -0,0 +1,62 @@ +package com.example.demo.genres.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.repository.GenreRepository; + +@Service +public class GenreService { + private final GenreRepository repository; + + public GenreService(GenreRepository repository) { + this.repository = repository; + } + + private void checkName(String name) { + if (repository.findByNameIgnoreCase(name).isPresent()) { + throw new IllegalArgumentException( + String.format("Genre with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public GenreEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(GenreEntity.class, id)); + } + + @Transactional + public GenreEntity create(GenreEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(entity.getName()); + return repository.save(entity); + } + + @Transactional + public GenreEntity update(Long id, GenreEntity entity) { + final GenreEntity existsEntity = get(id); + checkName(entity.getName()); + existsEntity.setName(entity.getName()); + return repository.save(existsEntity); + } + + @Transactional + public GenreEntity delete(Long id) { + final GenreEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeController.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeController.java new file mode 100644 index 0000000..595897f --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeController.java @@ -0,0 +1,68 @@ +package com.example.demo.subscribes.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.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.service.SubscribeService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/subscribe") +public class SubscribeController { + private final SubscribeService subscribeService; + private final ModelMapper modelMapper; + + public SubscribeController(SubscribeService subscribeService, ModelMapper modelMapper) { + this.subscribeService = subscribeService; + this.modelMapper = modelMapper; + } + + private SubscribeDto toDto(SubscribeEntity entity) { + return modelMapper.map(entity, SubscribeDto.class); + } + + private SubscribeEntity toEntity(SubscribeDto dto) { + return modelMapper.map(dto, SubscribeEntity.class); + } + + @GetMapping + public List getAll() { + return subscribeService.getAll().stream() + .map(this::toDto) + .toList(); + } + + @GetMapping("/{id}") + public SubscribeDto get(@PathVariable(name = "id") Long id) { + return toDto(subscribeService.get(id)); + } + + @PostMapping + public SubscribeDto create(@RequestBody @Valid SubscribeDto dto) { + return toDto(subscribeService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public SubscribeDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid SubscribeDto dto) { + return toDto(subscribeService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public SubscribeDto delete(@PathVariable(name = "id") Long id) { + return toDto(subscribeService.delete(id)); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeDto.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeDto.java new file mode 100644 index 0000000..2a203b2 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/api/SubscribeDto.java @@ -0,0 +1,43 @@ +package com.example.demo.subscribes.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public class SubscribeDto { + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private Long id; + @NotBlank + @Size(min = 5, max = 50) + private String name; + @NotNull + @Min(1) + private Double price; + + 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 Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/model/SubscribeEntity.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/model/SubscribeEntity.java new file mode 100644 index 0000000..60bd966 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/model/SubscribeEntity.java @@ -0,0 +1,60 @@ +package com.example.demo.subscribes.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "subscribes") +public class SubscribeEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + @Column(nullable = false) + private Double price; + + public SubscribeEntity() { + } + + public SubscribeEntity(String name, Double price) { + this.name = name; + this.price = price; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + @Override + public int hashCode() { + return Objects.hash(id, name, price); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final SubscribeEntity other = (SubscribeEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name) + && Objects.equals(other.getPrice(), price); + } + +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/repository/SubscribeRepository.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/repository/SubscribeRepository.java new file mode 100644 index 0000000..0dbfd6e --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/repository/SubscribeRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.subscribes.repository; + +import java.util.Optional; + +import com.example.demo.subscribes.model.SubscribeEntity; + +import org.springframework.data.repository.CrudRepository; + +public interface SubscribeRepository extends CrudRepository { + Optional findByNameIgnoreCase(String name); +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/service/SubscribeService.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/service/SubscribeService.java new file mode 100644 index 0000000..72c99a1 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/subscribes/service/SubscribeService.java @@ -0,0 +1,63 @@ +package com.example.demo.subscribes.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.repository.SubscribeRepository; + +@Service +public class SubscribeService { + private final SubscribeRepository repository; + + public SubscribeService(SubscribeRepository repository) { + this.repository = repository; + } + + private void checkName(String name) { + if (repository.findByNameIgnoreCase(name).isPresent()) { + throw new IllegalArgumentException( + String.format("Subscribe with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public SubscribeEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(SubscribeEntity.class, id)); + } + + @Transactional + public SubscribeEntity create(SubscribeEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(entity.getName()); + return repository.save(entity); + } + + @Transactional + public SubscribeEntity update(Long id, SubscribeEntity entity) { + final SubscribeEntity existsEntity = get(id); + checkName(entity.getName()); + existsEntity.setName(entity.getName()); + existsEntity.setPrice(entity.getPrice()); + return repository.save(existsEntity); + } + + @Transactional + public SubscribeEntity delete(Long id) { + final SubscribeEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/api/UserFilmController.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/api/UserFilmController.java new file mode 100644 index 0000000..2c2b29c --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/api/UserFilmController.java @@ -0,0 +1,105 @@ +package com.example.demo.userfilms.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.films.service.FilmService; +import com.example.demo.userfilms.model.UserFilmEntity; +import com.example.demo.userfilms.model.UserFilmGrouped; +import com.example.demo.userfilms.service.UserFilmService; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/user/{user}/userfilm") +public class UserFilmController { + private final UserFilmService userFilmService; + private final UserService userService; + private final FilmService filmService; + private final ModelMapper modelMapper; + + public UserFilmController(UserFilmService userFilmService, UserService userService, FilmService filmService, + ModelMapper modelMapper) { + this.userFilmService = userFilmService; + this.userService = userService; + this.filmService = filmService; + this.modelMapper = modelMapper; + } + + private UserFilmDto toDto(UserFilmEntity userFilmEntity) { + return modelMapper.map(userFilmEntity, UserFilmDto.class); + } + + private UserFilmGroupedDto toGroupedDto(UserFilmGrouped entity) { + return modelMapper.map(entity, UserFilmGroupedDto.class); + } + + private UserFilmEntity toEntity(UserFilmDto dto) { + final UserFilmEntity entity = modelMapper.map(dto, UserFilmEntity.class); + entity.setUser(userService.get(dto.getUserId())); + entity.setFilm(filmService.get(dto.getFilmId())); + return entity; + } + + @GetMapping + public List getAll( + @PathVariable(name = "user") Long userId) { + return userFilmService.getAll().stream() + .map(this::toDto) + .toList(); + } + + @GetMapping("/{film}") + public UserFilmDto get( + @PathVariable(name = "user") Long userId, + @PathVariable(name = "film") Long filmId) { + return toDto(userFilmService.get(userId, filmId)); + } + + @PostMapping("/{film}") + public UserFilmDto create( + @PathVariable(name = "user") Long userId, + @PathVariable(name = "film") Long filmId) { + return toDto( + userFilmService.create(new UserFilmEntity(userService.get(userId), filmService.get(filmId), false))); + } + + @PutMapping("/{id}") + public UserFilmDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid UserFilmDto dto) { + return toDto(userFilmService.update(id, toEntity(dto))); + } + + @PutMapping("/{id}/view") + public UserFilmDto updateViewed( + @PathVariable(name = "id") Long id, + @PathVariable(name = "view") Boolean view) { + return toDto(userFilmService.viewed(id, view)); + } + + @DeleteMapping("/{film}") + public UserFilmDto delete( + @PathVariable(name = "user") Long userId, + @PathVariable(name = "film") Long filmId) { + return toDto(userFilmService.delete(userId, filmId)); + } + + @GetMapping("/total") + public List getMethodName(@PathVariable(name = "user") Long userId) { + return userFilmService.getTotal(userId).stream() + .map(this::toGroupedDto) + .toList(); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/api/UserFilmDto.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/api/UserFilmDto.java new file mode 100644 index 0000000..c90dd1a --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/api/UserFilmDto.java @@ -0,0 +1,50 @@ +package com.example.demo.userfilms.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class UserFilmDto { + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private Long id; + @NotNull + @Min(1) + private Long userId; + @NotNull + @Min(1) + private Long filmId; + private boolean viewed; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getFilmId() { + return filmId; + } + + public void setFilmId(Long filmId) { + this.filmId = filmId; + } + + public Boolean getViewed() { + return viewed; + } + + public void setViewed(Boolean viewed) { + this.viewed = viewed; + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/api/UserFilmGroupedDto.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/api/UserFilmGroupedDto.java new file mode 100644 index 0000000..cc945b3 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/api/UserFilmGroupedDto.java @@ -0,0 +1,22 @@ +package com.example.demo.userfilms.api; + +public class UserFilmGroupedDto { + private Long filmCount; + private String genreName; + + public Long getfilmCount() { + return filmCount; + } + + public void setfilmCount(Long filmCount) { + this.filmCount = filmCount; + } + + public String getGenreName() { + return genreName; + } + + public void setGenreName(String genreName) { + this.genreName = genreName; + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/model/UserFilmEntity.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/model/UserFilmEntity.java new file mode 100644 index 0000000..f1519da --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/model/UserFilmEntity.java @@ -0,0 +1,87 @@ +package com.example.demo.userfilms.model; + +import com.example.demo.users.model.UserEntity; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.films.model.FilmEntity; + +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users_films") +public class UserFilmEntity extends BaseEntity { + private Long id; + @ManyToOne + @JoinColumn(name = "userId", nullable = false) + private UserEntity user; + @ManyToOne + @JoinColumn(name = "filmId", nullable = false) + private FilmEntity film; + private boolean viewed; + + public UserFilmEntity() { + } + + public UserFilmEntity(UserEntity user, FilmEntity film, boolean viewed) { + this.user = user; + this.film = film; + this.viewed = viewed; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + + } + + public FilmEntity getFilm() { + return film; + } + + public void setFilm(FilmEntity film) { + this.film = film; + + } + + public boolean isViewed() { + return viewed; + } + + public void setViewed(boolean viewed) { + this.viewed = viewed; + } + + @Override + public int hashCode() { + return Objects.hash(id, user.getId(), film.getId(), viewed); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserFilmEntity other = (UserFilmEntity) obj; + return Objects.equals(id, other.id) + && Objects.equals(user.getId(), other.user.getId()) + && Objects.equals(film.getId(), other.film.getId()) + && viewed == other.viewed; + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/model/UserFilmGrouped.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/model/UserFilmGrouped.java new file mode 100644 index 0000000..ee1b1d0 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/model/UserFilmGrouped.java @@ -0,0 +1,9 @@ +package com.example.demo.userfilms.model; + +import com.example.demo.genres.model.GenreEntity; + +public interface UserFilmGrouped { + Long getCount(); + + GenreEntity getGenre(); +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/repository/UserFilmRepository.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/repository/UserFilmRepository.java new file mode 100644 index 0000000..29980ce --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/repository/UserFilmRepository.java @@ -0,0 +1,30 @@ +package com.example.demo.userfilms.repository; + +import com.example.demo.userfilms.model.UserFilmEntity; +import com.example.demo.userfilms.model.UserFilmGrouped; + +import org.springframework.data.jpa.repository.Query; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; + +public interface UserFilmRepository extends CrudRepository { + Optional findOneByUserIdAndFilmId(long userId, long filmId); + + List findByUserId(long userId); + + List findByFilmId(long filmId); + + @Query("select " + + "count(*) as count, " + + "g as genre " + + "from FilmEntity f " + + "left join GenreEntity g " + + "on f.genre = g " + + "right join UserFilmEntity uf " + + "on uf.film = f and uf.user.id = ?1 " + + "group by g order by g.name") + List getFilmsTotalByGenre(long userId); +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/service/UserFilmService.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/service/UserFilmService.java new file mode 100644 index 0000000..be91860 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/userfilms/service/UserFilmService.java @@ -0,0 +1,125 @@ +package com.example.demo.userfilms.service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.userfilms.model.UserFilmEntity; +import com.example.demo.userfilms.model.UserFilmGrouped; +import com.example.demo.userfilms.repository.UserFilmRepository; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +@Service +public class UserFilmService { + private final UserFilmRepository userFilmRepository; + private final FilmService filmService; + private final UserService userService; + + public UserFilmService( + UserFilmRepository userFilmRepository, FilmService filmService, UserService userService) { + this.userFilmRepository = userFilmRepository; + this.filmService = filmService; + this.userService = userService; + } + + private void checkUserFilm(UserEntity user, FilmEntity film) { + if (userFilmRepository.findOneByUserIdAndFilmId(user.getId(), film.getId()).isPresent()) { + throw new IllegalArgumentException( + String.format("UserFilm with login is already exists")); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(userFilmRepository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public UserFilmEntity get(Long id) { + return userFilmRepository.findById(id) + .orElseThrow(() -> new NotFoundException(UserFilmEntity.class, id)); + } + + @Transactional(readOnly = true) + public UserFilmEntity get(Long userId, Long filmId) { + return userFilmRepository.findOneByUserIdAndFilmId(userId, filmId) + .orElseThrow(() -> new NotFoundException(UserFilmEntity.class, userId)); + } + + @Transactional + public UserFilmEntity create(UserFilmEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkUserFilm(entity.getUser(), entity.getFilm()); + return userFilmRepository.save(entity); + } + + @Transactional + public UserFilmEntity update(Long id, UserFilmEntity entity) { + final UserFilmEntity existsEntity = get(id); + existsEntity.setUser(entity.getUser()); + existsEntity.setFilm(entity.getFilm()); + existsEntity.setViewed(entity.isViewed()); + userFilmRepository.save(existsEntity); + return existsEntity; + } + + @Transactional + public UserFilmEntity delete(long userId, long filmId) { + final UserFilmEntity existsEntity = userFilmRepository.findOneByUserIdAndFilmId(userId, filmId).get(); + userFilmRepository.delete(existsEntity); + return existsEntity; + } + + @Transactional + public UserFilmEntity delete(long id) { + final UserFilmEntity existsEntity = get(id); + userFilmRepository.delete(existsEntity); + return existsEntity; + } + + @Transactional + public List addAllFilm(UserEntity user) { + List list = new ArrayList(); + filmService.getAll().forEach(film -> { + final UserFilmEntity userFilm = new UserFilmEntity(user, film, true); + userFilm.setUser(user); + userFilm.setFilm(film); + list.add(userFilm); + }); + userFilmRepository.saveAll(list); + return list; + } + + @Transactional + public UserFilmEntity update(long id, UserFilmEntity entity) { + final UserFilmEntity existsEntity = get(id); + existsEntity.setUser(entity.getUser()); + existsEntity.setFilm(entity.getFilm()); + existsEntity.setViewed(entity.isViewed()); + userFilmRepository.save(existsEntity); + return existsEntity; + } + + @Transactional + public UserFilmEntity viewed(long id, Boolean viewed) { + final UserFilmEntity existsEntity = get(id); + existsEntity.setViewed(viewed); + userFilmRepository.save(existsEntity); + return existsEntity; + } + + @Transactional(readOnly = true) + public List getTotal(long userId) { + userService.get(userId); + return userFilmRepository.getFilmsTotalByGenre(userId); + } +} \ No newline at end of file diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/api/UserController.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/api/UserController.java new file mode 100644 index 0000000..2bffe31 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/api/UserController.java @@ -0,0 +1,73 @@ +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.subscribes.service.SubscribeService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/user") +public class UserController { + private final UserService userService; + private final SubscribeService subscribeService; + private final ModelMapper modelMapper; + + public UserController(UserService userService, SubscribeService subscribeService, ModelMapper modelMapper) { + this.userService = userService; + this.subscribeService = subscribeService; + this.modelMapper = modelMapper; + } + + private UserDto toDto(UserEntity entity) { + return modelMapper.map(entity, UserDto.class); + } + + private UserEntity toEntity(UserDto dto) { + final UserEntity entity = modelMapper.map(dto, UserEntity.class); + entity.setSubscribe(subscribeService.get(dto.getSubscribeId())); + return entity; + } + + @GetMapping + public List 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 + public UserDto create(@RequestBody @Valid UserDto dto) { + return toDto(userService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public UserDto update( + @PathVariable(name = "id") Long id, + @RequestBody @Valid UserDto dto) { + return toDto(userService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public UserDto delete(@PathVariable(name = "id") Long id) { + return toDto(userService.delete(id)); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/api/UserDto.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/api/UserDto.java new file mode 100644 index 0000000..9f927f1 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/api/UserDto.java @@ -0,0 +1,66 @@ +package com.example.demo.users.api; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty.Access; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public class UserDto { + @JsonProperty(access = Access.READ_ONLY) + private Long id; + @NotBlank + @Size(min = 3, max = 20) + private String login; + @NotBlank + @Size(min = 3, max = 50) + private String mail; + @NotBlank + @Size(min = 8, max = 30) + private String phone; + @NotNull + @Min(1) + private Long subscribeId; + + 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; + } + + public Long getSubscribeId() { + return subscribeId; + } + + public void setSubscribeId(Long subscribeId) { + this.subscribeId = subscribeId; + } + + public String getMail() { + return mail; + } + + public void setMail(String mail) { + this.mail = mail; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/model/UserEntity.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/model/UserEntity.java new file mode 100644 index 0000000..6bc5957 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/model/UserEntity.java @@ -0,0 +1,87 @@ +package com.example.demo.users.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.subscribes.model.SubscribeEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users") +public class UserEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 20) + private String login; + @ManyToOne + @JoinColumn(name = "subscribeId", nullable = false) + private SubscribeEntity subscribe; + @Column(nullable = false, unique = true, length = 50) + private String mail; + @Column(nullable = false, unique = true, length = 20) + private String phone; + + public UserEntity() { + } + + public UserEntity(String login, SubscribeEntity subscribe, String mail, String phone) { + this.login = login; + this.subscribe = subscribe; + this.mail = mail; + this.phone = phone; + } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public void setSubscribe(SubscribeEntity subscribe) { + this.subscribe = subscribe; + } + + public SubscribeEntity getSubscribe() { + return subscribe; + } + + public String getMail() { + return mail; + } + + public void setMail(String mail) { + this.mail = mail; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + @Override + public int hashCode() { + return Objects.hash(id, login, mail, phone, subscribe); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserEntity other = (UserEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getLogin(), login) + && Objects.equals(other.getMail(), mail) + && Objects.equals(other.getPhone(), phone) + && Objects.equals(other.getSubscribe(), subscribe); + } +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/repository/UserRepository.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/repository/UserRepository.java new file mode 100644 index 0000000..bc03567 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/repository/UserRepository.java @@ -0,0 +1,14 @@ +package com.example.demo.users.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; + +import com.example.demo.users.model.UserEntity; + +public interface UserRepository extends CrudRepository { + Optional findByLoginIgnoreCase(String login); + + List findBySubscribeId(long subscribeId); +} diff --git a/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/service/UserService.java b/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/service/UserService.java new file mode 100644 index 0000000..7ec93b3 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/java/com/example/demo/users/service/UserService.java @@ -0,0 +1,73 @@ +package com.example.demo.users.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.repository.UserRepository; + +@Service +public class UserService { + private final UserRepository userRepository; + + public UserService( + UserRepository userRepository) { + this.userRepository = userRepository; + } + + private void checkLogin(String login) { + if (userRepository.findByLoginIgnoreCase(login).isPresent()) { + throw new IllegalArgumentException( + String.format("User with login %s is already exists", login)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(userRepository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public UserEntity get(long id) { + return userRepository.findById(id) + .orElseThrow(() -> new NotFoundException(UserEntity.class, id)); + } + + @Transactional + public UserEntity create(UserEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkLogin(entity.getLogin()); + userRepository.save(entity); + // filmService.getAll().forEach(film -> { + // final UserFilmEntity userFilm = new UserFilmEntity(entity, film, true); + // userFilm.setUser(entity); + // userFilm.setFilm(film); + // }); + return userRepository.save(entity); + } + + @Transactional + public UserEntity update(long id, UserEntity entity) { + final UserEntity existsEntity = get(id); + checkLogin(entity.getLogin()); + existsEntity.setLogin(entity.getLogin()); + existsEntity.setMail(entity.getMail()); + existsEntity.setPhone(entity.getPhone()); + existsEntity.setSubscribe(entity.getSubscribe()); + userRepository.save(existsEntity); + return existsEntity; + } + + @Transactional + public UserEntity delete(long id) { + final UserEntity existsEntity = get(id); + userRepository.delete(existsEntity); + return existsEntity; + } +} diff --git a/laba3.2/Лекция3-src/src/main/resources/application.properties b/laba3.2/Лекция3-src/src/main/resources/application.properties new file mode 100644 index 0000000..62ab433 --- /dev/null +++ b/laba3.2/Лекция3-src/src/main/resources/application.properties @@ -0,0 +1,20 @@ +# Server +spring.main.banner-mode=off +server.port=8080 + +# Logger settings +# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF +logging.level.com.example.demo=DEBUG + +# JPA Settings +spring.datasource.url=jdbc:h2:file:./data +spring.datasource.username=sa +spring.datasource.password=password +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=false +# spring.jpa.show-sql=true +# spring.jpa.properties.hibernate.format_sql=true + +# H2 console +spring.h2.console.enabled=true \ No newline at end of file diff --git a/laba3.2/Лекция3-src/src/test/java/com/example/demo/FilmServiceTests.java b/laba3.2/Лекция3-src/src/test/java/com/example/demo/FilmServiceTests.java new file mode 100644 index 0000000..8aa4f04 --- /dev/null +++ b/laba3.2/Лекция3-src/src/test/java/com/example/demo/FilmServiceTests.java @@ -0,0 +1,103 @@ +package com.example.demo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; + +@SpringBootTest +public class FilmServiceTests { + @Autowired + private GenreService genreService; + private GenreEntity genre; + @Autowired + private FilmService filmService; + private FilmEntity film; + + @BeforeEach + void createData() { + removeData(); + + genre = genreService.create(new GenreEntity("sub 1")); + genreService.create(new GenreEntity("sub 2")); + genreService.create(new GenreEntity("sub 3")); + + film = filmService.create(new FilmEntity("film 1", genre, 100d, 10)); + filmService.create(new FilmEntity("film 2", genre, 100d, 10)); + filmService.create(new FilmEntity("film 3", genre, 100d, 10)); + } + + @AfterEach + void removeData() { + filmService.getAll().forEach(item -> filmService.delete(item.getId())); + genreService.getAll().forEach(item -> genreService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> filmService.get(0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(3, filmService.getAll().size()); + Assertions.assertEquals(film, filmService.get(film.getId())); + } + + @Test + void createNotUniqueTest() { + final FilmEntity nonUniqueFilm = new FilmEntity("film 1", genre, 100d, 10); + Assertions.assertThrows(IllegalArgumentException.class, () -> filmService.create(nonUniqueFilm)); + } + + @Test + void createNullableTest() { + final FilmEntity nullableFilm = new FilmEntity(null, null, null, null); + Assertions.assertThrows(DataIntegrityViolationException.class, + () -> filmService.create(nullableFilm)); + } + + @Test + void updateTest() { + final String testName = "TEST"; + final GenreEntity testGenre = genreService.getAll().get(1); + final Double testPrice = 543d; + final Integer testDiscount = 99; + final String oldName = film.getName(); + final GenreEntity oldGenre = film.getGenre(); + final Double oldPrice = film.getPrice(); + final Integer oldDiscount = film.getDiscount(); + final FilmEntity newEntity = filmService.update(film.getId(), + new FilmEntity(testName, testGenre, testPrice, testDiscount)); + Assertions.assertEquals(3, filmService.getAll().size()); + Assertions.assertEquals(newEntity, filmService.get(film.getId())); + Assertions.assertEquals(testName, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + Assertions.assertEquals(testGenre, newEntity.getGenre()); + Assertions.assertNotEquals(oldGenre, newEntity.getGenre()); + Assertions.assertEquals(testPrice, newEntity.getPrice()); + Assertions.assertNotEquals(oldPrice, newEntity.getPrice()); + Assertions.assertEquals(testDiscount, newEntity.getDiscount()); + Assertions.assertNotEquals(oldDiscount, newEntity.getDiscount()); + } + + @Test + void deleteTest() { + filmService.delete(film.getId()); + Assertions.assertEquals(2, filmService.getAll().size()); + + final FilmEntity newEntity = filmService + .create(new FilmEntity(film.getName(), film.getGenre(), film.getPrice(), film.getDiscount())); + Assertions.assertEquals(3, filmService.getAll().size()); + Assertions.assertNotEquals(film.getId(), newEntity.getId()); + } +} diff --git a/laba3.2/Лекция3-src/src/test/java/com/example/demo/GServiceTests.java b/laba3.2/Лекция3-src/src/test/java/com/example/demo/GServiceTests.java new file mode 100644 index 0000000..4a43c64 --- /dev/null +++ b/laba3.2/Лекция3-src/src/test/java/com/example/demo/GServiceTests.java @@ -0,0 +1,82 @@ +package com.example.demo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; + +@SpringBootTest +public class GServiceTests { + @Autowired + private GenreService genreService; + + private GenreEntity genre; + + @BeforeEach + void createData() { + removeData(); + + genre = genreService.create(new GenreEntity("sub 1")); + genreService.create(new GenreEntity("sub 2")); + genreService.create(new GenreEntity("sub 3")); + } + + @AfterEach + void removeData() { + genreService.getAll().forEach(item -> genreService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> genreService.get(0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(3, genreService.getAll().size()); + Assertions.assertEquals(genre, genreService.get(genre.getId())); + } + + @Test + void createNotUniqueTest() { + final GenreEntity nonUniqueGenre = new GenreEntity("sub 1"); + Assertions.assertThrows(IllegalArgumentException.class, () -> genreService.create(nonUniqueGenre)); + } + + @Test + void createNullableTest() { + final GenreEntity nullableGenre = new GenreEntity(null); + Assertions.assertThrows(DataIntegrityViolationException.class, + () -> genreService.create(nullableGenre)); + } + + @Test + void updateTest() { + final String testName = "TEST"; + final String oldName = genre.getName(); + final GenreEntity newEntity = genreService.update(genre.getId(), + new GenreEntity(testName)); + Assertions.assertEquals(3, genreService.getAll().size()); + Assertions.assertEquals(newEntity, genreService.get(genre.getId())); + Assertions.assertEquals(testName, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + void deleteTest() { + genreService.delete(genre.getId()); + Assertions.assertEquals(2, genreService.getAll().size()); + + final GenreEntity newEntity = genreService + .create(new GenreEntity(genre.getName())); + Assertions.assertEquals(3, genreService.getAll().size()); + Assertions.assertNotEquals(genre.getId(), newEntity.getId()); + } +} diff --git a/laba3.2/Лекция3-src/src/test/java/com/example/demo/SubscribeServiceTests.java b/laba3.2/Лекция3-src/src/test/java/com/example/demo/SubscribeServiceTests.java new file mode 100644 index 0000000..2836efd --- /dev/null +++ b/laba3.2/Лекция3-src/src/test/java/com/example/demo/SubscribeServiceTests.java @@ -0,0 +1,86 @@ +package com.example.demo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.service.SubscribeService; + +@SpringBootTest +class SubscribeServiceTests { + @Autowired + private SubscribeService subscribeService; + + private SubscribeEntity subscribe; + + @BeforeEach + void createData() { + removeData(); + + subscribe = subscribeService.create(new SubscribeEntity("sub 1", 100d)); + subscribeService.create(new SubscribeEntity("sub 2", 100d)); + subscribeService.create(new SubscribeEntity("sub 3", 100d)); + } + + @AfterEach + void removeData() { + subscribeService.getAll().forEach(item -> subscribeService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> subscribeService.get(0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(3, subscribeService.getAll().size()); + Assertions.assertEquals(subscribe, subscribeService.get(subscribe.getId())); + } + + @Test + void createNotUniqueTest() { + final SubscribeEntity nonUniqueSubscribe = new SubscribeEntity("sub 1", 100d); + Assertions.assertThrows(IllegalArgumentException.class, () -> subscribeService.create(nonUniqueSubscribe)); + } + + @Test + void createNullableTest() { + final SubscribeEntity nullableSubscribe = new SubscribeEntity(null, null); + Assertions.assertThrows(DataIntegrityViolationException.class, + () -> subscribeService.create(nullableSubscribe)); + } + + @Test + void updateTest() { + final String testName = "TEST"; + final Double testPrice = 765d; + final String oldName = subscribe.getName(); + final Double oldPrice = subscribe.getPrice(); + final SubscribeEntity newEntity = subscribeService.update(subscribe.getId(), + new SubscribeEntity(testName, testPrice)); + Assertions.assertEquals(3, subscribeService.getAll().size()); + Assertions.assertEquals(newEntity, subscribeService.get(subscribe.getId())); + Assertions.assertEquals(testName, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + Assertions.assertEquals(testPrice, newEntity.getPrice()); + Assertions.assertNotEquals(oldPrice, newEntity.getPrice()); + } + + @Test + void deleteTest() { + subscribeService.delete(subscribe.getId()); + Assertions.assertEquals(2, subscribeService.getAll().size()); + + final SubscribeEntity newEntity = subscribeService + .create(new SubscribeEntity(subscribe.getName(), subscribe.getPrice())); + Assertions.assertEquals(3, subscribeService.getAll().size()); + Assertions.assertNotEquals(subscribe.getId(), newEntity.getId()); + } +} diff --git a/laba3.2/Лекция3-src/src/test/java/com/example/demo/UserFilmServiceTests.java b/laba3.2/Лекция3-src/src/test/java/com/example/demo/UserFilmServiceTests.java new file mode 100644 index 0000000..b2ec1ad --- /dev/null +++ b/laba3.2/Лекция3-src/src/test/java/com/example/demo/UserFilmServiceTests.java @@ -0,0 +1,141 @@ +package com.example.demo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import com.example.demo.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; +import com.example.demo.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.service.SubscribeService; +import com.example.demo.userfilms.model.UserFilmEntity; +import com.example.demo.userfilms.service.UserFilmService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +@SpringBootTest +public class UserFilmServiceTests { + @Autowired + private GenreService genreService; + private GenreEntity genre; + @Autowired + private FilmService filmService; + private FilmEntity film; + private FilmEntity film2; + @Autowired + private SubscribeService subscribeService; + private SubscribeEntity subscribe; + @Autowired + private UserService userService; + private UserEntity user; + private UserEntity user2; + + @Autowired + private UserFilmService userFilmService; + private UserFilmEntity userFilm; + + @BeforeEach + void createData() { + removeData(); + + genre = genreService.create(new GenreEntity("genre 1")); + genreService.create(new GenreEntity("genre 2")); + genreService.create(new GenreEntity("genre 3")); + + film = filmService.create(new FilmEntity("film 1", genre, 100d, 10)); + film2 = filmService.create(new FilmEntity("film 2", genre, + 100d, 10)); + filmService.create(new FilmEntity("film 3", genre, + 100d, 10)); + + subscribe = subscribeService.create(new SubscribeEntity("sub 1", 100d)); + subscribeService.create(new SubscribeEntity("sub 2", 100d)); + subscribeService.create(new SubscribeEntity("sub 3", 100d)); + + user = userService.create(new UserEntity("login 1", subscribe, "mail1", + "phone1")); + user2 = userService.create(new UserEntity("login 2", subscribe, "mail2", + "phone2")); + userService.create(new UserEntity("login 3", subscribe, "mail3", "phone3")); + + userFilm = userFilmService.create(new UserFilmEntity(user, film, false)); + userFilmService.create(new UserFilmEntity(user2, film, true)); + } + + @AfterEach + void removeData() { + userFilmService.getAll().forEach(item -> userFilmService.delete(item.getId())); + userService.getAll().forEach(item -> userService.delete(item.getId())); + subscribeService.getAll().forEach(item -> subscribeService.delete(item.getId())); + filmService.getAll().forEach(item -> filmService.delete(item.getId())); + genreService.getAll().forEach(item -> genreService.delete(item.getId())); + } + + @Test + void getTest() { + + } + + @Test + void createTest() { + Assertions.assertEquals(2, userFilmService.getAll().size()); + Assertions.assertEquals(userFilm, userFilmService.get(userFilm.getId())); + } + + @Test + void createNotUniqueTest() { + final UserFilmEntity nonUniqueUser = new UserFilmEntity(user, film, false); + Assertions.assertThrows(IllegalArgumentException.class, () -> userFilmService.create(nonUniqueUser)); + } + + @Test + void createNullableTest() { + final UserFilmEntity nullableUserFilm = new UserFilmEntity(null, null, true); + Assertions.assertThrows( + NullPointerException.class, + () -> userFilmService.create(nullableUserFilm)); + } + + @Test + void updateTest() { + final UserEntity testUser = user2; + final FilmEntity testFilm = film2; + final Boolean testView = true; + final UserEntity oldUser = userFilm.getUser(); + final FilmEntity oldFilm = userFilm.getFilm(); + final Boolean oldView = userFilm.isViewed(); + final UserFilmEntity newEntity = userFilmService.update(userFilm.getId(), + new UserFilmEntity(testUser, testFilm, testView)); + + Assertions.assertEquals(2, userFilmService.getAll().size()); + Assertions.assertEquals(newEntity, userFilmService.get(userFilm.getId())); + Assertions.assertEquals(testUser, newEntity.getUser()); + Assertions.assertNotEquals(oldUser, newEntity.getUser()); + Assertions.assertEquals(testFilm, newEntity.getFilm()); + Assertions.assertNotEquals(oldFilm, newEntity.getFilm()); + Assertions.assertEquals(testView, newEntity.isViewed()); + Assertions.assertNotEquals(oldView, newEntity.isViewed()); + } + + @Test + void deleteTest() { + userFilmService.delete(userFilm.getId()); + Assertions.assertEquals(1, userFilmService.getAll().size()); + + final UserFilmEntity newEntity = userFilmService + .create(new UserFilmEntity(userFilm.getUser(), userFilm.getFilm(), userFilm.isViewed())); + Assertions.assertEquals(2, userFilmService.getAll().size()); + Assertions.assertNotEquals(userFilm.getId(), newEntity.getId()); + } + + @Test + void QueryTest() { + Assertions.assertEquals(2, userFilmService.getTotal(user.getId()).size()); + Assertions.assertEquals(genre, userFilmService.getTotal(user.getId()).get(1).getGenre()); + Assertions.assertEquals(1, userFilmService.getTotal(user.getId()).get(1).getCount()); + } +} diff --git a/laba3.2/Лекция3-src/src/test/java/com/example/demo/UserServiceTests.java b/laba3.2/Лекция3-src/src/test/java/com/example/demo/UserServiceTests.java new file mode 100644 index 0000000..43237fd --- /dev/null +++ b/laba3.2/Лекция3-src/src/test/java/com/example/demo/UserServiceTests.java @@ -0,0 +1,142 @@ +package com.example.demo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.demo.films.model.FilmEntity; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; +import com.example.demo.subscribes.model.SubscribeEntity; +import com.example.demo.subscribes.service.SubscribeService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +import jakarta.persistence.EntityManager; + +@SpringBootTest +public class UserServiceTests { + @Autowired + private EntityManager entityManager; + @Autowired + private GenreService genreService; + private GenreEntity genre; + @Autowired + private FilmService filmService; + @Autowired + private SubscribeService subscribeService; + private SubscribeEntity subscribe; + private SubscribeEntity subscribe2; + @Autowired + private UserService userService; + private UserEntity user; + private UserEntity user2; + + @BeforeEach + void createData() { + removeData(); + + genre = genreService.create(new GenreEntity("genre 1")); + genreService.create(new GenreEntity("genre 2")); + genreService.create(new GenreEntity("genre 3")); + + filmService.create(new FilmEntity("film 1", genre, 100d, 10)); + filmService.create(new FilmEntity("film 2", genre, + 100d, 10)); + filmService.create(new FilmEntity("film 3", genre, + 100d, 10)); + + subscribe = subscribeService.create(new SubscribeEntity("sub 1", 100d)); + subscribe2 = subscribeService.create(new SubscribeEntity("sub 2", 100d)); + subscribeService.create(new SubscribeEntity("sub 3", 100d)); + + user = userService.create(new UserEntity("login 1", subscribe, "mail1", + "phone1")); + user2 = userService.create(new UserEntity("login 2", subscribe, "mail2", + "phone2")); + userService.create(new UserEntity("login 3", subscribe, "mail3", "phone3")); + } + + @AfterEach + void removeData() { + userService.getAll().forEach(item -> userService.delete(item.getId())); + subscribeService.getAll().forEach(item -> subscribeService.delete(item.getId())); + filmService.getAll().forEach(item -> filmService.delete(item.getId())); + genreService.getAll().forEach(item -> genreService.delete(item.getId())); + } + + @Test + void getTest() { + + } + + @Test + void createTest() { + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(user, userService.get(user.getId())); + } + + @Test + void createNotUniqueTest() { + final UserEntity nonUniqueUser = new UserEntity("login 1", subscribe, + "mail1", "phone1"); + Assertions.assertThrows(IllegalArgumentException.class, () -> userService.create(nonUniqueUser)); + } + + @Test + void createNullableTest() { + final UserEntity nullableUser = new UserEntity(null, null, null, null); + Assertions.assertThrows(DataIntegrityViolationException.class, + () -> userService.create(nullableUser)); + } + + @Test + void updateTest() { + final String testLogin = "TEST"; + final SubscribeEntity testSubscribe = subscribe2; + final String testMail = "TEST"; + final String testPhone = "TEST"; + final String oldLogin = user.getLogin(); + final SubscribeEntity oldSubscribe = user.getSubscribe(); + final String oldMail = user.getMail(); + final String oldPhone = user.getPhone(); + final UserEntity newEntity = userService.update(user.getId(), + new UserEntity(testLogin, testSubscribe, testMail, testPhone)); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(newEntity, userService.get(user.getId())); + Assertions.assertEquals(testLogin, newEntity.getLogin()); + Assertions.assertNotEquals(oldLogin, newEntity.getLogin()); + Assertions.assertEquals(testSubscribe, newEntity.getSubscribe()); + Assertions.assertNotEquals(oldSubscribe, newEntity.getSubscribe()); + Assertions.assertEquals(testMail, newEntity.getMail()); + Assertions.assertNotEquals(oldMail, newEntity.getMail()); + Assertions.assertEquals(testPhone, newEntity.getPhone()); + Assertions.assertNotEquals(oldPhone, newEntity.getPhone()); + } + + @Test + void deleteTest() { + userService.delete(user.getId()); + Assertions.assertEquals(2, userService.getAll().size()); + + final UserEntity newEntity = userService + .create(new UserEntity(user.getLogin(), user.getSubscribe(), user.getMail(), + user.getPhone())); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertNotEquals(user.getId(), newEntity.getId()); + } + + @Test + void userCascadeDeleteTest() { + userService.delete(user2.getId()); + final var films = entityManager.createQuery( + "select count(us) from UserFilmEntity us where us.user.id = :userId"); + films.setParameter("userId", user2.getId()); + Assertions.assertEquals(0, films.getFirstResult()); + } +} diff --git a/laba3.2/Лекция3-src/src/test/resources/application.properties b/laba3.2/Лекция3-src/src/test/resources/application.properties new file mode 100644 index 0000000..d5f355c --- /dev/null +++ b/laba3.2/Лекция3-src/src/test/resources/application.properties @@ -0,0 +1,14 @@ +# Server +spring.main.banner-mode=off + +# Logger settings +# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF +logging.level.com.example.demo=DEBUG + +# JPA Settings +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.username=sa +spring.datasource.password=password +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=false \ No newline at end of file diff --git a/laba4/.gitignore b/laba4/.gitignore new file mode 100644 index 0000000..546ecee --- /dev/null +++ b/laba4/.gitignore @@ -0,0 +1,36 @@ +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/ + +data.*.db \ No newline at end of file diff --git a/laba4/.vscode/extensions.json b/laba4/.vscode/extensions.json new file mode 100644 index 0000000..42cf79d --- /dev/null +++ b/laba4/.vscode/extensions.json @@ -0,0 +1,12 @@ +{ + "recommendations": [ + // fronted + "AndersEAndersen.html-class-suggestions", + "dbaeumer.vscode-eslint", + // backend + "vscjava.vscode-java-pack", + "vmware.vscode-boot-dev-pack", + "vscjava.vscode-gradle", + "redhat.vscode-xml" + ] +} \ No newline at end of file diff --git a/laba4/.vscode/launch.json b/laba4/.vscode/launch.json new file mode 100644 index 0000000..27aa918 --- /dev/null +++ b/laba4/.vscode/launch.json @@ -0,0 +1,14 @@ +{ + "configurations": [ + { + "type": "java", + "name": "Demo", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "lec5", + "args": "--populate", + "envFile": "${workspaceFolder}/.env" + } + ] +} \ No newline at end of file diff --git a/laba4/.vscode/settings.json b/laba4/.vscode/settings.json new file mode 100644 index 0000000..95915c9 --- /dev/null +++ b/laba4/.vscode/settings.json @@ -0,0 +1,24 @@ +{ + "editor.tabSize": 4, + "editor.detectIndentation": false, + "editor.insertSpaces": true, + "editor.formatOnPaste": true, + "editor.formatOnSave": true, + "editor.formatOnType": false, + "java.compile.nullAnalysis.mode": "disabled", + "java.configuration.updateBuildConfiguration": "automatic", + "[java]": { + "editor.pasteAs.enabled": false, + }, + "gradle.nestedProjects": true, + "java.saveActions.organizeImports": true, + "java.dependency.packagePresentation": "hierarchical", + "spring-boot.ls.problem.boot2.JAVA_CONSTRUCTOR_PARAMETER_INJECTION": "WARNING", + "spring.initializr.defaultLanguage": "Java", + "java.format.settings.url": ".vscode/eclipse-formatter.xml", + "java.project.explorer.showNonJavaResources": true, + "java.codeGeneration.hashCodeEquals.useJava7Objects": true, + "cSpell.words": [ + "classappend" + ], +} \ No newline at end of file diff --git a/laba4/build.gradle b/laba4/build.gradle new file mode 100644 index 0000000..cf1172b --- /dev/null +++ b/laba4/build.gradle @@ -0,0 +1,48 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.4' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +defaultTasks 'bootRun' + +jar { + enabled = false +} + +bootJar { + archiveFileName = String.format('%s-%s.jar', rootProject.name, version) +} + +assert System.properties['java.specification.version'] == '17' || '21' +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.modelmapper:modelmapper:3.2.0' + + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'com.h2database:h2:2.2.224' + + implementation 'org.springframework.boot:spring-boot-devtools' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0' + runtimeOnly 'org.webjars.npm:bootstrap:5.3.3' + runtimeOnly 'org.webjars.npm:bootstrap-icons:1.11.3' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/laba4/gradle/wrapper/gradle-wrapper.jar b/laba4/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/laba4/gradle/wrapper/gradle-wrapper.jar differ diff --git a/laba4/gradle/wrapper/gradle-wrapper.properties b/laba4/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/laba4/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/laba4/gradlew b/laba4/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/laba4/gradlew @@ -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" "$@" diff --git a/laba4/gradlew.bat b/laba4/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/laba4/gradlew.bat @@ -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 diff --git a/laba4/readme.md b/laba4/readme.md new file mode 100644 index 0000000..ac4a1d0 --- /dev/null +++ b/laba4/readme.md @@ -0,0 +1,15 @@ +H2 Console: \ +http://localhost:8080/h2-console + +JDBC URL: jdbc:h2:file:./data \ +User Name: sa \ +Password: password + +Почитать: + +- Spring Boot CRUD Application with Thymeleaf https://www.baeldung.com/spring-boot-crud-thymeleaf +- Thymeleaf Layout Dialect https://ultraq.github.io/thymeleaf-layout-dialect/ +- Tutorial: Using Thymeleaf https://www.thymeleaf.org/doc/tutorials/3.1/usingthymeleaf.html#introducing-thymeleaf +- Working with Cookies in Spring MVC using @CookieValue Annotation https://www.geeksforgeeks.org/working-with-cookies-in-spring-mvc-using-cookievalue-annotation/ +- Session Attributes in Spring MVC https://www.baeldung.com/spring-mvc-session-attributes +- LazyInitializationException – What it is and the best way to fix it https://thorben-janssen.com/lazyinitializationexception/ diff --git a/laba4/settings.gradle b/laba4/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/laba4/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/laba4/src/main/java/com/example/demo/DemoApplication.java b/laba4/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..e54d422 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,78 @@ +package com.example.demo; + +import java.util.List; +import java.util.Objects; +import java.util.stream.IntStream; + +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.orders.model.OrderEntity; +import com.example.demo.orders.service.OrderService; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; +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 SubscriptionService subscriptionService; + private final UserService userService; + private final OrderService orderService; + + public DemoApplication( + TypeService typeService, + SubscriptionService subscriptionService, + UserService userService, + OrderService orderService) { + this.typeService = typeService; + this.subscriptionService = subscriptionService; + this.userService = userService; + this.orderService = orderService; + } + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + + @Override + public void run(String... args) throws Exception { + if (args.length > 0 && Objects.equals("--populate", args[0])) { + log.info("Create default type values"); + final var type1 = typeService.create(new TypeEntity("Ноутбук")); + final var type2 = typeService.create(new TypeEntity("Телефон")); + final var type3 = typeService.create(new TypeEntity("Игровая приставка")); + + log.info("Create default subscription values"); + subscriptionService.create(new SubscriptionEntity("Подписка 1")); + subscriptionService.create(new SubscriptionEntity("Подписка 2")); + subscriptionService.create(new SubscriptionEntity("Подписка 3")); + + log.info("Create default user values"); + final var user1 = userService.create(new UserEntity("user1")); + + IntStream.range(2, 27) + .forEach(value -> userService.create( + new UserEntity("user".concat(String.valueOf(value))))); + + log.info("Create default order values"); + final var orders = List.of( + new OrderEntity(type1, 49999.00, 20), + new OrderEntity(type1, 129999.00, 3), + new OrderEntity(type2, 15450.50, 30), + new OrderEntity(type2, 69900.50, 10), + new OrderEntity(type2, 150000.00, 6), + new OrderEntity(type3, 75000.00, 6), + new OrderEntity(type3, 67800.00, 3)); + orders.forEach(order -> orderService.create(user1.getId(), order)); + } + } +} diff --git a/laba4/src/main/java/com/example/demo/core/api/GlobalController.java b/laba4/src/main/java/com/example/demo/core/api/GlobalController.java new file mode 100644 index 0000000..5e7a996 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/core/api/GlobalController.java @@ -0,0 +1,43 @@ +package com.example.demo.core.api; + +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.ModelAttribute; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.core.session.SessionCart; +import com.example.demo.users.service.UserService; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + +@ControllerAdvice +public class GlobalController { + private final UserService userService; + private final SessionCart cart; + + public GlobalController( + UserService userService, + SessionCart cart) { + this.userService = userService; + this.cart = cart; + } + + @ModelAttribute("servletPath") + String getRequestServletPath(HttpServletRequest request) { + return request.getServletPath(); + } + + @ModelAttribute("totalCart") + double getTotalCart(HttpSession session) { + return cart.getSum(); + } + + @ModelAttribute("userName") + String getUserName(@CookieValue(value = Constants.USER_COOKIE, defaultValue = "0") long userId) { + if (userId <= 0) { + return ""; + } + return userService.get(userId).getLogin(); + } +} diff --git a/laba4/src/main/java/com/example/demo/core/api/PageAttributesMapper.java b/laba4/src/main/java/com/example/demo/core/api/PageAttributesMapper.java new file mode 100644 index 0000000..74ee38d --- /dev/null +++ b/laba4/src/main/java/com/example/demo/core/api/PageAttributesMapper.java @@ -0,0 +1,18 @@ +package com.example.demo.core.api; + +import java.util.Map; +import java.util.function.Function; + +import org.springframework.data.domain.Page; + +public class PageAttributesMapper { + private PageAttributesMapper() { + } + + public static Map toAttributes(Page page, Function mapper) { + return Map.of( + "items", page.getContent().stream().map(mapper::apply).toList(), + "currentPage", page.getNumber(), + "totalPages", page.getTotalPages()); + } +} diff --git a/laba4/src/main/java/com/example/demo/core/configuration/Constants.java b/laba4/src/main/java/com/example/demo/core/configuration/Constants.java new file mode 100644 index 0000000..f4e00a8 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/core/configuration/Constants.java @@ -0,0 +1,16 @@ +package com.example.demo.core.configuration; + +public class Constants { + public static final String SEQUENCE_NAME = "hibernate_sequence"; + + public static final int DEFUALT_PAGE_SIZE = 5; + + public static final String REDIRECT_VIEW = "redirect:"; + + public static final String ADMIN_PREFIX = "/admin"; + + public static final String USER_COOKIE = "userIdCookie"; + + private Constants() { + } +} diff --git a/laba4/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/laba4/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java new file mode 100644 index 0000000..44defae --- /dev/null +++ b/laba4/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java @@ -0,0 +1,23 @@ +package com.example.demo.core.configuration; + +import org.modelmapper.ModelMapper; +import org.modelmapper.PropertyMap; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.example.demo.core.model.BaseEntity; + +@Configuration +public class MapperConfiguration { + @Bean + ModelMapper modelMapper() { + final ModelMapper mapper = new ModelMapper(); + mapper.addMappings(new PropertyMap() { + @Override + protected void configure() { + skip(destination.getId()); + } + }); + return mapper; + } +} diff --git a/laba4/src/main/java/com/example/demo/core/error/AdviceController.java b/laba4/src/main/java/com/example/demo/core/error/AdviceController.java new file mode 100644 index 0000000..65f0c3e --- /dev/null +++ b/laba4/src/main/java/com/example/demo/core/error/AdviceController.java @@ -0,0 +1,53 @@ +package com.example.demo.core.error; + +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.servlet.ModelAndView; + +import jakarta.servlet.http.HttpServletRequest; + +@ControllerAdvice +public class AdviceController { + private final Logger log = LoggerFactory.getLogger(AdviceController.class); + + private static Throwable getRootCause(Throwable throwable) { + Throwable rootCause = throwable; + while (rootCause.getCause() != null && rootCause.getCause() != rootCause) { + rootCause = rootCause.getCause(); + } + return rootCause; + } + + private static Map getAttributes(HttpServletRequest request, Throwable throwable) { + final Throwable rootCause = getRootCause(throwable); + final StackTraceElement firstError = rootCause.getStackTrace()[0]; + return Map.of( + "message", rootCause.getMessage(), + "url", request.getRequestURL(), + "exception", rootCause.getClass().getName(), + "file", firstError.getFileName(), + "method", firstError.getMethodName(), + "line", firstError.getLineNumber()); + } + + @ExceptionHandler(value = Exception.class) + public ModelAndView defaultErrorHandler(HttpServletRequest request, Throwable throwable) throws Throwable { + if (AnnotationUtils.findAnnotation(throwable.getClass(), + ResponseStatus.class) != null) { + throw throwable; + } + + log.error("{}", throwable.getMessage()); + throwable.printStackTrace(); + final ModelAndView model = new ModelAndView(); + model.addAllObjects(getAttributes(request, throwable)); + model.setViewName("error"); + return model; + } +} diff --git a/laba4/src/main/java/com/example/demo/core/error/NotFoundException.java b/laba4/src/main/java/com/example/demo/core/error/NotFoundException.java new file mode 100644 index 0000000..a61d118 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/core/error/NotFoundException.java @@ -0,0 +1,7 @@ +package com.example.demo.core.error; + +public class NotFoundException extends RuntimeException { + public NotFoundException(Class clazz, Long id) { + super(String.format("%s with id [%s] is not found or not exists", clazz.getSimpleName(), id)); + } +} diff --git a/laba4/src/main/java/com/example/demo/core/model/BaseEntity.java b/laba4/src/main/java/com/example/demo/core/model/BaseEntity.java new file mode 100644 index 0000000..eba74ad --- /dev/null +++ b/laba4/src/main/java/com/example/demo/core/model/BaseEntity.java @@ -0,0 +1,28 @@ +package com.example.demo.core.model; + +import com.example.demo.core.configuration.Constants; + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.SequenceGenerator; + +@MappedSuperclass +public abstract class BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = Constants.SEQUENCE_NAME) + @SequenceGenerator(name = Constants.SEQUENCE_NAME, sequenceName = Constants.SEQUENCE_NAME, allocationSize = 1) + protected Long id; + + protected BaseEntity() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/laba4/src/main/java/com/example/demo/core/session/SessionCart.java b/laba4/src/main/java/com/example/demo/core/session/SessionCart.java new file mode 100644 index 0000000..09f7d23 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/core/session/SessionCart.java @@ -0,0 +1,14 @@ +package com.example.demo.core.session; + +import java.util.HashMap; + +import com.example.demo.users.api.UserCartDto; + +public class SessionCart extends HashMap { + public double getSum() { + return this.values().stream() + .map(item -> item.getCount() * item.getPrice()) + .mapToDouble(Double::doubleValue) + .sum(); + } +} diff --git a/laba4/src/main/java/com/example/demo/core/session/SessionHelper.java b/laba4/src/main/java/com/example/demo/core/session/SessionHelper.java new file mode 100644 index 0000000..6ee3d8c --- /dev/null +++ b/laba4/src/main/java/com/example/demo/core/session/SessionHelper.java @@ -0,0 +1,16 @@ +package com.example.demo.core.session; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; +import org.springframework.context.annotation.ScopedProxyMode; +import org.springframework.web.context.WebApplicationContext; + +@Configuration +public class SessionHelper { + @Bean + @Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS) + SessionCart todos() { + return new SessionCart(); + } +} diff --git a/laba4/src/main/java/com/example/demo/films/model/FilmEntity.java b/laba4/src/main/java/com/example/demo/films/model/FilmEntity.java new file mode 100644 index 0000000..825030a --- /dev/null +++ b/laba4/src/main/java/com/example/demo/films/model/FilmEntity.java @@ -0,0 +1,63 @@ +package com.example.demo.films.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.types.model.TypeEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "films") +public class FilmEntity extends BaseEntity { + @ManyToOne + @JoinColumn(name = "typeId", nullable = false) + private TypeEntity type; + @Column(nullable = false) + private Double price; + + public FilmEntity() { + } + + public FilmEntity(TypeEntity type, Double price) { + this.type = type; + this.price = price; + } + + public TypeEntity getType() { + return type; + } + + public void setType(TypeEntity type) { + this.type = type; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + @Override + public int hashCode() { + return Objects.hash(id, type, price); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final FilmEntity other = (FilmEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getType(), type) + && Objects.equals(other.getPrice(), price); + } +} diff --git a/laba4/src/main/java/com/example/demo/orders/api/OrderDto.java b/laba4/src/main/java/com/example/demo/orders/api/OrderDto.java new file mode 100644 index 0000000..8ba4b7c --- /dev/null +++ b/laba4/src/main/java/com/example/demo/orders/api/OrderDto.java @@ -0,0 +1,53 @@ +package com.example.demo.orders.api; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class OrderDto { + private Long id; + @NotNull + @Min(1) + private String typeName; + @NotNull + @Min(1) + private Double price; + @NotNull + @Min(1) + private Integer count; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public Double getSum() { + return price * count; + } +} diff --git a/laba4/src/main/java/com/example/demo/orders/api/OrderGroupedDto.java b/laba4/src/main/java/com/example/demo/orders/api/OrderGroupedDto.java new file mode 100644 index 0000000..ddb116e --- /dev/null +++ b/laba4/src/main/java/com/example/demo/orders/api/OrderGroupedDto.java @@ -0,0 +1,31 @@ +package com.example.demo.orders.api; + +public class OrderGroupedDto { + private String typeName; + private Long totalPrice; + private Integer totalCount; + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public Long getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(Long totalPrice) { + this.totalPrice = totalPrice; + } + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } +} diff --git a/laba4/src/main/java/com/example/demo/orders/model/OrderEntity.java b/laba4/src/main/java/com/example/demo/orders/model/OrderEntity.java new file mode 100644 index 0000000..d4e6b90 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/orders/model/OrderEntity.java @@ -0,0 +1,91 @@ +package com.example.demo.orders.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.users.model.UserEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "orders") +public class OrderEntity extends BaseEntity { + @ManyToOne + @JoinColumn(name = "typeId", nullable = false) + private TypeEntity type; + @ManyToOne + @JoinColumn(name = "userId", nullable = false) + private UserEntity user; + @Column(nullable = false) + private Double price; + @Column(nullable = false) + private Integer count; + + public OrderEntity() { + } + + public OrderEntity(TypeEntity type, Double price, Integer count) { + this.type = type; + this.price = price; + this.count = count; + } + + public TypeEntity getType() { + return type; + } + + public void setType(TypeEntity type) { + this.type = type; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + if (!user.getOrders().contains(this)) { + user.getOrders().add(this); + } + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + @Override + public int hashCode() { + return Objects.hash(id, type, user.getId(), price, count); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final OrderEntity other = (OrderEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getType(), type) + && Objects.equals(other.getUser().getId(), user.getId()) + && Objects.equals(other.getPrice(), price) + && Objects.equals(other.getCount(), count); + } +} diff --git a/laba4/src/main/java/com/example/demo/orders/model/OrderGrouped.java b/laba4/src/main/java/com/example/demo/orders/model/OrderGrouped.java new file mode 100644 index 0000000..4d55f18 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/orders/model/OrderGrouped.java @@ -0,0 +1,11 @@ +package com.example.demo.orders.model; + +import com.example.demo.types.model.TypeEntity; + +public interface OrderGrouped { + TypeEntity getType(); + + double getTotalPrice(); + + int getTotalCount(); +} diff --git a/laba4/src/main/java/com/example/demo/orders/repository/OrderRepository.java b/laba4/src/main/java/com/example/demo/orders/repository/OrderRepository.java new file mode 100644 index 0000000..3ef17fa --- /dev/null +++ b/laba4/src/main/java/com/example/demo/orders/repository/OrderRepository.java @@ -0,0 +1,42 @@ +package com.example.demo.orders.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.model.OrderGrouped; + +public interface OrderRepository + extends CrudRepository, PagingAndSortingRepository { + + Optional findOneByUserIdAndId(long userId, long id); + + List findByUserId(long userId); + + Page findByUserId(long userId, Pageable pageable); + + List findByUserIdAndTypeId(long userId, long typeId); + + Page findByUserIdAndTypeId(long userId, long typeId, Pageable pageable); + + // select + // tpe.name, + // coalesce(sum(order.price), 0), + // coalesce(sum(order.count), 0) + // from types as tpe + // left join orders as order on tpe.id = order.type_id and order.user_id = ? + // group by tpe.name order by tpe.id + @Query("select " + + "t as type, " + + "coalesce(sum(o.price), 0) as totalPrice, " + + "coalesce(sum(o.count), 0) as totalCount " + + "from TypeEntity t left join OrderEntity o on o.type = t and o.user.id = ?1 " + + "group by t order by t.id") + List getOrdersTotalByType(long userId); +} diff --git a/laba4/src/main/java/com/example/demo/orders/service/OrderService.java b/laba4/src/main/java/com/example/demo/orders/service/OrderService.java new file mode 100644 index 0000000..69cb502 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/orders/service/OrderService.java @@ -0,0 +1,101 @@ +package com.example.demo.orders.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.model.OrderGrouped; +import com.example.demo.orders.repository.OrderRepository; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +@Service +public class OrderService { + private final OrderRepository repository; + private final UserService userService; + + public OrderService(OrderRepository repository, UserService userService) { + this.repository = repository; + this.userService = userService; + } + + @Transactional(readOnly = true) + public List getAll(long userId, long typeId) { + userService.get(userId); + if (typeId <= 0L) { + return repository.findByUserId(userId); + } else { + return repository.findByUserIdAndTypeId(userId, typeId); + } + } + + @Transactional(readOnly = true) + public Page getAll(long userId, long typeId, int page, int size) { + final Pageable pageable = PageRequest.of(page, size, Sort.by("id")); + userService.get(userId); + if (typeId <= 0L) { + return repository.findByUserId(userId, pageable); + } else { + return repository.findByUserIdAndTypeId(userId, typeId, pageable); + } + } + + @Transactional(readOnly = true) + public OrderEntity get(long userId, long id) { + userService.get(userId); + return repository.findOneByUserIdAndId(userId, id) + .orElseThrow(() -> new NotFoundException(OrderEntity.class, id)); + } + + @Transactional + public OrderEntity create(long userId, OrderEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + final UserEntity existsUser = userService.get(userId); + entity.setUser(existsUser); + return repository.save(entity); + } + + @Transactional + public List createAll(long userId, List entities) { + if (entities == null || entities.isEmpty()) { + throw new IllegalArgumentException("Orders list is null or empty"); + } + final UserEntity existsUser = userService.get(userId); + entities.forEach(entity -> entity.setUser(existsUser)); + return StreamSupport.stream(repository.saveAll(entities).spliterator(), false).toList(); + } + + @Transactional + public OrderEntity update(long userId, long id, OrderEntity entity) { + userService.get(userId); + final OrderEntity existsEntity = get(userId, id); + existsEntity.setType(entity.getType()); + existsEntity.setPrice(entity.getPrice()); + existsEntity.setCount(entity.getCount()); + return repository.save(existsEntity); + } + + @Transactional + public OrderEntity delete(long userId, long id) { + userService.get(userId); + final OrderEntity existsEntity = get(userId, id); + repository.delete(existsEntity); + return existsEntity; + } + + @Transactional(readOnly = true) + public List getTotal(long userId) { + userService.get(userId); + return repository.getOrdersTotalByType(userId); + } +} diff --git a/laba4/src/main/java/com/example/demo/subscriptions/api/SubscriptionController.java b/laba4/src/main/java/com/example/demo/subscriptions/api/SubscriptionController.java new file mode 100644 index 0000000..1ddcc7b --- /dev/null +++ b/laba4/src/main/java/com/example/demo/subscriptions/api/SubscriptionController.java @@ -0,0 +1,104 @@ +package com.example.demo.subscriptions.api; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(SubscriptionController.URL) +public class SubscriptionController { + public static final String URL = Constants.ADMIN_PREFIX + "/subscription"; + private static final String SUBSCRIPTION_VIEW = "subscription"; + private static final String SUBSCRIPTION_EDIT_VIEW = "subscription-edit"; + private static final String SUBSCRIPTION_ATTRIBUTE = "subscription"; + + private final SubscriptionService subscriptionService; + private final ModelMapper modelMapper; + + public SubscriptionController(SubscriptionService subscriptionService, ModelMapper modelMapper) { + this.subscriptionService = subscriptionService; + this.modelMapper = modelMapper; + } + + private SubscriptionDto toDto(SubscriptionEntity entity) { + return modelMapper.map(entity, SubscriptionDto.class); + } + + private SubscriptionEntity toEntity(SubscriptionDto dto) { + return modelMapper.map(dto, SubscriptionEntity.class); + } + + @GetMapping + public String getAll(Model model) { + model.addAttribute( + "items", + subscriptionService.getAll().stream() + .map(this::toDto) + .toList()); + return SUBSCRIPTION_VIEW; + } + + @GetMapping("/edit/") + public String create(Model model) { + model.addAttribute(SUBSCRIPTION_ATTRIBUTE, new SubscriptionDto()); + return SUBSCRIPTION_EDIT_VIEW; + } + + @PostMapping("/edit/") + public String create( + @ModelAttribute(name = SUBSCRIPTION_ATTRIBUTE) @Valid SubscriptionDto subscription, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return SUBSCRIPTION_EDIT_VIEW; + } + subscriptionService.create(toEntity(subscription)); + return Constants.REDIRECT_VIEW + URL; + } + + @GetMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + Model model) { + if (id <= 0) { + throw new IllegalArgumentException(); + } + model.addAttribute(SUBSCRIPTION_ATTRIBUTE, toDto(subscriptionService.get(id))); + return SUBSCRIPTION_EDIT_VIEW; + } + + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @ModelAttribute(name = SUBSCRIPTION_ATTRIBUTE) @Valid SubscriptionDto subscription, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return SUBSCRIPTION_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + subscriptionService.update(id, toEntity(subscription)); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/delete/{id}") + public String delete( + @PathVariable(name = "id") Long id) { + subscriptionService.delete(id); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/laba4/src/main/java/com/example/demo/subscriptions/api/SubscriptionDto.java b/laba4/src/main/java/com/example/demo/subscriptions/api/SubscriptionDto.java new file mode 100644 index 0000000..76e6fc6 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/subscriptions/api/SubscriptionDto.java @@ -0,0 +1,27 @@ +package com.example.demo.subscriptions.api; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class SubscriptionDto { + private Long id; + @NotBlank + @Size(min = 5, max = 50) + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/laba4/src/main/java/com/example/demo/subscriptions/model/SubscriptionEntity.java b/laba4/src/main/java/com/example/demo/subscriptions/model/SubscriptionEntity.java new file mode 100644 index 0000000..59214e4 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/subscriptions/model/SubscriptionEntity.java @@ -0,0 +1,67 @@ +package com.example.demo.subscriptions.model; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.usersubscription.model.UserSubscriptionEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; + +@Entity +@Table(name = "subscriptions") +public class SubscriptionEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + @OneToMany(mappedBy = "subscription") + @OrderBy("id ASC") + private Set userSubscriptions = new HashSet<>(); + + public SubscriptionEntity() { + } + + public SubscriptionEntity(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Set getUserSubscriptions() { + return userSubscriptions; + } + + public void addUser(UserSubscriptionEntity userSubscription) { + if (userSubscription.getSubscription() != this) { + userSubscription.setSubscription(this); + } + userSubscriptions.add(userSubscription); + } + + @Override + public int hashCode() { + return Objects.hash(id, name, userSubscriptions); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + SubscriptionEntity other = (SubscriptionEntity) obj; + return Objects.equals(id, other.id) + && Objects.equals(name, other.name) + && Objects.equals(userSubscriptions, other.userSubscriptions); + } +} diff --git a/laba4/src/main/java/com/example/demo/subscriptions/repository/SubscriptionRepository.java b/laba4/src/main/java/com/example/demo/subscriptions/repository/SubscriptionRepository.java new file mode 100644 index 0000000..5cc12c6 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/subscriptions/repository/SubscriptionRepository.java @@ -0,0 +1,13 @@ +package com.example.demo.subscriptions.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.demo.subscriptions.model.SubscriptionEntity; + +public interface SubscriptionRepository + extends CrudRepository, PagingAndSortingRepository { + Optional findByNameIgnoreCase(String name); +} diff --git a/laba4/src/main/java/com/example/demo/subscriptions/service/SubscriptionService.java b/laba4/src/main/java/com/example/demo/subscriptions/service/SubscriptionService.java new file mode 100644 index 0000000..11f15a1 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/subscriptions/service/SubscriptionService.java @@ -0,0 +1,66 @@ +package com.example.demo.subscriptions.service; + +import java.util.List; +import java.util.Optional; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.repository.SubscriptionRepository; + +@Service +public class SubscriptionService { + private final SubscriptionRepository repository; + + public SubscriptionService(SubscriptionRepository repository) { + this.repository = repository; + } + + private void checkName(Long id, String name) { + final Optional existsType = repository.findByNameIgnoreCase(name); + if (existsType.isPresent() && !existsType.get().getId().equals(id)) { + throw new IllegalArgumentException( + String.format("Subscription with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll(Sort.by("id")).spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public SubscriptionEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(SubscriptionEntity.class, id)); + } + + @Transactional + public SubscriptionEntity create(SubscriptionEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(null, entity.getName()); + return repository.save(entity); + } + + @Transactional + public SubscriptionEntity update(Long id, SubscriptionEntity entity) { + final SubscriptionEntity existsEntity = get(id); + checkName(id, entity.getName()); + existsEntity.setName(entity.getName()); + return repository.save(existsEntity); + } + + @Transactional + public SubscriptionEntity delete(Long id) { + final SubscriptionEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } + +} diff --git a/laba4/src/main/java/com/example/demo/types/api/TypeController.java b/laba4/src/main/java/com/example/demo/types/api/TypeController.java new file mode 100644 index 0000000..802c978 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/types/api/TypeController.java @@ -0,0 +1,104 @@ +package com.example.demo.types.api; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +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; + +@Controller +@RequestMapping(TypeController.URL) +public class TypeController { + public static final String URL = Constants.ADMIN_PREFIX + "/type"; + private static final String TYPE_VIEW = "type"; + private static final String TYPE_EDIT_VIEW = "type-edit"; + private static final String TYPE_ATTRIBUTE = "type"; + + private final TypeService typeService; + private final ModelMapper modelMapper; + + public TypeController(TypeService typeService, ModelMapper modelMapper) { + this.typeService = typeService; + this.modelMapper = modelMapper; + } + + private TypeDto toDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private TypeEntity toEntity(TypeDto dto) { + return modelMapper.map(dto, TypeEntity.class); + } + + @GetMapping + public String getAll(Model model) { + model.addAttribute( + "items", + typeService.getAll().stream() + .map(this::toDto) + .toList()); + return TYPE_VIEW; + } + + @GetMapping("/edit/") + public String create(Model model) { + model.addAttribute(TYPE_ATTRIBUTE, new TypeDto()); + return TYPE_EDIT_VIEW; + } + + @PostMapping("/edit/") + public String create( + @ModelAttribute(name = TYPE_ATTRIBUTE) @Valid TypeDto type, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return TYPE_EDIT_VIEW; + } + typeService.create(toEntity(type)); + return Constants.REDIRECT_VIEW + URL; + } + + @GetMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + Model model) { + if (id <= 0) { + throw new IllegalArgumentException(); + } + model.addAttribute(TYPE_ATTRIBUTE, toDto(typeService.get(id))); + return TYPE_EDIT_VIEW; + } + + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @ModelAttribute(name = TYPE_ATTRIBUTE) @Valid TypeDto type, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return TYPE_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + typeService.update(id, toEntity(type)); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/delete/{id}") + public String delete( + @PathVariable(name = "id") Long id) { + typeService.delete(id); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/laba4/src/main/java/com/example/demo/types/api/TypeDto.java b/laba4/src/main/java/com/example/demo/types/api/TypeDto.java new file mode 100644 index 0000000..ed3350d --- /dev/null +++ b/laba4/src/main/java/com/example/demo/types/api/TypeDto.java @@ -0,0 +1,27 @@ +package com.example.demo.types.api; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class TypeDto { + private Long id; + @NotBlank + @Size(min = 5, max = 50) + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/laba4/src/main/java/com/example/demo/types/model/TypeEntity.java b/laba4/src/main/java/com/example/demo/types/model/TypeEntity.java new file mode 100644 index 0000000..14df9ea --- /dev/null +++ b/laba4/src/main/java/com/example/demo/types/model/TypeEntity.java @@ -0,0 +1,48 @@ +package com.example.demo.types.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "types") +public class TypeEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + + public TypeEntity() { + } + + public TypeEntity(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final TypeEntity other = (TypeEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } + +} diff --git a/laba4/src/main/java/com/example/demo/types/repository/TypeRepository.java b/laba4/src/main/java/com/example/demo/types/repository/TypeRepository.java new file mode 100644 index 0000000..fb863a7 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/types/repository/TypeRepository.java @@ -0,0 +1,13 @@ +package com.example.demo.types.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.demo.types.model.TypeEntity; + +public interface TypeRepository + extends CrudRepository, PagingAndSortingRepository { + Optional findByNameIgnoreCase(String name); +} diff --git a/laba4/src/main/java/com/example/demo/types/service/TypeService.java b/laba4/src/main/java/com/example/demo/types/service/TypeService.java new file mode 100644 index 0000000..3ec0d2b --- /dev/null +++ b/laba4/src/main/java/com/example/demo/types/service/TypeService.java @@ -0,0 +1,75 @@ +package com.example.demo.types.service; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +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; + } + + private void checkName(Long id, String name) { + final Optional existsType = repository.findByNameIgnoreCase(name); + if (existsType.isPresent() && !existsType.get().getId().equals(id)) { + throw new IllegalArgumentException( + String.format("Type with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll(Sort.by("id")).spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public List getByIds(Collection ids) { + final List types = StreamSupport.stream(repository.findAllById(ids).spliterator(), false).toList(); + if (types.size() < ids.size()) { + throw new IllegalArgumentException("Invalid type"); + } + return types; + } + + @Transactional(readOnly = true) + public TypeEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(TypeEntity.class, id)); + } + + @Transactional + public TypeEntity create(TypeEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(null, entity.getName()); + return repository.save(entity); + } + + @Transactional + public TypeEntity update(Long id, TypeEntity entity) { + final TypeEntity existsEntity = get(id); + checkName(id, entity.getName()); + existsEntity.setName(entity.getName()); + return repository.save(existsEntity); + } + + @Transactional + public TypeEntity delete(Long id) { + final TypeEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } +} diff --git a/laba4/src/main/java/com/example/demo/users/api/UserCartController.java b/laba4/src/main/java/com/example/demo/users/api/UserCartController.java new file mode 100644 index 0000000..16a31c7 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/api/UserCartController.java @@ -0,0 +1,151 @@ +package com.example.demo.users.api; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.SessionAttributes; +import org.springframework.web.bind.support.SessionStatus; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.core.session.SessionCart; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.service.OrderService; +import com.example.demo.types.api.TypeDto; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(UserCartController.URL) +@SessionAttributes("types") +public class UserCartController { + public static final String URL = "/cart"; + private static final String ORDER_VIEW = "cart"; + private static final String ORDER_ATTRIBUTE = "order"; + private static final String CART_ATTRIBUTE = "cart"; + + private final TypeService typeService; + private final OrderService orderService; + private final SessionCart cart; + private final ModelMapper modelMapper; + + public UserCartController( + TypeService typeService, + OrderService orderService, + SessionCart cart, + ModelMapper modelMapper) { + this.typeService = typeService; + this.orderService = orderService; + this.cart = cart; + this.modelMapper = modelMapper; + } + + private TypeDto toTypeDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private List toOrderEntities(Collection dtos) { + final Set typeIds = dtos.stream() + .map(UserCartDto::getType) + .collect(Collectors.toSet()); + final Map types = typeService.getByIds(typeIds).stream() + .collect(Collectors.toMap(TypeEntity::getId, Function.identity())); + return dtos.stream() + .map(dto -> { + final OrderEntity entity = modelMapper.map(dto, OrderEntity.class); + entity.setType(types.get(dto.getType())); + return entity; + }) + .toList(); + } + + @GetMapping + public String getCart(Model model) { + model.addAttribute("types", + typeService.getAll().stream() + .map(this::toTypeDto) + .toList()); + model.addAttribute(ORDER_ATTRIBUTE, new UserCartDto()); + model.addAttribute(CART_ATTRIBUTE, cart.values()); + return ORDER_VIEW; + } + + @PostMapping + public String addOrderToCart( + @ModelAttribute(name = ORDER_ATTRIBUTE) @Valid UserCartDto order, + BindingResult bindingResult, + SessionStatus status, + Model model) { + if (bindingResult.hasErrors()) { + return ORDER_VIEW; + } + status.setComplete(); + order.setTypeName(typeService.get(order.getType()).getName()); + cart.computeIfPresent(order.hashCode(), (key, value) -> { + value.setCount(value.getCount() + order.getCount()); + return value; + }); + cart.putIfAbsent(order.hashCode(), order); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/save") + public String saveCart( + @CookieValue(value = Constants.USER_COOKIE, defaultValue = "0") long userId, + Model model) { + orderService.createAll(userId, toOrderEntities(cart.values())); + cart.clear(); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/clear") + public String clearCart() { + cart.clear(); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/increase") + public String increaseCartCount( + @RequestParam(name = "type") Long type, + @RequestParam(name = "price") Double price) { + cart.computeIfPresent(Objects.hash(type, price), (key, value) -> { + value.setCount(value.getCount() + 1); + return value; + }); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/decrease") + public String decreaseCartCount( + @RequestParam(name = "type") Long type, + @RequestParam(name = "price") Double price) { + cart.computeIfPresent(Objects.hash(type, price), (key, value) -> { + value.setCount(value.getCount() - 1); + return value; + }); + final Map filteredCart = cart.entrySet() + .stream() + .filter(item -> item.getValue().getCount() > 0) + .collect(Collectors.toMap(Entry::getKey, Entry::getValue)); + cart.clear(); + cart.putAll(filteredCart); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/laba4/src/main/java/com/example/demo/users/api/UserCartDto.java b/laba4/src/main/java/com/example/demo/users/api/UserCartDto.java new file mode 100644 index 0000000..584adf4 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/api/UserCartDto.java @@ -0,0 +1,65 @@ +package com.example.demo.users.api; + +import java.util.Objects; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class UserCartDto { + @NotNull + private Long type; + private String typeName; + @NotNull + @Min(1000) + private Double price; + @NotNull + @Min(1) + private Integer count; + + public Long getType() { + return type; + } + + public void setType(Long typeId) { + this.type = typeId; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + @Override + public int hashCode() { + return Objects.hash(type, price); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserCartDto other = (UserCartDto) obj; + return Objects.equals(type, other.type) && Objects.equals(price, other.price); + } +} diff --git a/laba4/src/main/java/com/example/demo/users/api/UserController.java b/laba4/src/main/java/com/example/demo/users/api/UserController.java new file mode 100644 index 0000000..7c5b23f --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/api/UserController.java @@ -0,0 +1,127 @@ +package com.example.demo.users.api; + +import java.util.Map; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.example.demo.core.api.PageAttributesMapper; +import com.example.demo.core.configuration.Constants; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(UserController.URL) +public class UserController { + public static final String URL = Constants.ADMIN_PREFIX + "/user"; + private static final String USER_VIEW = "user"; + private static final String USER_EDIT_VIEW = "user-edit"; + private static final String PAGE_ATTRIBUTE = "page"; + private static final String USER_ATTRIBUTE = "user"; + + private final UserService userService; + private final ModelMapper modelMapper; + + public UserController(UserService userService, ModelMapper modelMapper) { + this.userService = userService; + this.modelMapper = modelMapper; + } + + private UserDto toDto(UserEntity entity) { + return modelMapper.map(entity, UserDto.class); + } + + private UserEntity toEntity(UserDto dto) { + return modelMapper.map(dto, UserEntity.class); + } + + @GetMapping + public String getAll( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + final Map attributes = PageAttributesMapper.toAttributes( + userService.getAll(page, Constants.DEFUALT_PAGE_SIZE), this::toDto); + model.addAllAttributes(attributes); + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_VIEW; + } + + @GetMapping("/edit/") + public String create( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + model.addAttribute(USER_ATTRIBUTE, new UserDto()); + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + + @PostMapping("/edit/") + public String create( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserDto user, + BindingResult bindingResult, + Model model, + RedirectAttributes redirectAttributes) { + if (bindingResult.hasErrors()) { + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + userService.create(toEntity(user)); + return Constants.REDIRECT_VIEW + URL; + } + + @GetMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + if (id <= 0) { + throw new IllegalArgumentException(); + } + model.addAttribute(USER_ATTRIBUTE, toDto(userService.get(id))); + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserDto user, + BindingResult bindingResult, + Model model, + RedirectAttributes redirectAttributes) { + if (bindingResult.hasErrors()) { + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + userService.update(id, toEntity(user)); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/delete/{id}") + public String delete( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + RedirectAttributes redirectAttributes) { + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + userService.delete(id); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/laba4/src/main/java/com/example/demo/users/api/UserDto.java b/laba4/src/main/java/com/example/demo/users/api/UserDto.java new file mode 100644 index 0000000..abf6df8 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/api/UserDto.java @@ -0,0 +1,27 @@ +package com.example.demo.users.api; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class UserDto { + private Long id; + @NotBlank + @Size(min = 3, max = 20) + private String login; + + 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; + } +} diff --git a/laba4/src/main/java/com/example/demo/users/api/UserLoginController.java b/laba4/src/main/java/com/example/demo/users/api/UserLoginController.java new file mode 100644 index 0000000..76d4916 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/api/UserLoginController.java @@ -0,0 +1,59 @@ +package com.example.demo.users.api; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; + +@Controller +public class UserLoginController { + public static final String LOGIN_URL = "/login"; + + private static final String LOGIN_VIEW = "login"; + private static final String USER_ATTRIBUTE = "user"; + + private final UserService userService; + + public UserLoginController(UserService userService) { + this.userService = userService; + } + + @GetMapping(LOGIN_URL) + public String login(Model model) { + model.addAttribute(USER_ATTRIBUTE, new UserLoginDto()); + return LOGIN_VIEW; + } + + @PostMapping(LOGIN_URL) + // Порядок аргументов важен! + public String login( + HttpServletResponse response, + @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserLoginDto user, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return LOGIN_VIEW; + } + final UserEntity existsUser = userService.getByLogin(user.getLogin()); + final Cookie cookie = new Cookie(Constants.USER_COOKIE, existsUser.getId().toString()); + response.addCookie(cookie); + return Constants.REDIRECT_VIEW + "/"; + } + + @PostMapping("/logout") + public String logout(HttpServletResponse response) { + final Cookie cookie = new Cookie(Constants.USER_COOKIE, "0"); + response.addCookie(cookie); + return Constants.REDIRECT_VIEW + "/"; + } +} diff --git a/laba4/src/main/java/com/example/demo/users/api/UserLoginDto.java b/laba4/src/main/java/com/example/demo/users/api/UserLoginDto.java new file mode 100644 index 0000000..5949c3d --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/api/UserLoginDto.java @@ -0,0 +1,29 @@ +package com.example.demo.users.api; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class UserLoginDto { + @NotBlank + @Size(min = 3, max = 20) + private String login; + @NotBlank + @Size(min = 3, max = 20) + private String password; + + 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; + } +} diff --git a/laba4/src/main/java/com/example/demo/users/api/UserProfileController.java b/laba4/src/main/java/com/example/demo/users/api/UserProfileController.java new file mode 100644 index 0000000..c00af8f --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/api/UserProfileController.java @@ -0,0 +1,133 @@ +package com.example.demo.users.api; + +import java.util.stream.Collectors; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.example.demo.core.api.PageAttributesMapper; +import com.example.demo.core.configuration.Constants; +import com.example.demo.orders.api.OrderDto; +import com.example.demo.orders.api.OrderGroupedDto; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.model.OrderGrouped; +import com.example.demo.orders.service.OrderService; +import com.example.demo.types.api.TypeDto; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; +import com.example.demo.users.model.UserSubscriptionWithStatus; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@Controller +public class UserProfileController { + private static final String PROFILE_VIEW = "profile"; + + private static final String PAGE_ATTRIBUTE = "page"; + private static final String TYPEID_ATTRIBUTE = "typeId"; + private static final String PROFILE_ATTRIBUTE = "profile"; + + private final OrderService orderService; + private final TypeService typeService; + private final UserService userService; + private final ModelMapper modelMapper; + + public UserProfileController( + OrderService orderService, + TypeService typeService, + UserService userService, + ModelMapper modelMapper) { + this.orderService = orderService; + this.typeService = typeService; + this.userService = userService; + this.modelMapper = modelMapper; + } + + private OrderDto toDto(OrderEntity entity) { + return modelMapper.map(entity, OrderDto.class); + } + + private OrderGroupedDto toGroupedDto(OrderGrouped entity) { + return modelMapper.map(entity, OrderGroupedDto.class); + } + + private TypeDto toTypeDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private UserSubscriptionDto tSubscriptionDto(UserSubscriptionWithStatus entity) { + return modelMapper.map(entity, UserSubscriptionDto.class); + } + + private UserSubscriptionWithStatus toSubscriptionWithStatus(UserSubscriptionDto dto) { + return modelMapper.map(dto, UserSubscriptionWithStatus.class); + } + + @GetMapping + public String getProfile( + @CookieValue(value = Constants.USER_COOKIE, defaultValue = "0") long userId, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @RequestParam(name = TYPEID_ATTRIBUTE, defaultValue = "0") int typeId, + Model model) { + if (userId <= 0) { + return Constants.REDIRECT_VIEW + UserLoginController.LOGIN_URL; + } + model.addAttribute(PAGE_ATTRIBUTE, page); + model.addAttribute(TYPEID_ATTRIBUTE, typeId); + model.addAllAttributes(PageAttributesMapper.toAttributes( + orderService.getAll(userId, typeId, page, Constants.DEFUALT_PAGE_SIZE), + this::toDto)); + model.addAttribute("stats", + orderService.getTotal(userId).stream() + .map(this::toGroupedDto) + .toList()); + model.addAttribute("types", + typeService.getAll().stream() + .map(this::toTypeDto) + .toList()); + model.addAttribute(PROFILE_ATTRIBUTE, + new UserProfileDto(userService.getUserSubscriptions(userId).stream() + .map(this::tSubscriptionDto) + .toList())); + return PROFILE_VIEW; + } + + @PostMapping + public String saveProfile( + @CookieValue(value = Constants.USER_COOKIE, defaultValue = "0") long userId, + @ModelAttribute(name = PROFILE_ATTRIBUTE) @Valid UserProfileDto profile, + BindingResult bindResult, + Model model) { + if (bindResult.hasErrors()) { + return PROFILE_VIEW; + } + userService.saveUserSubscriptions(userId, + profile.getSubscriptions().stream() + .map(this::toSubscriptionWithStatus) + .collect(Collectors.toSet())); + return Constants.REDIRECT_VIEW + "/"; + } + + @PostMapping("/delete/{id}") + public String deleteOrder( + @CookieValue(value = Constants.USER_COOKIE, defaultValue = "0") long userId, + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @RequestParam(name = TYPEID_ATTRIBUTE, defaultValue = "0") int typeId, + RedirectAttributes redirectAttributes) { + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + redirectAttributes.addAttribute(TYPEID_ATTRIBUTE, typeId); + orderService.delete(userId, id); + return Constants.REDIRECT_VIEW + "/"; + } +} diff --git a/laba4/src/main/java/com/example/demo/users/api/UserProfileDto.java b/laba4/src/main/java/com/example/demo/users/api/UserProfileDto.java new file mode 100644 index 0000000..0a72573 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/api/UserProfileDto.java @@ -0,0 +1,23 @@ +package com.example.demo.users.api; + +import java.util.ArrayList; +import java.util.List; + +public class UserProfileDto { + private List subscriptions = new ArrayList<>(); + + public UserProfileDto() { + } + + public UserProfileDto(List subscriptions) { + this.subscriptions = subscriptions; + } + + public List getSubscriptions() { + return subscriptions; + } + + public void setSubscriptions(List subscriptions) { + this.subscriptions = subscriptions; + } +} diff --git a/laba4/src/main/java/com/example/demo/users/api/UserSubscriptionDto.java b/laba4/src/main/java/com/example/demo/users/api/UserSubscriptionDto.java new file mode 100644 index 0000000..1c5a865 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/api/UserSubscriptionDto.java @@ -0,0 +1,31 @@ +package com.example.demo.users.api; + +public class UserSubscriptionDto { + private Long id; + private String name; + private boolean active; + + 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 boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } +} diff --git a/laba4/src/main/java/com/example/demo/users/model/UserEntity.java b/laba4/src/main/java/com/example/demo/users/model/UserEntity.java new file mode 100644 index 0000000..e1c48f7 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/model/UserEntity.java @@ -0,0 +1,91 @@ +package com.example.demo.users.model; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.usersubscription.model.UserSubscriptionEntity; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users") +public class UserEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 20) + private String login; + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + @OrderBy("id ASC") + private Set orders = new HashSet<>(); + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) + @OrderBy("id ASC") + private Set userSubscriptions = new HashSet<>(); + + public UserEntity() { + } + + public UserEntity(String login) { + this.login = login; + } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public Set getOrders() { + return orders; + } + + public void addOrder(OrderEntity order) { + if (order.getUser() != this) { + order.setUser(this); + } + orders.add(order); + } + + public Set getUserSubscriptions() { + return userSubscriptions; + } + + public void addSubscription(UserSubscriptionEntity userSubscription) { + if (userSubscription.getUser() != this) { + userSubscription.setUser(this); + } + userSubscriptions.add(userSubscription); + } + + public void deleteSubscription(UserSubscriptionEntity userSubscription) { + if (userSubscription.getUser() != this) { + return; + } + userSubscriptions.remove(userSubscription); + } + + @Override + public int hashCode() { + return Objects.hash(id, login, orders, userSubscriptions); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserEntity other = (UserEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getLogin(), login) + && Objects.equals(other.getOrders(), orders) + && Objects.equals(other.getUserSubscriptions(), userSubscriptions); + } +} diff --git a/laba4/src/main/java/com/example/demo/users/model/UserSubscriptionWithStatus.java b/laba4/src/main/java/com/example/demo/users/model/UserSubscriptionWithStatus.java new file mode 100644 index 0000000..a460e81 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/model/UserSubscriptionWithStatus.java @@ -0,0 +1,60 @@ +package com.example.demo.users.model; + +import java.util.Objects; + +import com.example.demo.subscriptions.model.SubscriptionEntity; + +public class UserSubscriptionWithStatus { + private Long id; + private String name; + private boolean active; + + public UserSubscriptionWithStatus() { + } + + public UserSubscriptionWithStatus(SubscriptionEntity entity, boolean active) { + this.id = entity.getId(); + this.name = entity.getName(); + this.active = active; + } + + 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 boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } + + @Override + public int hashCode() { + return Objects.hash(id, name, active); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserSubscriptionWithStatus other = (UserSubscriptionWithStatus) obj; + return Objects.equals(id, other.id) && Objects.equals(name, other.name) && active == other.active; + } + +} diff --git a/laba4/src/main/java/com/example/demo/users/repository/UserRepository.java b/laba4/src/main/java/com/example/demo/users/repository/UserRepository.java new file mode 100644 index 0000000..9bf3cae --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/repository/UserRepository.java @@ -0,0 +1,13 @@ +package com.example.demo.users.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.demo.users.model.UserEntity; + +public interface UserRepository + extends CrudRepository, PagingAndSortingRepository { + Optional findByLoginIgnoreCase(String login); +} diff --git a/laba4/src/main/java/com/example/demo/users/service/UserService.java b/laba4/src/main/java/com/example/demo/users/service/UserService.java new file mode 100644 index 0000000..315be1d --- /dev/null +++ b/laba4/src/main/java/com/example/demo/users/service/UserService.java @@ -0,0 +1,141 @@ +package com.example.demo.users.service; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.model.UserSubscriptionWithStatus; +import com.example.demo.users.repository.UserRepository; +import com.example.demo.usersubscription.model.UserSubscriptionEntity; + +@Service +public class UserService { + private final UserRepository repository; + private final SubscriptionService subscriptionService; + + public UserService( + UserRepository repository, + SubscriptionService subscriptionService) { + this.repository = repository; + this.subscriptionService = subscriptionService; + } + + private void checkLogin(Long id, String login) { + final Optional existsUser = repository.findByLoginIgnoreCase(login); + if (existsUser.isPresent() && !existsUser.get().getId().equals(id)) { + throw new IllegalArgumentException( + String.format("User with login %s is already exists", login)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public Page getAll(int page, int size) { + return repository.findAll(PageRequest.of(page, size, Sort.by("id"))); + } + + @Transactional(readOnly = true) + public UserEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(UserEntity.class, id)); + } + + @Transactional(readOnly = true) + public UserEntity getByLogin(String login) { + return repository.findByLoginIgnoreCase(login) + .orElseThrow(() -> new IllegalArgumentException("Invalid login")); + } + + @Transactional + public UserEntity create(UserEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkLogin(null, entity.getLogin()); + repository.save(entity); + subscriptionService.getAll().forEach(subscription -> { + final UserSubscriptionEntity userSubscription = new UserSubscriptionEntity(entity, subscription, true); + userSubscription.setUser(entity); + userSubscription.setSubscription(subscription); + }); + return repository.save(entity); + } + + @Transactional + public UserEntity update(long id, UserEntity entity) { + final UserEntity existsEntity = get(id); + checkLogin(id, entity.getLogin()); + existsEntity.setLogin(entity.getLogin()); + repository.save(existsEntity); + return existsEntity; + } + + @Transactional + public UserEntity delete(long id) { + final UserEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } + + private Map getUserSubscriptionsMap(Set subscriptions) { + return Optional.ofNullable(subscriptions).orElse(Collections.emptySet()).stream() + .collect(Collectors.toMap(item -> item.getSubscription().getId(), Function.identity())); + } + + @Transactional(readOnly = true) + public List getUserSubscriptions(long id) { + final Map userSubscriptions = getUserSubscriptionsMap( + get(id).getUserSubscriptions()); + return subscriptionService.getAll().stream() + .map(item -> { + final boolean active = Optional.ofNullable(userSubscriptions.get(item.getId())) + .map(UserSubscriptionEntity::isActive) + .orElse(false); + return new UserSubscriptionWithStatus(item, active); + }) + .toList(); + } + + @Transactional + public void saveUserSubscriptions(long id, Set subscriptions) { + final UserEntity existsUser = get(id); + final Map existsSubscriptions = subscriptionService.getAll().stream() + .collect(Collectors.toMap(SubscriptionEntity::getId, Function.identity())); + final Map userSubscriptions = getUserSubscriptionsMap( + existsUser.getUserSubscriptions()); + subscriptions.stream() + .filter(item -> existsSubscriptions.keySet().contains(item.getId())) + .forEach(item -> { + userSubscriptions.computeIfAbsent(item.getId(), key -> { + final UserSubscriptionEntity subscription = new UserSubscriptionEntity( + existsUser, existsSubscriptions.get(key), item.isActive()); + existsUser.addSubscription(subscription); + return subscription; + }); + userSubscriptions.computeIfPresent(item.getId(), (key, value) -> { + value.setActive(item.isActive()); + return value; + }); + }); + repository.save(existsUser); + } +} diff --git a/laba4/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionEntity.java b/laba4/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionEntity.java new file mode 100644 index 0000000..1f280f9 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionEntity.java @@ -0,0 +1,95 @@ +package com.example.demo.usersubscription.model; + +import java.util.Objects; + +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.users.model.UserEntity; + +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users_subscriptions") +public class UserSubscriptionEntity { + @EmbeddedId + private UserSubscriptionId id = new UserSubscriptionId(); + @ManyToOne + @MapsId("userId") + @JoinColumn(name = "user_id") + private UserEntity user; + @ManyToOne + @MapsId("subscriptionId") + @JoinColumn(name = "subscription_id") + private SubscriptionEntity subscription; + private boolean active; + + public UserSubscriptionEntity() { + } + + public UserSubscriptionEntity(UserEntity user, SubscriptionEntity subscription, boolean active) { + this.user = user; + this.subscription = subscription; + this.active = active; + } + + public UserSubscriptionId getId() { + return id; + } + + public void setId(UserSubscriptionId id) { + this.id = id; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + if (!user.getUserSubscriptions().contains(this)) { + user.getUserSubscriptions().add(this); + } + } + + public SubscriptionEntity getSubscription() { + return subscription; + } + + public void setSubscription(SubscriptionEntity subscription) { + this.subscription = subscription; + if (!subscription.getUserSubscriptions().contains(this)) { + subscription.getUserSubscriptions().add(this); + } + } + + public boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } + + @Override + public int hashCode() { + return Objects.hash(id, user.getId(), subscription.getId(), active); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserSubscriptionEntity other = (UserSubscriptionEntity) obj; + return Objects.equals(id, other.id) + && Objects.equals(user.getId(), other.user.getId()) + && Objects.equals(subscription.getId(), other.subscription.getId()) + && active == other.active; + } + +} diff --git a/laba4/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionId.java b/laba4/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionId.java new file mode 100644 index 0000000..0b23f19 --- /dev/null +++ b/laba4/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionId.java @@ -0,0 +1,55 @@ +package com.example.demo.usersubscription.model; + +import java.util.Objects; +import java.util.Optional; + +import jakarta.persistence.Embeddable; + +@Embeddable +public class UserSubscriptionId { + private Long userId; + private Long subscriptionId; + + public UserSubscriptionId() { + } + + public UserSubscriptionId(Long userId, Long subscriptionId) { + this.userId = userId; + this.subscriptionId = subscriptionId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getSubscriptionId() { + return subscriptionId; + } + + public void setSubscriptionId(Long subscriptionId) { + this.subscriptionId = subscriptionId; + } + + @Override + public int hashCode() { + return Objects.hash( + Optional.ofNullable(userId).orElse(0L), + Optional.ofNullable(subscriptionId).orElse(0L)); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserSubscriptionId other = (UserSubscriptionId) obj; + return Objects.equals(userId, other.userId) + && Objects.equals(subscriptionId, other.subscriptionId); + } + +} diff --git a/laba4/src/main/resources/application.properties b/laba4/src/main/resources/application.properties new file mode 100644 index 0000000..62ab433 --- /dev/null +++ b/laba4/src/main/resources/application.properties @@ -0,0 +1,20 @@ +# Server +spring.main.banner-mode=off +server.port=8080 + +# Logger settings +# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF +logging.level.com.example.demo=DEBUG + +# JPA Settings +spring.datasource.url=jdbc:h2:file:./data +spring.datasource.username=sa +spring.datasource.password=password +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=false +# spring.jpa.show-sql=true +# spring.jpa.properties.hibernate.format_sql=true + +# H2 console +spring.h2.console.enabled=true \ No newline at end of file diff --git a/laba4/src/main/resources/public/css/style.css b/laba4/src/main/resources/public/css/style.css new file mode 100644 index 0000000..7423490 --- /dev/null +++ b/laba4/src/main/resources/public/css/style.css @@ -0,0 +1,67 @@ +html, +body { + height: 100%; +} + +h1 { + font-size: 1.5em; +} + +h2 { + font-size: 1.25em; +} + +h3 { + font-size: 1.1em; +} + +td form { + margin: 0; + padding: 0; + margin-top: -.25em; +} + +.button-fixed-width { + width: 150px; +} + +.button-link { + padding: 0; +} + +.invalid-feedback { + display: block; +} + +.w-10 { + width: 10% !important; +} + +.my-navbar { + background-color: #3c3c3c !important; +} + +.my-navbar .link a:hover { + text-decoration: underline; +} + +.my-navbar .logo { + width: 26px; + height: 26px; +} + +.my-footer { + background-color: #2c2c2c; + height: 32px; + color: rgba(255, 255, 255, 0.5); +} + +.cart-image { + width: 3.1rem; + padding: 0.25rem; + border-radius: 0.5rem; +} + +.cart-item { + height: auto; +} \ No newline at end of file diff --git a/laba4/src/main/resources/public/favicon.svg b/laba4/src/main/resources/public/favicon.svg new file mode 100644 index 0000000..7e1bd9a --- /dev/null +++ b/laba4/src/main/resources/public/favicon.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/cart.html b/laba4/src/main/resources/templates/cart.html new file mode 100644 index 0000000..835acd2 --- /dev/null +++ b/laba4/src/main/resources/templates/cart.html @@ -0,0 +1,83 @@ + + + + + Корзина + + + +
+
+
+ Корзина +
+ +
+
+
+
+
+ [[${cartItem.typeName}]] [[${cartItem.price}]] * [[${cartItem.count}]] = + [[${cartItem.price * cartItem.count}]] +
+
+
+ +
+
+ +
+
+
+
+
+ Итого: [[${totalCart}]] ₽ +
+
+
+ +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ +
+
+
+ + + + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/default.html b/laba4/src/main/resources/templates/default.html new file mode 100644 index 0000000..7e928b7 --- /dev/null +++ b/laba4/src/main/resources/templates/default.html @@ -0,0 +1,65 @@ + + + + + + + + My shop + + + + + + + + +
+
+
+ Автор, [[${#dates.year(#dates.createNow())}]] +
+ + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/error.html b/laba4/src/main/resources/templates/error.html new file mode 100644 index 0000000..faa6b0a --- /dev/null +++ b/laba4/src/main/resources/templates/error.html @@ -0,0 +1,37 @@ + + + + + Ошибка + + + +
+
    + +
  • + Неизвестная ошибка +
    • +     + +
  • + Ошибка: [[${message}]] +
    • +     + +
  • + Адрес: [[${url}]] +
    • +
  • + Класс исключения: [[${exception}]] +
    • +
  • + [[${method}]] ([[${file}]]:[[${line}]]) +
    • +     +
+ На главную +
+ + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/login.html b/laba4/src/main/resources/templates/login.html new file mode 100644 index 0000000..a4d3ce5 --- /dev/null +++ b/laba4/src/main/resources/templates/login.html @@ -0,0 +1,30 @@ + + + + + Вход + + + +
+
+
+ + +
+
+
+ + +
+
+
+ +
+
+
+ + + + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/orders.html b/laba4/src/main/resources/templates/orders.html new file mode 100644 index 0000000..821dd62 --- /dev/null +++ b/laba4/src/main/resources/templates/orders.html @@ -0,0 +1,61 @@ + + + + + + +

Данные отсутствуют

+ +
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
IDТип заказаЦенаКоличествоСумма
+
+ + + +
+
+ + + + + + + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/pagination.html b/laba4/src/main/resources/templates/pagination.html new file mode 100644 index 0000000..b11664a --- /dev/null +++ b/laba4/src/main/resources/templates/pagination.html @@ -0,0 +1,51 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/profile.html b/laba4/src/main/resources/templates/profile.html new file mode 100644 index 0000000..f8ea866 --- /dev/null +++ b/laba4/src/main/resources/templates/profile.html @@ -0,0 +1,60 @@ + + + + + Личный кабинет + + + +
+ + +
+
+ +
+
+
    +
  • + [[${stat.typeName}]]: [[${stat.totalPrice}]] ₽ ([[${stat.totalCount}]] + шт.) +
    • +
+
+
+
+
+ + + +
+ +
+
+
+
+ Создать заказ +
+ +
+ + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/subscription-edit.html b/laba4/src/main/resources/templates/subscription-edit.html new file mode 100644 index 0000000..6d940ec --- /dev/null +++ b/laba4/src/main/resources/templates/subscription-edit.html @@ -0,0 +1,29 @@ + + + + + Редакторовать списки рассылки + + + +
+
+
+ + +
+
+ + +
+
+
+ + Отмена +
+
+
+ + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/subscription.html b/laba4/src/main/resources/templates/subscription.html new file mode 100644 index 0000000..b3123a9 --- /dev/null +++ b/laba4/src/main/resources/templates/subscription.html @@ -0,0 +1,51 @@ + + + + + Списки рассылки + + + +
+ +

Данные отсутствуют

+ +

Списки рассылки

+ + + + + + + + + + + + + + + + + + + +
IDСписок рассылки
+
+ +
+ 		+
+ +
+
+ + +
+ + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/type-edit.html b/laba4/src/main/resources/templates/type-edit.html new file mode 100644 index 0000000..91f03ca --- /dev/null +++ b/laba4/src/main/resources/templates/type-edit.html @@ -0,0 +1,28 @@ + + + + + Редакторовать тип заказа + + + +
+
+
+ + +
+
+ + +
+
+
+ + Отмена +
+
+
+ + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/type.html b/laba4/src/main/resources/templates/type.html new file mode 100644 index 0000000..ec0909e --- /dev/null +++ b/laba4/src/main/resources/templates/type.html @@ -0,0 +1,50 @@ + + + + + Типы заказов + + + +
+ +

Данные отсутствуют

+ +

Типы заказов

+ + + + + + + + + + + + + + + + + + + +
IDТип заказа
+
+ +
+ 		+
+ +
+
+ + +
+ + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/user-edit.html b/laba4/src/main/resources/templates/user-edit.html new file mode 100644 index 0000000..659be54 --- /dev/null +++ b/laba4/src/main/resources/templates/user-edit.html @@ -0,0 +1,29 @@ + + + + + Редакторовать пользователя + + + +
+
+
+ + +
+
+ + +
+
+
+ + Отмена +
+
+
+ + + \ No newline at end of file diff --git a/laba4/src/main/resources/templates/user.html b/laba4/src/main/resources/templates/user.html new file mode 100644 index 0000000..cce1336 --- /dev/null +++ b/laba4/src/main/resources/templates/user.html @@ -0,0 +1,56 @@ + + + + + Пользователи + + + +
+ +

Данные отсутствуют

+ +

Пользователи

+ + + + + + + + + + + + + + + + + + + +
IDИмя пользователя
+
+ + +
+ 		+
+ + +
+
+ + + +
+ + + \ No newline at end of file diff --git a/laba4/src/test/java/com/example/demo/TypeServiceTests.java b/laba4/src/test/java/com/example/demo/TypeServiceTests.java new file mode 100644 index 0000000..10043cd --- /dev/null +++ b/laba4/src/test/java/com/example/demo/TypeServiceTests.java @@ -0,0 +1,79 @@ +package com.example.demo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +@SpringBootTest +class TypeServiceTests { + @Autowired + private TypeService typeService; + + private TypeEntity type; + + @BeforeEach + void createData() { + removeData(); + + type = typeService.create(new TypeEntity("Ноутбук")); + typeService.create(new TypeEntity("Телефон")); + typeService.create(new TypeEntity("Игровая приставка")); + } + + @AfterEach + void removeData() { + typeService.getAll().forEach(item -> typeService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(type, typeService.get(type.getId())); + } + + @Test + void createNotUniqueTest() { + final TypeEntity nonUniqueType = new TypeEntity("Ноутбук"); + Assertions.assertThrows(IllegalArgumentException.class, () -> typeService.create(nonUniqueType)); + } + + @Test + void createNullableTest() { + final TypeEntity nullableType = new TypeEntity(null); + Assertions.assertThrows(DataIntegrityViolationException.class, () -> typeService.create(nullableType)); + } + + @Test + void updateTest() { + final String test = "TEST"; + final String oldName = type.getName(); + final TypeEntity newEntity = typeService.update(type.getId(), new TypeEntity(test)); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(newEntity, typeService.get(type.getId())); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + void deleteTest() { + typeService.delete(type.getId()); + Assertions.assertEquals(2, typeService.getAll().size()); + + final TypeEntity newEntity = typeService.create(new TypeEntity(type.getName())); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertNotEquals(type.getId(), newEntity.getId()); + } +} diff --git a/laba4/src/test/java/com/example/demo/UserOrderServiceTest.java b/laba4/src/test/java/com/example/demo/UserOrderServiceTest.java new file mode 100644 index 0000000..866f095 --- /dev/null +++ b/laba4/src/test/java/com/example/demo/UserOrderServiceTest.java @@ -0,0 +1,132 @@ +package com.example.demo; + +import java.util.List; +import java.util.Set; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +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.orders.model.OrderEntity; +import com.example.demo.orders.service.OrderService; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; +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.model.UserSubscriptionWithStatus; +import com.example.demo.users.service.UserService; + +import jakarta.persistence.EntityManager; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class UserOrderServiceTest { + @Autowired + private EntityManager entityManager; + @Autowired + private TypeService typeService; + @Autowired + private SubscriptionService subscriptionService; + @Autowired + private OrderService orderService; + @Autowired + private UserService userService; + + private TypeEntity type1; + private TypeEntity type2; + private TypeEntity type3; + + private UserEntity user1; + private UserEntity user2; + + @BeforeEach + void createData() { + removeData(); + + type1 = typeService.create(new TypeEntity("Ноутбук")); + type2 = typeService.create(new TypeEntity("Телефон")); + type3 = typeService.create(new TypeEntity("Игровая приставка")); + + subscriptionService.create(new SubscriptionEntity("Подписка 1")); + subscriptionService.create(new SubscriptionEntity("Подписка 2")); + subscriptionService.create(new SubscriptionEntity("Подписка 3")); + + user1 = userService.create(new UserEntity("user1")); + user2 = userService.create(new UserEntity("user2")); + + final var orders = List.of( + new OrderEntity(type1, 49999.00, 20), + new OrderEntity(type1, 129999.00, 3), + new OrderEntity(type2, 15450.50, 30), + new OrderEntity(type2, 69900.50, 10), + new OrderEntity(type2, 150000.00, 6), + new OrderEntity(type3, 75000.00, 6), + new OrderEntity(type3, 67800.00, 3)); + orders.forEach(order -> orderService.create(user1.getId(), order)); + } + + @AfterEach + void removeData() { + userService.getAll().forEach(item -> userService.delete(item.getId())); + typeService.getAll().forEach(item -> typeService.delete(item.getId())); + subscriptionService.getAll().forEach(item -> subscriptionService.delete(item.getId())); + } + + @Test + @Order(1) + void createTest() { + Assertions.assertEquals(7, orderService.getAll(user1.getId(), 0).size()); + Assertions.assertEquals(0, orderService.getAll(user2.getId(), 0).size()); + } + + @Test + @Order(2) + void orderFilterTest() { + Assertions.assertEquals(2, orderService.getAll(user1.getId(), type1.getId()).size()); + Assertions.assertEquals(3, orderService.getAll(user1.getId(), type2.getId()).size()); + Assertions.assertEquals(2, orderService.getAll(user1.getId(), type3.getId()).size()); + } + + @Test + @Order(3) + void subscriptionsTest() { + Assertions.assertEquals(3, userService.getUserSubscriptions(user1.getId()).size()); + + final UserSubscriptionWithStatus subscription = userService.getUserSubscriptions(user1.getId()).get(0); + subscription.setActive(false); + userService.saveUserSubscriptions(user1.getId(), Set.of(subscription)); + Assertions.assertEquals(2, + userService.getUserSubscriptions(user1.getId()).stream() + .filter(UserSubscriptionWithStatus::isActive) + .count()); + + subscription.setActive(true); + userService.saveUserSubscriptions(user1.getId(), Set.of(subscription)); + Assertions.assertEquals(3, + userService.getUserSubscriptions(user1.getId()).stream() + .filter(UserSubscriptionWithStatus::isActive) + .count()); + } + + @Test + @Order(6) + void userCascadeDeleteTest() { + userService.delete(user1.getId()); + final var orders = entityManager.createQuery( + "select count(o) from OrderEntity o where o.user.id = :userId"); + orders.setParameter("userId", user1.getId()); + Assertions.assertEquals(0, orders.getFirstResult()); + final var subscriptions = entityManager.createQuery( + "select count(us) from UserSubscriptionEntity us where us.user.id = :userId"); + subscriptions.setParameter("userId", user1.getId()); + Assertions.assertEquals(0, subscriptions.getFirstResult()); + + } +} diff --git a/laba4/src/test/resources/application.properties b/laba4/src/test/resources/application.properties new file mode 100644 index 0000000..d5f355c --- /dev/null +++ b/laba4/src/test/resources/application.properties @@ -0,0 +1,14 @@ +# Server +spring.main.banner-mode=off + +# Logger settings +# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF +logging.level.com.example.demo=DEBUG + +# JPA Settings +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.username=sa +spring.datasource.password=password +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=false \ No newline at end of file