Skip to content

Commit 0539ec8

Browse files
authored
Merge pull request #38 from Decodeat/fix/37-products-get
fix: 분석완료 상품 조회 불가 오류 수정
2 parents 0d04d62 + 8b5549f commit 0539ec8

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

src/main/java/com/DecodEat/domain/products/controller/ProductController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public ApiResponse<ProductRegisterResponseDto> registerProduct(
4747
@CurrentUser User user,
4848
@RequestParam("name") String name,
4949
@RequestParam("manufacturer") String manufacturer,
50-
@RequestPart("productImage") MultipartFile productImage,
50+
@RequestPart(value = "productImage", required = false) MultipartFile productImage,
5151
@RequestPart("productInfoImages") List<MultipartFile> productInfoImages
5252
) {
5353
ProductRegisterRequestDto requestDto = ProductRegisterRequestDto.builder()
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
package com.DecodEat.domain.products.repository;
22

3+
import com.DecodEat.domain.products.entity.Product;
34
import com.DecodEat.domain.products.entity.ProductNutrition;
45
import org.springframework.data.jpa.repository.JpaRepository;
56

7+
import javax.swing.text.html.Option;
8+
import java.util.Optional;
9+
610
public interface ProductNutritionRepository extends JpaRepository<ProductNutrition, Long> {
11+
Optional<ProductNutrition> findByProduct(Product product);
712
}

src/main/java/com/DecodEat/domain/products/service/ProductService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public ProductDetailDto getDetail(Long id) {
6262
List<ProductInfoImage> images = productImageRepository.findByProduct(product);
6363
List<String> imageUrls = images.stream().map(ProductInfoImage::getImageUrl).toList();
6464

65-
ProductNutrition productNutrition = productNutritionRepository.findById(id).orElseThrow(() -> new GeneralException(PRODUCT_NUTRITION_NOT_EXISTED));
65+
ProductNutrition productNutrition = productNutritionRepository.findByProduct(product).orElseThrow(() -> new GeneralException(PRODUCT_NUTRITION_NOT_EXISTED));
6666

6767
return ProductConverter.toProductDetailDto(product, imageUrls, productNutrition);
6868
}

0 commit comments

Comments
 (0)