My branch

pom.xml

@@ -30,6 +30,33 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.28</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/mate/academy/springboot/datajpa/controller/CategoryController.java

@@ -0,0 +1,52 @@
+package mate.academy.springboot.datajpa.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import mate.academy.springboot.datajpa.dto.request.CategoryRequestDto;
+import mate.academy.springboot.datajpa.dto.response.CategoryResponseDto;
+import mate.academy.springboot.datajpa.mapper.RequestDtoMapper;
+import mate.academy.springboot.datajpa.mapper.ResponseDtoMapper;
+import mate.academy.springboot.datajpa.model.Category;
+import mate.academy.springboot.datajpa.service.CategoryService;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/categories")
+@RequiredArgsConstructor
+public class CategoryController {
+    private final CategoryService categoryService;
+    private final ResponseDtoMapper<CategoryResponseDto, Category> responseDtoMapper;
+    private final RequestDtoMapper<CategoryRequestDto, Category> requestDtoMapper;
+
+    @PostMapping
+    public CategoryResponseDto create(@RequestBody @Valid CategoryRequestDto requestDto) {
+        Category category = categoryService.create(requestDtoMapper
+                .mapToModel(requestDto));
+        return responseDtoMapper.mapToDto(category);
+    }
+
+    @GetMapping("/{id}")
+    public CategoryResponseDto get(@PathVariable Long id) {
+        Category category = categoryService.getById(id);
+        return responseDtoMapper.mapToDto(category);
+    }
+
+    @DeleteMapping("/{id}")
+    public void delete(@PathVariable Long id) {
+        categoryService.delete(id);
+    }
+
+    @PutMapping("/{id}")
+    public CategoryResponseDto update(@RequestBody @Valid CategoryRequestDto requestDto,
+                                      @PathVariable Long id) {
+        Category category = categoryService.update(requestDtoMapper.mapToModel(requestDto), id);
+        return responseDtoMapper.mapToDto(category);
+    }
+}

src/main/java/mate/academy/springboot/datajpa/controller/ProductController.java

@@ -0,0 +1,73 @@
+package mate.academy.springboot.datajpa.controller;
+
+import jakarta.validation.Valid;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import mate.academy.springboot.datajpa.dto.request.ProductRequestDto;
+import mate.academy.springboot.datajpa.dto.response.ProductResponseDto;
+import mate.academy.springboot.datajpa.mapper.RequestDtoMapper;
+import mate.academy.springboot.datajpa.mapper.ResponseDtoMapper;
+import mate.academy.springboot.datajpa.model.Product;
+import mate.academy.springboot.datajpa.service.ProductService;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/products")
+@RequiredArgsConstructor
+public class ProductController {
+    private final ProductService productService;
+    private final ResponseDtoMapper<ProductResponseDto, Product> responseDtoMapper;
+    private final RequestDtoMapper<ProductRequestDto, Product> requestDtoMapper;
+
+    @PostMapping
+    public ProductResponseDto create(@RequestBody @Valid ProductRequestDto productRequestDto) {
+        Product product = productService.create(requestDtoMapper.mapToModel(productRequestDto));
+        return responseDtoMapper.mapToDto(product);
+    }
+
+    @GetMapping("/{id}")
+    public ProductResponseDto getById(@PathVariable Long id) {
+        Product product = productService.getById(id);
+        return responseDtoMapper.mapToDto(product);
+    }
+
+    @DeleteMapping("/{id}")
+    public void delete(@PathVariable Long id) {
+        productService.delete(id);
+    }
+
+    @PutMapping("/{id}")
+    public ProductResponseDto update(@PathVariable Long id,
+                                     @RequestBody @Valid ProductRequestDto productRequestDto) {
+        Product product = productService.update(requestDtoMapper
+                .mapToModel(productRequestDto), id);
+        return responseDtoMapper.mapToDto(product);
+    }
+
+    @GetMapping("/price")
+    public List<ProductResponseDto> getAllByPriceBetween(@RequestParam BigDecimal from,
+                                                         @RequestParam BigDecimal to) {
+        List<Product> products = productService.getAllByPriceBetween(from, to);
+        return products.stream()
+                .map(responseDtoMapper::mapToDto)
+                .collect(Collectors.toList());
+    }
+
+    @GetMapping("/category")
+    public List<ProductResponseDto> getAllByCategories(@RequestParam List<String> categoryNames) {
+        List<Product> products = productService.getAllByCategoryNames(categoryNames);
+        return products.stream()
+                .map(responseDtoMapper::mapToDto)
+                .collect(Collectors.toList());
+    }
+}

src/main/java/mate/academy/springboot/datajpa/dao/CategoryRepository.java

@@ -0,0 +1,9 @@
+package mate.academy.springboot.datajpa.dao;
+
+import mate.academy.springboot.datajpa.model.Category;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CategoryRepository extends JpaRepository<Category, Long> {
+}

src/main/java/mate/academy/springboot/datajpa/dao/ProductRepository.java

@@ -0,0 +1,14 @@
+package mate.academy.springboot.datajpa.dao;
+
+import java.math.BigDecimal;
+import java.util.List;
+import mate.academy.springboot.datajpa.model.Product;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProductRepository extends JpaRepository<Product, Long> {
+    List<Product> findAllByPriceBetween(BigDecimal from, BigDecimal to);
+
+    List<Product> findByCategoryNameIn(List<String> categoryNames);
+}

src/main/java/mate/academy/springboot/datajpa/dto/request/CategoryRequestDto.java

@@ -0,0 +1,12 @@
+package mate.academy.springboot.datajpa.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CategoryRequestDto {
+    @NotNull
+    private String name;
+}

src/main/java/mate/academy/springboot/datajpa/dto/request/ProductRequestDto.java

@@ -0,0 +1,19 @@
+package mate.academy.springboot.datajpa.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+import java.math.BigDecimal;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class ProductRequestDto {
+    @NotNull
+    private String title;
+    @Positive
+    @NotNull
+    private BigDecimal price;
+    @NotNull
+    private Long categoryId;
+}

src/main/java/mate/academy/springboot/datajpa/dto/response/CategoryResponseDto.java

@@ -0,0 +1,11 @@
+package mate.academy.springboot.datajpa.dto.response;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class CategoryResponseDto {
+    private Long id;
+    private String name;
+}

src/main/java/mate/academy/springboot/datajpa/dto/response/ProductResponseDto.java

@@ -0,0 +1,14 @@
+package mate.academy.springboot.datajpa.dto.response;
+
+import java.math.BigDecimal;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ProductResponseDto {
+    private Long id;
+    private String title;
+    private BigDecimal price;
+    private Long categoryId;
+}

src/main/java/mate/academy/springboot/datajpa/mapper/RequestDtoMapper.java

@@ -0,0 +1,5 @@
+package mate.academy.springboot.datajpa.mapper;
+
+public interface RequestDtoMapper<D, T> {
+    T mapToModel(D dto);
+}

src/main/java/mate/academy/springboot/datajpa/mapper/ResponseDtoMapper.java

@@ -0,0 +1,5 @@
+package mate.academy.springboot.datajpa.mapper;
+
+public interface ResponseDtoMapper<D, T> {
+    D mapToDto(T model);
+}

src/main/java/mate/academy/springboot/datajpa/mapper/impl/CategoryRequestDtoMapper.java

@@ -0,0 +1,16 @@
+package mate.academy.springboot.datajpa.mapper.impl;
+
+import mate.academy.springboot.datajpa.dto.request.CategoryRequestDto;
+import mate.academy.springboot.datajpa.mapper.RequestDtoMapper;
+import mate.academy.springboot.datajpa.model.Category;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CategoryRequestDtoMapper implements RequestDtoMapper<CategoryRequestDto, Category> {
+    @Override
+    public Category mapToModel(CategoryRequestDto dto) {
+        Category category = new Category();
+        category.setName(dto.getName());
+        return category;
+    }
+}

src/main/java/mate/academy/springboot/datajpa/mapper/impl/CategoryResponseDtoMapper.java

@@ -0,0 +1,17 @@
+package mate.academy.springboot.datajpa.mapper.impl;
+
+import mate.academy.springboot.datajpa.dto.response.CategoryResponseDto;
+import mate.academy.springboot.datajpa.mapper.ResponseDtoMapper;
+import mate.academy.springboot.datajpa.model.Category;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CategoryResponseDtoMapper implements ResponseDtoMapper<CategoryResponseDto, Category> {
+    @Override
+    public CategoryResponseDto mapToDto(Category category) {
+        CategoryResponseDto categoryResponseDto = new CategoryResponseDto();
+        categoryResponseDto.setId(category.getId());
+        categoryResponseDto.setName(category.getName());
+        return categoryResponseDto;
+    }
+}

src/main/java/mate/academy/springboot/datajpa/mapper/impl/ProductRequestDtoMapper.java

@@ -0,0 +1,19 @@
+package mate.academy.springboot.datajpa.mapper.impl;
+
+import mate.academy.springboot.datajpa.dto.request.ProductRequestDto;
+import mate.academy.springboot.datajpa.mapper.RequestDtoMapper;
+import mate.academy.springboot.datajpa.model.Category;
+import mate.academy.springboot.datajpa.model.Product;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ProductRequestDtoMapper implements RequestDtoMapper<ProductRequestDto, Product> {
+    @Override
+    public Product mapToModel(ProductRequestDto dto) {
+        Product product = new Product();
+        product.setTitle(dto.getTitle());
+        product.setPrice(dto.getPrice());
+        product.setCategory(new Category(dto.getCategoryId()));
+        return product;
+    }
+}

src/main/java/mate/academy/springboot/datajpa/mapper/impl/ProductResponseDtoMapper.java

@@ -0,0 +1,19 @@
+package mate.academy.springboot.datajpa.mapper.impl;
+
+import mate.academy.springboot.datajpa.dto.response.ProductResponseDto;
+import mate.academy.springboot.datajpa.mapper.ResponseDtoMapper;
+import mate.academy.springboot.datajpa.model.Product;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ProductResponseDtoMapper implements ResponseDtoMapper<ProductResponseDto, Product> {
+    @Override
+    public ProductResponseDto mapToDto(Product product) {
+        ProductResponseDto productResponseDto = new ProductResponseDto();
+        productResponseDto.setId(product.getId());
+        productResponseDto.setTitle(product.getTitle());
+        productResponseDto.setPrice(product.getPrice());
+        productResponseDto.setCategoryId(product.getCategory().getId());
+        return productResponseDto;
+    }
+}

src/main/java/mate/academy/springboot/datajpa/model/Category.java

@@ -0,0 +1,28 @@
+package mate.academy.springboot.datajpa.model;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Entity
+@Table(name = "categories")
+@Setter
+@Getter
+@NoArgsConstructor
+@ToString
+public class Category {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String name;
+
+    public Category(Long id) {
+        this.id = id;
+    }
+}

src/main/java/mate/academy/springboot/datajpa/model/Product.java

@@ -0,0 +1,35 @@
+package mate.academy.springboot.datajpa.model;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "products")
+@Setter
+@Getter
+public class Product {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String title;
+    private BigDecimal price;
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Category category;
+
+    @Override
+    public String toString() {
+        return "Product{"
+                + "id=" + id
+                + ", title='" + title + '\''
+                + ", price=" + price
+                + '}';
+    }
+}