Merge branch 'main' into BENCH-269

Author: AndyFlintAnswerDigital

.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/test/java/com/answerdigital/answerking/service/CategoryServiceTest.java

@@ -111,6 +111,11 @@ void testUpdateCategory() {
                 .withName(updateCategoryRequest.name())
                 .withDescription(updateCategoryRequest.description())
                 .build();
+        final var categoryResponse = CategoryResponse.builder()
+                .id(1L)
+                .name("Pizzas")
+                .description("Italian style stone baked pizzas.")
+                .build();
 
         // when
         doReturn(false).when(categoryRepository).existsByNameAndIdIsNot(anyString(), anyLong());
@@ -257,6 +262,11 @@ void testRetireCategory() {
         final Category expectedCategory = categoryTestBuilder.withDefaultValues()
                 .withRetired(true)
                 .build();
+        final var categoryResponse = CategoryResponse.builder()
+                .id(1L)
+                .name("Pizzas")
+                .description("Italian style stone baked pizzas.")
+                .build();
 
         // when
         doReturn(Optional.of(category)).when(categoryRepository).findById(anyLong());