Merge branch 'main' into BENCH-182-TEST

# Conflicts:
#	src/main/java/com/answerdigital/answerking/controller/CategoryController.java
#	src/main/java/com/answerdigital/answerking/controller/OrderController.java
#	src/main/java/com/answerdigital/answerking/mapper/ProductMapper.java
#	src/main/java/com/answerdigital/answerking/response/ProductResponse.java
#	src/main/java/com/answerdigital/answerking/service/CategoryService.java
#	src/main/java/com/answerdigital/answerking/service/OrderService.java
#	src/test/java/com/answerdigital/answerking/service/CategoryServiceTest.java
#	src/test/java/com/answerdigital/answerking/service/OrderServiceTest.java

Author: AudriusPutys

.github/workflows/build_docker_package.yml

@@ -6,7 +6,6 @@ on:
       - main
       - master
       - develop
-      - v1.0.0-preview.1
     types:
       - completed
 

.github/workflows/build_integration_and_code_analysis.yml

@@ -6,7 +6,6 @@ on:
       - main
       - master
       - develop
-      - v1.0.0-preview.1
   pull_request:
     types: [opened, synchronize, reopened]
     schedule:
@@ -77,7 +76,7 @@ jobs:
 
       - name: Publish test coverage results
         id: jacoco_reporter
-        uses: PavanMudigonda/jacoco-reporter@v4.7
+        uses: PavanMudigonda/jacoco-reporter@v4.8
         with:
           coverage_results_path: 'target/site/jacoco/jacoco.xml'
           coverage_report_title: 'Test coverage results'

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

@@ -137,7 +137,8 @@ public ResponseEntity<CategoryResponse> updateCategory(@Valid @RequestBody final
             content = { @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)) })
     })
     @DeleteMapping("/{categoryId}")
-    public ResponseEntity<CategoryResponse> retireCategory(@PathVariable @NotNull final Long categoryId) {
-        return new ResponseEntity<>(categoryService.retireCategory(categoryId), HttpStatus.OK);
+    public ResponseEntity<Void> retireCategory(@PathVariable @NotNull final Long categoryId) {
+        categoryService.retireCategory(categoryId);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 }

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

@@ -105,7 +105,8 @@ public ResponseEntity<ProductResponse> updateProduct(@PathVariable @NotNull fina
                                     schema = @Schema(implementation = ErrorResponse.class)) })
     })
     @DeleteMapping("/{id}")
-    public ResponseEntity<ProductResponse> retireProduct(@PathVariable @NotNull final Long id) {
-        return new ResponseEntity<>(productService.retireProduct(id), HttpStatus.OK);
+    public ResponseEntity<Void> retireProduct(@PathVariable @NotNull final Long id) {
+        productService.retireProduct(id);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 }

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

@@ -6,11 +6,9 @@
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
-
 import java.util.List;
-import java.util.stream.Collectors;
 
-@Mapper(componentModel = "spring", imports = {List.class, Collectors.class})
+@Mapper(componentModel = "spring", imports = {List.class})
 public interface ProductMapper {
     @Mapping(target = "retired", constant = "false")
     Product addRequestToProduct(ProductRequest productRequest);

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

@@ -104,14 +104,13 @@ public CategoryResponse removeProductFromCategory(final Long categoryId, final L
         return categoryMapper.convertCategoryEntityToCategoryResponse(savedCategory);
     }
 
-    public CategoryResponse retireCategory(final Long categoryId) {
+    public void retireCategory(final Long categoryId) {
         final Category category = findById(categoryId);
         if(category.isRetired()) {
             throw new RetirementException(String.format("The category with ID %d is already retired", categoryId));
         }
         category.setRetired(true);
         final Category savedCategory = categoryRepository.save(category);
-        return categoryMapper.convertCategoryEntityToCategoryResponse(savedCategory);
     }
 
     public List<ProductResponse> findProductsByCategoryId(final Long categoryId) {

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

@@ -77,14 +77,13 @@ public ProductResponse updateProduct(final Long productId, final ProductRequest
         return productMapper.convertProductEntityToProductResponse(savedProduct);
     }
 
-    public ProductResponse retireProduct(final Long productId) {
+    public void retireProduct(final Long productId) {
         final Product product = findById(productId);
         if (product.isRetired()) {
             throw new RetirementException(String.format("The product with ID %d is already retired", productId));
         }
         product.setRetired(true);
         final Product savedProduct = productRepository.save(product);
-        return productMapper.convertProductEntityToProductResponse(savedProduct);
     }
 
     public List<ProductResponse> findProductsByCategoryId(final Long categoryId) {

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

@@ -281,9 +281,10 @@ void testRetireCategory() {
         doReturn(expectedCategory).when(categoryRepository).save(any(Category.class));
 
         // then
-        assertEquals(categoryResponse.getClass(), categoryService.retireCategory(category.getId()).getClass());
-        verify(categoryRepository).findById(anyLong());
-        verify(categoryRepository).save(any(Category.class));
+        categoryService.retireCategory(category.getId());
+
+        verify(categoryRepository).findById(category.getId());
+        verify(categoryRepository).save(expectedCategory);
     }
 
     @Test
@@ -299,7 +300,7 @@ void testRetireCategoryAlreadyRetiredThrowsRetirementException() {
 
         // then
         assertThrows(RetirementException.class, () -> categoryService.retireCategory(retiredCategory.getId()));
-        verify(categoryRepository).findById(anyLong());
+        verify(categoryRepository).findById(retiredCategory.getId());
     }
 
     @Test

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

@@ -23,7 +23,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyLong;
@@ -174,15 +173,15 @@ void updateProductThrowsExceptionIfProductNameAlreadyExist() {
     @Test
     void testRetireProduct() {
         // when
-        when(productRepository.findById(anyLong()))
-                .thenReturn(Optional.of(product));
-        when(productRepository.save(any(Product.class)))
-                .thenReturn(product);
+        when(productRepository.findById(anyLong())).thenReturn(Optional.of(product));
+        when(productRepository.save(any(Product.class))).thenReturn(product);
 
         // then
-        assertNotEquals(product.isRetired(), productService.retireProduct(PRODUCT_ID).isRetired());
+        productService.retireProduct(PRODUCT_ID);
+        product.setRetired(true);
+
         verify(productRepository).findById(anyLong());
-        verify(productRepository).save(any(Product.class));
+        verify(productRepository).save(product);
     }
 
     @Test
@@ -192,8 +191,7 @@ void testRetireProductAlreadyRetiredThrowsRetirementException() {
         expectedProduct.setRetired(true);
 
         // when
-        when(productRepository.findById(anyLong()))
-                .thenReturn(Optional.of(expectedProduct));
+        when(productRepository.findById(anyLong())).thenReturn(Optional.of(expectedProduct));
 
         // then
         assertThrows(RetirementException.class, () -> productService.retireProduct(PRODUCT_ID));
@@ -203,8 +201,7 @@ void testRetireProductAlreadyRetiredThrowsRetirementException() {
     @Test
     void testRetireProductDoesNotExistThrowsNotFoundException() {
         // when
-        when(productRepository.findById(anyLong()))
-                .thenReturn(Optional.empty());
+        when(productRepository.findById(anyLong())).thenReturn(Optional.empty());
 
         // then
         assertThrows(NotFoundException.class, () -> productService.retireProduct(PRODUCT_ID));