lab5

Лекция6-src (1)/.gitignore

@@ -0,0 +1,36 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+data.*.db

Лекция6-src (1)/.vscode/extensions.json

@@ -0,0 +1,12 @@
+{
+  "recommendations": [
+    // fronted
+    "AndersEAndersen.html-class-suggestions",
+    "dbaeumer.vscode-eslint",
+    // backend
+    "vscjava.vscode-java-pack",
+    "vmware.vscode-boot-dev-pack",
+    "vscjava.vscode-gradle",
+    "redhat.vscode-xml"
+  ]
+}

Лекция6-src (1)/.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Demo",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "mainClass": "com.example.demo.DemoApplication",
+            "projectName": "lec6",
+            "args": "--populate",
+            "envFile": "${workspaceFolder}/.env"
+        }
+    ]
+}

Лекция6-src (1)/.vscode/settings.json

@@ -0,0 +1,24 @@
+{
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false,
+    "editor.insertSpaces": true,
+    "editor.formatOnPaste": true,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": false,
+    "java.compile.nullAnalysis.mode": "disabled",
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "[java]": {
+        "editor.pasteAs.enabled": false,
+    },
+    "gradle.nestedProjects": true,
+    "java.saveActions.organizeImports": true,
+    "java.dependency.packagePresentation": "hierarchical",
+    "spring-boot.ls.problem.boot2.JAVA_CONSTRUCTOR_PARAMETER_INJECTION": "WARNING",
+    "spring.initializr.defaultLanguage": "Java",
+    "java.format.settings.url": ".vscode/eclipse-formatter.xml",
+    "java.project.explorer.showNonJavaResources": true,
+    "java.codeGeneration.hashCodeEquals.useJava7Objects": true,
+    "cSpell.words": [
+        "classappend"
+    ],
+}

Лекция6-src (1)/build.gradle

@@ -0,0 +1,51 @@
+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'
+
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}

Лекция6-src (1)/gradle/wrapper/gradle-wrapper.properties

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

Лекция6-src (1)/gradlew

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

Лекция6-src (1)/gradlew.bat

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

Лекция6-src (1)/readme.md

@@ -0,0 +1,15 @@
+H2 Console: \
+http://localhost:8080/h2-console
+
+JDBC URL: jdbc:h2:file:./data \
+User Name: sa \
+Password: password
+
+Почитать:
+
+- Spring Boot CRUD Application with Thymeleaf https://www.baeldung.com/spring-boot-crud-thymeleaf
+- Thymeleaf Layout Dialect https://ultraq.github.io/thymeleaf-layout-dialect/
+- Tutorial: Using Thymeleaf https://www.thymeleaf.org/doc/tutorials/3.1/usingthymeleaf.html#introducing-thymeleaf
+- Working with Cookies in Spring MVC using @CookieValue Annotation https://www.geeksforgeeks.org/working-with-cookies-in-spring-mvc-using-cookievalue-annotation/
+- Session Attributes in Spring MVC https://www.baeldung.com/spring-mvc-session-attributes
+- LazyInitializationException – What it is and the best way to fix it https://thorben-janssen.com/lazyinitializationexception/

Лекция6-src (1)/settings.gradle

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

Лекция6-src (1)/src/main/java/com/example/demo/DemoApplication.java

@@ -0,0 +1,85 @@
+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.cars.model.CarEntity;
+import com.example.demo.cars.service.CarService;
+import com.example.demo.packs.model.PackEntity;
+import com.example.demo.packs.service.PackService;
+import com.example.demo.brands.model.BrandEntity;
+import com.example.demo.brands.service.BrandService;
+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 UserService userService;
+    private final CarService carService;
+    private final BrandService brandService;
+    private final PackService packService;
+
+    public DemoApplication(
+            UserService userService,
+            BrandService brandService,
+            CarService carService,
+            PackService packService) {
+        this.userService = userService;
+        this.carService = carService;
+        this.packService = packService;
+        this.brandService = brandService;
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(DemoApplication.class, args);
+    }
+
+    @Override
+    public void run(String... args) throws Exception {
+
+        log.info("Create default brand values");
+        final var brand1 = brandService.create(new BrandEntity("Ламборгини"));
+        final var brand2 = brandService.create(new BrandEntity("Феррари"));
+        final var brand3 = brandService.create(new BrandEntity("Тойота"));
+
+        log.info("Create default pack values");
+        final var pack1 = packService.create(new PackEntity("Дрифт"));
+        final var pack2 = packService.create(new PackEntity("Про"));
+        packService.create(new PackEntity("Базовый"));
+
+        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, 6)
+                .forEach(value -> userService.create(
+                        new UserEntity("user".concat(String.valueOf(value)), Constants.DEFAULT_PASSWORD)));
+
+        log.info("Create default order values");
+        carService.create(new CarEntity("Автомобиль Ламба", "Крутое авто для парня", brand1, 5000));
+        carService.create(new CarEntity("Автомобиль Ферра", "Супер мощное авто 90 л.с.", brand2, 6000));
+        carService.create(new CarEntity("Супер Пушка", "Гоночный автомобиль", brand3, 2000));
+        carService.create(new CarEntity("Дрифт Гонка", "Дрифт автомобиль", brand1, 1000));
+        carService.create(new CarEntity("абоба", "абоба", brand1, 9999));
+
+        var cars = carService.getAll();
+        for (CarEntity carEntity : cars) {
+            carService.addCarPacks(carEntity.getId(), pack1.getId());
+            carService.addCarPacks(carEntity.getId(), pack2.getId());
+        }
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/brands/api/BrandController.java

@@ -0,0 +1,104 @@
+package com.example.demo.brands.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.brands.model.BrandEntity;
+import com.example.demo.brands.service.BrandService;
+
+import jakarta.validation.Valid;
+
+@Controller
+@RequestMapping(BrandController.URL)
+public class BrandController {
+    public static final String URL = Constants.ADMIN_PREFIX + "/brand";
+    private static final String BRAND_VIEW = "brand";
+    private static final String BRAND_EDIT_VIEW = "brand-edit";
+    private static final String BRAND_ATTRIBUTE = "brand";
+
+    private final BrandService brandService;
+    private final ModelMapper modelMapper;
+
+    public BrandController(BrandService brandService, ModelMapper modelMapper) {
+        this.brandService = brandService;
+        this.modelMapper = modelMapper;
+    }
+
+    private BrandDto toDto(BrandEntity entity) {
+        return modelMapper.map(entity, BrandDto.class);
+    }
+
+    private BrandEntity toEntity(BrandDto dto) {
+        return modelMapper.map(dto, BrandEntity.class);
+    }
+
+    @GetMapping
+    public String getAll(Model model) {
+        model.addAttribute(
+                "items",
+                brandService.getAll().stream()
+                        .map(this::toDto)
+                        .toList());
+        return BRAND_VIEW;
+    }
+
+    @GetMapping("/edit/")
+    public String create(Model model) {
+        model.addAttribute(BRAND_ATTRIBUTE, new BrandDto());
+        return BRAND_EDIT_VIEW;
+    }
+
+    @PostMapping("/edit/")
+    public String create(
+            @ModelAttribute(name = BRAND_ATTRIBUTE) @Valid BrandDto brand,
+            BindingResult bindingResult,
+            Model model) {
+        if (bindingResult.hasErrors()) {
+            return BRAND_EDIT_VIEW;
+        }
+        brandService.create(toEntity(brand));
+        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(BRAND_ATTRIBUTE, toDto(brandService.get(id)));
+        return BRAND_EDIT_VIEW;
+    }
+
+    @PostMapping("/edit/{id}")
+    public String update(
+            @PathVariable(name = "id") Long id,
+            @ModelAttribute(name = BRAND_ATTRIBUTE) @Valid BrandDto brand,
+            BindingResult bindingResult,
+            Model model) {
+        if (bindingResult.hasErrors()) {
+            return BRAND_EDIT_VIEW;
+        }
+        if (id <= 0) {
+            throw new IllegalArgumentException();
+        }
+        brandService.update(id, toEntity(brand));
+        return Constants.REDIRECT_VIEW + URL;
+    }
+
+    @PostMapping("/delete/{id}")
+    public String delete(
+            @PathVariable(name = "id") Long id) {
+        brandService.delete(id);
+        return Constants.REDIRECT_VIEW + URL;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/brands/api/BrandDto.java

@@ -0,0 +1,30 @@
+package com.example.demo.brands.api;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public class BrandDto {
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private Long id;
+    @NotBlank
+    @Size(min = 1, 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;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/brands/model/BrandEntity.java

@@ -0,0 +1,48 @@
+package com.example.demo.brands.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 = "brands")
+public class BrandEntity extends BaseEntity {
+    @Column(nullable = false, unique = true, length = 50)
+    private String name;
+
+    public BrandEntity() {
+    }
+
+    public BrandEntity(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 BrandEntity other = (BrandEntity) obj;
+        return Objects.equals(other.getId(), id)
+                && Objects.equals(other.getName(), name);
+    }
+
+}

Лекция6-src (1)/src/main/java/com/example/demo/brands/repository/BrandRepository.java

@@ -0,0 +1,12 @@
+package com.example.demo.brands.repository;
+
+import java.util.Optional;
+
+import org.springframework.data.repository.CrudRepository;
+
+import com.example.demo.brands.model.BrandEntity;
+
+public interface BrandRepository extends CrudRepository<BrandEntity, Long> {
+    Optional<BrandEntity> findByNameIgnoreCase(String name);
+
+}

Лекция6-src (1)/src/main/java/com/example/demo/brands/service/BrandService.java

@@ -0,0 +1,69 @@
+package com.example.demo.brands.service;
+
+import java.util.List;
+import java.util.stream.StreamSupport;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.demo.core.error.NotFoundException;
+import com.example.demo.brands.model.BrandEntity;
+import com.example.demo.brands.repository.BrandRepository;
+
+import jakarta.persistence.EntityManager;
+
+@Service
+public class BrandService {
+    private final BrandRepository repository;
+    private final EntityManager entityManager;
+
+    public BrandService(BrandRepository repository, EntityManager entityManager) {
+        this.repository = repository;
+        this.entityManager = entityManager;
+    }
+
+    private void checkName(String name) {
+        if (repository.findByNameIgnoreCase(name).isPresent()) {
+            throw new IllegalArgumentException(
+                    String.format("Brand with name %s is already exists", name));
+        }
+    }
+
+    @Transactional(readOnly = true)
+    public List<BrandEntity> getAll() {
+        return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
+    }
+
+    @Transactional(readOnly = true)
+    public BrandEntity get(long id) {
+        return repository.findById(id)
+                .orElseThrow(() -> new NotFoundException(BrandEntity.class, id));
+    }
+
+    @Transactional
+    public BrandEntity create(BrandEntity entity) {
+        if (entity == null) {
+            throw new IllegalArgumentException("Entity is null");
+        }
+        checkName(entity.getName());
+        return repository.save(entity);
+    }
+
+    @Transactional
+    public BrandEntity update(Long id, BrandEntity entity) {
+        final BrandEntity existsEntity = get(id);
+        checkName(entity.getName());
+        existsEntity.setName(entity.getName());
+        return repository.save(existsEntity);
+    }
+
+    @Transactional
+    public BrandEntity delete(Long id) {
+        final BrandEntity existsEntity = get(id);
+        entityManager.createQuery("DELETE FROM CarEntity f WHERE f.brand = :brand")
+                .setParameter("brand", existsEntity)
+                .executeUpdate();
+        repository.delete(existsEntity);
+        return existsEntity;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/cars/api/CarAdminController.java

@@ -0,0 +1,151 @@
+package com.example.demo.cars.api;
+
+import java.util.List;
+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.cars.model.CarEntity;
+import com.example.demo.cars.service.CarService;
+import com.example.demo.packs.api.PackDto;
+import com.example.demo.packs.model.PackEntity;
+import com.example.demo.packs.service.PackService;
+import com.example.demo.brands.api.BrandDto;
+import com.example.demo.brands.model.BrandEntity;
+import com.example.demo.brands.service.BrandService;
+import com.example.demo.users.service.UserService;
+
+import jakarta.validation.Valid;
+
+@Controller
+@RequestMapping(CarAdminController.URL)
+public class CarAdminController {
+    public static final String URL = Constants.ADMIN_PREFIX + "/car";
+    private static final String CAR_VIEW = "car-admin";
+    private static final String CAR_EDIT_VIEW = "car-edit";
+    private static final String CAR_ATTRIBUTE = "car";
+
+    private final CarService carService;
+    private final BrandService brandService;
+    private final PackService packService;
+    private final ModelMapper modelMapper;
+
+    public CarAdminController(CarService carService, ModelMapper modelMapper, PackService packService,
+            BrandService brandService) {
+        this.packService = packService;
+        this.brandService = brandService;
+        this.carService = carService;
+        this.modelMapper = modelMapper;
+    }
+
+    private CarDto toDto(CarEntity entity) {
+        var dto = new CarDto();
+        dto.setId(entity.getId());
+        dto.setPacks(entity.getCarPacks().stream().map(PackEntity::getId).toList());
+        dto.setDescription(entity.getDescription());
+        dto.setPrice(entity.getPrice());
+        dto.setName(entity.getName());
+        dto.setBrandId(entity.getBrand().getId());
+
+        return dto;
+    }
+
+    private CarEntity toEntity(CarDto dto) {
+        final CarEntity entity = modelMapper.map(dto, CarEntity.class);
+        entity.setBrand(brandService.get(dto.getBrandId()));
+        var packs = dto.getPacks();
+        List<PackEntity> packsList = packService.getAllById(packs);
+        for (var pack : packsList) {
+            entity.addPack(pack);
+        }
+        return entity;
+    }
+
+    @GetMapping
+    public String getAll(Model model) {
+        model.addAttribute(
+                "items",
+                carService.getAll().stream()
+                        .map(this::toDto)
+                        .toList());
+        return CAR_VIEW;
+    }
+
+    private BrandDto toBrandDto(BrandEntity entity) {
+        return modelMapper.map(entity, BrandDto.class);
+    }
+
+    private PackDto toPackDto(PackEntity entity) {
+        return modelMapper.map(entity, PackDto.class);
+    }
+
+    @GetMapping("/edit/")
+    public String create(Model model) {
+        model.addAttribute(CAR_ATTRIBUTE, new CarDto());
+        model.addAttribute("brands", brandService.getAll().stream().map(this::toBrandDto).toList());
+        model.addAttribute("packsCheck", packService.getAll().stream().map(this::toPackDto).toList());
+        return CAR_EDIT_VIEW;
+    }
+
+    @PostMapping("/edit/")
+    public String create(
+            @ModelAttribute(name = CAR_ATTRIBUTE) @Valid CarDto car,
+            BindingResult bindingResult,
+            Model model) {
+        if (bindingResult.hasErrors()) {
+            return CAR_EDIT_VIEW;
+        }
+        carService.create(toEntity(car));
+        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(CAR_ATTRIBUTE, toDto(carService.get(id)));
+        model.addAttribute("brands", brandService.getAll().stream().map(this::toBrandDto).toList());
+        model.addAttribute("packsCheck", packService.getAll().stream().map(this::toPackDto).toList());
+        return CAR_EDIT_VIEW;
+    }
+
+    @PostMapping("/edit/{id}")
+    public String update(
+            @PathVariable(name = "id") Long id,
+            @ModelAttribute(name = CAR_ATTRIBUTE) @Valid CarDto car,
+            BindingResult bindingResult,
+            Model model) {
+        if (bindingResult.hasErrors()) {
+            return CAR_EDIT_VIEW;
+        }
+        if (id <= 0) {
+            throw new IllegalArgumentException();
+        }
+        model.addAttribute("brands", brandService.getAll().stream().map(this::toBrandDto).toList());
+        model.addAttribute("packsCheck", packService.getAll().stream().map(this::toPackDto).toList());
+        carService.update(id, toEntity(car));
+        return Constants.REDIRECT_VIEW + URL;
+    }
+
+    @PostMapping("/delete/{id}")
+    public String delete(
+            @PathVariable(name = "id") Long id) {
+        carService.delete(id);
+        return Constants.REDIRECT_VIEW + URL;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/cars/api/CarController.java

@@ -0,0 +1,124 @@
+package com.example.demo.cars.api;
+
+import java.util.List;
+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.cars.model.CarEntity;
+import com.example.demo.cars.service.CarService;
+import com.example.demo.packs.api.PackDto;
+import com.example.demo.packs.model.PackEntity;
+import com.example.demo.packs.service.PackService;
+import com.example.demo.brands.api.BrandDto;
+import com.example.demo.brands.model.BrandEntity;
+import com.example.demo.brands.service.BrandService;
+import com.example.demo.users.service.UserService;
+
+import jakarta.validation.Valid;
+
+@Controller
+@RequestMapping(CarController.URL)
+public class CarController {
+    public static final String URL = "/car";
+    private static final String CAR_VIEW = "car";
+    private static final String PAGE_ATTRIBUTE = "page";
+
+    private static final String LIKE_VIEW = "car-desire";
+
+    private final CarService carService;
+    private final ModelMapper modelMapper;
+    private final BrandService brandService;
+    private final PackService packService;
+    private final UserService userService;
+
+    public CarController(CarService carService, ModelMapper modelMapper, PackService packService,
+            BrandService brandService, UserService userService) {
+        this.carService = carService;
+        this.modelMapper = modelMapper;
+        this.packService = packService;
+        this.brandService = brandService;
+        this.userService = userService;
+    }
+
+    private CarDto toDto(CarEntity entity) {
+        var dto = new CarDto();
+        dto.setId(entity.getId());
+        dto.setPacks(entity.getCarPacks().stream().map(PackEntity::getId).toList());
+        dto.setDescription(entity.getDescription());
+        dto.setName(entity.getName());
+        dto.setBrandId(entity.getBrand().getId());
+        dto.setPrice(entity.getPrice());
+        return dto;
+    }
+
+    @GetMapping
+    public String getAll(
+            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            Model model) {
+        final Map<String, Object> attrib = PageAttributesMapper.toAttributes(
+                carService.getAll(page, Constants.DEFUALT_PAGE_SIZE), this::toDto);
+        model.addAllAttributes(attrib);
+        model.addAttribute(PAGE_ATTRIBUTE, page);
+        model.addAttribute(
+                "items",
+                carService.getAll().stream()
+                        .map(this::toDto)
+                        .toList());
+        return CAR_VIEW;
+    }
+
+    @GetMapping("/desire")
+    public String getDesires(@RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            Model model) {
+        final Long id = userService.getUserIdLong();
+        model.addAttribute(
+                "items",
+                userService.getUserCars(id).stream()
+                        .map(this::toDto)
+                        .toList());
+        return LIKE_VIEW;
+    }
+
+    @PostMapping("/desire/{carId}")
+    public String addDesire(@PathVariable(name = "carId") Long carId,
+            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            RedirectAttributes redirectAttributes) {
+        redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page);
+        final Long userid = userService.getUserIdLong();
+        userService.addCar(userid, carId);
+        return Constants.REDIRECT_VIEW + "/list/car";
+    }
+
+    @PostMapping("/disdesire1/{id}")
+    public String deleteDesire1(
+            @PathVariable(name = "id") Long id, @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            RedirectAttributes redirectAttributes) {
+        redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page);
+        final Long userid = userService.getUserIdLong();
+        userService.deleteCar(userid, id);
+        return Constants.REDIRECT_VIEW + "/list/car";
+    }
+
+    @PostMapping("/disdesire2/{id}")
+    public String deleteDesire2(
+            @PathVariable(name = "id") Long id, @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            RedirectAttributes redirectAttributes) {
+        redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page);
+        final Long userid = userService.getUserIdLong();
+        userService.deleteCar(userid, id);
+        return Constants.REDIRECT_VIEW + URL + "/desire";
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/cars/api/CarDto.java

@@ -0,0 +1,76 @@
+package com.example.demo.cars.api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.Min;
+
+public class CarDto {
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private Long id;
+    @NotBlank
+    @Size(min = 1)
+    private String name;
+    @Size(min = 1)
+    private String description;
+    @Min(value = 100)
+    private Integer price;
+    @NotNull
+    private final List<Long> packs = new ArrayList<>();
+    @Min(1)
+    private Long brandId;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String desc) {
+        this.description = desc;
+    }
+
+    public Long getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(Long brandId) {
+        this.brandId = brandId;
+    }
+
+    public List<Long> getPacks() {
+        return packs;
+    }
+
+    public void setPacks(List<Long> packs) {
+        this.packs.clear();
+        this.packs.addAll(packs);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getPrice() {
+        return price;
+    }
+
+    public void setPrice(Integer price) {
+        this.price = price;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/cars/api/CarDtoDesire.java

@@ -0,0 +1,13 @@
+package com.example.demo.cars.api;
+
+public class CarDtoDesire extends CarDto {
+    public Boolean isDesired;
+
+    public Boolean getIsDesired() {
+        return isDesired;
+    }
+
+    public void setIsDesired(Boolean isDesired) {
+        this.isDesired = isDesired;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/cars/api/CarListController.java

@@ -0,0 +1,57 @@
+package com.example.demo.cars.api;
+
+import java.util.Map;
+
+import org.modelmapper.ModelMapper;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.example.demo.core.configuration.Constants;
+import com.example.demo.users.service.UserService;
+import com.example.demo.core.api.PageAttributesMapper;
+import com.example.demo.cars.model.CarEntity;
+import com.example.demo.cars.service.CarService;
+import com.example.demo.packs.model.PackEntity;
+
+@Controller
+@RequestMapping(CarListController.URL)
+public class CarListController {
+    public static final String URL = "/list";
+    private static final String CAR_VIEW = "car";
+    private static final String PAGE_ATTRIBUTE = "page";
+
+    private final CarService carService;
+    private final UserService userService;
+
+    public CarListController(CarService car,
+            UserService user) {
+        carService = car;
+        userService = user;
+    }
+
+    private CarDtoDesire toDto(CarEntity entity) {
+        final Long userId = userService.getUserIdLong();
+        final CarDtoDesire dto = new CarDtoDesire();
+        dto.setId(entity.getId());
+        dto.setPacks(entity.getCarPacks().stream().map(PackEntity::getId).toList());
+        dto.setDescription(entity.getDescription());
+        dto.setName(entity.getName());
+        dto.setPrice(entity.getPrice());
+        dto.setBrandId(entity.getBrand().getId());
+        boolean fg = userService.existByUserIdAndCarId(userId, entity.getId());
+        dto.setIsDesired(fg);
+        return dto;
+    }
+
+    @GetMapping("/car")
+    public String getAll(@RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            Model model) {
+        final Map<String, Object> attrib = PageAttributesMapper.toAttributes(
+                carService.getAll(page, Constants.DEFUALT_PAGE_SIZE), this::toDto);
+        model.addAllAttributes(attrib);
+        model.addAttribute(PAGE_ATTRIBUTE, page);
+        return CAR_VIEW;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/cars/model/CarEntity.java

@@ -0,0 +1,108 @@
+package com.example.demo.cars.model;
+
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+import com.example.demo.core.model.BaseEntity;
+import com.example.demo.packs.model.PackEntity;
+import com.example.demo.brands.model.BrandEntity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Min;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.FetchType;
+
+@Entity
+@Table(name = "cars")
+public class CarEntity extends BaseEntity {
+    @Column(nullable = false)
+    private String name;
+    @Column(nullable = false)
+    private String description;
+    @Column(nullable = false)
+    @Min(value = 100)
+    private Integer price;
+    @ManyToMany(fetch = FetchType.EAGER)
+    @JoinTable(name = "packs_cars", joinColumns = @JoinColumn(name = "car_id"), inverseJoinColumns = @JoinColumn(name = "pack_id"))
+    private Set<PackEntity> carPacks = new HashSet<>();
+    @ManyToOne
+    @JoinColumn(name = "brandId", nullable = false)
+    private BrandEntity brand;
+
+    public CarEntity() {
+    }
+
+    public CarEntity(String name, String decs, BrandEntity brand, Integer price) {
+        this.name = name;
+        this.description = decs;
+        this.brand = brand;
+        this.price = price;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BrandEntity getBrand() {
+        return brand;
+    }
+
+    public void setBrand(BrandEntity brand) {
+        this.brand = brand;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String desc) {
+        this.description = desc;
+    }
+
+    public Set<PackEntity> getCarPacks() {
+        return carPacks;
+    }
+
+    public void addPack(PackEntity carPack) {
+        carPacks.add(carPack);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, description, brand, price);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null || getClass() != obj.getClass())
+            return false;
+        CarEntity other = (CarEntity) obj;
+        return Objects.equals(id, other.id)
+                && Objects.equals(name, other.name)
+                && Objects.equals(brand, other.brand)
+                && Objects.equals(price, other.price)
+                && Objects.equals(description, other.description);
+    }
+
+    public Integer getPrice() {
+        return price;
+    }
+
+    public void setPrice(Integer price) {
+        this.price = price;
+    }
+
+}

Лекция6-src (1)/src/main/java/com/example/demo/cars/repository/CarRepository.java

@@ -0,0 +1,30 @@
+package com.example.demo.cars.repository;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+
+import com.example.demo.cars.model.CarEntity;
+import com.example.demo.packs.model.PackEntity;
+
+import jakarta.transaction.Transactional;
+
+public interface CarRepository extends CrudRepository<CarEntity, Long>, PagingAndSortingRepository<CarEntity, Long> {
+    Optional<CarEntity> findByNameIgnoreCase(String name);
+
+    @Query("SELECT f FROM CarEntity f JOIN f.carPacks g WHERE g.id = :packId")
+    List<CarEntity> findAllByPackId(@Param("packId") long packId);
+
+    List<CarEntity> findAllByBrandId(Long brandId);
+
+    @Modifying
+    @Transactional
+    @Query("DELETE FROM CarEntity f WHERE :pack MEMBER OF f.carPacks")
+    void deleteAllByPack(@Param("pack") PackEntity pack);
+
+}

Лекция6-src (1)/src/main/java/com/example/demo/cars/service/CarService.java

@@ -0,0 +1,93 @@
+package com.example.demo.cars.service;
+
+import java.util.List;
+import java.util.stream.StreamSupport;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.demo.core.error.NotFoundException;
+import com.example.demo.cars.model.CarEntity;
+import com.example.demo.cars.repository.CarRepository;
+import com.example.demo.packs.model.PackEntity;
+import com.example.demo.packs.repository.PackRepository;
+
+@Service
+public class CarService {
+    private final CarRepository repository;
+    private final PackRepository packRepository;
+    private final Logger log = LoggerFactory.getLogger(CarService.class);
+
+    public CarService(CarRepository repository, PackRepository packRepository) {
+        this.repository = repository;
+        this.packRepository = packRepository;
+    }
+
+    @Transactional(readOnly = true)
+    public List<CarEntity> getAll() {
+        return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
+    }
+
+    @Transactional(readOnly = true)
+    public Page<CarEntity> getAll(int page, int size) {
+        return repository.findAll(PageRequest.of(page, size, Sort.by("id")));
+    }
+
+    @Transactional(readOnly = true)
+    public CarEntity get(long id) {
+        return repository.findById(id)
+                .orElseThrow(() -> new NotFoundException(CarEntity.class, id));
+    }
+
+    @Transactional(readOnly = true)
+    public List<PackEntity> getCarPacks(long id) {
+        return get(id).getCarPacks().stream()
+                // .map(PackEntity::getPack)
+                .toList();
+    }
+
+    @Transactional
+    public CarEntity addCarPacks(long carId, long packId) {
+        CarEntity fm = repository.findById(carId)
+                .orElseThrow(() -> new NotFoundException(CarEntity.class, carId));
+        PackEntity gn = packRepository.findById(packId)
+                .orElseThrow(() -> new NotFoundException(PackEntity.class, packId));
+        fm.addPack(gn);
+        return repository.save(fm);
+    }
+
+    @Transactional
+    public CarEntity create(CarEntity entity) {
+        if (entity == null) {
+            throw new IllegalArgumentException("Entity is null");
+        }
+        return repository.save(entity);
+    }
+
+    @Transactional
+    public CarEntity update(Long id, CarEntity entity) {
+        final CarEntity existsEntity = get(id);
+        existsEntity.setName(entity.getName());
+        existsEntity.setDescription(entity.getDescription());
+        existsEntity.setBrand(entity.getBrand());
+        existsEntity.setPrice(entity.getPrice());
+        var packs = entity.getCarPacks();
+        for (var pack : packs) {
+            existsEntity.addPack(pack);
+        }
+        return repository.save(existsEntity);
+    }
+
+    @Transactional
+    public CarEntity delete(Long id) {
+        final CarEntity existsEntity = get(id);
+        repository.delete(existsEntity);
+        return existsEntity;
+    }
+
+}

Лекция6-src (1)/src/main/java/com/example/demo/core/api/GlobalController.java

@@ -0,0 +1,16 @@
+package com.example.demo.core.api;
+
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+@ControllerAdvice
+public class GlobalController {
+
+    @ModelAttribute("servletPath")
+    String getRequestServletPath(HttpServletRequest request) {
+        return request.getServletPath();
+    }
+
+}

Лекция6-src (1)/src/main/java/com/example/demo/core/api/PageAttributesMapper.java

@@ -0,0 +1,18 @@
+package com.example.demo.core.api;
+
+import java.util.Map;
+import java.util.function.Function;
+
+import org.springframework.data.domain.Page;
+
+public class PageAttributesMapper {
+    private PageAttributesMapper() {
+    }
+
+    public static <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());
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/core/configuration/Constants.java

@@ -0,0 +1,19 @@
+package com.example.demo.core.configuration;
+
+public class Constants {
+    public static final String SEQUENCE_NAME = "hibernate_sequence";
+
+    public static final int DEFUALT_PAGE_SIZE = 4;
+
+    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() {
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java

@@ -0,0 +1,23 @@
+package com.example.demo.core.configuration;
+
+import org.modelmapper.ModelMapper;
+import org.modelmapper.PropertyMap;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.example.demo.core.model.BaseEntity;
+
+@Configuration
+public class MapperConfiguration {
+    @Bean
+    ModelMapper modelMapper() {
+        final ModelMapper mapper = new ModelMapper();
+        mapper.addMappings(new PropertyMap<Object, BaseEntity>() {
+            @Override
+            protected void configure() {
+                skip(destination.getId());
+            }
+        });
+        return mapper;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/core/configuration/WebConfiguration.java

@@ -0,0 +1,13 @@
+package com.example.demo.core.configuration;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController("/login").setViewName("login");
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/core/error/AdviceController.java

@@ -0,0 +1,53 @@
+package com.example.demo.core.error;
+
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.ModelAndView;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+@ControllerAdvice
+public class AdviceController {
+    private final Logger log = LoggerFactory.getLogger(AdviceController.class);
+
+    private static Throwable getRootCause(Throwable throwable) {
+        Throwable rootCause = throwable;
+        while (rootCause.getCause() != null && rootCause.getCause() != rootCause) {
+            rootCause = rootCause.getCause();
+        }
+        return rootCause;
+    }
+
+    private static Map<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;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/core/error/NotFoundException.java

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

Лекция6-src (1)/src/main/java/com/example/demo/core/model/BaseEntity.java

@@ -0,0 +1,27 @@
+package com.example.demo.core.model;
+
+import com.example.demo.core.configuration.Constants;
+
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.SequenceGenerator;
+
+@MappedSuperclass
+public abstract class BaseEntity {
+    @Id
+    @GeneratedValue
+    @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;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/core/security/SecurityConfiguration.java

@@ -0,0 +1,63 @@
+package com.example.demo.core.security;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
+
+import com.example.demo.core.configuration.Constants;
+import com.example.demo.users.api.UserSignupController;
+import com.example.demo.users.model.UserRole;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfiguration {
+    @Bean
+    SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
+        httpSecurity.headers(headers -> headers.frameOptions(FrameOptionsConfig::sameOrigin));
+        httpSecurity.csrf(AbstractHttpConfigurer::disable);
+        httpSecurity.cors(Customizer.withDefaults());
+
+        httpSecurity.authorizeHttpRequests(requests -> requests
+                .requestMatchers("/css/**", "/webjars/**", "/*.svg")
+                .permitAll());
+
+        httpSecurity.authorizeHttpRequests(requests -> requests
+                .requestMatchers(Constants.ADMIN_PREFIX + "/**").hasRole(UserRole.ADMIN.name())
+                .requestMatchers("/h2-console/**").hasRole(UserRole.ADMIN.name())
+                .requestMatchers(UserSignupController.URL).anonymous()
+                .requestMatchers(Constants.LOGIN_URL).anonymous()
+                .anyRequest().authenticated());
+
+        httpSecurity.formLogin(formLogin -> formLogin
+                .loginPage(Constants.LOGIN_URL));
+
+        httpSecurity.rememberMe(rememberMe -> rememberMe.key("uniqueAndSecret"));
+
+        httpSecurity.logout(logout -> logout
+                .deleteCookies("JSESSIONID"));
+
+        return httpSecurity.build();
+    }
+
+    @Bean
+    DaoAuthenticationProvider authenticationProvider(UserDetailsService userDetailsService) {
+        final DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
+        authProvider.setUserDetailsService(userDetailsService);
+        authProvider.setPasswordEncoder(passwordEncoder());
+        return authProvider;
+    }
+
+    @Bean
+    PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/core/security/UserPrincipal.java

@@ -0,0 +1,64 @@
+package com.example.demo.core.security;
+
+import java.util.Collection;
+import java.util.Set;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import com.example.demo.users.model.UserEntity;
+
+public class UserPrincipal implements UserDetails {
+    private final long id;
+    private final String username;
+    private final String password;
+    private final Set<? 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();
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/core/session/SessionHelper.java

@@ -0,0 +1,14 @@
+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)*/
+}

Лекция6-src (1)/src/main/java/com/example/demo/packs/api/PackController.java

@@ -0,0 +1,104 @@
+package com.example.demo.packs.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.packs.model.PackEntity;
+import com.example.demo.packs.service.PackService;
+
+import jakarta.validation.Valid;
+
+@Controller
+@RequestMapping(PackController.URL)
+public class PackController {
+    public static final String URL = Constants.ADMIN_PREFIX + "/pack";
+    private static final String PACK_VIEW = "pack";
+    private static final String PACK_EDIT_VIEW = "pack-edit";
+    private static final String PACK_ATTRIBUTE = "pack";
+
+    private final PackService packService;
+    private final ModelMapper modelMapper;
+
+    public PackController(PackService packService, ModelMapper modelMapper) {
+        this.packService = packService;
+        this.modelMapper = modelMapper;
+    }
+
+    private PackDto toDto(PackEntity entity) {
+        return modelMapper.map(entity, PackDto.class);
+    }
+
+    private PackEntity toEntity(PackDto dto) {
+        return modelMapper.map(dto, PackEntity.class);
+    }
+
+    @GetMapping
+    public String getAll(Model model) {
+        model.addAttribute(
+                "items",
+                packService.getAll().stream()
+                        .map(this::toDto)
+                        .toList());
+        return PACK_VIEW;
+    }
+
+    @GetMapping("/edit/")
+    public String create(Model model) {
+        model.addAttribute(PACK_ATTRIBUTE, new PackDto());
+        return PACK_EDIT_VIEW;
+    }
+
+    @PostMapping("/edit/")
+    public String create(
+            @ModelAttribute(name = PACK_ATTRIBUTE) @Valid PackDto pack,
+            BindingResult bindingResult,
+            Model model) {
+        if (bindingResult.hasErrors()) {
+            return PACK_EDIT_VIEW;
+        }
+        packService.create(toEntity(pack));
+        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(PACK_ATTRIBUTE, toDto(packService.get(id)));
+        return PACK_EDIT_VIEW;
+    }
+
+    @PostMapping("/edit/{id}")
+    public String update(
+            @PathVariable(name = "id") Long id,
+            @ModelAttribute(name = PACK_ATTRIBUTE) @Valid PackDto pack,
+            BindingResult bindingResult,
+            Model model) {
+        if (bindingResult.hasErrors()) {
+            return PACK_EDIT_VIEW;
+        }
+        if (id <= 0) {
+            throw new IllegalArgumentException();
+        }
+        packService.update(id, toEntity(pack));
+        return Constants.REDIRECT_VIEW + URL;
+    }
+
+    @PostMapping("/delete/{id}")
+    public String delete(
+            @PathVariable(name = "id") Long id) {
+        packService.delete(id);
+        return Constants.REDIRECT_VIEW + URL;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/packs/api/PackDto.java

@@ -0,0 +1,30 @@
+package com.example.demo.packs.api;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public class PackDto {
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private Long id;
+    @NotBlank
+    @Size(min = 5, max = 50)
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/packs/model/PackEntity.java

@@ -0,0 +1,48 @@
+package com.example.demo.packs.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 = "packs")
+public class PackEntity extends BaseEntity {
+    @Column(nullable = false, unique = true, length = 50)
+    private String name;
+
+    public PackEntity() {
+    }
+
+    public PackEntity(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 PackEntity other = (PackEntity) obj;
+        return Objects.equals(other.getId(), id)
+                && Objects.equals(other.getName(), name);
+    }
+
+}

Лекция6-src (1)/src/main/java/com/example/demo/packs/repository/PackRepository.java

@@ -0,0 +1,11 @@
+package com.example.demo.packs.repository;
+
+import java.util.Optional;
+
+import org.springframework.data.repository.CrudRepository;
+
+import com.example.demo.packs.model.PackEntity;
+
+public interface PackRepository extends CrudRepository<PackEntity, Long> {
+    Optional<PackEntity> findByNameIgnoreCase(String name);
+}

Лекция6-src (1)/src/main/java/com/example/demo/packs/service/PackService.java

@@ -0,0 +1,72 @@
+package com.example.demo.packs.service;
+
+import java.util.List;
+import java.util.stream.StreamSupport;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.demo.core.error.NotFoundException;
+import com.example.demo.packs.model.PackEntity;
+import com.example.demo.packs.repository.PackRepository;
+
+import com.example.demo.cars.repository.CarRepository;
+
+@Service
+public class PackService {
+    private final PackRepository repository;
+    private final CarRepository fmrepository;
+
+    public PackService(PackRepository repository, CarRepository fmrepository) {
+        this.repository = repository;
+        this.fmrepository = fmrepository;
+    }
+
+    private void checkName(String name) {
+        if (repository.findByNameIgnoreCase(name).isPresent()) {
+            throw new IllegalArgumentException(
+                    String.format("Pack with name %s is already exists", name));
+        }
+    }
+
+    @Transactional(readOnly = true)
+    public List<PackEntity> getAll() {
+        return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
+    }
+
+    @Transactional(readOnly = true)
+    public List<PackEntity> getAllById(List<Long> listIds) {
+        return StreamSupport.stream(repository.findAllById(listIds).spliterator(), false).toList();
+    }
+
+    @Transactional(readOnly = true)
+    public PackEntity get(long id) {
+        return repository.findById(id)
+                .orElseThrow(() -> new NotFoundException(PackEntity.class, id));
+    }
+
+    @Transactional
+    public PackEntity create(PackEntity entity) {
+        if (entity == null) {
+            throw new IllegalArgumentException("Entity is null");
+        }
+        checkName(entity.getName());
+        return repository.save(entity);
+    }
+
+    @Transactional
+    public PackEntity update(Long id, PackEntity entity) {
+        final PackEntity existsEntity = get(id);
+        checkName(entity.getName());
+        existsEntity.setName(entity.getName());
+        return repository.save(existsEntity);
+    }
+
+    @Transactional
+    public PackEntity delete(Long id) {
+        final PackEntity existsEntity = get(id);
+        fmrepository.deleteAllByPack(existsEntity);
+        repository.delete(existsEntity);
+        return existsEntity;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/api/UserCarsDto.java

@@ -0,0 +1,31 @@
+package com.example.demo.users.api;
+
+public class UserCarsDto {
+    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;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/api/UserController.java

@@ -0,0 +1,127 @@
+package com.example.demo.users.api;
+
+import java.util.Map;
+
+import org.modelmapper.ModelMapper;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.example.demo.core.api.PageAttributesMapper;
+import com.example.demo.core.configuration.Constants;
+import com.example.demo.users.model.UserEntity;
+import com.example.demo.users.service.UserService;
+
+import jakarta.validation.Valid;
+
+@Controller
+@RequestMapping(UserController.URL)
+public class UserController {
+    public static final String URL = Constants.ADMIN_PREFIX + "/user";
+    private static final String USER_VIEW = "user";
+    private static final String USER_EDIT_VIEW = "user-edit";
+    private static final String PAGE_ATTRIBUTE = "page";
+    private static final String USER_ATTRIBUTE = "user";
+
+    private final UserService userService;
+    private final ModelMapper modelMapper;
+
+    public UserController(UserService userService, ModelMapper modelMapper) {
+        this.userService = userService;
+        this.modelMapper = modelMapper;
+    }
+
+    private UserDto toDto(UserEntity entity) {
+        return modelMapper.map(entity, UserDto.class);
+    }
+
+    private UserEntity toEntity(UserDto dto) {
+        return modelMapper.map(dto, UserEntity.class);
+    }
+
+    @GetMapping
+    public String getAll(
+            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            Model model) {
+        final Map<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;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/api/UserDto.java

@@ -0,0 +1,36 @@
+package com.example.demo.users.api;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public class UserDto {
+    private Long id;
+    @NotBlank
+    @Size(min = 3, max = 20)
+    private String login;
+    private String role;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getRole() {
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/api/UserProfileController.java

@@ -0,0 +1,61 @@
+package com.example.demo.users.api;
+
+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.RequestParam;
+
+import com.example.demo.core.configuration.Constants;
+import com.example.demo.core.security.UserPrincipal;
+import com.example.demo.cars.api.CarDto;
+import com.example.demo.cars.model.CarEntity;
+import com.example.demo.users.service.UserService;
+
+import jakarta.validation.Valid;
+
+@Controller
+public class UserProfileController {
+    private static final String PROFILE_VIEW = "profile";
+
+    private static final String PAGE_ATTRIBUTE = "page";
+    private static final String PROFILE_ATTRIBUTE = "profile";
+
+    private final UserService userService;
+    private final ModelMapper modelMapper;
+
+    public UserProfileController(
+            UserService userService,
+            ModelMapper modelMapper) {
+        this.userService = userService;
+        this.modelMapper = modelMapper;
+    }
+
+    private CarDto tCarDto(CarEntity entity) {
+        return modelMapper.map(entity, CarDto.class);
+    }
+
+    @GetMapping
+    public String getProfile(
+            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            Model model,
+            @AuthenticationPrincipal UserPrincipal principal) {
+        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;
+        }
+        return Constants.REDIRECT_VIEW + "/";
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/api/UserProfileDto.java

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

Лекция6-src (1)/src/main/java/com/example/demo/users/api/UserSignupController.java

@@ -0,0 +1,65 @@
+package com.example.demo.users.api;
+
+import java.util.Objects;
+
+import org.modelmapper.ModelMapper;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.example.demo.core.configuration.Constants;
+import com.example.demo.users.model.UserEntity;
+import com.example.demo.users.service.UserService;
+
+import jakarta.validation.Valid;
+
+@Controller
+@RequestMapping(UserSignupController.URL)
+public class UserSignupController {
+    public static final String URL = "/signup";
+
+    private static final String SIGNUP_VIEW = "signup";
+    private static final String USER_ATTRIBUTE = "user";
+
+    private final UserService userService;
+    private final ModelMapper modelMapper;
+
+    public UserSignupController(
+            UserService userService,
+            ModelMapper modelMapper) {
+        this.userService = userService;
+        this.modelMapper = modelMapper;
+    }
+
+    private UserEntity toEntity(UserSignupDto dto) {
+        return modelMapper.map(dto, UserEntity.class);
+    }
+
+    @GetMapping
+    public String getSignup(Model model) {
+        model.addAttribute(USER_ATTRIBUTE, new UserSignupDto());
+        return SIGNUP_VIEW;
+    }
+
+    @PostMapping
+    public String signup(
+            @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserSignupDto user,
+            BindingResult bindingResult,
+            Model model) {
+        if (bindingResult.hasErrors()) {
+            return SIGNUP_VIEW;
+        }
+        if (!Objects.equals(user.getPassword(), user.getPasswordConfirm())) {
+            bindingResult.rejectValue("password", "signup:passwords", "Пароли не совпадают.");
+            model.addAttribute(USER_ATTRIBUTE, user);
+            return SIGNUP_VIEW;
+        }
+        userService.create(toEntity(user));
+        return Constants.REDIRECT_VIEW + Constants.LOGIN_URL + "?signup";
+    }
+
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/api/UserSignupDto.java

@@ -0,0 +1,40 @@
+package com.example.demo.users.api;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public class UserSignupDto {
+    @NotBlank
+    @Size(min = 3, max = 20)
+    private String login;
+    @NotBlank
+    @Size(min = 3, max = 20)
+    private String password;
+    @NotBlank
+    @Size(min = 3, max = 20)
+    private String passwordConfirm;
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getPasswordConfirm() {
+        return passwordConfirm;
+    }
+
+    public void setPasswordConfirm(String passwordConfirm) {
+        this.passwordConfirm = passwordConfirm;
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/model/UserCarWithStatus.java

@@ -0,0 +1,60 @@
+package com.example.demo.users.model;
+
+import java.util.Objects;
+
+import com.example.demo.cars.model.CarEntity;
+
+public class UserCarWithStatus {
+    private Long id;
+    private String name;
+    private boolean active;
+
+    public UserCarWithStatus() {
+    }
+
+    public UserCarWithStatus(CarEntity 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;
+        UserCarWithStatus other = (UserCarWithStatus) obj;
+        return Objects.equals(id, other.id) && Objects.equals(name, other.name) && active == other.active;
+    }
+
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/model/UserEntity.java

@@ -0,0 +1,94 @@
+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.cars.model.CarEntity;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+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;
+    @ManyToMany(fetch = FetchType.EAGER)
+    @JoinTable(name = "users_cars", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "car_id"))
+    private Set<CarEntity> userCars = 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<CarEntity> getUserCars() {
+        return userCars;
+    }
+
+    public void addCar(CarEntity userCar) {
+        userCars.add(userCar);
+    }
+
+    public void deleteCar(CarEntity userCar) {
+        userCars.remove(userCar);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, login, password, role, userCars);
+    }
+
+    @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.getUserCars(), userCars);
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/model/UserRole.java

@@ -0,0 +1,15 @@
+package com.example.demo.users.model;
+
+import org.springframework.security.core.GrantedAuthority;
+
+public enum UserRole implements GrantedAuthority {
+    ADMIN,
+    USER;
+
+    private static final String PREFIX = "ROLE_";
+
+    @Override
+    public String getAuthority() {
+        return PREFIX + this.name();
+    }
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/repository/UserRepository.java

@@ -0,0 +1,20 @@
+package com.example.demo.users.repository;
+
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+
+import com.example.demo.users.model.UserEntity;
+
+public interface UserRepository
+        extends CrudRepository<UserEntity, Long>, PagingAndSortingRepository<UserEntity, Long> {
+    Optional<UserEntity> findByLoginIgnoreCase(String login);
+
+    @Query("SELECT CASE WHEN COUNT(uf) > 0 THEN true ELSE false END " +
+            "FROM UserEntity u JOIN u.userCars uf " +
+            "WHERE u.id = :userId AND uf.id = :carId")
+    boolean existsByUserIdAndCarId(@Param("userId") Long userId, @Param("carId") Long carId);
+}

Лекция6-src (1)/src/main/java/com/example/demo/users/service/UserService.java

@@ -0,0 +1,181 @@
+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.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+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.cars.model.CarEntity;
+import com.example.demo.cars.repository.CarRepository;
+import com.example.demo.users.model.UserEntity;
+import com.example.demo.users.model.UserRole;
+import com.example.demo.users.repository.UserRepository;
+
+@Service
+public class UserService implements UserDetailsService {
+    private final UserRepository repository;
+    private final CarRepository carRepository;
+    private final PasswordEncoder passwordEncoder;
+
+    public UserService(
+            UserRepository repository,
+            PasswordEncoder passwordEncoder,
+            CarRepository carRepository) {
+        this.repository = repository;
+        this.passwordEncoder = passwordEncoder;
+        this.carRepository = carRepository;
+    }
+
+    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 addCar(long userId, Long carId) {
+        UserEntity us = repository.findById(userId)
+                .orElseThrow(() -> new NotFoundException(UserEntity.class, userId));
+
+        CarEntity fm = carRepository.findById(carId)
+                .orElseThrow(() -> new NotFoundException(CarEntity.class, carId));
+        us.addCar(fm);
+        return repository.save(us);
+    }
+
+    @Transactional
+    public UserEntity deleteCar(long userId, Long carId) {
+        UserEntity us = repository.findById(userId)
+                .orElseThrow(() -> new NotFoundException(UserEntity.class, userId));
+
+        CarEntity fm = carRepository.findById(carId)
+                .orElseThrow(() -> new NotFoundException(CarEntity.class, carId));
+        us.deleteCar(fm);
+        return repository.save(us);
+    }
+
+    @Transactional
+    public UserEntity create(UserEntity entity) {
+        if (entity == null) {
+            throw new IllegalArgumentException("Entity is null");
+        }
+        checkLogin(null, entity.getLogin());
+        final String password = Optional.ofNullable(entity.getPassword()).orElse("");
+        entity.setPassword(
+                passwordEncoder.encode(
+                        StringUtils.hasText(password.strip()) ? password : Constants.DEFAULT_PASSWORD));
+        entity.setRole(Optional.ofNullable(entity.getRole()).orElse(UserRole.USER));
+        repository.save(entity);
+        return repository.save(entity);
+    }
+
+    @Transactional
+    public UserEntity update(long id, UserEntity entity) {
+        final UserEntity existsEntity = get(id);
+        checkLogin(id, entity.getLogin());
+        existsEntity.setLogin(entity.getLogin());
+        repository.save(existsEntity);
+        return existsEntity;
+    }
+
+    @Transactional
+    public UserEntity delete(long id) {
+        final UserEntity existsEntity = get(id);
+        repository.delete(existsEntity);
+        return existsEntity;
+    }
+
+    @Transactional(readOnly = true)
+    public List<CarEntity> getUserCars(long id) {
+        return get(id).getUserCars().stream()
+                .toList();
+    }
+
+    @Transactional
+    public List<CarEntity> deleteUserCars(long id, List<Long> carsIds) {
+        final UserEntity existsUser = get(id);
+        final List<CarEntity> cars = existsUser.getUserCars().stream()
+                .filter(car -> carsIds.contains(car.getId()))
+                .toList();
+        cars.forEach(existsUser::deleteCar);
+        repository.save(existsUser);
+        return cars.stream()
+                .toList();
+    }
+
+    @Transactional
+    public List<CarEntity> deleteAllUserCars(long id) {
+        final UserEntity existsUser = get(id);
+        final List<CarEntity> cars = existsUser.getUserCars().stream()
+                .toList();
+        for (CarEntity carEntity : cars) {
+            existsUser.getUserCars().remove(carEntity);
+        }
+        repository.save(existsUser);
+        return cars.stream()
+                .toList();
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        final UserEntity existsUser = getByLogin(username);
+        return new UserPrincipal(existsUser);
+    }
+
+    public Long getUserIdLong() {
+        Authentication aut = SecurityContextHolder.getContext().getAuthentication();
+        if (aut != null && aut.getPrincipal() instanceof UserDetails) {
+            return ((UserPrincipal) aut.getPrincipal()).getId();
+        }
+        return null;
+    }
+
+    public boolean existByUserIdAndCarId(Long userId, Long carId) {
+        return repository.existsByUserIdAndCarId(userId, carId);
+    }
+}

Лекция6-src (1)/src/main/resources/application.properties

@@ -0,0 +1,20 @@
+# Server
+spring.main.banner-mode=off
+server.port=8080
+
+# Logger settings
+# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
+logging.level.com.example.demo=DEBUG
+
+# JPA Settings
+spring.datasource.url=jdbc:h2:file:./data
+spring.datasource.username=sa
+spring.datasource.password=password
+spring.datasource.driver-class-name=org.h2.Driver
+spring.jpa.hibernate.ddl-auto=create
+spring.jpa.open-in-view=false
+# spring.jpa.show-sql=true
+# spring.jpa.properties.hibernate.format_sql=true
+
+# H2 console
+spring.h2.console.enabled=true

Лекция6-src (1)/src/main/resources/public/css/style.css

@@ -0,0 +1,121 @@
+html,
+body {
+    height: 100%;
+    background-color: #8acf96;
+}
+
+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: #8acf96 !important;
+}
+
+.my-navbar .logo {
+    width: 26px;
+    height: 26px;
+}
+
+.my-footer {
+    background-color: #8acf96;
+    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;
+}
+
+.nav-link {
+    color: black;
+    font-size: 20px;
+}
+
+
+.my-navbar .link a:hover {
+    text-decoration: none;
+    color: black;
+}
+
+.my-navbar .link a.active {
+    text-decoration: none;
+    color: black;
+}
+
+.my-navbar .navbar-nav {
+    justify-content: center;
+    align-items: center;
+}
+
+
+h2 {
+    color: black;
+}
+
+label {
+    color: black;
+}
+
+
+.btn {
+    color: white;
+    background-color: #212529;
+}
+
+.btn-primary {
+    color: white;
+    background-color: #212529;
+}
+
+.btn:hover,
+.btn-primary:hover {
+    color: white;
+    background-color: #212529;
+}
+
+.pagination {
+    color: black;
+    background-color: #8acf96;
+}
+
+.navbar-nav form button:hover {
+    color: black;
+
+}

Лекция6-src (1)/src/main/resources/public/favicon.svg

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

Лекция6-src (1)/src/main/resources/templates/brand-edit.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html brand="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/brand/edit/{id}(id=${brand.id})}" th:object="${brand}" method="post">
+            <div class="mb-3">
+                <label for="id" class="form-label">ID</label>
+                <input brand="text" th:value="*{id}" id="id" class="form-control" readonly disabled>
+            </div>
+            <div class="mb-3">
+                <label for="name" class="form-label">Марка</label>
+                <input brand="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" brand="submit">Сохранить</button>
+                <a class="btn btn-secondary button-fixed-width" href="/admin/brand">Отмена</a>
+            </div>
+        </form>
+    </main>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/brand.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html brand="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/brand/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="brand : ${items}">
+                            <th scope="row" th:text="${brand.id}"></th>
+                            <td th:text="${brand.name}"></td>
+                            <td>
+                                <form th:action="@{/admin/brand/edit/{id}(id=${brand.id})}" method="get">
+                                    <button brand="submit" class="btn btn-link button-link">Редактировать</button>
+                                </form>
+                            </td>
+                            <td>
+                                <form th:action="@{/admin/brand/delete/{id}(id=${brand.id})}" method="post">
+                                    <button brand="submit" class="btn btn-link button-link"
+                                        onclick="return confirm('Вы уверены?')">Удалить</button>
+                                </form>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </th:block>
+        </th:block>
+    </main>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/car-admin.html

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html brand="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/car/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:block sec:authorize="hasRole('ADMIN')">
+                                <th scope="col" class="w-10"></th>
+                                <th scope="col" class="w-10"></th>
+                            </th:block>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr th:each="car : ${items}">
+                            <th scope="row" th:text="${car.id}"></th>
+                            <td th:text="${car.name}"></td>
+                            <th:block sec:authorize="hasRole('ADMIN')">
+                                <td>
+                                    <form th:action="@{/admin/car/edit/{id}(id=${car.id})}" method="get">
+                                        <button type="submit" class="btn btn-link button-link">Редактировать</button>
+                                    </form>
+                                </td>
+                                <td>
+                                    <form th:action="@{/admin/car/delete/{id}(id=${car.id})}" method="post">
+                                        <button type="submit" class="btn btn-link button-link"
+                                            onclick="return confirm('Вы уверены?')">Удалить</button>
+                                    </form>
+                                </td>
+                            </th:block>
+                        </tr>
+                    </tbody>
+                </table>
+            </th:block>
+        </th:block>
+    </main>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/car-desire.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html brand="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="*">
+                <div class="container" style="text-align: center; color: black; font-size: 30px;">
+                    <h2>Желаемые автомобили</h2>
+                </div>
+                <div style="display: flex; flex-wrap: wrap; justify-content: center;">
+                    <div th:each="desire : ${items}" style="padding: 10px 10px 10px 10px; justify-content: center;">
+                        <div th:text="${desire.name}" style="color: black; font-size: 30px;"></div>
+                        <div>
+                            <img src="/photo.jpg" alt="IMAGE" width="400" height="500" />
+                            <div th:text="${desire.description}" style="color: black; font-size: 20px;"></div>
+                            <div style="color: black; font-size: 20px;">
+                                Цена: <span th:text="${desire.price}"></span>
+                            </div>
+                            <div style="display: flex; justify-content: center; margin-top: 5;">
+                                <form th:action="@{/car/disdesire2/{id}(id=${desire.id}, page=${page})}" method="post">
+                                    <button type="submit" class="btn btn-dark"
+                                        onclick="return confirm('Вы уверены?')">Удалить</button>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </th:block>
+            <th:block th:replace="~{ pagination :: pagination (
+                                            url=${'car/desire'},
+                                            totalPages=${totalPages},
+                                            currentPage=${currentPage}) }" />
+        </th:block>
+    </main>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/car-edit.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html brand="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/car/edit/{id}(id=${car.id})}" th:object="${car}" 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 brand="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">
+                <label for="description" class="form-label">Описание</label>
+                <input brand="text" th:field="*{description}" id="description" class="form-control">
+                <div th:if="${#fields.hasErrors('description')}" th:errors="*{description}" class="invalid-feedback">
+                </div>
+            </div>
+            <div class="mb-3">
+                <label for="price" class="form-label">Цена</label>
+                <input brand="text" th:field="*{price}" id="price" class="form-control">
+                <div th:if="${#fields.hasErrors('price')}" th:errors="*{price}" class="invalid-feedback">
+                </div>
+            </div>
+            <div class="mb-2">
+                <label for="brandId" class="form-label">Марка</label>
+                <select th:field="*{brandId}" id="brandId" class="form-select">
+                    <option selected value="">Укажите марку</option>
+                    <option th:each="brand : ${brands}" th:value="${brand.id}">[[${brand.name}]]</option>
+                </select>
+            </div>
+            <div class="mb-2">
+                <label class="form-label">Пакет</label>
+                <div class="form-check" th:each="pack : ${packsCheck}">
+                    <input class="form-check-input" th:field="*{packs}" th:value="${pack.id}" type="checkbox"
+                        th:for="${id}">
+                    <label class="form-check-label" th:field="*{packs}" for="" th:for="${id}">
+                        [[${pack.name}]]
+                    </label>
+                </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/car">Отмена</a>
+            </div>
+        </form>
+    </main>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/car.html

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html brand="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="*">
+                <div class="container" style="text-align: center; color: black; font-size: 30px;">
+                    <h2>Каталог автомобилей</h2>
+                </div>
+
+                <div style="display: flex; flex-wrap: wrap; justify-content: center;">
+                    <div th:each="car : ${items}" style="padding: 10px 10px 10px 10px;  flex-wrap: wrap;">
+                        <div th:text="${car.name}" style="color: black; font-size: 30px;"></div>
+                        <div>
+                            <img src="/photo.jpg" alt="IMAGE" width="400" height="500" />
+                            <div th:text="${car.description}" style="color: black; font-size: 20px;"></div>
+                            <div style="color: black; font-size: 20px;">
+                                Цена: <span th:text="${car.price}"></span>
+                            </div>
+                            <div style="display: flex; justify-content: center;">
+                                <form
+                                    th:action="${car.isDesired} ? @{/car/disdesire1/{id}(id=${car.id}, page=${page})} : @{/car/desire/{id}(id=${car.id}, page=${page})}"
+                                    method="post">
+                                    <button type="submit" class="btn btn-dark text-big"
+                                        th:text="${car.isDesired} ? 'Убрать из желаемого' : 'Добавить в желаемое'"></button>
+                                </form>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </th:block>
+        </th:block>
+        <th:block th:replace="~{ pagination :: pagination (
+                                url=${'list/car'},
+                                totalPages=${totalPages},
+                                currentPage=${currentPage}) }" />
+    </main>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/default.html

@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html brand="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" />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Автосалон</title>
+    <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" style="justify-content: center;">
+        <div class="container-fluid">
+            <a class="navbar-brand" href="/">
+                <i class="bi bi-cart2 d-inline-block align-top me-1 logo" style="color: black;"></i>
+            </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" style="justify-content: center;">
+                    <ul class="navbar-nav me-auto link" th:with="activeLink=${#objects.nullSafe(servletPath, '')}"
+                        style="justify-content: center;">
+                        <a class="nav-link" href="/list/car"
+                            th:classappend="${activeLink.startsWith('/list/car') ? 'active' : ''}">
+                            Каталог автомобилей
+                        </a>
+                        <a class="nav-link" href="/car/desire"
+                            th:classappend="${activeLink.startsWith('/car/desire') ? 'active' : ''}">
+                            Желаемое
+                        </a>
+
+                        <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/brand"
+                                th:classappend="${activeLink.startsWith('/admin/brand') ? 'active' : ''}">
+                                Марки
+                            </a>
+                            <a class="nav-link" href="/admin/pack"
+                                th:classappend="${activeLink.startsWith('/admin/pack') ? 'active' : ''}">
+                                Пакеты
+                            </a>
+                            <a class="nav-link" href="/admin/car"
+                                th:classappend="${activeLink.startsWith('/admin/car') ? 'active' : ''}">
+                                Автомобили
+                            </a>
+                        </th:block>
+
+                    </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>
+                    </ul>
+                </div>
+            </th:block>
+        </div>
+    </nav>
+    <main class="container-fluid p-2" layout:fragment="content">
+    </main>
+    <footer class="my-footer mt-auto d-flex flex-shrink-0 justify-content-center align-items-center">
+        Автор, [[${#dates.year(#dates.createNow())}]]
+    </footer>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/error.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html brand="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>

Лекция6-src (1)/src/main/resources/templates/index.html

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html brand="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
+
+<head>
+    <title>Главная страница</title>
+</head>
+
+<body>
+    <main layout:fragment="content">
+        <div>
+            <a th:href="@{/list/car}" class="btn btn-primary">Каталог автомобилей</a>
+        </div>
+        <div>
+            <a th:href="@{/car/desire}" class="btn btn-primary">Желаемые автомобили</a>
+        </div>
+    </main>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/login.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html brand="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>

Лекция6-src (1)/src/main/resources/templates/pack-edit.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html brand="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/pack/edit/{id}(id=${pack.id})}" th:object="${pack}" method="post">
+            <div class="mb-3">
+                <label for="id" class="form-label">ID</label>
+                <input pack="text" th:value="*{id}" id="id" class="form-control" readonly disabled>
+            </div>
+            <div class="mb-3">
+                <label for="name" class="form-label">Пакет</label>
+                <input pack="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" pack="submit">Сохранить</button>
+                <a class="btn btn-secondary button-fixed-width" href="/admin/pack">Отмена</a>
+            </div>
+        </form>
+    </main>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/pack.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html brand="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/pack/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="pack : ${items}">
+                            <th scope="row" th:text="${pack.id}"></th>
+                            <td th:text="${pack.name}"></td>
+                            <td>
+                                <form th:action="@{/admin/pack/edit/{id}(id=${pack.id})}" method="get">
+                                    <button pack="submit" class="btn btn-link button-link">Редактировать</button>
+                                </form>
+                            </td>
+                            <td>
+                                <form th:action="@{/admin/pack/delete/{id}(id=${pack.id})}" method="post">
+                                    <button pack="submit" class="btn btn-link button-link"
+                                        onclick="return confirm('Вы уверены?')">Удалить</button>
+                                </form>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </th:block>
+        </th:block>
+    </main>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/pagination.html

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

Лекция6-src (1)/src/main/resources/templates/profile.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html brand="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
+
+<head>
+    <title>Главная страница</title>
+</head>
+
+<body>
+    <main layout:fragment="content">
+        <img src="/car.jpg" alt="CAT" width="1890" height="1040">
+    </main>
+</body>
+
+</html>

Лекция6-src (1)/src/main/resources/templates/signup.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html brand="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>

Лекция6-src (1)/src/main/resources/templates/user-edit.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html brand="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>

Лекция6-src (1)/src/main/resources/templates/user.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html brand="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>

Лекция6-src (1)/src/test/java/com/example/demo/TypeServiceTests.java

@@ -0,0 +1,83 @@
+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;
+
+@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());
+     * }
+     */
+}

Лекция6-src (1)/src/test/java/com/example/demo/UserOrderServiceTest.java

@@ -0,0 +1,145 @@
+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.users.model.UserEntity;
+import com.example.demo.users.service.UserService;
+
+import jakarta.persistence.EntityManager;
+
+@SpringBootTest
+@TestMethodOrder(OrderAnnotation.class)
+class UserOrderServiceTest {
+    /*
+     * @Autowired
+     * private EntityManager entityManager;
+     * 
+     * @Autowired
+     * private TypeService typeService;
+     * 
+     * @Autowired
+     * private SubscriptionService subscriptionService;
+     * 
+     * @Autowired
+     * private OrderService orderService;
+     * 
+     * @Autowired
+     * private UserService userService;
+     * 
+     * private TypeEntity type1;
+     * private TypeEntity type2;
+     * private TypeEntity type3;
+     * 
+     * private 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());
+     * 
+     * }
+     */
+}

Лекция6-src (1)/src/test/resources/application.properties

@@ -0,0 +1,14 @@
+# Server
+spring.main.banner-mode=off
+
+# Logger settings
+# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
+logging.level.com.example.demo=DEBUG
+
+# JPA Settings
+spring.datasource.url=jdbc:h2:mem:testdb
+spring.datasource.username=sa
+spring.datasource.password=password
+spring.datasource.driver-class-name=org.h2.Driver
+spring.jpa.hibernate.ddl-auto=create
+spring.jpa.open-in-view=false