Ничего не ломал, но все равно начал все заново

This commit is contained in:
Kirill 2024-06-05 09:41:36 +04:00
parent 3e219a70bf
commit 0ba91b1a06
91 changed files with 4692 additions and 47 deletions

36
Laba5.1/.gitignore vendored Normal file
View File

@ -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

12
Laba5.1/.vscode/extensions.json vendored Normal file
View File

@ -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"
]
}

14
Laba5.1/.vscode/launch.json vendored Normal file
View File

@ -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"
}
]
}

24
Laba5.1/.vscode/settings.json vendored Normal file
View File

@ -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"
],
}

55
Laba5.1/build.gradle Normal file
View File

@ -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()
}

Binary file not shown.

View File

@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

249
Laba5.1/gradlew vendored Normal file
View File

@ -0,0 +1,249 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
warn () {
echo "$*"
} >&2
die () {
echo
echo "$*"
echo
exit 1
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"

92
Laba5.1/gradlew.bat vendored Normal file
View File

@ -0,0 +1,92 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

11
Laba5.1/readme.md Normal file
View File

@ -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

1
Laba5.1/settings.gradle Normal file
View File

@ -0,0 +1 @@
rootProject.name = 'demo'

View File

@ -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));
}
}
}

View File

@ -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();
}
}

View File

@ -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 <E, D> Map<String, Object> toAttributes(Page<E> page, Function<E, D> mapper) {
return Map.of(
"items", page.getContent().stream().map(mapper::apply).toList(),
"currentPage", page.getNumber(),
"totalPages", page.getTotalPages());
}
}

View File

@ -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() {
}
}

View File

@ -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<Object, BaseEntity>() {
@Override
protected void configure() {
skip(destination.getId());
}
});
return mapper;
}
}

View File

@ -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 {
}

View File

@ -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");
}
}

View File

@ -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<String, Object> 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;
}
}

View File

@ -0,0 +1,7 @@
package com.example.demo.core.error;
public class NotFoundException extends RuntimeException {
public <T> NotFoundException(Class<T> clazz, Long id) {
super(String.format("%s with id [%s] is not found or not exists", clazz.getSimpleName(), id));
}
}

View File

@ -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);
}
}
}

View File

@ -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;
}
}

View File

@ -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();
}
}

View File

@ -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<? extends GrantedAuthority> 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<? extends GrantedAuthority> 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();
}
}

View File

@ -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<Integer, UserCartDto> {
public double getSum() {
return this.values().stream()
.map(item -> item.getCount() * item.getPrice())
.mapToDouble(Double::doubleValue)
.sum();
}
}

View File

@ -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();
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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);
}
}

View File

@ -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();
}

View File

@ -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<OrderEntity, Long>, PagingAndSortingRepository<OrderEntity, Long> {
Optional<OrderEntity> findOneByUserIdAndId(long userId, long id);
List<OrderEntity> findByUserId(long userId);
Page<OrderEntity> findByUserId(long userId, Pageable pageable);
List<OrderEntity> findByUserIdAndTypeId(long userId, long typeId);
Page<OrderEntity> 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<OrderGrouped> getOrdersTotalByType(long userId);
}

View File

@ -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<OrderEntity> 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<OrderEntity> 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<OrderEntity> createAll(long userId, List<OrderEntity> 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<OrderGrouped> getTotal(long userId) {
userService.get(userId);
return repository.getOrdersTotalByType(userId);
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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<UserSubscriptionEntity> 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<UserSubscriptionEntity> 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);
}
}

View File

@ -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<SubscriptionEntity, Long>, PagingAndSortingRepository<SubscriptionEntity, Long> {
Optional<SubscriptionEntity> findByNameIgnoreCase(String name);
}

View File

@ -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<SubscriptionEntity> 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<SubscriptionEntity> 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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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);
}
}

View File

@ -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<TypeEntity, Long>, PagingAndSortingRepository<TypeEntity, Long> {
Optional<TypeEntity> findByNameIgnoreCase(String name);
}

View File

@ -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<TypeEntity> 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<TypeEntity> getAll() {
return StreamSupport.stream(repository.findAll(Sort.by("id")).spliterator(), false).toList();
}
@Transactional(readOnly = true)
public List<TypeEntity> getByIds(Collection<Long> ids) {
final List<TypeEntity> 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;
}
}

View File

@ -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<String> 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<OrderEntity> toOrderEntities(Collection<UserCartDto> dtos) {
final Set<Long> typeIds = dtos.stream()
.map(UserCartDto::getType)
.collect(Collectors.toSet());
final Map<Long, TypeEntity> 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<Integer, UserCartDto> 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;
}
}

View File

@ -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);
}
}

View File

@ -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<String, Object> 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;
}
}

View File

@ -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;
}
}

View File

@ -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 + "/";
}
}

View File

@ -0,0 +1,23 @@
package com.example.demo.users.api;
import java.util.ArrayList;
import java.util.List;
public class UserProfileDto {
private List<UserSubscriptionDto> subscriptions = new ArrayList<>();
public UserProfileDto() {
}
public UserProfileDto(List<UserSubscriptionDto> subscriptions) {
this.subscriptions = subscriptions;
}
public List<UserSubscriptionDto> getSubscriptions() {
return subscriptions;
}
public void setSubscriptions(List<UserSubscriptionDto> subscriptions) {
this.subscriptions = subscriptions;
}
}

View File

@ -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";
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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<OrderEntity> orders = new HashSet<>();
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
@OrderBy("id ASC")
private Set<UserSubscriptionEntity> 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<OrderEntity> getOrders() {
return orders;
}
public void addOrder(OrderEntity order) {
if (order.getUser() != this) {
order.setUser(this);
}
orders.add(order);
}
public Set<UserSubscriptionEntity> 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);
}
}

View File

@ -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();
}
}

View File

@ -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;
}
}

View File

@ -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<UserEntity, Long>, PagingAndSortingRepository<UserEntity, Long> {
Optional<UserEntity> findByLoginIgnoreCase(String login);
}

View File

@ -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<UserEntity> 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<UserEntity> getAll() {
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
}
@Transactional(readOnly = true)
public Page<UserEntity> 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<Long, UserSubscriptionEntity> getUserSubscriptionsMap(Set<UserSubscriptionEntity> subscriptions) {
return Optional.ofNullable(subscriptions).orElse(Collections.emptySet()).stream()
.collect(Collectors.toMap(item -> item.getSubscription().getId(), Function.identity()));
}
@Transactional(readOnly = true)
public List<UserSubscriptionWithStatus> getUserSubscriptions(long id) {
final Map<Long, UserSubscriptionEntity> 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<UserSubscriptionWithStatus> subscriptions) {
final UserEntity existsUser = get(id);
final Map<Long, SubscriptionEntity> existsSubscriptions = subscriptionService.getAll().stream()
.collect(Collectors.toMap(SubscriptionEntity::getId, Function.identity()));
final Map<Long, UserSubscriptionEntity> 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);
}
}

View File

@ -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;
}
}

View File

@ -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);
}
}

View File

@ -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));
}
}

View File

@ -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;
}
}

View File

@ -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<Message<?>> authorizationManager(
MessageMatcherDelegatingAuthorizationManager.Builder messages) {
messages
.simpDestMatchers(ENDPOINT + "/**").permitAll()
.anyMessage().authenticated();
return messages.build();
}
}

View File

@ -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"));
}
}

View File

@ -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> T sendMessageToAll(String destination, T message) {
messagingTemplate.convertAndSend(destination, message);
return message;
}
public <T> T sendMessageToUser(String destination, String user, T message) {
messagingTemplate.convertAndSendToUser(user, destination, message);
return message;
}
}

View File

@ -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

View File

@ -0,0 +1 @@
<?xml version="1.0" ?><svg data-name="Layer 1" id="Layer_1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><defs><style>.cls-1{fill:#f2bc0f;}.cls-2,.cls-8{fill:#fff;}.cls-2{opacity:0.3;}.cls-3{fill:#515570;}.cls-4{fill:#393c54;}.cls-5{fill:#ffd8c9;}.cls-10,.cls-12,.cls-6,.cls-7,.cls-9{fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}.cls-6{stroke:#393c54;}.cls-10,.cls-7,.cls-9{stroke:#515570;}.cls-7{opacity:0.1;}.cls-9{opacity:0.4;}.cls-11{fill:#f8dc25;}.cls-12{stroke:#fbc0aa;}</style></defs><title/><circle class="cls-1" cx="64" cy="64" r="60"/><circle class="cls-2" cx="64" cy="64" r="48"/><path class="cls-3" d="M64,124.1a59.78,59.78,0,0,0,40-15.28l-2.39-5.68c-1.71-4-6.22-6.64-11.29-6.64H37.69c-5.07,0-9.58,2.66-11.29,6.64L24,108.82A59.78,59.78,0,0,0,64,124.1Z"/><path class="cls-4" d="M95.25,60.43c0,4.38.45,7.93-3.93,7.93a7.93,7.93,0,1,1,0-15.86C95.7,52.5,95.25,56.05,95.25,60.43Z"/><path class="cls-4" d="M44.61,60.43a7.93,7.93,0,0,1-7.93,7.93c-4.38,0-3.93-3.55-3.93-7.93s-.45-7.93,3.93-7.93A7.93,7.93,0,0,1,44.61,60.43Z"/><path class="cls-5" d="M64,95.37A28.31,28.31,0,0,1,35.68,67.05V52.43c0-15.64,12.68-25.32,28.32-25.32s28.32,9.68,28.32,25.32V67.05A28.31,28.31,0,0,1,64,95.37Z"/><path class="cls-6" d="M56.41,82.07A.91.91,0,0,1,57.25,81h13.5a.91.91,0,0,1,.84,1.07"/><path class="cls-7" d="M90.91,67A13.34,13.34,0,0,0,79.09,80.34v4.49"/><path class="cls-7" d="M37.09,67A13.34,13.34,0,0,1,48.91,80.34v4.49"/><path class="cls-4" d="M35,67.53l27.68,6.22a6.14,6.14,0,0,0,2.63,0L93,67.53V22.7a1,1,0,0,0-1.6-.8l-10,7.45s-6.12-5.8-17.39-5.8A27.83,27.83,0,0,0,45.92,30l-9.27-7.9a1,1,0,0,0-1.65.76Z"/><path class="cls-8" d="M46.13,57.75,55.88,60a5,5,0,1,1-9.75-2.21Z"/><circle class="cls-4" cx="51" cy="59.02" r="2.72"/><line class="cls-9" x1="56.36" x2="45.64" y1="60.07" y2="57.63"/><line class="cls-10" x1="56.36" x2="45.64" y1="59.07" y2="56.63"/><path class="cls-11" d="M78,111.82a.5.5,0,0,0-.26-.93H69.65a.7.7,0,0,0-.65.43h0a3.15,3.15,0,0,1-2.3,1.89l-1,.21a.36.36,0,0,1-.43-.29L65,111.72a.08.08,0,0,0-.15,0l-.28.66a2.37,2.37,0,0,0-1.06,0l-.28-.66a.08.08,0,0,0-.15,0l-.27,1.41a.36.36,0,0,1-.43.29l-1-.21a3.15,3.15,0,0,1-2.3-1.89h0a.7.7,0,0,0-.65-.43H50.29a.5.5,0,0,0-.26.93,5.67,5.67,0,0,1,2.85,4.72.49.49,0,0,0,.56.49,13.27,13.27,0,0,1,5.89.46,9.19,9.19,0,0,1,4.26,3.41.5.5,0,0,0,.82,0,9.19,9.19,0,0,1,4.26-3.41,13.27,13.27,0,0,1,5.89-.46.49.49,0,0,0,.56-.49A5.67,5.67,0,0,1,78,111.82Z"/><path class="cls-8" d="M81.87,57.75,72.12,60a5,5,0,1,0,9.75-2.21Z"/><circle class="cls-4" cx="77.06" cy="59.01" r="2.63"/><line class="cls-9" x1="71.64" x2="82.36" y1="60.07" y2="57.63"/><line class="cls-10" x1="71.64" x2="82.36" y1="59.07" y2="56.63"/><path class="cls-4" d="M93,96.5V67l-5,1.36L85.25,80.65a15.8,15.8,0,0,1-7.39,10.16l-2.14.93a29.26,29.26,0,0,1-23.44,0l-2.14-.93a15.8,15.8,0,0,1-7.39-10.16L40,68.36,35,67V96.5l-16.46,6.64,1.37,1.55a60.21,60.21,0,0,0,17.24,13l19.35-13A14,14,0,0,1,64,102.5a16.37,16.37,0,0,1,7.5,1.81l19.37,13.34a60.39,60.39,0,0,0,17-12.72c.56-.61,1.1-1.21,1.61-1.79Z"/><path class="cls-12" d="M60,90a7,7,0,0,1,8,0"/><path class="cls-3" d="M64,63.12v8.21a.51.51,0,0,1-.63.49l-3.62-1a.51.51,0,0,1-.31-.71l3.61-7.23A.5.5,0,0,1,64,63.12Z"/></svg>

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -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);
}

View File

@ -0,0 +1 @@
<?xml version="1.0" ?><svg data-name="Layer 1" id="Layer_1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><defs><style>.cls-1{fill:#4bc190;}.cls-12,.cls-2{fill:#356cb6;}.cls-2{opacity:0.3;}.cls-3{fill:#fff;}.cls-4{fill:#fbc0aa;}.cls-5{fill:#515570;}.cls-10,.cls-6{fill:none;stroke:#fbc0aa;stroke-linecap:round;stroke-linejoin:round;}.cls-6{stroke-width:20px;}.cls-7,.cls-8{fill:#393c54;}.cls-12,.cls-8{opacity:0.1;}.cls-9{fill:#ffd8c9;}.cls-10{stroke-width:2px;}.cls-11{fill:#f85565;}</style></defs><title/><circle class="cls-1" cx="64" cy="64" r="60"/><circle class="cls-2" cx="64" cy="64" r="48"/><circle class="cls-3" cx="30.76" cy="59.37" r="10"/><circle class="cls-3" cx="97.24" cy="59.37" r="10"/><circle class="cls-3" cx="32.76" cy="41.77" r="12.43"/><circle class="cls-3" cx="95.24" cy="41.77" r="12.43"/><circle class="cls-3" cx="44.5" cy="25.34" r="12.43"/><circle class="cls-3" cx="83.5" cy="25.34" r="12.43"/><circle class="cls-4" cx="91.32" cy="64.43" r="7.93"/><path class="cls-3" d="M64,124.1a59.78,59.78,0,0,0,40-15.28l-2.39-5.68c-1.71-4-6.22-6.64-11.29-6.64H37.69c-5.07,0-9.58,2.66-11.29,6.64L24,108.82A59.78,59.78,0,0,0,64,124.1Z"/><path class="cls-5" d="M79,96.5H48.85A15.07,15.07,0,0,0,79,96.5Z"/><line class="cls-6" x1="64" x2="64" y1="84.75" y2="98.5"/><path class="cls-7" d="M64,113l9.66,3.51a1,1,0,0,0,1.34-.94V104.43a1,1,0,0,0-1.34-.94L64,107Z"/><path class="cls-7" d="M64,113l-9.66,3.51a1,1,0,0,1-1.34-.94V104.43a1,1,0,0,1,1.34-.94L64,107Z"/><circle class="cls-7" cx="64" cy="110" r="5"/><path class="cls-3" d="M64,103.25a11,11,0,0,1-10.78-8.8,11.4,11.4,0,0,0-.22,2.2,11,11,0,0,0,22,0,11.4,11.4,0,0,0-.22-2.2A11,11,0,0,1,64,103.25Z"/><path class="cls-8" d="M64,103.25a11,11,0,0,1-10.78-8.8,11.4,11.4,0,0,0-.22,2.2,11,11,0,0,0,22,0,11.4,11.4,0,0,0-.22-2.2A11,11,0,0,1,64,103.25Z"/><path class="cls-3" d="M72.78,101.1,64,105.74l-8.78-4.64a.9.9,0,0,0-1.22.7v8.4a.9.9,0,0,0,1.22.7L64,106.26l8.78,4.64a.9.9,0,0,0,1.22-.7v-8.4A.9.9,0,0,0,72.78,101.1Z"/><path class="cls-8" d="M72.78,101.1,64,105.74l-8.78-4.64a.9.9,0,0,0-1.22.7v8.4a.9.9,0,0,0,1.22.7L64,106.26l8.78,4.64a.9.9,0,0,0,1.22-.7v-8.4A.9.9,0,0,0,72.78,101.1Z"/><circle class="cls-4" cx="36.68" cy="64.43" r="7.93"/><path class="cls-9" d="M64,98.37A28.31,28.31,0,0,1,35.68,70.05V55.43a28.32,28.32,0,1,1,56.64,0V70.05A28.31,28.31,0,0,1,64,98.37Z"/><path class="cls-10" d="M60,94a7,7,0,0,1,8,0"/><path class="cls-7" d="M71.55,80a1,1,0,0,1,.94,1.07,8.56,8.56,0,0,1-17,0A1,1,0,0,1,56.45,80Z"/><path class="cls-11" d="M64,92h0a4,4,0,0,1-4-4V77h8V88A4,4,0,0,1,64,92Z"/><path class="cls-3" d="M51.25,82.26C51.25,76.59,56.93,72,63.92,72s12.67,4.59,12.67,10.26"/><path class="cls-4" d="M64,77h0a5,5,0,0,1-5-5V57H69V72A5,5,0,0,1,64,77Z"/><circle class="cls-7" cx="50" cy="62.51" r="3.15"/><line class="cls-10" x1="56" x2="72" y1="45" y2="45"/><ellipse class="cls-3" cx="63.91" cy="24.95" rx="18.28" ry="16.82"/><path class="cls-12" d="M80.83,18.58c-.41,10.66-9.9,19.19-21.58,19.19A23.05,23.05,0,0,1,50,35.83a18.9,18.9,0,0,0,13.93,5.94C74,41.77,82.19,34.24,82.19,25A15.72,15.72,0,0,0,80.83,18.58Z"/><circle class="cls-7" cx="78" cy="62.51" r="3.15"/><path class="cls-3" d="M87,53.77c-.4,1.69-10.86.65-12.55.25a3.15,3.15,0,1,1,1.46-6.12C77.58,48.3,87.38,52.08,87,53.77Z"/><path class="cls-3" d="M41,53.77c.4,1.69,10.86.65,12.55.25a3.15,3.15,0,0,0-1.46-6.12C50.42,48.3,40.62,52.08,41,53.77Z"/><line class="cls-10" x1="75" x2="81" y1="69" y2="69"/><line class="cls-10" x1="47" x2="53" y1="69" y2="69"/><path class="cls-7" d="M104,108.82l-2.39-5.68c-1.71-4-6.22-6.64-11.29-6.64H77l-.4,26.26A59.82,59.82,0,0,0,104,108.82Z"/><path class="cls-7" d="M23.59,108.82,26,103.14c1.71-4,6.23-6.64,11.29-6.64H50.59l.4,26.26A59.82,59.82,0,0,1,23.59,108.82Z"/></svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-cart2" viewBox="0 0 16 16">
<path d="M0 2.5A.5.5 0 0 1 .5 2H2a.5.5 0 0 1 .485.379L2.89 4H14.5a.5.5 0 0 1 .485.621l-1.5 6A.5.5 0 0 1 13 11H4a.5.5 0 0 1-.485-.379L1.61 3H.5a.5.5 0 0 1-.5-.5zM3.14 5l1.25 5h8.22l1.25-5H3.14zM5 13a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm-2 1a2 2 0 1 1 4 0 2 2 0 0 1-4 0zm9-1a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm-2 1a2 2 0 1 1 4 0 2 2 0 0 1-4 0z"/>
</svg>

After

Width:  |  Height:  |  Size: 463 B

View File

@ -0,0 +1,91 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Корзина</title>
</head>
<body>
<main layout:fragment="content">
<div class="d-flex flex-column align-items-center">
<div class="mb-2 col-12 col-md-8 col-lg-6 d-flex align-items-center">
<strong class="flex-fill">Корзина</strong>
<form action="#" th:action="@{/cart/clear}" method="post">
<button type="submit" class="btn btn-danger button-fixed-width"
onclick="return confirm('Вы уверены?')">
<i class="bi bi-x-lg"></i> Очистить
</button>
</form>
</div>
<div class="card col-12 col-md-8 col-lg-6 align-items-center" th:each="cartItem : ${cart}">
<div class="card-body col-12 p-2 d-flex flex-row align-items-center justify-content-center">
<div class="col-9">
[[${cartItem.typeName}]] [[${#numbers.formatDecimal(cartItem.price, 1, 2)}]] *
[[${cartItem.count}]]
=
[[${#numbers.formatDecimal(cartItem.price * cartItem.count, 1, 2)}]]
</div>
<div class="col-3 d-flex justify-content-end">
<form action="#"
th:action="@{/cart/increase?type={type}&price={price}(type=${cartItem.type},price=${cartItem.price})}"
method="post">
<button type="submit" class="btn btn-primary">
<i class="bi bi-plus-lg"></i>
</button>
</form>
<form action="#"
th:action="@{/cart/decrease?type={type}&price={price}(type=${cartItem.type},price=${cartItem.price})}"
method="post">
<button class="btn btn-danger">
<i class="bi bi-dash-lg"></i>
</button>
</form>
</div>
</div>
</div>
<div class=" mb-2 col-12 col-md-8 col-lg-6 d-flex justify-content-end">
<strong>Итого: [[${#numbers.formatDecimal(totalCart, 1, 2)}]] &#8381;</strong>
</div>
<div class="mb-2 col-12 col-md-8 col-lg-6 d-flex justify-content-center"
th:if="${not #lists.isEmpty(cart)}">
<form action="#" th:action="@{/cart/save}" method="post">
<button type="submit" class="btn btn-primary" onclick="return confirm('Вы уверены?')">
Оформить заказ
</button>
</form>
</div>
</div>
<div class="mb-2">
<form action=" #" th:action="@{/cart}" th:object="${order}" method="post" enctype="multipart/form-data">
<div class="mb-2">
<label for="type" class="form-label">Товары</label>
<select th:field="*{type}" id="type" class="form-select">
<option selected value="">Укажите тип товара</option>
<option th:each="type : ${types}" th:value="${type.id}">[[${type.name}]]</option>
</select>
<div th:if="${#fields.hasErrors('type')}" th:errors="*{type}" class="invalid-feedback"></div>
</div>
<div class="mb-2">
<label for="price" class="form-label">Цена</label>
<input type="number" th:field="*{price}" id="price" class="form-control" step="0.50">
<div th:if="${#fields.hasErrors('price')}" th:errors="*{price}" class="invalid-feedback"></div>
</div>
<div class="mb-2">
<label for="count" class="form-label">Количество</label>
<input type="number" th:field="*{count}" id="count" class="form-control" value="0" step="1">
<div th:if="${#fields.hasErrors('count')}" th:errors="*{count}" class="invalid-feedback"></div>
</div>
<div class="mb-2">
<label for="image" class="form-label">Изображение</label>
<input type="file" th:field="*{image}" id="image" class="form-control">
<div th:if="${#fields.hasErrors('image')}" th:errors="*{image}" class="invalid-feedback"></div>
</div>
<button type="submit" class="btn btn-primary">Добавить в корзину</button>
</form>
</div>
</main>
</body>
</html>
</html>

View File

@ -0,0 +1,275 @@
<!DOCTYPE html>
<html lang="ru" data-bs-theme="dark" xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity6">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">My shop</title>
<script type="text/javascript" src="/webjars/stomp__stompjs/7.0.0/bundles/stomp.umd.min.js"></script>
<script type="text/javascript" src="/webjars/bootstrap/5.3.3/dist/js/bootstrap.bundle.min.js"></script>
<link rel="stylesheet" href="/webjars/bootstrap/5.3.3/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="/webjars/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" />
<link rel="stylesheet" href="/css/style.css" />
</head>
<body class="h-100 d-flex flex-column">
<nav class="navbar navbar-expand-md my-navbar" data-bs-theme="dark">
<div class="container-fluid">
<a class="navbar-brand" href="/">
<i class="bi bi-cart2 d-inline-block align-top me-1 logo"></i>
MyShop
</a>
<th:block sec:authorize="isAuthenticated()" th:with="userName=${#authentication.name}">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#main-navbar"
aria-controls="main-navbar" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="main-navbar">
<ul class="navbar-nav me-auto link" th:with="activeLink=${#objects.nullSafe(servletPath, '')}">
<th:block sec:authorize="hasRole('ADMIN')">
<a class="nav-link" href="/admin/user"
th:classappend="${activeLink.startsWith('/admin/user') ? 'active' : ''}">
Пользователи
</a>
<a class="nav-link" href="/admin/type"
th:classappend="${activeLink.startsWith('/admin/type') ? 'active' : ''}">
Типы заказов
</a>
<a class="nav-link" href="/admin/subscription"
th:classappend="${activeLink.startsWith('/admin/subscription') ? 'active' : ''}">
Списки рассылки
</a>
<a class="nav-link" href="/h2-console/" target="_blank">Консоль H2</a>
</th:block>
<a class="nav-link" href="/123" target="_blank">Ошибка 1</a>
<a class="nav-link" href="/admin/123" target="_blank">Ошибка 2</a>
</ul>
<ul class="navbar-nav" th:if="${not #strings.isEmpty(userName)}">
<form th:action="@{/logout}" method="post">
<button type="submit" class="navbar-brand nav-link" onclick="return confirm('Вы уверены?')">
Выход ([[${userName}]])
</button>
</form>
<a class="navbar-brand" href="/cart">
<i class="bi bi-cart2 d-inline-block align-top me-1 logo"></i>
[[${#numbers.formatDecimal(totalCart, 1, 2)}]] &#8381;
</a>
</ul>
</div>
</th:block>
</div>
</nav>
<main class="container-fluid p-2" layout:fragment="content">
</main>
<section sec:authorize="isAuthenticated()" id="chat-container" class="row d-flex justify-content-center">
<div class="col-12 p-0 m-0">
<div class="row d-flex flex-column p-0 m-0 h-100">
<div id="chat" class="card p-0 h-100">
<div class="card-header p-3 bg-info text-white text-center">
<p class="mb-0 fw-bold">Чат</p>
</div>
<div class="card-body d-flex flex-column">
<div id="messages" class="flex-grow-1 pe-3">
<!-- <div class="message d-flex flex-row justify-content-start mb-4">
<img class="message-avatar" src="/einstein.svg" alt="avatar">
<div class="p-3 ms-3 message-body message-in">
<p class="small mb-0">
Hello and thank you for visiting MDBootstrap. Please click the video below.
</p>
</div>
</div>
<div class="message d-flex flex-row justify-content-end mb-4">
<div class="p-3 me-3 border message-body message-out">
<p class="small mb-0">
Thank you, I really like your product.
</p>
</div>
<img class="message-avatar" src="/batman.svg" alt="avatar">
</div> -->
</div>
<div class="card-text pt-2">
<div data-mdb-input-init class="form-outline">
<textarea id="message-box" class="form-control" rows="2"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<footer class="my-footer mt-auto d-flex flex-shrink-0 justify-content-center align-items-center">
Автор, [[${#dates.year(#dates.createNow())}]]
</footer>
<script sec:authorize="isAuthenticated()">
const wsClient = () => {
let messageCallback = null;
const currentUrl = new URL(window.location.href);
const stompClient = new StompJs.Client({
brokerURL: `ws://${currentUrl.host}/ws`
});
const proceedMessage = (message) => {
const data = JSON.parse(message.body)
console.log(data);
if (messageCallback) {
messageCallback(data);
}
}
stompClient.onConnect = (frame) => {
console.log('Connected: ' + frame);
stompClient.subscribe('/topic/messages', proceedMessage);
stompClient.subscribe('/user/topic/messages', proceedMessage);
};
stompClient.onWebSocketError = (error) => {
console.error('Error with websocket', error);
};
stompClient.onStompError = (frame) => {
console.error('Broker reported error: ' + frame.headers['message']);
if (frame.body) {
console.error('Additional details: ' + frame.body);
}
};
const sendMessage = (message, toUser) => {
if (!message.trim()) {
return;
}
stompClient.publish({
destination: `/app/messages${toUser ? `/${toUser}` : ''}`,
body: message
});
}
stompClient.activate();
return {
sendToAll: (message) => sendMessage(message),
sendToUser: (message, user) => sendMessage(message, user),
setCallback: (callback) => messageCallback = callback
}
}
const chat = async (wsClient) => {
const messages = document.getElementById("messages");
const messageBox = document.getElementById("message-box");
const chatContainer = document.getElementById("chat-container");
const chatHeader = document.querySelector("#chat .card-header");
const chatBody = document.querySelector("#chat .card-body");
const getUserName = async () => {
const response = await fetch("/whoami");
return response.text();
}
const user = await getUserName();
const format = (date) => {
const d = new Date(date);
let month = '' + (d.getMonth() + 1);
let day = '' + d.getDate();
let year = d.getFullYear();
if (month.length < 2) {
month = '0' + month;
}
if (day.length < 2) {
day = '0' + day;
}
return [day, month, year].join('.');
}
const addOutMessage = (message) => {
messages.innerHTML +=
`<div class="message d-flex flex-row justify-content-end mb-4">
<div class="p-3 me-3 border message-body message-out">
<p class="fw-semibold m-0">${user}</p>
<p class="small m-0">${message}</p>
<p class="fw-light small m-0 text-end">${format(new Date())}</p>
</div>
<img class="message-avatar" src="/batman.svg" alt="avatar">
</div>`;
messages.scrollTop = messages.scrollHeight;
}
const addInMessage = (message) => {
if (message.author === user) {
return;
}
messages.innerHTML +=
`<div class="message d-flex flex-row justify-content-start mb-4">
<img class="message-avatar" src="/einstein.svg" alt="avatar">
<div class="p-3 ms-3 message-body message-in">
<p class="fw-semibold m-0">${message.author}</p>
<p class="small m-0">${message.text}</p>
<p class="fw-light small m-0 text-end">${format(message.date)}</p>
</div>
</div>`;
messages.scrollTop = messages.scrollHeight;
}
const sendMessage = (message, user) => {
if (!message.trim()) {
return;
}
if (user) {
wsClient.sendToUser(message, user);
} else {
wsClient.sendToAll(message);
}
addOutMessage(message);
}
const toggleChat = () => {
const closedClass = "closed-chat";
const hideClass = "d-none";
const chatVisible = chatContainer.classList.contains(closedClass);
if (chatVisible) {
chatBody.classList.remove(hideClass);
chatContainer.classList.remove(closedClass);
} else {
chatBody.classList.add(hideClass);
chatContainer.classList.add(closedClass);
}
}
chatHeader.addEventListener("click", toggleChat);
messageBox.addEventListener("keydown", (event) => {
if (event.code === "Enter") {
event.preventDefault();
event.stopPropagation();
const message = messageBox.value;
if (message.startsWith("@")) {
const splitted = message.split(" ");
if (splitted.length < 2) {
return;
}
const user = splitted.shift().replaceAll("@", "");
sendMessage(splitted.join(" "), user);
} else {
sendMessage(message);
}
messageBox.value = "";
}
});
if (wsClient) {
wsClient.setCallback(addInMessage);
}
toggleChat();
}
document.addEventListener("DOMContentLoaded", () => {
chat(wsClient());
});
</script>
</body>
</html>

View File

@ -0,0 +1,37 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Ошибка</title>
</head>
<body>
<main layout:fragment="content">
<ul class="list-group mb-2">
<th:block th:if="${#strings.isEmpty(message)}">
<li class="list-group-item">
Неизвестная ошибка
</li>
</th:block>
<th:block th:if="${not #strings.isEmpty(message)}">
<li class="list-group-item">
<strong>Ошибка:</strong> [[${message}]]
</li>
</th:block>
<th:block th:if="${not #strings.isEmpty(url)}">
<li class="list-group-item">
<strong>Адрес:</strong> [[${url}]]
</li>
<li class="list-group-item">
<strong>Класс исключения:</strong> [[${exception}]]
</li>
<li class="list-group-item">
[[${method}]] ([[${file}]]:[[${line}]])
</li>
</th:block>
</ul>
<a class="btn btn-primary button-fixed-width" href="/">На главную</a>
</main>
</body>
</html>

View File

@ -0,0 +1,44 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Вход</title>
</head>
<body>
<main layout:fragment="content">
<form action="#" th:action="@{/login}" method="post">
<div th:if="${param.error}" class="alert alert-danger">
Неверный логин или пароль
</div>
<div th:if="${param.logout}" class="alert alert-success">
Выход успешно произведен
</div>
<div th:if="${param.signup}" class="alert alert-success">
Пользователь успешно создан
</div>
<div class="mb-3">
<label for="username" class="form-label">Имя пользователя</label>
<input type="text" id="username" name="username" class="form-control" required minlength="3"
maxlength="20">
</div>
<div class="mb-3">
<label for="password" class="form-label">Пароль</label>
<input type="password" id="password" name="password" class="form-control" required minlength="3"
maxlength="20">
</div>
<div class="form-check mb-3">
<input class="form-check-input" type="checkbox" id="remember-me" name="remember-me" checked>
<label class="form-check-label" for="remember-me">Запомнить меня</label>
</div>
<div class="mb-3 d-flex flex-row">
<button class="btn btn-primary me-2 button-fixed-width" type="submit">Войти</button>
<a class="btn btn-secondary button-fixed-width" href="/signup">Регистрация</a>
</div>
</form>
</main>
</body>
</html>
</html>

View File

@ -0,0 +1,70 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<body>
<th:block th:fragment="orders (items, totalPages, currentPage)">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<form th:action="@{/}" method="get" class="row mt-2">
<div class="col-sm-10">
<input type="hidden" th:name="page" th:value="${page}">
<select th:name="typeId" id="typeId" class="form-select">
<option selected value="">Фильтр по типу товара</option>
<option th:each="type : ${types}" th:value="${type.id}" th:selected="${type.id==typeId}">
[[${type.name}]]
</option>
</select>
</div>
<button type="submit" class="btn btn-primary col-sm-2">Показать</button>
</form>
<table class="table mt-2">
<caption></caption>
<thead>
<tr>
<th scope="col" class="w-10">ID</th>
<th scope="col" class="w-10">Изображение</th>
<th scope="col" class="w-auto">Тип заказа</th>
<th scope="col" class="w-10">Цена</th>
<th scope="col" class="w-10">Количество</th>
<th scope="col" class="w-10">Сумма</th>
<th scope="col" class="w-10"></th>
</tr>
</thead>
<tbody>
<tr th:each="order : ${items}">
<th scope="row" th:text="${order.id}"></th>
<td>
<img th:if="${not #strings.isEmpty(order.imageExtension)}"
th:src="@{/resources/image/order-{id}.{ext}(id=${order.id},ext=${order.imageExtension})}"
th:alt="${'order-' + order.id}" class="cart-image" />
</td>
<td th:text="${order.typeName}"></td>
<td th:text="${#numbers.formatDecimal(order.price, 1, 2)}"></td>
<td th:text="${order.count}"></td>
<td th:text="${#numbers.formatDecimal(order.sum, 1, 2)}"></td>
<td>
<form th:action="@{/delete/{id}(id=${order.id})}" method="post">
<input type="hidden" th:name="page" th:value="${page}">
<input type="hidden" th:name="typeId" th:value="${typeId}">
<button type="submit" class="btn btn-link button-link"
onclick="return confirm('Вы уверены?')">Удалить</button>
</form>
</td>
</tr>
</tbody>
</table>
</th:block>
<th:block th:replace="~{ pagination :: pagination (
url='',
totalPages=${totalPages},
currentPage=${currentPage}) }" />
<div class="mt-2 d-flex justify-content-center">
<a class="btn btn-primary" href="/cart">Создать заказ</a>
</div>
</th:block>
</th:block>
</body>
</html>

View File

@ -0,0 +1,51 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<body>
<th:block th:fragment="pagination (url, totalPages, currentPage)">
<nav th:if="${totalPages > 1}" th:with="
maxPage=2,
currentPage=${currentPage + 1}">
<ul class="pagination justify-content-center"
th:with="
seqFrom=${currentPage - maxPage < 1 ? 1 : currentPage - maxPage},
seqTo=${currentPage + maxPage > totalPages ? totalPages : currentPage + maxPage}">
<th:block th:if="${currentPage > maxPage + 1}">
<li class="page-item">
<a class="page-link" aria-label="Previous" th:href="@{/{url}?page=0(url=${url})}">
<span aria-hidden="true">&laquo;</span>
</a>
</li>
<li class="page-item disabled">
<span class="page-link" aria-label="Previous">
<span aria-hidden="true">&hellip;</span>
</span>
</li>
</th:block>
<li class="page-item" th:each="page : ${#numbers.sequence(seqFrom, seqTo)}"
th:classappend="${page == currentPage} ? 'active' : ''">
<a class=" page-link" th:href="@{/{url}?page={page}(url=${url},page=${page - 1})}">
<span th:text="${page}" />
</a>
</li>
<th:block th:if="${currentPage < totalPages - maxPage}">
<li class="page-item disabled">
<span class="page-link" aria-label="Previous">
<span aria-hidden="true">&hellip;</span>
</span>
</li>
<li class="page-item">
<a class="page-link" aria-label="Next"
th:href="@{/{url}?page={page}(url=${url},page=${totalPages - 1})}">
<span aria-hidden="true">&raquo;</span>
</a>
</li>
</th:block>
</ul>
</nav>
</th:block>
</body>
</html>

View File

@ -0,0 +1,57 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Личный кабинет</title>
</head>
<body>
<main layout:fragment="content">
<ul class="nav nav-pills justify-content-center" role="tablist">
<li class="nav-item">
<a class="nav-link active" data-bs-toggle="pill" href="#orders">Заказы</a>
</li>
<li class="nav-item">
<a class="nav-link" data-bs-toggle="pill" href="#stats">Статистика</a>
</li>
<li class="nav-item">
<a class="nav-link" data-bs-toggle="pill" href="#subscriptions">Списки рассылок</a>
</li>
</ul>
<div class="tab-content mt-2">
<div class="tab-pane container active" id="orders">
<th:block th:replace="~{ orders :: orders (
items=${items},
totalPages=${totalPages},
currentPage=${currentPage}) }" />
</div>
<div class="tab-pane container fade" id="stats">
<ul class="list-group mb-2">
<li th:each="stat : ${stats}" class="list-group-item">
<strong>[[${stat.typeName}]]</strong>:
[[${#numbers.formatDecimal(stat.totalPrice, 1, 2)}]] &#8381;
([[${stat.totalCount}]] шт.)
</li>
</ul>
</div>
<div class="tab-pane container fade" id="subscriptions">
<form action="#" th:action="@{/}" th:object="${profile}" method="post">
<div class="form-check" th:each="subscription, item : *{subscriptions}"
th:with="id=${'sub-' + subscription.id}">
<input class="form-check-input" type="hidden" th:for="${id}"
th:field="*{subscriptions[__${item.index}__].id}">
<input class="form-check-input" type="checkbox" th:for="${id}"
th:field="*{subscriptions[__${item.index}__].active}">
<label class="form-check-label" for="" th:for="${id}">
[[${subscription.name}]]
</label>
</div>
<button type="submit" class="btn btn-primary button-fixed-width">Сохранить</button>
</form>
</div>
</div>
</main>
</body>
</html>

View File

@ -0,0 +1,37 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Вход</title>
</head>
<body>
<main layout:fragment="content">
<form action="#" th:action="@{/signup}" th:object="${user}" method="post">
<div class="mb-3">
<label for="login" class="form-label">Имя пользователя</label>
<input type="text" th:field="*{login}" id="login" class="form-control">
<div th:if="${#fields.hasErrors('login')}" th:errors="*{login}" class="invalid-feedback"></div>
</div>
<div class="mb-3">
<label for="password" class="form-label">Пароль</label>
<input type="password" th:field="*{password}" id="password" class="form-control">
<div th:if="${#fields.hasErrors('password')}" th:errors="*{password}" class="invalid-feedback"></div>
</div>
<div class="mb-3">
<label for="passwordConfirm" class="form-label">Пароль (подтверждение)</label>
<input type="password" th:field="*{passwordConfirm}" id="passwordConfirm" class="form-control">
<div th:if="${#fields.hasErrors('passwordConfirm')}" th:errors="*{passwordConfirm}"
class="invalid-feedback"></div>
</div>
<div class="mb-3 d-flex flex-row">
<button class="btn btn-primary me-2 button-fixed-width" type="submit">Регистрация</button>
<a class="btn btn-secondary button-fixed-width" href="/">Отмена</a>
</div>
</form>
</main>
</body>
</html>
</html>

View File

@ -0,0 +1,29 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Редакторовать списки рассылки</title>
</head>
<body>
<main layout:fragment="content">
<form action="#" th:action="@{/admin/subscription/edit/{id}(id=${subscription.id})}" th:object="${subscription}"
method="post">
<div class="mb-3">
<label for="id" class="form-label">ID</label>
<input type="text" th:value="*{id}" id="id" class="form-control" readonly disabled>
</div>
<div class="mb-3">
<label for="name" class="form-label">Тип заказа</label>
<input type="text" th:field="*{name}" id="name" class="form-control">
<div th:if="${#fields.hasErrors('name')}" th:errors="*{name}" class="invalid-feedback"></div>
</div>
<div class="mb-3 d-flex flex-row">
<button class="btn btn-primary me-2 button-fixed-width" type="submit">Сохранить</button>
<a class="btn btn-secondary button-fixed-width" href="/admin/subscription">Отмена</a>
</div>
</form>
</main>
</body>
</html>

View File

@ -0,0 +1,51 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Списки рассылки</title>
</head>
<body>
<main layout:fragment="content">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<h2>Списки рассылки</h2>
<div>
<a href="/admin/subscription/edit/" class="btn btn-primary">Добавить список рассылки</a>
</div>
<table class="table">
<caption></caption>
<thead>
<tr>
<th scope="col" class="w-10">ID</th>
<th scope="col" class="w-auto">Список рассылки</th>
<th scope="col" class="w-10"></th>
<th scope="col" class="w-10"></th>
</tr>
</thead>
<tbody>
<tr th:each="subscription : ${items}">
<th scope="row" th:text="${subscription.id}"></th>
<td th:text="${subscription.name}"></td>
<td>
<form th:action="@{/admin/subscription/edit/{id}(id=${subscription.id})}" method="get">
<button type="submit" class="btn btn-link button-link">Редактировать</button>
</form>
</td>
<td>
<form th:action="@{/admin/subscription/delete/{id}(id=${subscription.id})}"
method="post">
<button type="submit" class="btn btn-link button-link"
onclick="return confirm('Вы уверены?')">Удалить</button>
</form>
</td>
</tr>
</tbody>
</table>
</th:block>
</th:block>
</main>
</body>
</html>

View File

@ -0,0 +1,28 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Редакторовать тип заказа</title>
</head>
<body>
<main layout:fragment="content">
<form action="#" th:action="@{/admin/type/edit/{id}(id=${type.id})}" th:object="${type}" method="post">
<div class="mb-3">
<label for="id" class="form-label">ID</label>
<input type="text" th:value="*{id}" id="id" class="form-control" readonly disabled>
</div>
<div class="mb-3">
<label for="name" class="form-label">Тип заказа</label>
<input type="text" th:field="*{name}" id="name" class="form-control">
<div th:if="${#fields.hasErrors('name')}" th:errors="*{name}" class="invalid-feedback"></div>
</div>
<div class="mb-3 d-flex flex-row">
<button class="btn btn-primary me-2 button-fixed-width" type="submit">Сохранить</button>
<a class="btn btn-secondary button-fixed-width" href="/admin/type">Отмена</a>
</div>
</form>
</main>
</body>
</html>

View File

@ -0,0 +1,50 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Типы заказов</title>
</head>
<body>
<main layout:fragment="content">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<h2>Типы заказов</h2>
<div>
<a href="/admin/type/edit/" class="btn btn-primary">Добавить тип заказа</a>
</div>
<table class="table">
<caption></caption>
<thead>
<tr>
<th scope="col" class="w-10">ID</th>
<th scope="col" class="w-auto">Тип заказа</th>
<th scope="col" class="w-10"></th>
<th scope="col" class="w-10"></th>
</tr>
</thead>
<tbody>
<tr th:each="type : ${items}">
<th scope="row" th:text="${type.id}"></th>
<td th:text="${type.name}"></td>
<td>
<form th:action="@{/admin/type/edit/{id}(id=${type.id})}" method="get">
<button type="submit" class="btn btn-link button-link">Редактировать</button>
</form>
</td>
<td>
<form th:action="@{/admin/type/delete/{id}(id=${type.id})}" method="post">
<button type="submit" class="btn btn-link button-link"
onclick="return confirm('Вы уверены?')">Удалить</button>
</form>
</td>
</tr>
</tbody>
</table>
</th:block>
</th:block>
</main>
</body>
</html>

View File

@ -0,0 +1,29 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Редакторовать пользователя</title>
</head>
<body>
<main layout:fragment="content">
<form action="#" th:action="@{/admin/user/edit/{id}(id=${user.id},page=${page})}" th:object="${user}"
method="post">
<div class="mb-3">
<label for="id" class="form-label">ID</label>
<input type="text" th:value="*{id}" id="id" class="form-control" readonly disabled>
</div>
<div class="mb-3">
<label for="login" class="form-label">Имя пользователя</label>
<input type="text" th:field="*{login}" id="login" class="form-control">
<div th:if="${#fields.hasErrors('login')}" th:errors="*{login}" class="invalid-feedback"></div>
</div>
<div class="mb-3 d-flex flex-row">
<button class="btn btn-primary me-2 button-fixed-width" type="submit">Сохранить</button>
<a class="btn btn-secondary button-fixed-width" th:href="@{/admin/user(page=${page})}">Отмена</a>
</div>
</form>
</main>
</body>
</html>

View File

@ -0,0 +1,56 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Пользователи</title>
</head>
<body>
<main layout:fragment="content">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<h2>Пользователи</h2>
<div>
<a th:href="@{/admin/user/edit/(page=${page})}" class="btn btn-primary">Добавить пользователя</a>
</div>
<table class="table">
<caption></caption>
<thead>
<tr>
<th scope="col" class="w-10">ID</th>
<th scope="col" class="w-auto">Имя пользователя</th>
<th scope="col" class="w-10"></th>
<th scope="col" class="w-10"></th>
</tr>
</thead>
<tbody>
<tr th:each="user : ${items}">
<th scope="row" th:text="${user.id}"></th>
<td th:text="${user.login}"></td>
<td>
<form th:action="@{/admin/user/edit/{id}(id=${user.id})}" method="get">
<input type="hidden" th:name="page" th:value="${page}">
<button type="submit" class="btn btn-link button-link">Редактировать</button>
</form>
</td>
<td>
<form th:action="@{/admin/user/delete/{id}(id=${user.id})}" method="post">
<input type="hidden" th:name="page" th:value="${page}">
<button type="submit" class="btn btn-link button-link"
onclick="return confirm('Вы уверены?')">Удалить</button>
</form>
</td>
</tr>
</tbody>
</table>
</th:block>
<th:block th:replace="~{ pagination :: pagination (
url=${'admin/user'},
totalPages=${totalPages},
currentPage=${currentPage}) }" />
</th:block>
</main>
</body>
</html>

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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

View File

@ -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() {

View File

@ -21,9 +21,9 @@ public interface UserfilmRepository
Page<UserfilmEntity> findByUserId(long userId, Pageable pageable);
List<UserfilmEntity> findByUserIdAndFilmId(long userId, long filmId);
List<UserfilmEntity> findByUserIdAndGenreId(long userId, long genreId);
Page<UserfilmEntity> findByUserIdAndFilmId(long userId, long filmId, Pageable pageable);
Page<UserfilmEntity> 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<UserfilmGrouped> getFilmsTotalByGenre(long userId);

View File

@ -28,12 +28,12 @@ public class UserfilmService {
}
@Transactional(readOnly = true)
public List<UserfilmEntity> getAll(long userId, long filmId) {
public List<UserfilmEntity> 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<UserfilmEntity> getAll(long userId, long filmId, int page, int size) {
public Page<UserfilmEntity> 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);
}
}

View File

@ -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";
}
}

View File

@ -11,6 +11,9 @@
<li class="nav-item">
<a class="nav-link active" data-bs-toggle="pill" href="#userfilms">Фильмы</a>
</li>
<li class="nav-item">
<a class="nav-link" data-bs-toggle="pill" href="#userfilms2">Фильмы</a>
</li>
<li class="nav-item">
<a class="nav-link" data-bs-toggle="pill" href="#stats">Статистика</a>
</li>
@ -20,7 +23,13 @@
</ul>
<div class="tab-content mt-2">
<div class="tab-pane container" id="userfilms">
<div class="tab-pane container active" id="userfilms">
<th:block th:replace="~{ userfilms :: userfilms (
items=${items},
totalPages=${totalPages},
currentPage=${currentPage}) }" />
</div>
<div class="tab-pane container" id="userfilms2">
<ul class="list-group flex-row flex-wrap">
<li th:each="userfilm : ${userfilms}" class="list-group-item col-sm-6">
<strong>[[${userfilm.filmName}]]</strong> : [[${userfilm.genreName}]]

File diff suppressed because one or more lines are too long