Fix: 병합 오류 수정

Author: whale22

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

@@ -23,10 +23,10 @@ public class PetController {
 
     // 현재 펫 경험치 상승 및 상승 시 레벨업 처리
     @GetMapping("/getall")
-    public ResponseEntity<List<UserPetDto>> getUserPets(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
+    public ResponseEntity<List<PetsDto>> getUserPets(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
         String username = oAuth2User.getName();  // CustomOAuth2User의 getName()은 user.getUsername()을 반환
 
-        List<UserPetDto> userPetDto = petService.getAllPets(username);
+        List<PetsDto> userPetDto = petService.getAllPets(username);
         return ResponseEntity.ok(userPetDto);
     }
 
@@ -40,13 +40,6 @@ public ResponseEntity<UserPetDto> getPetExp(@AuthenticationPrincipal CustomOAuth
         return ResponseEntity.ok(userPetDto);
     }
 
-    @GetMapping("/getall")
-    public ResponseEntity<List<PetsDto>> getUserAllPets(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
-        String username = oAuth2User.getName();
-        List<PetsDto> userPetDto = petService.getAllPets(username);
-        return ResponseEntity.ok(userPetDto);
-    }
-
     // *************************************
     // TODO : 아래는 확장 기능, 추가 시 개선 필요
     // *************************************

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

@@ -14,10 +14,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Random;
+import java.util.*;
 
 @Service
 @RequiredArgsConstructor
@@ -38,24 +35,6 @@ public Pet createPet(String petname, String username) throws IOException {
         return petRepository.save(newPet);
     }
 
-    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);