fix: petAPI responseType

Author: yoon2000

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

@@ -1,12 +1,13 @@
 package cmf.commitField.domain.pet.controller;
 
 
+import cmf.commitField.domain.pet.dto.UserPetDto;
 import cmf.commitField.domain.pet.entity.Pet;
-import cmf.commitField.domain.pet.entity.UserPet;
 import cmf.commitField.domain.pet.service.PetService;
 import cmf.commitField.domain.pet.service.UserPetService;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.service.CustomOAuth2UserService;
+import cmf.commitField.global.globalDto.GlobalResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,16 +24,17 @@ public class UserPetController {
 
     // 유저가 펫을 부화
     @PostMapping("/hatch")
-    public UserPet hatchPet(@RequestParam Long userId, @RequestParam Long petId) {
+    public GlobalResponse<UserPetDto> hatchPet(@RequestParam Long userId, @RequestParam Long petId) {
         User user = customOAuth2UserService.getUserById(userId).orElse(null);
         Pet pet = petService.getPetById(petId);
-        return userPetService.hatchPet(user, pet);
+        UserPetDto userPetDto = new UserPetDto(userPetService.hatchPet(user, pet));
+        return GlobalResponse.success(userPetDto);
     }
 
     // 유저의 도감 조회 (보유한 펫 목록)
     @GetMapping("/collection/{userId}")
-    public List<Pet> getUserPetCollection(@PathVariable Long userId) {
+    public GlobalResponse<List<Pet>> getUserPetCollection(@PathVariable Long userId) {
         User user = customOAuth2UserService.getUserById(userId).orElse(null);
-        return userPetService.getUserPetCollection(user);
+        return GlobalResponse.success(userPetService.getUserPetCollection(user));
     }
 }

src/main/java/cmf/commitField/domain/pet/dto/UserPetDto.java

@@ -0,0 +1,21 @@
+package cmf.commitField.domain.pet.dto;
+
+import cmf.commitField.domain.pet.entity.UserPet;
+import lombok.Getter;
+
+@Getter
+public class UserPetDto {
+    private Long userId;
+    private String username;
+    private Long petId;
+    private String petName;
+    private boolean isHatched;
+
+    public UserPetDto(UserPet userPet) {
+        this.userId = userPet.getUser().getId();
+        this.username = userPet.getUser().getUsername();
+        this.petId = userPet.getPet().getId();
+        this.petName = userPet.getPet().getName();
+        this.isHatched = userPet.isHatched();
+    }
+}

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

@@ -22,11 +22,11 @@
 public class UserPet extends BaseEntity {
 
     @ManyToOne
-    @JoinColumn(name = "user_id")
+    @JoinColumn(name = "user_id", nullable = false)
     private User user;
 
     @ManyToOne
-    @JoinColumn(name = "pet_id")
+    @JoinColumn(name = "pet_id", nullable = false)
     private Pet pet;
 
     private boolean isHatched;  // 부화 여부