feat: 알 종류에 따라 다른 url 주입하게끔 수정

Author: whale22

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

@@ -9,6 +9,8 @@
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 
+import java.util.Random;
+
 @Entity
 @Getter
 @Setter
@@ -17,11 +19,36 @@
 @SuperBuilder
 @Table(name = "pet")
 public class Pet extends BaseEntity {
-    private int type; // 펫 타입 넘버, 현재 1~3까지 존재
+    private int type; // 펫 타입 넘버, 현재 0~2까지 존재
     private String name;
     private String imageUrl;
+    private int exp; // 펫 경험치
+
+    @Enumerated(EnumType.STRING)  // DB에 저장될 때 String 형태로 저장됨
+    private Grow grow; // 성장 정도
+
+    public enum Grow {
+        EGG, HATCH, GROWN
+    }
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id", nullable = false)
     private User user;
+
+    public Pet(String name, User user){
+        Random random = new Random();
+        this.type = random.nextInt(3);
+        switch (type){ //정해진 알 타입에 따라 다른 url을 주입
+            case 0: this.imageUrl = "temp0";
+                 break;
+            case 1: this.imageUrl = "temp1";
+                break;
+            case 2: this.imageUrl = "temp2";
+                break;
+        }
+        this.name = name;
+        this.exp = 0;
+        this.grow = Grow.EGG;
+        this.user = user;
+    }
 }

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

@@ -29,7 +29,7 @@ public Pet createPet(String name, MultipartFile imageFile, User user) throws IOE
             imageUrl = s3Service.uploadFile(imageFile, "pet-images");
         }
         Random random = new Random();
-        Pet pet = new Pet(random.nextInt(3), name, imageUrl, user);
+        Pet pet = new Pet(name, user);
         return petRepository.save(pet);
     }
 

src/main/java/cmf/commitField/domain/user/entity/User.java

@@ -3,6 +3,7 @@
 import cmf.commitField.domain.chat.chatMessage.entity.ChatMsg;
 import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
 import cmf.commitField.domain.chat.userChatRoom.entity.UserChatRoom;
+import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.global.jpa.BaseEntity;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
@@ -32,7 +33,7 @@ public class User extends BaseEntity {
     public enum Role {
         USER, ADMIN
     }
-    //추가
+
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     private List<ChatRoom> chatRooms = new ArrayList<>();
 
@@ -42,4 +43,21 @@ public enum Role {
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     private List<ChatMsg> chatMsgs = new ArrayList<>();
 
+    @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private List<Pet> pets = new ArrayList<>();
+
+    public void addPets(Pet pet){
+        pets.add(pet);
+    }
+
+    public User(String username, String email, String nickname, String avatarUrl, List<ChatRoom> cr, List<UserChatRoom> ucr, List<ChatMsg> cmsg){
+        this.username=username;
+        this.email=email;
+        this.nickname=nickname;
+        this.avatarUrl=avatarUrl;
+        this.role = Role.USER;
+        this.chatRooms = cr;
+        this.userChatRooms = ucr;
+        this.chatMsgs = cmsg;
+    }
 }

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

@@ -14,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Random;
 
 @Service
 @RequiredArgsConstructor
@@ -49,12 +48,13 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
         } else {
             //유저 정보가 db에 존재하지 않을 경우 회원가입 시킨다.
             //유저 생성 및 펫 생성
-            user = new User(username, email, name, avatarUrl, User.Role.USER, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
+            user = new User(username, email, name, avatarUrl, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
             userRepository.save(user);
 
-            Random random = new Random(); //펫 랜덤 생성
-            pet = new Pet(random.nextInt(3), "알알", "temp-Url", user); // 변경 필요
+            pet = new Pet("알알", user); // 변경 필요
             petRepository.save(pet);
+
+            user.addPets(pet);
         }
 
         return new CustomOAuth2User(oauthUser, user);