Оно работает....
This commit is contained in:
parent
b350bf150c
commit
d09f2ec19c
Binary file not shown.
@ -27,3 +27,7 @@ dependencies {
|
|||||||
tasks.named('test') {
|
tasks.named('test') {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bootRun {
|
||||||
|
args = ['--populate']
|
||||||
|
}
|
||||||
|
@ -8,10 +8,14 @@ import org.springframework.boot.CommandLineRunner;
|
|||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
|
import com.example.demo.orders.model.OrderEntity;
|
||||||
|
import com.example.demo.orders.service.OrderService;
|
||||||
import com.example.demo.product.model.ProductEntity;
|
import com.example.demo.product.model.ProductEntity;
|
||||||
import com.example.demo.product.service.ProductService;
|
import com.example.demo.product.service.ProductService;
|
||||||
import com.example.demo.types.model.TypeEntity;
|
import com.example.demo.types.model.TypeEntity;
|
||||||
import com.example.demo.types.service.TypeService;
|
import com.example.demo.types.service.TypeService;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.service.UserService;
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
public class DemoApplication implements CommandLineRunner {
|
public class DemoApplication implements CommandLineRunner {
|
||||||
@ -19,10 +23,14 @@ public class DemoApplication implements CommandLineRunner {
|
|||||||
|
|
||||||
private final TypeService typeService;
|
private final TypeService typeService;
|
||||||
private final ProductService productService;
|
private final ProductService productService;
|
||||||
|
private final OrderService orderService;
|
||||||
|
private final UserService userService;
|
||||||
|
|
||||||
public DemoApplication(TypeService typeService, ProductService productService) {
|
public DemoApplication(TypeService typeService, ProductService productService, OrderService orderService, UserService userService) {
|
||||||
this.typeService = typeService;
|
this.typeService = typeService;
|
||||||
this.productService = productService;
|
this.productService = productService;
|
||||||
|
this.orderService = orderService;
|
||||||
|
this.userService = userService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
@ -38,13 +46,25 @@ public class DemoApplication implements CommandLineRunner {
|
|||||||
final var type3 = typeService.create(new TypeEntity(null, "Сырная"));
|
final var type3 = typeService.create(new TypeEntity(null, "Сырная"));
|
||||||
|
|
||||||
log.info("Create default product values");
|
log.info("Create default product values");
|
||||||
productService.create(new ProductEntity(null, "test", type1, 399.00));
|
final var product1 = productService.create(new ProductEntity(null, "test", type1, 399.00));
|
||||||
productService.create(new ProductEntity(null, "test", type1, 499.00));
|
final var product2 = productService.create(new ProductEntity(null, "test", type1, 499.00));
|
||||||
productService.create(new ProductEntity(null, "test", type2, 450.50));
|
final var product3 = productService.create(new ProductEntity(null, "test", type2, 450.50));
|
||||||
productService.create(new ProductEntity(null, "test", type2, 900.50));
|
final var product4 = productService.create(new ProductEntity(null, "test", type2, 900.50));
|
||||||
productService.create(new ProductEntity(null, "test", type2, 600.00));
|
final var product5 = productService.create(new ProductEntity(null, "test", type2, 600.00));
|
||||||
productService.create(new ProductEntity(null, "test", type3, 750.00));
|
final var product6 = productService.create(new ProductEntity(null, "test", type3, 750.00));
|
||||||
productService.create(new ProductEntity(null, "test", type3, 670.00));
|
|
||||||
|
log.info("Create default user values");
|
||||||
|
final var user1 = userService.create(new UserEntity(null, "test", "test", "test"));
|
||||||
|
final var user2 = userService.create(new UserEntity(null, "test1", "test1", "test1"));
|
||||||
|
final var user3 = userService.create(new UserEntity(null, "test2", "test2", "test2"));
|
||||||
|
|
||||||
|
log.info("Create default order values");
|
||||||
|
orderService.create(new OrderEntity(null, user1, product1, 10));
|
||||||
|
orderService.create(new OrderEntity(null, user2, product2, 5));
|
||||||
|
orderService.create(new OrderEntity(null, user3, product3, 15));
|
||||||
|
orderService.create(new OrderEntity(null, user1, product4, 6));
|
||||||
|
orderService.create(new OrderEntity(null, user2, product5, 8));
|
||||||
|
orderService.create(new OrderEntity(null, user3, product6, 3));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,6 @@ public class OrderController {
|
|||||||
private OrderDto toDto(OrderEntity entity) {
|
private OrderDto toDto(OrderEntity entity) {
|
||||||
OrderDto dto = new OrderDto(productService);
|
OrderDto dto = new OrderDto(productService);
|
||||||
dto.setId(entity.getId());
|
dto.setId(entity.getId());
|
||||||
dto.setUserId(entity.getUser().getId());
|
|
||||||
dto.setProductId(entity.getProduct().getId());
|
dto.setProductId(entity.getProduct().getId());
|
||||||
dto.setCount(entity.getCount());
|
dto.setCount(entity.getCount());
|
||||||
return dto;
|
return dto;
|
||||||
|
@ -38,14 +38,11 @@ public class OrderDto {
|
|||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
public Long getUserId() {
|
public Long getUserId() {
|
||||||
return userId;
|
return userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUserId(Long userId) {
|
|
||||||
this.userId = userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getProductId() {
|
public Long getProductId() {
|
||||||
return productId;
|
return productId;
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,6 @@ public class OrderService {
|
|||||||
|
|
||||||
public OrderEntity update(Long id, OrderEntity entity) {
|
public OrderEntity update(Long id, OrderEntity entity) {
|
||||||
final OrderEntity existsEntity = get(id);
|
final OrderEntity existsEntity = get(id);
|
||||||
existsEntity.setUser(entity.getUser());
|
|
||||||
existsEntity.setProduct(entity.getProduct());
|
existsEntity.setProduct(entity.getProduct());
|
||||||
existsEntity.setCount(entity.getCount());
|
existsEntity.setCount(entity.getCount());
|
||||||
return repository.update(existsEntity);
|
return repository.update(existsEntity);
|
||||||
|
@ -29,8 +29,8 @@ class TypeServiceTests {
|
|||||||
typeService.create(new TypeEntity(null, "Пепперони"));
|
typeService.create(new TypeEntity(null, "Пепперони"));
|
||||||
typeService.create(new TypeEntity(null, "Мясная"));
|
typeService.create(new TypeEntity(null, "Мясная"));
|
||||||
final TypeEntity last = typeService.create(new TypeEntity(null, "Сырная"));
|
final TypeEntity last = typeService.create(new TypeEntity(null, "Сырная"));
|
||||||
Assertions.assertEquals(6, typeService.getAll().size());
|
Assertions.assertEquals(9, typeService.getAll().size());
|
||||||
Assertions.assertEquals(last, typeService.get(6L));
|
Assertions.assertEquals(last, typeService.get(9L));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -40,7 +40,7 @@ class TypeServiceTests {
|
|||||||
final TypeEntity entity = typeService.get(3L);
|
final TypeEntity entity = typeService.get(3L);
|
||||||
final String oldName = entity.getName();
|
final String oldName = entity.getName();
|
||||||
final TypeEntity newEntity = typeService.update(3L, new TypeEntity(1L, test));
|
final TypeEntity newEntity = typeService.update(3L, new TypeEntity(1L, test));
|
||||||
Assertions.assertEquals(6, typeService.getAll().size());
|
Assertions.assertEquals(9, typeService.getAll().size());
|
||||||
Assertions.assertEquals(newEntity, typeService.get(3L));
|
Assertions.assertEquals(newEntity, typeService.get(3L));
|
||||||
Assertions.assertEquals(test, newEntity.getName());
|
Assertions.assertEquals(test, newEntity.getName());
|
||||||
Assertions.assertNotEquals(oldName, newEntity.getName());
|
Assertions.assertNotEquals(oldName, newEntity.getName());
|
||||||
@ -50,12 +50,12 @@ class TypeServiceTests {
|
|||||||
@Order(3)
|
@Order(3)
|
||||||
void deleteTest() {
|
void deleteTest() {
|
||||||
typeService.delete(3L);
|
typeService.delete(3L);
|
||||||
Assertions.assertEquals(5, typeService.getAll().size());
|
Assertions.assertEquals(8, typeService.getAll().size());
|
||||||
final TypeEntity last = typeService.get(2L);
|
final TypeEntity last = typeService.get(2L);
|
||||||
Assertions.assertEquals(2L, last.getId());
|
Assertions.assertEquals(2L, last.getId());
|
||||||
|
|
||||||
final TypeEntity newEntity = typeService.create(new TypeEntity(null, "Сырная"));
|
final TypeEntity newEntity = typeService.create(new TypeEntity(null, "Сырная"));
|
||||||
Assertions.assertEquals(6, typeService.getAll().size());
|
Assertions.assertEquals(9, typeService.getAll().size());
|
||||||
Assertions.assertEquals(7L, newEntity.getId());
|
Assertions.assertEquals(10L, newEntity.getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,8 +29,8 @@ class UserServiceTests {
|
|||||||
userService.create(new UserEntity(null, "User 1", "test@test", "qwerty"));
|
userService.create(new UserEntity(null, "User 1", "test@test", "qwerty"));
|
||||||
userService.create(new UserEntity(null, "User 2", "test1@test1", "12345678"));
|
userService.create(new UserEntity(null, "User 2", "test1@test1", "12345678"));
|
||||||
final UserEntity last = userService.create(new UserEntity(null, "User 3", "test2@test2", "mrgurgnugrn"));
|
final UserEntity last = userService.create(new UserEntity(null, "User 3", "test2@test2", "mrgurgnugrn"));
|
||||||
Assertions.assertEquals(5, userService.getAll().size());
|
Assertions.assertEquals(3, userService.getAll().size());
|
||||||
Assertions.assertEquals(last, userService.get(5L));
|
Assertions.assertEquals(last, userService.get(3L));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -42,7 +42,7 @@ class UserServiceTests {
|
|||||||
final UserEntity entity = userService.get(3L);
|
final UserEntity entity = userService.get(3L);
|
||||||
final String oldName = entity.getName();
|
final String oldName = entity.getName();
|
||||||
final UserEntity newEntity = userService.update(3L, new UserEntity(1L, test, email, password));
|
final UserEntity newEntity = userService.update(3L, new UserEntity(1L, test, email, password));
|
||||||
Assertions.assertEquals(5, userService.getAll().size());
|
Assertions.assertEquals(3, userService.getAll().size());
|
||||||
Assertions.assertEquals(newEntity, userService.get(3L));
|
Assertions.assertEquals(newEntity, userService.get(3L));
|
||||||
Assertions.assertEquals(test, newEntity.getName());
|
Assertions.assertEquals(test, newEntity.getName());
|
||||||
Assertions.assertNotEquals(oldName, newEntity.getName());
|
Assertions.assertNotEquals(oldName, newEntity.getName());
|
||||||
@ -52,12 +52,12 @@ class UserServiceTests {
|
|||||||
@Order(3)
|
@Order(3)
|
||||||
void deleteTest() {
|
void deleteTest() {
|
||||||
userService.delete(3L);
|
userService.delete(3L);
|
||||||
Assertions.assertEquals(4, userService.getAll().size());
|
Assertions.assertEquals(2, userService.getAll().size());
|
||||||
final UserEntity last = userService.get(2L);
|
final UserEntity last = userService.get(2L);
|
||||||
Assertions.assertEquals(2L, last.getId());
|
Assertions.assertEquals(2L, last.getId());
|
||||||
|
|
||||||
final UserEntity newEntity = userService.create(new UserEntity(null, "TEST", "ortrigr@rbirirrgi", "rgkrgimrgirg"));
|
final UserEntity newEntity = userService.create(new UserEntity(null, "TEST", "ortrigr@rbirirrgi", "rgkrgimrgirg"));
|
||||||
Assertions.assertEquals(5, userService.getAll().size());
|
Assertions.assertEquals(3, userService.getAll().size());
|
||||||
Assertions.assertEquals(6L, newEntity.getId());
|
Assertions.assertEquals(4L, newEntity.getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
14
2 семестр/lab3/.vscode/launch.json
vendored
Normal file
14
2 семестр/lab3/.vscode/launch.json
vendored
Normal 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"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
39
2 семестр/lab3/demo/.gitignore
vendored
Normal file
39
2 семестр/lab3/demo/.gitignore
vendored
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
HELP.md
|
||||||
|
.gradle
|
||||||
|
build/
|
||||||
|
!gradle/wrapper/gradle-wrapper.jar
|
||||||
|
!**/src/main/**/build/
|
||||||
|
!**/src/test/**/build/
|
||||||
|
|
||||||
|
### STS ###
|
||||||
|
.apt_generated
|
||||||
|
.classpath
|
||||||
|
.factorypath
|
||||||
|
.project
|
||||||
|
.settings
|
||||||
|
.springBeans
|
||||||
|
.sts4-cache
|
||||||
|
bin/
|
||||||
|
!**/src/main/**/bin/
|
||||||
|
!**/src/test/**/bin/
|
||||||
|
|
||||||
|
### IntelliJ IDEA ###
|
||||||
|
.idea
|
||||||
|
*.iws
|
||||||
|
*.iml
|
||||||
|
*.ipr
|
||||||
|
out/
|
||||||
|
!**/src/main/**/out/
|
||||||
|
!**/src/test/**/out/
|
||||||
|
|
||||||
|
### NetBeans ###
|
||||||
|
/nbproject/private/
|
||||||
|
/nbbuild/
|
||||||
|
/dist/
|
||||||
|
/nbdist/
|
||||||
|
/.nb-gradle/
|
||||||
|
|
||||||
|
### VS Code ###
|
||||||
|
.vscode/
|
||||||
|
|
||||||
|
data.*.db
|
43
2 семестр/lab3/demo/build.gradle
Normal file
43
2 семестр/lab3/demo/build.gradle
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java'
|
||||||
|
id 'org.springframework.boot' version '3.2.5'
|
||||||
|
id 'io.spring.dependency-management' version '1.1.4'
|
||||||
|
}
|
||||||
|
|
||||||
|
group = 'com.example'
|
||||||
|
version = '0.0.1-SNAPSHOT'
|
||||||
|
|
||||||
|
defaultTasks 'bootRun'
|
||||||
|
|
||||||
|
jar {
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
|
||||||
|
bootJar {
|
||||||
|
archiveFileName = String.format('%s-%s.jar', rootProject.name, version)
|
||||||
|
}
|
||||||
|
|
||||||
|
assert System.properties['java.specification.version'] == '17' || '21'
|
||||||
|
java {
|
||||||
|
sourceCompatibility = '17'
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
|
implementation 'org.springframework.boot:spring-boot-starter-validation'
|
||||||
|
implementation 'org.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'
|
||||||
|
|
||||||
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('test') {
|
||||||
|
useJUnitPlatform()
|
||||||
|
}
|
BIN
2 семестр/lab3/demo/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
2 семестр/lab3/demo/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
7
2 семестр/lab3/demo/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
7
2 семестр/lab3/demo/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
249
2 семестр/lab3/demo/gradlew
vendored
Normal file
249
2 семестр/lab3/demo/gradlew
vendored
Normal file
@ -0,0 +1,249 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright © 2015-2021 the original authors.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
#
|
||||||
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
|
#
|
||||||
|
# Important for running:
|
||||||
|
#
|
||||||
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||||
|
# noncompliant, but you have some other compliant shell such as ksh or
|
||||||
|
# bash, then to run this script, type that shell name before the whole
|
||||||
|
# command line, like:
|
||||||
|
#
|
||||||
|
# ksh Gradle
|
||||||
|
#
|
||||||
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
|
# requires all of these POSIX shell features:
|
||||||
|
# * functions;
|
||||||
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
|
#
|
||||||
|
# Important for patching:
|
||||||
|
#
|
||||||
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||||
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||||
|
#
|
||||||
|
# The "traditional" practice of packing multiple parameters into a
|
||||||
|
# space-separated string is a well documented source of bugs and security
|
||||||
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||||
|
# options in "$@", and eventually passing that to Java.
|
||||||
|
#
|
||||||
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||||
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||||
|
# see the in-line comments for details.
|
||||||
|
#
|
||||||
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||||
|
# Darwin, MinGW, and NonStop.
|
||||||
|
#
|
||||||
|
# (3) This script is generated from the Groovy template
|
||||||
|
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
|
# within the Gradle project.
|
||||||
|
#
|
||||||
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
#
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
app_path=$0
|
||||||
|
|
||||||
|
# Need this for daisy-chained symlinks.
|
||||||
|
while
|
||||||
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
|
[ -h "$app_path" ]
|
||||||
|
do
|
||||||
|
ls=$( ls -ld "$app_path" )
|
||||||
|
link=${ls#*' -> '}
|
||||||
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
|
APP_BASE_NAME=${0##*/}
|
||||||
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD=maximum
|
||||||
|
|
||||||
|
warn () {
|
||||||
|
echo "$*"
|
||||||
|
} >&2
|
||||||
|
|
||||||
|
die () {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
} >&2
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
nonstop=false
|
||||||
|
case "$( uname )" in #(
|
||||||
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
|
Darwin* ) darwin=true ;; #(
|
||||||
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
|
NONSTOP* ) nonstop=true ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
|
else
|
||||||
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD=java
|
||||||
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
|
case $MAX_FD in #(
|
||||||
|
max*)
|
||||||
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC2039,SC3045
|
||||||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
|
warn "Could not query maximum file descriptor limit"
|
||||||
|
esac
|
||||||
|
case $MAX_FD in #(
|
||||||
|
'' | soft) :;; #(
|
||||||
|
*)
|
||||||
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC2039,SC3045
|
||||||
|
ulimit -n "$MAX_FD" ||
|
||||||
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
|
# * args from the command line
|
||||||
|
# * the main class name
|
||||||
|
# * -classpath
|
||||||
|
# * -D...appname settings
|
||||||
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
|
# Collect all arguments for the java command:
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
|
# and any embedded shellness will be escaped.
|
||||||
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-classpath "$CLASSPATH" \
|
||||||
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# Stop when "xargs" is not available.
|
||||||
|
if ! command -v xargs >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "xargs is not available"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use "xargs" to parse quoted args.
|
||||||
|
#
|
||||||
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
#
|
||||||
|
# In Bash we could simply go:
|
||||||
|
#
|
||||||
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||||
|
# set -- "${ARGS[@]}" "$@"
|
||||||
|
#
|
||||||
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||||
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||||
|
# character that might be a shell metacharacter, then use eval to reverse
|
||||||
|
# that process (while maintaining the separation between arguments), and wrap
|
||||||
|
# the whole thing up as a single "set" statement.
|
||||||
|
#
|
||||||
|
# This will of course break if any of these variables contains a newline or
|
||||||
|
# an unmatched quote.
|
||||||
|
#
|
||||||
|
|
||||||
|
eval "set -- $(
|
||||||
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||||
|
xargs -n1 |
|
||||||
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||||
|
tr '\n' ' '
|
||||||
|
)" '"$@"'
|
||||||
|
|
||||||
|
exec "$JAVACMD" "$@"
|
92
2 семестр/lab3/demo/gradlew.bat
vendored
Normal file
92
2 семестр/lab3/demo/gradlew.bat
vendored
Normal 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
|
1
2 семестр/lab3/demo/settings.gradle
Normal file
1
2 семестр/lab3/demo/settings.gradle
Normal file
@ -0,0 +1 @@
|
|||||||
|
rootProject.name = 'demo'
|
@ -0,0 +1,78 @@
|
|||||||
|
package com.example.demo;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.boot.CommandLineRunner;
|
||||||
|
import org.springframework.boot.SpringApplication;
|
||||||
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
|
import com.example.demo.orders.model.OrderEntity;
|
||||||
|
import com.example.demo.orders.service.OrderService;
|
||||||
|
import com.example.demo.product.model.ProductEntity;
|
||||||
|
import com.example.demo.product.service.ProductService;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.service.UserService;
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
public class DemoApplication implements CommandLineRunner {
|
||||||
|
private final Logger log = LoggerFactory.getLogger(DemoApplication.class);
|
||||||
|
|
||||||
|
private final TypeService typeService;
|
||||||
|
private final ProductService productService;
|
||||||
|
private final OrderService orderService;
|
||||||
|
private final UserService userService;
|
||||||
|
|
||||||
|
public DemoApplication(TypeService typeService, ProductService productService, OrderService orderService, UserService userService) {
|
||||||
|
this.typeService = typeService;
|
||||||
|
this.productService = productService;
|
||||||
|
this.orderService = orderService;
|
||||||
|
this.userService = userService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
SpringApplication.run(DemoApplication.class, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run(String... args) throws Exception {
|
||||||
|
if (args.length > 0 && Arrays.asList(args).contains("--populate")) {
|
||||||
|
log.info("Create default types values");
|
||||||
|
final var type1 = typeService.create(new TypeEntity("Мясная"));
|
||||||
|
final var type2 = typeService.create(new TypeEntity("Пепперони"));
|
||||||
|
final var type3 = typeService.create(new TypeEntity("Сырная"));
|
||||||
|
|
||||||
|
log.info("Create default product values");
|
||||||
|
final var product1 = productService.create(new ProductEntity("test", type1, 399.00, 15));
|
||||||
|
final var product2 = productService.create(new ProductEntity("test", type1, 499.00, 10));
|
||||||
|
final var product3 = productService.create(new ProductEntity("test", type2, 450.50, 5));
|
||||||
|
final var product4 = productService.create(new ProductEntity("test", type2, 900.50, 6));
|
||||||
|
final var product5 = productService.create(new ProductEntity("test", type2, 600.00, 8));
|
||||||
|
final var product6 = productService.create(new ProductEntity("test", type3, 750.00, 9));
|
||||||
|
|
||||||
|
log.info("Create default user values");
|
||||||
|
final var user1 = userService.create(new UserEntity("kruviii", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123"));
|
||||||
|
final var user2 = userService.create(new UserEntity("vihoof", "Фёдор", "Лопатин", "test1@test.ru", "22-12-2023", "+79875433210", "qwerty321"));
|
||||||
|
final var user3 = userService.create(new UserEntity("fragreg", "Семён", "Кукушкин", "test2@test.ru", "03-02-2023", "+74567433210", "qwerty451"));
|
||||||
|
|
||||||
|
log.info("Create default order values");
|
||||||
|
final var order1 = orderService.create(user1.getId(), new OrderEntity("ул. Северный венец, 32"));
|
||||||
|
final var order2 = orderService.create(user2.getId(), new OrderEntity("ул. Северный венец, 32"));
|
||||||
|
final var order3 = orderService.create(user3.getId(), new OrderEntity("ул. Северный венец, 32"));
|
||||||
|
|
||||||
|
orderService.addOrderProducts(user1.getId(), order1.getId(),
|
||||||
|
Map.of(product1.getId(), 3,
|
||||||
|
product2.getId(), 1,
|
||||||
|
product3.getId(), 2));
|
||||||
|
orderService.addOrderProducts(user2.getId(), order2.getId(),
|
||||||
|
Map.of(product4.getId(), 5));
|
||||||
|
orderService.addOrderProducts(user3.getId(), order3.getId(),
|
||||||
|
Map.of(product5.getId(), 1,
|
||||||
|
product6.getId(), 1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,12 @@
|
|||||||
|
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";
|
||||||
|
|
||||||
|
private Constants() {
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,13 @@
|
|||||||
|
package com.example.demo.core.configuration;
|
||||||
|
|
||||||
|
import org.modelmapper.ModelMapper;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class MapperConfiguration {
|
||||||
|
@Bean
|
||||||
|
ModelMapper modelMapper() {
|
||||||
|
return new ModelMapper();
|
||||||
|
}
|
||||||
|
}
|
@ -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.WebMvcConfigurer;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class WebConfiguration implements WebMvcConfigurer {
|
||||||
|
@Override
|
||||||
|
public void addCorsMappings(@NonNull CorsRegistry registry) {
|
||||||
|
registry.addMapping("/**")
|
||||||
|
.allowedMethods("GET", "POST", "PUT", "DELETE");
|
||||||
|
}
|
||||||
|
}
|
@ -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));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
package com.example.demo.core.model;
|
||||||
|
|
||||||
|
import com.example.demo.core.configuration.Constants;
|
||||||
|
|
||||||
|
import jakarta.persistence.GeneratedValue;
|
||||||
|
import jakarta.persistence.GenerationType;
|
||||||
|
import jakarta.persistence.Id;
|
||||||
|
import jakarta.persistence.MappedSuperclass;
|
||||||
|
import jakarta.persistence.SequenceGenerator;
|
||||||
|
|
||||||
|
@MappedSuperclass
|
||||||
|
public abstract class BaseEntity {
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = Constants.SEQUENCE_NAME)
|
||||||
|
@SequenceGenerator(name = Constants.SEQUENCE_NAME, sequenceName = Constants.SEQUENCE_NAME, allocationSize = 1)
|
||||||
|
protected Long id;
|
||||||
|
|
||||||
|
protected BaseEntity() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,17 @@
|
|||||||
|
package com.example.demo.core.repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface CommonRepository<E, T> {
|
||||||
|
List<E> getAll();
|
||||||
|
|
||||||
|
E get(T id);
|
||||||
|
|
||||||
|
E create(E entity);
|
||||||
|
|
||||||
|
E update(E entity);
|
||||||
|
|
||||||
|
E delete(E entity);
|
||||||
|
|
||||||
|
void deleteAll();
|
||||||
|
}
|
@ -0,0 +1,57 @@
|
|||||||
|
package com.example.demo.core.repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.TreeMap;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
|
||||||
|
public abstract class MapRepository<E extends BaseEntity> implements CommonRepository<E, Long> {
|
||||||
|
private final Map<Long, E> entities = new TreeMap<>();
|
||||||
|
private Long lastId = 0L;
|
||||||
|
|
||||||
|
protected MapRepository() {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<E> getAll() {
|
||||||
|
return entities.values().stream().toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public E get(Long id) {
|
||||||
|
return entities.get(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public E create(E entity) {
|
||||||
|
lastId++;
|
||||||
|
entity.setId(lastId);
|
||||||
|
entities.put(lastId, entity);
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public E update(E entity) {
|
||||||
|
if (get(entity.getId()) == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
entities.put(entity.getId(), entity);
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public E delete(E entity) {
|
||||||
|
if (get(entity.getId()) == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
entities.remove(entity.getId());
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteAll() {
|
||||||
|
lastId = 0L;
|
||||||
|
entities.clear();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,130 @@
|
|||||||
|
package com.example.demo.orders.api;
|
||||||
|
|
||||||
|
import java.text.ParseException;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
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.product.api.ProductDto;
|
||||||
|
import com.example.demo.product.model.ProductEntity;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping(Constants.API_URL + "/user/{user}/order")
|
||||||
|
public class OrderController {
|
||||||
|
private final OrderService orderService;
|
||||||
|
private final ModelMapper modelMapper;
|
||||||
|
|
||||||
|
public OrderController(OrderService orderService, ModelMapper modelMapper) {
|
||||||
|
this.orderService = orderService;
|
||||||
|
this.modelMapper = modelMapper;
|
||||||
|
}
|
||||||
|
|
||||||
|
private OrderDto toDto(OrderEntity entity) {
|
||||||
|
final OrderDto dto = modelMapper.map(entity, OrderDto.class);
|
||||||
|
dto.setSum(orderService.getSum(entity.getUser().getId(), entity.getId()));
|
||||||
|
dto.setCount(orderService.getFullCount(entity.getUser().getId(), entity.getId()));
|
||||||
|
return dto;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ProductDto toProductDto(ProductEntity entity) {
|
||||||
|
return modelMapper.map(entity, ProductDto.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
private OrderEntity toEntity(OrderDto dto) throws ParseException {
|
||||||
|
final OrderEntity entity = modelMapper.map(dto, OrderEntity.class);
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public PageDto<OrderDto> getAll(
|
||||||
|
@PathVariable(name = "user") Long userId,
|
||||||
|
@RequestParam(name = "page", defaultValue = "0") int page,
|
||||||
|
@RequestParam(name = "size", defaultValue = Constants.DEFAULT_PAGE_SIZE) int size) {
|
||||||
|
return PageDtoMapper.toDto(orderService.getAll(userId, page, size), this::toDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public OrderDto get(
|
||||||
|
@PathVariable(name = "user") Long userId,
|
||||||
|
@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(orderService.get(userId, id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public OrderDto create(
|
||||||
|
@PathVariable(name = "user") Long userId,
|
||||||
|
@RequestBody @Valid OrderDto dto) throws ParseException {
|
||||||
|
return toDto(orderService.create(userId, toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@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));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}/product")
|
||||||
|
public List<ProductDto> getOrderProducts(
|
||||||
|
@PathVariable(name = "user") Long userId,
|
||||||
|
@PathVariable(name = "id") Long id) {
|
||||||
|
return orderService.getOrderProducts(userId, id).stream().map(this::toProductDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/{id}/product")
|
||||||
|
public List<ProductDto> addProducts(
|
||||||
|
@PathVariable(name = "user") Long userId,
|
||||||
|
@PathVariable(name = "id") Long id,
|
||||||
|
@RequestBody Map<Long, Integer> productsIdsCount) {
|
||||||
|
return orderService.addOrderProducts(userId, id, productsIdsCount).stream().map(this::toProductDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/{id}/product")
|
||||||
|
public List<ProductDto> changeProductsCount(
|
||||||
|
@PathVariable(name = "user") Long userId,
|
||||||
|
@PathVariable(name = "id") Long id,
|
||||||
|
@RequestBody Map<Long, Integer> productsIdsCount) {
|
||||||
|
return orderService.changeProductsCount(userId, id, productsIdsCount).stream().map(this::toProductDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}/product")
|
||||||
|
public List<ProductDto> deleteOrderProducts(
|
||||||
|
@PathVariable(name = "user") Long userId,
|
||||||
|
@PathVariable(name = "id") Long id,
|
||||||
|
@RequestParam(name = "products", defaultValue = "") List<Long> productsIds) {
|
||||||
|
return orderService.deleteOrderProducts(userId, id, productsIds).stream().map(this::toProductDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}/product/all")
|
||||||
|
public List<ProductDto> deleteAllOrderProducts(
|
||||||
|
@PathVariable(name = "user") Long userId,
|
||||||
|
@PathVariable(name = "id") Long id) {
|
||||||
|
return orderService.deleteAllOrderProducts(userId, id).stream().map(this::toProductDto).toList();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,48 @@
|
|||||||
|
package com.example.demo.orders.api;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
|
||||||
|
public class OrderDto {
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
private Long id;
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
private Double sum;
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
private Integer count;
|
||||||
|
@NotBlank
|
||||||
|
private String shippingAddress;
|
||||||
|
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Double getSum() {
|
||||||
|
return sum;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSum(Double sum) {
|
||||||
|
this.sum = sum;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getCount() {
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCount(Integer count) {
|
||||||
|
this.count = count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getShippingAddress() {
|
||||||
|
return shippingAddress;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setShippingAddress(String shippingAddress) {
|
||||||
|
this.shippingAddress = shippingAddress;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,93 @@
|
|||||||
|
package com.example.demo.orders.model;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
import com.example.demo.ordersproducts.model.OrderProductEntity;
|
||||||
|
|
||||||
|
import jakarta.persistence.CascadeType;
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.JoinColumn;
|
||||||
|
import jakarta.persistence.ManyToOne;
|
||||||
|
import jakarta.persistence.OneToMany;
|
||||||
|
import jakarta.persistence.OrderBy;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "orders")
|
||||||
|
public class OrderEntity extends BaseEntity {
|
||||||
|
@ManyToOne
|
||||||
|
@JoinColumn(name = "userId", nullable = false)
|
||||||
|
private UserEntity user;
|
||||||
|
@Column(nullable = false)
|
||||||
|
private String shippingAddress;
|
||||||
|
@OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
@OrderBy("id ASC")
|
||||||
|
private Set<OrderProductEntity> orderProducts = new HashSet<>();
|
||||||
|
|
||||||
|
public OrderEntity() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public OrderEntity(String shippingAddress) {
|
||||||
|
this.shippingAddress = shippingAddress;
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserEntity getUser() {
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUser(UserEntity user) {
|
||||||
|
this.user = user;
|
||||||
|
if (!user.getOrders().contains(this)) {
|
||||||
|
user.getOrders().add(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getShippingAddress() {
|
||||||
|
return shippingAddress;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setShippingAddress(String shippingAddress) {
|
||||||
|
this.shippingAddress = shippingAddress;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Set<OrderProductEntity> getOrderProducts() {
|
||||||
|
return orderProducts;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addProduct(OrderProductEntity orderProduct) {
|
||||||
|
if (orderProduct.getOrder() != this) {
|
||||||
|
orderProduct.setOrder(this);
|
||||||
|
}
|
||||||
|
orderProducts.add(orderProduct);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteProduct(OrderProductEntity orderProduct) {
|
||||||
|
if (orderProduct.getOrder() != this) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
orderProducts.remove(orderProduct);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(id, user.getId(), shippingAddress, orderProducts);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null || getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
final OrderEntity other = (OrderEntity) obj;
|
||||||
|
return Objects.equals(other.getId(), id)
|
||||||
|
&& Objects.equals(other.getUser().getId(), user.getId())
|
||||||
|
&& Objects.equals(other.getShippingAddress(), shippingAddress)
|
||||||
|
&& Objects.equals(other.getOrderProducts(), orderProducts);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,19 @@
|
|||||||
|
package com.example.demo.orders.repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.repository.CrudRepository;
|
||||||
|
import org.springframework.data.repository.PagingAndSortingRepository;
|
||||||
|
|
||||||
|
import com.example.demo.orders.model.OrderEntity;
|
||||||
|
|
||||||
|
public interface OrderRepository extends CrudRepository<OrderEntity, Long>, PagingAndSortingRepository<OrderEntity, Long> {
|
||||||
|
Optional<OrderEntity> findOneByUserIdAndId(long userId, long id);
|
||||||
|
|
||||||
|
List<OrderEntity> findByUserId(long userId);
|
||||||
|
|
||||||
|
Page<OrderEntity> findByUserId(long userId, Pageable pageable);
|
||||||
|
}
|
@ -0,0 +1,174 @@
|
|||||||
|
package com.example.demo.orders.service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
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.product.model.ProductEntity;
|
||||||
|
import com.example.demo.product.service.ProductService;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.service.UserService;
|
||||||
|
import com.example.demo.ordersproducts.model.OrderProductEntity;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class OrderService {
|
||||||
|
private final OrderRepository repository;
|
||||||
|
private final UserService userService;
|
||||||
|
private final ProductService productService;
|
||||||
|
|
||||||
|
public OrderService(OrderRepository repository, UserService userService, ProductService productService) {
|
||||||
|
this.repository = repository;
|
||||||
|
this.userService = userService;
|
||||||
|
this.productService = productService;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public List<OrderEntity> getAll(Long userId) {
|
||||||
|
userService.get(userId);
|
||||||
|
return repository.findByUserId(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public Page<OrderEntity> getAll(long userId, int page, int size) {
|
||||||
|
final Pageable pageRequest = PageRequest.of(page, size);
|
||||||
|
userService.get(userId);
|
||||||
|
return repository.findByUserId(userId, pageRequest);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public OrderEntity get(long userId, long id) {
|
||||||
|
userService.get(userId);
|
||||||
|
return repository.findOneByUserIdAndId(userId, id)
|
||||||
|
.orElseThrow(() -> new NotFoundException(OrderEntity.class, id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public OrderEntity create(long userId, OrderEntity entity) {
|
||||||
|
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.setShippingAddress(entity.getShippingAddress());
|
||||||
|
return repository.save(existsEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public OrderEntity delete(long userId, long id) {
|
||||||
|
userService.get(userId);
|
||||||
|
final OrderEntity existsEntity = get(userId, id);
|
||||||
|
repository.delete(existsEntity);
|
||||||
|
return existsEntity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public List<ProductEntity> getOrderProducts(long userId, long id) {
|
||||||
|
userService.get(userId);
|
||||||
|
return get(userId, id).getOrderProducts().stream()
|
||||||
|
.map(OrderProductEntity::getProduct)
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public Double getSum(long userId, long id) {
|
||||||
|
userService.get(userId);
|
||||||
|
return get(userId, id).getOrderProducts().stream()
|
||||||
|
.mapToDouble(orderProduct -> orderProduct.getCount() * orderProduct.getProduct().getPrice())
|
||||||
|
.sum();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public Integer getFullCount(long userId, long id) {
|
||||||
|
userService.get(userId);
|
||||||
|
return get(userId, id).getOrderProducts().stream()
|
||||||
|
.mapToInt(OrderProductEntity::getCount)
|
||||||
|
.sum();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public List<ProductEntity> addOrderProducts(
|
||||||
|
long userId,
|
||||||
|
long id,
|
||||||
|
Map<Long, Integer> productsIdsCount) {
|
||||||
|
userService.get(userId);
|
||||||
|
final OrderEntity existsOrder = get(userId, id);
|
||||||
|
List<ProductEntity> result = productService.getAll(0L).stream()
|
||||||
|
.filter(product -> productsIdsCount.containsKey(product.getId()))
|
||||||
|
.toList();
|
||||||
|
result.forEach(product -> {
|
||||||
|
final OrderProductEntity orderProduct = new OrderProductEntity(existsOrder, product, productsIdsCount.get(product.getId()));
|
||||||
|
orderProduct.setOrder(existsOrder);
|
||||||
|
orderProduct.setProduct(product);
|
||||||
|
});
|
||||||
|
repository.save(existsOrder);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public List<ProductEntity> changeProductsCount(
|
||||||
|
long userId,
|
||||||
|
long id,
|
||||||
|
Map<Long, Integer> productsIdsCount) {
|
||||||
|
userService.get(userId);
|
||||||
|
final OrderEntity existsOrder = get(userId, id);
|
||||||
|
List<ProductEntity> result = existsOrder.getOrderProducts().stream()
|
||||||
|
.filter(product -> Objects.nonNull(product.getProduct()))
|
||||||
|
.filter(product -> productsIdsCount.containsKey(product.getProduct().getId()))
|
||||||
|
.map(product -> {
|
||||||
|
Integer newCount = productsIdsCount.getOrDefault(product.getProduct().getId(), product.getCount());
|
||||||
|
product.setCount(newCount);
|
||||||
|
return product.getProduct();
|
||||||
|
})
|
||||||
|
.toList();
|
||||||
|
repository.save(existsOrder);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public List<ProductEntity> deleteOrderProducts(
|
||||||
|
long userId,
|
||||||
|
long id,
|
||||||
|
List<Long> productsIds) {
|
||||||
|
userService.get(userId);
|
||||||
|
final OrderEntity existsOrder = get(userId, id);
|
||||||
|
final List<OrderProductEntity> products = existsOrder.getOrderProducts().stream()
|
||||||
|
.filter(product -> Objects.nonNull(product.getProduct()))
|
||||||
|
.filter(product -> productsIds.contains(product.getProduct().getId()))
|
||||||
|
.toList();
|
||||||
|
products.forEach(existsOrder::deleteProduct);
|
||||||
|
repository.save(existsOrder);
|
||||||
|
return products.stream()
|
||||||
|
.map(OrderProductEntity::getProduct)
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public List<ProductEntity> deleteAllOrderProducts(long userId, long id) {
|
||||||
|
userService.get(userId);
|
||||||
|
final OrderEntity existsOrder = get(userId, id);
|
||||||
|
final List<OrderProductEntity> products = existsOrder.getOrderProducts().stream()
|
||||||
|
.filter(product -> Objects.nonNull(product.getProduct()))
|
||||||
|
.toList();
|
||||||
|
products.forEach(existsOrder::deleteProduct);
|
||||||
|
repository.save(existsOrder);
|
||||||
|
return products.stream()
|
||||||
|
.map(OrderProductEntity::getProduct)
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,96 @@
|
|||||||
|
package com.example.demo.ordersproducts.model;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import com.example.demo.orders.model.OrderEntity;
|
||||||
|
import com.example.demo.product.model.ProductEntity;
|
||||||
|
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.EmbeddedId;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.JoinColumn;
|
||||||
|
import jakarta.persistence.ManyToOne;
|
||||||
|
import jakarta.persistence.MapsId;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "orders_products")
|
||||||
|
public class OrderProductEntity {
|
||||||
|
@EmbeddedId
|
||||||
|
private OrderProductId id = new OrderProductId();
|
||||||
|
@ManyToOne
|
||||||
|
@MapsId("orderId")
|
||||||
|
@JoinColumn(name = "order_id")
|
||||||
|
private OrderEntity order;
|
||||||
|
@ManyToOne
|
||||||
|
@MapsId("productId")
|
||||||
|
@JoinColumn(name = "product_id")
|
||||||
|
private ProductEntity product;
|
||||||
|
@Column(nullable = false)
|
||||||
|
private Integer count;
|
||||||
|
|
||||||
|
public OrderProductEntity() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public OrderProductEntity(OrderEntity order, ProductEntity product, Integer count) {
|
||||||
|
this.order = order;
|
||||||
|
this.product = product;
|
||||||
|
this.count = count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OrderProductId getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(OrderProductId id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OrderEntity getOrder() {
|
||||||
|
return order;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOrder(OrderEntity order) {
|
||||||
|
this.order = order;
|
||||||
|
if (!order.getOrderProducts().contains(this)) {
|
||||||
|
order.getOrderProducts().add(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ProductEntity getProduct() {
|
||||||
|
return product;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setProduct(ProductEntity product) {
|
||||||
|
this.product = product;
|
||||||
|
if (!product.getOrderProducts().contains(this)) {
|
||||||
|
product.getOrderProducts().add(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getCount() {
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCount(Integer count) {
|
||||||
|
this.count = count;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(id, order.getId(), product.getId(), count);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null || getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
OrderProductEntity other = (OrderProductEntity) obj;
|
||||||
|
return Objects.equals(id, other.id)
|
||||||
|
&& Objects.equals(order.getId(), other.order.getId())
|
||||||
|
&& Objects.equals(product.getId(), other.product.getId())
|
||||||
|
&& count == other.count;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,54 @@
|
|||||||
|
package com.example.demo.ordersproducts.model;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import jakarta.persistence.Embeddable;
|
||||||
|
|
||||||
|
@Embeddable
|
||||||
|
public class OrderProductId {
|
||||||
|
private Long orderId;
|
||||||
|
private Long productId;
|
||||||
|
|
||||||
|
public OrderProductId() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public OrderProductId(Long orderId, Long productId) {
|
||||||
|
this.orderId = orderId;
|
||||||
|
this.productId = productId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getOrderId() {
|
||||||
|
return orderId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOrderId(Long orderId) {
|
||||||
|
this.orderId = orderId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getBookId() {
|
||||||
|
return productId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBookId(Long productId) {
|
||||||
|
this.productId = productId;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(
|
||||||
|
Optional.ofNullable(orderId).orElse(0L),
|
||||||
|
Optional.ofNullable(productId).orElse(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null || getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
OrderProductId other = (OrderProductId) obj;
|
||||||
|
return Objects.equals(orderId, other.orderId)
|
||||||
|
&& Objects.equals(productId, other.productId);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,73 @@
|
|||||||
|
package com.example.demo.product.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.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.product.model.ProductEntity;
|
||||||
|
import com.example.demo.product.service.ProductService;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping(Constants.API_URL + "/product")
|
||||||
|
public class ProductController {
|
||||||
|
private final ProductService productService;
|
||||||
|
private final TypeService typeService;
|
||||||
|
private final ModelMapper modelMapper;
|
||||||
|
|
||||||
|
public ProductController(ProductService productService, TypeService typeService, ModelMapper modelMapper) {
|
||||||
|
this.productService = productService;
|
||||||
|
this.typeService = typeService;
|
||||||
|
this.modelMapper = modelMapper;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ProductDto toDto(ProductEntity entity) {
|
||||||
|
return modelMapper.map(entity, ProductDto.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ProductEntity toEntity(ProductDto dto) {
|
||||||
|
final ProductEntity entity = modelMapper.map(dto, ProductEntity.class);
|
||||||
|
entity.setType(typeService.get(dto.getTypeId()));
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public PageDto<ProductDto> getAll(
|
||||||
|
@RequestParam(name = "typeId", defaultValue = "0") Long typeId,
|
||||||
|
@RequestParam(name = "page", defaultValue = "0") int page,
|
||||||
|
@RequestParam(name = "size", defaultValue = Constants.DEFAULT_PAGE_SIZE) int size) {
|
||||||
|
return PageDtoMapper.toDto(productService.getAll(typeId, page, size), this::toDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public ProductDto get(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(productService.get(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public ProductDto create(@RequestBody @Valid ProductDto dto) {
|
||||||
|
return toDto(productService.create(toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/{id}")
|
||||||
|
public ProductDto update(@PathVariable(name = "id") Long id, @RequestBody @Valid ProductDto dto) {
|
||||||
|
return toDto(productService.update(id, toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public ProductDto delete(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(productService.delete(id));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,63 @@
|
|||||||
|
package com.example.demo.product.api;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.Min;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
public class ProductDto {
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
private Long id;
|
||||||
|
@NotBlank
|
||||||
|
private String name;
|
||||||
|
@NotNull
|
||||||
|
@Min(1)
|
||||||
|
private Long typeId;
|
||||||
|
@NotNull
|
||||||
|
@Min(1)
|
||||||
|
private Double price;
|
||||||
|
@NotNull
|
||||||
|
@Min(0)
|
||||||
|
private Integer count;
|
||||||
|
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getTypeId() {
|
||||||
|
return typeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTypeId(Long typeId) {
|
||||||
|
this.typeId = typeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Double getPrice() {
|
||||||
|
return price;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPrice(Double price) {
|
||||||
|
this.price = price;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getCount() {
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCount(Integer count) {
|
||||||
|
this.count = count;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,108 @@
|
|||||||
|
package com.example.demo.product.model;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.ordersproducts.model.OrderProductEntity;
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.OneToMany;
|
||||||
|
import jakarta.persistence.OrderBy;
|
||||||
|
import jakarta.persistence.JoinColumn;
|
||||||
|
import jakarta.persistence.ManyToOne;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "products")
|
||||||
|
public class ProductEntity extends BaseEntity {
|
||||||
|
@Column(nullable = false)
|
||||||
|
private String name;
|
||||||
|
@ManyToOne
|
||||||
|
@JoinColumn(name = "typeId", nullable = false)
|
||||||
|
private TypeEntity type;
|
||||||
|
@Column(nullable = false)
|
||||||
|
private Double price;
|
||||||
|
@Column(nullable = false)
|
||||||
|
private Integer count;
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "product")
|
||||||
|
@OrderBy("id ASC")
|
||||||
|
private Set<OrderProductEntity> orderProducts = new HashSet<>();
|
||||||
|
|
||||||
|
public ProductEntity() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public ProductEntity(String name, TypeEntity type, Double price, Integer count) {
|
||||||
|
this.name = name;
|
||||||
|
this.type = type;
|
||||||
|
this.price = price;
|
||||||
|
this.count = count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public TypeEntity getType() {
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setType(TypeEntity type) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Double getPrice() {
|
||||||
|
return price;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPrice(Double price) {
|
||||||
|
this.price = price;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getCount() {
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCount(Integer count) {
|
||||||
|
this.count = count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Set<OrderProductEntity> getOrderProducts() {
|
||||||
|
return orderProducts;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addOrder(OrderProductEntity orderProduct) {
|
||||||
|
if (orderProduct.getProduct() != this) {
|
||||||
|
orderProduct.setProduct(this);
|
||||||
|
}
|
||||||
|
orderProducts.add(orderProduct);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(id, name, type, price, count, orderProducts);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null || getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
final ProductEntity other = (ProductEntity) obj;
|
||||||
|
return Objects.equals(other.getId(), id)
|
||||||
|
&& Objects.equals(other.getName(), name)
|
||||||
|
&& Objects.equals(other.getType(), type)
|
||||||
|
&& Objects.equals(other.getPrice(), price)
|
||||||
|
&& Objects.equals(other.getCount(), count)
|
||||||
|
&& Objects.equals(other.getOrderProducts(), orderProducts);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,16 @@
|
|||||||
|
package com.example.demo.product.repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.repository.CrudRepository;
|
||||||
|
import org.springframework.data.repository.PagingAndSortingRepository;
|
||||||
|
|
||||||
|
import com.example.demo.product.model.ProductEntity;
|
||||||
|
|
||||||
|
public interface ProductRepository extends CrudRepository<ProductEntity, Long>, PagingAndSortingRepository<ProductEntity, Long> {
|
||||||
|
List<ProductEntity> findByTypeId(long typeId);
|
||||||
|
|
||||||
|
Page<ProductEntity> findByTypeId(long typeId, Pageable pageable);
|
||||||
|
}
|
@ -0,0 +1,71 @@
|
|||||||
|
package com.example.demo.product.service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.StreamSupport;
|
||||||
|
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.PageRequest;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.product.model.ProductEntity;
|
||||||
|
import com.example.demo.product.repository.ProductRepository;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class ProductService {
|
||||||
|
private final ProductRepository repository;
|
||||||
|
|
||||||
|
public ProductService(ProductRepository repository) {
|
||||||
|
this.repository = repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public List<ProductEntity> getAll(long categoryId) {
|
||||||
|
if (categoryId <= 0L) {
|
||||||
|
return StreamSupport.stream(repository.findAll().spliterator(), false).toList();
|
||||||
|
}
|
||||||
|
return repository.findByTypeId(categoryId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public Page<ProductEntity> getAll(long typeId, int page, int size) {
|
||||||
|
final Pageable pageRequest = PageRequest.of(page, size);
|
||||||
|
if (typeId <= 0L) {
|
||||||
|
return repository.findAll(pageRequest);
|
||||||
|
}
|
||||||
|
return repository.findByTypeId(typeId, pageRequest);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public ProductEntity get(long id) {
|
||||||
|
return repository.findById(id)
|
||||||
|
.orElseThrow(() -> new NotFoundException(ProductEntity.class, id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public ProductEntity create(ProductEntity entity) {
|
||||||
|
if (entity == null) {
|
||||||
|
throw new IllegalArgumentException("Entity is null");
|
||||||
|
}
|
||||||
|
return repository.save(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public ProductEntity update(Long id, ProductEntity entity) {
|
||||||
|
final ProductEntity existsEntity = get(id);
|
||||||
|
existsEntity.setName(entity.getName());
|
||||||
|
existsEntity.setType(entity.getType());
|
||||||
|
existsEntity.setPrice(entity.getPrice());
|
||||||
|
existsEntity.setCount(entity.getCount());
|
||||||
|
return repository.save(existsEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public ProductEntity delete(Long id) {
|
||||||
|
final ProductEntity existsEntity = get(id);
|
||||||
|
repository.delete(existsEntity);
|
||||||
|
return existsEntity;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,64 @@
|
|||||||
|
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 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;
|
||||||
|
|
||||||
|
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 List<TypeDto> getAll() {
|
||||||
|
return typeService.getAll().stream().map(this::toDto).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@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 @Valid TypeDto dto) {
|
||||||
|
return toDto(typeService.update(id, toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public TypeDto delete(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(typeService.delete(id));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,30 @@
|
|||||||
|
package com.example.demo.types.api;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.Size;
|
||||||
|
|
||||||
|
public class TypeDto {
|
||||||
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
|
private Long id;
|
||||||
|
@NotBlank
|
||||||
|
@Size(min = 3, max = 50)
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,47 @@
|
|||||||
|
package com.example.demo.types.model;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "types")
|
||||||
|
public class TypeEntity extends BaseEntity {
|
||||||
|
@Column(nullable = false, unique = true, length = 50)
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
public TypeEntity() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public TypeEntity(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(id, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null || getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
final TypeEntity other = (TypeEntity) obj;
|
||||||
|
return Objects.equals(other.getId(), id)
|
||||||
|
&& Objects.equals(other.getName(), name);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,11 @@
|
|||||||
|
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);
|
||||||
|
}
|
@ -0,0 +1,61 @@
|
|||||||
|
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);
|
||||||
|
existsEntity.setName(entity.getName());
|
||||||
|
return repository.save(existsEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public TypeEntity delete(long id) {
|
||||||
|
final TypeEntity existsEntity = get(id);
|
||||||
|
repository.delete(existsEntity);
|
||||||
|
return existsEntity;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,67 @@
|
|||||||
|
package com.example.demo.users.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.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.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.service.UserService;
|
||||||
|
import com.example.demo.core.configuration.Constants;
|
||||||
|
|
||||||
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping(Constants.API_URL + "/user")
|
||||||
|
public class UserController {
|
||||||
|
private final UserService userService;
|
||||||
|
private final ModelMapper modelMapper;
|
||||||
|
|
||||||
|
public UserController(UserService userService, ModelMapper modelMapper) {
|
||||||
|
this.userService = userService;
|
||||||
|
this.modelMapper = modelMapper;
|
||||||
|
}
|
||||||
|
|
||||||
|
private UserDto toDto(UserEntity entity) {
|
||||||
|
return modelMapper.map(entity, UserDto.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
private UserEntity toEntity(UserDto dto) {
|
||||||
|
return modelMapper.map(dto, UserEntity.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public PageDto<UserDto> getAll(
|
||||||
|
@RequestParam(name = "page", defaultValue = "0") int page,
|
||||||
|
@RequestParam(name = "size", defaultValue = Constants.DEFAULT_PAGE_SIZE) int size) {
|
||||||
|
return PageDtoMapper.toDto(userService.getAll(page, size), this::toDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public UserDto get(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(userService.get(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public UserDto create(@RequestBody @Valid UserDto dto) {
|
||||||
|
return toDto(userService.create(toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/{id}")
|
||||||
|
public UserDto update(@PathVariable(name = "id") Long id, @RequestBody @Valid UserDto dto) {
|
||||||
|
return toDto(userService.update(id, toEntity(dto)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public UserDto delete(@PathVariable(name = "id") Long id) {
|
||||||
|
return toDto(userService.delete(id));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,95 @@
|
|||||||
|
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 = 3, max = 30)
|
||||||
|
private String name;
|
||||||
|
@NotBlank
|
||||||
|
@Size(min = 3, max = 30)
|
||||||
|
private String surname;
|
||||||
|
@NotBlank
|
||||||
|
@Size(min = 5, max = 254)
|
||||||
|
private String email;
|
||||||
|
@NotBlank
|
||||||
|
private String dateofbirth;
|
||||||
|
@NotBlank
|
||||||
|
@Size(min = 5, max = 40)
|
||||||
|
private String phonenumber;
|
||||||
|
@NotBlank
|
||||||
|
@Size(min = 8, max = 20)
|
||||||
|
private String password;
|
||||||
|
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLogin() {
|
||||||
|
return login;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLogin(String name) {
|
||||||
|
this.login = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSurname() {
|
||||||
|
return surname;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSurname(String surname) {
|
||||||
|
this.surname = surname;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getEmail() {
|
||||||
|
return email;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setEmail(String email) {
|
||||||
|
this.email = email;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDateofbirth() {
|
||||||
|
return dateofbirth;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDateofbirth(String dateofbirth) {
|
||||||
|
this.dateofbirth = dateofbirth;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPhoneNumber() {
|
||||||
|
return phonenumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPhoneNumber(String phonenumber) {
|
||||||
|
this.phonenumber = phonenumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPassword() {
|
||||||
|
return password;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPassword(String password) {
|
||||||
|
this.password = password;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,141 @@
|
|||||||
|
package com.example.demo.users.model;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import jakarta.persistence.CascadeType;
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.OneToMany;
|
||||||
|
import jakarta.persistence.OrderBy;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
|
||||||
|
import com.example.demo.core.model.BaseEntity;
|
||||||
|
import com.example.demo.orders.model.OrderEntity;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = "users")
|
||||||
|
public class UserEntity extends BaseEntity {
|
||||||
|
@Column(nullable = false, unique = true, length = 20)
|
||||||
|
private String login;
|
||||||
|
@Column(nullable = false, length = 30)
|
||||||
|
private String name;
|
||||||
|
@Column(nullable = false, length = 30)
|
||||||
|
private String surname;
|
||||||
|
@Column(nullable = false, unique = true, length = 254)
|
||||||
|
private String email;
|
||||||
|
@Column(nullable = false)
|
||||||
|
private String dateofbirth;
|
||||||
|
@Column(nullable = false, unique = true, length = 40)
|
||||||
|
private String phonenumber;
|
||||||
|
@Column(nullable = false, length = 20)
|
||||||
|
private String password;
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
|
||||||
|
@OrderBy("id ASC")
|
||||||
|
private Set<OrderEntity> orders = new HashSet<>();
|
||||||
|
|
||||||
|
public UserEntity() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserEntity(String login, String name, String surname, String email, String dateofbirth, String phonenumber, String password) {
|
||||||
|
this.login = login;
|
||||||
|
this.surname = surname;
|
||||||
|
this.name = name;
|
||||||
|
this.email = email;
|
||||||
|
this.dateofbirth = dateofbirth;
|
||||||
|
this.phonenumber = phonenumber;
|
||||||
|
this.password = password;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLogin() {
|
||||||
|
return login;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLogin(String name) {
|
||||||
|
this.login = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSurname() {
|
||||||
|
return surname;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSurname(String surname) {
|
||||||
|
this.surname = surname;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getEmail() {
|
||||||
|
return email;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setEmail(String email) {
|
||||||
|
this.email = email;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDateofbirth() {
|
||||||
|
return dateofbirth;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDateofbirth(String dateofbirth) {
|
||||||
|
this.dateofbirth = dateofbirth;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPhoneNumber() {
|
||||||
|
return phonenumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPhoneNumber(String phonenumber) {
|
||||||
|
this.phonenumber = phonenumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
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() {
|
||||||
|
return Objects.hash(id, login, name, surname, email, dateofbirth, phonenumber, password, orders);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null || getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
final UserEntity other = (UserEntity) obj;
|
||||||
|
return Objects.equals(other.getId(), id)
|
||||||
|
&& Objects.equals(other.getLogin(), login)
|
||||||
|
&& Objects.equals(other.getName(), name)
|
||||||
|
&& Objects.equals(other.getSurname(), surname)
|
||||||
|
&& Objects.equals(other.getEmail(), email)
|
||||||
|
&& Objects.equals(other.getDateofbirth(), dateofbirth)
|
||||||
|
&& Objects.equals(other.getPhoneNumber(), phonenumber)
|
||||||
|
&& Objects.equals(other.getPassword(), password)
|
||||||
|
&& Objects.equals(other.getOrders(), orders);
|
||||||
|
}
|
||||||
|
}
|
@ -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);
|
||||||
|
}
|
@ -0,0 +1,75 @@
|
|||||||
|
package com.example.demo.users.service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.StreamSupport;
|
||||||
|
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.PageRequest;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.repository.UserRepository;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class UserService {
|
||||||
|
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);
|
||||||
|
existsEntity.setLogin(entity.getLogin());
|
||||||
|
existsEntity.setName(entity.getName());
|
||||||
|
existsEntity.setSurname(entity.getSurname());
|
||||||
|
existsEntity.setEmail(entity.getEmail());
|
||||||
|
existsEntity.setDateofbirth(entity.getDateofbirth());
|
||||||
|
existsEntity.setPhoneNumber(entity.getPhoneNumber());
|
||||||
|
existsEntity.setPassword(entity.getPassword());
|
||||||
|
repository.save(existsEntity);
|
||||||
|
return existsEntity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public UserEntity delete(long id) {
|
||||||
|
final UserEntity existsEntity = get(id);
|
||||||
|
repository.delete(existsEntity);
|
||||||
|
return existsEntity;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,20 @@
|
|||||||
|
# Server
|
||||||
|
spring.main.banner-mode=off
|
||||||
|
server.port=8080
|
||||||
|
|
||||||
|
# Logger settings
|
||||||
|
# Available levels are: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
|
||||||
|
logging.level.com.example.demo=DEBUG
|
||||||
|
|
||||||
|
# JPA Settings
|
||||||
|
spring.datasource.url=jdbc:h2:file:./data
|
||||||
|
spring.datasource.username=sa
|
||||||
|
spring.datasource.password=password
|
||||||
|
spring.datasource.driver-class-name=org.h2.Driver
|
||||||
|
spring.jpa.hibernate.ddl-auto=create
|
||||||
|
spring.jpa.open-in-view=false
|
||||||
|
# spring.jpa.show-sql=true
|
||||||
|
# spring.jpa.properties.hibernate.format_sql=true
|
||||||
|
|
||||||
|
# H2 console
|
||||||
|
spring.h2.console.enabled=true
|
@ -0,0 +1,148 @@
|
|||||||
|
package com.example.demo;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.orders.model.OrderEntity;
|
||||||
|
import com.example.demo.orders.service.OrderService;
|
||||||
|
import com.example.demo.product.model.ProductEntity;
|
||||||
|
import com.example.demo.product.service.ProductService;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.service.UserService;
|
||||||
|
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
public class OrderServiceTests {
|
||||||
|
@Autowired
|
||||||
|
private TypeService typeService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ProductService productService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private UserService userService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private OrderService orderService;
|
||||||
|
|
||||||
|
private OrderEntity order;
|
||||||
|
|
||||||
|
private UserEntity user;
|
||||||
|
|
||||||
|
private ProductEntity product1;
|
||||||
|
private ProductEntity product2;
|
||||||
|
private ProductEntity product3;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void createData() {
|
||||||
|
removeData();
|
||||||
|
|
||||||
|
final var type = typeService.create(new TypeEntity("Пепперони"));
|
||||||
|
product1 = productService.create(new ProductEntity("test1", type, 399.00, 15));
|
||||||
|
product2 = productService.create(new ProductEntity("test2", type, 499.00, 10));
|
||||||
|
product3 = productService.create(new ProductEntity("test3", type, 450.50, 5));
|
||||||
|
user = userService.create(new UserEntity("kruviii", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123"));
|
||||||
|
order = orderService.create(user.getId(), new OrderEntity("ул. Северный венец, 32"));
|
||||||
|
orderService.create(user.getId(), new OrderEntity("ул. Северный венец, 32"));
|
||||||
|
orderService.create(user.getId(), new OrderEntity("ул. Северный венец, 32"));
|
||||||
|
|
||||||
|
orderService.addOrderProducts(user.getId(), order.getId(),
|
||||||
|
Map.of(product1.getId(), 3,
|
||||||
|
product2.getId(), 1,
|
||||||
|
product3.getId(), 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
void removeData() {
|
||||||
|
userService.getAll().forEach(item -> userService.delete(item.getId()));
|
||||||
|
productService.getAll(0L).forEach(item -> productService.delete(item.getId()));
|
||||||
|
typeService.getAll().forEach(item -> typeService.delete(item.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> orderService.get(user.getId(), 0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Test
|
||||||
|
void createTest() {
|
||||||
|
Assertions.assertEquals(3, orderService.getAll(user.getId()).size());
|
||||||
|
Assertions.assertEquals(order, orderService.get(user.getId(), order.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Test
|
||||||
|
void updateTest() {
|
||||||
|
final OrderEntity newEntity = orderService.update(user.getId(), order.getId(), new OrderEntity("ул. Северный венец, 32"));
|
||||||
|
Assertions.assertEquals(3, orderService.getAll(user.getId()).size());
|
||||||
|
Assertions.assertEquals(newEntity, orderService.get(user.getId(), order.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void deleteTest() {
|
||||||
|
orderService.delete(user.getId(), order.getId());
|
||||||
|
Assertions.assertEquals(2, orderService.getAll(user.getId()).size());
|
||||||
|
|
||||||
|
final OrderEntity newEntity = orderService.create(user.getId(), new OrderEntity("ул. Северный венец, 32"));
|
||||||
|
Assertions.assertEquals(3, orderService.getAll(user.getId()).size());
|
||||||
|
Assertions.assertNotEquals(order.getId(), newEntity.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getSumTest() {
|
||||||
|
Double sum = orderService.getSum(user.getId(), order.getId());
|
||||||
|
Assertions.assertEquals(product1.getPrice() * 3 + product2.getPrice() + product3.getPrice() * 2, sum);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getFullCountTest() {
|
||||||
|
Integer count = orderService.getFullCount(user.getId(), order.getId());
|
||||||
|
Assertions.assertEquals(6, count);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Test
|
||||||
|
void AddOrderProductsTest() {
|
||||||
|
final var type = typeService.create(new TypeEntity("3 сыра"));
|
||||||
|
final var product = productService.create(new ProductEntity("test1", type, 100.00, 5));
|
||||||
|
Assertions.assertEquals(3, orderService.getOrderProducts(user.getId(), order.getId()).size());
|
||||||
|
orderService.addOrderProducts(user.getId(), order.getId(), Map.of(product.getId(), 5));
|
||||||
|
Assertions.assertEquals(4, orderService.getOrderProducts(user.getId(), order.getId()).size());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Test
|
||||||
|
void changeProductsCountTest() {
|
||||||
|
Assertions.assertEquals(6, orderService.getFullCount(user.getId(), order.getId()));
|
||||||
|
orderService.changeProductsCount(user.getId(), order.getId(), Map.of(product2.getId(), 4, product3.getId(), 1));
|
||||||
|
Assertions.assertEquals(8, orderService.getFullCount(user.getId(), order.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Test
|
||||||
|
void deleteOrderProductsTest() {
|
||||||
|
Assertions.assertEquals(3, orderService.getOrderProducts(user.getId(), order.getId()).size());
|
||||||
|
orderService.deleteOrderProducts(user.getId(), order.getId(), List.of(product1.getId(), product3.getId()));
|
||||||
|
Assertions.assertEquals(1, orderService.getOrderProducts(user.getId(), order.getId()).size());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Test
|
||||||
|
void deleteAllOrderProductsTest() {
|
||||||
|
Assertions.assertEquals(3, orderService.getOrderProducts(user.getId(), order.getId()).size());
|
||||||
|
orderService.deleteAllOrderProducts(user.getId(), order.getId());
|
||||||
|
Assertions.assertEquals(0, orderService.getOrderProducts(user.getId(), order.getId()).size());
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,92 @@
|
|||||||
|
package com.example.demo;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.dao.DataIntegrityViolationException;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.product.model.ProductEntity;
|
||||||
|
import com.example.demo.product.service.ProductService;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
class ProductsServiceTests {
|
||||||
|
@Autowired
|
||||||
|
private TypeService typeService;
|
||||||
|
|
||||||
|
private TypeEntity type;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ProductService productService;
|
||||||
|
|
||||||
|
private ProductEntity product;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void createData() {
|
||||||
|
removeData();
|
||||||
|
|
||||||
|
type = typeService.create(new TypeEntity("Мясная"));
|
||||||
|
final var type2 = typeService.create(new TypeEntity("Пепперони"));
|
||||||
|
final var type3 = typeService.create(new TypeEntity("Сырная"));
|
||||||
|
|
||||||
|
|
||||||
|
product = productService.create(new ProductEntity("test", type, 399.00, 15));
|
||||||
|
productService.create(new ProductEntity("test", type2, 499.00, 10));
|
||||||
|
productService.create(new ProductEntity("test", type3, 450.50, 5));
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
void removeData() {
|
||||||
|
productService.getAll(0L).forEach(item -> productService.delete(item.getId()));
|
||||||
|
typeService.getAll().forEach(item -> typeService.delete(item.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> productService.get(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Test
|
||||||
|
void createTest() {
|
||||||
|
Assertions.assertEquals(3, productService.getAll(0L).size());
|
||||||
|
Assertions.assertEquals(product, productService.get(product.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createNullableTest() {
|
||||||
|
final ProductEntity nullableProduct = new ProductEntity(null, type, 399.00, 15);;
|
||||||
|
Assertions.assertThrows(DataIntegrityViolationException.class, () -> productService.create(nullableProduct));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Test
|
||||||
|
void updateTest() {
|
||||||
|
final String test = "TEST";
|
||||||
|
final TypeEntity newType = typeService.create(new TypeEntity("Фреш"));
|
||||||
|
final TypeEntity oldType = product.getType();
|
||||||
|
final ProductEntity newEntity = productService.update(product.getId(), new ProductEntity(test, newType, 100.00, 15));
|
||||||
|
Assertions.assertEquals(3, productService.getAll(0L).size());
|
||||||
|
Assertions.assertEquals(newEntity, productService.get(product.getId()));
|
||||||
|
Assertions.assertEquals(test, newEntity.getName());
|
||||||
|
Assertions.assertEquals(newType, newEntity.getType());
|
||||||
|
Assertions.assertNotEquals(oldType, newEntity.getType());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void deleteTest() {
|
||||||
|
productService.delete(product.getId());
|
||||||
|
Assertions.assertEquals(2, productService.getAll(0L).size());
|
||||||
|
|
||||||
|
final ProductEntity newEntity = productService.create(new ProductEntity(product.getName(), product.getType(), product.getPrice(), product.getCount()));
|
||||||
|
Assertions.assertEquals(3, typeService.getAll().size());
|
||||||
|
Assertions.assertNotEquals(product.getId(), newEntity.getId());
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,82 @@
|
|||||||
|
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.Test;
|
||||||
|
import org.junit.jupiter.api.TestMethodOrder;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.dao.DataIntegrityViolationException;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.types.model.TypeEntity;
|
||||||
|
import com.example.demo.types.service.TypeService;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
@TestMethodOrder(OrderAnnotation.class)
|
||||||
|
class TypeServiceTests {
|
||||||
|
@Autowired
|
||||||
|
private TypeService typeService;
|
||||||
|
|
||||||
|
private TypeEntity type;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void createData() {
|
||||||
|
removeData();
|
||||||
|
|
||||||
|
type = typeService.create(new TypeEntity("Пепперони"));
|
||||||
|
typeService.create(new TypeEntity("Мясная"));
|
||||||
|
typeService.create(new TypeEntity("4 сыра"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
void removeData() {
|
||||||
|
typeService.getAll().forEach(item -> typeService.delete(item.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createTest() {
|
||||||
|
Assertions.assertEquals(3, typeService.getAll().size());
|
||||||
|
Assertions.assertEquals(type, typeService.get(type.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createNotUniqueTest() {
|
||||||
|
final TypeEntity nonUniqueType = new TypeEntity("Пепперони");
|
||||||
|
Assertions.assertThrows(IllegalArgumentException.class, () -> typeService.create(nonUniqueType));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createNullableTest() {
|
||||||
|
final TypeEntity nullableType = new TypeEntity(null);
|
||||||
|
Assertions.assertThrows(DataIntegrityViolationException.class, () -> typeService.create(nullableType));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void updateTest() {
|
||||||
|
final String test = "TEST";
|
||||||
|
final String oldName = type.getName();
|
||||||
|
final TypeEntity newEntity = typeService.update(type.getId(), new TypeEntity(test));
|
||||||
|
Assertions.assertEquals(3, typeService.getAll().size());
|
||||||
|
Assertions.assertEquals(newEntity, typeService.get(type.getId()));
|
||||||
|
Assertions.assertEquals(test, newEntity.getName());
|
||||||
|
Assertions.assertNotEquals(oldName, newEntity.getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void deleteTest() {
|
||||||
|
typeService.delete(type.getId());
|
||||||
|
Assertions.assertEquals(2, typeService.getAll().size());
|
||||||
|
|
||||||
|
final TypeEntity newEntity = typeService.create(new TypeEntity(type.getName()));
|
||||||
|
Assertions.assertEquals(3, typeService.getAll().size());
|
||||||
|
Assertions.assertNotEquals(type.getId(), newEntity.getId());
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,85 @@
|
|||||||
|
package com.example.demo;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.dao.DataIntegrityViolationException;
|
||||||
|
|
||||||
|
import com.example.demo.core.error.NotFoundException;
|
||||||
|
import com.example.demo.users.model.UserEntity;
|
||||||
|
import com.example.demo.users.service.UserService;
|
||||||
|
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
class UserServiceTests {
|
||||||
|
@Autowired
|
||||||
|
private UserService userService;
|
||||||
|
|
||||||
|
private UserEntity user;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void createData() {
|
||||||
|
removeData();
|
||||||
|
|
||||||
|
user = userService.create(new UserEntity("kruviii", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123"));
|
||||||
|
userService.create(new UserEntity("vihoof", "Фёдор", "Лопатин", "test1@test.ru", "22-12-2023", "+79875433210", "qwerty321"));
|
||||||
|
userService.create(new UserEntity("fragreg", "Семён", "Кукушкин", "test2@test.ru", "03-02-2023", "+74567433210", "qwerty451"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
void removeData() {
|
||||||
|
userService.getAll().forEach(item -> userService.delete(item.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getTest() {
|
||||||
|
Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Test
|
||||||
|
void createTest() {
|
||||||
|
Assertions.assertEquals(3, userService.getAll().size());
|
||||||
|
Assertions.assertEquals(user, userService.get(user.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createNotUniqueTest() {
|
||||||
|
final UserEntity nonUniqueUser = new UserEntity("kruviii", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123");
|
||||||
|
Assertions.assertThrows(IllegalArgumentException.class, () -> userService.create(nonUniqueUser));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createNullableTest() {
|
||||||
|
final UserEntity nullableUser = new UserEntity(null, "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123");
|
||||||
|
Assertions.assertThrows(DataIntegrityViolationException.class, () -> userService.create(nullableUser));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Test
|
||||||
|
void updateTest() {
|
||||||
|
final String test = "TEST";
|
||||||
|
final String oldLogin = user.getLogin();
|
||||||
|
final UserEntity newEntity = userService.update(user.getId(),
|
||||||
|
new UserEntity("kruvi", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123"));
|
||||||
|
Assertions.assertEquals(3, userService.getAll().size());
|
||||||
|
Assertions.assertEquals(newEntity, userService.get(user.getId()));
|
||||||
|
Assertions.assertNotEquals(test, newEntity.getLogin());
|
||||||
|
Assertions.assertNotEquals(oldLogin, newEntity.getLogin());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void deleteTest() {
|
||||||
|
userService.delete(user.getId());
|
||||||
|
Assertions.assertEquals(2, userService.getAll().size());
|
||||||
|
|
||||||
|
final UserEntity newEntity = userService
|
||||||
|
.create(new UserEntity("kruviii", "Павел", "Крылов", "test@test.ru", "11-11-2023", "+79876543210", "qwerty123"));
|
||||||
|
Assertions.assertEquals(3, userService.getAll().size());
|
||||||
|
Assertions.assertNotEquals(user.getId(), newEntity.getId());
|
||||||
|
}
|
||||||
|
}
|
@ -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
|
Loading…
Reference in New Issue
Block a user