Merge branch 'main' into BENCH-181

# Conflicts:
#	src/main/java/com/answerdigital/answerking/mapper/ProductMapper.java
#	src/main/java/com/answerdigital/answerking/model/Product.java
#	src/main/java/com/answerdigital/answerking/response/ProductResponse.java
#	src/test/java/com/answerdigital/answerking/service/ProductServiceTest.java

Author: AudriusPutys

src/main/java/com/answerdigital/answerking/config/SecurityConfig.java

@@ -49,12 +49,12 @@ public InMemoryUserDetailsManager userDetailsManager() {
         return new InMemoryUserDetailsManager(
             List.of("paul", "john", "ringo", "george")
                                             .stream()
-                                            .map(user -> {
-                                                return User.withUsername(user)
-                                                           .password(COMMON_PASSWORD)
-                                                           .authorities(COMMON_ROLE)
-                                                           .build();
-                                            }).toList()
+                                            .map(user ->
+                                                User.withUsername(user)
+                                                    .password(COMMON_PASSWORD)
+                                                    .authorities(COMMON_ROLE)
+                                                    .build()
+                                            ).toList()
         );
     }
 

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

@@ -4,6 +4,7 @@
 import com.answerdigital.answerking.model.Category;
 import com.answerdigital.answerking.request.CategoryRequest;
 import com.answerdigital.answerking.response.CategoryResponse;
+import com.answerdigital.answerking.response.ProductResponse;
 import com.answerdigital.answerking.service.CategoryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -76,6 +77,18 @@ public ResponseEntity<Category> getCategoryById(@PathVariable @NotNull final Lon
         return new ResponseEntity<>(categoryService.findById(categoryId), HttpStatus.OK);
     }
 
+    @Operation(summary = "Get all products in a category.")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "When all the products have been returned.",
+                content = { @Content(mediaType = "application/json", schema = @Schema(implementation = Category.class)) }),
+        @ApiResponse(responseCode = "404", description = "When the category with the given id does not exist.",
+                content = { @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)) })
+    })
+    @GetMapping("/{categoryId}/products")
+    public ResponseEntity<Collection<ProductResponse>> fetchProductsByCategory(@PathVariable @NotNull final Long categoryId) {
+        return new ResponseEntity<>(categoryService.findProductsByCategoryId(categoryId), HttpStatus.OK);
+    }
+
     @Operation(summary = "Add product to a category.")
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "Add product to a category.",

src/main/java/com/answerdigital/answerking/exception/util/RestResponseEntityExceptionHandler.java

@@ -2,10 +2,10 @@
 
 import com.answerdigital.answerking.exception.AnswerKingException;
 import com.answerdigital.answerking.exception.custom.ValidationException;
-import com.answerdigital.answerking.exception.generic.BadRequestException;
 import com.answerdigital.answerking.exception.generic.InternalServerErrorException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -15,9 +15,11 @@
 import javax.validation.ConstraintViolationException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 @RestControllerAdvice
@@ -28,14 +30,17 @@ public ResponseEntity<ErrorResponse> handleMethodArgumentNotValidException(
             final MethodArgumentNotValidException exception,
             final HttpServletRequest request) {
 
-        String detail;
-        try {
-            detail = Objects.requireNonNull(exception.getFieldError()).getDefaultMessage();
-        } catch (NullPointerException nullPointerException) {
-            detail = "Unknown error - MethodArgumentNotValidException was thrown with no default message";
-        }
+        final Map<String, Collection<String>> errorsMap =
+                exception.getBindingResult().getFieldErrors()
+                        .stream()
+                        .collect(Collectors.toMap(FieldError::getField,
+                                FieldError -> new ArrayList<>(Collections.singletonList(FieldError.getDefaultMessage())),
+                                (mainList, newList) -> {
+                                    mainList.addAll(newList);
+                                    return mainList;
+                                }));
 
-        final ErrorResponse response = new ErrorResponse(new BadRequestException(detail), request);
+        final ErrorResponse response = new ValidationErrorResponse(new ValidationException(errorsMap), request);
         return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
     }
 

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

@@ -20,7 +20,7 @@ public interface CategoryMapper {
     @Mapping(target = "lastUpdated", expression = "java(DateTimeUtility.getDateTimeAsString())")
     Category updateRequestToCategory(@MappingTarget Category category, CategoryRequest updateCategoryRequest);
 
-    @Mapping(target = "productIds",
+    @Mapping(target = "products",
              expression = "java(category.getProducts().stream().map(product -> product.getId()).collect(Collectors.toList()) )")
     CategoryResponse convertCategoryEntityToCategoryResponse(Category category);
 

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

@@ -6,20 +6,16 @@
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
+import java.util.List;
 
-import java.util.Collections;
-import java.util.stream.Collectors;
-
-@Mapper(componentModel = "spring",
-        imports = {Collectors.class, Collections.class})
+@Mapper(componentModel = "spring", imports = {List.class})
 public interface ProductMapper {
     @Mapping(target = "retired", constant = "false")
-    @Mapping(target = "categories", expression = "java(Collections.EMPTY_SET)")
     Product addRequestToProduct(ProductRequest productRequest);
 
     Product updateRequestToProduct(@MappingTarget Product product, ProductRequest productRequest);
 
-    @Mapping(target = "categories",
-            expression = "java(product.getCategories().stream().map(category -> category.getId()).collect(Collectors.toList()) )")
+    @Mapping(target = "categories", expression = "java(List.of(product.getCategory().getId()))")
     ProductResponse convertProductEntityToProductResponse(Product product);
+
 }

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

@@ -9,14 +9,12 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.Entity;
+import javax.persistence.OneToMany;
 import javax.persistence.FetchType;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import java.util.HashSet;
@@ -54,11 +52,7 @@ public class Category {
 
     private boolean retired;
 
-    @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(
-            name = "product_category",
-            joinColumns = {@JoinColumn(name = "category_id")},
-            inverseJoinColumns = {@JoinColumn(name = "product_id")})
+    @OneToMany(mappedBy="category", fetch = FetchType.EAGER)
     @JsonIgnore
     private Set<Product> products = new HashSet<>();
 

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

@@ -8,16 +8,16 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
+import javax.persistence.PreRemove;
+import javax.persistence.CascadeType;
+import javax.persistence.OneToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.JoinColumn;
+import javax.persistence.GenerationType;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.PreRemove;
 import javax.persistence.Table;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -47,8 +47,9 @@ public class Product {
 
     private boolean retired;
 
-    @ManyToMany(fetch = FetchType.EAGER, mappedBy = "products")
-    private Set<Category> categories = new HashSet<>();
+    @ManyToOne
+    @JoinColumn(name="category_id", nullable=false)
+    private Category category;
 
     @OneToMany(mappedBy = "product", cascade = CascadeType.ALL)
     private Set<LineItem> lineItems = new HashSet<>();
@@ -57,13 +58,12 @@ public Product(final String name, final String description, final BigDecimal pri
         this.name = name;
         this.description = description;
         this.price = price;
-        this.categories = new HashSet<>();
         this.retired = isRetired;
     }
 
     @PreRemove
     private void removeProductsFromCategories() {
-        categories.forEach(category -> category.removeProduct(this));
+        category.removeProduct(this);
     }
 
     public BigDecimal getPrice() {

src/main/java/com/answerdigital/answerking/repository/CategoryRepository.java

@@ -3,7 +3,6 @@
 import com.answerdigital.answerking.model.Category;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
-
 import java.util.Set;
 
 @Repository
@@ -13,4 +12,5 @@ public interface CategoryRepository extends PagingAndSortingRepository<Category,
     boolean existsByNameAndIdIsNot(String name, Long id);
 
     Set<Category> findAll();
+
 }

src/main/java/com/answerdigital/answerking/repository/ProductRepository.java

@@ -13,4 +13,7 @@ public interface ProductRepository extends PagingAndSortingRepository<Product, L
     boolean existsByNameAndIdIsNot(String name, Long id);
 
     List<Product> findAll();
+
+    List<Product> findProductsByCategoryId(Long categoryId);
+
 }

src/main/java/com/answerdigital/answerking/response/CategoryResponse.java

@@ -5,9 +5,6 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
 import java.util.List;
 
 @Data
@@ -16,27 +13,23 @@
 @AllArgsConstructor
 public class CategoryResponse {
 
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     private Long id;
 
-    @NotBlank
-    @Pattern(regexp = "^[a-zA-Z\s-]*",
-            message = "Category name must only contain letters, spaces and dashes")
     private String name;
 
-    @NotBlank
-    @Pattern(regexp = "^[a-zA-Z\s.,!?0-9-']*",
-            message = "Category description can only contain letters, numbers, spaces and !?-.,' punctuation")
     private String description;
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    private List<Long> productIds;
+    private List<Long> products;
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     private String createdOn;
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     private String lastUpdated;
 
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     private boolean retired;
 
 }