лаб4-5сем2

This commit is contained in:
AnnaLioness 2024-06-13 00:29:41 +04:00
parent 2004ffefe0
commit febd8d270e
80 changed files with 6716 additions and 0 deletions

View File

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

View File

@ -0,0 +1,4 @@
{
"java.dependency.packagePresentation": "hierarchical",
"java.configuration.updateBuildConfiguration": "interactive"
}

Binary file not shown.

View File

@ -0,0 +1,37 @@
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/

View File

@ -0,0 +1,39 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.2.4'
id 'io.spring.dependency-management' version '1.1.4'
}
group = 'com.example'
version = '0.0.1-SNAPSHOT'
java {
sourceCompatibility = '17'
}
repositories {
mavenCentral()
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
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-starter-thymeleaf'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0'
runtimeOnly 'org.webjars.npm:bootstrap:5.3.3'
runtimeOnly 'org.webjars.npm:bootstrap-icons:1.11.3'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}
tasks.named('test') {
useJUnitPlatform()
}

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

@ -0,0 +1,50 @@
package com.example.demo;
import java.util.Objects;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import com.example.demo.sizes.model.SizeEntity;
import com.example.demo.sizes.service.SizeService;
import com.example.demo.types.model.TypeEntity;
import com.example.demo.types.service.TypeService;
import com.example.demo.users.model.UserEntity;
import com.example.demo.users.model.UserRole;
import com.example.demo.users.service.UserService;
@SpringBootApplication
public class DemoApplication {
private final TypeService typeService;
private final SizeService sizeService;
private final UserService userService;
public DemoApplication(TypeService typeService, SizeService sizeService, UserService userService){
this.typeService = typeService;
this.sizeService = sizeService;
this.userService = userService;
}
public static void main(String[] args) {
SpringApplication.run(DemoApplication.class, args);
}
public void run(String... args) throws Exception {
if (args.length > 0 && Objects.equals("--populate", args[0])) {
typeService.create(new TypeEntity(null, "Плаье вечернее пышное"));
typeService.create(new TypeEntity(null, "Плаье вечернее русалка"));
typeService.create(new TypeEntity(null, "Плаье вечернее ампир"));
typeService.create(new TypeEntity(null, "Плаье вечернее прямое"));
typeService.create(new TypeEntity(null, "Плаье вечернее принцесса"));
sizeService.create(new SizeEntity(null, "38-40"));
sizeService.create(new SizeEntity(null, "40-42"));
sizeService.create(new SizeEntity(null, "42-44"));
sizeService.create(new SizeEntity(null, "44-46"));
sizeService.create(new SizeEntity(null, "собственные мерки"));
final var admin = new UserEntity(null,"admin", "admin");
admin.setRole(UserRole.ADMIN);
userService.create(admin);
final var user1 = new UserEntity(null, "login", "password");
user1.setRole(UserRole.USER);
userService.create(user1);
}
}
}

View File

@ -0,0 +1,28 @@
package com.example.demo.core.api;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ModelAttribute;
import com.example.demo.core.session.SessionCart;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
@ControllerAdvice
public class GlobalController {
private final SessionCart cart;
public GlobalController(SessionCart cart) {
this.cart = cart;
}
@ModelAttribute("servletPath")
String getRequestServletPath(HttpServletRequest request) {
return request.getServletPath();
}
@ModelAttribute("totalCart")
double getTotalCart(HttpSession session) {
return cart.getSum();
}
}

View File

@ -0,0 +1,18 @@
package com.example.demo.core.api;
import java.util.Map;
import java.util.function.Function;
import org.springframework.data.domain.Page;
public class PageAttributesMapper {
private PageAttributesMapper() {
}
public static <E, D> Map<String, Object> toAttributes(Page<E> page, Function<E, D> mapper) {
return Map.of(
"items", page.getContent().stream().map(mapper::apply).toList(),
"currentPage", page.getNumber(),
"totalPages", page.getTotalPages());
}
}

View File

@ -0,0 +1,97 @@
package com.example.demo.core.api;
import java.util.ArrayList;
import java.util.List;
public class PageDto<D> {
private List<D> items = new ArrayList<>();
private int itemsCount;
private int currentPage;
private int currentSize;
private int totalPages;
private long totalItems;
private boolean isFirst;
private boolean isLast;
private boolean hasNext;
private boolean hasPrevious;
public List<D> getItems() {
return items;
}
public void setItems(List<D> items) {
this.items = items;
}
public int getItemsCount() {
return itemsCount;
}
public void setItemsCount(int itemsCount) {
this.itemsCount = itemsCount;
}
public int getCurrentPage() {
return currentPage;
}
public void setCurrentPage(int currentPage) {
this.currentPage = currentPage;
}
public int getCurrentSize() {
return currentSize;
}
public void setCurrentSize(int currentSize) {
this.currentSize = currentSize;
}
public int getTotalPages() {
return totalPages;
}
public void setTotalPages(int totalPages) {
this.totalPages = totalPages;
}
public long getTotalItems() {
return totalItems;
}
public void setTotalItems(long totalItems) {
this.totalItems = totalItems;
}
public boolean isFirst() {
return isFirst;
}
public void setFirst(boolean isFirst) {
this.isFirst = isFirst;
}
public boolean isLast() {
return isLast;
}
public void setLast(boolean isLast) {
this.isLast = isLast;
}
public boolean isHasNext() {
return hasNext;
}
public void setHasNext(boolean hasNext) {
this.hasNext = hasNext;
}
public boolean isHasPrevious() {
return hasPrevious;
}
public void setHasPrevious(boolean hasPrevious) {
this.hasPrevious = hasPrevious;
}
}

View File

@ -0,0 +1,25 @@
package com.example.demo.core.api;
import java.util.function.Function;
import org.springframework.data.domain.Page;
public class PageDtoMapper {
private PageDtoMapper() {
}
public static <D, E> PageDto<D> toDto(Page<E> page, Function<E, D> mapper) {
final PageDto<D> dto = new PageDto<>();
dto.setItems(page.getContent().stream().map(mapper::apply).toList());
dto.setItemsCount(page.getNumberOfElements());
dto.setCurrentPage(page.getNumber());
dto.setCurrentSize(page.getSize());
dto.setTotalPages(page.getTotalPages());
dto.setTotalItems(page.getTotalElements());
dto.setFirst(page.isFirst());
dto.setLast(page.isLast());
dto.setHasNext(page.hasNext());
dto.setHasPrevious(page.hasPrevious());
return dto;
}
}

View File

@ -0,0 +1,13 @@
package com.example.demo.core.configuration;
public class Constants {
public static final String SEQUENCE_NAME = "hibernate_sequence";
public static final String API_URL = "/api/1.0";
public static final String DEFAULT_PAGE_SIZE = "5";
public static final String REDIRECT_VIEW = "redirect:";
public static final String LOGIN_URL = "/login";
public static final String LOGOUT_URL = "/logout";
public static final String ADMIN_PREFIX = "/admin";
private Constants() {
}
}

View File

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

View File

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

View File

@ -0,0 +1,53 @@
package com.example.demo.core.error;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.servlet.ModelAndView;
import jakarta.servlet.http.HttpServletRequest;
@ControllerAdvice
public class AdviceController {
private final Logger log = LoggerFactory.getLogger(AdviceController.class);
private static Throwable getRootCause(Throwable throwable) {
Throwable rootCause = throwable;
while (rootCause.getCause() != null && rootCause.getCause() != rootCause) {
rootCause = rootCause.getCause();
}
return rootCause;
}
private static Map<String, Object> getAttributes(HttpServletRequest request, Throwable throwable) {
final Throwable rootCause = getRootCause(throwable);
final StackTraceElement firstError = rootCause.getStackTrace()[0];
return Map.of(
"message", rootCause.getMessage(),
"url", request.getRequestURL(),
"exception", rootCause.getClass().getName(),
"file", firstError.getFileName(),
"method", firstError.getMethodName(),
"line", firstError.getLineNumber());
}
@ExceptionHandler(value = Exception.class)
public ModelAndView defaultErrorHandler(HttpServletRequest request, Throwable throwable) throws Throwable {
if (AnnotationUtils.findAnnotation(throwable.getClass(),
ResponseStatus.class) != null) {
throw throwable;
}
log.error("{}", throwable.getMessage());
throwable.printStackTrace();
final ModelAndView model = new ModelAndView();
model.addAllObjects(getAttributes(request, throwable));
model.setViewName("error");
return model;
}
}

View File

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

View File

@ -0,0 +1,31 @@
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() {
}
protected BaseEntity(Long id) {
this.id = id;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
}

View File

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

View File

@ -0,0 +1,64 @@
package com.example.demo.core.security;
import java.util.Collection;
import java.util.Set;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import com.example.demo.users.model.UserEntity;
public class UserPrincipal implements UserDetails {
private final long id;
private final String username;
private final String password;
private final Set<? extends GrantedAuthority> roles;
private final boolean active;
public UserPrincipal(UserEntity user) {
this.id = user.getId();
this.username = user.getLogin();
this.password = user.getPassword();
this.roles = Set.of(user.getRole());
this.active = true;
}
public Long getId() {
return id;
}
@Override
public String getUsername() {
return username;
}
@Override
public String getPassword() {
return password;
}
@Override
public Collection<? extends GrantedAuthority> getAuthorities() {
return roles;
}
@Override
public boolean isEnabled() {
return active;
}
@Override
public boolean isAccountNonExpired() {
return isEnabled();
}
@Override
public boolean isAccountNonLocked() {
return isEnabled();
}
@Override
public boolean isCredentialsNonExpired() {
return isEnabled();
}
}

View File

@ -0,0 +1,14 @@
package com.example.demo.core.session;
import java.util.HashMap;
import com.example.demo.orders.api.OrderCartDto;
public class SessionCart extends HashMap<Integer, OrderCartDto> {
public double getSum() {
return this.values().stream()
.map(item -> item.getCount() * item.getItemPrice())
.mapToDouble(Double::doubleValue)
.sum();
}
}

View File

@ -0,0 +1,16 @@
package com.example.demo.core.session;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.web.context.WebApplicationContext;
@Configuration
public class SessionHelper {
@Bean
@Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS)
SessionCart todos() {
return new SessionCart();
}
}

View File

@ -0,0 +1,19 @@
package com.example.demo.core.utils;
import java.util.Date;
import java.text.ParseException;
import java.text.SimpleDateFormat;
public final class Formatter {
private Formatter(){
}
private static final SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd");
public static String format(Date date) {
return dateFormatter.format(date);
}
public static Date parse(String date) throws ParseException {
return dateFormatter.parse(date);
}
}

View File

@ -0,0 +1,116 @@
package com.example.demo.items.api;
import java.text.ParseException;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
//import org.hibernate.mapping.Map;
import org.modelmapper.ModelMapper;
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.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.support.SessionStatus;
import org.springframework.web.bind.annotation.RequestMapping;
import com.example.demo.core.configuration.Constants;
import com.example.demo.core.session.SessionCart;
import com.example.demo.core.utils.Formatter;
import com.example.demo.items.model.ItemEntity;
import com.example.demo.items.service.ItemService;
import com.example.demo.orders.api.OrderCartDto;
import com.example.demo.orders.api.OrderDto;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.orders.service.OrderService;
import com.example.demo.sizes.service.SizeService;
import com.example.demo.types.model.TypeEntity;
import com.example.demo.types.service.TypeService;
import jakarta.validation.Valid;
@RestController
@RequestMapping(Constants.API_URL + "/catalog")
public class ItemCatalogController {
private final ItemService itemService;
private final TypeService typeService;
private final SizeService sizeService;
private final OrderService orderService;
private final SessionCart cart;
private final ModelMapper modelMapper;
private static final String ITEM_VIEW = "catalog";
private static final String ORDER_ATTRIBUTE = "order";
private static final String URL = "/cart";
public ItemCatalogController(ItemService itemService, TypeService typeService, SizeService sizeService, OrderService orderService,SessionCart cart, ModelMapper modelMapper) {
this.itemService = itemService;
this.typeService = typeService;
this.sizeService = sizeService;
this.orderService= orderService;
this.cart=cart;
this.modelMapper = modelMapper;
}
private ItemDto toDto(ItemEntity entity) {
return modelMapper.map(entity, ItemDto.class);
}
private OrderEntity toEntity(OrderDto dto) throws ParseException {
final OrderEntity entity = modelMapper.map(dto, OrderEntity.class);
entity.setItem(itemService.get(dto.getItemId()));
entity.setDate(Formatter.parse(dto.getDate()));
return entity;
}
private List<OrderEntity> toOrderEntities(Collection<OrderCartDto> dtos){
final Set<Long> itemIds = dtos.stream()
.map(OrderCartDto::getItemId)
.collect(Collectors.toSet());
final Map<Long, ItemEntity> items = itemService.getByIds(itemIds).stream()
.collect(Collectors.toMap(ItemEntity::getId, Function.identity()));
return dtos.stream()
.map(dto -> {
final OrderEntity entity = modelMapper.map(dto, OrderEntity.class);
entity.setItem(items.get(dto.getItemId()));
return entity;
})
.toList();
}
@GetMapping
public String getAll(Model model) {
model.addAttribute(
"items",
itemService.getAll().stream()
.map(this::toDto)
.toList());
return ITEM_VIEW;
}
@PostMapping
public String addOrderToCart(
@ModelAttribute(name = ORDER_ATTRIBUTE) @Valid OrderCartDto order,
BindingResult bindingResult,
SessionStatus status,
Model model) {
if (bindingResult.hasErrors()) {
return ITEM_VIEW;
}
status.setComplete();
order.setItemName(itemService.get(order.getItemId()).getNameItem());
order.setItemPrice(itemService.get(order.getItemId()).getPrice());
order.setItemSizeValue(itemService.get(order.getItemId()).getSize().getSize());
cart.computeIfPresent(order.hashCode(), (key, value) -> {
value.setCount(value.getCount() + order.getCount());
return value;
});
cart.putIfAbsent(order.hashCode(), order);
return Constants.REDIRECT_VIEW + URL;
}
}

View File

@ -0,0 +1,121 @@
package com.example.demo.items.api;
import org.modelmapper.ModelMapper;
import org.springframework.web.bind.annotation.DeleteMapping;
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.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 org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
import com.example.demo.core.api.PageDto;
import com.example.demo.core.api.PageDtoMapper;
import com.example.demo.core.configuration.Constants;
import com.example.demo.items.model.ItemEntity;
import com.example.demo.items.service.ItemService;
import com.example.demo.types.api.TypeDto;
import com.example.demo.types.service.TypeService;
import com.example.demo.sizes.service.SizeService;
import jakarta.validation.Valid;
@RestController
@RequestMapping(Constants.API_URL + "/item")
public class ItemController {
private final ItemService itemService;
private final TypeService typeService;
private final SizeService sizeService;
private final ModelMapper modelMapper;
public static final String URL = Constants.ADMIN_PREFIX + "/item";
private static final String ITEM_VIEW = "item";
private static final String ITEM_EDIT_VIEW = "item-edit";
private static final String ITEM_ATTRIBUTE = "item";
public ItemController(ItemService itemService, TypeService typeService, SizeService sizeService, ModelMapper modelMapper) {
this.itemService = itemService;
this.typeService = typeService;
this.sizeService = sizeService;
this.modelMapper = modelMapper;
}
private ItemDto toDto(ItemEntity entity) {
return modelMapper.map(entity, ItemDto.class);
}
private ItemEntity toEntity(ItemDto dto) {
final ItemEntity entity = modelMapper.map(dto, ItemEntity.class);
entity.setType(typeService.get(dto.getTypeId()));
entity.setSize(sizeService.get(dto.getSizeId()));
return entity;
}
@GetMapping
public String getAll(Model model) {
model.addAttribute(
"items",
itemService.getAll().stream()
.map(this::toDto)
.toList());
return ITEM_VIEW;
}
@GetMapping("/edit/")
public String create(Model model) {
model.addAttribute(ITEM_ATTRIBUTE, new ItemDto());
return ITEM_EDIT_VIEW;
}
@PostMapping("/edit/")
public String create(
@ModelAttribute(name = ITEM_ATTRIBUTE) @Valid ItemDto item,
BindingResult bindingResult,
Model model) {
if (bindingResult.hasErrors()) {
return ITEM_EDIT_VIEW;
}
itemService.create(toEntity(item));
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(ITEM_ATTRIBUTE, toDto(itemService.get(id)));
return ITEM_EDIT_VIEW;
}
@PostMapping("/edit/{id}")
public String update(
@PathVariable(name = "id") Long id,
@ModelAttribute(name = ITEM_ATTRIBUTE) @Valid ItemDto item,
BindingResult bindingResult,
Model model) {
if (bindingResult.hasErrors()) {
return ITEM_EDIT_VIEW;
}
if (id <= 0) {
throw new IllegalArgumentException();
}
itemService.update(id, toEntity(item));
return Constants.REDIRECT_VIEW + URL;
}
@PostMapping("/delete/{id}")
public String delete(
@PathVariable(name = "id") Long id) {
itemService.delete(id);
return Constants.REDIRECT_VIEW + URL;
}
}

View File

@ -0,0 +1,87 @@
package com.example.demo.items.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
public class ItemDto {
private Long id;
@NotNull
@Min(1)
private Long typeId;
@NotNull
@Min(1)
private Long sizeId;
@NotNull
@Min(1)
private Double price;
@NotNull
private String nameItem;
@NotNull
private String image;
private String typeName;
private String sizeValue;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getTypeId() {
return typeId;
}
public void setTypeId(Long typeId) {
this.typeId = typeId;
}
public Long getSizeId() {
return sizeId;
}
public void setSizeId(Long sizeId) {
this.sizeId = sizeId;
}
public Double getPrice() {
return price;
}
public void setPrice(Double price) {
this.price = price;
}
public String getNameItem() {
return nameItem;
}
public void setNameItem(String nameItem) {
this.nameItem = nameItem;
}
public String getImage() {
return image;
}
public void setImage(String image) {
this.image = image;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public String getTypeName(){
return typeName;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public void setTypeName(String typeName){
this.typeName= typeName;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public String getSizeValue(){
return sizeValue;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public void setSizeValue(String sizeValue){
this.sizeValue= sizeValue;
}
}

View File

@ -0,0 +1,132 @@
package com.example.demo.items.model;
import java.util.Objects;
import com.example.demo.core.model.BaseEntity;
import com.example.demo.types.model.TypeEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import com.example.demo.sizes.model.SizeEntity;
@Entity
@Table(name = "items")
public class ItemEntity extends BaseEntity {
@ManyToOne
@JoinColumn(name = "typeId", nullable = false)
private TypeEntity type;
@ManyToOne
@JoinColumn(name = "sizeId")
private SizeEntity size;
@Column(nullable = false)
private Double price;
@Column(nullable = false)
private String nameItem;
@Column(nullable = false, length = 10000)
private String image;
public ItemEntity() {
super();
}
public ItemEntity(Long id, TypeEntity type, SizeEntity size, Double price, String nameItem, String image) {
super(id);
this.type = type;
this.size = size;
this.price = price;
this.nameItem = nameItem;
this.image = image;
}
public TypeEntity getType() {
return type;
}
public void setType(TypeEntity type) {
this.type = type;
}
public SizeEntity getSize() {
return size;
}
public void setSize(SizeEntity size) {
this.size = size;
}
public Double getPrice() {
return price;
}
public void setPrice(Double price) {
this.price = price;
}
public String getNameItem() {
return nameItem;
}
public void setNameItem(String nameItem) {
this.nameItem = nameItem;
}
public String getImage() {
return image;
}
public void setImage(String image) {
this.image = image;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((type == null) ? 0 : type.hashCode());
result = prime * result + ((size == null) ? 0 : size.hashCode());
result = prime * result + ((price == null) ? 0 : price.hashCode());
result = prime * result + ((nameItem == null) ? 0 : nameItem.hashCode());
result = prime * result + ((image == null) ? 0 : image.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
ItemEntity other = (ItemEntity) obj;
if (type == null) {
if (other.type != null)
return false;
} else if (!type.equals(other.type))
return false;
if (size == null) {
if (other.size != null)
return false;
} else if (!size.equals(other.size))
return false;
if (price == null) {
if (other.price != null)
return false;
} else if (!price.equals(other.price))
return false;
if (nameItem == null) {
if (other.nameItem != null)
return false;
} else if (!nameItem.equals(other.nameItem))
return false;
if (image == null) {
if (other.image != null)
return false;
} else if (!image.equals(other.image))
return false;
return true;
}
}

View File

@ -0,0 +1,18 @@
package com.example.demo.items.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.items.model.ItemEntity;
public interface ItemRepository extends CrudRepository<ItemEntity, Long>, PagingAndSortingRepository<ItemEntity, Long> {
//Optional<ItemEntity> findByNameItemIgnoreCase(String nameItem);
List<ItemEntity> findByTypeId(long typeId);
Page<ItemEntity> findByTypeId(long typeId, Pageable pageable);
}

View File

@ -0,0 +1,87 @@
package com.example.demo.items.service;
import java.util.List;
import java.util.stream.StreamSupport;
import java.util.Collection;
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.items.model.ItemEntity;
import com.example.demo.items.repository.ItemRepository;
import com.example.demo.types.model.TypeEntity;
@Service
public class ItemService {
private final ItemRepository repository;
public ItemService(ItemRepository repository) {
this.repository = repository;
}
/*@Transactional(readOnly = true)
public List<ItemEntity> getAll(Long typeId) {
if (typeId <= 0L) {
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
} else{
return repository.findByTypeId(typeId);
}
}*/
@Transactional(readOnly = true)
public List<ItemEntity> getAll() {
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
}
@Transactional(readOnly = true)
public Page<ItemEntity> getAll(Long typeId, int page, int size) {
final Pageable pageRequest = PageRequest.of(page, size);
if (typeId <= 0L) {
return repository.findAll(PageRequest.of(page, size));
} else{
return repository.findByTypeId(typeId, pageRequest);
}
}
@Transactional(readOnly = true)
public ItemEntity get(Long id) {
return repository.findById(id)
.orElseThrow(() -> new NotFoundException(ItemEntity.class, id));
}
@Transactional
public ItemEntity create(ItemEntity entity) {
if (entity == null) {
throw new IllegalArgumentException("Entity is null");
}
return repository.save(entity);
}
@Transactional
public ItemEntity update(Long id, ItemEntity entity) {
final ItemEntity existsEntity = get(id);
existsEntity.setType(entity.getType());
existsEntity.setSize(entity.getSize());
existsEntity.setPrice(entity.getPrice());
existsEntity.setNameItem(entity.getNameItem());
existsEntity.setImage(entity.getImage());
return repository.save(existsEntity);
}
@Transactional
public ItemEntity delete(Long id) {
final ItemEntity existsEntity = get(id);
repository.delete(existsEntity);
return existsEntity;
}
@Transactional(readOnly = true)
public List<ItemEntity> getByIds(Collection<Long> ids) {
final List<ItemEntity> items = StreamSupport.stream(repository.findAllById(ids).spliterator(), false).toList();
if (items.size() < ids.size()) {
throw new IllegalArgumentException("Invalid type");
}
return items;
}
}

View File

@ -0,0 +1,85 @@
package com.example.demo.orders.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
public class OrderCartDto {
@NotNull
@Min(1)
private Long itemId;
private Double itemPrice;
private String itemName;
private String itemSizeValue;
@NotNull
private Integer count;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Long getItemId() {
return itemId;
}
public void setItemId(Long itemId) {
this.itemId = itemId;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Double getItemPrice() {
return itemPrice;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public void setItemPrice(Double itemPrice) {
this.itemPrice = itemPrice;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public String getItemName() {
return itemName;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public void setItemName(String itemName) {
this.itemName = itemName;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public String getItemSizeValue() {
return itemSizeValue;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public void setItemSizeValue(String itemSizeValue) {
this.itemSizeValue = itemSizeValue;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((itemId == null) ? 0 : itemId.hashCode());
result = prime * result + ((count == null) ? 0 : count.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
OrderCartDto other = (OrderCartDto) obj;
if (itemId == null) {
if (other.itemId != null)
return false;
} else if (!itemId.equals(other.itemId))
return false;
if (count == null) {
if (other.count != null)
return false;
} else if (!count.equals(other.count))
return false;
return true;
}
}

View File

@ -0,0 +1,90 @@
package com.example.demo.orders.api;
import java.text.ParseException;
import org.modelmapper.ModelMapper;
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.api.PageDto;
import com.example.demo.core.api.PageDtoMapper;
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.items.service.ItemService;
import com.example.demo.core.utils.Formatter;
import jakarta.validation.Valid;
@RestController
@RequestMapping(Constants.API_URL + "/user/{user}/order")
public class OrderController {
private final OrderService orderService;
private final ItemService itemService;
private final ModelMapper modelMapper;
public OrderController(OrderService orderService, ItemService itemService, ModelMapper modelMapper) {
this.orderService = orderService;
this.itemService = itemService;
this.modelMapper = modelMapper;
}
private OrderDto toDto(OrderEntity entity) {
OrderDto dto = modelMapper.map(entity, OrderDto.class);
dto.setDate(Formatter.format(entity.getDate()));
return dto;
}
private OrderEntity toEntity(OrderDto dto) throws ParseException {
final OrderEntity entity = modelMapper.map(dto, OrderEntity.class);
entity.setItem(itemService.get(dto.getItemId()));
entity.setDate(Formatter.parse(dto.getDate()));
return entity;
}
@GetMapping
public PageDto<OrderDto> getAll(
@PathVariable(name = "user") Long userId,
@RequestParam(name = "itemId", defaultValue = "0") Long itemId,
@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)));
}
@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)));
}
@DeleteMapping("/{id}")
public OrderDto delete(
@PathVariable(name = "user") Long userId,
@PathVariable(name = "id") Long id) {
return toDto(orderService.delete(userId, id));
}
}

View File

@ -0,0 +1,59 @@
package com.example.demo.orders.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
public class OrderDto {
private Long id;
@NotNull
@Min(1)
private Long itemId;
private Double itemPrice;
@NotNull
private Integer count;
@NotNull
private String date;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getItemId() {
return itemId;
}
public void setItemId(Long typeId) {
this.itemId = typeId;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Double getItemPrice() {
return itemPrice;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public void setItemPrice(Double price) {
this.itemPrice = price;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
public String getDate(){
return date;
}
public void setDate(String date) {
this.date = date;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Double getSum() {
return itemPrice * count;
}
}

View File

@ -0,0 +1,111 @@
package com.example.demo.orders.model;
import java.util.Date;
import java.util.Objects;
import com.example.demo.core.model.BaseEntity;
import com.example.demo.items.model.ItemEntity;
import com.example.demo.users.model.UserEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table;
@Entity
@Table(name = "orders")
public class OrderEntity extends BaseEntity{
@ManyToOne
@JoinColumn(name = "itemId", nullable = false)
private ItemEntity item;
@ManyToOne
@JoinColumn(name = "userId", nullable = false)
private UserEntity user;
@Column(nullable = false, columnDefinition = "integer default 1")
private Integer count;
@Column(nullable = false, columnDefinition = "Date default current_date" )
private Date date;
public OrderEntity(){
super();
}
public OrderEntity(Long id, ItemEntity item,Integer count, Date date) {
super(id);
this.item = item;
this.count = count;
this.date = date;
}
public ItemEntity getItem() {
return item;
}
public void setItem(ItemEntity item) {
this.item = item;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
public Date getDate(){
return date;
}
public void setDate(Date date){
this.date = date;
}
public UserEntity getUser() {
return user;
}
public void setUser(UserEntity user) {
this.user = user;
if (!user.getOrders().contains(this)) {
user.getOrders().add(this);
}
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((item == null) ? 0 : item.hashCode());
result = prime * result + ((user == null) ? 0 : user.hashCode());
result = prime * result + ((count == null) ? 0 : count.hashCode());
result = prime * result + ((date == null) ? 0 : date.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
OrderEntity other = (OrderEntity) obj;
if (item == null) {
if (other.item != null)
return false;
} else if (!item.equals(other.item))
return false;
if (user == null) {
if (other.user != null)
return false;
} else if (!user.equals(other.user))
return false;
if (count == null) {
if (other.count != null)
return false;
} else if (!count.equals(other.count))
return false;
if (date == null) {
if (other.date != null)
return false;
} else if (!date.equals(other.date))
return false;
return true;
}
}

View File

@ -0,0 +1,25 @@
package com.example.demo.orders.repository;
import java.util.List;
import java.util.Optional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.data.repository.CrudRepository;
import com.example.demo.orders.model.OrderEntity;
public interface OrderRepository extends CrudRepository<OrderEntity, Long>, PagingAndSortingRepository<OrderEntity, Long> {
//Optional<OrderEntity> findById(long id);
List<OrderEntity> findByUserId(long userId);
Page<OrderEntity> findByUserId(long userId, Pageable pageable);
Optional<OrderEntity> findOneByUserIdAndId(long userId, long id);
@Modifying
@Query("DELETE FROM OrderEntity as OrEn "
+"WHERE OrEn.id = :id AND OrEn.user.id = :userId")
void deleteOrderByIdAndUserId(@Param("id") Long id, @Param("userId") Long userId);
}

View File

@ -0,0 +1,97 @@
package com.example.demo.orders.service;
import java.util.List;
import java.util.stream.StreamSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.orders.repository.OrderRepository;
import com.example.demo.users.model.UserEntity;
import com.example.demo.users.service.UserService;
@Service
public class OrderService {
private final OrderRepository repository;
private final UserService userService;
private final Logger log = LoggerFactory.getLogger(OrderService.class);
public OrderService(OrderRepository repository,UserService userService ) {
this.repository = repository;
this.userService=userService;
}
@Transactional(readOnly = true)
public List<OrderEntity> getAll(Long userId) {
if (userId <= 0L) {
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
} else{
return repository.findByUserId(userId);
}
}
@Transactional(readOnly = true)
public Page<OrderEntity> getAll(Long userId, int page, int size) {
final Pageable pageRequest = PageRequest.of(page, size);
if (userId <= 0L) {
return repository.findAll(PageRequest.of(page, size));
} else{
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) {
if (entity == null) {
throw new IllegalArgumentException("Entity is null");
}
final UserEntity existsUser = userService.get(userId);
entity.setUser(existsUser);
return repository.save(entity);
}
@Transactional
public OrderEntity update(long userId, long id, OrderEntity entity) {
userService.get(userId);
final OrderEntity existsEntity = get(userId, id);
existsEntity.setItem(entity.getItem());
existsEntity.setCount(entity.getCount());
existsEntity.setDate(entity.getDate());
return repository.save(existsEntity);
}
@Transactional
public OrderEntity delete(long userId, long id) {
userService.get(userId);
final OrderEntity existsEntity = get(userId, id);
log.debug(existsEntity.getId().toString());
repository.deleteOrderByIdAndUserId(id, userId);
return existsEntity;
}
@Transactional
public List<OrderEntity> createAll(long userId, List<OrderEntity> entities) {
if (entities == null || entities.isEmpty()) {
throw new IllegalArgumentException("Orders list is null or empty");
}
final UserEntity existsUser = userService.get(userId);
entities.forEach(entity -> entity.setUser(existsUser));
return StreamSupport.stream(repository.saveAll(entities).spliterator(), false).toList();
}
}

View File

@ -0,0 +1,75 @@
package com.example.demo.sizes.api;
import java.util.List;
import org.modelmapper.ModelMapper;
import org.springframework.ui.Model;
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.RestController;
import com.example.demo.core.configuration.Constants;
import com.example.demo.sizes.model.SizeEntity;
import com.example.demo.sizes.service.SizeService;
import jakarta.validation.Valid;
@RestController
@RequestMapping(Constants.API_URL + "/size")
public class SizeController {
private final SizeService sizeService;
private final ModelMapper modelMapper;
private static final String SIZE_VIEW = "size";
public SizeController(SizeService sizeService, ModelMapper modelMapper) {
this.sizeService = sizeService;
this.modelMapper = modelMapper;
}
private SizeDto toDto(SizeEntity entity) {
return modelMapper.map(entity, SizeDto.class);
}
private SizeEntity toEntity(SizeDto dto) {
return modelMapper.map(dto, SizeEntity.class);
}
/*@GetMapping
public String getAll(Model model) {
model.addAttribute(
"sizes",
sizeService.getAll().stream()
.map(this::toDto)
.toList());
return SIZE_VIEW;
}*/
/*@GetMapping
public List<SizeDto> getAll() {
return sizeService.getAll().stream().map(this::toDto).toList();
}
@GetMapping("/{id}")
public SizeDto get(@PathVariable(name = "id") Long id) {
return toDto(sizeService.get(id));
}
@PostMapping
public SizeDto create(@RequestBody @Valid SizeDto dto) {
return toDto(sizeService.create(toEntity(dto)));
}
@PutMapping("/{id}")
public SizeDto update(@PathVariable(name = "id") Long id, @RequestBody SizeDto dto) {
return toDto(sizeService.update(id, toEntity(dto)));
}
@DeleteMapping("/{id}")
public SizeDto delete(@PathVariable(name = "id") Long id) {
return toDto(sizeService.delete(id));
}*/
}

View File

@ -0,0 +1,27 @@
package com.example.demo.sizes.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
public class SizeDto {
private Long id;
@NotBlank
private String size;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getSize() {
return size;
}
public void setSize(String size) {
this.size = size;
}
}

View File

@ -0,0 +1,47 @@
package com.example.demo.sizes.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 = "sizes")
public class SizeEntity extends BaseEntity{
@Column(nullable = false, unique = true, length = 20)
private String size;
public SizeEntity() {
super();
}
public SizeEntity(Long id, String size) {
super(id);
this.size = size;
}
public String getSize() {
return size;
}
public void setSize(String size) {
this.size = size;
}
@Override
public int hashCode() {
return Objects.hash(id, size);
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null || getClass() != obj.getClass())
return false;
final SizeEntity other = (SizeEntity) obj;
return Objects.equals(other.getId(), id)
&& Objects.equals(other.getSize(), size);
}
}

View File

@ -0,0 +1,9 @@
package com.example.demo.sizes.repository;
import java.util.Optional;
import org.springframework.data.repository.CrudRepository;
import com.example.demo.sizes.model.SizeEntity;
public interface SizeRepository extends CrudRepository<SizeEntity, Long> {
Optional<SizeEntity> findBySizeIgnoreCase(String size);
}

View File

@ -0,0 +1,62 @@
package com.example.demo.sizes.service;
import java.util.List;
import java.util.stream.StreamSupport;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.sizes.model.SizeEntity;
import com.example.demo.sizes.repository.SizeRepository;
@Service
public class SizeService {
private final SizeRepository repository;
public SizeService(SizeRepository repository) {
this.repository = repository;
}
private void checkSize(String size) {
if (repository.findBySizeIgnoreCase(size).isPresent()) {
throw new IllegalArgumentException(
String.format("Size with value %s is already exists", size));
}
}
@Transactional(readOnly = true)
public List<SizeEntity> getAll() {
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
}
@Transactional(readOnly = true)
public SizeEntity get(Long id) {
return repository.findById(id)
.orElseThrow(() -> new NotFoundException(SizeEntity.class, id));
}
@Transactional
public SizeEntity create(SizeEntity entity) {
if (entity == null) {
throw new IllegalArgumentException("Entity is null");
}
checkSize(entity.getSize());
return repository.save(entity);
}
@Transactional
public SizeEntity update(Long id, SizeEntity entity) {
final SizeEntity existsEntity = get(id);
checkSize(entity.getSize());
existsEntity.setSize(entity.getSize());
return repository.save(existsEntity);
}
@Transactional
public SizeEntity delete(Long id) {
final SizeEntity existsEntity = get(id);
repository.delete(existsEntity);
return existsEntity;
}
}

View File

@ -0,0 +1,77 @@
package com.example.demo.types.api;
import java.util.List;
import org.modelmapper.ModelMapper;
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.RestController;
import org.springframework.ui.Model;
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;
@RestController
@RequestMapping(Constants.API_URL + "/type")
public class TypeController {
private final TypeService typeService;
private final ModelMapper modelMapper;
private static final String TYPE_VIEW = "type";
public TypeController(TypeService typeService, ModelMapper modelMapper) {
this.typeService = typeService;
this.modelMapper = modelMapper;
}
private TypeDto toDto(TypeEntity entity) {
return modelMapper.map(entity, TypeDto.class);
}
private TypeEntity toEntity(TypeDto dto) {
return modelMapper.map(dto, TypeEntity.class);
}
/*@GetMapping
public String getAll(Model model) {
model.addAttribute(
"types",
typeService.getAll().stream()
.map(this::toDto)
.toList());
return TYPE_VIEW;
}*/
/*@GetMapping("/{id}")
public String get(@PathVariable(name = "id") Long id) {
model.addAttribute(
"type",
toDto(typeService.get(id));)
return TYPE_VIEW;
}
@GetMapping("/{id}")
public TypeDto get(@PathVariable(name = "id") Long id) {
return toDto(typeService.get(id));
}
@PostMapping
public TypeDto create(@RequestBody @Valid TypeDto dto) {
return toDto(typeService.create(toEntity(dto)));
}
@PutMapping("/{id}")
public TypeDto update(@PathVariable(name = "id") Long id, @RequestBody TypeDto dto) {
return toDto(typeService.update(id, toEntity(dto)));
}
@DeleteMapping("/{id}")
public TypeDto delete(@PathVariable(name = "id") Long id) {
return toDto(typeService.delete(id));
}*/
}

View File

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

View File

@ -0,0 +1,49 @@
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 = 70)
private String name;
public TypeEntity() {
super();
}
public TypeEntity(Long id, String name) {
super(id);
this.name = name;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Override
public int hashCode() {
return Objects.hash(id, name);
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null || getClass() != obj.getClass())
return false;
final TypeEntity other = (TypeEntity) obj;
return Objects.equals(other.getId(), id)
&& Objects.equals(other.getName(), name);
}
}

View File

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

View File

@ -0,0 +1,62 @@
package com.example.demo.types.service;
import java.util.List;
import java.util.stream.StreamSupport;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.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<TypeEntity> getAll() {
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
}
@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);
checkName(entity.getName());
existsEntity.setName(entity.getName());
return repository.save(existsEntity);
}
@Transactional
public TypeEntity delete(Long id) {
final TypeEntity existsEntity = get(id);
repository.delete(existsEntity);
return existsEntity;
}
}

View File

@ -0,0 +1,127 @@
package com.example.demo.users.api;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.Objects;
import org.modelmapper.ModelMapper;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.SessionAttributes;
import org.springframework.web.bind.support.SessionStatus;
import com.example.demo.core.configuration.Constants;
import com.example.demo.core.session.SessionCart;
import com.example.demo.items.api.ItemDto;
import com.example.demo.items.model.ItemEntity;
import com.example.demo.items.service.ItemService;
import com.example.demo.orders.api.OrderCartDto;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.orders.service.OrderService;
import com.example.demo.types.api.TypeDto;
import com.example.demo.types.model.TypeEntity;
import com.example.demo.types.service.TypeService;
import com.example.demo.core.security.UserPrincipal;
@Controller
@RequestMapping(UserCartController.URL)
@SessionAttributes("items")
public class UserCartController {
public static final String URL = "/cart";
private static final String ORDER_VIEW = "cart";
private static final String ORDER_ATTRIBUTE = "order";
private static final String CART_ATTRIBUTE = "cart";
private final ItemService itemService;
private final OrderService orderService;
private final SessionCart cart;
private final ModelMapper modelMapper;
public UserCartController(
ItemService itemService,
OrderService orderService,
SessionCart cart,
ModelMapper modelMapper) {
this.itemService = itemService;
this.orderService = orderService;
this.cart = cart;
this.modelMapper = modelMapper;
}
private ItemDto toItemDto(ItemEntity entity) {
return modelMapper.map(entity, ItemDto.class);
}
private List<OrderEntity> toOrderEntities(Collection<OrderCartDto> dtos){
final Set<Long> itemIds = dtos.stream()
.map(OrderCartDto::getItemId)
.collect(Collectors.toSet());
final Map<Long, ItemEntity> items = itemService.getByIds(itemIds).stream()
.collect(Collectors.toMap(ItemEntity::getId, Function.identity()));
return dtos.stream()
.map(dto -> {
final OrderEntity entity = modelMapper.map(dto, OrderEntity.class);
entity.setItem(items.get(dto.getItemId()));
return entity;
})
.toList();
}
@GetMapping
public String getCart(Model model) {
model.addAttribute("items",
itemService.getAll().stream()
.map(this::toItemDto)
.toList());
model.addAttribute(ORDER_ATTRIBUTE, new OrderCartDto());
model.addAttribute(CART_ATTRIBUTE, cart.values());
return ORDER_VIEW;
}
@PostMapping("/save")
public String saveCart(
Model model,
@AuthenticationPrincipal UserPrincipal principal) {
orderService.createAll(principal.getId(), toOrderEntities(cart.values()));
cart.clear();
return Constants.REDIRECT_VIEW + URL;
}
@PostMapping("/clear")
public String clearCart() {
cart.clear();
return Constants.REDIRECT_VIEW + URL;
}
@PostMapping("/increase")
public String increaseCartCount(
@RequestParam(name = "item") Long item,
@RequestParam(name = "price") Double price) {
cart.computeIfPresent(Objects.hash(item, price), (key, value) -> {
value.setCount(value.getCount() + 1);
return value;
});
return Constants.REDIRECT_VIEW + URL;
}
@PostMapping("/decrease")
public String decreaseCartCount(
@RequestParam(name = "item") Long itemId,
@RequestParam(name = "price") Double price) {
cart.computeIfPresent(Objects.hash(itemId, price), (key, value) -> {
value.setCount(value.getCount() - 1);
return value;
});
final Map<Integer, OrderCartDto> filteredCart = cart.entrySet()
.stream()
.filter(item -> item.getValue().getCount() > 0)
.collect(Collectors.toMap(Entry::getKey, Entry::getValue));
cart.clear();
cart.putAll(filteredCart);
return Constants.REDIRECT_VIEW + URL;
}
}

View File

@ -0,0 +1,85 @@
package com.example.demo.users.api;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.modelmapper.ModelMapper;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.DeleteMapping;
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.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 org.springframework.web.servlet.mvc.support.RedirectAttributes;
import org.springframework.ui.Model;
import java.util.Objects;
import com.example.demo.core.api.PageDto;
import com.example.demo.core.api.PageDtoMapper;
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;
@RestController
@RequestMapping(Constants.API_URL + "/user")
public class UserController {
private final Logger log = LoggerFactory.getLogger(UserController.class);
private final UserService userService;
private final ModelMapper modelMapper;
public static final String URL = "/signup";
private static final String SIGNUP_VIEW = "signup";
private static final String USER_ATTRIBUTE = "user";
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(UserSignupDto dto) {
log.debug(dto.getLogin());
var entity = modelMapper.map(dto, UserEntity.class);
log.debug(entity.getLogin());
return entity;
}
@GetMapping
public String getSignup(Model model) {
model.addAttribute(USER_ATTRIBUTE, new UserSignupDto());
return SIGNUP_VIEW;
}
@PostMapping
public String signup(
@ModelAttribute(name = USER_ATTRIBUTE) @Valid UserSignupDto user,
BindingResult bindingResult,
Model model) {
if (bindingResult.hasErrors()) {
return SIGNUP_VIEW;
}
if (!Objects.equals(user.getPassword(), user.getPasswordConfirm())) {
bindingResult.rejectValue("password", "signup:passwords", "Пароли не совпадают.");
model.addAttribute(USER_ATTRIBUTE, user);
return SIGNUP_VIEW;
}
userService.create(toEntity(user));
return Constants.REDIRECT_VIEW + Constants.LOGIN_URL + "?signup";
}
}

View File

@ -0,0 +1,42 @@
package com.example.demo.users.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
public class UserDto {
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Long id;
@NotBlank
@Size(min = 3, max = 20)
private String login;
@NotBlank
@Size(min = 5, max = 20)
private String password;
public Long getId() {
return id;
}
public String getLogin() {
return login;
}
public String getPassword() {
return password;
}
public void setId(Long id) {
this.id = id;
}
public void setLogin(String login) {
this.login = login;
}
public void setPassword(String password) {
this.password = password;
}
}

View File

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

View File

@ -0,0 +1,51 @@
package com.example.demo.users.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
public class UserSignupDto {
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Long id;
@NotBlank
@Size(min = 3, max = 20)
private String login;
@NotBlank
@Size(min = 5, max = 20)
private String password;
@NotBlank
@Size(min = 5, max = 20)
private String passwordConfirm;
public Long getId() {
return id;
}
public String getLogin() {
return login;
}
public String getPassword() {
return password;
}
public void setId(Long id) {
this.id = id;
}
public void setLogin(String login) {
this.login = login;
}
public void setPassword(String password) {
this.password = password;
}
public String getPasswordConfirm() {
return passwordConfirm;
}
public void setPasswordConfirm(String passwordConfirm) {
this.passwordConfirm = passwordConfirm;
}
}

View File

@ -0,0 +1,114 @@
package com.example.demo.users.model;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import com.example.demo.core.model.BaseEntity;
import com.example.demo.orders.model.OrderEntity;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OrderBy;
import jakarta.persistence.Table;
@Entity
@Table(name = "users")
public class UserEntity extends BaseEntity{
@Column(nullable = false, unique = true, length = 20)
private String login;
@Column(nullable = false, unique = true, length = 20)
private String password;
private UserRole role;
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
@OrderBy("id ASC")
private Set<OrderEntity> orders = new HashSet<OrderEntity>();
public UserEntity() {
super();
}
public UserEntity(Long id, String login, String password) {
super(id);
this.login = login;
this.password=password;
this.role = UserRole.USER;
}
public UserRole getRole() {
return role;
}
public void setRole(UserRole role) {
this.role = role;
}
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 Set<OrderEntity> getOrders() {
return orders;
}
public void addOrder(OrderEntity order) {
if (order.getUser() != this) {
order.setUser(this);
}
orders.add(order);
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((login == null) ? 0 : login.hashCode());
result = prime * result + ((password == null) ? 0 : password.hashCode());
result = prime * result + ((role == null) ? 0 : role.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
UserEntity other = (UserEntity) obj;
if (login == null) {
if (other.login != null)
return false;
} else if (!login.equals(other.login))
return false;
if (password == null) {
if (other.password != null)
return false;
} else if (!password.equals(other.password))
return false;
if (role != other.role)
return false;
return true;
}
}

View File

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

View File

@ -0,0 +1,12 @@
package com.example.demo.users.repository;
import java.util.Optional;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.example.demo.users.model.UserEntity;
public interface UserRepository extends CrudRepository<UserEntity, Long>, PagingAndSortingRepository<UserEntity, Long>{
Optional<UserEntity> findByLoginIgnoreCase(String login);
}

View File

@ -0,0 +1,88 @@
package com.example.demo.users.service;
import java.util.List;
import java.util.Objects;
import java.util.stream.StreamSupport;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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.repository.UserRepository;
@Service
public class UserService implements UserDetailsService{
private final UserRepository repository;
public UserService(
UserRepository repository) {
this.repository = repository;
}
private void checkLogin(String login) {
if (repository.findByLoginIgnoreCase(login).isPresent()) {
throw new IllegalArgumentException(
String.format("User with login %s is already exists", login));
}
}
@Transactional(readOnly = true)
public List<UserEntity> getAll() {
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
}
@Transactional(readOnly = true)
public Page<UserEntity> getAll(int page, int size) {
return repository.findAll(PageRequest.of(page, size));
}
@Transactional(readOnly = true)
public UserEntity get(long id) {
return repository.findById(id)
.orElseThrow(() -> new NotFoundException(UserEntity.class, id));
}
@Transactional
public UserEntity create(UserEntity entity) {
if (entity == null) {
throw new IllegalArgumentException("Entity is null");
}
checkLogin(entity.getLogin());
return repository.save(entity);
}
@Transactional
public UserEntity update(long id, UserEntity entity) {
final UserEntity existsEntity = get(id);
checkLogin(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);
}
@Transactional(readOnly = true)
public UserEntity getByLogin(String login) {
return repository.findByLoginIgnoreCase(login)
.orElseThrow(() -> new IllegalArgumentException("Invalid login"));
}
}

View File

@ -0,0 +1,21 @@
# 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=TRACE
# 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.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

View File

@ -0,0 +1,43 @@
body{
background-image: url(demo/src/main/resources/public/фон.jpg);
}
@font-face{
font-family: 'cursive';
src: url("demo/src/main/resources/public/monotypecorsiva.ttf");
}
*{
font-family: 'cursive';
}
header nav {
background-color: #5C00A4;
}
img{
width: 94px;
height: 74px;
}
@media (min-width: 768px) {
header nav {
height: 100px;
}
}
header nav a:hover {
text-decoration: underline;
font-size: large;
}
footer {
background-color: #5C00A4;
height: 32px;
color: #ffffff;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 673 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

View File

@ -0,0 +1,63 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Корзина</title>
</head>
<body>
<main layout:fragment="content">
<div class="d-flex flex-column align-items-center">
<div class="mb-2 col-12 col-md-8 col-lg-6 d-flex align-items-center">
<strong class="flex-fill">Корзина</strong>
<form action="#" th:action="@{/cart/clear}" method="post">
<button type="submit" class="btn btn-danger button-fixed-width"
onclick="return confirm('Вы уверены?')">
<i class="bi bi-x-lg"></i> Очистить
</button>
</form>
</div>
<div class="card col-12 col-md-8 col-lg-6 align-items-center" th:each="cartItem : ${cart}">
<div class="card-body col-12 p-2 d-flex flex-row align-items-center justify-content-center">
<div class="col-9">
[[${cartItem.nameItem}]] [[${#numbers.formatDecimal(cartItem.price, 1, 2)}]] *
[[${cartItem.count}]]
=
[[${#numbers.formatDecimal(cartItem.price * cartItem.count, 1, 2)}]]
</div>
<div class="col-3 d-flex justify-content-end">
<form action="#"
th:action="@{/cart/increase?item={item}&price={price}(item=${cartItem.item},price=${cartItem.price})}"
method="post">
<button type="submit" class="btn btn-primary">
<i class="bi bi-plus-lg"></i>
</button>
</form>
<form action="#"
th:action="@{/cart/decrease?item={item}&price={price}(item=${cartItem.item},price=${cartItem.price})}"
method="post">
<button class="btn btn-danger">
<i class="bi bi-dash-lg"></i>
</button>
</form>
</div>
</div>
</div>
<div class=" mb-2 col-12 col-md-8 col-lg-6 d-flex justify-content-end">
<strong>Итого: [[${#numbers.formatDecimal(totalCart, 1, 2)}]] &#8381;</strong>
</div>
<div class="mb-2 col-12 col-md-8 col-lg-6 d-flex justify-content-center"
th:if="${not #lists.isEmpty(cart)}">
<form action="#" th:action="@{/cart/save}" method="post">
<button type="submit" class="btn btn-primary" onclick="return confirm('Вы уверены?')">
Оформить заказ
</button>
</form>
</div>
</div>
</main>
</body>
</html>
</html>

View File

@ -0,0 +1,66 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Каталог</title>
</head>
<body>
<main layout:fragment="content">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<h2>Товары</h2>
<form th:action="@{/}" method="get" class="row mt-2">
<div class="col-sm-10">
<input type="hidden" th:name="page" th:value="${page}">
<select th:name="typeId" id="typeId" class="form-select">
<option selected value="">Фильтр по типу товара</option>
<option th:each="type : ${types}" th:value="${item.typeId}" th:selected="${type.id==typeId}">
[[${type.name}]]
</option>
</select>
<select th:name="sizeId" id="sizeId" class="form-select">
<option selected value="">Фильтр по размеру товара</option>
<option th:each="size : ${sizes}" th:value="${item.sizeId}" th:selected="${size.id==sizeId}">
[[${size.size}]]
</option>
</select>
</div>
<button type="submit" class="btn btn-primary col-sm-2">Показать</button>
</form>
<div class="col-8">
<div class="row row-cols-1 row-cols-md-3 g-4">
<div class="col">
<div class="card h-100" th:each="catalogItem : ${items}"style="color: white; background-color: #1C7AAF; text-decoration: underline;">
<img src="public/logo.png" class="cards card-img-top img-fluid" alt="...">
<div class="card-body">
<div class="row">
[[${cartItem.nameItem}]]
</div>
<div class="row">
<p class="card-text">цена: [[${#numbers.formatDecimal(cartItem.price, 1, 2)}]]</p>
<div class="justify-content-end">
<form action="#"
th:action="@{/catalog}" th:object="${order}" method="post">
<button type="submit" class="btn btn-primary">
В корзину
</button>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</th:block>
<th:block th:replace="~{ pagination :: pagination (
url=${'admin/user'},
totalPages=${totalPages},
currentPage=${currentPage}) }" />
</th:block>
</main>
</body>
</html>

View File

@ -0,0 +1,61 @@
<!DOCTYPE html>
<html lang="ru" xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity6">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/png" href="/logo.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">My shop</title>
<script type="text/javascript" src="/webjars/bootstrap/5.3.3/dist/js/bootstrap.bundle.min.js"></script>
<link rel="stylesheet" href="/webjars/bootstrap/5.3.3/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="/webjars/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" />
<link rel="stylesheet" href="/css/style.css" />
</head>
<body class="h-100 d-flex flex-column">
<nav class="navbar navbar-expand-md my-navbar" data-bs-theme="dark">
<div class="container-fluid">
<a class="navbar-brand" href="/">
<i class="bi bi-cart2 d-inline-block align-top me-1 logo"></i>
MyShop
</a>
<th:block sec:authorize="isAuthenticated()" th:with="userName=${#authentication.name}">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#main-navbar"
aria-controls="main-navbar" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="main-navbar">
<ul class="navbar-nav me-auto link" th:with="activeLink=${#objects.nullSafe(servletPath, '')}">
<th:block sec:authorize="hasRole('ADMIN')">
<a class="nav-link" href="/admin/type"
th:classappend="${activeLink.startsWith('/admin/type') ? 'active' : ''}">
Работа с товарами
</a>
<a class="nav-link" href="/h2-console/" target="_blank">Консоль H2</a>
</th:block>
<a class="nav-link" href="/catalog">Каталог</a>
</ul>
<ul class="navbar-nav" th:if="${not #strings.isEmpty(userName)}">
<form th:action="@{/logout}" method="post">
<button type="submit" class="navbar-brand nav-link" onclick="return confirm('Вы уверены?')">
Выход ([[${userName}]])
</button>
</form>
<a class="navbar-brand" href="/cart">
Корзина
</a>
</ul>
</div>
</th:block>
</div>
</nav>
<main class="container-fluid p-2" layout:fragment="content">
</main>
<footer class="footer mt-auto d-flex flex-shrink-0 justify-content-left align-items-left">
Рарити Шоп.ру Лёвушкина Анна ПИбд-21
</footer>
</body>
</html>

View File

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

View File

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

View File

@ -0,0 +1,80 @@
<!DOCTYPE html>
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
<head>
<title>Товары</title>
</head>
<body>
<main layout:fragment="content">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<h2>Товары</h2>
<div>
<a href="/admin/type/edit/(page=${page})" class="btn btn-primary">Добавить товар</a>
</div>
<form th:action="@{/}" method="get" class="row mt-2">
<div class="col-sm-10">
<input type="hidden" th:name="page" th:value="${page}">
<select th:name="typeId" id="typeId" class="form-select">
<option selected value="">Фильтр по типу товара</option>
<option th:each="type : ${types}" th:value="${item.typeId}" th:selected="${type.id==typeId}">
[[${type.name}]]
</option>
</select>
<select th:name="sizeId" id="sizeId" class="form-select">
<option selected value="">Фильтр по размеру товара</option>
<option th:each="size : ${sizes}" th:value="${item.sizeId}" th:selected="${size.id==sizeId}">
[[${size.size}]]
</option>
</select>
</div>
<button type="submit" class="btn btn-primary col-sm-2">Показать</button>
</form>
<table class="mt-2 table-primary table-bordered w-100 t1">
<caption></caption>
<thead>
<tr>
<th scope="col" class="w-10"></th>
<th scope="col" class="w-25">Тип</th>
<th scope='col' class='w-25'>Размер</th>
<th scope='col' class='w-25'>Цена</th>
<th scope='col' class='w-25'>Название</th>
<th scope="col" class="w-10"></th>
<th scope="col" class="w-10"></th>
</tr>
</thead>
<tbody>
<tr th:each="item : ${items}">
<th scope="row" th:text="${item.id}"></th>
<td th:text="${item.typeName}"></td>
<td th:text="${item.sizeValue}"></td>
<td th:text="${item.price}"></td>
<td th:text="${item.nameItem}"></td>
<td>
<form th:action="@{/admin/item/edit/{id}(id=${item.id})}" method="get">
<input type="hidden" th:name="page" th:value="${page}">
<button type="submit" class="btn btn-link button-link">Редактировать</button>
</form>
</td>
<td>
<form th:action="@{/admin/item/delete/{id}(id=${item.id})}" method="post">
<input type="hidden" th:name="page" th:value="${page}">
<button type="submit" class="btn btn-link button-link"
onclick="return confirm('Вы уверены?')">Удалить</button>
</form>
</td>
</tr>
</tbody>
</table>
</th:block>
<th:block th:replace="~{ pagination :: pagination (
url=${'admin/user'},
totalPages=${totalPages},
currentPage=${currentPage}) }" />
</th:block>
</main>
</body>
</html>

View File

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

View File

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

View File

@ -0,0 +1,13 @@
package com.example.demo;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class DemoApplicationTests {
@Test
void contextLoads() {
}
}

View File

@ -0,0 +1,96 @@
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.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.items.model.ItemEntity;
import com.example.demo.items.service.ItemService;
import com.example.demo.sizes.model.SizeEntity;
import com.example.demo.sizes.service.SizeService;
import com.example.demo.types.model.TypeEntity;
import com.example.demo.types.service.TypeService;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
public class ItemServiceTests {
@Autowired
private ItemService itemService;
@Autowired
private TypeService typeService;
@Autowired
private SizeService sizeService;
private TypeEntity t1;
private TypeEntity t2;
private TypeEntity t3;
private SizeEntity s1;
private SizeEntity s2;
private SizeEntity s3;
private ItemEntity i1;
private ItemEntity i2;
private ItemEntity i3;
@BeforeEach
void CreateData(){
removeData();
t1 = typeService.create(new TypeEntity(null, "п1"));
t2 = typeService.create(new TypeEntity(null, "п2"));
t3 = typeService.create(new TypeEntity(null, "п3"));
s1 = sizeService.create(new SizeEntity(null, "38-40"));
s2 = sizeService.create(new SizeEntity(null, "40-42"));
s3 = sizeService.create(new SizeEntity(null, "42-44"));
i1 = itemService.create(new ItemEntity(null, t1, s1, 10.00, "it1", "im1"));
i2 = itemService.create(new ItemEntity(null, t2, s2, 20.00, "it2", "im2"));
i3 = itemService.create(new ItemEntity(null, t3, s3, 30.00, "it3", "im3"));
}
@AfterEach
void removeData() {
itemService.getAll().forEach(item -> itemService.delete(item.getId()));
typeService.getAll().forEach(item -> typeService.delete(item.getId()));
sizeService.getAll().forEach(item -> sizeService.delete(item.getId()));
}
@Test
void getTest() {
Assertions.assertThrows(NotFoundException.class, () -> itemService.get(0L));
}
@Test
@Order(1)
void createTest() {
Assertions.assertEquals(3, itemService.getAll().size());
Assertions.assertEquals(i3, itemService.get(i3.getId()));
}
@Test
@Order(2)
void updateTest() {
final String test = "TEST";
final ItemEntity entity = itemService.get(i3.getId());
final String oldName = entity.getNameItem();
final ItemEntity newEntity = itemService.update(i3.getId(), new ItemEntity(1L,typeService.create(new TypeEntity(null, "платье4")),
sizeService.create(new SizeEntity(null, "44-46")),
30.0, test, test ));
Assertions.assertEquals(3, itemService.getAll().size());
Assertions.assertEquals(newEntity, itemService.get(i3.getId()));
Assertions.assertEquals(test, newEntity.getNameItem());
Assertions.assertNotEquals(oldName, newEntity.getNameItem());
}
@Test
@Order(3)
void deleteTest() {
itemService.delete(i3.getId());
Assertions.assertEquals(2, itemService.getAll().size());
final ItemEntity last = itemService.get(i2.getId());
Assertions.assertEquals(i2.getId(), last.getId());
final ItemEntity newEntity = itemService.create(new ItemEntity(null, typeService.create(new TypeEntity(null, "платье5")),
sizeService.create(new SizeEntity(null, "46-48")),
10.0, "item32", "image32"));
Assertions.assertEquals(3, itemService.getAll().size());
}
}

View File

@ -0,0 +1,138 @@
package com.example.demo;
import java.util.Date;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.items.model.ItemEntity;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.orders.service.OrderService;
import com.example.demo.items.service.ItemService;
import com.example.demo.types.service.TypeService;
import com.example.demo.users.model.UserEntity;
import com.example.demo.users.service.UserService;
import jakarta.persistence.EntityManager;
import com.example.demo.sizes.service.SizeService;
import com.example.demo.sizes.model.SizeEntity;
import com.example.demo.types.model.TypeEntity;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
public class OrderServiceTests {
@Autowired
private OrderService orderService;
@Autowired
private UserService userService;
@Autowired
private ItemService itemService;
@Autowired
private TypeService typeService;
@Autowired
private SizeService sizeService;
@Autowired
private EntityManager entityManager;
private UserEntity user1;
private TypeEntity t1;
private TypeEntity t2;
private TypeEntity t3;
private SizeEntity s1;
private SizeEntity s2;
private SizeEntity s3;
private ItemEntity i1;
private ItemEntity i2;
private ItemEntity i3;
private OrderEntity o1;
private OrderEntity o2;
private OrderEntity o3;
@BeforeEach
void CreateData(){
removeData();
user1 = userService.create(new UserEntity(null, "login1", "passwd1"));
t1 = typeService.create(new TypeEntity(null, "п1"));
t2 = typeService.create(new TypeEntity(null, "п2"));
t3 = typeService.create(new TypeEntity(null, "п3"));
s1 = sizeService.create(new SizeEntity(null, "38-40"));
s2 = sizeService.create(new SizeEntity(null, "40-42"));
s3 = sizeService.create(new SizeEntity(null, "42-44"));
i1 = itemService.create(new ItemEntity(null, t1, s1, 10.00, "it1", "im1"));
i2 = itemService.create(new ItemEntity(null, t2, s2, 20.00, "it2", "im2"));
i3 = itemService.create(new ItemEntity(null, t3, s3, 30.00, "it3", "im3"));
o1 = orderService.create(user1.getId(),new OrderEntity(null, i1, 10, new Date()));
o2 = orderService.create(user1.getId(),new OrderEntity(null, i2, 20, new Date()));
o3 = orderService.create(user1.getId(),new OrderEntity(null, i3, 30, new Date()));
}
@AfterEach
void removeData() {
orderService.getAll(0L).forEach(item -> orderService.delete(user1.getId(),item.getId()));
itemService.getAll().forEach(item -> itemService.delete(item.getId()));
sizeService.getAll().forEach(item -> sizeService.delete(item.getId()));
typeService.getAll().forEach(item -> typeService.delete(item.getId()));
userService.getAll().forEach(item -> userService.delete(item.getId()));
}
@Test
void getTest() {
Assertions.assertThrows(NotFoundException.class, () -> orderService.get(0,0));
}
@Test
@Order(1)
void createTest() {
Assertions.assertEquals(3, orderService.getAll(0L).size());
Assertions.assertEquals(o3, orderService.get(user1.getId(),o3.getId()));
}
@Test
@Order(2)
void updateTest() {
final Integer test = 1000;
final OrderEntity entity = orderService.get(user1.getId(),o3.getId());
final Integer oldCount = entity.getCount();
final OrderEntity newEntity = orderService.update(user1.getId(),o3.getId(),
new OrderEntity
(null, itemService.create(new ItemEntity(null, typeService.create(new TypeEntity(null, "платье4")),
sizeService.create(new SizeEntity(null, "44-46")),
10.0, "item3", "image3")) , test, new Date() ));
Assertions.assertEquals(3, orderService.getAll(0L).size());
Assertions.assertEquals(newEntity, orderService.get(user1.getId(),o3.getId()));
Assertions.assertEquals(test, newEntity.getCount());
Assertions.assertNotEquals(oldCount, newEntity.getCount());
}
@Test
@Order(3)
void deleteTest() {
orderService.delete(user1.getId(),o3.getId());
Assertions.assertEquals(2, orderService.getAll(0L).size());
final OrderEntity last = orderService.get(user1.getId(),o2.getId());
Assertions.assertEquals(o2.getId(), last.getId());
final OrderEntity newEntity = orderService.create(user1.getId(),new OrderEntity(null, itemService.create
(new ItemEntity
(null, typeService.create(new TypeEntity(null, "платье5")),
sizeService.create(new SizeEntity(null, "46-48")),
10.0, "item3", "image3")),10, new Date()
)
);
Assertions.assertEquals(3, orderService.getAll(0L).size());
}
@Test
@Order(4)
void userCascadeDeleteTest() {
userService.delete(user1.getId());
final var orders = entityManager.createQuery(
"select count(o) from OrderEntity o where o.user.id = :userId");
orders.setParameter("userId", user1.getId());
Assertions.assertEquals(0, orders.getFirstResult());
}
}

View File

@ -0,0 +1,74 @@
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.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.sizes.model.SizeEntity;
import com.example.demo.sizes.service.SizeService;
import com.example.demo.users.model.UserEntity;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
public class SizeServiceTests {
@Autowired
private SizeService sizeService;
private SizeEntity s1;
private SizeEntity s2;
private SizeEntity s3;
@BeforeEach
void CreateData(){
removeData();
s1 = sizeService.create(new SizeEntity(null, "38-40"));
s2 = sizeService.create(new SizeEntity(null, "40-42"));
s3 = sizeService.create(new SizeEntity(null, "42-44"));
}
@AfterEach
void removeData() {
sizeService.getAll().forEach(item -> sizeService.delete(item.getId()));
}
@Test
void getTest() {
Assertions.assertThrows(NotFoundException.class, () -> sizeService.get(0L));
}
@Test
@Order(1)
void createTest() {
Assertions.assertEquals(3, sizeService.getAll().size());
Assertions.assertEquals(s3, sizeService.get(s3.getId()));
}
@Test
@Order(2)
void updateTest() {
final String test = "TEST";
final SizeEntity entity = sizeService.get(s3.getId());
final String oldName = entity.getSize();
final SizeEntity newEntity = sizeService.update(s3.getId(), new SizeEntity(1L, test));
Assertions.assertEquals(3, sizeService.getAll().size());
Assertions.assertEquals(newEntity, sizeService.get(s3.getId()));
Assertions.assertEquals(test, newEntity.getSize());
Assertions.assertNotEquals(oldName, newEntity.getSize());
}
@Test
@Order(3)
void deleteTest() {
sizeService.delete(s3.getId());
Assertions.assertEquals(2, sizeService.getAll().size());
final SizeEntity last = sizeService.get(s2.getId());
Assertions.assertEquals(s2.getId(), last.getId());
final SizeEntity newEntity = sizeService.create(new SizeEntity(null, "платье3"));
Assertions.assertEquals(3, sizeService.getAll().size());
}
}

View File

@ -0,0 +1,74 @@
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.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.sizes.model.SizeEntity;
import com.example.demo.types.model.TypeEntity;
import com.example.demo.types.service.TypeService;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
public class TypeServiceTests {
@Autowired
private TypeService typeService;
private TypeEntity t1;
private TypeEntity t2;
private TypeEntity t3;
@BeforeEach
void CreateData(){
removeData();
t1 = typeService.create(new TypeEntity(null, "п1"));
t2 = typeService.create(new TypeEntity(null, "п2"));
t3 = typeService.create(new TypeEntity(null, "п3"));
}
@AfterEach
void removeData() {
typeService.getAll().forEach(item -> typeService.delete(item.getId()));
}
@Test
void getTest() {
Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L));
}
@Test
@Order(1)
void createTest() {
Assertions.assertEquals(3, typeService.getAll().size());
Assertions.assertEquals(t3, typeService.get(t3.getId()));
}
@Test
@Order(2)
void updateTest() {
final String test = "TEST";
final TypeEntity entity = typeService.get(t3.getId());
final String oldName = entity.getName();
final TypeEntity newEntity = typeService.update(t3.getId(), new TypeEntity(1L, test));
Assertions.assertEquals(3, typeService.getAll().size());
Assertions.assertEquals(newEntity, typeService.get(t3.getId()));
Assertions.assertEquals(test, newEntity.getName());
Assertions.assertNotEquals(oldName, newEntity.getName());
}
@Test
@Order(3)
void deleteTest() {
typeService.delete(t3.getId());
Assertions.assertEquals(2, typeService.getAll().size());
final TypeEntity last = typeService.get(t2.getId());
Assertions.assertEquals(t2.getId(), last.getId());
final TypeEntity newEntity = typeService.create(new TypeEntity(null, "платье3"));
Assertions.assertEquals(3, typeService.getAll().size());
}
}

View File

@ -0,0 +1,74 @@
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.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.users.model.UserEntity;
import com.example.demo.users.service.UserService;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
public class UserServiceTests {
@Autowired
private UserService userService;
private UserEntity user1;
private UserEntity user2;
private UserEntity user3;
@BeforeEach
void CreateData(){
removeData();
user1 = userService.create(new UserEntity(null, "login1", "passwd1"));
user2 = userService.create(new UserEntity(null, "login2", "passwd2"));
user3 = userService.create(new UserEntity(null, "login3", "passwd3"));
}
@AfterEach
void removeData() {
userService.getAll().forEach(item -> userService.delete(item.getId()));
}
@Test
void getTest() {
Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L));
}
@Test
@Order(1)
void createTest() {
Assertions.assertEquals(3, userService.getAll().size());
Assertions.assertEquals(user3, userService.get(user3.getId()));
}
@Test
@Order(2)
void updateTest() {
final String test = "TEST";
final UserEntity entity = userService.get(user3.getId());
final String oldName = entity.getLogin();
final UserEntity newEntity = userService.update(user3.getId(), new UserEntity(1L, test, test));
Assertions.assertEquals(3, userService.getAll().size());
Assertions.assertEquals(newEntity, userService.get(user3.getId()));
Assertions.assertEquals(test, newEntity.getLogin());
Assertions.assertNotEquals(oldName, newEntity.getLogin());
}
@Test
@Order(3)
void deleteTest() {
userService.delete(user3.getId());
Assertions.assertEquals(2, userService.getAll().size());
final UserEntity last = userService.get(user2.getId());
Assertions.assertEquals(user2.getId(), last.getId());
final UserEntity newEntity = userService.create(new UserEntity(null, "платье3", "платье3"));
Assertions.assertEquals(3, userService.getAll().size());
}
}

View File

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

View File