diff --git a/2 семестр/lab4-5/.vscode/launch.json b/2 семестр/lab4-5/.vscode/launch.json deleted file mode 100644 index edb9da4..0000000 --- a/2 семестр/lab4-5/.vscode/launch.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "configurations": [ - { - "type": "java", - "name": "Spring Boot-DemoApplication", - "request": "launch", - "cwd": "${workspaceFolder}", - "mainClass": "com.example.demo.DemoApplication", - "projectName": "demo", - "args": "", - "envFile": "${workspaceFolder}/.env" - } - ] -} \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/.gitignore b/2 семестр/lab4-5/demo/.gitignore deleted file mode 100644 index c9e91d9..0000000 --- a/2 семестр/lab4-5/demo/.gitignore +++ /dev/null @@ -1,39 +0,0 @@ -HELP.md -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -data.*.db \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/build.gradle b/2 семестр/lab4-5/demo/build.gradle deleted file mode 100644 index 9b5492b..0000000 --- a/2 семестр/lab4-5/demo/build.gradle +++ /dev/null @@ -1,53 +0,0 @@ -plugins { - id 'java' - id 'org.springframework.boot' version '3.2.5' - id 'io.spring.dependency-management' version '1.1.4' -} - -group = 'com.example' -version = '0.0.1-SNAPSHOT' - -defaultTasks 'bootRun' - -jar { - enabled = false -} - -bootJar { - archiveFileName = String.format('%s-%s.jar', rootProject.name, version) -} - -assert System.properties['java.specification.version'] == '17' || '21' -java { - sourceCompatibility = '17' -} - -repositories { - mavenCentral() -} - -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.modelmapper:modelmapper:3.2.0' - - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'com.h2database:h2:2.2.224' - - implementation 'org.springframework.boot:spring-boot-devtools' - implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0' - runtimeOnly 'org.webjars.npm:bootstrap:5.3.3' - runtimeOnly 'org.webjars.npm:bootstrap-icons:1.11.3' - implementation 'org.webjars:jquery:3.6.0' - implementation 'org.webjars:font-awesome:6.1.0' - - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' -} - -tasks.named('test') { - useJUnitPlatform() -} diff --git a/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.jar b/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index d64cd49..0000000 Binary files a/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.properties b/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 1af9e09..0000000 --- a/2 семестр/lab4-5/demo/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/2 семестр/lab4-5/demo/gradlew b/2 семестр/lab4-5/demo/gradlew deleted file mode 100644 index 1aa94a4..0000000 --- a/2 семестр/lab4-5/demo/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/2 семестр/lab4-5/demo/gradlew.bat b/2 семестр/lab4-5/demo/gradlew.bat deleted file mode 100644 index 93e3f59..0000000 --- a/2 семестр/lab4-5/demo/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/2 семестр/lab4-5/demo/settings.gradle b/2 семестр/lab4-5/demo/settings.gradle deleted file mode 100644 index 0a383dd..0000000 --- a/2 семестр/lab4-5/demo/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'demo' diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/DemoApplication.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/DemoApplication.java deleted file mode 100644 index b7378dc..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/DemoApplication.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.example.demo; - -import java.util.Arrays; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -import com.example.demo.orders.api.OrderProductDto; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.orders.service.OrderService; -import com.example.demo.product.model.ProductEntity; -import com.example.demo.product.service.ProductService; -import com.example.demo.types.model.TypeEntity; -import com.example.demo.types.service.TypeService; -import com.example.demo.users.model.UserEntity; -import com.example.demo.users.service.UserService; - -@SpringBootApplication -public class DemoApplication implements CommandLineRunner { - private final Logger log = LoggerFactory.getLogger(DemoApplication.class); - - private final TypeService typeService; - private final ProductService productService; - private final OrderService orderService; - private final UserService userService; - - public DemoApplication(TypeService typeService, ProductService productService, OrderService orderService, UserService userService) { - this.typeService = typeService; - this.productService = productService; - this.orderService = orderService; - this.userService = userService; - } - - public static void main(String[] args) { - SpringApplication.run(DemoApplication.class, args); - } - - @Override - public void run(String... args) throws Exception { - // if (args.length > 0 && Arrays.asList(args).contains("--populate")) { - log.info("Create default types values"); - final var type1 = typeService.create(new TypeEntity("Мясная")); - final var type2 = typeService.create(new TypeEntity("Пепперони")); - final var type3 = typeService.create(new TypeEntity("Сырная")); - - log.info("Create default product values"); - final var product1 = productService.create(new ProductEntity("test", type1, 399.00)); - final var product2 = productService.create(new ProductEntity("test", type1, 499.00)); - final var product3 = productService.create(new ProductEntity("test", type2, 450.50)); - final var product4 = productService.create(new ProductEntity("test", type2, 900.50)); - final var product5 = productService.create(new ProductEntity("test", type2, 600.00)); - final var product6 = productService.create(new ProductEntity("test", type3, 750.00)); - - log.info("Create default user values"); - final var user1 = userService.create(new UserEntity("Павел", "kruviii")); - final var user2 = userService.create(new UserEntity("Фёдор", "vihoof")); - final var user3 = userService.create(new UserEntity("Семён", "fragreg")); - - - log.info("Create default orders values"); - - orderService.create(user1.getId(), new OrderEntity(), Arrays.asList( - new OrderProductDto(product1.getId(), 3), - new OrderProductDto(product2.getId(), 1), - new OrderProductDto(product3.getId(), 2) - )); - - orderService.create(user2.getId(), new OrderEntity(), Arrays.asList( - new OrderProductDto(product4.getId(), 5) - )); - - orderService.create(user3.getId(), new OrderEntity(), Arrays.asList( - new OrderProductDto(product5.getId(), 1), - new OrderProductDto(product6.getId(), 1) - )); - } - //} -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/api/ComponentDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/api/ComponentDto.java deleted file mode 100644 index 1833c60..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/api/ComponentDto.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.example.demo.components.api; - -import com.example.demo.components.model.ComponentEntity; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -public class ComponentDto { - private long id; - @NotBlank - private String componentName; - @NotNull - private int price; - private int count = 0; - - public ComponentDto(ComponentEntity component) { - this.id = component.getId(); - this.componentName = component.getComponentName(); - this.price = component.getPrice(); - } - public ComponentDto(ComponentEntity component, int count) { - this.id = component.getId(); - this.componentName = component.getComponentName(); - this.price = component.getPrice(); - this.count = count; - } - - public ComponentDto() { - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getComponentName() { - return componentName; - } - - public void setComponentName(String componentName) { - this.componentName = componentName; - } - - public int getPrice() { - return price; - } - - public void setPrice(int price) { - this.price = price; - } - - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/model/ComponentEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/model/ComponentEntity.java deleted file mode 100644 index 085bb3c..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/model/ComponentEntity.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.example.demo.components.model; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -import com.example.demo.core.model.BaseEntity; - -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -@Entity -@Table(name = "components") -public class ComponentEntity extends BaseEntity { - @NotBlank - @Column(name = "name", nullable = false) - private String componentName; - @NotNull - @Column(name = "price", nullable = false) - private Integer price; - - @OneToMany(mappedBy = "component", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) - private List products; - - public ComponentEntity() { - } - - public ComponentEntity(String componentName, Integer price) { - this.componentName = componentName; - this.price = price; - } - - public String getComponentName() { - return componentName; - } - - public void setComponentName(String componentName) { - this.componentName = componentName; - } - - public Integer getPrice() { - return price; - } - - public void setPrice(Integer price) { - this.price = price; - } - - public List getProducts() { - return products; - } - - public void setProducts(List products) { - this.products = products; - } - - public void addProduct(ProductComponents productComponents) { - if (products == null) { - products = new ArrayList<>(); - } - if (!products.contains(productComponents)) - this.products.add(productComponents); - } - - public void removeProduct(ProductComponents productComponents) { - if (products.contains(productComponents)) - this.products.remove(productComponents); - } - - - @Override - public int hashCode() { - return Objects.hash(id, componentName, price); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - final ComponentEntity other = (ComponentEntity) o; - return Objects.equals(other.getId(), id) - && Objects.equals(other.getComponentName(), componentName) - && Objects.equals(other.getPrice(), price); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/repository/ComponentRepository.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/repository/ComponentRepository.java deleted file mode 100644 index e7176fe..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/components/repository/ComponentRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.demo.components.repository; - -import java.util.Optional; - -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.PagingAndSortingRepository; - -import com.example.demo.components.model.ComponentEntity; - -public interface ComponentRepository extends CrudRepository, PagingAndSortingRepository { - Optional findByNameIgnoreCase(String name); -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/GlobalController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/GlobalController.java deleted file mode 100644 index bc3f2ca..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/GlobalController.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.example.demo.core.api; - -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ModelAttribute; - -import com.example.demo.core.session.SessionCart; - -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; - -@ControllerAdvice -public class GlobalController { - private final SessionCart cart; - - public GlobalController(SessionCart cart) { - this.cart = cart; - } - - @ModelAttribute("servletPath") - String getRequestServletPath(HttpServletRequest request) { - return request.getServletPath(); - } - - @ModelAttribute("totalCart") - double getTotalCart(HttpSession session) { - return cart.getSum(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/PageAttributesMapper.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/PageAttributesMapper.java deleted file mode 100644 index 74ee38d..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/api/PageAttributesMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.demo.core.api; - -import java.util.Map; -import java.util.function.Function; - -import org.springframework.data.domain.Page; - -public class PageAttributesMapper { - private PageAttributesMapper() { - } - - public static Map toAttributes(Page page, Function mapper) { - return Map.of( - "items", page.getContent().stream().map(mapper::apply).toList(), - "currentPage", page.getNumber(), - "totalPages", page.getTotalPages()); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/Constants.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/Constants.java deleted file mode 100644 index 6d780a4..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/Constants.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.demo.core.configuration; - -public class Constants { - public static final String SEQUENCE_NAME = "hibernate_sequence"; - public static final int DEFAULT_PAGE_SIZE = 5; - public static final String REDIRECT_VIEW = "redirect:"; - public static final String ADMIN_PREFIX = "/admin"; - public static final String LOGIN_URL = "/login"; - public static final String LOGOUT_URL = "/logout"; - public static final String DEFAULT_PASSWORD = "123456"; - - private Constants() { - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java deleted file mode 100644 index 44defae..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.demo.core.configuration; - -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import com.example.demo.core.model.BaseEntity; - -@Configuration -public class MapperConfiguration { - @Bean - ModelMapper modelMapper() { - final ModelMapper mapper = new ModelMapper(); - mapper.addMappings(new PropertyMap() { - @Override - protected void configure() { - skip(destination.getId()); - } - }); - return mapper; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/WebConfiguration.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/WebConfiguration.java deleted file mode 100644 index 146778d..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/configuration/WebConfiguration.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.demo.core.configuration; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -@Configuration -public class WebConfiguration implements WebMvcConfigurer { - @Override - public void addViewControllers(ViewControllerRegistry registry) { - registry.addViewController("/login").setViewName("login"); - } -} - diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/AdviceController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/AdviceController.java deleted file mode 100644 index 65f0c3e..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/AdviceController.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.example.demo.core.error; - -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.servlet.ModelAndView; - -import jakarta.servlet.http.HttpServletRequest; - -@ControllerAdvice -public class AdviceController { - private final Logger log = LoggerFactory.getLogger(AdviceController.class); - - private static Throwable getRootCause(Throwable throwable) { - Throwable rootCause = throwable; - while (rootCause.getCause() != null && rootCause.getCause() != rootCause) { - rootCause = rootCause.getCause(); - } - return rootCause; - } - - private static Map getAttributes(HttpServletRequest request, Throwable throwable) { - final Throwable rootCause = getRootCause(throwable); - final StackTraceElement firstError = rootCause.getStackTrace()[0]; - return Map.of( - "message", rootCause.getMessage(), - "url", request.getRequestURL(), - "exception", rootCause.getClass().getName(), - "file", firstError.getFileName(), - "method", firstError.getMethodName(), - "line", firstError.getLineNumber()); - } - - @ExceptionHandler(value = Exception.class) - public ModelAndView defaultErrorHandler(HttpServletRequest request, Throwable throwable) throws Throwable { - if (AnnotationUtils.findAnnotation(throwable.getClass(), - ResponseStatus.class) != null) { - throw throwable; - } - - log.error("{}", throwable.getMessage()); - throwable.printStackTrace(); - final ModelAndView model = new ModelAndView(); - model.addAllObjects(getAttributes(request, throwable)); - model.setViewName("error"); - return model; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/NotFoundException.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/NotFoundException.java deleted file mode 100644 index a61d118..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/error/NotFoundException.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.demo.core.error; - -public class NotFoundException extends RuntimeException { - public NotFoundException(Class clazz, Long id) { - super(String.format("%s with id [%s] is not found or not exists", clazz.getSimpleName(), id)); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/model/BaseEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/model/BaseEntity.java deleted file mode 100644 index eba74ad..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/model/BaseEntity.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.example.demo.core.model; - -import com.example.demo.core.configuration.Constants; - -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.MappedSuperclass; -import jakarta.persistence.SequenceGenerator; - -@MappedSuperclass -public abstract class BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = Constants.SEQUENCE_NAME) - @SequenceGenerator(name = Constants.SEQUENCE_NAME, sequenceName = Constants.SEQUENCE_NAME, allocationSize = 1) - protected Long id; - - protected BaseEntity() { - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/SecurityConfiguration.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/SecurityConfiguration.java deleted file mode 100644 index 6b375a3..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/SecurityConfiguration.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.example.demo.core.security; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.config.Customizer; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.SecurityFilterChain; - -import com.example.demo.core.configuration.Constants; -import com.example.demo.users.api.UserSignupController; -import com.example.demo.users.model.UserRole; - -@Configuration -@EnableWebSecurity -public class SecurityConfiguration { - @Bean - SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { - httpSecurity.headers(headers -> headers.frameOptions(FrameOptionsConfig::sameOrigin)); - httpSecurity.csrf(AbstractHttpConfigurer::disable); - httpSecurity.cors(Customizer.withDefaults()); - - httpSecurity.authorizeHttpRequests(requests -> requests - .requestMatchers("/css/**", "/webjars/**", "/*.svg") - .permitAll()); - - httpSecurity.authorizeHttpRequests(requests -> requests - .requestMatchers(Constants.ADMIN_PREFIX + "/**").hasRole(UserRole.ADMIN.name()) - .requestMatchers("/h2-console/**").hasRole(UserRole.ADMIN.name()) - .requestMatchers(UserSignupController.URL).anonymous() - .requestMatchers(Constants.LOGIN_URL).anonymous() - .anyRequest().authenticated()); - - httpSecurity.formLogin(formLogin -> formLogin - .loginPage(Constants.LOGIN_URL)); - - httpSecurity.rememberMe(rememberMe -> rememberMe.key("uniqueAndSecret")); - - httpSecurity.logout(logout -> logout - .deleteCookies("JSESSIONID")); - - return httpSecurity.build(); - } - - @Bean - DaoAuthenticationProvider authenticationProvider(UserDetailsService userDetailsService) { - final DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider(); - authProvider.setUserDetailsService(userDetailsService); - authProvider.setPasswordEncoder(passwordEncoder()); - return authProvider; - } - - @Bean - PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/UserPrincipal.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/UserPrincipal.java deleted file mode 100644 index ce646c6..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/security/UserPrincipal.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.example.demo.core.security; - -import java.util.Collection; -import java.util.Set; - -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import com.example.demo.users.model.UserEntity; - -public class UserPrincipal implements UserDetails { - private final long id; - private final String username; - private final String password; - private final Set roles; - private final boolean active; - - public UserPrincipal(UserEntity user) { - this.id = user.getId(); - this.username = user.getLogin(); - this.password = user.getPassword(); - this.roles = Set.of(user.getRole()); - this.active = true; - } - - public Long getId() { - return id; - } - - @Override - public String getUsername() { - return username; - } - - @Override - public String getPassword() { - return password; - } - - @Override - public Collection getAuthorities() { - return roles; - } - - @Override - public boolean isEnabled() { - return active; - } - - @Override - public boolean isAccountNonExpired() { - return isEnabled(); - } - - @Override - public boolean isAccountNonLocked() { - return isEnabled(); - } - - @Override - public boolean isCredentialsNonExpired() { - return isEnabled(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionCart.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionCart.java deleted file mode 100644 index 09f7d23..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionCart.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.demo.core.session; - -import java.util.HashMap; - -import com.example.demo.users.api.UserCartDto; - -public class SessionCart extends HashMap { - public double getSum() { - return this.values().stream() - .map(item -> item.getCount() * item.getPrice()) - .mapToDouble(Double::doubleValue) - .sum(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionHelper.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionHelper.java deleted file mode 100644 index 6ee3d8c..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/core/session/SessionHelper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.demo.core.session; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Scope; -import org.springframework.context.annotation.ScopedProxyMode; -import org.springframework.web.context.WebApplicationContext; - -@Configuration -public class SessionHelper { - @Bean - @Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS) - SessionCart todos() { - return new SessionCart(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderController.java deleted file mode 100644 index f74b9ef..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderController.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.example.demo.orders.api; - -import java.text.ParseException; - -import java.util.List; - -import org.hibernate.Hibernate; -import org.modelmapper.ModelMapper; -import org.springframework.data.domain.jaxb.SpringDataJaxb.PageDto; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.example.demo.core.configuration.Constants; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.orders.service.OrderService; -import com.example.demo.product.api.ProductDto; -import com.example.demo.product.model.ProductEntity; - -import jakarta.validation.Valid; - -@Controller -@RequestMapping(OrderController.URL) -public class OrderController { - public static final String URL = "/orders"; - private static final String ORDER_VIEW = "orders"; - private static final String ORDER_DETAILS_VIEW = "order-details"; - - private static final String ORDER_ATTRIBUTE = "order"; - private static final String PAGE_ATTRIBUTE = "page"; - - private final OrderService orderService; - private final ModelMapper modelMapper; - - public OrderController(OrderService orderService, ModelMapper modelMapper) { - this.orderService = orderService; - this.modelMapper = modelMapper; - } - - private OrderDto toDto(OrderEntity entity) { - Hibernate.initialize(entity.getOrderProducts()); - final OrderDto dto = modelMapper.map(entity, OrderDto.class); - dto.setSum(orderService.getSum(entity.getUser().getId(), entity.getId())); - dto.setCount(orderService.getFullCount(entity.getUser().getId(), entity.getId())); - return dto; - } - - private ProductDto toProductDto(ProductEntity entity) { - return modelMapper.map(entity, ProductDto.class); - } - - private OrderEntity toEntity(OrderDto dto) { - final OrderEntity entity = modelMapper.map(dto, OrderEntity.class); - return entity; - } - - @GetMapping - public PageDto getAll( - @PathVariable(name = "user") Long userId, - @RequestParam(name = "page", defaultValue = "0") int page, - @RequestParam(name = "size", defaultValue = Constants.DEFAULT_PAGE_SIZE) int size) { - return PageDtoMapper.toDto(orderService.getAll(userId, page, size), this::toDto); - } - - @GetMapping("/{id}") - public OrderDto get( - @PathVariable(name = "user") Long userId, - @PathVariable(name = "id") Long id) { - return toDto(orderService.get(userId, id)); - } - - @PostMapping - public OrderDto create( - @PathVariable(name = "user") Long userId, - @RequestBody @Valid OrderDto dto) throws ParseException { - return toDto(orderService.create(userId, toEntity(dto), dto.getOrderProducts())); - } - - @PutMapping("/{id}") - public OrderDto update( - @PathVariable(name = "user") Long userId, - @PathVariable(name = "id") Long id, - @RequestBody @Valid OrderDto dto) throws ParseException { - return toDto(orderService.update(userId, id, toEntity(dto), dto.getOrderProducts())); - } - - @DeleteMapping("/{id}") - public OrderDto delete( - @PathVariable(name = "user") Long userId, - @PathVariable(name = "id") Long id) { - return toDto(orderService.delete(userId, id)); - } - - @GetMapping("/{id}/product") - public List getOrderProducts( - @PathVariable(name = "user") Long userId, - @PathVariable(name = "id") Long id) { - return orderService.getOrderProducts(userId, id).stream().map(this::toProductDto).toList(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderDto.java deleted file mode 100644 index b56ec8d..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderDto.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.example.demo.orders.api; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class OrderDto { - @JsonProperty(access = JsonProperty.Access.READ_ONLY) - private Long id; - @JsonProperty(access = JsonProperty.Access.READ_ONLY) - private Double sum; - @JsonProperty(access = JsonProperty.Access.READ_ONLY) - private Integer count; - - private List orderProducts; - - - public List getOrderProducts() { - return orderProducts; - } - - public void setOrderProducts(List orderProducts) { - this.orderProducts = orderProducts; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Double getSum() { - return sum; - } - - public void setSum(Double sum) { - this.sum = sum; - } - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderProductDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderProductDto.java deleted file mode 100644 index 4747c8d..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/api/OrderProductDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.example.demo.orders.api; - -import jakarta.validation.constraints.NotNull; - -public class OrderProductDto { - private Long productId; - @NotNull - private Integer count; - - public OrderProductDto(Long productId, Integer count) { - this.productId = productId; - this.count = count; - } - public OrderProductDto() { - } - - public Long getProductId() { - return productId; - } - - public void setProductId(Long id) { - this.productId = id; - } - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/model/OrderEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/model/OrderEntity.java deleted file mode 100644 index 2d8cd11..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/model/OrderEntity.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.example.demo.orders.model; - -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; - -import com.example.demo.users.model.UserEntity; -import com.example.demo.core.model.BaseEntity; -import com.example.demo.ordersproducts.model.OrderProductEntity; - -import jakarta.persistence.CascadeType; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.OrderBy; -import jakarta.persistence.Table; - -@Entity -@Table(name = "orders") -public class OrderEntity extends BaseEntity { - @ManyToOne - @JoinColumn(name = "userId", nullable = false) - private UserEntity user; - - @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true ) - @OrderBy("id ASC") - private Set orderProducts = new HashSet<>(); - - public UserEntity getUser() { - return user; - } - - public void setUser(UserEntity user) { - this.user = user; - if (!user.getOrders().contains(this)) { - user.getOrders().add(this); - } - } - - public Set getOrderProducts() { - return orderProducts; - } - - public void setOrdersProducts(Set set) { - this.orderProducts = set; - } - - public void addProduct(OrderProductEntity orderProduct) { - if (orderProduct.getOrder() != this) { - orderProduct.setOrder(this); - } - orderProducts.add(orderProduct); - } - - public void deleteProduct(OrderProductEntity orderProduct) { - if (orderProduct.getOrder() != this) { - return; - } - orderProducts.remove(orderProduct); - } - - @Override - public int hashCode() { - return Objects.hash(id, user.getId(), orderProducts); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - final OrderEntity other = (OrderEntity) obj; - return Objects.equals(other.getId(), id) - && Objects.equals(other.getUser().getId(), user.getId()) - && Objects.equals(other.getOrderProducts(), orderProducts); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/repository/OrderRepository.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/repository/OrderRepository.java deleted file mode 100644 index 119722a..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/repository/OrderRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.demo.orders.repository; - -import java.util.List; -import java.util.Optional; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.PagingAndSortingRepository; - -import com.example.demo.orders.model.OrderEntity; - -public interface OrderRepository extends CrudRepository, PagingAndSortingRepository { - Optional findOneByUserIdAndId(long userId, long id); - - List findByUserId(long userId); - - Page findByUserId(long userId, Pageable pageable); -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/service/OrderService.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/service/OrderService.java deleted file mode 100644 index c379972..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/orders/service/OrderService.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.example.demo.orders.service; - -import java.util.ArrayList; -import java.util.List; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.example.demo.core.error.NotFoundException; -import com.example.demo.orders.api.OrderProductDto; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.orders.repository.OrderRepository; -import com.example.demo.product.model.ProductEntity; -import com.example.demo.product.service.ProductService; -import com.example.demo.users.model.UserEntity; -import com.example.demo.users.service.UserService; -import com.example.demo.ordersproducts.model.OrderProductEntity; - -@Service -public class OrderService { - private final OrderRepository repository; - private final UserService userService; - private final ProductService productService; - - public OrderService(OrderRepository repository, UserService userService, ProductService productService) { - this.repository = repository; - this.userService = userService; - this.productService = productService; - } - - @Transactional(readOnly = true) - public List getAll(Long userId) { - userService.get(userId); - return repository.findByUserId(userId); - } - - @Transactional(readOnly = true) - public Page getAll(long userId, int page, int size) { - final Pageable pageRequest = PageRequest.of(page, size); - userService.get(userId); - return repository.findByUserId(userId, pageRequest); - } - - @Transactional(readOnly = true) - public OrderEntity get(long userId, long id) { - userService.get(userId); - return repository.findOneByUserIdAndId(userId, id) - .orElseThrow(() -> new NotFoundException(OrderEntity.class, id)); - } - - @Transactional - public OrderEntity create(long userId, OrderEntity entity, List orderProductList) { - if (entity == null) { - throw new IllegalArgumentException("Entity is null"); - } - final UserEntity existsUser = userService.get(userId); - entity.setUser(existsUser); - entity = repository.save(entity); - - List orderProductListEntities = new ArrayList(); - for (OrderProductDto element : orderProductList) { - OrderProductEntity orderProductEntity = new OrderProductEntity(entity, productService.get(element.getProductId()), element.getCount()); - - orderProductEntity.setOrder(entity); - orderProductListEntities.add(orderProductEntity); - entity.addProduct(orderProductEntity); - } - - return repository.save(entity); - } - - @Transactional - public OrderEntity update(long userId, long id, OrderEntity entity, List orderProductList) { - userService.get(userId); - final OrderEntity existsEntity = get(userId, id); - existsEntity.getOrderProducts().clear(); - for (OrderProductDto dto : orderProductList) { - OrderProductEntity orderProductEntity = new OrderProductEntity(existsEntity, productService.get(dto.getProductId()), dto.getCount()); - existsEntity.addProduct(orderProductEntity); - } - return repository.save(existsEntity); - } - - @Transactional - public OrderEntity delete(long userId, long id) { - userService.get(userId); - final OrderEntity existsEntity = get(userId, id); - repository.delete(existsEntity); - return existsEntity; - } - - @Transactional(readOnly = true) - public List getOrderProducts(long userId, long id) { - userService.get(userId); - return get(userId, id).getOrderProducts().stream() - .map(orderProduct -> orderProduct.getProduct()) - .toList(); - } - - @Transactional(readOnly = true) - public Double getSum(long userId, long id) { - userService.get(userId); - return get(userId, id).getOrderProducts().stream() - .mapToDouble(orderProduct -> orderProduct.getCount() * orderProduct.getProduct().getPrice()) - .sum(); - } - - @Transactional(readOnly = true) - public Integer getFullCount(long userId, long id) { - userService.get(userId); - return get(userId, id).getOrderProducts().stream() - .mapToInt(OrderProductEntity::getCount) - .sum(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductEntity.java deleted file mode 100644 index 3eec5df..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.example.demo.ordersproducts.model; - -import java.util.Objects; - -import com.example.demo.core.model.BaseEntity; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.product.model.ProductEntity; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; - -@Entity -@Table(name = "orders_products") -public class OrderProductEntity extends BaseEntity { - @ManyToOne - @JoinColumn(name = "order_id") - private OrderEntity order; - @ManyToOne - @JoinColumn(name = "product_id") - private ProductEntity product; - @Column(nullable = false) - private Integer count; - - public OrderProductEntity() { - } - - public OrderProductEntity(OrderEntity order, ProductEntity product, Integer count) { - this.order = order; - this.product = product; - this.count = count; - } - - public OrderEntity getOrder() { - return order; - } - - public void setOrder(OrderEntity order) { - this.order = order; - if (!order.getOrderProducts().contains(this)) { - order.getOrderProducts().add(this); - } - } - - public ProductEntity getProduct() { - return product; - } - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } - - @Override - public int hashCode() { - return Objects.hash(id, order.getId(), product.getId(), count); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - OrderProductEntity other = (OrderProductEntity) obj; - return Objects.equals(id, other.id) - && Objects.equals(order.getId(), other.order.getId()) - && Objects.equals(product.getId(), other.product.getId()) - && count == other.count; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductId.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductId.java deleted file mode 100644 index 4670e7e..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/ordersproducts/model/OrderProductId.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.example.demo.ordersproducts.model; - -import java.util.Objects; -import java.util.Optional; - -import jakarta.persistence.Embeddable; - -@Embeddable -public class OrderProductId { - private Long orderId; - private Long productId; - - public OrderProductId() { - } - - public OrderProductId(Long orderId, Long productId) { - this.orderId = orderId; - this.productId = productId; - } - - public Long getOrderId() { - return orderId; - } - - public void setOrderId(Long orderId) { - this.orderId = orderId; - } - - public Long getProductId() { - return productId; - } - - public void setProductId(Long productId) { - this.productId = productId; - } - - @Override - public int hashCode() { - return Objects.hash( - Optional.ofNullable(orderId).orElse(0L), - Optional.ofNullable(productId).orElse(0L)); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - OrderProductId other = (OrderProductId) obj; - return Objects.equals(orderId, other.orderId) - && Objects.equals(productId, other.productId); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductController.java deleted file mode 100644 index c1647ac..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.example.demo.product.api; - -import org.modelmapper.ModelMapper; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import com.example.demo.core.configuration.Constants; -import com.example.demo.product.model.ProductEntity; -import com.example.demo.product.service.ProductService; -import com.example.demo.types.service.TypeService; - -import jakarta.validation.Valid; - -@Controller -@RequestMapping(ProductController.URL) -public class ProductController { - public static final String URL = Constants.ADMIN_PREFIX + "/product"; - private static final String PRODUCT_VIEW = "product"; - private static final String PRODUCT_EDIT_VIEW = "product-edit"; - private static final String PRODUCT_ATTRIBUTE = "product"; - - private final ProductService productService; - private final TypeService typeService; - private final ModelMapper modelMapper; - - public ProductController(ProductService productService, TypeService typeService, ModelMapper modelMapper) { - this.productService = productService; - this.typeService = typeService; - this.modelMapper = modelMapper; - } - - private ProductDto toDto(ProductEntity entity) { - return modelMapper.map(entity, ProductDto.class); - } - - private ProductEntity toEntity(ProductDto dto) { - final ProductEntity entity = modelMapper.map(dto, ProductEntity.class); - entity.setType(typeService.get(dto.getTypeId())); - return entity; - } - - @GetMapping - public String getAll(Model model) { - model.addAttribute( - "items", - productService.getAll(0).stream() - .map(this::toDto) - .toList()); - return PRODUCT_VIEW; - } - - @GetMapping("/edit/") - public String create(Model model) { - model.addAttribute(PRODUCT_ATTRIBUTE, new ProductDto()); - return PRODUCT_EDIT_VIEW; - } - - @PostMapping("/edit/") - public String create( - @ModelAttribute(name = PRODUCT_ATTRIBUTE) @Valid ProductDto product, - BindingResult bindingResult, - Model model) { - if (bindingResult.hasErrors()) { - return PRODUCT_EDIT_VIEW; - } - productService.create(toEntity(product)); - return Constants.REDIRECT_VIEW + URL; - } - - @GetMapping("/edit/{id}") - public String update( - @PathVariable(name = "id") Long id, - Model model) { - if (id <= 0) { - throw new IllegalArgumentException(); - } - model.addAttribute(PRODUCT_ATTRIBUTE, toDto(productService.get(id))); - return PRODUCT_EDIT_VIEW; - } - - @PostMapping("/edit/{id}") - public String update( - @PathVariable(name = "id") Long id, - @ModelAttribute(name = PRODUCT_ATTRIBUTE) @Valid ProductDto product, - BindingResult bindingResult, - Model model) { - if (bindingResult.hasErrors()) { - return PRODUCT_EDIT_VIEW; - } - if (id <= 0) { - throw new IllegalArgumentException(); - } - productService.update(id, toEntity(product)); - return Constants.REDIRECT_VIEW + URL; - } - - @PostMapping("/delete/{id}") - public String delete( - @PathVariable(name = "id") Long id) { - productService.delete(id); - return Constants.REDIRECT_VIEW + URL; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductDto.java deleted file mode 100644 index cd182fb..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/api/ProductDto.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.example.demo.product.api; - -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -public class ProductDto { - private Long id; - @NotBlank - private String name; - @NotNull - @Min(1) - private Long typeId; - @NotNull - @Min(1) - private Double price; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Long getTypeId() { - return typeId; - } - - public void setTypeId(Long typeId) { - this.typeId = typeId; - } - - public Double getPrice() { - return price; - } - - public void setPrice(Double price) { - this.price = price; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/model/ProductEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/model/ProductEntity.java deleted file mode 100644 index 62e81f9..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/model/ProductEntity.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.example.demo.product.model; - -import java.util.Objects; - -import com.example.demo.types.model.TypeEntity; -import com.example.demo.core.model.BaseEntity; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; - -@Entity -@Table(name = "products") -public class ProductEntity extends BaseEntity { - @Column(nullable = false) - private String name; - @ManyToOne - @JoinColumn(name = "typeId", nullable = false) - private TypeEntity type; - @Column(nullable = false) - private Double price; - - public ProductEntity() { - } - - public ProductEntity(String name, TypeEntity type, Double price) { - this.name = name; - this.type = type; - this.price = price; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public TypeEntity getType() { - return type; - } - - public void setType(TypeEntity type) { - this.type = type; - } - - public Double getPrice() { - return price; - } - - public void setPrice(Double price) { - this.price = price; - } - - @Override - public int hashCode() { - return Objects.hash(id, name, type, price); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - final ProductEntity other = (ProductEntity) obj; - return Objects.equals(other.getId(), id) - && Objects.equals(other.getName(), name) - && Objects.equals(other.getType(), type) - && Objects.equals(other.getPrice(), price); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/repository/ProductRepository.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/repository/ProductRepository.java deleted file mode 100644 index e530575..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/repository/ProductRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.demo.product.repository; - -import java.util.List; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.PagingAndSortingRepository; - -import com.example.demo.product.model.ProductEntity; - -public interface ProductRepository extends CrudRepository, PagingAndSortingRepository { - List findByTypeId(long typeId); - - Page findByTypeId(long typeId, Pageable pageable); -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/service/ProductService.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/service/ProductService.java deleted file mode 100644 index 4632cf0..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/product/service/ProductService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.example.demo.product.service; - -import java.util.List; -import java.util.stream.StreamSupport; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.example.demo.core.error.NotFoundException; -import com.example.demo.product.model.ProductEntity; -import com.example.demo.product.repository.ProductRepository; - -@Service -public class ProductService { - private final ProductRepository repository; - - public ProductService(ProductRepository repository) { - this.repository = repository; - } - - @Transactional(readOnly = true) - public List getAll(long categoryId) { - if (categoryId <= 0L) { - return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); - } - return repository.findByTypeId(categoryId); - } - - @Transactional(readOnly = true) - public Page getAll(long typeId, int page, int size) { - final Pageable pageRequest = PageRequest.of(page, size); - if (typeId <= 0L) { - return repository.findAll(pageRequest); - } - return repository.findByTypeId(typeId, pageRequest); - } - - @Transactional(readOnly = true) - public ProductEntity get(long id) { - return repository.findById(id) - .orElseThrow(() -> new NotFoundException(ProductEntity.class, id)); - } - - @Transactional - public ProductEntity create(ProductEntity entity) { - if (entity == null) { - throw new IllegalArgumentException("Entity is null"); - } - return repository.save(entity); - } - - @Transactional - public ProductEntity update(Long id, ProductEntity entity) { - final ProductEntity existsEntity = get(id); - existsEntity.setName(entity.getName()); - existsEntity.setType(entity.getType()); - existsEntity.setPrice(entity.getPrice()); - return repository.save(existsEntity); - } - - @Transactional - public ProductEntity delete(Long id) { - final ProductEntity existsEntity = get(id); - repository.delete(existsEntity); - return existsEntity; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentEntity.java deleted file mode 100644 index 3b6170f..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentEntity.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.example.demo.productcomponents; - -import java.util.Objects; - -import com.example.demo.components.model.ComponentEntity; -import com.example.demo.core.model.BaseEntity; -import com.example.demo.orders.model.OrderEntity; -import com.example.demo.ordersproducts.model.OrderProductEntity; -import com.example.demo.product.model.ProductEntity; -import com.fasterxml.jackson.annotation.JsonIgnore; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.MapsId; -import jakarta.persistence.Table; -import jakarta.validation.constraints.NotNull; - -@Entity -@Table(name = "products_components") -public class ProductComponentEntity extends BaseEntity { - @ManyToOne - @MapsId("componentId") - @JoinColumn(name = "component_id") - private ComponentEntity component; - @ManyToOne - @MapsId("productId") - @JoinColumn(name = "product_id") - @JsonIgnore - private ProductEntity product; - @NotNull - @Column(name = "count") - private Integer count; - - public ProductComponentEntity() { - } - - public ProductComponentEntity(ComponentEntity component, ProductEntity product, Integer count) { - this.component = component; - this.id.setComponentId(component.getId()); - this.id.setProductId(product.getId()); - this.product = product; - this.count = count; - } - - public ComponentEntity getComponent() { - return component; - } - - public void setComponent(ComponentEntity component) { - this.component = component; - } - - public ProductEntity getProduct() { - return product; - } - - public void setProduct(ProductEntity product) { - this.product = product; - } - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } - - public void remove() { - product.getComponents().remove(this); - product = null; - component.getProducts().remove(this); - component = null; - } - - @Override - public int hashCode() { - return Objects.hash(id, component.getId(), product.getId(), count); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - ProductComponentEntity other = (ProductComponentEntity) obj; - return Objects.equals(id, other.id) - && Objects.equals(component.getId(), other.component.getId()) - && Objects.equals(product.getId(), other.product.getId()) - && count == other.count; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentId.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentId.java deleted file mode 100644 index f5710e7..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/productcomponents/ProductComponentId.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.example.demo.productcomponents; - -import java.util.Objects; -import java.util.Optional; - -import jakarta.persistence.Embeddable; - -@Embeddable -public class ProductComponentId { - private Long componentId; - private Long productId; - - public ProductComponentId() { - } - - public ProductComponentId(Long componentId, Long productId) { - this.componentId = componentId; - this.productId = productId; - } - - public Long getComponentId() { - return componentId; - } - - public void setComponentId(Long componentId) { - this.componentId = componentId; - } - - public Long getProductId() { - return productId; - } - - public void setProductId(Long productId) { - this.productId = productId; - } - - @Override - public int hashCode() { - return Objects.hash( - Optional.ofNullable(componentId).orElse(0L), - Optional.ofNullable(productId).orElse(0L)); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - ProductComponentId other = (ProductComponentId) obj; - return Objects.equals(componentId, other.componentId) - && Objects.equals(productId, other.productId); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeController.java deleted file mode 100644 index c90e831..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeController.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.example.demo.types.api; - -import java.util.Map; - -import org.modelmapper.ModelMapper; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import com.example.demo.core.api.PageAttributesMapper; -import com.example.demo.core.configuration.Constants; -import com.example.demo.types.model.TypeEntity; -import com.example.demo.types.service.TypeService; - -import jakarta.validation.Valid; - -@Controller -@RequestMapping(TypeController.URL) -public class TypeController { - public static final String URL = Constants.ADMIN_PREFIX + "/type"; - private static final String TYPE_VIEW = "type"; - private static final String TYPE_EDIT_VIEW = "type-edit"; - private static final String TYPE_ATTRIBUTE = "type"; - private static final String PAGE_ATTRIBUTE = "page"; - - private final TypeService typeService; - private final ModelMapper modelMapper; - - public TypeController(TypeService typeService, ModelMapper modelMapper) { - this.typeService = typeService; - this.modelMapper = modelMapper; - } - - private TypeDto toDto(TypeEntity entity) { - return modelMapper.map(entity, TypeDto.class); - } - - private TypeEntity toEntity(TypeDto dto) { - return modelMapper.map(dto, TypeEntity.class); - } - - @GetMapping - public String getAll(@RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, Model model) { - final Map attributes = PageAttributesMapper.toAttributes( - typeService.getAll(page, Constants.DEFAULT_PAGE_SIZE), this::toDto); - model.addAllAttributes(attributes); - model.addAttribute(PAGE_ATTRIBUTE, page); - return TYPE_VIEW; - } - - @GetMapping("/edit/") - public String create(Model model) { - model.addAttribute(TYPE_ATTRIBUTE, new TypeDto()); - return TYPE_EDIT_VIEW; - } - - @PostMapping("/edit/") - public String create( - @ModelAttribute(name = TYPE_ATTRIBUTE) @Valid TypeDto type, - BindingResult bindingResult, - Model model) { - if (bindingResult.hasErrors()) { - return TYPE_EDIT_VIEW; - } - typeService.create(toEntity(type)); - return Constants.REDIRECT_VIEW + URL; - } - - @GetMapping("/edit/{id}") - public String update(@PathVariable(name = "id") Long id, Model model) { - if (id <= 0) { - throw new IllegalArgumentException(); - } - model.addAttribute(TYPE_ATTRIBUTE, toDto(typeService.get(id))); - return TYPE_EDIT_VIEW; - } - - @PostMapping("/edit/{id}") - public String update( - @PathVariable(name = "id") Long id, - @ModelAttribute(name = TYPE_ATTRIBUTE) @Valid TypeDto type, - BindingResult bindingResult, - Model model) { - if (bindingResult.hasErrors()) { - return TYPE_EDIT_VIEW; - } - if (id <= 0) { - throw new IllegalArgumentException(); - } - typeService.update(id, toEntity(type)); - return Constants.REDIRECT_VIEW + URL; - } - - @PostMapping("/delete/{id}") - public String delete(@PathVariable(name = "id") Long id) { - typeService.delete(id); - return Constants.REDIRECT_VIEW + URL; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeDto.java deleted file mode 100644 index 37b9f81..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/api/TypeDto.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.example.demo.types.api; - -import jakarta.validation.constraints.NotBlank; - -public class TypeDto { - private Long id; - @NotBlank - private String name; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/model/TypeEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/model/TypeEntity.java deleted file mode 100644 index 14df9ea..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/model/TypeEntity.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.example.demo.types.model; - -import java.util.Objects; - -import com.example.demo.core.model.BaseEntity; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; - -@Entity -@Table(name = "types") -public class TypeEntity extends BaseEntity { - @Column(nullable = false, unique = true, length = 50) - private String name; - - public TypeEntity() { - } - - public TypeEntity(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - final TypeEntity other = (TypeEntity) obj; - return Objects.equals(other.getId(), id) - && Objects.equals(other.getName(), name); - } - -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/repository/TypeRepository.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/repository/TypeRepository.java deleted file mode 100644 index fb863a7..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/repository/TypeRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo.types.repository; - -import java.util.Optional; - -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.PagingAndSortingRepository; - -import com.example.demo.types.model.TypeEntity; - -public interface TypeRepository - extends CrudRepository, PagingAndSortingRepository { - Optional findByNameIgnoreCase(String name); -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/service/TypeService.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/service/TypeService.java deleted file mode 100644 index 5ef7062..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/types/service/TypeService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.example.demo.types.service; - -import java.util.List; -import java.util.stream.StreamSupport; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.example.demo.core.error.NotFoundException; -import com.example.demo.types.model.TypeEntity; -import com.example.demo.types.repository.TypeRepository; - -@Service -public class TypeService { - private final TypeRepository repository; - - public TypeService(TypeRepository repository) { - this.repository = repository; - } - - private void checkName(String name) { - if (repository.findByNameIgnoreCase(name).isPresent()) { - throw new IllegalArgumentException(String.format("Type with name %s is already exists", name)); - } - } - - @Transactional(readOnly = true) - public List getAll() { - return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); - } - - @Transactional(readOnly = true) - public Page getAll(int page, int size) { - return repository.findAll(PageRequest.of(page, size, Sort.by("id"))); - } - - @Transactional(readOnly = true) - public TypeEntity get(Long id) { - return repository.findById(id) - .orElseThrow(() -> new NotFoundException(TypeEntity.class, id)); - } - - @Transactional - public TypeEntity create(TypeEntity entity) { - if (entity == null) { - throw new IllegalArgumentException("Entity is null"); - } - checkName(entity.getName()); - return repository.save(entity); - } - - @Transactional - public TypeEntity update(Long id, TypeEntity entity) { - final TypeEntity existsEntity = get(id); - existsEntity.setName(entity.getName()); - return repository.save(existsEntity); - } - - @Transactional - public TypeEntity delete(Long id) { - final TypeEntity existsEntity = get(id); - repository.delete(existsEntity); - return existsEntity; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserCartDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserCartDto.java deleted file mode 100644 index 584adf4..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserCartDto.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.example.demo.users.api; - -import java.util.Objects; - -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; - -public class UserCartDto { - @NotNull - private Long type; - private String typeName; - @NotNull - @Min(1000) - private Double price; - @NotNull - @Min(1) - private Integer count; - - public Long getType() { - return type; - } - - public void setType(Long typeId) { - this.type = typeId; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - - public Double getPrice() { - return price; - } - - public void setPrice(Double price) { - this.price = price; - } - - public Integer getCount() { - return count; - } - - public void setCount(Integer count) { - this.count = count; - } - - @Override - public int hashCode() { - return Objects.hash(type, price); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - UserCartDto other = (UserCartDto) obj; - return Objects.equals(type, other.type) && Objects.equals(price, other.price); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserController.java deleted file mode 100644 index bd855d0..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.example.demo.users.api; - -import java.util.Map; - -import org.modelmapper.ModelMapper; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import com.example.demo.core.api.PageAttributesMapper; -import com.example.demo.core.configuration.Constants; -import com.example.demo.users.model.UserEntity; -import com.example.demo.users.service.UserService; - -import jakarta.validation.Valid; - -@Controller -@RequestMapping(UserController.URL) -public class UserController { - public static final String URL = Constants.ADMIN_PREFIX + "/user"; - private static final String USER_VIEW = "user"; - private static final String USER_EDIT_VIEW = "user-edit"; - private static final String PAGE_ATTRIBUTE = "page"; - private static final String USER_ATTRIBUTE = "user"; - - private final UserService userService; - private final ModelMapper modelMapper; - - public UserController(UserService userService, ModelMapper modelMapper) { - this.userService = userService; - this.modelMapper = modelMapper; - } - - private UserDto toDto(UserEntity entity) { - return modelMapper.map(entity, UserDto.class); - } - - private UserEntity toEntity(UserDto dto) { - return modelMapper.map(dto, UserEntity.class); - } - - @GetMapping - public String getAll( - @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, - Model model) { - final Map attributes = PageAttributesMapper.toAttributes( - userService.getAll(page, Constants.DEFAULT_PAGE_SIZE), this::toDto); - model.addAllAttributes(attributes); - model.addAttribute(PAGE_ATTRIBUTE, page); - return USER_VIEW; - } - - @GetMapping("/edit/") - public String create( - @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, - Model model) { - model.addAttribute(USER_ATTRIBUTE, new UserDto()); - model.addAttribute(PAGE_ATTRIBUTE, page); - return USER_EDIT_VIEW; - } - - @PostMapping("/edit/") - public String create( - @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, - @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserDto user, - BindingResult bindingResult, - Model model, - RedirectAttributes redirectAttributes) { - if (bindingResult.hasErrors()) { - model.addAttribute(PAGE_ATTRIBUTE, page); - return USER_EDIT_VIEW; - } - redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); - userService.create(toEntity(user)); - return Constants.REDIRECT_VIEW + URL; - } - - @GetMapping("/edit/{id}") - public String update( - @PathVariable(name = "id") Long id, - @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, - Model model) { - if (id <= 0) { - throw new IllegalArgumentException(); - } - model.addAttribute(USER_ATTRIBUTE, toDto(userService.get(id))); - model.addAttribute(PAGE_ATTRIBUTE, page); - return USER_EDIT_VIEW; - } - - @PostMapping("/edit/{id}") - public String update( - @PathVariable(name = "id") Long id, - @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, - @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserDto user, - BindingResult bindingResult, - Model model, - RedirectAttributes redirectAttributes) { - if (bindingResult.hasErrors()) { - model.addAttribute(PAGE_ATTRIBUTE, page); - return USER_EDIT_VIEW; - } - if (id <= 0) { - throw new IllegalArgumentException(); - } - redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); - userService.update(id, toEntity(user)); - return Constants.REDIRECT_VIEW + URL; - } - - @PostMapping("/delete/{id}") - public String delete( - @PathVariable(name = "id") Long id, - @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, - RedirectAttributes redirectAttributes) { - redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); - userService.delete(id); - return Constants.REDIRECT_VIEW + URL; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserDto.java deleted file mode 100644 index d5a1cd7..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserDto.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.example.demo.users.api; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; - -public class UserDto { - private Long id; - @NotBlank - @Size(min = 3, max = 20) - private String login; - private String role; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - - public String getRole() { - return role; - } - - public void setRole(String role) { - this.role = role; - } -} \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupController.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupController.java deleted file mode 100644 index e64a5e1..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupController.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.example.demo.users.api; - -import java.util.Objects; - -import org.modelmapper.ModelMapper; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import com.example.demo.core.configuration.Constants; -import com.example.demo.users.model.UserEntity; -import com.example.demo.users.service.UserService; - -import jakarta.validation.Valid; - -@Controller -@RequestMapping(UserSignupController.URL) -public class UserSignupController { - public static final String URL = "/signup"; - - private static final String SIGNUP_VIEW = "signup"; - private static final String USER_ATTRIBUTE = "user"; - - private final UserService userService; - private final ModelMapper modelMapper; - - public UserSignupController( - UserService userService, - ModelMapper modelMapper) { - this.userService = userService; - this.modelMapper = modelMapper; - } - - private UserEntity toEntity(UserSignupDto dto) { - return modelMapper.map(dto, UserEntity.class); - } - - @GetMapping - public String getSignup(Model model) { - model.addAttribute(USER_ATTRIBUTE, new UserSignupDto()); - return SIGNUP_VIEW; - } - - @PostMapping - public String signup( - @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserSignupDto user, - BindingResult bindingResult, - Model model) { - if (bindingResult.hasErrors()) { - return SIGNUP_VIEW; - } - if (!Objects.equals(user.getPassword(), user.getPasswordConfirm())) { - bindingResult.rejectValue("password", "signup:passwords", "Пароли не совпадают."); - model.addAttribute(USER_ATTRIBUTE, user); - return SIGNUP_VIEW; - } - userService.create(toEntity(user)); - return Constants.REDIRECT_VIEW + Constants.LOGIN_URL + "?signup"; - } - -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupDto.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupDto.java deleted file mode 100644 index 0e9abc8..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/api/UserSignupDto.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.example.demo.users.api; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; - -public class UserSignupDto { - @NotBlank - @Size(min = 3, max = 20) - private String login; - @NotBlank - @Size(min = 3, max = 20) - private String password; - @NotBlank - @Size(min = 3, max = 20) - private String passwordConfirm; - - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getPasswordConfirm() { - return passwordConfirm; - } - - public void setPasswordConfirm(String passwordConfirm) { - this.passwordConfirm = passwordConfirm; - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserEntity.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserEntity.java deleted file mode 100644 index 9815c97..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.example.demo.users.model; - -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; - -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.OneToMany; -import jakarta.persistence.OrderBy; -import jakarta.persistence.Table; - -import com.example.demo.core.model.BaseEntity; -import com.example.demo.orders.model.OrderEntity; - -@Entity -@Table(name = "users") -public class UserEntity extends BaseEntity { - @Column(nullable = false, unique = true, length = 20) - private String login; - @Column(nullable = false, length = 60) - private String password; - private UserRole role; - @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) - @OrderBy("id ASC") - private Set orders = new HashSet<>(); - - public UserEntity() { - } - - public UserEntity(String login, String password) { - this.login = login; - this.password = password; - this.role = UserRole.USER; - } - - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public UserRole getRole() { - return role; - } - - public void setRole(UserRole role) { - this.role = role; - } - - public Set getOrders() { - return orders; - } - - public void addOrder(OrderEntity order) { - if (order.getUser() != this) { - order.setUser(this); - } - orders.add(order); - } - - @Override - public int hashCode() { - return Objects.hash(id, login, password, role, orders); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - UserEntity other = (UserEntity) obj; - return Objects.equals(other.getId(), id) - && Objects.equals(other.getLogin(), login) - && Objects.equals(other.getPassword(), password) - && Objects.equals(other.getRole(), role) - && Objects.equals(other.getOrders(), orders); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserRole.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserRole.java deleted file mode 100644 index 00e8efa..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/model/UserRole.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.demo.users.model; - -import org.springframework.security.core.GrantedAuthority; - -public enum UserRole implements GrantedAuthority { - ADMIN, - USER; - - private static final String PREFIX = "ROLE_"; - - @Override - public String getAuthority() { - return PREFIX + this.name(); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/repository/UserRepository.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/repository/UserRepository.java deleted file mode 100644 index 9bf3cae..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/repository/UserRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo.users.repository; - -import java.util.Optional; - -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.PagingAndSortingRepository; - -import com.example.demo.users.model.UserEntity; - -public interface UserRepository - extends CrudRepository, PagingAndSortingRepository { - Optional findByLoginIgnoreCase(String login); -} diff --git a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/service/UserService.java b/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/service/UserService.java deleted file mode 100644 index eabb530..0000000 --- a/2 семестр/lab4-5/demo/src/main/java/com/example/demo/users/service/UserService.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.example.demo.users.service; - -import java.util.List; -import java.util.Optional; -import java.util.stream.StreamSupport; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -import com.example.demo.core.configuration.Constants; -import com.example.demo.core.error.NotFoundException; -import com.example.demo.core.security.UserPrincipal; -import com.example.demo.users.model.UserEntity; -import com.example.demo.users.model.UserRole; -import com.example.demo.users.repository.UserRepository; - -@Service -public class UserService implements UserDetailsService { - private final UserRepository repository; - private final PasswordEncoder passwordEncoder; - - public UserService( - UserRepository repository, - PasswordEncoder passwordEncoder) { - this.repository = repository; - this.passwordEncoder = passwordEncoder; - } - - - private void checkLogin(Long id, String login) { - final Optional existsUser = repository.findByLoginIgnoreCase(login); - if (existsUser.isPresent() && !existsUser.get().getId().equals(id)) { - throw new IllegalArgumentException( - String.format("User with login %s is already exists", login)); - } - } - - @Transactional(readOnly = true) - public List getAll() { - return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); - } - - @Transactional(readOnly = true) - public Page getAll(int page, int size) { - return repository.findAll(PageRequest.of(page, size, Sort.by("id"))); - } - - @Transactional(readOnly = true) - public UserEntity get(long id) { - return repository.findById(id) - .orElseThrow(() -> new NotFoundException(UserEntity.class, id)); - } - - @Transactional(readOnly = true) - public UserEntity getByLogin(String login) { - return repository.findByLoginIgnoreCase(login) - .orElseThrow(() -> new IllegalArgumentException("Invalid login")); - } - - @Transactional - public UserEntity create(UserEntity entity) { - if (entity == null) { - throw new IllegalArgumentException("Entity is null"); - } - checkLogin(null, entity.getLogin()); - final String password = Optional.ofNullable(entity.getPassword()).orElse(""); - entity.setPassword(passwordEncoder.encode( - StringUtils.hasText(password.strip()) ? password : Constants.DEFAULT_PASSWORD)); - entity.setRole(Optional.ofNullable(entity.getRole()).orElse(UserRole.USER)); - repository.save(entity); - return repository.save(entity); - } - - @Transactional - public UserEntity update(long id, UserEntity entity) { - final UserEntity existsEntity = get(id); - checkLogin(id, entity.getLogin()); - existsEntity.setLogin(entity.getLogin()); - repository.save(existsEntity); - return existsEntity; - } - - @Transactional - public UserEntity delete(long id) { - final UserEntity existsEntity = get(id); - repository.delete(existsEntity); - return existsEntity; - } - - @Override - @Transactional(readOnly = true) - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - final UserEntity existsUser = getByLogin(username); - return new UserPrincipal(existsUser); - } -} diff --git a/2 семестр/lab4-5/demo/src/main/resources/application.properties b/2 семестр/lab4-5/demo/src/main/resources/application.properties deleted file mode 100644 index 62ab433..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/application.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Server -spring.main.banner-mode=off -server.port=8080 - -# Logger settings -# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF -logging.level.com.example.demo=DEBUG - -# JPA Settings -spring.datasource.url=jdbc:h2:file:./data -spring.datasource.username=sa -spring.datasource.password=password -spring.datasource.driver-class-name=org.h2.Driver -spring.jpa.hibernate.ddl-auto=create -spring.jpa.open-in-view=false -# spring.jpa.show-sql=true -# spring.jpa.properties.hibernate.format_sql=true - -# H2 console -spring.h2.console.enabled=true \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/public/css/style.css b/2 семестр/lab4-5/demo/src/main/resources/public/css/style.css deleted file mode 100644 index 7423490..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/public/css/style.css +++ /dev/null @@ -1,67 +0,0 @@ -html, -body { - height: 100%; -} - -h1 { - font-size: 1.5em; -} - -h2 { - font-size: 1.25em; -} - -h3 { - font-size: 1.1em; -} - -td form { - margin: 0; - padding: 0; - margin-top: -.25em; -} - -.button-fixed-width { - width: 150px; -} - -.button-link { - padding: 0; -} - -.invalid-feedback { - display: block; -} - -.w-10 { - width: 10% !important; -} - -.my-navbar { - background-color: #3c3c3c !important; -} - -.my-navbar .link a:hover { - text-decoration: underline; -} - -.my-navbar .logo { - width: 26px; - height: 26px; -} - -.my-footer { - background-color: #2c2c2c; - height: 32px; - color: rgba(255, 255, 255, 0.5); -} - -.cart-image { - width: 3.1rem; - padding: 0.25rem; - border-radius: 0.5rem; -} - -.cart-item { - height: auto; -} \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/public/favicon.svg b/2 семестр/lab4-5/demo/src/main/resources/public/favicon.svg deleted file mode 100644 index 7e1bd9a..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/public/favicon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/default.html b/2 семестр/lab4-5/demo/src/main/resources/templates/default.html deleted file mode 100644 index 786bb59..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/default.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - My shop - - - - - - - - -
-
-
- Автор, [[${#dates.year(#dates.createNow())}]] -
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/error.html b/2 семестр/lab4-5/demo/src/main/resources/templates/error.html deleted file mode 100644 index faa6b0a..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/error.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Ошибка - - - -
-
    - -
  • - Неизвестная ошибка -
    • -     - -
  • - Ошибка: [[${message}]] -
    • -     - -
  • - Адрес: [[${url}]] -
    • -
  • - Класс исключения: [[${exception}]] -
    • -
  • - [[${method}]] ([[${file}]]:[[${line}]]) -
    • -     -
- На главную -
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/index.html b/2 семестр/lab4-5/demo/src/main/resources/templates/index.html deleted file mode 100644 index 76887d9..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Продукты - - - -
- -
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/login.html b/2 семестр/lab4-5/demo/src/main/resources/templates/login.html deleted file mode 100644 index eb3a6d7..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/login.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - Вход - - - -
-
-
- Неверный логин или пароль -
-
- Выход успешно произведен -
-
- Пользователь успешно создан -
-
- - -
-
- - -
-
- - -
-
- - Регистрация -
-
-
- - - - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/pagination.html b/2 семестр/lab4-5/demo/src/main/resources/templates/pagination.html deleted file mode 100644 index b11664a..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/pagination.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/product-edit.html b/2 семестр/lab4-5/demo/src/main/resources/templates/product-edit.html deleted file mode 100644 index 638225c..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/product-edit.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - Редакторовать продукт - - - -
-
-
- - -
-
- - -
-
-
- - -
-
-
- - -
-
-
- - -
-
-
- - -
-
-
- - Отмена -
-
-
- - - \ No newline at end of file diff --git a/2 семестр/lab4-5/demo/src/main/resources/templates/product.html b/2 семестр/lab4-5/demo/src/main/resources/templates/product.html deleted file mode 100644 index efc66c7..0000000 --- a/2 семестр/lab4-5/demo/src/main/resources/templates/product.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Продукты - - - -
- -

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

- -

Продукты

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

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

- -

[[${title}]]

- -
-
-
-
-

-
-

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

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

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

- -

Типы заказов

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

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

- -

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

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