Renamed to RequestModelsOrder & RequestModelsProduct

Renamed ProductRequest to RequestModelsProduct.

Renamed OrderRequest to RequestModelsOrder.

Author: MohammadIqbalAD

src/main/java/com/answerdigital/answerking/controller/OrderController.java

@@ -1,7 +1,7 @@
 package com.answerdigital.answerking.controller;
 
 import com.answerdigital.answerking.model.Order;
-import com.answerdigital.answerking.request.OrderRequest;
+import com.answerdigital.answerking.request.RequestModelsOrder;
 import com.answerdigital.answerking.service.OrderService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +35,7 @@ public OrderController(final OrderService orderService) {
     }
 
     @PostMapping
-    public ResponseEntity<Order> addOrder(@Valid @RequestBody final OrderRequest orderRequest) {
+    public ResponseEntity<Order> addOrder(@Valid @RequestBody final RequestModelsOrder orderRequest) {
         return new ResponseEntity<>(orderService.addOrder(orderRequest), HttpStatus.CREATED);
     }
 
@@ -46,7 +46,7 @@ public ResponseEntity<Order> getOrder(@PathVariable @NotNull final Long orderId)
 
     @PutMapping("/{orderId}")
     public ResponseEntity<Order> updateOrder(@PathVariable @NotNull final Long orderId,
-                                             @Valid @RequestBody final OrderRequest orderRequest) {
+                                             @Valid @RequestBody final RequestModelsOrder orderRequest) {
         return new ResponseEntity<>(orderService.updateOrder(orderId, orderRequest), HttpStatus.OK);
     }
 

src/main/java/com/answerdigital/answerking/controller/ProductController.java

@@ -2,7 +2,7 @@
 
 import com.answerdigital.answerking.exception.util.ErrorResponse;
 import com.answerdigital.answerking.model.Product;
-import com.answerdigital.answerking.request.ProductRequest;
+import com.answerdigital.answerking.request.RequestModelsProduct;
 import com.answerdigital.answerking.service.ProductService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -71,7 +71,7 @@ public ResponseEntity<Product> getProductById(@Valid @PathVariable @NotNull fina
                                     schema = @Schema(implementation = ErrorResponse.class)) })
     })
     @PostMapping
-    public ResponseEntity<Product> addProduct(@Valid @RequestBody final ProductRequest productRequest) {
+    public ResponseEntity<Product> addProduct(@Valid @RequestBody final RequestModelsProduct productRequest) {
         return new ResponseEntity<>(productService.addNewProduct(productRequest), HttpStatus.CREATED);
     }
 
@@ -88,7 +88,7 @@ public ResponseEntity<Product> addProduct(@Valid @RequestBody final ProductReque
     })
     @PutMapping("/{id}")
     public ResponseEntity<Product> updateProduct(@PathVariable @NotNull final Long id,
-                                              @Valid @RequestBody final ProductRequest productRequest) {
+                                              @Valid @RequestBody final RequestModelsProduct productRequest) {
         return new ResponseEntity<>(productService.updateProduct(id, productRequest), HttpStatus.OK);
     }
 

src/main/java/com/answerdigital/answerking/mapper/OrderMapper.java

@@ -1,7 +1,7 @@
 package com.answerdigital.answerking.mapper;
 
 import com.answerdigital.answerking.model.Order;
-import com.answerdigital.answerking.request.OrderRequest;
+import com.answerdigital.answerking.request.RequestModelsOrder;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
@@ -12,7 +12,7 @@ public interface OrderMapper {
 
     @Mapping(target = "orderStatus", constant = "IN_PROGRESS")
     @Mapping(target = "lineItems", expression = "java(Collections.EMPTY_SET)")
-    Order addRequestToOrder(OrderRequest orderRequest);
+    Order addRequestToOrder(RequestModelsOrder orderRequest);
 
-    Order updateOrderRequest(@MappingTarget Order order, OrderRequest orderRequest);
+    Order updateOrderRequest(@MappingTarget Order order, RequestModelsOrder orderRequest);
 }

src/main/java/com/answerdigital/answerking/mapper/ProductMapper.java

@@ -1,15 +1,15 @@
 package com.answerdigital.answerking.mapper;
 
 import com.answerdigital.answerking.model.Product;
-import com.answerdigital.answerking.request.ProductRequest;
+import com.answerdigital.answerking.request.RequestModelsProduct;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
 
 @Mapper(componentModel = "spring")
 public interface ProductMapper {
     @Mapping(target = "retired", constant = "false")
-    Product addRequestToProduct(ProductRequest productRequest);
+    Product addRequestToProduct(RequestModelsProduct productRequest);
 
-    Product updateRequestToProduct(@MappingTarget Product product, ProductRequest productRequest);
+    Product updateRequestToProduct(@MappingTarget Product product, RequestModelsProduct productRequest);
 }

src/main/java/com/answerdigital/answerking/model/Product.java

@@ -1,6 +1,6 @@
 package com.answerdigital.answerking.model;
 
-import com.answerdigital.answerking.request.ProductRequest;
+import com.answerdigital.answerking.request.RequestModelsProduct;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -60,7 +60,7 @@ public class Product {
     @JsonIgnore
     private Set<LineItem> lineItems = new HashSet<>();
 
-    public Product(final ProductRequest productRequest){
+    public Product(final RequestModelsProduct productRequest){
         this.name = productRequest.name();
         this.description = productRequest.description();
         this.price = productRequest.price();

…tal/answerking/request/OrderRequest.java …swerking/request/RequestModelsOrder.javasrc/main/java/com/answerdigital/answerking/request/OrderRequest.java renamed to src/main/java/com/answerdigital/answerking/request/RequestModelsOrder.java src/main/java/com/answerdigital/answerking/request/OrderRequest.java renamed to src/main/java/com/answerdigital/answerking/request/RequestModelsOrder.java

@@ -2,5 +2,5 @@
 
 import javax.validation.constraints.NotBlank;
 
-public record OrderRequest(@NotBlank String address) {
+public record RequestModelsOrder(@NotBlank String address) {
 }

…l/answerking/request/ProductRequest.java …erking/request/RequestModelsProduct.javasrc/main/java/com/answerdigital/answerking/request/ProductRequest.java renamed to src/main/java/com/answerdigital/answerking/request/RequestModelsProduct.java src/main/java/com/answerdigital/answerking/request/ProductRequest.java renamed to src/main/java/com/answerdigital/answerking/request/RequestModelsProduct.java

@@ -9,7 +9,7 @@
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
-public record ProductRequest(
+public record RequestModelsProduct(
         @NotBlank
         @Pattern(regexp = "^[a-zA-Z\s-]*",
                 message = "Product name must only contain letters, spaces and dashes")
@@ -25,6 +25,6 @@ public record ProductRequest(
         BigDecimal price
 ) {
     @Builder
-    public ProductRequest {
+    public RequestModelsProduct {
     }
 }

src/main/java/com/answerdigital/answerking/service/OrderService.java

@@ -8,7 +8,7 @@
 import com.answerdigital.answerking.model.Product;
 import com.answerdigital.answerking.model.Order;
 import com.answerdigital.answerking.repository.OrderRepository;
-import com.answerdigital.answerking.request.OrderRequest;
+import com.answerdigital.answerking.request.RequestModelsOrder;
 import org.mapstruct.factory.Mappers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,7 +32,7 @@ public OrderService(final OrderRepository orderRepository, final ProductService
         this.productService = productService;
     }
 
-    public Order addOrder(final OrderRequest orderRequest) {
+    public Order addOrder(final RequestModelsOrder orderRequest) {
         final Order newOrder = orderMapper.addRequestToOrder(orderRequest);
         return orderRepository.save(newOrder);
     }
@@ -48,7 +48,7 @@ public List<Order> findAll() {
         return this.orderRepository.findAll();
     }
 
-    public Order updateOrder(final Long orderId, final OrderRequest orderRequest) {
+    public Order updateOrder(final Long orderId, final RequestModelsOrder orderRequest) {
         final Order orderToUpdate = findById(orderId);
         final Order updatedOrder = orderMapper.updateOrderRequest(orderToUpdate, orderRequest);
 

src/main/java/com/answerdigital/answerking/service/ProductService.java

@@ -6,7 +6,7 @@
 import com.answerdigital.answerking.mapper.ProductMapper;
 import com.answerdigital.answerking.model.Product;
 import com.answerdigital.answerking.repository.ProductRepository;
-import com.answerdigital.answerking.request.ProductRequest;
+import com.answerdigital.answerking.request.RequestModelsProduct;
 import org.mapstruct.factory.Mappers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ public ProductService(final ProductRepository productRepository) {
         this.productRepository = productRepository;
     }
 
-    public Product addNewProduct(final ProductRequest productRequest) {
+    public Product addNewProduct(final RequestModelsProduct productRequest) {
         if (productRepository.existsByName(productRequest.name())) {
             throw new NameUnavailableException(String.format("A Product named '%s' already exists", productRequest.name()));
         }
@@ -42,7 +42,7 @@ public List<Product> findAll() {
         return productRepository.findAll();
     }
 
-    public Product updateProduct(final Long productId, final ProductRequest productRequest) {
+    public Product updateProduct(final Long productId, final RequestModelsProduct productRequest) {
         productRepository.findById(productId)
                 .orElseThrow(() -> new NotFoundException(String.format("Product with ID %d does not exist.", productId)));
 

src/test/java/com/answerdigital/answerking/service/OrderServiceTest.java

@@ -14,7 +14,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-import com.answerdigital.answerking.request.OrderRequest;
+import com.answerdigital.answerking.request.RequestModelsOrder;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -52,7 +52,7 @@ class OrderServiceTest {
     @Test
     void testAddOrderReturnsSavedOrder() {
         // Given
-        OrderRequest orderRequest = new OrderRequest("42 Main St");
+        RequestModelsOrder orderRequest = new RequestModelsOrder("42 Main St");
         Order expectedResult = Order.builder()
                 .address("42 Main Street")
                 .build();
@@ -136,7 +136,7 @@ void testFindAllReturnsListOfOrders() {
     void testUpdateOrder() {
         // Given
         Order originalOrder = new Order("14 Main St");
-        OrderRequest updateOrderRequest = new OrderRequest("14 Green Street");
+        RequestModelsOrder updateOrderRequest = new RequestModelsOrder("14 Green Street");
         Order expectedOrder = new Order("14 Green Street");
 
         // When
@@ -156,7 +156,7 @@ void testUpdateOrder() {
     @Test
     void testUpdateOrderWhenOrderNotExistsThrowsNotFoundException() {
         // Given
-        OrderRequest orderRequest = new OrderRequest("14 High St");
+        RequestModelsOrder orderRequest = new RequestModelsOrder("14 High St");
 
         // Then
         assertThrows(NotFoundException.class, () ->