fix: 펫 로직에 문제 발견되어 수정

Author: whale22

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

@@ -13,13 +13,24 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/pets")
 public class PetController {
     private final CustomOAuth2UserService userService;
     private final PetService petService;
 
+    // 현재 펫 경험치 상승 및 상승 시 레벨업 처리
+    @GetMapping("/getall")
+    public ResponseEntity<List<UserPetDto>> getUserPets(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
+        String username = oAuth2User.getName();  // CustomOAuth2User의 getName()은 user.getUsername()을 반환
+
+        List<UserPetDto> userPetDto = petService.getAllPets(username);
+        return ResponseEntity.ok(userPetDto);
+    }
+
     // 현재 펫 경험치 상승 및 상승 시 레벨업 처리
     @GetMapping("/exp")
     public ResponseEntity<UserPetDto> getUserTier(@AuthenticationPrincipal CustomOAuth2User oAuth2User){

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

@@ -26,7 +26,7 @@ public class UserPetController {
     @GetMapping("/collection")
     public ResponseEntity<UserPetListDto> getUserPetCollection(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
         String username = oAuth2User.getName();
-        UserPetListDto userPetListDto = petService.getAllPets(username);
+        UserPetListDto userPetListDto = petService.getUserCollection(username);
         return ResponseEntity.ok(userPetListDto);
     }
 }

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

@@ -14,5 +14,6 @@ public class UserPetDto {
     private long petId;
     private String petName;
     private String grow;
+    private int type;
     private long exp;
 }

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

@@ -36,8 +36,26 @@ public Pet createPet(String name, MultipartFile imageFile, User user) throws IOE
         return petRepository.save(pet);
     }
 
-    // 유저가 소유한 펫 조회
-    public UserPetListDto getAllPets(String username) {
+    public List<UserPetDto> getAllPets(String username){
+        List<Pet> pets = petRepository.findByUserUsername(username);
+        List<UserPetDto> userPetDtoList = new ArrayList<>();
+
+        for(Pet pet : pets){
+            userPetDtoList.add(UserPetDto.builder().
+                    username(username).
+                    petId(pet.getId()).
+                    petName(pet.getName()).
+                    grow(pet.getGrow().toString()).
+                    type(pet.getType()).
+                    build());
+        }
+
+        return userPetDtoList;
+    }
+
+
+    // 유저가 소유한 펫 도감 조회
+    public UserPetListDto getUserCollection(String username) {
         List<Pet> pets = petRepository.findByUserUsername(username);
         int[] petsNum = new int[100]; //FIXME: 차후 갯수 수정 필요
         int max = 0;

src/main/resources/application.yml

@@ -18,7 +18,7 @@ spring:
   jpa:
     open-in-view: false
     hibernate:
-      ddl-auto: create
+      ddl-auto: update
     properties:
       hibernate:
         default_batch_fetch_size: 100