[refactor] product 및 review 메소드 명, 엔드포인트 등 수정

src/main/java/com/example/eightyage/domain/product/entity/Category.java → src/main/java/com/example/eightyage/domain/product/category/Category.java

@@ -1,4 +1,4 @@
-package com.example.eightyage.domain.product.entity;
+package com.example.eightyage.domain.product.category;
 
 public enum Category {
     SKINCARE("스킨케어"),

src/main/java/com/example/eightyage/domain/product/controller/ProductController.java

@@ -6,7 +6,7 @@
 import com.example.eightyage.domain.product.dto.response.ProductSaveResponseDto;
 import com.example.eightyage.domain.product.dto.response.ProductSearchResponseDto;
 import com.example.eightyage.domain.product.dto.response.ProductUpdateResponseDto;
-import com.example.eightyage.domain.product.entity.Category;
+import com.example.eightyage.domain.product.category.Category;
 import com.example.eightyage.domain.product.service.ProductService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -46,8 +46,8 @@ public ResponseEntity<ProductUpdateResponseDto> updateProduct(
 
     // 제품 단건 조회
     @GetMapping("/v1/products/{productId}")
-    public ResponseEntity<ProductGetResponseDto> getProduct(@PathVariable Long productId){
-        ProductGetResponseDto responseDto = productService.findProductById(productId);
+    public ResponseEntity<ProductGetResponseDto> findProduct(@PathVariable Long productId){
+        ProductGetResponseDto responseDto = productService.getProductById(productId);
 
         return ResponseEntity.ok(responseDto);
     }

src/main/java/com/example/eightyage/domain/product/dto/request/ProductSaveRequestDto.java

@@ -1,12 +1,14 @@
 package com.example.eightyage.domain.product.dto.request;
 
-import com.example.eightyage.domain.product.entity.Category;
+import com.example.eightyage.domain.product.category.Category;
 import com.example.eightyage.global.dto.ValidationMessage;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
+@AllArgsConstructor
 public class ProductSaveRequestDto {
 
     @NotBlank(message= ValidationMessage.NOT_BLANK_PRODUCT_NAME)

src/main/java/com/example/eightyage/domain/product/dto/request/ProductUpdateRequestDto.java

@@ -1,19 +1,16 @@
 package com.example.eightyage.domain.product.dto.request;
 
-import com.example.eightyage.domain.product.entity.Category;
-import com.example.eightyage.domain.product.entity.SaleState;
+import com.example.eightyage.domain.product.category.Category;
+import com.example.eightyage.domain.product.salestate.SaleState;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
+@AllArgsConstructor
 public class ProductUpdateRequestDto {
-
     private String productName;
-
     private Category category;
-
     private String content;
-
     private SaleState saleState;
-
     private Integer price;
 }

src/main/java/com/example/eightyage/domain/product/dto/response/ProductGetResponseDto.java

@@ -1,7 +1,7 @@
 package com.example.eightyage.domain.product.dto.response;
 
-import com.example.eightyage.domain.product.entity.Category;
-import com.example.eightyage.domain.product.entity.SaleState;
+import com.example.eightyage.domain.product.category.Category;
+import com.example.eightyage.domain.product.salestate.SaleState;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -12,18 +12,11 @@
 @Builder
 @AllArgsConstructor
 public class ProductGetResponseDto {
-
     private final String productName;
-
     private final String content;
-
     private final Category category;
-
     private final Integer price;
-
     private final SaleState saleState;
-
     private final LocalDateTime createdAt;
-
     private final LocalDateTime modifiedAt;
 }

src/main/java/com/example/eightyage/domain/product/dto/response/ProductSaveResponseDto.java

@@ -1,7 +1,7 @@
 package com.example.eightyage.domain.product.dto.response;
 
-import com.example.eightyage.domain.product.entity.Category;
-import com.example.eightyage.domain.product.entity.SaleState;
+import com.example.eightyage.domain.product.category.Category;
+import com.example.eightyage.domain.product.salestate.SaleState;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -12,18 +12,11 @@
 @Builder
 @AllArgsConstructor
 public class ProductSaveResponseDto {
-
     private final String productName;
-
     private final Category category;
-
     private final Integer price;
-
     private final String content;
-
     private final SaleState saleState;
-
     private final LocalDateTime createdAt;
-
     private final LocalDateTime modifiedAt;
 }

src/main/java/com/example/eightyage/domain/product/dto/response/ProductSearchResponseDto.java

@@ -1,6 +1,6 @@
 package com.example.eightyage.domain.product.dto.response;
 
-import com.example.eightyage.domain.product.entity.Category;
+import com.example.eightyage.domain.product.category.Category;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/example/eightyage/domain/product/dto/response/ProductUpdateResponseDto.java

@@ -1,7 +1,7 @@
 package com.example.eightyage.domain.product.dto.response;
 
-import com.example.eightyage.domain.product.entity.Category;
-import com.example.eightyage.domain.product.entity.SaleState;
+import com.example.eightyage.domain.product.category.Category;
+import com.example.eightyage.domain.product.salestate.SaleState;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -12,18 +12,11 @@
 @Builder
 @AllArgsConstructor
 public class ProductUpdateResponseDto {
-
     private final String productName;
-
     private final Integer price;
-
     private final String content;
-
     private final Category category;
-
     private final SaleState saleState;
-
     private final LocalDateTime createdAt;
-
     private final LocalDateTime modifiedAt;
 }

src/main/java/com/example/eightyage/domain/product/entity/Product.java

@@ -1,8 +1,11 @@
 package com.example.eightyage.domain.product.entity;
 
+import com.example.eightyage.domain.product.category.Category;
+import com.example.eightyage.domain.product.salestate.SaleState;
 import com.example.eightyage.domain.review.entity.Review;
 import com.example.eightyage.global.entity.TimeStamped;
 import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -14,6 +17,7 @@
 @Entity
 @Getter
 @NoArgsConstructor
+@AllArgsConstructor
 @Table(name = "product",
         indexes = @Index(name = "index_saleState_category_name", columnList = "saleState, category, name")
 )
@@ -50,31 +54,31 @@ public Product(String name, Category category, String content, Integer price, Sa
         this.saleState = saleState;
     }
 
-    public void updateName(String newName){
+    public void updateNameIfNotNull(String newName){
         if(newName != null){
             this.name = newName;
         }
     }
 
-    public void updateCategory(Category newCategory) {
+    public void updateCategoryIfNotNull(Category newCategory) {
         if (newCategory != null) {
             this.category = newCategory;
         }
     }
 
-    public void updateContent(String newContent) {
+    public void updateContentIfNotNull(String newContent) {
         if (newContent != null) {
             this.content = newContent;
         }
     }
 
-    public void updatePrice(Integer newPrice) {
+    public void updatePriceIfNotNull(Integer newPrice) {
         if (newPrice != null) {
             this.price = newPrice;
         }
     }
 
-    public void updateSaleState(SaleState newSaleState) {
+    public void updateSaleStateIfNotNull(SaleState newSaleState) {
         if (newSaleState != null) {
             this.saleState = newSaleState;
         }

src/main/java/com/example/eightyage/domain/product/repository/ProductBulkRepository.java

@@ -1,8 +1,8 @@
 package com.example.eightyage.domain.product.repository;
 
-import com.example.eightyage.domain.product.entity.Category;
+import com.example.eightyage.domain.product.category.Category;
 import com.example.eightyage.domain.product.entity.Product;
-import com.example.eightyage.domain.product.entity.SaleState;
+import com.example.eightyage.domain.product.salestate.SaleState;
 import lombok.RequiredArgsConstructor;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;

src/main/java/com/example/eightyage/domain/product/repository/ProductImageRepository.java

@@ -1,7 +1,6 @@
 package com.example.eightyage.domain.product.repository;
 
 import com.example.eightyage.domain.product.entity.ProductImage;
-import com.example.eightyage.global.exception.NotFoundException;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 

src/main/java/com/example/eightyage/domain/product/repository/ProductRepository.java

@@ -1,7 +1,7 @@
 package com.example.eightyage.domain.product.repository;
 
 import com.example.eightyage.domain.product.dto.response.ProductSearchResponseDto;
-import com.example.eightyage.domain.product.entity.Category;
+import com.example.eightyage.domain.product.category.Category;
 import com.example.eightyage.domain.product.entity.Product;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/com/example/eightyage/domain/product/salestate/SaleState.java

@@ -0,0 +1,6 @@
+package com.example.eightyage.domain.product.salestate;
+
+public enum SaleState {
+    FOR_SALE,
+    SOLD_OUT
+}

src/main/java/com/example/eightyage/domain/product/service/ProductService.java

@@ -3,9 +3,9 @@
 import com.example.eightyage.domain.product.dto.request.ProductSaveRequestDto;
 import com.example.eightyage.domain.product.dto.request.ProductUpdateRequestDto;
 import com.example.eightyage.domain.product.dto.response.*;
-import com.example.eightyage.domain.product.entity.Category;
+import com.example.eightyage.domain.product.category.Category;
 import com.example.eightyage.domain.product.entity.Product;
-import com.example.eightyage.domain.product.entity.SaleState;
+import com.example.eightyage.domain.product.salestate.SaleState;
 import com.example.eightyage.domain.product.repository.ProductRepository;
 import com.example.eightyage.domain.review.entity.Review;
 import com.example.eightyage.domain.review.repository.ReviewRepository;
@@ -57,11 +57,11 @@ public ProductSaveResponseDto saveProduct(ProductSaveRequestDto requestDto) {
     public ProductUpdateResponseDto updateProduct(Long productId, ProductUpdateRequestDto requestDto) {
         Product findProduct = findProductByIdOrElseThrow(productId);
 
-        findProduct.updateName(requestDto.getProductName());
-        findProduct.updateCategory(requestDto.getCategory());
-        findProduct.updateContent(requestDto.getContent());
-        findProduct.updateSaleState(requestDto.getSaleState());
-        findProduct.updatePrice(requestDto.getPrice());
+        findProduct.updateNameIfNotNull(requestDto.getProductName());
+        findProduct.updateCategoryIfNotNull(requestDto.getCategory());
+        findProduct.updateContentIfNotNull(requestDto.getContent());
+        findProduct.updateSaleStateIfNotNull(requestDto.getSaleState());
+        findProduct.updatePriceIfNotNull(requestDto.getPrice());
 
         return ProductUpdateResponseDto.builder()
                 .productName(findProduct.getName())
@@ -76,7 +76,7 @@ public ProductUpdateResponseDto updateProduct(Long productId, ProductUpdateReque
 
     // 제품 단건 조회
     @Transactional(readOnly = true)
-    public ProductGetResponseDto findProductById(Long productId) {
+    public ProductGetResponseDto getProductById(Long productId) {
         Product findProduct = findProductByIdOrElseThrow(productId);
 
         return ProductGetResponseDto.builder()

src/main/java/com/example/eightyage/domain/review/controller/ReviewController.java

@@ -54,16 +54,16 @@ public ResponseEntity<ReviewUpdateResponseDto> updateReview(
     }
 
     // 리뷰 다건 조회
-    @GetMapping("/v1/products/{productId}/reviews")
-    public ResponseEntity<Page<ReviewsGetResponseDto>> getReviews(
-            @PathVariable Long productId,
+    @GetMapping("/v1/reviews")
+    public ResponseEntity<Page<ReviewsGetResponseDto>> findReviews(
+            @RequestParam(required = true) Long productId,
             @RequestParam(required = false, defaultValue = "score") String orderBy,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size
     ){
         PageRequest pageRequest = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, orderBy));
 
-        Page<ReviewsGetResponseDto> reviews = reviewService.findReviews(productId, pageRequest);
+        Page<ReviewsGetResponseDto> reviews = reviewService.getReviews(productId, pageRequest);
 
         return ResponseEntity.ok(reviews);
     }

src/main/java/com/example/eightyage/domain/review/dto/request/ReviewSaveRequestDto.java

@@ -3,9 +3,11 @@
 import com.example.eightyage.global.dto.ValidationMessage;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
+@AllArgsConstructor
 public class ReviewSaveRequestDto {
 
     @NotNull(message = ValidationMessage.NOT_NULL_SCORE)

src/main/java/com/example/eightyage/domain/review/dto/request/ReviewUpdateRequestDto.java

@@ -2,11 +2,11 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 @Getter
+@AllArgsConstructor
 public class ReviewUpdateRequestDto {
-
     private Double score;
-
     private String content;
 }

src/main/java/com/example/eightyage/domain/review/dto/response/ReviewSaveResponseDto.java

@@ -10,20 +10,12 @@
 @Builder
 @AllArgsConstructor
 public class ReviewSaveResponseDto {
-
     private final Long id;
-
     private final Long userId;
-
     private final Long productId;
-
     private final String nickname;
-
     private final Double score;
-
     private final String content;
-
     private final LocalDateTime createdAt;
-
     private final LocalDateTime modifiedAt;
 }

src/main/java/com/example/eightyage/domain/review/dto/response/ReviewUpdateResponseDto.java

@@ -10,18 +10,11 @@
 @Builder
 @AllArgsConstructor
 public class ReviewUpdateResponseDto {
-
     private final Long id;
-
     private final Long userId;
-
     private final String nickname;
-
     private final Double score;
-
     private final String content;
-
     private final LocalDateTime createdAt;
-
     private final LocalDateTime modifiedAt;
 }