Merge branch 'main' into BENCH-195-update-request-models-name-ak-java

# Conflicts:
#	src/main/java/com/answerdigital/answerking/mapper/CategoryMapper.java
#	src/test/java/com/answerdigital/answerking/controller/CategoryControllerTest.java
#	src/test/java/com/answerdigital/answerking/service/CategoryServiceTest.java

Author: AudriusPutys

pom.xml

@@ -158,6 +158,7 @@
 				<version>3.2.0</version>
 				<configuration>
 					<configLocation>checkstyle.xml</configLocation>
+					<includeTestSourceDirectory>true</includeTestSourceDirectory>
 				</configuration>
 
 				<executions>

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

@@ -30,7 +30,7 @@
 import java.util.Set;
 
 @Validated
-@Tag(name = "Categories", description = "The Categories API")
+@Tag(name = "Inventory", description = "Manage the inventory.")
 @RestController
 @RequestMapping(path = "/categories")
 public class CategoryController {

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

@@ -22,7 +22,7 @@
 import java.util.List;
 
 @Validated
-@Tag(name = "Orders", description = "The Orders API")
+@Tag(name = "Orders", description = "Create and manage customer orders.")
 @RestController
 @RequestMapping(path = "/orders")
 public class OrderController {

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

@@ -28,7 +28,7 @@
 import java.util.List;
 
 @Validated
-@Tag(name = "Products", description = "The Products API")
+@Tag(name = "Inventory", description = "Manage the inventory.")
 @RestController
 @RequestMapping(path = "/products")
 public class ProductController {
@@ -50,6 +50,7 @@ public ResponseEntity<List<Product>> getAllProducts() {
         return new ResponseEntity<>(products, products.isEmpty() ? HttpStatus.NO_CONTENT : HttpStatus.OK);
     }
 
+    @Operation(summary = "Get a single product.")
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "When the product with the provided id has been found.",
             content = { @Content(mediaType = "application/json", schema = @Schema(implementation = Product.class)) }),

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

@@ -3,32 +3,25 @@
 import com.answerdigital.answerking.model.Category;
 import com.answerdigital.answerking.request.CategoryRequest;
 import com.answerdigital.answerking.response.CategoryResponse;
+import com.answerdigital.answerking.util.DateTimeUtility;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.time.ZoneOffset;
 import java.util.stream.Collectors;
 
 @Mapper(componentModel = "spring",
-        imports = {DateTimeFormatter.class, ZoneOffset.class, ZonedDateTime.class, ChronoUnit.class, Collectors.class})
+        imports = {DateTimeUtility.class, Collectors.class})
 public interface CategoryMapper {
-    @Mapping(target = "createdOn", expression = "java( ZonedDateTime.now(ZoneOffset.UTC)" +
-                                                    ".truncatedTo( ChronoUnit.SECONDS )" +
-                                                    ".format( DateTimeFormatter.ofPattern( \"yyyy-MM-dd HH:mm:ss\" ) ) )")
-    @Mapping(target = "lastUpdated", expression = "java( ZonedDateTime.now(ZoneOffset.UTC)" +
-                                                        ".truncatedTo( ChronoUnit.SECONDS )" +
-                                                        ".format( DateTimeFormatter.ofPattern( \"yyyy-MM-dd HH:mm:ss\" ) ) )")
+
+    @Mapping(target = "createdOn", expression = "java(DateTimeUtility.getDateTimeAsString())")
+    @Mapping(target = "lastUpdated", expression = "java(DateTimeUtility.getDateTimeAsString())")
     Category addRequestToCategory(CategoryRequest addCategoryRequest);
 
-    @Mapping(target = "lastUpdated", expression = "java( ZonedDateTime.now(ZoneOffset.UTC)" +
-                                                    ".truncatedTo( ChronoUnit.SECONDS )" +
-                                                    ".format( DateTimeFormatter.ofPattern( \"yyyy-MM-dd HH:mm:ss\" ) ) )")
+    @Mapping(target = "lastUpdated", expression = "java(DateTimeUtility.getDateTimeAsString())")
     Category updateRequestToCategory(@MappingTarget Category category, CategoryRequest updateCategoryRequest);
 
     @Mapping(target = "productIds",
              expression = "java(category.getProducts().stream().map(product -> product.getId()).collect(Collectors.toList()) )")
     CategoryResponse convertCategoryEntityToCategoryResponse(Category category);
+
 }

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

@@ -19,14 +19,12 @@
 import javax.persistence.ManyToMany;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
+import static com.answerdigital.answerking.util.DateTimeUtility.getDateTimeAsString;
+
 @Entity
 @Getter
 @Setter
@@ -68,9 +66,7 @@ public Category(final String name, final String description) {
         this.name = name;
         this.description = description;
         this.retired = false;
-        this.createdOn = ZonedDateTime.now(ZoneOffset.UTC)
-                                      .truncatedTo( ChronoUnit.SECONDS )
-                                      .format( DateTimeFormatter.ofPattern( "yyyy-MM-dd HH:mm::ss" ) );
+        this.createdOn = getDateTimeAsString();
         this.lastUpdated = this.createdOn;
     }
 

src/main/java/com/answerdigital/answerking/util/DateTimeUtility.java

@@ -0,0 +1,17 @@
+package com.answerdigital.answerking.util;
+
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+
+public final class DateTimeUtility {
+
+    private DateTimeUtility() {}
+
+    public static String getDateTimeAsString() {
+        return ZonedDateTime.now(ZoneOffset.UTC)
+                .truncatedTo(ChronoUnit.SECONDS)
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+    }
+}

src/test/java/com/answerdigital/answerking/builder/AddCategoryRequestTestBuilder.java

@@ -0,0 +1,29 @@
+package com.answerdigital.answerking.builder;
+
+import com.answerdigital.answerking.request.AddCategoryRequest;
+
+public class AddCategoryRequestTestBuilder {
+
+    private String name;
+    private String description;
+
+    public AddCategoryRequestTestBuilder withDefaultValues() {
+        this.name = "Burgers";
+        this.description = "A selection of delicious burgers.";
+        return this;
+    }
+
+    public AddCategoryRequestTestBuilder withName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    public AddCategoryRequestTestBuilder withDescription(final String description) {
+        this.description = description;
+        return this;
+    }
+
+    public AddCategoryRequest build() {
+        return new AddCategoryRequest(name, description);
+    }
+}

src/test/java/com/answerdigital/answerking/builder/CategoryTestBuilder.java

@@ -0,0 +1,75 @@
+package com.answerdigital.answerking.builder;
+
+import com.answerdigital.answerking.model.Category;
+import com.answerdigital.answerking.model.Product;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static com.answerdigital.answerking.util.DateTimeUtility.getDateTimeAsString;
+
+public class CategoryTestBuilder {
+
+    private Long id = 1L;
+    private String name;
+    private String description;
+    private String createdOn;
+    private String lastUpdated;
+    private boolean retired;
+    private Set<Product> products;
+
+    public CategoryTestBuilder withDefaultValues() {
+        this.id = 1L;
+        this.name = "Burgers";
+        this.description = "A selection of delicious burgers.";
+        this.createdOn = getDateTimeAsString();
+        this.lastUpdated = getDateTimeAsString();
+        this.retired = false;
+        this.products = new HashSet<>();
+        return this;
+    }
+
+    public CategoryTestBuilder withId(final Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public CategoryTestBuilder withName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    public CategoryTestBuilder withDescription(final String description) {
+        this.description = description;
+        return this;
+    }
+
+    public CategoryTestBuilder withCreatedOn(final String createdOn) {
+        this.createdOn = createdOn;
+        return this;
+    }
+
+    public CategoryTestBuilder withLastUpdated(final String lastUpdated) {
+        this.lastUpdated = lastUpdated;
+        return this;
+    }
+
+    public CategoryTestBuilder withRetired(final boolean retired) {
+        this.retired = retired;
+        return this;
+    }
+
+    public CategoryTestBuilder withProducts(final Set<Product> products) {
+        this.products = products;
+        return this;
+    }
+
+    public CategoryTestBuilder withProduct(final Product product) {
+        products.add(product);
+        return this;
+    }
+
+    public Category build() {
+        return new Category(id, name, description, createdOn, lastUpdated, retired, products);
+    }
+}

src/test/java/com/answerdigital/answerking/builder/ProductTestBuilder.java

@@ -0,0 +1,70 @@
+package com.answerdigital.answerking.builder;
+
+import com.answerdigital.answerking.model.Category;
+import com.answerdigital.answerking.model.LineItem;
+import com.answerdigital.answerking.model.Product;
+
+import java.math.BigDecimal;
+import java.util.HashSet;
+import java.util.Set;
+
+public class ProductTestBuilder {
+
+    private Long id;
+    private String name;
+    private String description;
+    private BigDecimal price;
+    private boolean retired;
+    private Set<Category> categories;
+    private Set<LineItem> lineItems;
+
+    public ProductTestBuilder withDefaultValues() {
+        this.id = 1L;
+        this.name = "Cheeseburger";
+        this.description = "A beef patty with cheddar cheese.";
+        this.price = BigDecimal.valueOf(5.00D);
+        this.retired = false;
+        this.categories = new HashSet<>();
+        this.lineItems = new HashSet<>();
+        return this;
+    }
+
+    public ProductTestBuilder withId(final Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public ProductTestBuilder withName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    public ProductTestBuilder withDescription(final String description) {
+        this.description = description;
+        return this;
+    }
+
+    public ProductTestBuilder withPrice(final BigDecimal price) {
+        this.price = price;
+        return this;
+    }
+
+    public ProductTestBuilder withRetired(final boolean retired) {
+        this.retired = retired;
+        return this;
+    }
+
+    public ProductTestBuilder withCategories(final Set<Category> categories) {
+        this.categories = categories;
+        return this;
+    }
+
+    public ProductTestBuilder withLineItems(final Set<LineItem> lineItems) {
+        this.lineItems = lineItems;
+        return this;
+    }
+
+    public Product build() {
+        return new Product(id, name, description, price, retired, categories, lineItems);
+    }
+}