feat: 펫 생성 기능 수정

Author: whale22

src/main/java/cmf/commitField/domain/pet/entity/Pet.java

@@ -1,8 +1,8 @@
 package cmf.commitField.domain.pet.entity;
 
+import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.global.jpa.BaseEntity;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,6 +17,11 @@
 @SuperBuilder
 @Table(name = "pet")
 public class Pet extends BaseEntity {
+    private int type; // 펫 타입 넘버, 현재 1~3까지 존재
     private String name;
     private String imageUrl;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
 }

src/main/java/cmf/commitField/domain/pet/repository/PetRepository.java

@@ -4,9 +4,11 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface PetRepository extends JpaRepository<Pet, Long> {
     Optional<Pet> findById(Long id);
+    List<Pet> findByUserEmail(String email);
 }

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

@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
+import java.util.Random;
 
 @Service
 @RequiredArgsConstructor
@@ -26,8 +27,8 @@ public Pet createPet(String name, MultipartFile imageFile) throws IOException {
         if (imageFile != null && !imageFile.isEmpty()) {
             imageUrl = s3Service.uploadFile(imageFile, "pet-images");
         }
-
-        Pet pet = new Pet(name, imageUrl);
+        Random random = new Random();
+        Pet pet = new Pet(random.nextInt(3), name, imageUrl);
         return petRepository.save(pet);
     }
 

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

@@ -1,8 +1,11 @@
 package cmf.commitField.domain.user.service;
 
+import cmf.commitField.domain.pet.entity.Pet;
+import cmf.commitField.domain.pet.repository.PetRepository;
 import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
 import org.springframework.security.oauth2.core.user.OAuth2User;
@@ -11,14 +14,13 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Random;
 
 @Service
+@RequiredArgsConstructor
 public class CustomOAuth2UserService extends DefaultOAuth2UserService {
     private final UserRepository userRepository;
-
-    public CustomOAuth2UserService(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
+    private final PetRepository petRepository;
 
     @Override
     public OAuth2User loadUser(OAuth2UserRequest userRequest) {
@@ -36,14 +38,23 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
         }
 
         Optional<User> existingUser = userRepository.findByUsername(username);
+
         User user;
+        Pet pet;
         if (existingUser.isPresent()) {
+            //유저 정보가 있다면 유저 정보를 얻어온다.
             user = existingUser.get();
             user.setAvatarUrl(avatarUrl);
-            user.setEmail(email);  // GitHub에서 이메일이 변경될 수도 있으니 업데이트\
+            user.setEmail(email);  // GitHub에서 이메일이 변경될 수도 있으니 업데이트
         } else {
+            //유저 정보가 db에 존재하지 않을 경우 회원가입 시킨다.
+            //유저 생성 및 펫 생성
             user = new User(username, email, name, avatarUrl, User.Role.USER, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
             userRepository.save(user);
+
+            Random random = new Random(); //펫 랜덤 생성
+            pet = new Pet(random.nextInt(3), "알알", "temp-Url", user); // 변경 필요
+            petRepository.save(pet);
         }
 
         return new CustomOAuth2User(oauthUser, user);