Лабораторная 2

This commit is contained in:
Даниил Путинцев 2024-04-01 21:07:02 +04:00
parent e6288367a5
commit a48f044222
45 changed files with 1931 additions and 97 deletions

View File

@ -1,2 +1,2 @@
# Internet_Programming_PIbd-21_Putincev_D_M_Backend
# Internet_Programming_PIbd-21_Rodionov_I_A_Backend

View File

@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.2.2'
id 'org.springframework.boot' version '3.2.4'
id 'io.spring.dependency-management' version '1.1.4'
}
@ -18,6 +18,7 @@ repositories {
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
implementation 'org.modelmapper:modelmapper:3.2.0'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}
@ -25,3 +26,4 @@ dependencies {
tasks.named('test') {
useJUnitPlatform()
}

View File

@ -1 +1 @@
rootProject.name = 'demo'
rootProject.name = 'backend'

View File

@ -1,49 +0,0 @@
package com.example.demo;
import java.util.HashMap;
import java.util.List;
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;
@RestController
@RequestMapping("/api/types")
public class ApiController {
HashMap<Integer, TypeDto> types = new HashMap<>();
@GetMapping("/{id}")
public TypeDto getTypes(@PathVariable(name = "id") Integer id) {
return types.get(id);
}
@GetMapping
public List<TypeDto> getTypesAll() {
return List.copyOf(types.values());
}
@PostMapping("/{id}")
public TypeDto postTypes(@PathVariable(name = "id") Integer id, @RequestBody TypeDto typeDto) {
types.put(id, typeDto);
return typeDto;
}
@DeleteMapping("/{id}")
public TypeDto deleteTypes(@PathVariable(name = "id") Integer id) {
var temp = types.get(id);
types.remove(id);
return temp;
}
@PutMapping("/{id}")
public TypeDto putTypes(@PathVariable(name = "id") Integer id, @RequestBody TypeDto entity) {
types.replace(id, entity);
return types.get(id);
}
}

View File

@ -1,12 +1,90 @@
package com.example.demo;
import java.util.Objects;
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.foods.model.FoodEntity;
import com.example.demo.foods.service.FoodService;
import com.example.demo.types.model.TypeEntity;
import com.example.demo.types.service.TypeService;
import com.example.demo.core.utils.Formatter;
import com.example.demo.users.model.UserEntity;
import com.example.demo.users.service.UserService;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.orders.service.OrderService;
import com.example.demo.ordersfoods.model.OrderFoodEntity;
import com.example.demo.ordersfoods.service.OrderFoodService;
@SpringBootApplication
public class DemoApplication {
public class DemoApplication implements CommandLineRunner {
private final Logger log = LoggerFactory.getLogger(DemoApplication.class);
private final TypeService typeService;
private final FoodService foodService;
private final UserService userService;
private final OrderService orderService;
private final OrderFoodService orderFoodService;
public DemoApplication(TypeService typeService, FoodService foodService, UserService userService,
OrderService orderService, OrderFoodService orderFoodService) {
this.typeService = typeService;
this.foodService = foodService;
this.userService = userService;
this.orderService = orderService;
this.orderFoodService = orderFoodService;
}
public static void main(String[] args) {
SpringApplication.run(DemoApplication.class, args);
}
@Override
public void run(String... args) throws Exception {
if (args.length > 0 && Objects.equals("--populate", args[0])) {
log.info("Create default types values");
final var type1 = typeService.create(new TypeEntity(null, "Бургер"));
final var type2 = typeService.create(new TypeEntity(null, "Напиток"));
final var type3 = typeService.create(new TypeEntity(null, "Салат"));
log.info("Create default foods values");
final var food1 = foodService
.create(new FoodEntity(null, type1, 145.00, "Греческий бургер", Formatter.parse("2021-10-11"), 10));
final var food2 = foodService
.create(new FoodEntity(null, type2, 99.00, "Кола", Formatter.parse("2021-10-11"), 40));
final var food3 = foodService
.create(new FoodEntity(null, type3, 199.00, "Японский салат", Formatter.parse("2021-10-11"), 4));
final var food4 = foodService.create(
new FoodEntity(null, type1, 299.00, "Бургер с говядиной", Formatter.parse("2021-10-11"), 3));
final var food5 = foodService
.create(new FoodEntity(null, type3, 109.00, "Греческий салат", Formatter.parse("2021-10-11"), 24));
log.info("Create default users values");
final var user1 = userService
.create(new UserEntity(null, "Chief", "forum98761@gmail.com", "bth4323", true));
final var user2 = userService
.create(new UserEntity(null, "Dude23", "ovalinartem25@gmail.com", "dsre32462", false));
final var user3 = userService
.create(new UserEntity(null, "TestUser", "user53262@gmail.com", "lawy7728", false));
log.info("Create default orders values");
final var order1 = orderService
.create(new OrderEntity(null, user1, Formatter.parse("2024-03-28"), "Выполняется"));
final var order2 = orderService
.create(new OrderEntity(null, user2, Formatter.parse("2022-09-07"), "Выдан"));
final var order3 = orderService
.create(new OrderEntity(null, user3, Formatter.parse("2024-03-15"), "Готов"));
log.info("Create default ordersFoods values");
orderFoodService.create(new OrderFoodEntity(null, order1, food1, 4));
orderFoodService.create(new OrderFoodEntity(null, order1, food3, 1));
orderFoodService.create(new OrderFoodEntity(null, order1, food4, 2));
orderFoodService.create(new OrderFoodEntity(null, order2, food2, 1));
orderFoodService.create(new OrderFoodEntity(null, order2, food5, 1));
orderFoodService.create(new OrderFoodEntity(null, order3, food3, 3));
}
}
}

View File

@ -1,29 +0,0 @@
package com.example.demo;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
public class TypeDto {
private String Name;
private String surName;
public TypeDto() {
}
@JsonCreator
public TypeDto(
@JsonProperty(value = "name") String Name,
@JsonProperty(value = "surName") String surName) {
this.Name = Name;
this.surName = surName;
}
public String getName() {
return Name;
}
public String getSurName() {
return surName;
}
}

View File

@ -0,0 +1,8 @@
package com.example.demo.core.configuration;
public class Constants {
public static final String API_URL = "/api/1.0";
private Constants() {
}
}

View File

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

View File

@ -1,4 +1,4 @@
package com.example.demo;
package com.example.demo.core.configuration;
import org.springframework.context.annotation.Configuration;
import org.springframework.lang.NonNull;
@ -6,7 +6,7 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebConfig implements WebMvcConfigurer {
public class WebConfiguration implements WebMvcConfigurer {
@Override
public void addCorsMappings(@NonNull CorsRegistry registry) {
registry.addMapping("/**")

View File

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

View File

@ -0,0 +1,20 @@
package com.example.demo.core.model;
public abstract class BaseEntity {
protected Long id;
protected BaseEntity() {
}
protected BaseEntity(Long id) {
this.id = id;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
}

View File

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

View File

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

View File

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

View File

@ -0,0 +1,78 @@
package com.example.demo.foods.api;
import java.text.ParseException;
import java.util.Date;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.example.demo.core.configuration.Constants;
import com.example.demo.core.utils.Formatter;
import com.example.demo.foods.model.FoodEntity;
import com.example.demo.foods.service.FoodService;
import com.example.demo.types.service.TypeService;
import jakarta.validation.Valid;
@RestController
@RequestMapping(Constants.API_URL + "/food")
public class FoodController {
private final FoodService foodService;
private final TypeService typeService;
private final ModelMapper modelMapper;
public FoodController(FoodService foodService, TypeService typeService, ModelMapper modelMapper) {
this.foodService = foodService;
this.typeService = typeService;
this.modelMapper = modelMapper;
}
private FoodDto toDto(FoodEntity entity) {
final FoodDto dto = modelMapper.map(entity, FoodDto.class);
String date = Formatter.format(entity.getDate());
dto.setDate(date);
return dto;
}
private FoodEntity toEntity(FoodDto dto) throws ParseException {
final FoodEntity entity = modelMapper.map(dto, FoodEntity.class);
Date date = Formatter.parse(dto.getDate());
entity.setDate(date);
entity.setType(typeService.get(dto.getTypeId()));
return entity;
}
@GetMapping
public List<FoodDto> getAll(@RequestParam(name = "typeId", defaultValue = "0") Long typeId) {
return foodService.getAll(typeId).stream().map(this::toDto).toList();
}
@GetMapping("/{id}")
public FoodDto get(@PathVariable(name = "id") Long id) {
return toDto(foodService.get(id));
}
@PostMapping
public FoodDto create(@RequestBody @Valid FoodDto dto) throws ParseException {
return toDto(foodService.create(toEntity(dto)));
}
@PutMapping("/{id}")
public FoodDto update(@PathVariable(name = "id") Long id, @RequestBody FoodDto dto) throws ParseException {
return toDto(foodService.update(id, toEntity(dto)));
}
@DeleteMapping("/{id}")
public FoodDto delete(@PathVariable(name = "id") Long id) {
return toDto(foodService.delete(id));
}
}

View File

@ -0,0 +1,79 @@
package com.example.demo.foods.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
public class FoodDto {
private Long id;
@NotNull
@Min(1)
private Long typeId;
@NotNull
@Min(1)
private Double price;
@NotNull
@Min(1)
private String name;
@NotNull
@Min(1)
private String date;
@NotNull
@Min(1)
private Integer count;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getTypeId() {
return typeId;
}
public void setTypeId(Long typeId) {
this.typeId = typeId;
}
public Double getPrice() {
return price;
}
public void setPrice(Double price) {
this.price = price;
}
public String getDate() {
return date;
}
public void setDate(String date) {
this.date = date;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Double getSum() {
return price * count;
}
}

View File

@ -0,0 +1,87 @@
package com.example.demo.foods.model;
import java.util.Date;
import java.util.Objects;
import com.example.demo.core.model.BaseEntity;
import com.example.demo.types.model.TypeEntity;
public class FoodEntity extends BaseEntity {
private TypeEntity type;
private Double price;
private String name;
private Date date;
private Integer count;
public FoodEntity() {
super();
}
public FoodEntity(Long id, TypeEntity type, Double price, String name, Date date, Integer count) {
super(id);
this.type = type;
this.price = price;
this.name = name;
this.date = date;
this.count = count;
}
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 String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
@Override
public int hashCode() {
return Objects.hash(id, type, price, count);
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null || getClass() != obj.getClass())
return false;
final FoodEntity other = (FoodEntity) obj;
return Objects.equals(other.getId(), id)
&& Objects.equals(other.getType(), type)
&& Objects.equals(other.getPrice(), price)
&& Objects.equals(other.getDate(), date)
&& Objects.equals(other.getCount(), count);
}
}

View File

@ -0,0 +1,10 @@
package com.example.demo.foods.repository;
import org.springframework.stereotype.Repository;
import com.example.demo.core.repository.MapRepository;
import com.example.demo.foods.model.FoodEntity;
@Repository
public class FoodRepository extends MapRepository<FoodEntity> {
}

View File

@ -0,0 +1,52 @@
package com.example.demo.foods.service;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import org.springframework.stereotype.Service;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.foods.model.FoodEntity;
import com.example.demo.foods.repository.FoodRepository;
@Service
public class FoodService {
private final FoodRepository repository;
public FoodService(FoodRepository repository) {
this.repository = repository;
}
public List<FoodEntity> getAll(Long typeId) {
if (Objects.equals(typeId, 0L)) {
return repository.getAll();
}
return repository.getAll().stream()
.filter(item -> item.getType().getId().equals(typeId))
.toList();
}
public FoodEntity get(Long id) {
return Optional.ofNullable(repository.get(id))
.orElseThrow(() -> new NotFoundException(id));
}
public FoodEntity create(FoodEntity entity) {
return repository.create(entity);
}
public FoodEntity update(Long id, FoodEntity entity) {
final FoodEntity existsEntity = get(id);
existsEntity.setType(entity.getType());
existsEntity.setPrice(entity.getPrice());
existsEntity.setDate(entity.getDate());
existsEntity.setCount(entity.getCount());
return repository.update(existsEntity);
}
public FoodEntity delete(Long id) {
final FoodEntity existsEntity = get(id);
return repository.delete(existsEntity);
}
}

View File

@ -0,0 +1,87 @@
package com.example.demo.orders.api;
import java.text.ParseException;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.orders.service.OrderService;
import com.example.demo.ordersfoods.api.OrderFoodDto;
import com.example.demo.ordersfoods.model.OrderFoodEntity;
import com.example.demo.ordersfoods.service.OrderFoodService;
import com.example.demo.users.service.UserService;
import com.example.demo.core.configuration.Constants;
import com.example.demo.core.utils.Formatter;
import jakarta.validation.Valid;
@RestController
@RequestMapping(Constants.API_URL + "/order")
public class OrderController {
private final OrderService orderService;
private final UserService userService;
private final ModelMapper modelMapper;
private final OrderFoodService orderFoodService;
public OrderController(OrderService orderService, UserService userService, ModelMapper modelMapper,
OrderFoodService orderFoodService) {
this.orderService = orderService;
this.userService = userService;
this.modelMapper = modelMapper;
this.orderFoodService = orderFoodService;
}
private OrderFoodDto toFoodDto(OrderFoodEntity entity) {
return modelMapper.map(entity, OrderFoodDto.class);
}
private OrderDto toDto(OrderEntity entity) {
final OrderDto dto = modelMapper.map(entity, OrderDto.class);
dto.setDate(Formatter.format(entity.getDate()));
dto.setSum(orderService.getFullSum(entity.getId()));
dto.setFoods(orderFoodService.getAll(entity.getId(), 0L).stream().map(this::toFoodDto).toList());
return dto;
}
private OrderEntity toEntity(OrderDto dto) throws ParseException {
final OrderEntity entity = modelMapper.map(dto, OrderEntity.class);
entity.setUser(userService.get(dto.getUserId()));
entity.setDate(Formatter.parse(dto.getDate()));
return entity;
}
@GetMapping
public List<OrderDto> getAll(@RequestParam(name = "userId", defaultValue = "0") Long userId) {
return orderService.getAll(userId).stream().map(this::toDto).toList();
}
@GetMapping("/{id}")
public OrderDto get(@PathVariable(name = "id") Long id) {
return toDto(orderService.get(id));
}
@PostMapping
public OrderDto create(@RequestBody @Valid OrderDto dto) throws ParseException {
return toDto(orderService.create(toEntity(dto)));
}
@PutMapping("/{id}")
public OrderDto update(@PathVariable(name = "id") Long id, @RequestBody OrderDto dto) throws ParseException {
return toDto(orderService.update(id, toEntity(dto)));
}
@DeleteMapping("/{id}")
public OrderDto delete(@PathVariable(name = "id") Long id) {
return toDto(orderService.delete(id));
}
}

View File

@ -0,0 +1,73 @@
package com.example.demo.orders.api;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.NotBlank;
import com.example.demo.ordersfoods.api.OrderFoodDto;
public class OrderDto {
private Long id;
private Double sum;
@NotNull
@Min(1)
private Long userId;
@NotBlank
private String date;
@NotBlank
private String status;
private List<OrderFoodDto> foods;
public List<OrderFoodDto> getFoods() {
return foods;
}
public void setFoods(List<OrderFoodDto> foods) {
this.foods = foods;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public String getDate() {
return date;
}
public void setDate(String date) {
this.date = date;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Double getSum() {
return sum;
}
public void setSum(Double sum) {
this.sum = sum;
}
}

View File

@ -0,0 +1,66 @@
package com.example.demo.orders.model;
import java.util.Date;
import java.util.Objects;
import com.example.demo.users.model.UserEntity;
import com.example.demo.core.model.BaseEntity;
public class OrderEntity extends BaseEntity {
private UserEntity user;
private Date date;
private String status;
public OrderEntity() {
super();
}
public OrderEntity(Long id, UserEntity user, Date date, String status) {
super(id);
this.user = user;
this.date = date;
this.status = status;
}
public UserEntity getUser() {
return user;
}
public void setUser(UserEntity user) {
this.user = user;
}
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
@Override
public int hashCode() {
return Objects.hash(id, user, date, status);
}
@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(), user)
&& Objects.equals(other.getDate(), date)
&& Objects.equals(other.getStatus(), status);
}
}

View File

@ -0,0 +1,10 @@
package com.example.demo.orders.repository;
import org.springframework.stereotype.Repository;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.core.repository.MapRepository;
@Repository
public class OrderRepository extends MapRepository<OrderEntity> {
}

View File

@ -0,0 +1,60 @@
package com.example.demo.orders.service;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import org.springframework.stereotype.Service;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.orders.repository.OrderRepository;
import com.example.demo.ordersfoods.service.OrderFoodService;
import com.example.demo.core.error.NotFoundException;
@Service
public class OrderService {
private final OrderRepository repository;
private final OrderFoodService orderFoodService;
public OrderService(OrderRepository repository, OrderFoodService orderFoodService) {
this.repository = repository;
this.orderFoodService = orderFoodService;
}
public List<OrderEntity> getAll(Long userId) {
if (Objects.equals(userId, 0L)) {
return repository.getAll();
}
return repository.getAll().stream()
.filter(order -> order.getUser().getId().equals(userId))
.toList();
}
public OrderEntity get(Long id) {
return Optional.ofNullable(repository.get(id))
.orElseThrow(() -> new NotFoundException(id));
}
public OrderEntity create(OrderEntity entity) {
return repository.create(entity);
}
public OrderEntity update(Long id, OrderEntity entity) {
final OrderEntity existsEntity = get(id);
existsEntity.setUser(entity.getUser());
existsEntity.setDate(entity.getDate());
existsEntity.setStatus(entity.getStatus());
return repository.update(existsEntity);
}
public OrderEntity delete(Long id) {
final OrderEntity existsEntity = get(id);
return repository.delete(existsEntity);
}
public Double getFullSum(Long id) {
return orderFoodService.getAll(id, 0L).stream()
.mapToDouble(orderFood -> orderFoodService.getSum(orderFood.getId()))
.sum();
}
}

View File

@ -0,0 +1,76 @@
package com.example.demo.ordersfoods.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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.example.demo.ordersfoods.model.OrderFoodEntity;
import com.example.demo.ordersfoods.service.OrderFoodService;
import com.example.demo.orders.service.OrderService;
import com.example.demo.foods.service.FoodService;
import com.example.demo.core.configuration.Constants;
import jakarta.validation.Valid;
@RestController
@RequestMapping(Constants.API_URL + "/orderfood")
public class OrderFoodController {
private final OrderFoodService orderFoodService;
private final OrderService orderService;
private final FoodService foodService;
private final ModelMapper modelMapper;
public OrderFoodController(OrderFoodService orderFoodService, OrderService orderService, FoodService foodService,
ModelMapper modelMapper) {
this.orderFoodService = orderFoodService;
this.orderService = orderService;
this.foodService = foodService;
this.modelMapper = modelMapper;
}
private OrderFoodDto toDto(OrderFoodEntity entity) {
return modelMapper.map(entity, OrderFoodDto.class);
}
private OrderFoodEntity toEntity(OrderFoodDto dto) {
final OrderFoodEntity entity = modelMapper.map(dto, OrderFoodEntity.class);
entity.setOrder(orderService.get(dto.getOrderId()));
entity.setFood(foodService.get(dto.getFoodId()));
return entity;
}
@GetMapping
public List<OrderFoodDto> getAll(@RequestParam(name = "orderId", defaultValue = "0") Long orderId,
@RequestParam(name = "foodId", defaultValue = "0") Long foodId) {
return orderFoodService.getAll(orderId, foodId).stream().map(this::toDto).toList();
}
@GetMapping("/{id}")
public OrderFoodDto get(@PathVariable(name = "id") Long id) {
return toDto(orderFoodService.get(id));
}
@PostMapping
public OrderFoodDto create(@RequestBody @Valid OrderFoodDto dto) {
return toDto(orderFoodService.create(toEntity(dto)));
}
@PutMapping("/{id}")
public OrderFoodDto update(@PathVariable(name = "id") Long id, @RequestBody OrderFoodDto dto) {
return toDto(orderFoodService.update(id, toEntity(dto)));
}
@DeleteMapping("/{id}")
public OrderFoodDto delete(@PathVariable(name = "id") Long id) {
return toDto(orderFoodService.delete(id));
}
}

View File

@ -0,0 +1,52 @@
package com.example.demo.ordersfoods.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
public class OrderFoodDto {
private Long id;
@NotNull
@Min(1)
private Long orderId;
@NotNull
@Min(1)
private Long bookId;
@NotNull
@Min(1)
private Integer count;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getOrderId() {
return orderId;
}
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public Long getFoodId() {
return bookId;
}
public void setFoodId(Long bookId) {
this.bookId = bookId;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
}

View File

@ -0,0 +1,66 @@
package com.example.demo.ordersfoods.model;
import java.util.Objects;
import com.example.demo.foods.model.FoodEntity;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.core.model.BaseEntity;
public class OrderFoodEntity extends BaseEntity {
private OrderEntity order;
private FoodEntity food;
private Integer count;
public OrderFoodEntity() {
super();
}
public OrderFoodEntity(Long id, OrderEntity order, FoodEntity food, Integer count) {
super(id);
this.order = order;
this.food = food;
this.count = count;
}
public OrderEntity getOrder() {
return order;
}
public void setOrder(OrderEntity order) {
this.order = order;
}
public FoodEntity getFood() {
return food;
}
public void setFood(FoodEntity food) {
this.food = food;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
@Override
public int hashCode() {
return Objects.hash(id, order, food, count);
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null || getClass() != obj.getClass())
return false;
final OrderFoodEntity other = (OrderFoodEntity) obj;
return Objects.equals(other.getId(), id)
&& Objects.equals(other.getOrder(), order)
&& Objects.equals(other.getFood(), food)
&& Objects.equals(other.getCount(), count);
}
}

View File

@ -0,0 +1,10 @@
package com.example.demo.ordersfoods.repository;
import org.springframework.stereotype.Repository;
import com.example.demo.core.repository.MapRepository;
import com.example.demo.ordersfoods.model.OrderFoodEntity;
@Repository
public class OrderFoodRepository extends MapRepository<OrderFoodEntity> {
}

View File

@ -0,0 +1,56 @@
package com.example.demo.ordersfoods.service;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import org.springframework.stereotype.Service;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.ordersfoods.model.OrderFoodEntity;
import com.example.demo.ordersfoods.repository.OrderFoodRepository;
@Service
public class OrderFoodService {
private final OrderFoodRepository repository;
public OrderFoodService(OrderFoodRepository repository) {
this.repository = repository;
}
public List<OrderFoodEntity> getAll(Long orderId, Long foodId) {
if (Objects.equals(orderId, 0L) && Objects.equals(foodId, 0L)) {
return repository.getAll();
}
return repository.getAll().stream()
.filter(order -> order.getOrder().getId().equals(orderId) || order.getFood().getId().equals(foodId))
.toList();
}
public OrderFoodEntity get(Long id) {
return Optional.ofNullable(repository.get(id))
.orElseThrow(() -> new NotFoundException(id));
}
public OrderFoodEntity create(OrderFoodEntity entity) {
return repository.create(entity);
}
public OrderFoodEntity update(Long id, OrderFoodEntity entity) {
final OrderFoodEntity existsEntity = get(id);
existsEntity.setOrder(entity.getOrder());
existsEntity.setFood(entity.getFood());
existsEntity.setCount(entity.getCount());
return repository.update(existsEntity);
}
public OrderFoodEntity delete(Long id) {
final OrderFoodEntity existsEntity = get(id);
return repository.delete(existsEntity);
}
public Double getSum(Long id) {
final OrderFoodEntity entity = get(id);
return entity.getCount() * entity.getFood().getPrice();
}
}

View File

@ -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 TypeDto dto) {
return toDto(typeService.update(id, toEntity(dto)));
}
@DeleteMapping("/{id}")
public TypeDto delete(@PathVariable(name = "id") Long id) {
return toDto(typeService.delete(id));
}
}

View File

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

View File

@ -0,0 +1,43 @@
package com.example.demo.types.model;
import java.util.Objects;
import com.example.demo.core.model.BaseEntity;
public class TypeEntity extends BaseEntity {
private String name;
public TypeEntity() {
super();
}
public TypeEntity(Long id, String name) {
super(id);
this.name = name;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Override
public int hashCode() {
return Objects.hash(id, name);
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null || getClass() != obj.getClass())
return false;
final TypeEntity other = (TypeEntity) obj;
return Objects.equals(other.getId(), id)
&& Objects.equals(other.getName(), name);
}
}

View File

@ -0,0 +1,10 @@
package com.example.demo.types.repository;
import org.springframework.stereotype.Repository;
import com.example.demo.core.repository.MapRepository;
import com.example.demo.types.model.TypeEntity;
@Repository
public class TypeRepository extends MapRepository<TypeEntity> {
}

View File

@ -0,0 +1,43 @@
package com.example.demo.types.service;
import java.util.List;
import java.util.Optional;
import org.springframework.stereotype.Service;
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;
}
public List<TypeEntity> getAll() {
return repository.getAll();
}
public TypeEntity get(Long id) {
return Optional.ofNullable(repository.get(id))
.orElseThrow(() -> new NotFoundException(id));
}
public TypeEntity create(TypeEntity entity) {
return repository.create(entity);
}
public TypeEntity update(Long id, TypeEntity entity) {
final TypeEntity existsEntity = get(id);
existsEntity.setName(entity.getName());
return repository.update(existsEntity);
}
public TypeEntity delete(Long id) {
final TypeEntity existsEntity = get(id);
return repository.delete(existsEntity);
}
}

View File

@ -0,0 +1,64 @@
package com.example.demo.users.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.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 List<UserDto> getAll() {
return userService.getAll().stream().map(this::toDto).toList();
}
@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 UserDto dto) {
return toDto(userService.update(id, toEntity(dto)));
}
@DeleteMapping("/{id}")
public UserDto delete(@PathVariable(name = "id") Long id) {
return toDto(userService.delete(id));
}
}

View File

@ -0,0 +1,59 @@
package com.example.demo.users.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.NotBlank;
public class UserDto {
private Long id;
@NotBlank
private String name;
@NotBlank
private String email;
@NotBlank
private String password;
@NotNull
private Boolean isAdmin;
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public Boolean getIsAdmin() {
return isAdmin;
}
public void setIsAdmin(Boolean isAdmin) {
this.isAdmin = isAdmin;
}
}

View File

@ -0,0 +1,75 @@
package com.example.demo.users.model;
import java.util.Objects;
import com.example.demo.core.model.BaseEntity;
public class UserEntity extends BaseEntity {
private String name;
private String email;
private String password;
private Boolean isAdmin;
public UserEntity() {
super();
}
public UserEntity(Long id, String name, String email, String password, Boolean isAdmin) {
super(id);
this.name = name;
this.email = email;
this.password = password;
this.isAdmin = isAdmin;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public Boolean getIsAdmin() {
return isAdmin;
}
public void setIsAdmin(Boolean isAdmin) {
this.isAdmin = isAdmin;
}
@Override
public int hashCode() {
return Objects.hash(id, name, email, password, isAdmin);
}
@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.getName(), name)
&& Objects.equals(other.getEmail(), email)
&& Objects.equals(other.getPassword(), password)
&& Objects.equals(other.getIsAdmin(), isAdmin);
}
}

View File

@ -0,0 +1,10 @@
package com.example.demo.users.repository;
import org.springframework.stereotype.Repository;
import com.example.demo.core.repository.MapRepository;
import com.example.demo.users.model.UserEntity;
@Repository
public class UserRepository extends MapRepository<UserEntity> {
}

View File

@ -0,0 +1,46 @@
package com.example.demo.users.service;
import java.util.List;
import java.util.Optional;
import org.springframework.stereotype.Service;
import com.example.demo.users.model.UserEntity;
import com.example.demo.users.repository.UserRepository;
import com.example.demo.core.error.NotFoundException;
@Service
public class UserService {
private final UserRepository repository;
public UserService(UserRepository repository) {
this.repository = repository;
}
public List<UserEntity> getAll() {
return repository.getAll();
}
public UserEntity get(Long id) {
return Optional.ofNullable(repository.get(id))
.orElseThrow(() -> new NotFoundException(id));
}
public UserEntity create(UserEntity entity) {
return repository.create(entity);
}
public UserEntity update(Long id, UserEntity entity) {
final UserEntity existsEntity = get(id);
existsEntity.setName(entity.getName());
existsEntity.setEmail(entity.getEmail());
existsEntity.setPassword(entity.getPassword());
existsEntity.setIsAdmin(entity.getIsAdmin());
return repository.update(existsEntity);
}
public UserEntity delete(Long id) {
final UserEntity existsEntity = get(id);
return repository.delete(existsEntity);
}
}

View File

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

View File

@ -0,0 +1,80 @@
package com.example.demo;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.foods.service.FoodService;
import com.example.demo.types.model.TypeEntity;
import com.example.demo.types.service.TypeService;
import com.example.demo.foods.model.FoodEntity;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
class FoodServiceTests {
@Autowired
private FoodService foodService;
@Autowired
private TypeService typeService;
private final SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
@Test
void getTest() {
Assertions.assertThrows(NotFoundException.class, () -> foodService.get(0L));
}
@Test
@Order(1)
void createTest() throws ParseException {
final var type1 = typeService.create(new TypeEntity(null, "Шаурма"));
final var type2 = typeService.create(new TypeEntity(null, "Напиток"));
final var type3 = typeService.create(new TypeEntity(null, "Бургер"));
foodService
.create(new FoodEntity(null, type1, 49999.00, "Бургер с говядиной", formatter.parse("2021-10-11"), 20));
foodService.create(new FoodEntity(null, type2, 129999.00, "Кола", formatter.parse("2021-10-11"), 3));
final FoodEntity last = foodService
.create(new FoodEntity(null, type3, 149999.00, "Греческий салат", formatter.parse("2021-11-11"), 5));
Assertions.assertEquals(3, foodService.getAll(0L).size());
Assertions.assertEquals(last, foodService.get(3L));
}
@Test
@Order(2)
void updateTest() throws ParseException {
final var type3 = typeService.create(new TypeEntity(null, "Бургер"));
final int test = 10;
final FoodEntity entity = foodService.get(3L);
final int oldName = entity.getCount();
final FoodEntity newEntity = foodService.update(3L,
new FoodEntity(1L, type3, 129999.00, "Греческий бургер", formatter.parse("2021-11-11"), test));
Assertions.assertEquals(3, foodService.getAll(0L).size());
Assertions.assertEquals(newEntity, foodService.get(3L));
Assertions.assertEquals(test, newEntity.getCount());
Assertions.assertNotEquals(oldName, newEntity.getCount());
}
@Test
@Order(3)
void deleteTest() throws ParseException {
foodService.delete(3L);
Assertions.assertEquals(2, foodService.getAll(0L).size());
final FoodEntity last = foodService.get(2L);
Assertions.assertEquals(2L, last.getId());
final var type1 = typeService.create(new TypeEntity(null, "Шаурма"));
final FoodEntity newEntity = foodService
.create(new FoodEntity(null, type1, 129999.00, "Шаурма с курицей", formatter.parse("2021-10-11"), 3));
Assertions.assertEquals(3, foodService.getAll(0L).size());
Assertions.assertEquals(4L, newEntity.getId());
}
}

View File

@ -0,0 +1,112 @@
package com.example.demo;
import java.text.ParseException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.example.demo.users.model.UserEntity;
import com.example.demo.users.service.UserService;
import com.example.demo.types.model.TypeEntity;
import com.example.demo.types.service.TypeService;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.orders.service.OrderService;
import com.example.demo.ordersfoods.model.OrderFoodEntity;
import com.example.demo.ordersfoods.service.OrderFoodService;
import com.example.demo.foods.model.FoodEntity;
import com.example.demo.foods.service.FoodService;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.core.utils.Formatter;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
class OrderFoodServiceTests {
@Autowired
private UserService userService;
@Autowired
private TypeService typeService;
@Autowired
private OrderService orderService;
@Autowired
private FoodService foodService;
@Autowired
private OrderFoodService orderFoodService;
@Test
void getTest() {
Assertions.assertThrows(NotFoundException.class, () -> orderFoodService.get(0L));
}
@Test
@Order(1)
void createTest() throws ParseException {
final var type = typeService.create(new TypeEntity(null, "Бургер"));
final var user = userService
.create(new UserEntity(null, "TestUser", "user53262@gmail.com", "lawy7728", false));
final var order1 = orderService
.create(new OrderEntity(null, user, Formatter.parse("2024-03-28"), "Выполняется"));
final var order2 = orderService
.create(new OrderEntity(null, user, Formatter.parse("2022-09-07"), "Выдан"));
final var food1 = foodService.create(new FoodEntity(null, type, 145.00, "бургер",
Formatter.parse("2021-10-11"), 10));
final var food2 = foodService.create(new FoodEntity(null, type, 145.00, "Греческий бургер",
Formatter.parse("2021-10-11"), 10));
orderFoodService.create(new OrderFoodEntity(null, order1, food1, 4));
orderFoodService.create(new OrderFoodEntity(null, order1, food2, 1));
final OrderFoodEntity last = orderFoodService.create(new OrderFoodEntity(null, order2, food1, 2));
Assertions.assertEquals(3, orderFoodService.getAll(0L, 0L).size());
Assertions.assertEquals(last, orderFoodService.get(3L));
}
@Test
@Order(2)
void updateTest() throws ParseException {
final var type = typeService.create(new TypeEntity(null, "Художественная литература"));
final var user = userService
.create(new UserEntity(null, "TestUser", "user53262@gmail.com", "lawy7728", false));
final var order1 = orderService
.create(new OrderEntity(null, user, Formatter.parse("2024-03-28"), "Выполняется"));
final var food2 = foodService.create(new FoodEntity(null, type, 145.00, "Греческий бургер",
Formatter.parse("2021-10-11"), 10));
final Integer newCount = 6;
final OrderFoodEntity entity = orderFoodService.get(3L);
final Integer oldCount = entity.getCount();
final OrderFoodEntity newEntity = orderFoodService.update(3L,
new OrderFoodEntity(null, order1, food2, newCount));
Assertions.assertEquals(3, orderFoodService.getAll(0L, 0L).size());
Assertions.assertEquals(newEntity, orderFoodService.get(3L));
Assertions.assertEquals(newCount, newEntity.getCount());
Assertions.assertNotEquals(oldCount, newEntity.getCount());
}
@Test
@Order(3)
void deleteTest() throws ParseException {
final var type = typeService.create(new TypeEntity(null, "Художественная литература"));
final var user = userService
.create(new UserEntity(null, "TestUser", "user53262@gmail.com", "lawy7728", false));
final var order2 = orderService
.create(new OrderEntity(null, user, Formatter.parse("2022-09-07"), "Выдан"));
final var food1 = foodService.create(new FoodEntity(null, type, 145.00, "Греческий бургер",
Formatter.parse("2021-10-11"), 10));
orderFoodService.delete(3L);
Assertions.assertEquals(2, orderFoodService.getAll(0L, 0L).size());
final OrderFoodEntity last = orderFoodService.get(2L);
Assertions.assertEquals(2L, last.getId());
final OrderFoodEntity newEntity = orderFoodService.create(new OrderFoodEntity(null, order2, food1, 2));
Assertions.assertEquals(3, orderFoodService.getAll(0L, 0L).size());
Assertions.assertEquals(4L, newEntity.getId());
}
}

View File

@ -0,0 +1,82 @@
package com.example.demo;
import java.text.ParseException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.example.demo.orders.model.OrderEntity;
import com.example.demo.orders.service.OrderService;
import com.example.demo.users.model.UserEntity;
import com.example.demo.users.service.UserService;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.core.utils.Formatter;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
class OrderServiceTests {
@Autowired
private UserService userService;
@Autowired
private OrderService orderService;
@Test
void getTest() {
Assertions.assertThrows(NotFoundException.class, () -> orderService.get(0L));
}
@Test
@Order(1)
void createTest() throws ParseException {
final UserEntity user = userService.create(
new UserEntity(null, "TestUser", "user53262@gmail.com", "lawy7728", false));
orderService.create(new OrderEntity(null, user, Formatter.parse("2024-03-28"), "Выполняется"));
orderService.create(new OrderEntity(null, user, Formatter.parse("2022-09-07"), "Выдан"));
final OrderEntity last = orderService
.create(new OrderEntity(null, user, Formatter.parse("2024-03-15"), "Готов"));
Assertions.assertEquals(3, orderService.getAll(0L).size());
Assertions.assertEquals(last, orderService.get(3L));
}
@Test
@Order(2)
void updateTest() throws ParseException {
final UserEntity user = userService.create(
new UserEntity(null, "Chief", "forum98761@gmail.com", "bth4323", true));
final String test = "TEST";
final OrderEntity entity = orderService.get(3L);
final UserEntity oldUser = entity.getUser();
final String oldStatus = entity.getStatus();
final OrderEntity newEntity = orderService.update(3L,
new OrderEntity(null, user, Formatter.parse("2024-03-15"), test));
Assertions.assertEquals(3, orderService.getAll(0L).size());
Assertions.assertEquals(newEntity, orderService.get(3L));
Assertions.assertEquals(test, newEntity.getStatus());
Assertions.assertEquals(user, newEntity.getUser());
Assertions.assertNotEquals(oldStatus, newEntity.getStatus());
Assertions.assertNotEquals(oldUser, newEntity.getUser());
}
@Test
@Order(3)
void deleteTest() throws ParseException {
orderService.delete(3L);
Assertions.assertEquals(2, orderService.getAll(0L).size());
final OrderEntity last = orderService.get(2L);
Assertions.assertEquals(2L, last.getId());
final UserEntity user = userService.create(
new UserEntity(null, "TestUser", "user53262@gmail.com", "lawy7728", false));
final OrderEntity newEntity = orderService.create(
new OrderEntity(null, user, Formatter.parse("2024-03-15"), "Готов"));
Assertions.assertEquals(3, orderService.getAll(0L).size());
Assertions.assertEquals(4L, newEntity.getId());
}
}

View File

@ -0,0 +1,61 @@
package com.example.demo;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.example.demo.core.error.NotFoundException;
import com.example.demo.types.model.TypeEntity;
import com.example.demo.types.service.TypeService;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
class TypeServiceTests {
@Autowired
private TypeService typeService;
@Test
void getTest() {
Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L));
}
@Test
@Order(1)
void createTest() {
typeService.create(new TypeEntity(null, "Шаурма"));
typeService.create(new TypeEntity(null, "Напиток"));
final TypeEntity last = typeService.create(new TypeEntity(null, "Игровая приставка"));
Assertions.assertEquals(3, typeService.getAll().size());
Assertions.assertEquals(last, typeService.get(3L));
}
@Test
@Order(2)
void updateTest() {
final String test = "TEST";
final TypeEntity entity = typeService.get(3L);
final String oldName = entity.getName();
final TypeEntity newEntity = typeService.update(3L, new TypeEntity(1L, test));
Assertions.assertEquals(3, typeService.getAll().size());
Assertions.assertEquals(newEntity, typeService.get(3L));
Assertions.assertEquals(test, newEntity.getName());
Assertions.assertNotEquals(oldName, newEntity.getName());
}
@Test
@Order(3)
void deleteTest() {
typeService.delete(3L);
Assertions.assertEquals(2, typeService.getAll().size());
final TypeEntity last = typeService.get(2L);
Assertions.assertEquals(2L, last.getId());
final TypeEntity newEntity = typeService.create(new TypeEntity(null, "Игровая приставка"));
Assertions.assertEquals(3, typeService.getAll().size());
Assertions.assertEquals(4L, newEntity.getId());
}
}

View File

@ -0,0 +1,64 @@
package com.example.demo;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.example.demo.users.model.UserEntity;
import com.example.demo.users.service.UserService;
import com.example.demo.core.error.NotFoundException;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
class UserServiceTests {
@Autowired
private UserService userService;
@Test
void getTest() {
Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L));
}
@Test
@Order(1)
void createTest() {
userService.create(new UserEntity(null, "Chief", "forum98761@gmail.com", "bth4323", true));
userService.create(new UserEntity(null, "Dude23", "ovalinartem25@gmail.com", "dsre32462", false));
final UserEntity last = userService.create(new UserEntity(null, "TestUser", "user53262@gmail.com",
"lawy7728", false));
Assertions.assertEquals(3, userService.getAll().size());
Assertions.assertEquals(last, userService.get(3L));
}
@Test
@Order(2)
void updateTest() {
final String test = "TEST";
final UserEntity entity = userService.get(3L);
final String oldName = entity.getName();
final UserEntity newEntity = userService.update(3L, new UserEntity(1L, test, "user53262@gmail.com",
"lawy7728", false));
Assertions.assertEquals(3, userService.getAll().size());
Assertions.assertEquals(newEntity, userService.get(3L));
Assertions.assertEquals(test, newEntity.getName());
Assertions.assertNotEquals(oldName, newEntity.getName());
}
@Test
@Order(3)
void deleteTest() {
userService.delete(3L);
Assertions.assertEquals(2, userService.getAll().size());
final UserEntity last = userService.get(2L);
Assertions.assertEquals(2L, last.getId());
final UserEntity newEntity = userService.create(new UserEntity(null, "TestUser", "user53262@gmail.com",
"lawy7728", false));
Assertions.assertEquals(3, userService.getAll().size());
Assertions.assertEquals(4L, newEntity.getId());
}
}