From 0418d19e57496c9fa04a56c9be900252f3abb939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D1=8F=D1=87=D0=B5=D1=81=D0=BB=D0=B0=D0=B2=20=D0=98?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Mon, 13 May 2024 22:36:59 +0400 Subject: [PATCH] f --- 2 семестр/lab4-5/.vscode/launch.json | 14 - 2 семестр/lab4-5/demo/.gitignore | 39 --- 2 семестр/lab4-5/demo/build.gradle | 53 ---- .../demo/gradle/wrapper/gradle-wrapper.jar | Bin 43462 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 - 2 семестр/lab4-5/demo/gradlew | 249 ------------------ 2 семестр/lab4-5/demo/gradlew.bat | 92 ------- 2 семестр/lab4-5/demo/settings.gradle | 1 - .../com/example/demo/DemoApplication.java | 81 ------ .../demo/components/api/ComponentDto.java | 62 ----- .../components/model/ComponentEntity.java | 96 ------- .../repository/ComponentRepository.java | 12 - .../demo/core/api/GlobalController.java | 28 -- .../demo/core/api/PageAttributesMapper.java | 18 -- .../demo/core/configuration/Constants.java | 14 - .../configuration/MapperConfiguration.java | 23 -- .../core/configuration/WebConfiguration.java | 14 - .../demo/core/error/AdviceController.java | 53 ---- .../demo/core/error/NotFoundException.java | 7 - .../example/demo/core/model/BaseEntity.java | 28 -- .../core/security/SecurityConfiguration.java | 63 ----- .../demo/core/security/UserPrincipal.java | 64 ----- .../demo/core/session/SessionCart.java | 14 - .../demo/core/session/SessionHelper.java | 16 -- .../demo/orders/api/OrderController.java | 107 -------- .../com/example/demo/orders/api/OrderDto.java | 49 ---- .../demo/orders/api/OrderProductDto.java | 32 --- .../demo/orders/model/OrderEntity.java | 80 ------ .../orders/repository/OrderRepository.java | 19 -- .../demo/orders/service/OrderService.java | 118 --------- .../model/OrderProductEntity.java | 76 ------ .../ordersproducts/model/OrderProductId.java | 54 ---- .../demo/product/api/ProductController.java | 109 -------- .../example/demo/product/api/ProductDto.java | 49 ---- .../demo/product/model/ProductEntity.java | 75 ------ .../product/repository/ProductRepository.java | 16 -- .../demo/product/service/ProductService.java | 70 ----- .../ProductComponentEntity.java | 95 ------- .../productcomponents/ProductComponentId.java | 54 ---- .../demo/types/api/TypeController.java | 105 -------- .../com/example/demo/types/api/TypeDto.java | 25 -- .../example/demo/types/model/TypeEntity.java | 48 ---- .../demo/types/repository/TypeRepository.java | 13 - .../demo/types/service/TypeService.java | 68 ----- .../example/demo/users/api/UserCartDto.java | 65 ----- .../demo/users/api/UserController.java | 127 --------- .../com/example/demo/users/api/UserDto.java | 36 --- .../demo/users/api/UserSignupController.java | 65 ----- .../example/demo/users/api/UserSignupDto.java | 40 --- .../example/demo/users/model/UserEntity.java | 91 ------- .../example/demo/users/model/UserRole.java | 15 -- .../demo/users/repository/UserRepository.java | 13 - .../demo/users/service/UserService.java | 104 -------- .../src/main/resources/application.properties | 20 -- .../src/main/resources/public/css/style.css | 67 ----- .../src/main/resources/public/favicon.svg | 3 - .../src/main/resources/templates/default.html | 73 ----- .../src/main/resources/templates/error.html | 37 --- .../src/main/resources/templates/index.html | 14 - .../src/main/resources/templates/login.html | 44 ---- .../main/resources/templates/pagination.html | 51 ---- .../resources/templates/product-edit.html | 51 ---- .../src/main/resources/templates/product.html | 59 ----- .../main/resources/templates/products.html | 41 --- .../src/main/resources/templates/signup.html | 37 --- .../main/resources/templates/type-edit.html | 28 -- .../src/main/resources/templates/type.html | 50 ---- .../main/resources/templates/user-edit.html | 29 -- .../src/main/resources/templates/user.html | 56 ---- .../com/example/demo/OrderServiceTests.java | 117 -------- .../com/example/demo/ProductServiceTests.java | 95 ------- .../com/example/demo/TypeServiceTests.java | 82 ------ .../com/example/demo/UserServiceTests.java | 85 ------ .../src/test/resources/application.properties | 14 - 74 files changed, 3919 deletions(-) delete mode 100644 2 семестр/lab4-5/.vscode/launch.json delete mode 100644 2 семестр/lab4-5/demo/.gitignore delete mode 100644 2 семестр/lab4-5/demo/build.gradle delete mode 100644 2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.jar delete mode 100644 2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.properties delete mode 100644 2 семестр/lab4-5/demo/gradlew delete mode 100644 2 семестр/lab4-5/demo/gradlew.bat delete mode 100644 2 семестр/lab4-5/demo/settings.gradle delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/DemoApplication.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/api/ComponentDto.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/model/ComponentEntity.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/repository/ComponentRepository.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/GlobalController.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/PageAttributesMapper.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/Constants.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/WebConfiguration.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/AdviceController.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/NotFoundException.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/model/BaseEntity.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/SecurityConfiguration.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/UserPrincipal.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionCart.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionHelper.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderController.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderDto.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderProductDto.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/model/OrderEntity.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/repository/OrderRepository.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/service/OrderService.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductEntity.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductId.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductController.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductDto.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/model/ProductEntity.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/repository/ProductRepository.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/service/ProductService.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentEntity.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentId.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeController.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeDto.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/model/TypeEntity.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/repository/TypeRepository.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/service/TypeService.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserCartDto.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserController.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserDto.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupController.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupDto.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserEntity.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserRole.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/repository/UserRepository.java delete mode 100644 2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/service/UserService.java delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/application.properties delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/public/css/style.css delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/public/favicon.svg delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/default.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/error.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/index.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/login.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/pagination.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/product-edit.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/product.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/products.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/signup.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/type-edit.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/type.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/user-edit.html delete mode 100644 2 семестр/lab4-5/demo/src/main/resources/templates/user.html delete mode 100644 2 семестр/lab4-5/demo/src/test/java/com/example/demo/OrderServiceTests.java delete mode 100644 2 семестр/lab4-5/demo/src/test/java/com/example/demo/ProductServiceTests.java delete mode 100644 2 семестр/lab4-5/demo/src/test/java/com/example/demo/TypeServiceTests.java delete mode 100644 2 семестр/lab4-5/demo/src/test/java/com/example/demo/UserServiceTests.java delete mode 100644 2 семестр/lab4-5/demo/src/test/resources/application.properties diff --git a/2 семестр/lab4-5/.vscode/launch.json b/2 семестр/lab4-5/.vscode/launch.json deleted file mode 100644 index edb9da4..0000000 --- a/2 семестр/lab4-5/.vscode/launch.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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/2 семестр/lab4-5/demo/.gitignore b/2 семестр/lab4-5/demo/.gitignore deleted file mode 100644 index c9e91d9..0000000 --- a/2 семестр/lab4-5/demo/.gitignore +++ /dev/null @@ -1,39 +0,0 @@ -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/ - -data.*.db \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/build.gradle b/2 семестр/lab4-5/demo/build.gradle deleted file mode 100644 index 9b5492b..0000000 --- a/2 семестр/lab4-5/demo/build.gradle +++ /dev/null @@ -1,53 +0,0 @@ -plugins { - id 'java' - id 'org.springframework.boot' version '3.2.5' - id 'io.spring.dependency-management' version '1.1.4' -} - -group = 'com.example' -version = '0.0.1-SNAPSHOT' - -defaultTasks 'bootRun' - -jar { - enabled = false -} - -bootJar { - archiveFileName = String.format('%s-%s.jar', rootProject.name, version) -} - -assert System.properties['java.specification.version'] == '17' || '21' -java { - sourceCompatibility = '17' -} - -repositories { - mavenCentral() -} - -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.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' - implementation 'org.webjars:jquery:3.6.0' - implementation 'org.webjars:font-awesome:6.1.0' - - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' -} - -tasks.named('test') { - useJUnitPlatform() -} diff --git a/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.jar b/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index d64cd4917707c1f8861d8cb53dd15194d4248596..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43462 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 diff --git a/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.properties b/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 1af9e09..0000000 --- a/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -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/2 семестр/lab4-5/demo/gradlew b/2 семестр/lab4-5/demo/gradlew deleted file mode 100644 index 1aa94a4..0000000 --- a/2 семестр/lab4-5/demo/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/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/2 семестр/lab4-5/demo/gradlew.bat b/2 семестр/lab4-5/demo/gradlew.bat deleted file mode 100644 index 93e3f59..0000000 --- a/2 семестр/lab4-5/demo/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@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/2 семестр/lab4-5/demo/settings.gradle b/2 семестр/lab4-5/demo/settings.gradle deleted file mode 100644 index 0a383dd..0000000 --- a/2 семестр/lab4-5/demo/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'demo' diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/DemoApplication.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/DemoApplication.java deleted file mode 100644 index b7378dc..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/DemoApplication.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.example.demo; - -import java.util.Arrays; - -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.api.OrderProductDto; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.orders.service.OrderService; -import com.example.demo.product.model.ProductEntity; -import com.example.demo.product.service.ProductService; -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 ProductService productService; - private final OrderService orderService; - private final UserService userService; - - public DemoApplication(TypeService typeService, ProductService productService, OrderService orderService, UserService userService) { - this.typeService = typeService; - this.productService = productService; - this.orderService = orderService; - 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 && Arrays.asList(args).contains("--populate")) { - log.info("Create default types 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 product values"); - final var product1 = productService.create(new ProductEntity("test", type1, 399.00)); - final var product2 = productService.create(new ProductEntity("test", type1, 499.00)); - final var product3 = productService.create(new ProductEntity("test", type2, 450.50)); - final var product4 = productService.create(new ProductEntity("test", type2, 900.50)); - final var product5 = productService.create(new ProductEntity("test", type2, 600.00)); - final var product6 = productService.create(new ProductEntity("test", type3, 750.00)); - - log.info("Create default user values"); - final var user1 = userService.create(new UserEntity("Павел", "kruviii")); - final var user2 = userService.create(new UserEntity("Фёдор", "vihoof")); - final var user3 = userService.create(new UserEntity("Семён", "fragreg")); - - - log.info("Create default orders values"); - - orderService.create(user1.getId(), new OrderEntity(), Arrays.asList( - new OrderProductDto(product1.getId(), 3), - new OrderProductDto(product2.getId(), 1), - new OrderProductDto(product3.getId(), 2) - )); - - orderService.create(user2.getId(), new OrderEntity(), Arrays.asList( - new OrderProductDto(product4.getId(), 5) - )); - - orderService.create(user3.getId(), new OrderEntity(), Arrays.asList( - new OrderProductDto(product5.getId(), 1), - new OrderProductDto(product6.getId(), 1) - )); - } - //} -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/api/ComponentDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/api/ComponentDto.java deleted file mode 100644 index 1833c60..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/api/ComponentDto.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.example.demo.components.api; - -import com.example.demo.components.model.ComponentEntity; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -public class ComponentDto { - private long id; - @NotBlank - private String componentName; - @NotNull - private int price; - private int count = 0; - - public ComponentDto(ComponentEntity component) { - this.id = component.getId(); - this.componentName = component.getComponentName(); - this.price = component.getPrice(); - } - public ComponentDto(ComponentEntity component, int count) { - this.id = component.getId(); - this.componentName = component.getComponentName(); - this.price = component.getPrice(); - this.count = count; - } - - public ComponentDto() { - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getComponentName() { - return componentName; - } - - public void setComponentName(String componentName) { - this.componentName = componentName; - } - - public int getPrice() { - return price; - } - - public void setPrice(int price) { - this.price = price; - } - - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/model/ComponentEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/model/ComponentEntity.java deleted file mode 100644 index 085bb3c..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/model/ComponentEntity.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.example.demo.components.model; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -import com.example.demo.core.model.BaseEntity; - -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -@Entity -@Table(name = "components") -public class ComponentEntity extends BaseEntity { - @NotBlank - @Column(name = "name", nullable = false) - private String componentName; - @NotNull - @Column(name = "price", nullable = false) - private Integer price; - - @OneToMany(mappedBy = "component", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) - private List products; - - public ComponentEntity() { - } - - public ComponentEntity(String componentName, Integer price) { - this.componentName = componentName; - this.price = price; - } - - public String getComponentName() { - return componentName; - } - - public void setComponentName(String componentName) { - this.componentName = componentName; - } - - public Integer getPrice() { - return price; - } - - public void setPrice(Integer price) { - this.price = price; - } - - public List getProducts() { - return products; - } - - public void setProducts(List products) { - this.products = products; - } - - public void addProduct(ProductComponents productComponents) { - if (products == null) { - products = new ArrayList<>(); - } - if (!products.contains(productComponents)) - this.products.add(productComponents); - } - - public void removeProduct(ProductComponents productComponents) { - if (products.contains(productComponents)) - this.products.remove(productComponents); - } - - - @Override - public int hashCode() { - return Objects.hash(id, componentName, price); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - final ComponentEntity other = (ComponentEntity) o; - return Objects.equals(other.getId(), id) - && Objects.equals(other.getComponentName(), componentName) - && Objects.equals(other.getPrice(), price); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/repository/ComponentRepository.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/repository/ComponentRepository.java deleted file mode 100644 index e7176fe..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/repository/ComponentRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.demo.components.repository; - -import java.util.Optional; - -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.PagingAndSortingRepository; - -import com.example.demo.components.model.ComponentEntity; - -public interface ComponentRepository extends CrudRepository, PagingAndSortingRepository { - Optional findByNameIgnoreCase(String name); -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/GlobalController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/GlobalController.java deleted file mode 100644 index bc3f2ca..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/GlobalController.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.example.demo.core.api; - -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ModelAttribute; - -import com.example.demo.core.session.SessionCart; - -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; - -@ControllerAdvice -public class GlobalController { - private final SessionCart cart; - - public GlobalController(SessionCart cart) { - this.cart = cart; - } - - @ModelAttribute("servletPath") - String getRequestServletPath(HttpServletRequest request) { - return request.getServletPath(); - } - - @ModelAttribute("totalCart") - double getTotalCart(HttpSession session) { - return cart.getSum(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/PageAttributesMapper.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/PageAttributesMapper.java deleted file mode 100644 index 74ee38d..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/PageAttributesMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/Constants.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/Constants.java deleted file mode 100644 index 6d780a4..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/Constants.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.demo.core.configuration; - -public class Constants { - public static final String SEQUENCE_NAME = "hibernate_sequence"; - public static final int DEFAULT_PAGE_SIZE = 5; - public static final String REDIRECT_VIEW = "redirect:"; - public static final String ADMIN_PREFIX = "/admin"; - public static final String LOGIN_URL = "/login"; - public static final String LOGOUT_URL = "/logout"; - public static final String DEFAULT_PASSWORD = "123456"; - - private Constants() { - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java deleted file mode 100644 index 44defae..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java +++ /dev/null @@ -1,23 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/WebConfiguration.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/WebConfiguration.java deleted file mode 100644 index 146778d..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/WebConfiguration.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.demo.core.configuration; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -@Configuration -public class WebConfiguration implements WebMvcConfigurer { - @Override - public void addViewControllers(ViewControllerRegistry registry) { - registry.addViewController("/login").setViewName("login"); - } -} - diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/AdviceController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/AdviceController.java deleted file mode 100644 index 65f0c3e..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/AdviceController.java +++ /dev/null @@ -1,53 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/NotFoundException.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/NotFoundException.java deleted file mode 100644 index a61d118..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/NotFoundException.java +++ /dev/null @@ -1,7 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/model/BaseEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/model/BaseEntity.java deleted file mode 100644 index eba74ad..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/model/BaseEntity.java +++ /dev/null @@ -1,28 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/SecurityConfiguration.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/SecurityConfiguration.java deleted file mode 100644 index 6b375a3..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/SecurityConfiguration.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.example.demo.core.security; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.config.Customizer; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.SecurityFilterChain; - -import com.example.demo.core.configuration.Constants; -import com.example.demo.users.api.UserSignupController; -import com.example.demo.users.model.UserRole; - -@Configuration -@EnableWebSecurity -public class SecurityConfiguration { - @Bean - SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { - httpSecurity.headers(headers -> headers.frameOptions(FrameOptionsConfig::sameOrigin)); - httpSecurity.csrf(AbstractHttpConfigurer::disable); - httpSecurity.cors(Customizer.withDefaults()); - - httpSecurity.authorizeHttpRequests(requests -> requests - .requestMatchers("/css/**", "/webjars/**", "/*.svg") - .permitAll()); - - httpSecurity.authorizeHttpRequests(requests -> requests - .requestMatchers(Constants.ADMIN_PREFIX + "/**").hasRole(UserRole.ADMIN.name()) - .requestMatchers("/h2-console/**").hasRole(UserRole.ADMIN.name()) - .requestMatchers(UserSignupController.URL).anonymous() - .requestMatchers(Constants.LOGIN_URL).anonymous() - .anyRequest().authenticated()); - - httpSecurity.formLogin(formLogin -> formLogin - .loginPage(Constants.LOGIN_URL)); - - httpSecurity.rememberMe(rememberMe -> rememberMe.key("uniqueAndSecret")); - - httpSecurity.logout(logout -> logout - .deleteCookies("JSESSIONID")); - - return httpSecurity.build(); - } - - @Bean - DaoAuthenticationProvider authenticationProvider(UserDetailsService userDetailsService) { - final DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider(); - authProvider.setUserDetailsService(userDetailsService); - authProvider.setPasswordEncoder(passwordEncoder()); - return authProvider; - } - - @Bean - PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/UserPrincipal.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/UserPrincipal.java deleted file mode 100644 index ce646c6..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/UserPrincipal.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.example.demo.core.security; - -import java.util.Collection; -import java.util.Set; - -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import com.example.demo.users.model.UserEntity; - -public class UserPrincipal implements UserDetails { - private final long id; - private final String username; - private final String password; - private final Set roles; - private final boolean active; - - public UserPrincipal(UserEntity user) { - this.id = user.getId(); - this.username = user.getLogin(); - this.password = user.getPassword(); - this.roles = Set.of(user.getRole()); - this.active = true; - } - - public Long getId() { - return id; - } - - @Override - public String getUsername() { - return username; - } - - @Override - public String getPassword() { - return password; - } - - @Override - public Collection getAuthorities() { - return roles; - } - - @Override - public boolean isEnabled() { - return active; - } - - @Override - public boolean isAccountNonExpired() { - return isEnabled(); - } - - @Override - public boolean isAccountNonLocked() { - return isEnabled(); - } - - @Override - public boolean isCredentialsNonExpired() { - return isEnabled(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionCart.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionCart.java deleted file mode 100644 index 09f7d23..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionCart.java +++ /dev/null @@ -1,14 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionHelper.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionHelper.java deleted file mode 100644 index 6ee3d8c..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionHelper.java +++ /dev/null @@ -1,16 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderController.java deleted file mode 100644 index f74b9ef..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderController.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.example.demo.orders.api; - -import java.text.ParseException; - -import java.util.List; - -import org.hibernate.Hibernate; -import org.modelmapper.ModelMapper; -import org.springframework.data.domain.jaxb.SpringDataJaxb.PageDto; -import org.springframework.stereotype.Controller; -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.orders.model.OrderEntity; -import com.example.demo.orders.service.OrderService; -import com.example.demo.product.api.ProductDto; -import com.example.demo.product.model.ProductEntity; - -import jakarta.validation.Valid; - -@Controller -@RequestMapping(OrderController.URL) -public class OrderController { - public static final String URL = "/orders"; - private static final String ORDER_VIEW = "orders"; - private static final String ORDER_DETAILS_VIEW = "order-details"; - - private static final String ORDER_ATTRIBUTE = "order"; - private static final String PAGE_ATTRIBUTE = "page"; - - private final OrderService orderService; - private final ModelMapper modelMapper; - - public OrderController(OrderService orderService, ModelMapper modelMapper) { - this.orderService = orderService; - this.modelMapper = modelMapper; - } - - private OrderDto toDto(OrderEntity entity) { - Hibernate.initialize(entity.getOrderProducts()); - final OrderDto dto = modelMapper.map(entity, OrderDto.class); - dto.setSum(orderService.getSum(entity.getUser().getId(), entity.getId())); - dto.setCount(orderService.getFullCount(entity.getUser().getId(), entity.getId())); - return dto; - } - - private ProductDto toProductDto(ProductEntity entity) { - return modelMapper.map(entity, ProductDto.class); - } - - private OrderEntity toEntity(OrderDto dto) { - final OrderEntity entity = modelMapper.map(dto, OrderEntity.class); - return entity; - } - - @GetMapping - public PageDto getAll( - @PathVariable(name = "user") Long userId, - @RequestParam(name = "page", defaultValue = "0") int page, - @RequestParam(name = "size", defaultValue = Constants.DEFAULT_PAGE_SIZE) int size) { - return PageDtoMapper.toDto(orderService.getAll(userId, page, size), this::toDto); - } - - @GetMapping("/{id}") - public OrderDto get( - @PathVariable(name = "user") Long userId, - @PathVariable(name = "id") Long id) { - return toDto(orderService.get(userId, id)); - } - - @PostMapping - public OrderDto create( - @PathVariable(name = "user") Long userId, - @RequestBody @Valid OrderDto dto) throws ParseException { - return toDto(orderService.create(userId, toEntity(dto), dto.getOrderProducts())); - } - - @PutMapping("/{id}") - public OrderDto update( - @PathVariable(name = "user") Long userId, - @PathVariable(name = "id") Long id, - @RequestBody @Valid OrderDto dto) throws ParseException { - return toDto(orderService.update(userId, id, toEntity(dto), dto.getOrderProducts())); - } - - @DeleteMapping("/{id}") - public OrderDto delete( - @PathVariable(name = "user") Long userId, - @PathVariable(name = "id") Long id) { - return toDto(orderService.delete(userId, id)); - } - - @GetMapping("/{id}/product") - public List getOrderProducts( - @PathVariable(name = "user") Long userId, - @PathVariable(name = "id") Long id) { - return orderService.getOrderProducts(userId, id).stream().map(this::toProductDto).toList(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderDto.java deleted file mode 100644 index b56ec8d..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderDto.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.example.demo.orders.api; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class OrderDto { - @JsonProperty(access = JsonProperty.Access.READ_ONLY) - private Long id; - @JsonProperty(access = JsonProperty.Access.READ_ONLY) - private Double sum; - @JsonProperty(access = JsonProperty.Access.READ_ONLY) - private Integer count; - - private List orderProducts; - - - public List getOrderProducts() { - return orderProducts; - } - - public void setOrderProducts(List orderProducts) { - this.orderProducts = orderProducts; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Double getSum() { - return sum; - } - - public void setSum(Double sum) { - this.sum = sum; - } - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderProductDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderProductDto.java deleted file mode 100644 index 4747c8d..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderProductDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.example.demo.orders.api; - -import jakarta.validation.constraints.NotNull; - -public class OrderProductDto { - private Long productId; - @NotNull - private Integer count; - - public OrderProductDto(Long productId, Integer count) { - this.productId = productId; - this.count = count; - } - public OrderProductDto() { - } - - public Long getProductId() { - return productId; - } - - public void setProductId(Long id) { - this.productId = id; - } - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/model/OrderEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/model/OrderEntity.java deleted file mode 100644 index 2d8cd11..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/model/OrderEntity.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.example.demo.orders.model; - -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; - -import com.example.demo.users.model.UserEntity; -import com.example.demo.core.model.BaseEntity; -import com.example.demo.ordersproducts.model.OrderProductEntity; - -import jakarta.persistence.CascadeType; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.OrderBy; -import jakarta.persistence.Table; - -@Entity -@Table(name = "orders") -public class OrderEntity extends BaseEntity { - @ManyToOne - @JoinColumn(name = "userId", nullable = false) - private UserEntity user; - - @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true ) - @OrderBy("id ASC") - private Set orderProducts = new HashSet<>(); - - public UserEntity getUser() { - return user; - } - - public void setUser(UserEntity user) { - this.user = user; - if (!user.getOrders().contains(this)) { - user.getOrders().add(this); - } - } - - public Set getOrderProducts() { - return orderProducts; - } - - public void setOrdersProducts(Set set) { - this.orderProducts = set; - } - - public void addProduct(OrderProductEntity orderProduct) { - if (orderProduct.getOrder() != this) { - orderProduct.setOrder(this); - } - orderProducts.add(orderProduct); - } - - public void deleteProduct(OrderProductEntity orderProduct) { - if (orderProduct.getOrder() != this) { - return; - } - orderProducts.remove(orderProduct); - } - - @Override - public int hashCode() { - return Objects.hash(id, user.getId(), orderProducts); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - final OrderEntity other = (OrderEntity) obj; - return Objects.equals(other.getId(), id) - && Objects.equals(other.getUser().getId(), user.getId()) - && Objects.equals(other.getOrderProducts(), orderProducts); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/repository/OrderRepository.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/repository/OrderRepository.java deleted file mode 100644 index 119722a..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/repository/OrderRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -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.repository.CrudRepository; -import org.springframework.data.repository.PagingAndSortingRepository; - -import com.example.demo.orders.model.OrderEntity; - -public interface OrderRepository extends CrudRepository, PagingAndSortingRepository { - Optional findOneByUserIdAndId(long userId, long id); - - List findByUserId(long userId); - - Page findByUserId(long userId, Pageable pageable); -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/service/OrderService.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/service/OrderService.java deleted file mode 100644 index c379972..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/service/OrderService.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.example.demo.orders.service; - -import java.util.ArrayList; -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.api.OrderProductDto; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.orders.repository.OrderRepository; -import com.example.demo.product.model.ProductEntity; -import com.example.demo.product.service.ProductService; -import com.example.demo.users.model.UserEntity; -import com.example.demo.users.service.UserService; -import com.example.demo.ordersproducts.model.OrderProductEntity; - -@Service -public class OrderService { - private final OrderRepository repository; - private final UserService userService; - private final ProductService productService; - - public OrderService(OrderRepository repository, UserService userService, ProductService productService) { - this.repository = repository; - this.userService = userService; - this.productService = productService; - } - - @Transactional(readOnly = true) - public List getAll(Long userId) { - userService.get(userId); - return repository.findByUserId(userId); - } - - @Transactional(readOnly = true) - public Page getAll(long userId, int page, int size) { - final Pageable pageRequest = PageRequest.of(page, size); - userService.get(userId); - return repository.findByUserId(userId, pageRequest); - } - - @Transactional(readOnly = true) - public OrderEntity get(long userId, long id) { - userService.get(userId); - return repository.findOneByUserIdAndId(userId, id) - .orElseThrow(() -> new NotFoundException(OrderEntity.class, id)); - } - - @Transactional - public OrderEntity create(long userId, OrderEntity entity, List orderProductList) { - if (entity == null) { - throw new IllegalArgumentException("Entity is null"); - } - final UserEntity existsUser = userService.get(userId); - entity.setUser(existsUser); - entity = repository.save(entity); - - List orderProductListEntities = new ArrayList(); - for (OrderProductDto element : orderProductList) { - OrderProductEntity orderProductEntity = new OrderProductEntity(entity, productService.get(element.getProductId()), element.getCount()); - - orderProductEntity.setOrder(entity); - orderProductListEntities.add(orderProductEntity); - entity.addProduct(orderProductEntity); - } - - return repository.save(entity); - } - - @Transactional - public OrderEntity update(long userId, long id, OrderEntity entity, List orderProductList) { - userService.get(userId); - final OrderEntity existsEntity = get(userId, id); - existsEntity.getOrderProducts().clear(); - for (OrderProductDto dto : orderProductList) { - OrderProductEntity orderProductEntity = new OrderProductEntity(existsEntity, productService.get(dto.getProductId()), dto.getCount()); - existsEntity.addProduct(orderProductEntity); - } - 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 getOrderProducts(long userId, long id) { - userService.get(userId); - return get(userId, id).getOrderProducts().stream() - .map(orderProduct -> orderProduct.getProduct()) - .toList(); - } - - @Transactional(readOnly = true) - public Double getSum(long userId, long id) { - userService.get(userId); - return get(userId, id).getOrderProducts().stream() - .mapToDouble(orderProduct -> orderProduct.getCount() * orderProduct.getProduct().getPrice()) - .sum(); - } - - @Transactional(readOnly = true) - public Integer getFullCount(long userId, long id) { - userService.get(userId); - return get(userId, id).getOrderProducts().stream() - .mapToInt(OrderProductEntity::getCount) - .sum(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductEntity.java deleted file mode 100644 index 3eec5df..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.example.demo.ordersproducts.model; - -import java.util.Objects; - -import com.example.demo.core.model.BaseEntity; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.product.model.ProductEntity; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; - -@Entity -@Table(name = "orders_products") -public class OrderProductEntity extends BaseEntity { - @ManyToOne - @JoinColumn(name = "order_id") - private OrderEntity order; - @ManyToOne - @JoinColumn(name = "product_id") - private ProductEntity product; - @Column(nullable = false) - private Integer count; - - public OrderProductEntity() { - } - - public OrderProductEntity(OrderEntity order, ProductEntity product, Integer count) { - this.order = order; - this.product = product; - this.count = count; - } - - public OrderEntity getOrder() { - return order; - } - - public void setOrder(OrderEntity order) { - this.order = order; - if (!order.getOrderProducts().contains(this)) { - order.getOrderProducts().add(this); - } - } - - public ProductEntity getProduct() { - return product; - } - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } - - @Override - public int hashCode() { - return Objects.hash(id, order.getId(), product.getId(), count); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - OrderProductEntity other = (OrderProductEntity) obj; - return Objects.equals(id, other.id) - && Objects.equals(order.getId(), other.order.getId()) - && Objects.equals(product.getId(), other.product.getId()) - && count == other.count; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductId.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductId.java deleted file mode 100644 index 4670e7e..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductId.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.example.demo.ordersproducts.model; - -import java.util.Objects; -import java.util.Optional; - -import jakarta.persistence.Embeddable; - -@Embeddable -public class OrderProductId { - private Long orderId; - private Long productId; - - public OrderProductId() { - } - - public OrderProductId(Long orderId, Long productId) { - this.orderId = orderId; - this.productId = productId; - } - - public Long getOrderId() { - return orderId; - } - - public void setOrderId(Long orderId) { - this.orderId = orderId; - } - - public Long getProductId() { - return productId; - } - - public void setProductId(Long productId) { - this.productId = productId; - } - - @Override - public int hashCode() { - return Objects.hash( - Optional.ofNullable(orderId).orElse(0L), - Optional.ofNullable(productId).orElse(0L)); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - OrderProductId other = (OrderProductId) obj; - return Objects.equals(orderId, other.orderId) - && Objects.equals(productId, other.productId); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductController.java deleted file mode 100644 index c1647ac..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.example.demo.product.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.product.model.ProductEntity; -import com.example.demo.product.service.ProductService; -import com.example.demo.types.service.TypeService; - -import jakarta.validation.Valid; - -@Controller -@RequestMapping(ProductController.URL) -public class ProductController { - public static final String URL = Constants.ADMIN_PREFIX + "/product"; - private static final String PRODUCT_VIEW = "product"; - private static final String PRODUCT_EDIT_VIEW = "product-edit"; - private static final String PRODUCT_ATTRIBUTE = "product"; - - private final ProductService productService; - private final TypeService typeService; - private final ModelMapper modelMapper; - - public ProductController(ProductService productService, TypeService typeService, ModelMapper modelMapper) { - this.productService = productService; - this.typeService = typeService; - this.modelMapper = modelMapper; - } - - private ProductDto toDto(ProductEntity entity) { - return modelMapper.map(entity, ProductDto.class); - } - - private ProductEntity toEntity(ProductDto dto) { - final ProductEntity entity = modelMapper.map(dto, ProductEntity.class); - entity.setType(typeService.get(dto.getTypeId())); - return entity; - } - - @GetMapping - public String getAll(Model model) { - model.addAttribute( - "items", - productService.getAll(0).stream() - .map(this::toDto) - .toList()); - return PRODUCT_VIEW; - } - - @GetMapping("/edit/") - public String create(Model model) { - model.addAttribute(PRODUCT_ATTRIBUTE, new ProductDto()); - return PRODUCT_EDIT_VIEW; - } - - @PostMapping("/edit/") - public String create( - @ModelAttribute(name = PRODUCT_ATTRIBUTE) @Valid ProductDto product, - BindingResult bindingResult, - Model model) { - if (bindingResult.hasErrors()) { - return PRODUCT_EDIT_VIEW; - } - productService.create(toEntity(product)); - 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(PRODUCT_ATTRIBUTE, toDto(productService.get(id))); - return PRODUCT_EDIT_VIEW; - } - - @PostMapping("/edit/{id}") - public String update( - @PathVariable(name = "id") Long id, - @ModelAttribute(name = PRODUCT_ATTRIBUTE) @Valid ProductDto product, - BindingResult bindingResult, - Model model) { - if (bindingResult.hasErrors()) { - return PRODUCT_EDIT_VIEW; - } - if (id <= 0) { - throw new IllegalArgumentException(); - } - productService.update(id, toEntity(product)); - return Constants.REDIRECT_VIEW + URL; - } - - @PostMapping("/delete/{id}") - public String delete( - @PathVariable(name = "id") Long id) { - productService.delete(id); - return Constants.REDIRECT_VIEW + URL; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductDto.java deleted file mode 100644 index cd182fb..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductDto.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.example.demo.product.api; - -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -public class ProductDto { - private Long id; - @NotBlank - private String name; - @NotNull - @Min(1) - private Long typeId; - @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 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; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/model/ProductEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/model/ProductEntity.java deleted file mode 100644 index 62e81f9..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/model/ProductEntity.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.example.demo.product.model; - -import java.util.Objects; - -import com.example.demo.types.model.TypeEntity; -import com.example.demo.core.model.BaseEntity; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; - -@Entity -@Table(name = "products") -public class ProductEntity extends BaseEntity { - @Column(nullable = false) - private String name; - @ManyToOne - @JoinColumn(name = "typeId", nullable = false) - private TypeEntity type; - @Column(nullable = false) - private Double price; - - public ProductEntity() { - } - - public ProductEntity(String name, TypeEntity type, Double price) { - this.name = name; - this.type = type; - this.price = price; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - 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, name, type, price); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - final ProductEntity other = (ProductEntity) obj; - return Objects.equals(other.getId(), id) - && Objects.equals(other.getName(), name) - && Objects.equals(other.getType(), type) - && Objects.equals(other.getPrice(), price); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/repository/ProductRepository.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/repository/ProductRepository.java deleted file mode 100644 index e530575..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/repository/ProductRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.demo.product.repository; - -import java.util.List; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.PagingAndSortingRepository; - -import com.example.demo.product.model.ProductEntity; - -public interface ProductRepository extends CrudRepository, PagingAndSortingRepository { - List findByTypeId(long typeId); - - Page findByTypeId(long typeId, Pageable pageable); -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/service/ProductService.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/service/ProductService.java deleted file mode 100644 index 4632cf0..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/service/ProductService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.example.demo.product.service; - -import java.util.List; -import java.util.stream.StreamSupport; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.example.demo.core.error.NotFoundException; -import com.example.demo.product.model.ProductEntity; -import com.example.demo.product.repository.ProductRepository; - -@Service -public class ProductService { - private final ProductRepository repository; - - public ProductService(ProductRepository repository) { - this.repository = repository; - } - - @Transactional(readOnly = true) - public List getAll(long categoryId) { - if (categoryId <= 0L) { - return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); - } - return repository.findByTypeId(categoryId); - } - - @Transactional(readOnly = true) - public Page getAll(long typeId, int page, int size) { - final Pageable pageRequest = PageRequest.of(page, size); - if (typeId <= 0L) { - return repository.findAll(pageRequest); - } - return repository.findByTypeId(typeId, pageRequest); - } - - @Transactional(readOnly = true) - public ProductEntity get(long id) { - return repository.findById(id) - .orElseThrow(() -> new NotFoundException(ProductEntity.class, id)); - } - - @Transactional - public ProductEntity create(ProductEntity entity) { - if (entity == null) { - throw new IllegalArgumentException("Entity is null"); - } - return repository.save(entity); - } - - @Transactional - public ProductEntity update(Long id, ProductEntity entity) { - final ProductEntity existsEntity = get(id); - existsEntity.setName(entity.getName()); - existsEntity.setType(entity.getType()); - existsEntity.setPrice(entity.getPrice()); - return repository.save(existsEntity); - } - - @Transactional - public ProductEntity delete(Long id) { - final ProductEntity existsEntity = get(id); - repository.delete(existsEntity); - return existsEntity; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentEntity.java deleted file mode 100644 index 3b6170f..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentEntity.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.example.demo.productcomponents; - -import java.util.Objects; - -import com.example.demo.components.model.ComponentEntity; -import com.example.demo.core.model.BaseEntity; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.ordersproducts.model.OrderProductEntity; -import com.example.demo.product.model.ProductEntity; -import com.fasterxml.jackson.annotation.JsonIgnore; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.MapsId; -import jakarta.persistence.Table; -import jakarta.validation.constraints.NotNull; - -@Entity -@Table(name = "products_components") -public class ProductComponentEntity extends BaseEntity { - @ManyToOne - @MapsId("componentId") - @JoinColumn(name = "component_id") - private ComponentEntity component; - @ManyToOne - @MapsId("productId") - @JoinColumn(name = "product_id") - @JsonIgnore - private ProductEntity product; - @NotNull - @Column(name = "count") - private Integer count; - - public ProductComponentEntity() { - } - - public ProductComponentEntity(ComponentEntity component, ProductEntity product, Integer count) { - this.component = component; - this.id.setComponentId(component.getId()); - this.id.setProductId(product.getId()); - this.product = product; - this.count = count; - } - - public ComponentEntity getComponent() { - return component; - } - - public void setComponent(ComponentEntity component) { - this.component = component; - } - - public ProductEntity getProduct() { - return product; - } - - public void setProduct(ProductEntity product) { - this.product = product; - } - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } - - public void remove() { - product.getComponents().remove(this); - product = null; - component.getProducts().remove(this); - component = null; - } - - @Override - public int hashCode() { - return Objects.hash(id, component.getId(), product.getId(), count); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - ProductComponentEntity other = (ProductComponentEntity) obj; - return Objects.equals(id, other.id) - && Objects.equals(component.getId(), other.component.getId()) - && Objects.equals(product.getId(), other.product.getId()) - && count == other.count; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentId.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentId.java deleted file mode 100644 index f5710e7..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentId.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.example.demo.productcomponents; - -import java.util.Objects; -import java.util.Optional; - -import jakarta.persistence.Embeddable; - -@Embeddable -public class ProductComponentId { - private Long componentId; - private Long productId; - - public ProductComponentId() { - } - - public ProductComponentId(Long componentId, Long productId) { - this.componentId = componentId; - this.productId = productId; - } - - public Long getComponentId() { - return componentId; - } - - public void setComponentId(Long componentId) { - this.componentId = componentId; - } - - public Long getProductId() { - return productId; - } - - public void setProductId(Long productId) { - this.productId = productId; - } - - @Override - public int hashCode() { - return Objects.hash( - Optional.ofNullable(componentId).orElse(0L), - Optional.ofNullable(productId).orElse(0L)); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - ProductComponentId other = (ProductComponentId) obj; - return Objects.equals(componentId, other.componentId) - && Objects.equals(productId, other.productId); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeController.java deleted file mode 100644 index c90e831..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeController.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.example.demo.types.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 com.example.demo.core.api.PageAttributesMapper; -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 static final String PAGE_ATTRIBUTE = "page"; - - 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(@RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, Model model) { - final Map attributes = PageAttributesMapper.toAttributes( - typeService.getAll(page, Constants.DEFAULT_PAGE_SIZE), this::toDto); - model.addAllAttributes(attributes); - model.addAttribute(PAGE_ATTRIBUTE, page); - 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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeDto.java deleted file mode 100644 index 37b9f81..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeDto.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.example.demo.types.api; - -import jakarta.validation.constraints.NotBlank; - -public class TypeDto { - private Long id; - @NotBlank - 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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/model/TypeEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/model/TypeEntity.java deleted file mode 100644 index 14df9ea..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/model/TypeEntity.java +++ /dev/null @@ -1,48 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/repository/TypeRepository.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/repository/TypeRepository.java deleted file mode 100644 index fb863a7..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/repository/TypeRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/service/TypeService.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/service/TypeService.java deleted file mode 100644 index 5ef7062..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/service/TypeService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.example.demo.types.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.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(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 Page getAll(int page, int size) { - return repository.findAll(PageRequest.of(page, size, Sort.by("id"))); - } - - @Transactional(readOnly = true) - public TypeEntity get(Long id) { - return repository.findById(id) - .orElseThrow(() -> new NotFoundException(TypeEntity.class, id)); - } - - @Transactional - public TypeEntity create(TypeEntity entity) { - if (entity == null) { - throw new IllegalArgumentException("Entity is null"); - } - checkName(entity.getName()); - return repository.save(entity); - } - - @Transactional - public TypeEntity update(Long id, TypeEntity entity) { - final TypeEntity existsEntity = get(id); - existsEntity.setName(entity.getName()); - return repository.save(existsEntity); - } - - @Transactional - public TypeEntity delete(Long id) { - final TypeEntity existsEntity = get(id); - repository.delete(existsEntity); - return existsEntity; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserCartDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserCartDto.java deleted file mode 100644 index 584adf4..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserCartDto.java +++ /dev/null @@ -1,65 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserController.java deleted file mode 100644 index bd855d0..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserController.java +++ /dev/null @@ -1,127 +0,0 @@ -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.DEFAULT_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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserDto.java deleted file mode 100644 index d5a1cd7..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserDto.java +++ /dev/null @@ -1,36 +0,0 @@ -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; - private String role; - - 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 String getRole() { - return role; - } - - public void setRole(String role) { - this.role = role; - } -} \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupController.java deleted file mode 100644 index e64a5e1..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupController.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.example.demo.users.api; - -import java.util.Objects; - -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.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -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(UserSignupController.URL) -public class UserSignupController { - public static final String URL = "/signup"; - - private static final String SIGNUP_VIEW = "signup"; - private static final String USER_ATTRIBUTE = "user"; - - private final UserService userService; - private final ModelMapper modelMapper; - - public UserSignupController( - UserService userService, - ModelMapper modelMapper) { - this.userService = userService; - this.modelMapper = modelMapper; - } - - private UserEntity toEntity(UserSignupDto dto) { - return modelMapper.map(dto, UserEntity.class); - } - - @GetMapping - public String getSignup(Model model) { - model.addAttribute(USER_ATTRIBUTE, new UserSignupDto()); - return SIGNUP_VIEW; - } - - @PostMapping - public String signup( - @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserSignupDto user, - BindingResult bindingResult, - Model model) { - if (bindingResult.hasErrors()) { - return SIGNUP_VIEW; - } - if (!Objects.equals(user.getPassword(), user.getPasswordConfirm())) { - bindingResult.rejectValue("password", "signup:passwords", "Пароли не совпадают."); - model.addAttribute(USER_ATTRIBUTE, user); - return SIGNUP_VIEW; - } - userService.create(toEntity(user)); - return Constants.REDIRECT_VIEW + Constants.LOGIN_URL + "?signup"; - } - -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupDto.java deleted file mode 100644 index 0e9abc8..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupDto.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.example.demo.users.api; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; - -public class UserSignupDto { - @NotBlank - @Size(min = 3, max = 20) - private String login; - @NotBlank - @Size(min = 3, max = 20) - private String password; - @NotBlank - @Size(min = 3, max = 20) - private String passwordConfirm; - - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getPasswordConfirm() { - return passwordConfirm; - } - - public void setPasswordConfirm(String passwordConfirm) { - this.passwordConfirm = passwordConfirm; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserEntity.java deleted file mode 100644 index 9815c97..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.example.demo.users.model; - -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; - -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.OneToMany; -import jakarta.persistence.OrderBy; -import jakarta.persistence.Table; - -import com.example.demo.core.model.BaseEntity; -import com.example.demo.orders.model.OrderEntity; - -@Entity -@Table(name = "users") -public class UserEntity extends BaseEntity { - @Column(nullable = false, unique = true, length = 20) - private String login; - @Column(nullable = false, length = 60) - private String password; - private UserRole role; - @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) - @OrderBy("id ASC") - private Set orders = new HashSet<>(); - - public UserEntity() { - } - - public UserEntity(String login, String password) { - this.login = login; - this.password = password; - this.role = UserRole.USER; - } - - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public UserRole getRole() { - return role; - } - - public void setRole(UserRole role) { - this.role = role; - } - - public Set getOrders() { - return orders; - } - - public void addOrder(OrderEntity order) { - if (order.getUser() != this) { - order.setUser(this); - } - orders.add(order); - } - - @Override - public int hashCode() { - return Objects.hash(id, login, password, role, orders); - } - - @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.getPassword(), password) - && Objects.equals(other.getRole(), role) - && Objects.equals(other.getOrders(), orders); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserRole.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserRole.java deleted file mode 100644 index 00e8efa..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserRole.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.demo.users.model; - -import org.springframework.security.core.GrantedAuthority; - -public enum UserRole implements GrantedAuthority { - ADMIN, - USER; - - private static final String PREFIX = "ROLE_"; - - @Override - public String getAuthority() { - return PREFIX + this.name(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/repository/UserRepository.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/repository/UserRepository.java deleted file mode 100644 index 9bf3cae..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/repository/UserRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/service/UserService.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/service/UserService.java deleted file mode 100644 index eabb530..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/service/UserService.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.example.demo.users.service; - -import java.util.List; -import java.util.Optional; -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.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -import com.example.demo.core.configuration.Constants; -import com.example.demo.core.error.NotFoundException; -import com.example.demo.core.security.UserPrincipal; -import com.example.demo.users.model.UserEntity; -import com.example.demo.users.model.UserRole; -import com.example.demo.users.repository.UserRepository; - -@Service -public class UserService implements UserDetailsService { - private final UserRepository repository; - private final PasswordEncoder passwordEncoder; - - public UserService( - UserRepository repository, - PasswordEncoder passwordEncoder) { - this.repository = repository; - this.passwordEncoder = passwordEncoder; - } - - - 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()); - final String password = Optional.ofNullable(entity.getPassword()).orElse(""); - entity.setPassword(passwordEncoder.encode( - StringUtils.hasText(password.strip()) ? password : Constants.DEFAULT_PASSWORD)); - entity.setRole(Optional.ofNullable(entity.getRole()).orElse(UserRole.USER)); - repository.save(entity); - 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; - } - - @Override - @Transactional(readOnly = true) - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - final UserEntity existsUser = getByLogin(username); - return new UserPrincipal(existsUser); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/resources/application.properties b/2 семестр/lab4-5/demo/src/main/resources/application.properties deleted file mode 100644 index 62ab433..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/application.properties +++ /dev/null @@ -1,20 +0,0 @@ -# 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/2 семестр/lab4-5/demo/src/main/resources/public/css/style.css b/2 семестр/lab4-5/demo/src/main/resources/public/css/style.css deleted file mode 100644 index 7423490..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/public/css/style.css +++ /dev/null @@ -1,67 +0,0 @@ -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/2 семестр/lab4-5/demo/src/main/resources/public/favicon.svg b/2 семестр/lab4-5/demo/src/main/resources/public/favicon.svg deleted file mode 100644 index 7e1bd9a..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/public/favicon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/default.html b/2 семестр/lab4-5/demo/src/main/resources/templates/default.html deleted file mode 100644 index 786bb59..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/default.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - My shop - - - - - - - -

-
-
-
- Автор, [[${#dates.year(#dates.createNow())}]] -
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/error.html b/2 семестр/lab4-5/demo/src/main/resources/templates/error.html deleted file mode 100644 index faa6b0a..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/error.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Ошибка - - - -
-
    - -
  • - Неизвестная ошибка -
    • -     - -
  • - Ошибка: [[${message}]] -
    • -     - -
  • - Адрес: [[${url}]] -
    • -
  • - Класс исключения: [[${exception}]] -
    • -
  • - [[${method}]] ([[${file}]]:[[${line}]]) -
    • -     -
- На главную -
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/index.html b/2 семестр/lab4-5/demo/src/main/resources/templates/index.html deleted file mode 100644 index 76887d9..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Продукты - - - -
- -
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/login.html b/2 семестр/lab4-5/demo/src/main/resources/templates/login.html deleted file mode 100644 index eb3a6d7..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/login.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - Вход - - - -
-
-
- Неверный логин или пароль -
-
- Выход успешно произведен -
-
- Пользователь успешно создан -
-
- - -
-
- - -
-
- - -
-
- - Регистрация -
-
-
- - - - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/pagination.html b/2 семестр/lab4-5/demo/src/main/resources/templates/pagination.html deleted file mode 100644 index b11664a..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/pagination.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/product-edit.html b/2 семестр/lab4-5/demo/src/main/resources/templates/product-edit.html deleted file mode 100644 index 638225c..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/product-edit.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - Редакторовать продукт - - - -
-
-
- - -
-
- - -
-
-
- - -
-
-
- - -
-
-
- - -
-
-
- - -
-
-
- - Отмена -
-
-
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/product.html b/2 семестр/lab4-5/demo/src/main/resources/templates/product.html deleted file mode 100644 index efc66c7..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/product.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Продукты - - - -
- -

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

- -

Продукты

- - - - - - - - - - - - - - - - - - - - - - - -
IDНазваниеКатегорияЦена
-
- -
- 		-
- -
-
- - - - -
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/products.html b/2 семестр/lab4-5/demo/src/main/resources/templates/products.html deleted file mode 100644 index c118609..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/products.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Продукты - - - - - -

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

- -

[[${title}]]

- -
-
-
-
-

-
-

[[${product.price}]] руб.

-
-
- -
-
-
-
- - - - - - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/signup.html b/2 семестр/lab4-5/demo/src/main/resources/templates/signup.html deleted file mode 100644 index 293fcaa..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/signup.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Вход - - - -
-
-
- - -
-
-
- - -
-
-
- - -
-
-
- - Отмена -
-
-
- - - - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/type-edit.html b/2 семестр/lab4-5/demo/src/main/resources/templates/type-edit.html deleted file mode 100644 index 91f03ca..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/type-edit.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - Редакторовать тип заказа - - - -
-
-
- - -
-
- - -
-
-
- - Отмена -
-
-
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/type.html b/2 семестр/lab4-5/demo/src/main/resources/templates/type.html deleted file mode 100644 index ec0909e..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/type.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - Типы заказов - - - -
- -

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

- -

Типы заказов

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

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

- -

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

- - - - - - - - - - - - - - - - - - - -
IDИмя пользователя
-
- - -
- 		-
- - -
-
- - - -
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/test/java/com/example/demo/OrderServiceTests.java b/2 семестр/lab4-5/demo/src/test/java/com/example/demo/OrderServiceTests.java deleted file mode 100644 index c901859..0000000 --- a/2 семестр/lab4-5/demo/src/test/java/com/example/demo/OrderServiceTests.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.example.demo; - -import java.util.Arrays; - -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.transaction.annotation.Transactional; - -import com.example.demo.core.error.NotFoundException; -import com.example.demo.orders.api.OrderProductDto; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.orders.service.OrderService; -import com.example.demo.product.model.ProductEntity; -import com.example.demo.product.service.ProductService; -import com.example.demo.types.model.TypeEntity; -import com.example.demo.types.service.TypeService; -import com.example.demo.users.model.UserEntity; -import com.example.demo.users.service.UserService; - - -@SpringBootTest -public class OrderServiceTests { - // @Autowired - // private TypeService typeService; - - // @Autowired - // private ProductService productService; - - // @Autowired - // private UserService userService; - - // @Autowired - // private OrderService orderService; - - // private OrderEntity order; - - // private UserEntity user; - - // private ProductEntity product1; - // private ProductEntity product2; - // private ProductEntity product3; - - // @BeforeEach - // void createData() { - // removeData(); - - // final var type = typeService.create(new TypeEntity("Пепперони")); - // product1 = productService.create(new ProductEntity("test1", type, 399.00)); - // product2 = productService.create(new ProductEntity("test2", type, 499.00)); - // product3 = productService.create(new ProductEntity("test3", type, 450.50)); - // user = userService.create(new UserEntity("kruviii", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123")); - // order = orderService.create(user.getId(), new OrderEntity("ул. Северный венец, 32"), Arrays.asList( - // new OrderProductDto(product1.getId(), 3), - // new OrderProductDto(product2.getId(), 1), - // new OrderProductDto(product3.getId(), 2))); - // orderService.create(user.getId(), new OrderEntity("ул. Северный венец, 32"), Arrays.asList( - // new OrderProductDto(product1.getId(), 5))); - // orderService.create(user.getId(), new OrderEntity("ул. Северный венец, 32"), Arrays.asList( - // new OrderProductDto(product2.getId(), 1), - // new OrderProductDto(product3.getId(), 1))); - // } - - // @AfterEach - // void removeData() { - // userService.getAll().forEach(item -> userService.delete(item.getId())); - // productService.getAll(0L).forEach(item -> productService.delete(item.getId())); - // typeService.getAll().forEach(item -> typeService.delete(item.getId())); - // } - - // @Test - // void getTest() { - // Assertions.assertThrows(NotFoundException.class, () -> orderService.get(user.getId(), 0L)); - // } - - // @Transactional - // @Test - // void createTest() { - // Assertions.assertEquals(3, orderService.getAll(user.getId()).size()); - // Assertions.assertEquals(order, orderService.get(user.getId(), order.getId())); - // } - - // @Transactional - // @Test - // void updateTest() { - // final OrderEntity newEntity = orderService.update(user.getId(), order.getId(), new OrderEntity("ул. Северный венец, 32"), Arrays.asList( - // new OrderProductDto(product1.getId(), 5))); - // Assertions.assertEquals(3, orderService.getAll(user.getId()).size()); - // Assertions.assertEquals(newEntity, orderService.get(user.getId(), order.getId())); - // } - - // @Test - // void deleteTest() { - // orderService.delete(user.getId(), order.getId()); - // Assertions.assertEquals(2, orderService.getAll(user.getId()).size()); - - // final OrderEntity newEntity = orderService.create(user.getId(), new OrderEntity("ул. Северный венец, 32"), Arrays.asList( - // new OrderProductDto(product1.getId(), 5))); - // Assertions.assertEquals(3, orderService.getAll(user.getId()).size()); - // Assertions.assertNotEquals(order.getId(), newEntity.getId()); - // } - - // @Test - // void getSumTest() { - // Double sum = orderService.getSum(user.getId(), order.getId()); - // Assertions.assertEquals(product1.getPrice() * 3 + product2.getPrice() + product3.getPrice() * 2, sum); - // } - - // @Test - // void getFullCountTest() { - // Integer count = orderService.getFullCount(user.getId(), order.getId()); - // Assertions.assertEquals(6, count); - // } -} diff --git a/2 семестр/lab4-5/demo/src/test/java/com/example/demo/ProductServiceTests.java b/2 семестр/lab4-5/demo/src/test/java/com/example/demo/ProductServiceTests.java deleted file mode 100644 index 2e29c35..0000000 --- a/2 семестр/lab4-5/demo/src/test/java/com/example/demo/ProductServiceTests.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.example.demo; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.dao.DataIntegrityViolationException; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; - -import com.example.demo.core.error.NotFoundException; -import com.example.demo.product.model.ProductEntity; -import com.example.demo.product.service.ProductService; -import com.example.demo.types.model.TypeEntity; -import com.example.demo.types.service.TypeService; - -import jakarta.transaction.Transactional; - -@SpringBootTest -@TestMethodOrder(OrderAnnotation.class) -class ProductsServiceTests { - @Autowired - private TypeService typeService; - - private TypeEntity type; - - @Autowired - private ProductService productService; - - private ProductEntity product; - - void createData() { - removeData(); - - type = typeService.create(new TypeEntity("Мясная")); - final var type2 = typeService.create(new TypeEntity("Пепперони")); - final var type3 = typeService.create(new TypeEntity("Сырная")); - - - product = productService.create(new ProductEntity("test", type, 399.00)); - productService.create(new ProductEntity("test", type2, 499.00)); - productService.create(new ProductEntity("test", type3, 450.50)); - } - - void removeData() { - productService.getAll(0L).forEach(item -> productService.delete(item.getId())); - typeService.getAll().forEach(item -> typeService.delete(item.getId())); - } - - @Test - void getTest() { - Assertions.assertThrows(NotFoundException.class, () -> productService.get(0L)); - } - - @Transactional - @Test - void createTest() { - Assertions.assertEquals(6, productService.getAll(0L).size()); - product = productService.create(new ProductEntity("test1", type, 399.00)); - Assertions.assertEquals(product, productService.get(product.getId())); - } - - @Test - void createNullableTest() { - final ProductEntity nullableProduct = new ProductEntity(null, type, 399.00);; - Assertions.assertThrows(DataIntegrityViolationException.class, () -> productService.create(nullableProduct)); - } - - @Transactional - @Test - void updateTest() { - final String test = "TEST"; - final TypeEntity newType = typeService.create(new TypeEntity("Фреш")); - product = productService.create(new ProductEntity("te2st", type, 399.00)); - final TypeEntity oldType = product.getType(); - final ProductEntity newEntity = productService.update(product.getId(), new ProductEntity(test, newType, 100.00)); - - Assertions.assertEquals(newEntity, productService.get(product.getId())); - Assertions.assertEquals(test, newEntity.getName()); - Assertions.assertEquals(newType, newEntity.getType()); - Assertions.assertNotEquals(oldType, newEntity.getType()); - } - - @Test - void deleteTest() { - type = typeService.create(new TypeEntity("yynrrnn")); - product = productService.create(new ProductEntity("te2st", type, 399.00)); - productService.delete(product.getId()); - Assertions.assertEquals(6, productService.getAll(0L).size()); - - final ProductEntity newEntity = productService.create(new ProductEntity(product.getName(), product.getType(), product.getPrice())); - Assertions.assertEquals(7, typeService.getAll().size()); - Assertions.assertNotEquals(product.getId(), newEntity.getId()); - } -} \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/test/java/com/example/demo/TypeServiceTests.java b/2 семестр/lab4-5/demo/src/test/java/com/example/demo/TypeServiceTests.java deleted file mode 100644 index 32b76d0..0000000 --- a/2 семестр/lab4-5/demo/src/test/java/com/example/demo/TypeServiceTests.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.example.demo; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.dao.DataIntegrityViolationException; - -import com.example.demo.core.error.NotFoundException; -import com.example.demo.types.model.TypeEntity; -import com.example.demo.types.service.TypeService; - -@SpringBootTest -@TestMethodOrder(OrderAnnotation.class) -class TypeServiceTests { - @Autowired - private TypeService typeService; - - private TypeEntity type; - - void createData() { - - - type = typeService.create(new TypeEntity("Пепперони")); - typeService.create(new TypeEntity("Мясная")); - typeService.create(new TypeEntity("4 сыра")); - } - - - void removeData() { - typeService.getAll().forEach(item -> typeService.delete(item.getId())); - } - - @Test - void getTest() { - Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L)); - } - - @Test - void createTest() { - type = typeService.create(new TypeEntity("thdgndgneth")); - Assertions.assertEquals(5, 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"; - type = typeService.create(new TypeEntity("ryjhjhrrnh")); - final String oldName = type.getName(); - final TypeEntity newEntity = typeService.update(type.getId(), new TypeEntity(test)); - Assertions.assertEquals(4, typeService.getAll().size()); - Assertions.assertEquals(newEntity, typeService.get(type.getId())); - Assertions.assertEquals(test, newEntity.getName()); - Assertions.assertNotEquals(oldName, newEntity.getName()); - } - - @Test - void deleteTest() { - type = typeService.create(new TypeEntity("gnnetnten")); - typeService.delete(type.getId()); - Assertions.assertEquals(5, typeService.getAll().size()); - - final TypeEntity newEntity = typeService.create(new TypeEntity(type.getName())); - Assertions.assertEquals(6, typeService.getAll().size()); - Assertions.assertNotEquals(type.getId(), newEntity.getId()); - } -} diff --git a/2 семестр/lab4-5/demo/src/test/java/com/example/demo/UserServiceTests.java b/2 семестр/lab4-5/demo/src/test/java/com/example/demo/UserServiceTests.java deleted file mode 100644 index f0db171..0000000 --- a/2 семестр/lab4-5/demo/src/test/java/com/example/demo/UserServiceTests.java +++ /dev/null @@ -1,85 +0,0 @@ -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.users.model.UserEntity; -import com.example.demo.users.service.UserService; - -import jakarta.transaction.Transactional; - -@SpringBootTest -class UserServiceTests { - // @Autowired - // private UserService userService; - - // private UserEntity user; - - // @BeforeEach - // void createData() { - // removeData(); - - // user = userService.create(new UserEntity("kruviii", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123")); - // userService.create(new UserEntity("vihoof", "Фёдор", "Лопатин", "test1@test.ru", "22-12-2023", "+79875433210", "qwerty321")); - // userService.create(new UserEntity("fragreg", "Семён", "Кукушкин", "test2@test.ru", "03-02-2023", "+74567433210", "qwerty451")); - // } - - // @AfterEach - // void removeData() { - // userService.getAll().forEach(item -> userService.delete(item.getId())); - // } - - // @Test - // void getTest() { - // Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L)); - // } - - // @Transactional - // @Test - // void createTest() { - // Assertions.assertEquals(3, userService.getAll().size()); - // Assertions.assertEquals(user, userService.get(user.getId())); - // } - - // @Test - // void createNotUniqueTest() { - // final UserEntity nonUniqueUser = new UserEntity("kruviii", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123"); - // Assertions.assertThrows(IllegalArgumentException.class, () -> userService.create(nonUniqueUser)); - // } - - // @Test - // void createNullableTest() { - // final UserEntity nullableUser = new UserEntity(null, "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123"); - // Assertions.assertThrows(DataIntegrityViolationException.class, () -> userService.create(nullableUser)); - // } - - // @Transactional - // @Test - // void updateTest() { - // final String test = "TEST"; - // final String oldLogin = user.getLogin(); - // final UserEntity newEntity = userService.update(user.getId(), - // new UserEntity("kruvi", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123")); - // Assertions.assertEquals(3, userService.getAll().size()); - // Assertions.assertEquals(newEntity, userService.get(user.getId())); - // Assertions.assertNotEquals(test, newEntity.getLogin()); - // Assertions.assertNotEquals(oldLogin, newEntity.getLogin()); - // } - - // @Test - // void deleteTest() { - // userService.delete(user.getId()); - // Assertions.assertEquals(2, userService.getAll().size()); - - // final UserEntity newEntity = userService - // .create(new UserEntity("kruviii", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123")); - // Assertions.assertEquals(3, userService.getAll().size()); - // Assertions.assertNotEquals(user.getId(), newEntity.getId()); - // } -} diff --git a/2 семестр/lab4-5/demo/src/test/resources/application.properties b/2 семестр/lab4-5/demo/src/test/resources/application.properties deleted file mode 100644 index d5f355c..0000000 --- a/2 семестр/lab4-5/demo/src/test/resources/application.properties +++ /dev/null @@ -1,14 +0,0 @@ -# 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