[Feat] 상품 상세 GET 요청 응답 DTO 수정 (#342)

* work

* work

* work

* Work

* work

* work

Author: yeeJin227

src/main/java/com/back/domain/funding/repository/FundingCustomRepositoryImpl.java

@@ -169,7 +169,8 @@ public List<Funding> searchByTitle(String keyword) {
                 com.back.domain.funding.entity.FundingStatus.OPEN,
                 com.back.domain.funding.entity.FundingStatus.APPROVED,
                 com.back.domain.funding.entity.FundingStatus.SUCCESS,
-                com.back.domain.funding.entity.FundingStatus.CLOSED
+                com.back.domain.funding.entity.FundingStatus.CLOSED,
+                com.back.domain.funding.entity.FundingStatus.FAILED
         ));
 
         query.where(predicates.toArray(new Predicate[0]));

src/main/java/com/back/domain/product/product/dto/request/CreateProductRequest.java

@@ -5,7 +5,7 @@
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.*;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Schema(name = "CreateProductRequest", description = "상품 등록 요청 DTO")
@@ -82,10 +82,10 @@ public record CreateProductRequest(
         Boolean isRestock,// 재입고 여부
 
         @Schema(description = "판매 시작일 (null 가능)", example = "2025-10-01")
-        LocalDate sellingStartDate, // 판매 시작일
+        LocalDateTime sellingStartDate, // 판매 시작일
 
         @Schema(description = "판매 종료일 (null 가능)", example = "2025-12-01")
-        LocalDate sellingEndDate, // 판매 종료일
+        LocalDateTime sellingEndDate, // 판매 종료일
 
         @Schema(description = "태그 ID 목록", example = "[1,2,3]")
         @NotEmpty(message = "스타일 태그는 최소 1개 이상이어야 합니다.")

src/main/java/com/back/domain/product/product/dto/response/ProductDetailResponse.java

@@ -4,8 +4,10 @@
 import com.back.domain.product.product.entity.Option;
 import com.back.domain.product.product.entity.ProductImage;
 import com.back.domain.product.tag.dto.response.TagResponse;
+import com.back.global.s3.FileType;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
 
@@ -62,7 +64,7 @@ public record ProductDetailResponse(
         @Schema(description = "추가 상품 목록(null 가능)")
         List<AdditionalProductResponse> additionalProducts,
 
-        @Schema( description = "이미지 파일 목록", example = "[" + "{\"fileUrl\":\"https://example.com/image1.jpg\",\"fileType\":\"MAIN\"}," + "{\"fileUrl\":\"https://example.com/image2.jpg\",\"fileType\":\"ADDITIONAL\"}" + "]" )
+        @Schema( description = "이미지 파일 목록", example = "[" + "{\"url\":\"https://example.com/image1.jpg\",\"type\":\"MAIN\",\"s3Key\":\"product-images/uuid1.png\",\"originalFileName\":\"example.png\"}," + "{\"url\":\"https://example.com/image2.jpg\",\"fileType\":\"ADDITIONAL\",\"s3Key\":\"product-images/uuid2.png\",\"originalFileName\":\"example2.png\"}," + "]" )
         List<ProductImageResponse> images,
 
         @Schema(description = "상품 필수 정보")
@@ -93,8 +95,13 @@ public record ProductDetailResponse(
         boolean isRestock,
 
         @Schema(description = "태그 ID 목록", example = "[1,2,3]")
-        List<TagResponse> tags
+        List<TagResponse> tags,
 
+        @Schema(description = "판매 시작일", example = "2025-10-01")
+        LocalDateTime sellingStartDate,
+
+        @Schema(description = "판매 종료일", example = "2025-12-01")
+        LocalDateTime sellingEndDate
 ) {
     @Schema(name = "OptionResponse", description = "상품 옵션")
     public record OptionResponse(
@@ -135,14 +142,20 @@ public static AdditionalProductResponse fromEntity(AdditionalProduct additional)
     @Schema(name = "ProductImageResponse", description = "상품 이미지")
     public record ProductImageResponse(
             @Schema(description = "이미지 URL", example = "https://s3.amazonaws.com/bucket/uuid-main.jpg")
-            String fileUrl,
+            String url,
             @Schema(description = "이미지 타입", example = "MAIN")
-            String fileType
+            FileType type,
+            @Schema(description = "이미지 s3Key", example = "product-images/uuid1.png")
+            String s3Key,
+            @Schema(description = "이미지 원본파일명", example = "example.png")
+            String originalFileName
     ) {
         public static ProductImageResponse fromEntity(ProductImage img) {
             return new ProductImageResponse(
                     img.getFileUrl(),
-                    img.getFileType().name()
+                    img.getFileType(),
+                    img.getS3Key(),
+                    img.getOriginalFilename()
             );
         }
     }

src/main/java/com/back/domain/product/product/service/ProductService.java

@@ -415,8 +415,8 @@ private Product buildProductFromRequest(CreateProductRequest request, User user,
                 .maxQuantity(request.maxQuantity()) // 최대 구매수량
                 .isPlanned(request.isPlanned()) // 기획상품 여부
                 .isRestock(request.isRestock()) // 재입고상품 여부
-                .sellingStartDate(request.sellingStartDate() != null ? request.sellingStartDate().atStartOfDay() : null)// 판매시작일
-                .sellingEndDate(request.sellingEndDate() != null ? request.sellingEndDate().atStartOfDay() : null)// 판매종료일
+                .sellingStartDate(request.sellingStartDate() != null ? request.sellingStartDate() : null)// 판매시작일
+                .sellingEndDate(request.sellingEndDate() != null ? request.sellingEndDate() : null)// 판매종료일
                 .productModelName(request.productModelName()) //품명
                 .certification(request.certification()) // 법에 의한 인증,허가 확인사항
                 .origin(request.origin()) // 제조국
@@ -462,7 +462,6 @@ private void updateProductFromRequest(Product product, UpdateProductRequest requ
         if (previousStock == 0 && product.getStock() > 0) {
             product.setRestock(true);
         }
-
     }
 
     /** 엔티티 -> DTO  */
@@ -511,7 +510,9 @@ private ProductDetailResponse toProductDetailResponse(Product product, ArtistBus
                 product.getDisplayStatus().name(),
                 product.isPlanned(),
                 product.isRestock(),
-                mapTags(product.getProductTags())
+                mapTags(product.getProductTags()),
+                product.getSellingStartDate(),
+                product.getSellingEndDate()
         );
     }