Merge pull request #72 from CommitField/fix/#71

fix: S3Config & CreatePetApi

Author: yoon2000

src/main/java/cmf/commitField/domain/pet/controller/PetController.java

@@ -3,7 +3,9 @@
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.service.PetService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -15,9 +17,12 @@ public class PetController {
     private final PetService petService;
 
     // 새로운 펫 추가
-    @PostMapping
-    public Pet createPet(@RequestParam String name, @RequestParam String imageUrl) {
-        return petService.createPet(name, imageUrl);
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public Pet createPet(
+            @RequestParam String name,
+            @RequestPart(value = "imageFile") MultipartFile imageFile
+    ) throws Exception {
+        return petService.createPet(name, imageFile);
     }
 
     // 모든 펫 조회

src/main/java/cmf/commitField/domain/pet/service/PetService.java

@@ -2,9 +2,12 @@
 
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.repository.PetRepository;
+import cmf.commitField.global.aws.s3.S3Service;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 
@@ -13,9 +16,17 @@
 public class PetService {
 
     private final PetRepository petRepository;
+    private final S3Service s3Service;
 
     // 새로운 펫 생성
-    public Pet createPet(String name, String imageUrl) {
+    public Pet createPet(String name, MultipartFile imageFile) throws IOException {
+
+        // ✅ S3 업로드 로직 추가
+        String imageUrl = null;
+        if (imageFile != null && !imageFile.isEmpty()) {
+            imageUrl = s3Service.uploadFile(imageFile, "pet-images");
+        }
+
         Pet pet = new Pet(name, imageUrl);
         return petRepository.save(pet);
     }

src/main/java/cmf/commitField/global/aws/s3/S3Config.java

@@ -1,16 +1,29 @@
 package cmf.commitField.global.aws.s3;
 
+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.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 
 @Configuration
 public class S3Config {
+
+    @Value("${aws.access-key-id}")
+    private String accessKeyId;
+
+    @Value("${aws.secret-access-key}")
+    private String secretAccessKey;
+
     @Bean
     public S3Client s3Client() {
         return S3Client.builder()
                 .region(Region.AP_NORTHEAST_2)
+                .credentialsProvider(StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(accessKeyId, secretAccessKey)
+                ))
                 .build();
     }
 }