Merge pull request #141 from CommitField/feat/#139

feat: 새 펫 기능 추가를 위한 코드 소량 수정

Author: skyeong42

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

@@ -1,5 +1,6 @@
 package cmf.commitField.domain.pet.controller;
 
+import cmf.commitField.domain.pet.dto.PetsDto;
 import cmf.commitField.domain.pet.dto.UserPetDto;
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.service.PetService;
@@ -24,14 +25,21 @@ public class PetController {
 
     // 현재 펫 경험치 상승 및 상승 시 레벨업 처리
     @GetMapping("/exp")
-    public ResponseEntity<UserPetDto> getUserTier(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
-        String username = oAuth2User.getName();  // CustomOAuth2User의 getName()은 user.getUsername()을 반환
+    public ResponseEntity<UserPetDto> getPetExp(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
+        String username = oAuth2User.getName();
 
         System.out.println("/pet/exp, Username: "+username);
         UserPetDto userPetDto = petService.getExpPet(username, 0);
         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/dto/PetsDto.java

@@ -0,0 +1,18 @@
+package cmf.commitField.domain.pet.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class PetsDto {
+    private String username;
+    private long petId;
+    private String petName;
+    private int type;
+    private String grow;
+}

src/main/java/cmf/commitField/domain/pet/repository/PetRepository.java

@@ -2,6 +2,8 @@
 
 import cmf.commitField.domain.pet.entity.Pet;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,4 +14,7 @@ public interface PetRepository extends JpaRepository<Pet, Long> {
     Optional<Pet> findById(Long id);
     List<Pet> findByUserEmail(String email);
     List<Pet> findByUserUsername(String username);
+
+    @Query("SELECT p FROM Pet p WHERE p.user.email = :email ORDER BY p.id DESC")
+    List<Pet> findLatestPetByUserEmail(@Param("email") String email);
 }

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

@@ -1,5 +1,6 @@
 package cmf.commitField.domain.pet.service;
 
+import cmf.commitField.domain.pet.dto.PetsDto;
 import cmf.commitField.domain.pet.dto.UserPetDto;
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.entity.PetGrow;
@@ -13,6 +14,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
@@ -27,11 +29,7 @@ public class PetService {
     // 새로운 펫 생성
     public Pet createPet(String name, MultipartFile imageFile, User user) throws IOException {
 
-        // ✅ S3 업로드 로직 추가
-        String imageUrl = null;
-        if (imageFile != null && !imageFile.isEmpty()) {
-            imageUrl = s3Service.uploadFile(imageFile, "pet-images");
-        }
+
         Random random = new Random();
         Pet pet = new Pet(name, user);
         return petRepository.save(pet);
@@ -80,4 +78,23 @@ public void levelUp(Pet pet){
         pet.setGrow(PetGrow.getLevelByExp(pet.getExp()));
         petRepository.save(pet);
     }
+
+    //유저의 모든 펫 조회
+    public List<PetsDto> getAllPets(String username){
+        List<Pet> pets = petRepository.findByUserUsername(username);
+        List<PetsDto> petsList = new ArrayList<>();
+        for(Pet pet : pets){
+            petsList.add(
+                PetsDto.builder()
+                .username(username)
+                .petId(pet.getId())
+                .petName(pet.getName())
+                .type(pet.getType())
+                .grow(String.valueOf(pet.getGrow()))
+                .build()
+            );
+        }
+
+        return petsList;
+    }
 }

src/main/java/cmf/commitField/domain/user/service/UserService.java

@@ -68,20 +68,10 @@ public List<UserRegacyDto> showUserRegacy(String username) {
         return userRegacyDtos;
     }
 
-        @Transactional
     public UserInfoDto showUserInfo(String username) {
         User user = userRepository.findByUsername(username).get();
-        Pet pet = petRepository.findByUserEmail(user.getEmail()).get(0); // TODO: 확장시 코드 수정 필요
+        Pet pet = petRepository.findLatestPetByUserEmail(user.getEmail()).get(0);
 
-        // TODO: info 조회 시 user commit 수 즉시 반영은 로직 변경이 필요
-//        long totalCommit = totalCommitService.getTotalCommitCount(username).getTotalCommitContributions();
-//        long seasonCommit = totalCommitService.getSeasonCommits(username,
-//                LocalDateTime.of(2025,03,01,00,00),
-//                LocalDateTime.of(2025,05,31,23,59)
-//        ).getTotalCommitContributions();
-//
-//        user.setCommitCount(totalCommit);
-        // TODO블럭 종료
 
         // 유저 정보 조회 후 active 상태가 아니면 Redis에 추가, 커밋 추적 시작
         String key = "commit_active:" + user.getUsername();

src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ spring:
   jpa:
     open-in-view: false
     hibernate:
-      ddl-auto: create
+      ddl-auto: update
   autoconfigure: # 로컬에서 실행할 때는 Redis와 Session 설정을 제외
     exclude:
       - org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration

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