From 0ba91b1a069717f2754ce93e6a5b9bb586298d36 Mon Sep 17 00:00:00 2001 From: Kirill <117719052+KirillFirsof@users.noreply.github.com> Date: Wed, 5 Jun 2024 09:41:36 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B8=D1=87=D0=B5=D0=B3=D0=BE=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=BB=D0=BE=D0=BC=D0=B0=D0=BB,=20=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D1=80=D0=B0=D0=B2=D0=BD=D0=BE=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=87=D0=B0=D0=BB=20=D0=B2=D1=81=D0=B5=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laba5.1/.gitignore | 36 +++ Laba5.1/.vscode/extensions.json | 12 + Laba5.1/.vscode/launch.json | 14 + Laba5.1/.vscode/settings.json | 24 ++ Laba5.1/build.gradle | 55 ++++ Laba5.1/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + Laba5.1/gradlew | 249 ++++++++++++++++ Laba5.1/gradlew.bat | 92 ++++++ Laba5.1/readme.md | 11 + Laba5.1/settings.gradle | 1 + .../com/example/demo/DemoApplication.java | 84 ++++++ .../demo/core/api/GlobalController.java | 28 ++ .../demo/core/api/PageAttributesMapper.java | 18 ++ .../demo/core/configuration/Constants.java | 19 ++ .../configuration/MapperConfiguration.java | 23 ++ .../configuration/SchedulerConfiguration.java | 9 + .../core/configuration/WebConfiguration.java | 13 + .../demo/core/error/AdviceController.java | 53 ++++ .../demo/core/error/NotFoundException.java | 7 + .../example/demo/core/file/FileHelper.java | 79 +++++ .../example/demo/core/model/BaseEntity.java | 28 ++ .../core/security/SecurityConfiguration.java | 67 +++++ .../demo/core/security/UserPrincipal.java | 64 ++++ .../demo/core/session/SessionCart.java | 14 + .../demo/core/session/SessionHelper.java | 16 + .../com/example/demo/orders/api/OrderDto.java | 62 ++++ .../demo/orders/api/OrderGroupedDto.java | 31 ++ .../demo/orders/model/OrderEntity.java | 112 +++++++ .../demo/orders/model/OrderGrouped.java | 11 + .../orders/repository/OrderRepository.java | 42 +++ .../demo/orders/service/OrderService.java | 103 +++++++ .../api/SubscriptionController.java | 104 +++++++ .../subscriptions/api/SubscriptionDto.java | 27 ++ .../model/SubscriptionEntity.java | 68 +++++ .../repository/SubscriptionRepository.java | 13 + .../service/SubscriptionService.java | 66 +++++ .../demo/types/api/TypeController.java | 104 +++++++ .../com/example/demo/types/api/TypeDto.java | 27 ++ .../example/demo/types/model/TypeEntity.java | 48 +++ .../demo/types/repository/TypeRepository.java | 13 + .../demo/types/service/TypeService.java | 75 +++++ .../demo/users/api/UserCartController.java | 173 +++++++++++ .../example/demo/users/api/UserCartDto.java | 86 ++++++ .../demo/users/api/UserController.java | 127 ++++++++ .../com/example/demo/users/api/UserDto.java | 36 +++ .../demo/users/api/UserProfileController.java | 147 ++++++++++ .../demo/users/api/UserProfileDto.java | 23 ++ .../demo/users/api/UserSignupController.java | 65 +++++ .../example/demo/users/api/UserSignupDto.java | 40 +++ .../demo/users/api/UserSubscriptionDto.java | 31 ++ .../example/demo/users/model/UserEntity.java | 114 ++++++++ .../example/demo/users/model/UserRole.java | 15 + .../model/UserSubscriptionWithStatus.java | 60 ++++ .../demo/users/repository/UserRepository.java | 13 + .../demo/users/service/UserService.java | 164 +++++++++++ .../model/UserSubscriptionEntity.java | 95 ++++++ .../model/UserSubscriptionId.java | 55 ++++ .../demo/ws/api/MessageController.java | 40 +++ .../com/example/demo/ws/api/MessageDto.java | 27 ++ .../configuration/WebSocketConfiguration.java | 53 ++++ .../demo/ws/scheduler/MessageScheduler.java | 24 ++ .../demo/ws/service/MessageService.java | 23 ++ .../src/main/resources/application.properties | 24 ++ Laba5.1/src/main/resources/public/batman.svg | 1 + .../src/main/resources/public/css/style.css | 120 ++++++++ .../src/main/resources/public/einstein.svg | 1 + Laba5.1/src/main/resources/public/favicon.svg | 3 + .../src/main/resources/templates/cart.html | 91 ++++++ .../src/main/resources/templates/default.html | 275 ++++++++++++++++++ .../src/main/resources/templates/error.html | 37 +++ .../src/main/resources/templates/login.html | 44 +++ .../src/main/resources/templates/orders.html | 70 +++++ .../main/resources/templates/pagination.html | 51 ++++ .../src/main/resources/templates/profile.html | 57 ++++ .../src/main/resources/templates/signup.html | 37 +++ .../templates/subscription-edit.html | 29 ++ .../resources/templates/subscription.html | 51 ++++ .../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/TypeServiceTests.java | 79 +++++ .../example/demo/UserOrderServiceTest.java | 133 +++++++++ .../src/test/resources/application.properties | 14 + .../demo/userfilms/model/UserfilmEntity.java | 4 + .../repository/UserfilmRepository.java | 6 +- .../userfilms/service/UserfilmService.java | 12 +- .../demo/users/api/UserCabinetController.java | 57 ++-- .../src/main/resources/templates/cabinet.html | 11 +- .../main/resources/templates/userfilms.html | 29 +- 91 files changed, 4692 insertions(+), 47 deletions(-) create mode 100644 Laba5.1/.gitignore create mode 100644 Laba5.1/.vscode/extensions.json create mode 100644 Laba5.1/.vscode/launch.json create mode 100644 Laba5.1/.vscode/settings.json create mode 100644 Laba5.1/build.gradle create mode 100644 Laba5.1/gradle/wrapper/gradle-wrapper.jar create mode 100644 Laba5.1/gradle/wrapper/gradle-wrapper.properties create mode 100644 Laba5.1/gradlew create mode 100644 Laba5.1/gradlew.bat create mode 100644 Laba5.1/readme.md create mode 100644 Laba5.1/settings.gradle create mode 100644 Laba5.1/src/main/java/com/example/demo/DemoApplication.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/api/GlobalController.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/api/PageAttributesMapper.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/configuration/Constants.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/configuration/SchedulerConfiguration.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/configuration/WebConfiguration.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/error/AdviceController.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/error/NotFoundException.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/file/FileHelper.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/model/BaseEntity.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/security/SecurityConfiguration.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/security/UserPrincipal.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/session/SessionCart.java create mode 100644 Laba5.1/src/main/java/com/example/demo/core/session/SessionHelper.java create mode 100644 Laba5.1/src/main/java/com/example/demo/orders/api/OrderDto.java create mode 100644 Laba5.1/src/main/java/com/example/demo/orders/api/OrderGroupedDto.java create mode 100644 Laba5.1/src/main/java/com/example/demo/orders/model/OrderEntity.java create mode 100644 Laba5.1/src/main/java/com/example/demo/orders/model/OrderGrouped.java create mode 100644 Laba5.1/src/main/java/com/example/demo/orders/repository/OrderRepository.java create mode 100644 Laba5.1/src/main/java/com/example/demo/orders/service/OrderService.java create mode 100644 Laba5.1/src/main/java/com/example/demo/subscriptions/api/SubscriptionController.java create mode 100644 Laba5.1/src/main/java/com/example/demo/subscriptions/api/SubscriptionDto.java create mode 100644 Laba5.1/src/main/java/com/example/demo/subscriptions/model/SubscriptionEntity.java create mode 100644 Laba5.1/src/main/java/com/example/demo/subscriptions/repository/SubscriptionRepository.java create mode 100644 Laba5.1/src/main/java/com/example/demo/subscriptions/service/SubscriptionService.java create mode 100644 Laba5.1/src/main/java/com/example/demo/types/api/TypeController.java create mode 100644 Laba5.1/src/main/java/com/example/demo/types/api/TypeDto.java create mode 100644 Laba5.1/src/main/java/com/example/demo/types/model/TypeEntity.java create mode 100644 Laba5.1/src/main/java/com/example/demo/types/repository/TypeRepository.java create mode 100644 Laba5.1/src/main/java/com/example/demo/types/service/TypeService.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/api/UserCartController.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/api/UserCartDto.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/api/UserController.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/api/UserDto.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/api/UserProfileController.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/api/UserProfileDto.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/api/UserSignupController.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/api/UserSignupDto.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/api/UserSubscriptionDto.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/model/UserEntity.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/model/UserRole.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/model/UserSubscriptionWithStatus.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/repository/UserRepository.java create mode 100644 Laba5.1/src/main/java/com/example/demo/users/service/UserService.java create mode 100644 Laba5.1/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionEntity.java create mode 100644 Laba5.1/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionId.java create mode 100644 Laba5.1/src/main/java/com/example/demo/ws/api/MessageController.java create mode 100644 Laba5.1/src/main/java/com/example/demo/ws/api/MessageDto.java create mode 100644 Laba5.1/src/main/java/com/example/demo/ws/configuration/WebSocketConfiguration.java create mode 100644 Laba5.1/src/main/java/com/example/demo/ws/scheduler/MessageScheduler.java create mode 100644 Laba5.1/src/main/java/com/example/demo/ws/service/MessageService.java create mode 100644 Laba5.1/src/main/resources/application.properties create mode 100644 Laba5.1/src/main/resources/public/batman.svg create mode 100644 Laba5.1/src/main/resources/public/css/style.css create mode 100644 Laba5.1/src/main/resources/public/einstein.svg create mode 100644 Laba5.1/src/main/resources/public/favicon.svg create mode 100644 Laba5.1/src/main/resources/templates/cart.html create mode 100644 Laba5.1/src/main/resources/templates/default.html create mode 100644 Laba5.1/src/main/resources/templates/error.html create mode 100644 Laba5.1/src/main/resources/templates/login.html create mode 100644 Laba5.1/src/main/resources/templates/orders.html create mode 100644 Laba5.1/src/main/resources/templates/pagination.html create mode 100644 Laba5.1/src/main/resources/templates/profile.html create mode 100644 Laba5.1/src/main/resources/templates/signup.html create mode 100644 Laba5.1/src/main/resources/templates/subscription-edit.html create mode 100644 Laba5.1/src/main/resources/templates/subscription.html create mode 100644 Laba5.1/src/main/resources/templates/type-edit.html create mode 100644 Laba5.1/src/main/resources/templates/type.html create mode 100644 Laba5.1/src/main/resources/templates/user-edit.html create mode 100644 Laba5.1/src/main/resources/templates/user.html create mode 100644 Laba5.1/src/test/java/com/example/demo/TypeServiceTests.java create mode 100644 Laba5.1/src/test/java/com/example/demo/UserOrderServiceTest.java create mode 100644 Laba5.1/src/test/resources/application.properties diff --git a/Laba5.1/.gitignore b/Laba5.1/.gitignore new file mode 100644 index 0000000..546ecee --- /dev/null +++ b/Laba5.1/.gitignore @@ -0,0 +1,36 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +data.*.db \ No newline at end of file diff --git a/Laba5.1/.vscode/extensions.json b/Laba5.1/.vscode/extensions.json new file mode 100644 index 0000000..42cf79d --- /dev/null +++ b/Laba5.1/.vscode/extensions.json @@ -0,0 +1,12 @@ +{ + "recommendations": [ + // fronted + "AndersEAndersen.html-class-suggestions", + "dbaeumer.vscode-eslint", + // backend + "vscjava.vscode-java-pack", + "vmware.vscode-boot-dev-pack", + "vscjava.vscode-gradle", + "redhat.vscode-xml" + ] +} \ No newline at end of file diff --git a/Laba5.1/.vscode/launch.json b/Laba5.1/.vscode/launch.json new file mode 100644 index 0000000..c6b156c --- /dev/null +++ b/Laba5.1/.vscode/launch.json @@ -0,0 +1,14 @@ +{ + "configurations": [ + { + "type": "java", + "name": "Demo", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "lec7", + "args": "--populate", + "envFile": "${workspaceFolder}/.env" + } + ] +} \ No newline at end of file diff --git a/Laba5.1/.vscode/settings.json b/Laba5.1/.vscode/settings.json new file mode 100644 index 0000000..95915c9 --- /dev/null +++ b/Laba5.1/.vscode/settings.json @@ -0,0 +1,24 @@ +{ + "editor.tabSize": 4, + "editor.detectIndentation": false, + "editor.insertSpaces": true, + "editor.formatOnPaste": true, + "editor.formatOnSave": true, + "editor.formatOnType": false, + "java.compile.nullAnalysis.mode": "disabled", + "java.configuration.updateBuildConfiguration": "automatic", + "[java]": { + "editor.pasteAs.enabled": false, + }, + "gradle.nestedProjects": true, + "java.saveActions.organizeImports": true, + "java.dependency.packagePresentation": "hierarchical", + "spring-boot.ls.problem.boot2.JAVA_CONSTRUCTOR_PARAMETER_INJECTION": "WARNING", + "spring.initializr.defaultLanguage": "Java", + "java.format.settings.url": ".vscode/eclipse-formatter.xml", + "java.project.explorer.showNonJavaResources": true, + "java.codeGeneration.hashCodeEquals.useJava7Objects": true, + "cSpell.words": [ + "classappend" + ], +} \ No newline at end of file diff --git a/Laba5.1/build.gradle b/Laba5.1/build.gradle new file mode 100644 index 0000000..40518d0 --- /dev/null +++ b/Laba5.1/build.gradle @@ -0,0 +1,55 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.4' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +defaultTasks 'bootRun' + +jar { + enabled = false +} + +bootJar { + archiveFileName = String.format('%s-%s.jar', rootProject.name, version) +} + +assert System.properties['java.specification.version'] == '17' || '21' +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.modelmapper:modelmapper:3.2.0' + + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'com.h2database:h2:2.2.224' + + implementation 'org.springframework.boot:spring-boot-devtools' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0' + runtimeOnly 'org.webjars.npm:bootstrap:5.3.3' + runtimeOnly 'org.webjars.npm:bootstrap-icons:1.11.3' + + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' + + implementation 'org.springframework.boot:spring-boot-starter-websocket' + implementation 'org.springframework.security:spring-security-messaging' + runtimeOnly 'org.webjars.npm:stomp__stompjs:7.0.0' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/Laba5.1/gradle/wrapper/gradle-wrapper.jar b/Laba5.1/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/Laba5.1/gradle/wrapper/gradle-wrapper.properties b/Laba5.1/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/Laba5.1/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/Laba5.1/gradlew b/Laba5.1/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/Laba5.1/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Laba5.1/gradlew.bat b/Laba5.1/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/Laba5.1/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Laba5.1/readme.md b/Laba5.1/readme.md new file mode 100644 index 0000000..057fa23 --- /dev/null +++ b/Laba5.1/readme.md @@ -0,0 +1,11 @@ +H2 Console: \ +http://localhost:8080/h2-console + +JDBC URL: jdbc:h2:file:./data \ +User Name: sa \ +Password: password + +Почитать: + +- Security with Spring https://www.baeldung.com/security-spring +- Spring Security https://docs.spring.io/spring-security/reference/index.html diff --git a/Laba5.1/settings.gradle b/Laba5.1/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/Laba5.1/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/Laba5.1/src/main/java/com/example/demo/DemoApplication.java b/Laba5.1/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..5566a90 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,84 @@ +package com.example.demo; + +import java.util.List; +import java.util.Objects; +import java.util.stream.IntStream; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.service.OrderService; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.model.UserRole; +import com.example.demo.users.service.UserService; + +@SpringBootApplication +public class DemoApplication implements CommandLineRunner { + private final Logger log = LoggerFactory.getLogger(DemoApplication.class); + + private final TypeService typeService; + private final SubscriptionService subscriptionService; + private final UserService userService; + private final OrderService orderService; + + public DemoApplication( + TypeService typeService, + SubscriptionService subscriptionService, + UserService userService, + OrderService orderService) { + this.typeService = typeService; + this.subscriptionService = subscriptionService; + this.userService = userService; + this.orderService = orderService; + } + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + + @Override + public void run(String... args) throws Exception { + if (args.length > 0 && Objects.equals("--populate", args[0])) { + log.info("Create default type values"); + final var type1 = typeService.create(new TypeEntity("Ноутбук")); + final var type2 = typeService.create(new TypeEntity("Телефон")); + final var type3 = typeService.create(new TypeEntity("Игровая приставка")); + + log.info("Create default subscription values"); + subscriptionService.create(new SubscriptionEntity("Подписка 1")); + subscriptionService.create(new SubscriptionEntity("Подписка 2")); + subscriptionService.create(new SubscriptionEntity("Подписка 3")); + + log.info("Create default user values"); + final var admin = new UserEntity("admin", "admin"); + admin.setRole(UserRole.ADMIN); + userService.create(admin); + + final var user1 = userService.create(new UserEntity("user1", Constants.DEFAULT_PASSWORD)); + + IntStream.range(2, 27) + .forEach(value -> userService.create( + new UserEntity("user".concat(String.valueOf(value)), Constants.DEFAULT_PASSWORD))); + + log.info("Create default order values"); + final var orders = List.of( + new OrderEntity(type1, 49999.00, 20), + new OrderEntity(type1, 129999.00, 3), + new OrderEntity(type2, 15450.50, 30), + new OrderEntity(type2, 69900.50, 10), + new OrderEntity(type2, 150000.00, 6), + new OrderEntity(type3, 75000.00, 6), + new OrderEntity(type3, 67800.00, 3)); + orders.forEach(order -> orderService.create(user1.getId(), order)); + } + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/core/api/GlobalController.java b/Laba5.1/src/main/java/com/example/demo/core/api/GlobalController.java new file mode 100644 index 0000000..bc3f2ca --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/api/GlobalController.java @@ -0,0 +1,28 @@ +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/Laba5.1/src/main/java/com/example/demo/core/api/PageAttributesMapper.java b/Laba5.1/src/main/java/com/example/demo/core/api/PageAttributesMapper.java new file mode 100644 index 0000000..74ee38d --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/api/PageAttributesMapper.java @@ -0,0 +1,18 @@ +package com.example.demo.core.api; + +import java.util.Map; +import java.util.function.Function; + +import org.springframework.data.domain.Page; + +public class PageAttributesMapper { + private PageAttributesMapper() { + } + + public static Map toAttributes(Page page, Function mapper) { + return Map.of( + "items", page.getContent().stream().map(mapper::apply).toList(), + "currentPage", page.getNumber(), + "totalPages", page.getTotalPages()); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/core/configuration/Constants.java b/Laba5.1/src/main/java/com/example/demo/core/configuration/Constants.java new file mode 100644 index 0000000..0bf6e30 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/configuration/Constants.java @@ -0,0 +1,19 @@ +package com.example.demo.core.configuration; + +public class Constants { + public static final String SEQUENCE_NAME = "hibernate_sequence"; + + public static final int DEFUALT_PAGE_SIZE = 5; + + public static final String REDIRECT_VIEW = "redirect:"; + + public static final String ADMIN_PREFIX = "/admin"; + + public static final String LOGIN_URL = "/login"; + public static final String LOGOUT_URL = "/logout"; + + public static final String DEFAULT_PASSWORD = "123456"; + + private Constants() { + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/Laba5.1/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java new file mode 100644 index 0000000..44defae --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java @@ -0,0 +1,23 @@ +package com.example.demo.core.configuration; + +import org.modelmapper.ModelMapper; +import org.modelmapper.PropertyMap; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.example.demo.core.model.BaseEntity; + +@Configuration +public class MapperConfiguration { + @Bean + ModelMapper modelMapper() { + final ModelMapper mapper = new ModelMapper(); + mapper.addMappings(new PropertyMap() { + @Override + protected void configure() { + skip(destination.getId()); + } + }); + return mapper; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/core/configuration/SchedulerConfiguration.java b/Laba5.1/src/main/java/com/example/demo/core/configuration/SchedulerConfiguration.java new file mode 100644 index 0000000..e8d4b6e --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/configuration/SchedulerConfiguration.java @@ -0,0 +1,9 @@ +package com.example.demo.core.configuration; + +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableScheduling; + +@Configuration +@EnableScheduling +public class SchedulerConfiguration { +} diff --git a/Laba5.1/src/main/java/com/example/demo/core/configuration/WebConfiguration.java b/Laba5.1/src/main/java/com/example/demo/core/configuration/WebConfiguration.java new file mode 100644 index 0000000..6316aa8 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/configuration/WebConfiguration.java @@ -0,0 +1,13 @@ +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/Laba5.1/src/main/java/com/example/demo/core/error/AdviceController.java b/Laba5.1/src/main/java/com/example/demo/core/error/AdviceController.java new file mode 100644 index 0000000..65f0c3e --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/error/AdviceController.java @@ -0,0 +1,53 @@ +package com.example.demo.core.error; + +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.servlet.ModelAndView; + +import jakarta.servlet.http.HttpServletRequest; + +@ControllerAdvice +public class AdviceController { + private final Logger log = LoggerFactory.getLogger(AdviceController.class); + + private static Throwable getRootCause(Throwable throwable) { + Throwable rootCause = throwable; + while (rootCause.getCause() != null && rootCause.getCause() != rootCause) { + rootCause = rootCause.getCause(); + } + return rootCause; + } + + private static Map getAttributes(HttpServletRequest request, Throwable throwable) { + final Throwable rootCause = getRootCause(throwable); + final StackTraceElement firstError = rootCause.getStackTrace()[0]; + return Map.of( + "message", rootCause.getMessage(), + "url", request.getRequestURL(), + "exception", rootCause.getClass().getName(), + "file", firstError.getFileName(), + "method", firstError.getMethodName(), + "line", firstError.getLineNumber()); + } + + @ExceptionHandler(value = Exception.class) + public ModelAndView defaultErrorHandler(HttpServletRequest request, Throwable throwable) throws Throwable { + if (AnnotationUtils.findAnnotation(throwable.getClass(), + ResponseStatus.class) != null) { + throw throwable; + } + + log.error("{}", throwable.getMessage()); + throwable.printStackTrace(); + final ModelAndView model = new ModelAndView(); + model.addAllObjects(getAttributes(request, throwable)); + model.setViewName("error"); + return model; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/core/error/NotFoundException.java b/Laba5.1/src/main/java/com/example/demo/core/error/NotFoundException.java new file mode 100644 index 0000000..a61d118 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/error/NotFoundException.java @@ -0,0 +1,7 @@ +package com.example.demo.core.error; + +public class NotFoundException extends RuntimeException { + public NotFoundException(Class clazz, Long id) { + super(String.format("%s with id [%s] is not found or not exists", clazz.getSimpleName(), id)); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/core/file/FileHelper.java b/Laba5.1/src/main/java/com/example/demo/core/file/FileHelper.java new file mode 100644 index 0000000..f972545 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/file/FileHelper.java @@ -0,0 +1,79 @@ +package com.example.demo.core.file; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.UUID; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.multipart.MultipartFile; + +public class FileHelper { + private static final Logger log = LoggerFactory.getLogger(FileHelper.class); + + private FileHelper() { + } + + public static String getExtension(MultipartFile file) { + final String fileName = file.getOriginalFilename(); + if (fileName == null) { + return null; + } + final int lastIndex = fileName.lastIndexOf('.'); + return fileName.substring(lastIndex, fileName.length()).replaceFirst("\\.", ""); + } + + // MultipartFile доступен только в пределах запроса + // Чтобы файл существовал до создания заказа, необходимо его скопировать во + // временных каталог + public static Path toTmpPath(MultipartFile file, Path storagePath) { + if (file.isEmpty()) { + return null; + } + try { + final Path dest = Path.of( + storagePath.toFile().getAbsolutePath(), + String.format("%s-%s", UUID.randomUUID().toString(), file.getOriginalFilename())); + file.transferTo(dest); + return dest; + } catch (IOException e) { + throw new InternalError(e); + } + } + + public static byte[] getFileBytes(Path file) { + if (!Files.exists(file)) { + throw new IllegalArgumentException("File is not exists"); + } + try { + final byte[] data = Files.readAllBytes(file); + Files.delete(file); + return data; + } catch (IOException e) { + log.error("File upload error", e); + return new byte[0]; + } + } + + public static String saveToFile(Path path, long id, String extension, byte[] bytes) { + if (bytes == null || bytes.length == 0) { + return null; + } + try { + final Path dir = Path.of( + path.toFile().getAbsolutePath(), + "resources/image"); + if (!Files.exists(dir)) { + Files.createDirectories(dir); + } + final Path temp = Path.of( + dir.toFile().getAbsolutePath(), + String.format("order-%s.%s", id, extension)); + Files.write(temp, bytes); + return temp.toFile().getAbsolutePath(); + } catch (IOException e) { + throw new InternalError(e); + } + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/core/model/BaseEntity.java b/Laba5.1/src/main/java/com/example/demo/core/model/BaseEntity.java new file mode 100644 index 0000000..eba74ad --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/model/BaseEntity.java @@ -0,0 +1,28 @@ +package com.example.demo.core.model; + +import com.example.demo.core.configuration.Constants; + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.SequenceGenerator; + +@MappedSuperclass +public abstract class BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = Constants.SEQUENCE_NAME) + @SequenceGenerator(name = Constants.SEQUENCE_NAME, sequenceName = Constants.SEQUENCE_NAME, allocationSize = 1) + protected Long id; + + protected BaseEntity() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/core/security/SecurityConfiguration.java b/Laba5.1/src/main/java/com/example/demo/core/security/SecurityConfiguration.java new file mode 100644 index 0000000..eee4c44 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/security/SecurityConfiguration.java @@ -0,0 +1,67 @@ +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( + "/resources/image/*", + "/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/Laba5.1/src/main/java/com/example/demo/core/security/UserPrincipal.java b/Laba5.1/src/main/java/com/example/demo/core/security/UserPrincipal.java new file mode 100644 index 0000000..ce646c6 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/security/UserPrincipal.java @@ -0,0 +1,64 @@ +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/Laba5.1/src/main/java/com/example/demo/core/session/SessionCart.java b/Laba5.1/src/main/java/com/example/demo/core/session/SessionCart.java new file mode 100644 index 0000000..09f7d23 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/session/SessionCart.java @@ -0,0 +1,14 @@ +package com.example.demo.core.session; + +import java.util.HashMap; + +import com.example.demo.users.api.UserCartDto; + +public class SessionCart extends HashMap { + public double getSum() { + return this.values().stream() + .map(item -> item.getCount() * item.getPrice()) + .mapToDouble(Double::doubleValue) + .sum(); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/core/session/SessionHelper.java b/Laba5.1/src/main/java/com/example/demo/core/session/SessionHelper.java new file mode 100644 index 0000000..6ee3d8c --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/core/session/SessionHelper.java @@ -0,0 +1,16 @@ +package com.example.demo.core.session; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; +import org.springframework.context.annotation.ScopedProxyMode; +import org.springframework.web.context.WebApplicationContext; + +@Configuration +public class SessionHelper { + @Bean + @Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS) + SessionCart todos() { + return new SessionCart(); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/orders/api/OrderDto.java b/Laba5.1/src/main/java/com/example/demo/orders/api/OrderDto.java new file mode 100644 index 0000000..bb1a313 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/orders/api/OrderDto.java @@ -0,0 +1,62 @@ +package com.example.demo.orders.api; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class OrderDto { + private Long id; + @NotNull + @Min(1) + private String typeName; + @NotNull + @Min(1) + private Double price; + @NotNull + @Min(1) + private Integer count; + private String imageExtension; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public String getImageExtension() { + return imageExtension; + } + + public void setImageExtension(String imageExtension) { + this.imageExtension = imageExtension; + } + + public Double getSum() { + return price * count; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/orders/api/OrderGroupedDto.java b/Laba5.1/src/main/java/com/example/demo/orders/api/OrderGroupedDto.java new file mode 100644 index 0000000..ddb116e --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/orders/api/OrderGroupedDto.java @@ -0,0 +1,31 @@ +package com.example.demo.orders.api; + +public class OrderGroupedDto { + private String typeName; + private Long totalPrice; + private Integer totalCount; + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public Long getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(Long totalPrice) { + this.totalPrice = totalPrice; + } + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/orders/model/OrderEntity.java b/Laba5.1/src/main/java/com/example/demo/orders/model/OrderEntity.java new file mode 100644 index 0000000..df46816 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/orders/model/OrderEntity.java @@ -0,0 +1,112 @@ +package com.example.demo.orders.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.users.model.UserEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "orders") +public class OrderEntity extends BaseEntity { + @ManyToOne + @JoinColumn(name = "typeId", nullable = false) + private TypeEntity type; + @ManyToOne + @JoinColumn(name = "userId", nullable = false) + private UserEntity user; + @Column(nullable = false) + private Double price; + @Column(nullable = false) + private Integer count; + private String imageExtension; + @Lob + private byte[] image; + + public OrderEntity() { + } + + public OrderEntity(TypeEntity type, Double price, Integer count) { + this.type = type; + this.price = price; + this.count = count; + } + + public TypeEntity getType() { + return type; + } + + public void setType(TypeEntity type) { + this.type = type; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + if (!user.getOrders().contains(this)) { + user.getOrders().add(this); + } + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public String getImageExtension() { + return imageExtension; + } + + public void setImageExtension(String imageExtension) { + this.imageExtension = imageExtension; + } + + public byte[] getImage() { + return image; + } + + public void setImage(byte[] image) { + this.image = image; + } + + @Override + public int hashCode() { + return Objects.hash(id, type, user.getId(), price, count, imageExtension); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final OrderEntity other = (OrderEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getType(), type) + && Objects.equals(other.getUser().getId(), user.getId()) + && Objects.equals(other.getPrice(), price) + && Objects.equals(other.getCount(), count) + && Objects.equals(other.getImageExtension(), imageExtension); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/orders/model/OrderGrouped.java b/Laba5.1/src/main/java/com/example/demo/orders/model/OrderGrouped.java new file mode 100644 index 0000000..4d55f18 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/orders/model/OrderGrouped.java @@ -0,0 +1,11 @@ +package com.example.demo.orders.model; + +import com.example.demo.types.model.TypeEntity; + +public interface OrderGrouped { + TypeEntity getType(); + + double getTotalPrice(); + + int getTotalCount(); +} diff --git a/Laba5.1/src/main/java/com/example/demo/orders/repository/OrderRepository.java b/Laba5.1/src/main/java/com/example/demo/orders/repository/OrderRepository.java new file mode 100644 index 0000000..3ef17fa --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/orders/repository/OrderRepository.java @@ -0,0 +1,42 @@ +package com.example.demo.orders.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.model.OrderGrouped; + +public interface OrderRepository + extends CrudRepository, PagingAndSortingRepository { + + Optional findOneByUserIdAndId(long userId, long id); + + List findByUserId(long userId); + + Page findByUserId(long userId, Pageable pageable); + + List findByUserIdAndTypeId(long userId, long typeId); + + Page findByUserIdAndTypeId(long userId, long typeId, Pageable pageable); + + // select + // tpe.name, + // coalesce(sum(order.price), 0), + // coalesce(sum(order.count), 0) + // from types as tpe + // left join orders as order on tpe.id = order.type_id and order.user_id = ? + // group by tpe.name order by tpe.id + @Query("select " + + "t as type, " + + "coalesce(sum(o.price), 0) as totalPrice, " + + "coalesce(sum(o.count), 0) as totalCount " + + "from TypeEntity t left join OrderEntity o on o.type = t and o.user.id = ?1 " + + "group by t order by t.id") + List getOrdersTotalByType(long userId); +} diff --git a/Laba5.1/src/main/java/com/example/demo/orders/service/OrderService.java b/Laba5.1/src/main/java/com/example/demo/orders/service/OrderService.java new file mode 100644 index 0000000..ee2f5ec --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/orders/service/OrderService.java @@ -0,0 +1,103 @@ +package com.example.demo.orders.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.model.OrderGrouped; +import com.example.demo.orders.repository.OrderRepository; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +@Service +public class OrderService { + private final OrderRepository repository; + private final UserService userService; + + public OrderService(OrderRepository repository, UserService userService) { + this.repository = repository; + this.userService = userService; + } + + @Transactional(readOnly = true) + public List getAll(long userId, long typeId) { + userService.get(userId); + if (typeId <= 0L) { + return repository.findByUserId(userId); + } else { + return repository.findByUserIdAndTypeId(userId, typeId); + } + } + + @Transactional(readOnly = true) + public Page getAll(long userId, long typeId, int page, int size) { + final Pageable pageable = PageRequest.of(page, size, Sort.by("id")); + userService.get(userId); + if (typeId <= 0L) { + return repository.findByUserId(userId, pageable); + } else { + return repository.findByUserIdAndTypeId(userId, typeId, pageable); + } + } + + @Transactional(readOnly = true) + public OrderEntity get(long userId, long id) { + userService.get(userId); + return repository.findOneByUserIdAndId(userId, id) + .orElseThrow(() -> new NotFoundException(OrderEntity.class, id)); + } + + @Transactional + public OrderEntity create(long userId, OrderEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + final UserEntity existsUser = userService.get(userId); + entity.setUser(existsUser); + return repository.save(entity); + } + + @Transactional + public List createAll(long userId, List entities) { + if (entities == null || entities.isEmpty()) { + throw new IllegalArgumentException("Orders list is null or empty"); + } + final UserEntity existsUser = userService.get(userId); + entities.forEach(entity -> entity.setUser(existsUser)); + return StreamSupport.stream(repository.saveAll(entities).spliterator(), false).toList(); + } + + @Transactional + public OrderEntity update(long userId, long id, OrderEntity entity) { + userService.get(userId); + final OrderEntity existsEntity = get(userId, id); + existsEntity.setType(entity.getType()); + existsEntity.setPrice(entity.getPrice()); + existsEntity.setCount(entity.getCount()); + existsEntity.setImageExtension(entity.getImageExtension()); + existsEntity.setImage(entity.getImage()); + return repository.save(existsEntity); + } + + @Transactional + public OrderEntity delete(long userId, long id) { + userService.get(userId); + final OrderEntity existsEntity = get(userId, id); + repository.delete(existsEntity); + return existsEntity; + } + + @Transactional(readOnly = true) + public List getTotal(long userId) { + userService.get(userId); + return repository.getOrdersTotalByType(userId); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/subscriptions/api/SubscriptionController.java b/Laba5.1/src/main/java/com/example/demo/subscriptions/api/SubscriptionController.java new file mode 100644 index 0000000..1ddcc7b --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/subscriptions/api/SubscriptionController.java @@ -0,0 +1,104 @@ +package com.example.demo.subscriptions.api; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(SubscriptionController.URL) +public class SubscriptionController { + public static final String URL = Constants.ADMIN_PREFIX + "/subscription"; + private static final String SUBSCRIPTION_VIEW = "subscription"; + private static final String SUBSCRIPTION_EDIT_VIEW = "subscription-edit"; + private static final String SUBSCRIPTION_ATTRIBUTE = "subscription"; + + private final SubscriptionService subscriptionService; + private final ModelMapper modelMapper; + + public SubscriptionController(SubscriptionService subscriptionService, ModelMapper modelMapper) { + this.subscriptionService = subscriptionService; + this.modelMapper = modelMapper; + } + + private SubscriptionDto toDto(SubscriptionEntity entity) { + return modelMapper.map(entity, SubscriptionDto.class); + } + + private SubscriptionEntity toEntity(SubscriptionDto dto) { + return modelMapper.map(dto, SubscriptionEntity.class); + } + + @GetMapping + public String getAll(Model model) { + model.addAttribute( + "items", + subscriptionService.getAll().stream() + .map(this::toDto) + .toList()); + return SUBSCRIPTION_VIEW; + } + + @GetMapping("/edit/") + public String create(Model model) { + model.addAttribute(SUBSCRIPTION_ATTRIBUTE, new SubscriptionDto()); + return SUBSCRIPTION_EDIT_VIEW; + } + + @PostMapping("/edit/") + public String create( + @ModelAttribute(name = SUBSCRIPTION_ATTRIBUTE) @Valid SubscriptionDto subscription, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return SUBSCRIPTION_EDIT_VIEW; + } + subscriptionService.create(toEntity(subscription)); + return Constants.REDIRECT_VIEW + URL; + } + + @GetMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + Model model) { + if (id <= 0) { + throw new IllegalArgumentException(); + } + model.addAttribute(SUBSCRIPTION_ATTRIBUTE, toDto(subscriptionService.get(id))); + return SUBSCRIPTION_EDIT_VIEW; + } + + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @ModelAttribute(name = SUBSCRIPTION_ATTRIBUTE) @Valid SubscriptionDto subscription, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return SUBSCRIPTION_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + subscriptionService.update(id, toEntity(subscription)); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/delete/{id}") + public String delete( + @PathVariable(name = "id") Long id) { + subscriptionService.delete(id); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/subscriptions/api/SubscriptionDto.java b/Laba5.1/src/main/java/com/example/demo/subscriptions/api/SubscriptionDto.java new file mode 100644 index 0000000..76e6fc6 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/subscriptions/api/SubscriptionDto.java @@ -0,0 +1,27 @@ +package com.example.demo.subscriptions.api; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class SubscriptionDto { + private Long id; + @NotBlank + @Size(min = 5, max = 50) + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/subscriptions/model/SubscriptionEntity.java b/Laba5.1/src/main/java/com/example/demo/subscriptions/model/SubscriptionEntity.java new file mode 100644 index 0000000..f56ab11 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/subscriptions/model/SubscriptionEntity.java @@ -0,0 +1,68 @@ +package com.example.demo.subscriptions.model; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.usersubscription.model.UserSubscriptionEntity; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; + +@Entity +@Table(name = "subscriptions") +public class SubscriptionEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + @OneToMany(mappedBy = "subscription", cascade = CascadeType.REMOVE, orphanRemoval = true) + @OrderBy("id ASC") + private Set userSubscriptions = new HashSet<>(); + + public SubscriptionEntity() { + } + + public SubscriptionEntity(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Set getUserSubscriptions() { + return userSubscriptions; + } + + public void addUser(UserSubscriptionEntity userSubscription) { + if (userSubscription.getSubscription() != this) { + userSubscription.setSubscription(this); + } + userSubscriptions.add(userSubscription); + } + + @Override + public int hashCode() { + return Objects.hash(id, name, userSubscriptions); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + SubscriptionEntity other = (SubscriptionEntity) obj; + return Objects.equals(id, other.id) + && Objects.equals(name, other.name) + && Objects.equals(userSubscriptions, other.userSubscriptions); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/subscriptions/repository/SubscriptionRepository.java b/Laba5.1/src/main/java/com/example/demo/subscriptions/repository/SubscriptionRepository.java new file mode 100644 index 0000000..5cc12c6 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/subscriptions/repository/SubscriptionRepository.java @@ -0,0 +1,13 @@ +package com.example.demo.subscriptions.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.demo.subscriptions.model.SubscriptionEntity; + +public interface SubscriptionRepository + extends CrudRepository, PagingAndSortingRepository { + Optional findByNameIgnoreCase(String name); +} diff --git a/Laba5.1/src/main/java/com/example/demo/subscriptions/service/SubscriptionService.java b/Laba5.1/src/main/java/com/example/demo/subscriptions/service/SubscriptionService.java new file mode 100644 index 0000000..11f15a1 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/subscriptions/service/SubscriptionService.java @@ -0,0 +1,66 @@ +package com.example.demo.subscriptions.service; + +import java.util.List; +import java.util.Optional; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.repository.SubscriptionRepository; + +@Service +public class SubscriptionService { + private final SubscriptionRepository repository; + + public SubscriptionService(SubscriptionRepository repository) { + this.repository = repository; + } + + private void checkName(Long id, String name) { + final Optional existsType = repository.findByNameIgnoreCase(name); + if (existsType.isPresent() && !existsType.get().getId().equals(id)) { + throw new IllegalArgumentException( + String.format("Subscription with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll(Sort.by("id")).spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public SubscriptionEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(SubscriptionEntity.class, id)); + } + + @Transactional + public SubscriptionEntity create(SubscriptionEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(null, entity.getName()); + return repository.save(entity); + } + + @Transactional + public SubscriptionEntity update(Long id, SubscriptionEntity entity) { + final SubscriptionEntity existsEntity = get(id); + checkName(id, entity.getName()); + existsEntity.setName(entity.getName()); + return repository.save(existsEntity); + } + + @Transactional + public SubscriptionEntity delete(Long id) { + final SubscriptionEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } + +} diff --git a/Laba5.1/src/main/java/com/example/demo/types/api/TypeController.java b/Laba5.1/src/main/java/com/example/demo/types/api/TypeController.java new file mode 100644 index 0000000..802c978 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/types/api/TypeController.java @@ -0,0 +1,104 @@ +package com.example.demo.types.api; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(TypeController.URL) +public class TypeController { + public static final String URL = Constants.ADMIN_PREFIX + "/type"; + private static final String TYPE_VIEW = "type"; + private static final String TYPE_EDIT_VIEW = "type-edit"; + private static final String TYPE_ATTRIBUTE = "type"; + + private final TypeService typeService; + private final ModelMapper modelMapper; + + public TypeController(TypeService typeService, ModelMapper modelMapper) { + this.typeService = typeService; + this.modelMapper = modelMapper; + } + + private TypeDto toDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private TypeEntity toEntity(TypeDto dto) { + return modelMapper.map(dto, TypeEntity.class); + } + + @GetMapping + public String getAll(Model model) { + model.addAttribute( + "items", + typeService.getAll().stream() + .map(this::toDto) + .toList()); + return TYPE_VIEW; + } + + @GetMapping("/edit/") + public String create(Model model) { + model.addAttribute(TYPE_ATTRIBUTE, new TypeDto()); + return TYPE_EDIT_VIEW; + } + + @PostMapping("/edit/") + public String create( + @ModelAttribute(name = TYPE_ATTRIBUTE) @Valid TypeDto type, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return TYPE_EDIT_VIEW; + } + typeService.create(toEntity(type)); + return Constants.REDIRECT_VIEW + URL; + } + + @GetMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + Model model) { + if (id <= 0) { + throw new IllegalArgumentException(); + } + model.addAttribute(TYPE_ATTRIBUTE, toDto(typeService.get(id))); + return TYPE_EDIT_VIEW; + } + + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @ModelAttribute(name = TYPE_ATTRIBUTE) @Valid TypeDto type, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return TYPE_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + typeService.update(id, toEntity(type)); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/delete/{id}") + public String delete( + @PathVariable(name = "id") Long id) { + typeService.delete(id); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/types/api/TypeDto.java b/Laba5.1/src/main/java/com/example/demo/types/api/TypeDto.java new file mode 100644 index 0000000..ed3350d --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/types/api/TypeDto.java @@ -0,0 +1,27 @@ +package com.example.demo.types.api; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class TypeDto { + private Long id; + @NotBlank + @Size(min = 5, max = 50) + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/types/model/TypeEntity.java b/Laba5.1/src/main/java/com/example/demo/types/model/TypeEntity.java new file mode 100644 index 0000000..14df9ea --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/types/model/TypeEntity.java @@ -0,0 +1,48 @@ +package com.example.demo.types.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "types") +public class TypeEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + + public TypeEntity() { + } + + public TypeEntity(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final TypeEntity other = (TypeEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } + +} diff --git a/Laba5.1/src/main/java/com/example/demo/types/repository/TypeRepository.java b/Laba5.1/src/main/java/com/example/demo/types/repository/TypeRepository.java new file mode 100644 index 0000000..fb863a7 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/types/repository/TypeRepository.java @@ -0,0 +1,13 @@ +package com.example.demo.types.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.demo.types.model.TypeEntity; + +public interface TypeRepository + extends CrudRepository, PagingAndSortingRepository { + Optional findByNameIgnoreCase(String name); +} diff --git a/Laba5.1/src/main/java/com/example/demo/types/service/TypeService.java b/Laba5.1/src/main/java/com/example/demo/types/service/TypeService.java new file mode 100644 index 0000000..3ec0d2b --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/types/service/TypeService.java @@ -0,0 +1,75 @@ +package com.example.demo.types.service; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.repository.TypeRepository; + +@Service +public class TypeService { + private final TypeRepository repository; + + public TypeService(TypeRepository repository) { + this.repository = repository; + } + + private void checkName(Long id, String name) { + final Optional existsType = repository.findByNameIgnoreCase(name); + if (existsType.isPresent() && !existsType.get().getId().equals(id)) { + throw new IllegalArgumentException( + String.format("Type with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll(Sort.by("id")).spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public List getByIds(Collection ids) { + final List types = StreamSupport.stream(repository.findAllById(ids).spliterator(), false).toList(); + if (types.size() < ids.size()) { + throw new IllegalArgumentException("Invalid type"); + } + return types; + } + + @Transactional(readOnly = true) + public TypeEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(TypeEntity.class, id)); + } + + @Transactional + public TypeEntity create(TypeEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(null, entity.getName()); + return repository.save(entity); + } + + @Transactional + public TypeEntity update(Long id, TypeEntity entity) { + final TypeEntity existsEntity = get(id); + checkName(id, entity.getName()); + existsEntity.setName(entity.getName()); + return repository.save(existsEntity); + } + + @Transactional + public TypeEntity delete(Long id) { + final TypeEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/users/api/UserCartController.java b/Laba5.1/src/main/java/com/example/demo/users/api/UserCartController.java new file mode 100644 index 0000000..41053b6 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/api/UserCartController.java @@ -0,0 +1,173 @@ +package com.example.demo.users.api; + +import java.nio.file.Path; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; + +import org.modelmapper.ModelMapper; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +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 org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.SessionAttributes; +import org.springframework.web.bind.support.SessionStatus; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.core.file.FileHelper; +import com.example.demo.core.security.UserPrincipal; +import com.example.demo.core.session.SessionCart; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.service.OrderService; +import com.example.demo.types.api.TypeDto; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +import jakarta.servlet.ServletContext; +import jakarta.validation.Valid; + +@Controller +@RequestMapping(UserCartController.URL) +@SessionAttributes("types") +public class UserCartController { + public static final String URL = "/cart"; + private static final String ORDER_VIEW = "cart"; + private static final String ORDER_ATTRIBUTE = "order"; + private static final String CART_ATTRIBUTE = "cart"; + + private final Set allow = Set.of("jpg", "jpeg", "png", "svg"); + + private final TypeService typeService; + private final OrderService orderService; + private final SessionCart cart; + private final ModelMapper modelMapper; + private final Path servletContextPath; + + public UserCartController( + TypeService typeService, + OrderService orderService, + SessionCart cart, + ModelMapper modelMapper, + ServletContext servletContext) { + this.typeService = typeService; + this.orderService = orderService; + this.cart = cart; + this.modelMapper = modelMapper; + this.servletContextPath = Path.of(servletContext.getRealPath("/")); + } + + private TypeDto toTypeDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private List toOrderEntities(Collection dtos) { + final Set typeIds = dtos.stream() + .map(UserCartDto::getType) + .collect(Collectors.toSet()); + final Map types = typeService.getByIds(typeIds).stream() + .collect(Collectors.toMap(TypeEntity::getId, Function.identity())); + return dtos.stream() + .map(dto -> { + final String extension = FileHelper.getExtension(dto.getImage()); + if (!allow.contains(extension.toLowerCase())) { + throw new IllegalArgumentException( + String.format("Only %s files", String.join(", ", allow))); + } + final OrderEntity entity = modelMapper.map(dto, OrderEntity.class); + entity.setType(types.get(dto.getType())); + entity.setImageExtension(extension); + entity.setImage(FileHelper.getFileBytes(dto.getTmpPath())); + return entity; + }) + .toList(); + } + + @GetMapping + public String getCart(Model model) { + model.addAttribute("types", + typeService.getAll().stream() + .map(this::toTypeDto) + .toList()); + model.addAttribute(ORDER_ATTRIBUTE, new UserCartDto()); + model.addAttribute(CART_ATTRIBUTE, cart.values()); + return ORDER_VIEW; + } + + @PostMapping + public String addOrderToCart( + @ModelAttribute(name = ORDER_ATTRIBUTE) @Valid UserCartDto order, + BindingResult bindingResult, + SessionStatus status, + Model model) { + if (bindingResult.hasErrors()) { + return ORDER_VIEW; + } + if (order.getImage().isEmpty()) { + bindingResult.rejectValue("image", "orders:image", "Изображение не выбрано."); + model.addAttribute(ORDER_ATTRIBUTE, order); + return ORDER_VIEW; + } + status.setComplete(); + order.setTypeName(typeService.get(order.getType()).getName()); + order.setTmpPath(FileHelper.toTmpPath(order.getImage(), servletContextPath)); + cart.computeIfPresent(order.hashCode(), (key, value) -> { + value.setCount(value.getCount() + order.getCount()); + return value; + }); + cart.putIfAbsent(order.hashCode(), order); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/save") + public String saveCart( + Model model, + @AuthenticationPrincipal UserPrincipal principal) { + orderService.createAll(principal.getId(), toOrderEntities(cart.values())); + cart.clear(); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/clear") + public String clearCart() { + cart.clear(); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/increase") + public String increaseCartCount( + @RequestParam(name = "type") Long type, + @RequestParam(name = "price") Double price) { + cart.computeIfPresent(Objects.hash(type, price), (key, value) -> { + value.setCount(value.getCount() + 1); + return value; + }); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/decrease") + public String decreaseCartCount( + @RequestParam(name = "type") Long type, + @RequestParam(name = "price") Double price) { + cart.computeIfPresent(Objects.hash(type, price), (key, value) -> { + value.setCount(value.getCount() - 1); + return value; + }); + final Map filteredCart = cart.entrySet() + .stream() + .filter(item -> item.getValue().getCount() > 0) + .collect(Collectors.toMap(Entry::getKey, Entry::getValue)); + cart.clear(); + cart.putAll(filteredCart); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/users/api/UserCartDto.java b/Laba5.1/src/main/java/com/example/demo/users/api/UserCartDto.java new file mode 100644 index 0000000..d7079c7 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/api/UserCartDto.java @@ -0,0 +1,86 @@ +package com.example.demo.users.api; + +import java.nio.file.Path; +import java.util.Objects; + +import org.springframework.web.multipart.MultipartFile; + +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; + private MultipartFile image; + private Path tmpPath; + + 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; + } + + public MultipartFile getImage() { + return image; + } + + public void setImage(MultipartFile image) { + this.image = image; + } + + public Path getTmpPath() { + return tmpPath; + } + + public void setTmpPath(Path tmpPath) { + this.tmpPath = tmpPath; + } + + @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/Laba5.1/src/main/java/com/example/demo/users/api/UserController.java b/Laba5.1/src/main/java/com/example/demo/users/api/UserController.java new file mode 100644 index 0000000..7c5b23f --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/api/UserController.java @@ -0,0 +1,127 @@ +package com.example.demo.users.api; + +import java.util.Map; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.example.demo.core.api.PageAttributesMapper; +import com.example.demo.core.configuration.Constants; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(UserController.URL) +public class UserController { + public static final String URL = Constants.ADMIN_PREFIX + "/user"; + private static final String USER_VIEW = "user"; + private static final String USER_EDIT_VIEW = "user-edit"; + private static final String PAGE_ATTRIBUTE = "page"; + private static final String USER_ATTRIBUTE = "user"; + + private final UserService userService; + private final ModelMapper modelMapper; + + public UserController(UserService userService, ModelMapper modelMapper) { + this.userService = userService; + this.modelMapper = modelMapper; + } + + private UserDto toDto(UserEntity entity) { + return modelMapper.map(entity, UserDto.class); + } + + private UserEntity toEntity(UserDto dto) { + return modelMapper.map(dto, UserEntity.class); + } + + @GetMapping + public String getAll( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + final Map attributes = PageAttributesMapper.toAttributes( + userService.getAll(page, Constants.DEFUALT_PAGE_SIZE), this::toDto); + model.addAllAttributes(attributes); + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_VIEW; + } + + @GetMapping("/edit/") + public String create( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + model.addAttribute(USER_ATTRIBUTE, new UserDto()); + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + + @PostMapping("/edit/") + public String create( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserDto user, + BindingResult bindingResult, + Model model, + RedirectAttributes redirectAttributes) { + if (bindingResult.hasErrors()) { + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + userService.create(toEntity(user)); + return Constants.REDIRECT_VIEW + URL; + } + + @GetMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + if (id <= 0) { + throw new IllegalArgumentException(); + } + model.addAttribute(USER_ATTRIBUTE, toDto(userService.get(id))); + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserDto user, + BindingResult bindingResult, + Model model, + RedirectAttributes redirectAttributes) { + if (bindingResult.hasErrors()) { + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + userService.update(id, toEntity(user)); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/delete/{id}") + public String delete( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + RedirectAttributes redirectAttributes) { + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + userService.delete(id); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/users/api/UserDto.java b/Laba5.1/src/main/java/com/example/demo/users/api/UserDto.java new file mode 100644 index 0000000..7904847 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/api/UserDto.java @@ -0,0 +1,36 @@ +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; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/users/api/UserProfileController.java b/Laba5.1/src/main/java/com/example/demo/users/api/UserProfileController.java new file mode 100644 index 0000000..7b23338 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/api/UserProfileController.java @@ -0,0 +1,147 @@ +package com.example.demo.users.api; + +import java.nio.file.Path; +import java.util.stream.Collectors; + +import org.modelmapper.ModelMapper; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +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.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.core.file.FileHelper; +import com.example.demo.core.security.UserPrincipal; +import com.example.demo.orders.api.OrderDto; +import com.example.demo.orders.api.OrderGroupedDto; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.model.OrderGrouped; +import com.example.demo.orders.service.OrderService; +import com.example.demo.types.api.TypeDto; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; +import com.example.demo.users.model.UserSubscriptionWithStatus; +import com.example.demo.users.service.UserService; + +import jakarta.servlet.ServletContext; +import jakarta.validation.Valid; + +@Controller +public class UserProfileController { + private static final String PROFILE_VIEW = "profile"; + + private static final String PAGE_ATTRIBUTE = "page"; + private static final String TYPEID_ATTRIBUTE = "typeId"; + private static final String PROFILE_ATTRIBUTE = "profile"; + + private final OrderService orderService; + private final TypeService typeService; + private final UserService userService; + private final ModelMapper modelMapper; + private final ServletContext servletContext; + + public UserProfileController( + OrderService orderService, + TypeService typeService, + UserService userService, + ModelMapper modelMapper, + ServletContext servletContext) { + this.orderService = orderService; + this.typeService = typeService; + this.userService = userService; + this.modelMapper = modelMapper; + this.servletContext = servletContext; + } + + private OrderDto toDto(OrderEntity entity) { + final OrderDto dto = modelMapper.map(entity, OrderDto.class); + if (entity.getImage() != null && entity.getImage().length > 0) { + final Path contextPath = Path.of(servletContext.getRealPath("/")); + FileHelper.saveToFile( + contextPath, + entity.getId(), + entity.getImageExtension(), + entity.getImage()); + } + return dto; + } + + private OrderGroupedDto toGroupedDto(OrderGrouped entity) { + return modelMapper.map(entity, OrderGroupedDto.class); + } + + private TypeDto toTypeDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private UserSubscriptionDto tSubscriptionDto(UserSubscriptionWithStatus entity) { + return modelMapper.map(entity, UserSubscriptionDto.class); + } + + private UserSubscriptionWithStatus toSubscriptionWithStatus(UserSubscriptionDto dto) { + return modelMapper.map(dto, UserSubscriptionWithStatus.class); + } + + @GetMapping + public String getProfile( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @RequestParam(name = TYPEID_ATTRIBUTE, defaultValue = "0") int typeId, + Model model, + @AuthenticationPrincipal UserPrincipal principal) { + final long userId = principal.getId(); + model.addAttribute(PAGE_ATTRIBUTE, page); + model.addAttribute(TYPEID_ATTRIBUTE, typeId); + model.addAllAttributes(PageAttributesMapper.toAttributes( + orderService.getAll(userId, typeId, page, Constants.DEFUALT_PAGE_SIZE), + this::toDto)); + model.addAttribute("stats", + orderService.getTotal(userId).stream() + .map(this::toGroupedDto) + .toList()); + model.addAttribute("types", + typeService.getAll().stream() + .map(this::toTypeDto) + .toList()); + model.addAttribute(PROFILE_ATTRIBUTE, + new UserProfileDto(userService.getUserSubscriptions(userId).stream() + .map(this::tSubscriptionDto) + .toList())); + return PROFILE_VIEW; + } + + @PostMapping + public String saveProfile( + @ModelAttribute(name = PROFILE_ATTRIBUTE) @Valid UserProfileDto profile, + BindingResult bindResult, + Model model, + @AuthenticationPrincipal UserPrincipal principal) { + if (bindResult.hasErrors()) { + return PROFILE_VIEW; + } + userService.saveUserSubscriptions(principal.getId(), + profile.getSubscriptions().stream() + .map(this::toSubscriptionWithStatus) + .collect(Collectors.toSet())); + return Constants.REDIRECT_VIEW + "/"; + } + + @PostMapping("/delete/{id}") + public String deleteOrder( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @RequestParam(name = TYPEID_ATTRIBUTE, defaultValue = "0") int typeId, + RedirectAttributes redirectAttributes, + @AuthenticationPrincipal UserPrincipal principal) { + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + redirectAttributes.addAttribute(TYPEID_ATTRIBUTE, typeId); + orderService.delete(principal.getId(), id); + return Constants.REDIRECT_VIEW + "/"; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/users/api/UserProfileDto.java b/Laba5.1/src/main/java/com/example/demo/users/api/UserProfileDto.java new file mode 100644 index 0000000..0a72573 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/api/UserProfileDto.java @@ -0,0 +1,23 @@ +package com.example.demo.users.api; + +import java.util.ArrayList; +import java.util.List; + +public class UserProfileDto { + private List subscriptions = new ArrayList<>(); + + public UserProfileDto() { + } + + public UserProfileDto(List subscriptions) { + this.subscriptions = subscriptions; + } + + public List getSubscriptions() { + return subscriptions; + } + + public void setSubscriptions(List subscriptions) { + this.subscriptions = subscriptions; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/users/api/UserSignupController.java b/Laba5.1/src/main/java/com/example/demo/users/api/UserSignupController.java new file mode 100644 index 0000000..e64a5e1 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/api/UserSignupController.java @@ -0,0 +1,65 @@ +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/Laba5.1/src/main/java/com/example/demo/users/api/UserSignupDto.java b/Laba5.1/src/main/java/com/example/demo/users/api/UserSignupDto.java new file mode 100644 index 0000000..0e9abc8 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/api/UserSignupDto.java @@ -0,0 +1,40 @@ +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/Laba5.1/src/main/java/com/example/demo/users/api/UserSubscriptionDto.java b/Laba5.1/src/main/java/com/example/demo/users/api/UserSubscriptionDto.java new file mode 100644 index 0000000..1c5a865 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/api/UserSubscriptionDto.java @@ -0,0 +1,31 @@ +package com.example.demo.users.api; + +public class UserSubscriptionDto { + private Long id; + private String name; + private boolean active; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/users/model/UserEntity.java b/Laba5.1/src/main/java/com/example/demo/users/model/UserEntity.java new file mode 100644 index 0000000..6aaf69b --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/model/UserEntity.java @@ -0,0 +1,114 @@ +package com.example.demo.users.model; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.usersubscription.model.UserSubscriptionEntity; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users") +public class UserEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 20) + private String login; + @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<>(); + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) + @OrderBy("id ASC") + private Set userSubscriptions = 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); + } + + public Set getUserSubscriptions() { + return userSubscriptions; + } + + public void addSubscription(UserSubscriptionEntity userSubscription) { + if (userSubscription.getUser() != this) { + userSubscription.setUser(this); + } + userSubscriptions.add(userSubscription); + } + + public void deleteSubscription(UserSubscriptionEntity userSubscription) { + if (userSubscription.getUser() != this) { + return; + } + userSubscriptions.remove(userSubscription); + } + + @Override + public int hashCode() { + return Objects.hash(id, login, password, role, orders, userSubscriptions); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserEntity other = (UserEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getLogin(), login) + && Objects.equals(other.getPassword(), password) + && Objects.equals(other.getRole(), role) + && Objects.equals(other.getOrders(), orders) + && Objects.equals(other.getUserSubscriptions(), userSubscriptions); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/users/model/UserRole.java b/Laba5.1/src/main/java/com/example/demo/users/model/UserRole.java new file mode 100644 index 0000000..00e8efa --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/model/UserRole.java @@ -0,0 +1,15 @@ +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/Laba5.1/src/main/java/com/example/demo/users/model/UserSubscriptionWithStatus.java b/Laba5.1/src/main/java/com/example/demo/users/model/UserSubscriptionWithStatus.java new file mode 100644 index 0000000..a460e81 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/model/UserSubscriptionWithStatus.java @@ -0,0 +1,60 @@ +package com.example.demo.users.model; + +import java.util.Objects; + +import com.example.demo.subscriptions.model.SubscriptionEntity; + +public class UserSubscriptionWithStatus { + private Long id; + private String name; + private boolean active; + + public UserSubscriptionWithStatus() { + } + + public UserSubscriptionWithStatus(SubscriptionEntity entity, boolean active) { + this.id = entity.getId(); + this.name = entity.getName(); + this.active = active; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } + + @Override + public int hashCode() { + return Objects.hash(id, name, active); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserSubscriptionWithStatus other = (UserSubscriptionWithStatus) obj; + return Objects.equals(id, other.id) && Objects.equals(name, other.name) && active == other.active; + } + +} diff --git a/Laba5.1/src/main/java/com/example/demo/users/repository/UserRepository.java b/Laba5.1/src/main/java/com/example/demo/users/repository/UserRepository.java new file mode 100644 index 0000000..9bf3cae --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/repository/UserRepository.java @@ -0,0 +1,13 @@ +package com.example.demo.users.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.demo.users.model.UserEntity; + +public interface UserRepository + extends CrudRepository, PagingAndSortingRepository { + Optional findByLoginIgnoreCase(String login); +} diff --git a/Laba5.1/src/main/java/com/example/demo/users/service/UserService.java b/Laba5.1/src/main/java/com/example/demo/users/service/UserService.java new file mode 100644 index 0000000..a933958 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/users/service/UserService.java @@ -0,0 +1,164 @@ +package com.example.demo.users.service; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.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.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.model.UserRole; +import com.example.demo.users.model.UserSubscriptionWithStatus; +import com.example.demo.users.repository.UserRepository; +import com.example.demo.usersubscription.model.UserSubscriptionEntity; + +@Service +public class UserService implements UserDetailsService { + private final UserRepository repository; + private final SubscriptionService subscriptionService; + private final PasswordEncoder passwordEncoder; + + public UserService( + UserRepository repository, + SubscriptionService subscriptionService, + PasswordEncoder passwordEncoder) { + this.repository = repository; + this.subscriptionService = subscriptionService; + 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); + subscriptionService.getAll().forEach(subscription -> { + final UserSubscriptionEntity userSubscription = new UserSubscriptionEntity(entity, subscription, true); + userSubscription.setUser(entity); + userSubscription.setSubscription(subscription); + }); + return repository.save(entity); + } + + @Transactional + public UserEntity update(long id, UserEntity entity) { + final UserEntity existsEntity = get(id); + checkLogin(id, entity.getLogin()); + existsEntity.setLogin(entity.getLogin()); + repository.save(existsEntity); + return existsEntity; + } + + @Transactional + public UserEntity delete(long id) { + final UserEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } + + private Map getUserSubscriptionsMap(Set subscriptions) { + return Optional.ofNullable(subscriptions).orElse(Collections.emptySet()).stream() + .collect(Collectors.toMap(item -> item.getSubscription().getId(), Function.identity())); + } + + @Transactional(readOnly = true) + public List getUserSubscriptions(long id) { + final Map userSubscriptions = getUserSubscriptionsMap( + get(id).getUserSubscriptions()); + return subscriptionService.getAll().stream() + .map(item -> { + final boolean active = Optional.ofNullable(userSubscriptions.get(item.getId())) + .map(UserSubscriptionEntity::isActive) + .orElse(false); + return new UserSubscriptionWithStatus(item, active); + }) + .toList(); + } + + @Transactional + public void saveUserSubscriptions(long id, Set subscriptions) { + final UserEntity existsUser = get(id); + final Map existsSubscriptions = subscriptionService.getAll().stream() + .collect(Collectors.toMap(SubscriptionEntity::getId, Function.identity())); + final Map userSubscriptions = getUserSubscriptionsMap( + existsUser.getUserSubscriptions()); + subscriptions.stream() + .filter(item -> existsSubscriptions.keySet().contains(item.getId())) + .forEach(item -> { + userSubscriptions.computeIfAbsent(item.getId(), key -> { + final UserSubscriptionEntity subscription = new UserSubscriptionEntity( + existsUser, existsSubscriptions.get(key), item.isActive()); + existsUser.addSubscription(subscription); + return subscription; + }); + userSubscriptions.computeIfPresent(item.getId(), (key, value) -> { + value.setActive(item.isActive()); + return value; + }); + }); + repository.save(existsUser); + } + + @Override + @Transactional(readOnly = true) + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + final UserEntity existsUser = getByLogin(username); + return new UserPrincipal(existsUser); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionEntity.java b/Laba5.1/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionEntity.java new file mode 100644 index 0000000..1f280f9 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionEntity.java @@ -0,0 +1,95 @@ +package com.example.demo.usersubscription.model; + +import java.util.Objects; + +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.users.model.UserEntity; + +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users_subscriptions") +public class UserSubscriptionEntity { + @EmbeddedId + private UserSubscriptionId id = new UserSubscriptionId(); + @ManyToOne + @MapsId("userId") + @JoinColumn(name = "user_id") + private UserEntity user; + @ManyToOne + @MapsId("subscriptionId") + @JoinColumn(name = "subscription_id") + private SubscriptionEntity subscription; + private boolean active; + + public UserSubscriptionEntity() { + } + + public UserSubscriptionEntity(UserEntity user, SubscriptionEntity subscription, boolean active) { + this.user = user; + this.subscription = subscription; + this.active = active; + } + + public UserSubscriptionId getId() { + return id; + } + + public void setId(UserSubscriptionId id) { + this.id = id; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + if (!user.getUserSubscriptions().contains(this)) { + user.getUserSubscriptions().add(this); + } + } + + public SubscriptionEntity getSubscription() { + return subscription; + } + + public void setSubscription(SubscriptionEntity subscription) { + this.subscription = subscription; + if (!subscription.getUserSubscriptions().contains(this)) { + subscription.getUserSubscriptions().add(this); + } + } + + public boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } + + @Override + public int hashCode() { + return Objects.hash(id, user.getId(), subscription.getId(), active); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserSubscriptionEntity other = (UserSubscriptionEntity) obj; + return Objects.equals(id, other.id) + && Objects.equals(user.getId(), other.user.getId()) + && Objects.equals(subscription.getId(), other.subscription.getId()) + && active == other.active; + } + +} diff --git a/Laba5.1/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionId.java b/Laba5.1/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionId.java new file mode 100644 index 0000000..0b23f19 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/usersubscription/model/UserSubscriptionId.java @@ -0,0 +1,55 @@ +package com.example.demo.usersubscription.model; + +import java.util.Objects; +import java.util.Optional; + +import jakarta.persistence.Embeddable; + +@Embeddable +public class UserSubscriptionId { + private Long userId; + private Long subscriptionId; + + public UserSubscriptionId() { + } + + public UserSubscriptionId(Long userId, Long subscriptionId) { + this.userId = userId; + this.subscriptionId = subscriptionId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getSubscriptionId() { + return subscriptionId; + } + + public void setSubscriptionId(Long subscriptionId) { + this.subscriptionId = subscriptionId; + } + + @Override + public int hashCode() { + return Objects.hash( + Optional.ofNullable(userId).orElse(0L), + Optional.ofNullable(subscriptionId).orElse(0L)); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + UserSubscriptionId other = (UserSubscriptionId) obj; + return Objects.equals(userId, other.userId) + && Objects.equals(subscriptionId, other.subscriptionId); + } + +} diff --git a/Laba5.1/src/main/java/com/example/demo/ws/api/MessageController.java b/Laba5.1/src/main/java/com/example/demo/ws/api/MessageController.java new file mode 100644 index 0000000..f87228c --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/ws/api/MessageController.java @@ -0,0 +1,40 @@ +package com.example.demo.ws.api; + +import java.security.Principal; + +import org.springframework.messaging.handler.annotation.DestinationVariable; +import org.springframework.messaging.handler.annotation.MessageMapping; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.example.demo.ws.configuration.WebSocketConfiguration; +import com.example.demo.ws.service.MessageService; + +@Controller +public class MessageController { + public static final String URL = "/messages"; + public static final String MESSAGES_TOPIC = WebSocketConfiguration.TOPIC_PREFIX + URL; + + private final MessageService messageService; + + public MessageController(MessageService messageService) { + this.messageService = messageService; + } + + @GetMapping("/whoami") + @ResponseBody + public String getUserName(Principal principal) { + return principal.getName(); + } + + @MessageMapping(URL) + public void sendMessageToAll(String message, Principal author) { + messageService.sendMessageToAll(MESSAGES_TOPIC, new MessageDto(author.getName(), message)); + } + + @MessageMapping(URL + "/{user}") + public void sendMessageToUser(@DestinationVariable String user, String message, Principal author) { + messageService.sendMessageToUser(MESSAGES_TOPIC, user, new MessageDto(author.getName(), message)); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/ws/api/MessageDto.java b/Laba5.1/src/main/java/com/example/demo/ws/api/MessageDto.java new file mode 100644 index 0000000..b92341d --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/ws/api/MessageDto.java @@ -0,0 +1,27 @@ +package com.example.demo.ws.api; + +import java.util.Date; + +public class MessageDto { + private final String author; + private final Date date; + private final String text; + + public MessageDto(String author, String text) { + this.author = author; + this.date = new Date(); + this.text = text; + } + + public String getAuthor() { + return author; + } + + public Date getDate() { + return date; + } + + public String getText() { + return text; + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/ws/configuration/WebSocketConfiguration.java b/Laba5.1/src/main/java/com/example/demo/ws/configuration/WebSocketConfiguration.java new file mode 100644 index 0000000..135c893 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/ws/configuration/WebSocketConfiguration.java @@ -0,0 +1,53 @@ +package com.example.demo.ws.configuration; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.messaging.Message; +import org.springframework.messaging.simp.config.MessageBrokerRegistry; +import org.springframework.messaging.support.ChannelInterceptor; +import org.springframework.security.authorization.AuthorizationManager; +import org.springframework.security.config.annotation.web.socket.EnableWebSocketSecurity; +import org.springframework.security.messaging.access.intercept.MessageMatcherDelegatingAuthorizationManager; +import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; +import org.springframework.web.socket.config.annotation.StompEndpointRegistry; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; + +@Order(Ordered.HIGHEST_PRECEDENCE + 99) +@Configuration +@EnableWebSocketMessageBroker +@EnableWebSocketSecurity +public class WebSocketConfiguration implements WebSocketMessageBrokerConfigurer { + public static final String ENDPOINT = "/ws"; + private static final String APP_PREFIX = "/app"; + + public static final String TOPIC_PREFIX = "/topic"; + + @Override + public void registerStompEndpoints(StompEndpointRegistry registry) { + registry.addEndpoint(ENDPOINT); + } + + @Override + public void configureMessageBroker(MessageBrokerRegistry registry) { + registry.enableSimpleBroker(TOPIC_PREFIX); + registry.setApplicationDestinationPrefixes(APP_PREFIX); + } + + @Order(Ordered.HIGHEST_PRECEDENCE) + @Bean("csrfChannelInterceptor") + ChannelInterceptor noopCsrfChannelInterceptor() { + return new ChannelInterceptor() { + }; + } + + @Bean + AuthorizationManager> authorizationManager( + MessageMatcherDelegatingAuthorizationManager.Builder messages) { + messages + .simpDestMatchers(ENDPOINT + "/**").permitAll() + .anyMessage().authenticated(); + return messages.build(); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/ws/scheduler/MessageScheduler.java b/Laba5.1/src/main/java/com/example/demo/ws/scheduler/MessageScheduler.java new file mode 100644 index 0000000..bb82f65 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/ws/scheduler/MessageScheduler.java @@ -0,0 +1,24 @@ +package com.example.demo.ws.scheduler; + +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import com.example.demo.ws.api.MessageController; +import com.example.demo.ws.api.MessageDto; +import com.example.demo.ws.service.MessageService; + +@Component +public class MessageScheduler { + private final MessageService messageService; + + public MessageScheduler(MessageService messageService) { + this.messageService = messageService; + } + + @Scheduled(cron = "*/30 * * * * ?", zone = "Europe/Samara") + public void scheduledServiceMessages() { + messageService.sendMessageToAll( + MessageController.MESSAGES_TOPIC, + new MessageDto("service", "Scheduled message")); + } +} diff --git a/Laba5.1/src/main/java/com/example/demo/ws/service/MessageService.java b/Laba5.1/src/main/java/com/example/demo/ws/service/MessageService.java new file mode 100644 index 0000000..7ac4132 --- /dev/null +++ b/Laba5.1/src/main/java/com/example/demo/ws/service/MessageService.java @@ -0,0 +1,23 @@ +package com.example.demo.ws.service; + +import org.springframework.messaging.simp.SimpMessagingTemplate; +import org.springframework.stereotype.Service; + +@Service +public class MessageService { + private final SimpMessagingTemplate messagingTemplate; + + public MessageService(SimpMessagingTemplate messagingTemplate) { + this.messagingTemplate = messagingTemplate; + } + + public T sendMessageToAll(String destination, T message) { + messagingTemplate.convertAndSend(destination, message); + return message; + } + + public T sendMessageToUser(String destination, String user, T message) { + messagingTemplate.convertAndSendToUser(user, destination, message); + return message; + } +} diff --git a/Laba5.1/src/main/resources/application.properties b/Laba5.1/src/main/resources/application.properties new file mode 100644 index 0000000..1652358 --- /dev/null +++ b/Laba5.1/src/main/resources/application.properties @@ -0,0 +1,24 @@ +# 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 + +# File Upload Settings +spring.servlet.multipart.max-file-size=5MB +spring.servlet.multipart.max-request-size=5MB + +# H2 console +spring.h2.console.enabled=true \ No newline at end of file diff --git a/Laba5.1/src/main/resources/public/batman.svg b/Laba5.1/src/main/resources/public/batman.svg new file mode 100644 index 0000000..bbe0e31 --- /dev/null +++ b/Laba5.1/src/main/resources/public/batman.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Laba5.1/src/main/resources/public/css/style.css b/Laba5.1/src/main/resources/public/css/style.css new file mode 100644 index 0000000..63c887a --- /dev/null +++ b/Laba5.1/src/main/resources/public/css/style.css @@ -0,0 +1,120 @@ +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; +} + +#chat-container { + position: fixed; + bottom: 0px; + right: 0px; + margin: 0.25rem; + height: 600px; + width: 400px; + z-index: 100; +} + +.closed-chat { + height: auto !important; +} + +#chat { + border-radius: 15px; +} + +#chat .card-header { + border-top-left-radius: 15px; + border-top-right-radius: 15px; + border-bottom: 0; +} + +#chat .card-header:hover { + cursor: pointer; +} + +#chat .card-body { + max-height: 540px; +} + +#chat #messages { + overflow-y: scroll; +} + +#chat .message .message-avatar { + width: 45px; + height: 100%; +} + +#chat .message .message-body { + border-radius: 15px +} + +#chat .message .message-out { + background-color: rgba(57, 192, 237, 0.5); +} + +#chat .message .message-in { + background-color: rgba(57, 192, 237, 0.1); +} \ No newline at end of file diff --git a/Laba5.1/src/main/resources/public/einstein.svg b/Laba5.1/src/main/resources/public/einstein.svg new file mode 100644 index 0000000..d663192 --- /dev/null +++ b/Laba5.1/src/main/resources/public/einstein.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Laba5.1/src/main/resources/public/favicon.svg b/Laba5.1/src/main/resources/public/favicon.svg new file mode 100644 index 0000000..7e1bd9a --- /dev/null +++ b/Laba5.1/src/main/resources/public/favicon.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Laba5.1/src/main/resources/templates/cart.html b/Laba5.1/src/main/resources/templates/cart.html new file mode 100644 index 0000000..5d462d7 --- /dev/null +++ b/Laba5.1/src/main/resources/templates/cart.html @@ -0,0 +1,91 @@ + + + + + Корзина + + + +

+
+
+ Корзина +
+ +
+
+
+
+
+ [[${cartItem.typeName}]] [[${#numbers.formatDecimal(cartItem.price, 1, 2)}]] * + [[${cartItem.count}]] + = + [[${#numbers.formatDecimal(cartItem.price * cartItem.count, 1, 2)}]] +
+
+
+ +
+
+ +
+
+
+
+
+ Итого: [[${#numbers.formatDecimal(totalCart, 1, 2)}]] ₽ +
+
+
+ +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ +
+
+
+ + + + + \ No newline at end of file diff --git a/Laba5.1/src/main/resources/templates/default.html b/Laba5.1/src/main/resources/templates/default.html new file mode 100644 index 0000000..103729e --- /dev/null +++ b/Laba5.1/src/main/resources/templates/default.html @@ -0,0 +1,275 @@ + + + + + + + + My shop + + + + + + + + + +
+
+
+
+
+
+
+

Чат

+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+ Автор, [[${#dates.year(#dates.createNow())}]] +
+ + + + \ No newline at end of file diff --git a/Laba5.1/src/main/resources/templates/error.html b/Laba5.1/src/main/resources/templates/error.html new file mode 100644 index 0000000..faa6b0a --- /dev/null +++ b/Laba5.1/src/main/resources/templates/error.html @@ -0,0 +1,37 @@ + + + + + Ошибка + + + +
+
    + +
  • + Неизвестная ошибка +
    • +     + +
  • + Ошибка: [[${message}]] +
    • +     + +
  • + Адрес: [[${url}]] +
    • +
  • + Класс исключения: [[${exception}]] +
    • +
  • + [[${method}]] ([[${file}]]:[[${line}]]) +
    • +     +
+ На главную +
+ + + \ No newline at end of file diff --git a/Laba5.1/src/main/resources/templates/login.html b/Laba5.1/src/main/resources/templates/login.html new file mode 100644 index 0000000..eb3a6d7 --- /dev/null +++ b/Laba5.1/src/main/resources/templates/login.html @@ -0,0 +1,44 @@ + + + + + Вход + + + +
+
+
+ Неверный логин или пароль +
+
+ Выход успешно произведен +
+
+ Пользователь успешно создан +
+
+ + +
+
+ + +
+
+ + +
+
+ + Регистрация +
+
+
+ + + + + \ No newline at end of file diff --git a/Laba5.1/src/main/resources/templates/orders.html b/Laba5.1/src/main/resources/templates/orders.html new file mode 100644 index 0000000..e914114 --- /dev/null +++ b/Laba5.1/src/main/resources/templates/orders.html @@ -0,0 +1,70 @@ + + + + + + +

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

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

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

+ +

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

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

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

+ +

Типы заказов

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

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

+ +

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

+ + + + + + + + + + + + + + + + + + + +
IDИмя пользователя
+
+ + +
+ 		+
+ + +
+
+ + + +
+ + + \ No newline at end of file diff --git a/Laba5.1/src/test/java/com/example/demo/TypeServiceTests.java b/Laba5.1/src/test/java/com/example/demo/TypeServiceTests.java new file mode 100644 index 0000000..10043cd --- /dev/null +++ b/Laba5.1/src/test/java/com/example/demo/TypeServiceTests.java @@ -0,0 +1,79 @@ +package com.example.demo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +@SpringBootTest +class TypeServiceTests { + @Autowired + private TypeService typeService; + + private TypeEntity type; + + @BeforeEach + void createData() { + removeData(); + + type = typeService.create(new TypeEntity("Ноутбук")); + typeService.create(new TypeEntity("Телефон")); + typeService.create(new TypeEntity("Игровая приставка")); + } + + @AfterEach + void removeData() { + typeService.getAll().forEach(item -> typeService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(type, typeService.get(type.getId())); + } + + @Test + void createNotUniqueTest() { + final TypeEntity nonUniqueType = new TypeEntity("Ноутбук"); + Assertions.assertThrows(IllegalArgumentException.class, () -> typeService.create(nonUniqueType)); + } + + @Test + void createNullableTest() { + final TypeEntity nullableType = new TypeEntity(null); + Assertions.assertThrows(DataIntegrityViolationException.class, () -> typeService.create(nullableType)); + } + + @Test + void updateTest() { + final String test = "TEST"; + final String oldName = type.getName(); + final TypeEntity newEntity = typeService.update(type.getId(), new TypeEntity(test)); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(newEntity, typeService.get(type.getId())); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + void deleteTest() { + typeService.delete(type.getId()); + Assertions.assertEquals(2, typeService.getAll().size()); + + final TypeEntity newEntity = typeService.create(new TypeEntity(type.getName())); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertNotEquals(type.getId(), newEntity.getId()); + } +} diff --git a/Laba5.1/src/test/java/com/example/demo/UserOrderServiceTest.java b/Laba5.1/src/test/java/com/example/demo/UserOrderServiceTest.java new file mode 100644 index 0000000..820009f --- /dev/null +++ b/Laba5.1/src/test/java/com/example/demo/UserOrderServiceTest.java @@ -0,0 +1,133 @@ +package com.example.demo; + +import java.util.List; +import java.util.Set; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.orders.model.OrderEntity; +import com.example.demo.orders.service.OrderService; +import com.example.demo.subscriptions.model.SubscriptionEntity; +import com.example.demo.subscriptions.service.SubscriptionService; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.model.UserSubscriptionWithStatus; +import com.example.demo.users.service.UserService; + +import jakarta.persistence.EntityManager; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class UserOrderServiceTest { + @Autowired + private EntityManager entityManager; + @Autowired + private TypeService typeService; + @Autowired + private SubscriptionService subscriptionService; + @Autowired + private OrderService orderService; + @Autowired + private UserService userService; + + private TypeEntity type1; + private TypeEntity type2; + private TypeEntity type3; + + private UserEntity user1; + private UserEntity user2; + + @BeforeEach + void createData() { + removeData(); + + type1 = typeService.create(new TypeEntity("Ноутбук")); + type2 = typeService.create(new TypeEntity("Телефон")); + type3 = typeService.create(new TypeEntity("Игровая приставка")); + + subscriptionService.create(new SubscriptionEntity("Подписка 1")); + subscriptionService.create(new SubscriptionEntity("Подписка 2")); + subscriptionService.create(new SubscriptionEntity("Подписка 3")); + + user1 = userService.create(new UserEntity("user1", Constants.DEFAULT_PASSWORD)); + user2 = userService.create(new UserEntity("user2", Constants.DEFAULT_PASSWORD)); + + final var orders = List.of( + new OrderEntity(type1, 49999.00, 20), + new OrderEntity(type1, 129999.00, 3), + new OrderEntity(type2, 15450.50, 30), + new OrderEntity(type2, 69900.50, 10), + new OrderEntity(type2, 150000.00, 6), + new OrderEntity(type3, 75000.00, 6), + new OrderEntity(type3, 67800.00, 3)); + orders.forEach(order -> orderService.create(user1.getId(), order)); + } + + @AfterEach + void removeData() { + userService.getAll().forEach(item -> userService.delete(item.getId())); + typeService.getAll().forEach(item -> typeService.delete(item.getId())); + subscriptionService.getAll().forEach(item -> subscriptionService.delete(item.getId())); + } + + @Test + @Order(1) + void createTest() { + Assertions.assertEquals(7, orderService.getAll(user1.getId(), 0).size()); + Assertions.assertEquals(0, orderService.getAll(user2.getId(), 0).size()); + } + + @Test + @Order(2) + void orderFilterTest() { + Assertions.assertEquals(2, orderService.getAll(user1.getId(), type1.getId()).size()); + Assertions.assertEquals(3, orderService.getAll(user1.getId(), type2.getId()).size()); + Assertions.assertEquals(2, orderService.getAll(user1.getId(), type3.getId()).size()); + } + + @Test + @Order(3) + void subscriptionsTest() { + Assertions.assertEquals(3, userService.getUserSubscriptions(user1.getId()).size()); + + final UserSubscriptionWithStatus subscription = userService.getUserSubscriptions(user1.getId()).get(0); + subscription.setActive(false); + userService.saveUserSubscriptions(user1.getId(), Set.of(subscription)); + Assertions.assertEquals(2, + userService.getUserSubscriptions(user1.getId()).stream() + .filter(UserSubscriptionWithStatus::isActive) + .count()); + + subscription.setActive(true); + userService.saveUserSubscriptions(user1.getId(), Set.of(subscription)); + Assertions.assertEquals(3, + userService.getUserSubscriptions(user1.getId()).stream() + .filter(UserSubscriptionWithStatus::isActive) + .count()); + } + + @Test + @Order(6) + void userCascadeDeleteTest() { + userService.delete(user1.getId()); + final var orders = entityManager.createQuery( + "select count(o) from OrderEntity o where o.user.id = :userId"); + orders.setParameter("userId", user1.getId()); + Assertions.assertEquals(0, orders.getFirstResult()); + final var subscriptions = entityManager.createQuery( + "select count(us) from UserSubscriptionEntity us where us.user.id = :userId"); + subscriptions.setParameter("userId", user1.getId()); + Assertions.assertEquals(0, subscriptions.getFirstResult()); + + } +} diff --git a/Laba5.1/src/test/resources/application.properties b/Laba5.1/src/test/resources/application.properties new file mode 100644 index 0000000..d5f355c --- /dev/null +++ b/Laba5.1/src/test/resources/application.properties @@ -0,0 +1,14 @@ +# Server +spring.main.banner-mode=off + +# Logger settings +# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF +logging.level.com.example.demo=DEBUG + +# JPA Settings +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.username=sa +spring.datasource.password=password +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=false \ No newline at end of file diff --git a/Laba5/src/main/java/com/example/demo/userfilms/model/UserfilmEntity.java b/Laba5/src/main/java/com/example/demo/userfilms/model/UserfilmEntity.java index e2059df..68426a9 100644 --- a/Laba5/src/main/java/com/example/demo/userfilms/model/UserfilmEntity.java +++ b/Laba5/src/main/java/com/example/demo/userfilms/model/UserfilmEntity.java @@ -21,12 +21,16 @@ public class UserfilmEntity extends BaseEntity { @ManyToOne @JoinColumn(name = "userId", nullable = false) private UserEntity user; + @ManyToOne + @JoinColumn(name = "genreId", nullable = false) + private GenreEntity genre; public UserfilmEntity() { } public UserfilmEntity(FilmEntity film) { this.film = film; + this.genre = film.getGenre(); } public GenreEntity getGenre() { diff --git a/Laba5/src/main/java/com/example/demo/userfilms/repository/UserfilmRepository.java b/Laba5/src/main/java/com/example/demo/userfilms/repository/UserfilmRepository.java index aa32ec8..e2e3129 100644 --- a/Laba5/src/main/java/com/example/demo/userfilms/repository/UserfilmRepository.java +++ b/Laba5/src/main/java/com/example/demo/userfilms/repository/UserfilmRepository.java @@ -21,9 +21,9 @@ public interface UserfilmRepository Page findByUserId(long userId, Pageable pageable); - List findByUserIdAndFilmId(long userId, long filmId); + List findByUserIdAndGenreId(long userId, long genreId); - Page findByUserIdAndFilmId(long userId, long filmId, Pageable pageable); + Page findByUserIdAndGenreId(long userId, long genreId, Pageable pageable); @Query("select " + "count(*) as count, " @@ -31,7 +31,7 @@ public interface UserfilmRepository + "from FilmEntity f " + "left join GenreEntity g " + "on f.genre = g " - + "right join UserFilmEntity uf " + + "right join UserfilmEntity uf " + "on uf.film = f and uf.user.id = ?1 " + "group by g order by g.name") List getFilmsTotalByGenre(long userId); diff --git a/Laba5/src/main/java/com/example/demo/userfilms/service/UserfilmService.java b/Laba5/src/main/java/com/example/demo/userfilms/service/UserfilmService.java index 69981ed..c9024cf 100644 --- a/Laba5/src/main/java/com/example/demo/userfilms/service/UserfilmService.java +++ b/Laba5/src/main/java/com/example/demo/userfilms/service/UserfilmService.java @@ -28,12 +28,12 @@ public class UserfilmService { } @Transactional(readOnly = true) - public List getAll(long userId, long filmId) { + public List getAll(long userId, long genreId) { userService.get(userId); - if (filmId <= 0L) { + if (genreId <= 0L) { return repository.findByUserId(userId); } else { - return repository.findByUserIdAndFilmId(userId, filmId); + return repository.findByUserIdAndGenreId(userId, genreId); } } @@ -44,13 +44,13 @@ public class UserfilmService { } @Transactional(readOnly = true) - public Page getAll(long userId, long filmId, int page, int size) { + public Page getAll(long userId, long genreId, int page, int size) { final Pageable pageable = PageRequest.of(page, size, Sort.by("id")); userService.get(userId); - if (filmId <= 0L) { + if (genreId <= 0L) { return repository.findByUserId(userId, pageable); } else { - return repository.findByUserIdAndFilmId(userId, filmId, pageable); + return repository.findByUserIdAndGenreId(userId, genreId, pageable); } } diff --git a/Laba5/src/main/java/com/example/demo/users/api/UserCabinetController.java b/Laba5/src/main/java/com/example/demo/users/api/UserCabinetController.java index 9508bac..55304cb 100644 --- a/Laba5/src/main/java/com/example/demo/users/api/UserCabinetController.java +++ b/Laba5/src/main/java/com/example/demo/users/api/UserCabinetController.java @@ -17,14 +17,10 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.example.demo.core.api.PageAttributesMapper; import com.example.demo.core.configuration.Constants; -import com.example.demo.orders.api.OrderDto; -import com.example.demo.orders.api.OrderGroupedDto; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.orders.model.OrderGrouped; -import com.example.demo.orders.service.OrderService; -import com.example.demo.types.api.TypeDto; -import com.example.demo.types.model.TypeEntity; -import com.example.demo.types.service.TypeService; +import com.example.demo.films.service.FilmService; +import com.example.demo.genres.api.GenreDto; +import com.example.demo.genres.model.GenreEntity; +import com.example.demo.genres.service.GenreService; import com.example.demo.userfilms.api.UserfilmDto; import com.example.demo.userfilms.api.UserfilmGroupedDto; import com.example.demo.userfilms.model.UserfilmEntity; @@ -42,34 +38,30 @@ public class UserCabinetController { private static final String PROFILE_VIEW = "cabinet"; private static final String PAGE_ATTRIBUTE = "page"; - private static final String TYPEID_ATTRIBUTE = "typeId"; + private static final String GENREID_ATTRIBUTE = "genreId"; private static final String PROFILE_ATTRIBUTE = "profile"; - private final OrderService orderService; private final UserfilmService userfilmService; - private final TypeService typeService; + private final GenreService genreService; + private final FilmService filmService; private final UserService userService; private final ModelMapper modelMapper; public UserCabinetController( - OrderService orderService, UserfilmService userfilmService, - TypeService typeService, + GenreService genreService, + FilmService filmService, UserService userService, ModelMapper modelMapper) { - this.orderService = orderService; this.userfilmService = userfilmService; - this.typeService = typeService; + this.genreService = genreService; + this.filmService = filmService; this.userService = userService; this.modelMapper = modelMapper; } - private OrderDto toDto(OrderEntity entity) { - return modelMapper.map(entity, OrderDto.class); - } - - private OrderGroupedDto toGroupedDto(OrderGrouped entity) { - return modelMapper.map(entity, OrderGroupedDto.class); + private GenreDto toGenreDto(GenreEntity entity) { + return modelMapper.map(entity, GenreDto.class); } private UserfilmDto toUserfilmDto(UserfilmEntity entity) { @@ -84,30 +76,33 @@ public class UserCabinetController { public String getProfile( @CookieValue(value = Constants.USER_COOKIE, defaultValue = "0") long userId, @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, - @RequestParam(name = TYPEID_ATTRIBUTE, defaultValue = "0") int typeId, + @RequestParam(name = GENREID_ATTRIBUTE, defaultValue = "0") int genreId, Model model) { if (userId <= 0) { return Constants.REDIRECT_VIEW + UserLoginController.LOGIN_URL; } model.addAttribute(PAGE_ATTRIBUTE, page); - model.addAttribute(TYPEID_ATTRIBUTE, typeId); - model.addAttribute("userfilms", - userfilmService.getAll(userId).stream() - .map(this::toUserfilmDto) + model.addAttribute(GENREID_ATTRIBUTE, genreId); + model.addAllAttributes(PageAttributesMapper.toAttributes( + userfilmService.getAll(userId, genreId, page, Constants.DEFUALT_PAGE_SIZE), + this::toUserfilmDto)); + model.addAttribute("genres", + genreService.getAll().stream() + .map(this::toGenreDto) .toList()); return PROFILE_VIEW; } @PostMapping("/delete/{id}") - public String deleteOrder( + public String deleteUserfilm( @CookieValue(value = Constants.USER_COOKIE, defaultValue = "0") long userId, @PathVariable(name = "id") Long id, @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, - @RequestParam(name = TYPEID_ATTRIBUTE, defaultValue = "0") int typeId, + @RequestParam(name = GENREID_ATTRIBUTE, defaultValue = "0") int genreId, RedirectAttributes redirectAttributes) { redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); - redirectAttributes.addAttribute(TYPEID_ATTRIBUTE, typeId); - orderService.delete(userId, id); - return Constants.REDIRECT_VIEW + "/"; + redirectAttributes.addAttribute(GENREID_ATTRIBUTE, genreId); + userfilmService.delete(userId, id); + return Constants.REDIRECT_VIEW + "/cabinet"; } } diff --git a/Laba5/src/main/resources/templates/cabinet.html b/Laba5/src/main/resources/templates/cabinet.html index fb72623..f448ed6 100644 --- a/Laba5/src/main/resources/templates/cabinet.html +++ b/Laba5/src/main/resources/templates/cabinet.html @@ -11,6 +11,9 @@
  • Фильмы
    • +
  • + Фильмы +
  • Статистика
    • @@ -20,7 +23,13 @@
    -
    +
    + +
    +
    • [[${userfilm.filmName}]] : [[${userfilm.genreName}]] diff --git a/Laba5/src/main/resources/templates/userfilms.html b/Laba5/src/main/resources/templates/userfilms.html index f0df53f..9aa0678 100644 --- a/Laba5/src/main/resources/templates/userfilms.html +++ b/Laba5/src/main/resources/templates/userfilms.html @@ -9,10 +9,11 @@
      - -
      @@ -27,14 +28,30 @@ +
      +
        +
      • + [[${userfilm.filmName}]] : [[${userfilm.genreName}]] + + + + + +
        • + +
      +
      + - + -
      + - +