Merge pull request #156 from CommitField/feat/#150

feat: 유저 펫 조회 api 추가

Author: whale22

src/main/java/cmf/commitField/domain/noti/noti/controller/ApiV1NotiController.java

@@ -32,7 +32,6 @@ public class ApiV1NotiController {
     private final NotiService notiService;
     private final UserService userService;
 
-
     @GetMapping("")
     public GlobalResponse<List<NotiDto>> getNoti(@AuthenticationPrincipal OAuth2User oAuth2User) {
         String username = oAuth2User.getName();

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

@@ -21,6 +21,15 @@ public class PetController {
     private final CustomOAuth2UserService userService;
     private final PetService petService;
 
+    // 현재 펫 경험치 상승 및 상승 시 레벨업 처리
+    @GetMapping("/getall")
+    public ResponseEntity<List<PetsDto>> getUserPets(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
+        String username = oAuth2User.getName();  // CustomOAuth2User의 getName()은 user.getUsername()을 반환
+
+        List<PetsDto> userPetDto = petService.getAllPets(username);
+        return ResponseEntity.ok(userPetDto);
+    }
+
     // 현재 펫 경험치 상승 및 상승 시 레벨업 처리
     @GetMapping("/exp")
     public ResponseEntity<UserPetDto> getPetExp(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
@@ -31,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 : 아래는 확장 기능, 추가 시 개선 필요
     // *************************************
@@ -54,11 +56,6 @@ public ResponseEntity<Pet> createPet(@AuthenticationPrincipal CustomOAuth2User o
         return ResponseEntity.ok(pet);
     }
 
-    // 모든 펫 조회
-    @GetMapping
-    public List<Pet> getAllPets() {
-        return petService.getAllPets();
-    }
 
     // 특정 펫 조회
     @GetMapping("/{petId}")

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

@@ -1,34 +1,32 @@
 package cmf.commitField.domain.pet.controller;
 
 
-import cmf.commitField.domain.pet.entity.Pet;
+import cmf.commitField.domain.pet.dto.UserPetListDto;
 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.entity.CustomOAuth2User;
 import cmf.commitField.domain.user.service.CustomOAuth2UserService;
-import cmf.commitField.global.globalDto.GlobalResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
-@RequestMapping("/user-pets")
+@RequestMapping("/api/user/")
 @RequiredArgsConstructor
 public class UserPetController {
 
     private final UserPetService userPetService;
     private final CustomOAuth2UserService customOAuth2UserService;
     private final PetService petService;
 
-    // TODO: 기능 확장시 추가 예정
     // 유저의 도감 조회 (보유한 펫 목록)
-    @GetMapping("/collection/{userId}")
-    public GlobalResponse<List<Pet>> getUserPetCollection(@PathVariable Long userId) {
-        User user = customOAuth2UserService.getUserById(userId).orElse(null);
-        return GlobalResponse.success(userPetService.getUserPetCollection(user));
+    @GetMapping("/collection")
+    public ResponseEntity<UserPetListDto> getUserPetCollection(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        String username = oAuth2User.getName();
+        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/dto/UserPetListDto.java

@@ -0,0 +1,17 @@
+package cmf.commitField.domain.pet.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+@Builder
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserPetListDto {
+    private String username;
+    private Map<Integer, Integer> petList; // 아이디, 소유 갯수
+}

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

@@ -2,6 +2,7 @@
 
 import cmf.commitField.domain.pet.dto.PetsDto;
 import cmf.commitField.domain.pet.dto.UserPetDto;
+import cmf.commitField.domain.pet.dto.UserPetListDto;
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.entity.PetGrow;
 import cmf.commitField.domain.pet.repository.PetRepository;
@@ -13,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
@@ -37,9 +35,26 @@ public Pet createPet(String petname, String username) throws IOException {
         return petRepository.save(newPet);
     }
 
-    // 모든 펫 조회
-    public List<Pet> getAllPets() {
-        return petRepository.findAll();
+    // 유저가 소유한 펫 도감 조회
+    public UserPetListDto getUserCollection(String username) {
+        List<Pet> pets = petRepository.findByUserUsername(username);
+        int[] petsNum = new int[100]; //FIXME: 차후 갯수 수정 필요
+        int max = 0;
+        Map<Integer, Integer> petList = new HashMap<>();
+        for(Pet pet : pets){
+            int type = pet.getType();
+            petsNum[type]++;
+            if(max<type) max = type;
+        }
+
+        for(int i=0;i<=max;i++){
+            petList.put(i, petsNum[i]);
+        }
+
+        return UserPetListDto.builder().
+                username(username).
+                petList(petList).
+                build();
     }
 
     // 특정 펫 조회