feat: 펫 성장 메소드 수정

Author: whale22

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

@@ -1,11 +1,16 @@
 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.service.PetService;
+import cmf.commitField.domain.user.dto.UserInfoDto;
+import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.service.CustomOAuth2UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -18,6 +23,20 @@ public class PetController {
     private final CustomOAuth2UserService userService;
     private final PetService petService;
 
+    // 현재 펫 경험치 상승 및 상승 시 레벨업 처리
+    @GetMapping("/exp")
+    public ResponseEntity<UserPetDto> getUserTier(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
+        String username = oAuth2User.getName();  // CustomOAuth2User의 getName()은 user.getUsername()을 반환
+
+        System.out.println("/pet/exp, Username: "+username);
+        UserPetDto userPetDto = petService.getExpPet(username);
+        return ResponseEntity.ok(userPetDto);
+    }
+
+    // *************************************
+    // TODO : 아래는 확장 기능, 추가 시 개선 필요
+    // *************************************
+
     // 새로운 펫 추가
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public Pet createPet(

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

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

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

@@ -1,9 +1,11 @@
 package cmf.commitField.domain.pet.service;
 
+import cmf.commitField.domain.pet.dto.UserPetDto;
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.entity.PetGrow;
 import cmf.commitField.domain.pet.repository.PetRepository;
 import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.repository.UserRepository;
 import cmf.commitField.global.aws.s3.S3Service;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -17,7 +19,7 @@
 @Service
 @RequiredArgsConstructor
 public class PetService {
-
+    private final UserRepository userRepository;
     private final PetRepository petRepository;
     private final S3Service s3Service;
 
@@ -51,16 +53,25 @@ public void deletePet(Long petId) {
     }
 
     // 펫 성장
-    public Pet getExpPet(User user, int commitCount) {
+    public UserPetDto getExpPet(String username, int commitCount) {
+        User user = userRepository.findByUsername(username).get();
         Pet pet = user.getPets().get(0);
         pet.addExp(commitCount); // 경험치 증가
 
         // 경험치 증가 후, 만약 레벨업한다면 레벨업 시킨다.
         if( (pet.getGrow()== PetGrow.EGG && pet.getExp()>= PetGrow.EGG.getRequiredExp()) ||
-                (pet.getGrow()== PetGrow.HATCH && pet.getExp()>= PetGrow.HATCH.getRequiredExp()))
+                (pet.getGrow()== PetGrow.HATCH && pet.getExp()>= PetGrow.HATCH.getRequiredExp())) {
+            System.out.println("펫 레벨 업, 현재 경험치 : "+pet.getExp());
             levelUp(pet);
+        }
 
-        return petRepository.save(pet);
+        return UserPetDto.builder().
+                username(username).
+                petId(pet.getId()).
+                petName(pet.getName()).
+                exp(pet.getExp()).
+                grow(String.valueOf(pet.getGrow())).
+                build();
     }
 
     // 펫 레벨 업