-
Notifications
You must be signed in to change notification settings - Fork 343
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
Implemented all needed repositories/services/controllers #323
Open
ykhmaruk
wants to merge
6
commits into
mate-academy:main
Choose a base branch
from
ykhmaruk:hw-solution
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5a7e695
Implemented all needed repositories/services/controllers
ykhmaruk 1e15621
add some fixes
ykhmaruk e79d423
add some fixes
ykhmaruk 53f2192
add some fixes to Product and application.properties
ykhmaruk d00d1c6
add some fixes to Product and application.properties
ykhmaruk 439c408
add fixes after review
ykhmaruk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
src/main/java/mate/academy/springboot/datajpa/controller/CategoryController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
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.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; | ||
|
||
@RestController | ||
@RequestMapping("/categories") | ||
@RequiredArgsConstructor | ||
public class CategoryController { | ||
private final CategoryService service; | ||
private final DtoMapper<CategoryRequestDto, CategoryResponseDto, Category> mapper; | ||
|
||
@PostMapping | ||
public CategoryResponseDto create(@RequestBody @Valid CategoryRequestDto dto) { | ||
Category category = service.add(mapper.mapToModel(dto)); | ||
return mapper.mapToDto(category); | ||
} | ||
|
||
@GetMapping("/{id}") | ||
public CategoryResponseDto get(@PathVariable Long id) { | ||
Category category = service.getById(id); | ||
return mapper.mapToDto(category); | ||
} | ||
|
||
@DeleteMapping ("/{id}") | ||
public void delete(@PathVariable Long id) { | ||
service.delete(id); | ||
} | ||
|
||
@PutMapping("/{id}") | ||
public CategoryResponseDto update(@PathVariable Long id, | ||
@RequestBody @Valid CategoryRequestDto dto) { | ||
Category category = service.update(mapper.mapToModel(dto), id); | ||
return mapper.mapToDto(category); | ||
} | ||
} |
69 changes: 69 additions & 0 deletions
69
src/main/java/mate/academy/springboot/datajpa/controller/ProductController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
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.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; | ||
|
||
@RestController | ||
@RequestMapping("/products") | ||
@RequiredArgsConstructor | ||
public class ProductController { | ||
private final ProductService service; | ||
private final DtoMapper<ProductRequestDto, ProductResponseDto, Product> mapper; | ||
|
||
@PostMapping | ||
public ProductResponseDto create(@RequestBody @Valid ProductRequestDto dto) { | ||
Product mappedProduct = mapper.mapToModel(dto); | ||
Product product = service.add(mappedProduct); | ||
return mapper.mapToDto(product); | ||
} | ||
|
||
@GetMapping("/{id}") | ||
public ProductResponseDto get(@PathVariable Long id) { | ||
Product product = service.getById(id); | ||
return mapper.mapToDto(product); | ||
} | ||
|
||
@DeleteMapping("/{id}") | ||
public void delete(@PathVariable Long id) { | ||
service.delete(id); | ||
} | ||
|
||
@PutMapping("/{id}") | ||
public ProductResponseDto update(@PathVariable Long id, | ||
@RequestBody @Valid ProductRequestDto dto) { | ||
Product product = service.update(mapper.mapToModel(dto), id); | ||
return mapper.mapToDto(product); | ||
} | ||
|
||
@GetMapping("/price") | ||
public List<ProductResponseDto> getByPrice(@RequestParam BigDecimal from, | ||
@RequestParam BigDecimal to) { | ||
return service.findAllByPriceBetween(from, to).stream() | ||
.map(mapper::mapToDto) | ||
.collect(Collectors.toList()); | ||
} | ||
|
||
@GetMapping("/categories") | ||
public List<ProductResponseDto> getByCategory(@RequestParam List<String> categoryNames) { | ||
return service.findAllByCategoryNameIn(categoryNames).stream() | ||
.map(mapper::mapToDto) | ||
.collect(Collectors.toList()); | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/mate/academy/springboot/datajpa/dto/request/CategoryRequestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
} |
19 changes: 19 additions & 0 deletions
19
src/main/java/mate/academy/springboot/datajpa/dto/request/ProductRequestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|
||
@Getter | ||
@Setter | ||
public class ProductRequestDto { | ||
@NotNull | ||
private String title; | ||
@NotNull | ||
@Positive | ||
private BigDecimal price; | ||
@NotNull | ||
private Long categoryId; | ||
} |
11 changes: 11 additions & 0 deletions
11
src/main/java/mate/academy/springboot/datajpa/dto/response/CategoryResponseDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package mate.academy.springboot.datajpa.dto.response; | ||
|
||
import lombok.Getter; | ||
import lombok.Setter; | ||
|
||
@Getter | ||
@Setter | ||
public class CategoryResponseDto { | ||
private Long id; | ||
private String name; | ||
} |
14 changes: 14 additions & 0 deletions
14
src/main/java/mate/academy/springboot/datajpa/dto/response/ProductResponseDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
} |
4 changes: 4 additions & 0 deletions
4
src/main/java/mate/academy/springboot/datajpa/mapper/DtoMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
package mate.academy.springboot.datajpa.mapper; | ||
|
||
public interface DtoMapper<Q, S, M> extends RequestDtoMapper<Q, M>, ResponseDtoMapper<S, M> { | ||
} |
5 changes: 5 additions & 0 deletions
5
src/main/java/mate/academy/springboot/datajpa/mapper/RequestDtoMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package mate.academy.springboot.datajpa.mapper; | ||
|
||
public interface RequestDtoMapper<Q, M> { | ||
M mapToModel(Q dto); | ||
} |
5 changes: 5 additions & 0 deletions
5
src/main/java/mate/academy/springboot/datajpa/mapper/ResponseDtoMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package mate.academy.springboot.datajpa.mapper; | ||
|
||
public interface ResponseDtoMapper<S, M> { | ||
S mapToDto(M t); | ||
} |
26 changes: 26 additions & 0 deletions
26
src/main/java/mate/academy/springboot/datajpa/mapper/impl/CategoryMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 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; | ||
} | ||
} |
30 changes: 30 additions & 0 deletions
30
src/main/java/mate/academy/springboot/datajpa/mapper/impl/ProductMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 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; | ||
} | ||
|
||
@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; | ||
} | ||
} |
28 changes: 28 additions & 0 deletions
28
src/main/java/mate/academy/springboot/datajpa/model/Category.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.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; | ||
|
||
@Getter | ||
@Setter | ||
@ToString | ||
@NoArgsConstructor | ||
@Entity | ||
@Table(name = "categories") | ||
public class Category { | ||
@Id | ||
@GeneratedValue(strategy = GenerationType.IDENTITY) | ||
private Long id; | ||
private String name; | ||
|
||
public Category(Long id) { | ||
this.id = id; | ||
} | ||
} |
35 changes: 35 additions & 0 deletions
35
src/main/java/mate/academy/springboot/datajpa/model/Product.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|
||
@Getter | ||
@Setter | ||
@Entity | ||
@Table(name = "products") | ||
public class Product { | ||
@Id | ||
@GeneratedValue(strategy = GenerationType.IDENTITY) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
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 | ||
+ '}'; | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
src/main/java/mate/academy/springboot/datajpa/repository/CategoryRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> { | ||
} |
14 changes: 14 additions & 0 deletions
14
src/main/java/mate/academy/springboot/datajpa/repository/ProductRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> categoryNames); | ||
} |
13 changes: 13 additions & 0 deletions
13
src/main/java/mate/academy/springboot/datajpa/service/CategoryService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package mate.academy.springboot.datajpa.service; | ||
|
||
import mate.academy.springboot.datajpa.model.Category; | ||
|
||
public interface CategoryService { | ||
Category add(Category category); | ||
|
||
Category getById(Long id); | ||
|
||
void delete(Long id); | ||
|
||
Category update(Category category, Long id); | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's be consistent in your code style. Either use additional variables everywhere or avoid creating it