diff --git a/demo/src/main/java/com/example/demo/orders/api/OrderController.java b/demo/src/main/java/com/example/demo/orders/api/OrderController.java index 1040314..1446e49 100644 --- a/demo/src/main/java/com/example/demo/orders/api/OrderController.java +++ b/demo/src/main/java/com/example/demo/orders/api/OrderController.java @@ -39,7 +39,6 @@ public class OrderController { private OrderDto toDto(OrderEntity entity) { OrderDto dto = new OrderDto(productService); dto.setId(entity.getId()); - dto.setUserId(entity.getUser().getId()); dto.setProductId(entity.getProduct().getId()); dto.setCount(entity.getCount()); return dto; diff --git a/demo/src/main/java/com/example/demo/orders/api/OrderDto.java b/demo/src/main/java/com/example/demo/orders/api/OrderDto.java index 2631fdd..96c769b 100644 --- a/demo/src/main/java/com/example/demo/orders/api/OrderDto.java +++ b/demo/src/main/java/com/example/demo/orders/api/OrderDto.java @@ -38,13 +38,10 @@ public class OrderDto { this.id = id; } + @JsonProperty(access = JsonProperty.Access.READ_ONLY) public Long getUserId() { return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } + } public Long getProductId() { return productId; diff --git a/demo/src/main/java/com/example/demo/orders/service/OrderService.java b/demo/src/main/java/com/example/demo/orders/service/OrderService.java index e3ab454..ea0ed3b 100644 --- a/demo/src/main/java/com/example/demo/orders/service/OrderService.java +++ b/demo/src/main/java/com/example/demo/orders/service/OrderService.java @@ -37,7 +37,6 @@ public class OrderService { public OrderEntity update(Long id, OrderEntity entity) { final OrderEntity existsEntity = get(id); - existsEntity.setUser(entity.getUser()); existsEntity.setProduct(entity.getProduct()); existsEntity.setCount(entity.getCount()); return repository.update(existsEntity); diff --git a/demo/src/test/java/com/example/demo/TypeServiceTests.java b/demo/src/test/java/com/example/demo/TypeServiceTests.java index 07f7076..c4a39d0 100644 --- a/demo/src/test/java/com/example/demo/TypeServiceTests.java +++ b/demo/src/test/java/com/example/demo/TypeServiceTests.java @@ -29,8 +29,8 @@ class TypeServiceTests { 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)); + Assertions.assertEquals(9, typeService.getAll().size()); + Assertions.assertEquals(last, typeService.get(9L)); } @Test @@ -40,7 +40,7 @@ class TypeServiceTests { 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(9, typeService.getAll().size()); Assertions.assertEquals(newEntity, typeService.get(3L)); Assertions.assertEquals(test, newEntity.getName()); Assertions.assertNotEquals(oldName, newEntity.getName()); @@ -50,12 +50,12 @@ class TypeServiceTests { @Order(3) void deleteTest() { typeService.delete(3L); - Assertions.assertEquals(2, typeService.getAll().size()); + Assertions.assertEquals(8, 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()); + Assertions.assertEquals(9, typeService.getAll().size()); + Assertions.assertEquals(10L, newEntity.getId()); } }