Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hw jv2 #320

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,37 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>24.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package mate.academy.springboot.datajpa.controller;

import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import mate.academy.springboot.datajpa.mapper.DtoMapper;
import mate.academy.springboot.datajpa.model.Category;
import mate.academy.springboot.datajpa.model.dto.request.CategoryRequestDto;
import mate.academy.springboot.datajpa.model.dto.response.CategoryResponseDto;
import mate.academy.springboot.datajpa.service.CategoryService;
import org.springframework.validation.annotation.Validated;
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")
@AllArgsConstructor
public class CategoryController {
private final CategoryService categoryService;
private final DtoMapper<CategoryRequestDto, CategoryResponseDto, Category> mapper;

@PostMapping
public CategoryResponseDto save(@RequestBody
@Validated CategoryRequestDto categoryRequestDto) {
Category category = categoryService.save(mapper.mapToModel(categoryRequestDto));
return mapper.mapToDto(category);
}

@GetMapping("/{id}")
public CategoryResponseDto get(@PathVariable Long id) {
return mapper.mapToDto(categoryService.get(id));
}

@PutMapping("/{id}")
public CategoryResponseDto update(@PathVariable Long id,
@RequestBody @Valid CategoryRequestDto categoryRequestDto) {
Category category = mapper.mapToModel(categoryRequestDto);
category.setId(id);
return mapper.mapToDto(categoryService.save(category));
}

@DeleteMapping("/{id}")
public void delete(@PathVariable Long id) {
categoryService.remove(id);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package mate.academy.springboot.datajpa.controller;

import jakarta.validation.Valid;
import jakarta.validation.constraints.Positive;
import java.math.BigDecimal;
import java.util.List;
import java.util.stream.Collectors;
import lombok.AllArgsConstructor;
import mate.academy.springboot.datajpa.mapper.DtoMapper;
import mate.academy.springboot.datajpa.model.Product;
import mate.academy.springboot.datajpa.model.dto.request.ProductRequestDto;
import mate.academy.springboot.datajpa.model.dto.response.ProductResponseDto;
import mate.academy.springboot.datajpa.service.ProductService;
import org.springframework.validation.annotation.Validated;
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")
@AllArgsConstructor
public class ProductController {
private final ProductService productService;
private final DtoMapper<ProductRequestDto, ProductResponseDto, Product> mapper;

@PostMapping
public ProductResponseDto save(@RequestBody @Validated ProductRequestDto categoryRequestDto) {
Product product = productService.save(mapper.mapToModel(categoryRequestDto));
return mapper.mapToDto(product);
}

@GetMapping("/{id}")
public ProductResponseDto get(@PathVariable Long id) {
return mapper.mapToDto(productService.get(id));
}

@GetMapping("/by-price")
public List<ProductResponseDto> getAllByPrice(@RequestParam @Positive BigDecimal from,
@RequestParam @Positive BigDecimal to) {
return productService.findAllByPriceBetween(from, to).stream()
.map(mapper::mapToDto)
.collect(Collectors.toList());
}

@GetMapping("/by-categories")
public List<ProductResponseDto> getAllByCategoryIds(@RequestParam String[] categoryIds) {
return productService.findByCategoryIds(List.of(categoryIds)).stream()
.map(mapper::mapToDto)
.collect(Collectors.toList());
}

@PutMapping("/{id}")
public ProductResponseDto update(@PathVariable Long id,
@RequestBody @Valid ProductRequestDto productRequestDto) {
Product product = mapper.mapToModel(productRequestDto);
product.setId(id);
return mapper.mapToDto(productService.save(product));
}

@DeleteMapping("/{id}")
public void delete(@PathVariable Long id) {
productService.remove(id);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package mate.academy.springboot.datajpa.mapper;

public interface DtoMapper<D, R, T> extends RequestDtoMapper<D, T>, ResponseDtoMapper<T, R> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package mate.academy.springboot.datajpa.mapper;

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

public interface ResponseDtoMapper<T, D> {
D mapToDto(T t);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package mate.academy.springboot.datajpa.mapper.impl;

import mate.academy.springboot.datajpa.mapper.DtoMapper;
import mate.academy.springboot.datajpa.model.Category;
import mate.academy.springboot.datajpa.model.dto.request.CategoryRequestDto;
import mate.academy.springboot.datajpa.model.dto.response.CategoryResponseDto;
import org.springframework.stereotype.Component;

@Component
public class CategoryMapper implements DtoMapper<CategoryRequestDto,
CategoryResponseDto, Category> {
@Override
public Category mapToModel(CategoryRequestDto dto) {
Category category = new Category();
category.setName(dto.getName());
return category;
}

@Override
public CategoryResponseDto mapToDto(Category category) {
CategoryResponseDto categoryResponseDto = new CategoryResponseDto();
categoryResponseDto.setId(category.getId());
categoryResponseDto.setName(category.getName());
return categoryResponseDto;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package mate.academy.springboot.datajpa.mapper.impl;

import mate.academy.springboot.datajpa.mapper.DtoMapper;
import mate.academy.springboot.datajpa.model.Category;
import mate.academy.springboot.datajpa.model.Product;
import mate.academy.springboot.datajpa.model.dto.request.ProductRequestDto;
import mate.academy.springboot.datajpa.model.dto.response.ProductResponseDto;
import org.springframework.stereotype.Component;

@Component
public class ProductMapper implements DtoMapper<ProductRequestDto, ProductResponseDto, Product> {
@Override
public Product mapToModel(ProductRequestDto dto) {
Product product = new Product();
product.setTitle(dto.getTitle());
product.setPrice(dto.getPrice());
Category category = new Category();
category.setId(dto.getCategoryId());
product.setCategory(category);
return 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;
}
}
24 changes: 24 additions & 0 deletions src/main/java/mate/academy/springboot/datajpa/model/Category.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
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.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Getter
@Setter
@NoArgsConstructor
@EqualsAndHashCode
@Entity
@Table(name = "categories")
public class Category {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String name;
}
32 changes: 32 additions & 0 deletions src/main/java/mate/academy/springboot/datajpa/model/Product.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package mate.academy.springboot.datajpa.model;

import jakarta.persistence.CascadeType;
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.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Getter
@Setter
@NoArgsConstructor
@EqualsAndHashCode
@Entity
@Table(name = "products")
public class Product {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String title;
private BigDecimal price;
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@EqualsAndHashCode.Exclude
private Category category;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package mate.academy.springboot.datajpa.model.dto.request;

import jakarta.validation.constraints.NotNull;
import lombok.Data;

@Data
public class CategoryRequestDto {
@NotNull
private String name;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package mate.academy.springboot.datajpa.model.dto.request;

import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
import java.math.BigDecimal;
import lombok.Data;

@Data
public class ProductRequestDto {
@NotNull
private String title;
@Positive
private BigDecimal price;
@Positive
private Long categoryId;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package mate.academy.springboot.datajpa.model.dto.response;

import lombok.Data;

@Data
public class CategoryResponseDto {
private Long id;
private String name;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package mate.academy.springboot.datajpa.model.dto.response;

import java.math.BigDecimal;
import lombok.Data;

@Data
public class ProductResponseDto {
private Long id;
private String title;
private BigDecimal price;
private Long categoryId;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package mate.academy.springboot.datajpa.repository;

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> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package mate.academy.springboot.datajpa.repository;

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> findAllByCategoryNameIn(List<String> categoryName);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package mate.academy.springboot.datajpa.service;

import mate.academy.springboot.datajpa.model.Category;

public interface CategoryService extends GeneralService<Category> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package mate.academy.springboot.datajpa.service;

public interface GeneralService<T> {
T save(T model);

T get(Long id);

void remove(Long id);
}
Loading
Loading