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

Completed all points in Readme #330

Open
wants to merge 1 commit 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
22 changes: 22 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,28 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package mate.academy.springboot.datajpa.controller;

import javax.validation.Valid;
import lombok.AllArgsConstructor;
import mate.academy.springboot.datajpa.dto.request.CategoryRequestDto;
import mate.academy.springboot.datajpa.dto.response.CategoryResponseDto;
import mate.academy.springboot.datajpa.mapper.DtoMapper;
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;

@AllArgsConstructor
@RestController
@RequestMapping("/categories")
public class CategoryController {
private final CategoryService categoryService;
private final DtoMapper<CategoryRequestDto, CategoryResponseDto, Category> categoryMapper;

@PostMapping
public CategoryResponseDto create(@RequestBody @Valid CategoryRequestDto categoryRequestDto) {
return categoryMapper.mapToDto(categoryService.save(
categoryMapper.mapToEntity(categoryRequestDto)));
}

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

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

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

import java.math.BigDecimal;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.validation.Valid;
import javax.validation.constraints.Positive;
import lombok.AllArgsConstructor;
import mate.academy.springboot.datajpa.dto.request.ProductRequestDto;
import mate.academy.springboot.datajpa.dto.response.ProductResponseDto;
import mate.academy.springboot.datajpa.mapper.DtoMapper;
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;

@AllArgsConstructor
@RestController
@RequestMapping("/products")
public class ProductController {
private final ProductService productService;
private final DtoMapper<ProductRequestDto, ProductResponseDto, Product> productMapper;

@PostMapping
public ProductResponseDto create(@RequestBody @Valid ProductRequestDto productRequestDto) {
Product product = productMapper.mapToEntity(productRequestDto);
return productMapper.mapToDto(productService.save(product));
}

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

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

@GetMapping("/by-categories")
public List<ProductResponseDto> getAllByCategories(@RequestParam Set<String> categoryIds) {
return productService.getAllByCategoryNameIn(categoryIds).stream()
.map(productMapper::mapToDto)
.collect(Collectors.toList());
}

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

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

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

@Data

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd recommend using specific Lombok annotations here instead of general Data. You can fix the same issue in all places

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.dto.request;

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

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

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

@Data
public class ProductResponseDto {
private Long id;
private BigDecimal price;
private String title;
private Long categoriesId;
}
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 mapToEntity(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 entity);
}
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.dto.request.CategoryRequestDto;
import mate.academy.springboot.datajpa.dto.response.CategoryResponseDto;
import mate.academy.springboot.datajpa.mapper.DtoMapper;
import mate.academy.springboot.datajpa.model.Category;
import org.springframework.stereotype.Component;

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

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

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

@Component
public class ProductMapper implements DtoMapper<ProductRequestDto, ProductResponseDto, Product> {
@Override
public Product mapToEntity(ProductRequestDto dto) {
Product product = new Product();
product.setPrice(dto.getPrice());
product.setTitle(dto.getTitle());
product.setCategory(new Category(dto.getCategoryId()));
return product;
}

@Override
public ProductResponseDto mapToDto(Product entity) {
ProductResponseDto productResponseDto = new ProductResponseDto();
productResponseDto.setId(entity.getId());
productResponseDto.setTitle(entity.getTitle());
productResponseDto.setPrice(entity.getPrice());
productResponseDto.setCategoriesId(entity.getCategory().getId());
return productResponseDto;
}
}
27 changes: 27 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,27 @@
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;

public Category(Long categoryId) {
}
}
28 changes: 28 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,28 @@
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.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;

@Getter
@Setter
@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)
private Category category;
}
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,15 @@
package mate.academy.springboot.datajpa.repository;

import java.math.BigDecimal;
import java.util.Collection;
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> getAllProductsByPriceBetween(BigDecimal from, BigDecimal to);

List<Product> getAllProductsByCategoryNameIn(Collection<String> categoriesName);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package mate.academy.springboot.datajpa.service;

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

public interface CategoryService {
Category save(Category categoryMapper);

Category getById(Long id);

void deleteById(Long id);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package mate.academy.springboot.datajpa.service;

import java.math.BigDecimal;
import java.util.List;
import java.util.Set;
import mate.academy.springboot.datajpa.model.Product;

public interface ProductService {
Product save(Product product);

Product getById(Long id);

void deleteById(Long id);

List<Product> getAll();

List<Product> getAllByPricePriceBetween(BigDecimal from, BigDecimal to);

List<Product> getAllByCategoryNameIn(Set<String> categories);
}
Loading
Loading