feat: 펫 생성 기능 테스트 확인

Author: whale22

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

@@ -2,6 +2,8 @@
 
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.service.PetService;
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.service.CustomOAuth2UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -11,18 +13,20 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/pets")
+@RequestMapping("/api/pets")
 public class PetController {
-
+    private final CustomOAuth2UserService userService;
     private final PetService petService;
 
     // 새로운 펫 추가
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public Pet createPet(
+            @RequestParam String email,
             @RequestParam String name,
             @RequestPart(value = "imageFile") MultipartFile imageFile
     ) throws Exception {
-        return petService.createPet(name, imageFile);
+        User user = userService.getUserByEmail(email).get();
+        return petService.createPet(name, imageFile, user);
     }
 
     // 모든 펫 조회

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

@@ -2,6 +2,7 @@
 
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.repository.PetRepository;
+import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.global.aws.s3.S3Service;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -20,15 +21,15 @@ public class PetService {
     private final S3Service s3Service;
 
     // 새로운 펫 생성
-    public Pet createPet(String name, MultipartFile imageFile) throws IOException {
+    public Pet createPet(String name, MultipartFile imageFile, User user) throws IOException {
 
         // ✅ S3 업로드 로직 추가
         String imageUrl = null;
         if (imageFile != null && !imageFile.isEmpty()) {
             imageUrl = s3Service.uploadFile(imageFile, "pet-images");
         }
         Random random = new Random();
-        Pet pet = new Pet(random.nextInt(3), name, imageUrl);
+        Pet pet = new Pet(random.nextInt(3), name, imageUrl, user);
         return petRepository.save(pet);
     }
 

src/main/java/cmf/commitField/domain/season/controller/ApiV1SeasonController.java

@@ -4,9 +4,11 @@
 import cmf.commitField.domain.season.service.SeasonService;
 import cmf.commitField.global.scheduler.SeasonScheduler;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.swing.*;
 import java.time.LocalDateTime;
 
 @RestController
@@ -20,7 +22,7 @@ public class ApiV1SeasonController {
     @PostMapping
     public Season createSeason() {
         String name = "2025 1분기";
-        LocalDateTime start = LocalDateTime.of(2025, 1, 1, 0, 0, 0);
+        LocalDateTime start = LocalDateTime.of(2024, 12, 1, 0, 0, 0);
         LocalDateTime end = LocalDateTime.of(2025, 2, 28, 23, 59, 59);
 
         return seasonService.createNewSeason(name, start, end);

src/main/java/cmf/commitField/domain/user/repository/UserRepository.java

@@ -8,4 +8,5 @@
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByUsername(String username);
     Optional<User> findById(Long id);
+    Optional<User> findByEmail(String email);
 }

src/main/java/cmf/commitField/domain/user/service/CustomOAuth2UserService.java

@@ -64,4 +64,9 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
     public Optional<User> getUserById(Long userId) {
         return userRepository.findById(userId);
     }
+
+    // email로 user 조회
+    public Optional<User> getUserByEmail(String email) {
+        return userRepository.findByEmail(email);
+    }
 }