[feat] 클론코딩 3번째!

carrot/build.gradle

@@ -33,6 +33,8 @@ dependencies {
 	annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.0.Beta1'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	runtimeOnly 'org.postgresql:postgresql'
+	implementation("software.amazon.awssdk:bom:2.21.0")
+	implementation("software.amazon.awssdk:s3:2.21.0")
 }
 
 tasks.named('test') {

carrot/src/main/java/server/sopt/carrot/config/S3Config.java

@@ -0,0 +1,48 @@
+package server.sopt.carrot.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.auth.credentials.SystemPropertyCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+@Configuration
+public class S3Config {
+
+    private static final String AWS_ACCESS_KEY_ID = "aws.accessKeyId";
+    private static final String AWS_SECRET_ACCESS_KEY = "aws.secretAccessKey";
+
+    private final String accessKey;
+    private final String secretKey;
+    private final String regionString;
+
+    public S3Config(@Value("${aws-property.access-key}") final String accessKey,
+                     @Value("${aws-property.secret-key}") final String secretKey,
+                     @Value("${aws-property.aws-region}") final String regionString) {
+        this.accessKey = accessKey;
+        this.secretKey = secretKey;
+        this.regionString = regionString;
+    }
+
+
+    @Bean
+    public SystemPropertyCredentialsProvider systemPropertyCredentialsProvider() {
+        System.setProperty(AWS_ACCESS_KEY_ID, accessKey);
+        System.setProperty(AWS_SECRET_ACCESS_KEY, secretKey);
+        return SystemPropertyCredentialsProvider.create();
+    }
+
+    @Bean
+    public Region getRegion() {
+        return Region.of(regionString);
+    }
+
+    @Bean
+    public S3Client getS3Client() {
+        return S3Client.builder()
+                .region(getRegion())
+                .credentialsProvider(systemPropertyCredentialsProvider())
+                .build();
+    }
+}

carrot/src/main/java/server/sopt/carrot/controller/ProductController.java

@@ -6,13 +6,11 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import server.sopt.carrot.constant.Place;
-import server.sopt.carrot.dto.product.ProductCreate;
-import server.sopt.carrot.dto.product.ProductEdit;
-import server.sopt.carrot.dto.product.ProductFindDto;
-import server.sopt.carrot.dto.product.ProductGoodUpdateDto;
+import server.sopt.carrot.dto.product.*;
 import server.sopt.carrot.mapper.ProductMapper;
 import server.sopt.carrot.service.ProductService;
 
+import java.io.IOException;
 import java.util.List;
 
 @RestController
@@ -22,12 +20,20 @@ public class ProductController {
     private final ProductService productService;
     private final ProductMapper productMapper;
     // 새로운 상품을 등록해줘!
-    @PostMapping("")
+    @PostMapping
     public ProductCreate.Response createProduct(
             @Valid @RequestBody ProductCreate.Request req
-    ) {
+    ) throws IOException {
         return productService.createProductwithCustomerId(req);
     }
+
+    @DeleteMapping("/{productId}")
+    public ResponseEntity<Void> deleteProduct(
+            @Valid @RequestHeader Long productId
+    ) throws IOException {
+        return productService.deleteProduct(productId);
+    }
+
     // 특정 상품 조회
     @PatchMapping("/{productId}")
     public ProductFindDto productGoodUporDown(

carrot/src/main/java/server/sopt/carrot/dto/product/ProductCreate.java

@@ -1,12 +1,12 @@
 package server.sopt.carrot.dto.product;
 
-import jakarta.persistence.Column;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.*;
+import org.springframework.web.multipart.MultipartFile;
 import server.sopt.carrot.constant.CellingStatus;
 import server.sopt.carrot.constant.Place;
 import server.sopt.carrot.entity.Customer;
@@ -25,22 +25,23 @@ public static class Request {
         private Integer price;
 
         @NotNull
-        @Size(min=3,max=50,message= "Name is 3~50")
+        @Size(min = 3, max = 50, message = "Name is 3~50")
         private String itemName;
 
         @NotNull
         private Long customerId;
 
-//        @NotNull
-//        private CellingStatus cellingStatus;
 
         @NotNull
-        @Size(min=1,max=512,message= "Description is 3~50")
+        @Size(min = 1, max = 512, message = "Description is 3~50")
         private String itemDescription;
 
         @NotNull
         @Enumerated(EnumType.STRING)
         private Place place;
+
+        private MultipartFile image;
+
     }
     @Getter
     @Builder

carrot/src/main/java/server/sopt/carrot/dto/product/ProductDelete.java

@@ -0,0 +1,2 @@
+package server.sopt.carrot.dto.product;
+

carrot/src/main/java/server/sopt/carrot/entity/Image.java

@@ -0,0 +1,26 @@
+package server.sopt.carrot.entity;
+
+import jakarta.persistence.*;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor
+public class Image {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String imageUrl;
+
+    @OneToOne
+    Product product;
+
+    @Builder
+    public Image(String imageUrl, Product product) {
+        this.imageUrl = imageUrl;
+        this.product = product;
+    }
+}

carrot/src/main/java/server/sopt/carrot/external/S3Service.java

@@ -0,0 +1,80 @@
+package server.sopt.carrot.external;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+import server.sopt.carrot.config.S3Config;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+@Component
+public class S3Service {
+
+    private final String bucketName;
+    private final S3Config awsConfig;
+    private static final List<String> IMAGE_EXTENSIONS = Arrays.asList("image/jpeg", "image/png", "image/jpg", "image/webp");
+
+
+    public S3Service(@Value("${aws-property.s3-bucket-name}") final String bucketName, S3Config awsConfig) {
+        this.bucketName = bucketName;
+        this.awsConfig = awsConfig;
+    }
+
+
+    public String uploadImage(String directoryPath, MultipartFile image) throws IOException {
+        final String key = directoryPath + generateImageFileName();
+        final S3Client s3Client = awsConfig.getS3Client();
+
+        validateExtension(image);
+        validateFileSize(image);
+
+        PutObjectRequest request = PutObjectRequest.builder()
+                .bucket(bucketName)
+                .key(key)
+                .contentType(image.getContentType())
+                .contentDisposition("inline")
+                .build();
+
+        RequestBody requestBody = RequestBody.fromBytes(image.getBytes());
+        s3Client.putObject(request, requestBody);
+        return key;
+    }
+
+    public void deleteImage(String key) throws IOException {
+        final S3Client s3Client = awsConfig.getS3Client();
+        s3Client.deleteObject((DeleteObjectRequest.Builder builder) ->
+                builder.bucket(bucketName)
+                        .key(key)
+                        .build()
+        );
+    }
+
+
+    private String generateImageFileName() {
+        return UUID.randomUUID() + ".jpg";
+    }
+
+
+    private void validateExtension(MultipartFile image) {
+        String contentType = image.getContentType();
+        if (!IMAGE_EXTENSIONS.contains(contentType)) {
+            throw new RuntimeException("이미지 확장자는 jpg, png, webp만 가능합니다.");
+        }
+    }
+
+    private static final Long MAX_FILE_SIZE = 5 * 1024 * 1024L;
+
+    private void validateFileSize(MultipartFile image) {
+        if (image.getSize() > MAX_FILE_SIZE) {
+            throw new RuntimeException("이미지 사이즈는 5MB를 넘을 수 없습니다.");
+        }
+    }
+
+}

carrot/src/main/java/server/sopt/carrot/repo/ImageRepository.java

@@ -0,0 +1,10 @@
+package server.sopt.carrot.repo;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import server.sopt.carrot.entity.Image;
+
+import java.util.Optional;
+
+public interface ImageRepository extends JpaRepository<Image, Long> {
+    Optional<Image> findByProduct_Id(Long proudctId);
+}

carrot/src/main/java/server/sopt/carrot/service/ProductService.java

@@ -1,19 +1,18 @@
 package server.sopt.carrot.service;
 
+import org.springframework.http.ResponseEntity;
 import server.sopt.carrot.constant.Place;
-import server.sopt.carrot.dto.product.ProductCreate;
-import server.sopt.carrot.dto.product.ProductFindDto;
-import server.sopt.carrot.dto.product.ProductEdit;
-import server.sopt.carrot.dto.product.ProductGoodUpdateDto;
+import server.sopt.carrot.dto.product.*;
 import server.sopt.carrot.entity.Product;
 
+import java.io.IOException;
 import java.util.List;
 
 public interface ProductService {
 
     Product findProductById(Long id);
     ProductFindDto getProductById(Long id);
-    ProductCreate.Response createProductwithCustomerId(ProductCreate.Request req);
+    ProductCreate.Response createProductwithCustomerId(ProductCreate.Request req) throws IOException;
 
     List<ProductFindDto> getAllProductByCustomerId(Long customerId);
 
@@ -26,4 +25,6 @@ public interface ProductService {
     List<ProductFindDto> getProductbyPlace(Place place);
 
     ProductFindDto productGoodUporDown(Long productId, ProductGoodUpdateDto productGoodUpdateDto);
+
+    ResponseEntity<Void> deleteProduct(Long productId);
 }

carrot/src/main/java/server/sopt/carrot/service/ProductServiceImpl.java

@@ -4,21 +4,23 @@
 import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import server.sopt.carrot.constant.CellingStatus;
 import server.sopt.carrot.constant.Place;
-import server.sopt.carrot.dto.product.ProductEdit;
-import server.sopt.carrot.dto.product.ProductGoodUpdateDto;
+import server.sopt.carrot.dto.product.*;
 import server.sopt.carrot.entity.Customer;
+import server.sopt.carrot.entity.Image;
 import server.sopt.carrot.entity.Product;
-import server.sopt.carrot.dto.product.ProductCreate;
-import server.sopt.carrot.dto.product.ProductFindDto;
 import server.sopt.carrot.error.ErrorMessage;
 import server.sopt.carrot.exception.BusinessException;
 import server.sopt.carrot.exception.NotFoundPlaceException;
+import server.sopt.carrot.external.S3Service;
 import server.sopt.carrot.mapper.ProductMapper;
+import server.sopt.carrot.repo.ImageRepository;
 import server.sopt.carrot.repo.ProductRepository;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -29,7 +31,9 @@ public class ProductServiceImpl implements ProductService {
     private final ProductRepository productRepository;
     private final CustomerService customerService;
     private final ProductMapper productMapper;
-
+    private final S3Service s3Service;
+    private final ImageRepository imageRepository;
+    private final String BLOG_S3_UPLOAD_FOLER = "/blog";
     @Override
     public Product findProductById(Long id) {
         return productRepository.findById(id)
@@ -43,8 +47,7 @@ public ProductFindDto getProductById(Long id) {
     }
     @Transactional
     @Override
-    public ProductCreate.Response createProductwithCustomerId(ProductCreate.Request req)
-    {
+    public ProductCreate.Response createProductwithCustomerId(ProductCreate.Request req) throws IOException {
         Customer customer = customerService.getCustomerById(req.getCustomerId());
         Product product = Product.builder()
                 .price(req.getPrice())
@@ -56,6 +59,11 @@ public ProductCreate.Response createProductwithCustomerId(ProductCreate.Request
                 .build();
 
         productRepository.save(product);
+        String imageUrl = s3Service.uploadImage(BLOG_S3_UPLOAD_FOLER, req.getImage());
+        Image image = Image.builder()
+                .imageUrl(imageUrl)
+                .product(product).build();
+        imageRepository.save(image);
         return ProductCreate.Response.fromEntity(product);
     }
 
@@ -89,8 +97,6 @@ public ProductFindDto editProduct(
     @Override
     @Transactional
     public ProductFindDto soldProduct(Product product) {
-//        Product product = productRepository.findById(productId)
-//                .orElseThrow(() -> new BusinessException(ErrorMessage.PRODUC)T_NOT_FOUND));
         product.setCellingStatus(CellingStatus.SOLD);
         return ProductFindDto.of(product);
     }
@@ -112,4 +118,13 @@ public ProductFindDto productGoodUporDown(Long productId, ProductGoodUpdateDto p
         product.setGood(product.getGood() + point);
         return productMapper.toProductFindDto(product);
     }
+
+    @Override
+    public ResponseEntity<Void> deleteProduct(Long productId) {
+        Image image= imageRepository.findByProduct_Id(productId).orElseThrow(
+                () -> new BusinessException(ErrorMessage.PRODUCT_NOT_FOUND)
+        );
+        imageRepository.delete(image);
+        return ResponseEntity.ok().build();
+    }
 }