Merge branch 'add-tests' into develop

src/main/java/com/example/testj/domain/Order.java

@@ -2,12 +2,14 @@ package com.example.testj.domain;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,10 +29,10 @@ public class Order {
     @Column(name = "client")
     private String client;
 
-    @NotBlank
+    @NotNull
     @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
     @Column(name = "date")
-    private String date;
+    private LocalDate date;
 
     @NotBlank
     @Column(name = "address")

src/main/java/com/example/testj/domain/OrderLine.java

@@ -22,19 +22,19 @@ public class OrderLine {
     @Column(name = "id")
     private Long id;
 
+    @NotNull
     @JsonIgnore
     @ManyToOne
     @JoinColumn(name = "order_id")
-    @NotNull
     private Order order;
 
+    @NotNull
     @ManyToOne
     @JoinColumn(name = "goods_id")
-    @NotNull
     private Goods goods;
 
-    @Column(name = "count")
     @NumberFormat
     @Min(1)
+    @Column(name = "count")
     private int count;
 }

src/main/java/com/example/testj/exception/ApiError.java

+package com.example.testj.exception;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.http.HttpStatus;
+
+import java.util.*;
+
+@Getter
+@Setter
+public class ApiError {
+
+    private final Date timestamp;
+    private HttpStatus status;
+    private String message;
+    private List<Map<String, String>> errors;
+
+    public ApiError() {
+        timestamp = new Date();
+    }
+
+    public ApiError(HttpStatus status, String message, List<Map<String, String>> errors) {
+        super();
+        timestamp = new Date();
+        this.status = status;
+        this.message = message;
+        this.errors = errors;
+    }
+
+    public ApiError(HttpStatus status, String message, String error) {
+        super();
+        timestamp = new Date();
+        this.status = status;
+        this.message = message;
+        errors = new ArrayList<>((Collection) Map.of("message", error));
+
+    }
+}
\ No newline at end of file

src/main/java/com/example/testj/exception/RestResponseEntityExceptionHandler.java

+package com.example.testj.exception;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@ControllerAdvice
+public class RestResponseEntityExceptionHandler
+        extends ResponseEntityExceptionHandler {
+
+    @ExceptionHandler({ DateTimeParseException.class })
+    public ResponseEntity<Object> handleDateTimeParseException(Exception ex, WebRequest request) {
+        List<Map<String, String>> errors = List.of(Map.of("field", "date", "message", ex.getMessage()));
+        ApiError body = new ApiError(HttpStatus.BAD_REQUEST, "Date parse error", errors);
+        return new ResponseEntity<>(body, new HttpHeaders(), HttpStatus.BAD_REQUEST);
+    }
+
+    // 500
+    @ExceptionHandler({ Exception.class })
+    public ResponseEntity<Object> handleAll(Exception ex, WebRequest request) {
+        final ApiError apiError = new ApiError(HttpStatus.INTERNAL_SERVER_ERROR, ex.getLocalizedMessage(), "error occurred");
+        return new ResponseEntity<>(apiError, new HttpHeaders(), apiError.getStatus());
+    }
+
+    protected ResponseEntity<Object> handleMethodArgumentNotValid(
+            MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) {
+        //Get all fields errors
+        List<Map<String, String>> errors = ex.getBindingResult()
+                .getFieldErrors()
+                .stream()
+                .map(err -> Map.of("field", err.getField(), "message", err.getDefaultMessage()))
+                .collect(Collectors.toList());
+        ApiError body = new ApiError(HttpStatus.BAD_REQUEST, ex.getBody().getDetail(), errors);
+        return handleExceptionInternal(ex, body, headers, status, request);
+    }
+
+    protected ResponseEntity<Object> handleHttpMessageNotReadable(
+            HttpMessageNotReadableException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) {
+        ApiError body = new ApiError(HttpStatus.BAD_REQUEST, ex.getMessage(), new ArrayList<>());
+        return handleExceptionInternal(ex, body, headers, status, request);
+    }
+}

src/main/java/com/example/testj/service/dto/OrderDto.java

 package com.example.testj.service.dto;
 
 import jakarta.validation.constraints.NotBlank;
-import lombok.*;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -19,8 +25,9 @@ public class OrderDto implements Serializable {
     @NotBlank
     private String client;
 
-    @NotBlank
-    private String date;
+    @NotNull
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate date;
 
     @NotBlank
     private String address;

src/test/java/com/example/testj/repository/OrderRepositoryTest.java

@@ -7,6 +7,7 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
 import org.springframework.test.context.ActiveProfiles;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
@@ -27,7 +28,7 @@ public class OrderRepositoryTest {
         Order order = new Order();
         order.setClient("Client 1");
         order.setAddress("Address 1");
-        order.setDate("2000-01-01");
+        order.setDate(LocalDate.of(2000, 1, 1));
         // when
         orderRepository.save(order);
         // then
@@ -61,7 +62,7 @@ public class OrderRepositoryTest {
         Order order = entityManager.find(Order.class, 1L);
         order.setAddress("Address 2");
         order.setClient("Client 2");
-        order.setDate("2000-01-01");
+        order.setDate(LocalDate.of(2002, 2, 2));
         // when
         Order saved = orderRepository.save(order);
         // then

src/test/java/com/example/testj/service/OrderLineServiceTest.java

@@ -18,6 +18,7 @@ import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.time.LocalDate;
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -52,7 +53,7 @@ public class OrderLineServiceTest {
 
     @BeforeAll
     static void init() {
-        orderDto = new OrderDto(1L, "client 1", "20-20-2020", "address 1", null);
+        orderDto = new OrderDto(1L, "client 1", LocalDate.of(2020, 1, 20), "address 1", null);
         goodsDto = new GoodsDto(1L, "product 1", 10.99);
         orderLine = new OrderLine(
                 1L,

src/test/java/com/example/testj/service/OrderServiceTest.java

@@ -19,6 +19,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PagedModel;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -46,13 +47,13 @@ public class OrderServiceTest {
         order.setId(1L);
         order.setClient("client 1");
         order.setAddress("address 1");
-        order.setDate("20-20-2020");
+        order.setDate(LocalDate.of(2020, 1, 1));
 
         Order order1 = new Order();
         order1.setId(2L);
         order1.setClient("client 2");
         order1.setAddress("address 2");
-        order1.setDate("10-10-2021");
+        order1.setDate(LocalDate.of(2020, 2, 20));
 
         ordersList = Stream.of(
                 order,
@@ -63,7 +64,7 @@ public class OrderServiceTest {
     @Test
     void testCreateOrUpdateOrder() {
         // given
-        Order order = new Order(null, "client new", "01-01-2021", "address new", null);
+        Order order = new Order(null, "client new", LocalDate.of(2021, 1, 1), "address new", null);
 
         Order result = new Order(
                 ordersList.getLast().getId() + 1,
@@ -84,7 +85,7 @@ public class OrderServiceTest {
     @Disabled
     void testSaveOrderWithEmptyClient() {
         // given
-        Order order = new Order(null, "", "01-01-2020", "address new", null);
+        Order order = new Order(null, "", LocalDate.of(2020, 1, 1), "address new", null);
         // when
         assertThrows(ConstraintViolationException.class, () -> orderService.createOrUpdateOrder(order));
         // then
@@ -95,7 +96,7 @@ public class OrderServiceTest {
     @Disabled
     void testSaveOrderWithNullName() {
         // given
-        Order order = new Order(null, null,  "01-01-2020", "address", null);
+        Order order = new Order(null, null,  LocalDate.of(2020, 1, 1), "address", null);
         // when
         assertThrows(ConstraintViolationException.class, () -> orderService.createOrUpdateOrder(order));
         // then
@@ -133,7 +134,7 @@ public class OrderServiceTest {
         Order order = ordersList.getFirst();
         order.setClient("client new");
         order.setAddress("address new");
-        order.setDate("02-02-2020");
+        order.setDate(LocalDate.of(2020, 2, 2));
         // when
         when(orderRepository.save(order)).thenReturn(order);
         OrderDto updated = orderService.createOrUpdateOrder(order);

src/test/java/com/example/testj/web/rest/GoodsControllerTest.java

@@ -5,6 +5,7 @@ import com.example.testj.service.GoodsService;
 import com.example.testj.service.dto.GoodsDto;
 import com.example.testj.service.mapper.GoodsMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.hamcrest.Matchers;
 import org.json.JSONObject;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -109,7 +110,9 @@ public class GoodsControllerTest {
         JSONObject bodyJson = new JSONObject("{'name': null, 'price': 0}");
 
         mvc.perform(post("/api/goods").contentType(MediaType.APPLICATION_JSON).content(bodyJson.toString()))
-                .andExpect(status().isBadRequest());
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.errors[*].field").value(
+                        Matchers.containsInAnyOrder("name", "price")));
     }
 
     @Test

src/test/java/com/example/testj/web/rest/OrderControllerTest.java

@@ -4,6 +4,8 @@ import com.example.testj.service.OrderService;
 import com.example.testj.service.dto.OrderDto;
 import com.example.testj.service.mapper.OrderMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.hamcrest.Matchers;
+import org.json.JSONObject;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -18,6 +20,7 @@ import org.springframework.data.web.PagedModel;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
@@ -34,6 +37,9 @@ public class OrderControllerTest {
     @Autowired
     private MockMvc mvc;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
     @MockBean
     private OrderService orderService;
 
@@ -46,10 +52,10 @@ public class OrderControllerTest {
     static void init() {
         ordersList = Stream.of(
                 new OrderDto(
-                        1L, "client 1", "20-20-2020", "address 1", null
+                        1L, "client 1", LocalDate.of(2020, 1, 20), "address 1", null
                 ),
                 new OrderDto(
-                        2L, "client 2", "20-20-2020", "address 2", null
+                        2L, "client 2", LocalDate.of(2020, 1, 21), "address 2", null
                 )
         ).toList();
     }
@@ -83,9 +89,9 @@ public class OrderControllerTest {
     @DisplayName("POST /api/orders [201 Created]")
     void testCreateOrder() throws Exception {
         OrderDto orderDto = new OrderDto(
-               null, "client new", "21-21-2021", "address new", null
+               null, "client new", LocalDate.of(2021, 1, 21), "address new", null
         );
-        String body = new ObjectMapper().writeValueAsString(orderDto);
+        String body = objectMapper.writeValueAsString(orderDto);
         Long nextId = (ordersList.getLast().getId() + 1);
         orderDto.setId(nextId);
 
@@ -96,7 +102,18 @@ public class OrderControllerTest {
                 .andExpect(jsonPath("$.id").isNumber())
                 .andExpect(jsonPath("$.client").value(orderDto.getClient()))
                 .andExpect(jsonPath("$.address").value(orderDto.getAddress()))
-                .andExpect(jsonPath("$.date").value(orderDto.getDate())).andReturn();
+                .andExpect(jsonPath("$.date").value(orderDto.getDate().toString())).andReturn();
+    }
+
+    @Test
+    @DisplayName("POST /api/orders [400 Bad Request]")
+    void testCreateOrderBadRequest() throws Exception {
+        JSONObject bodyJson = new JSONObject("{'client': null, 'address': '', 'date': ''}");
+
+        mvc.perform(post("/api/orders").contentType(MediaType.APPLICATION_JSON).content(bodyJson.toString()))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.errors[*].field").value(
+                        Matchers.containsInAnyOrder("client", "address", "date")));
     }
 
     @Test
@@ -104,9 +121,9 @@ public class OrderControllerTest {
     void testUpdateOrder() throws Exception {
         Long id = 1L;
         OrderDto orderDto = new OrderDto(
-                id, "client new", "21-21-2021", "address new", null
+                id, "client new", LocalDate.of(2021,1,21), "address new", null
         );
-        String body = new ObjectMapper().writeValueAsString(orderDto);
+        String body = objectMapper.writeValueAsString(orderDto);
 
         when(orderService.getOrder(id)).thenReturn(ordersList.getFirst());
         when(orderService.createOrUpdateOrder(orderMapper.toEntity(orderDto))).thenReturn(orderDto);
@@ -117,7 +134,7 @@ public class OrderControllerTest {
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.client").value(orderDto.getClient()))
                 .andExpect(jsonPath("$.address").value(orderDto.getAddress()))
-                .andExpect(jsonPath("$.date").value(orderDto.getDate()));
+                .andExpect(jsonPath("$.date").value(orderDto.getDate().toString()));
     }
 
     @Test