Merge pull request #99 from CommitField/feat/#97

fix: pr 오류 수정

Author: whale22

src/main/java/cmf/commitField/domain/commit/scheduler/CommitScheduler.java

@@ -10,7 +10,6 @@
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -30,25 +29,19 @@ public void updateUserCommits() {
         log.info("🔍 updateUserCommits 실행중");
         int count = counter.incrementAndGet();
 
-        if (count % 10 == 0) {
-            List<User> allUsers = userRepository.findAll();
-            log.info("🔍 All User Count: {}", allUsers.size());
+        // 최근 로그인이 이루어진 (접근 가능성이 높은) 유저만 실시간으로 커밋 수 변경 추적 후 갱신
+        // 최근 로그인이 이루어지지 않은 유저는 페이지 최초 로그인 시 갱신이 발생한다.
+        Set<String> activeUsers = redisTemplate.keys("commit_active:*");
+        log.info("🔍 Active User Count: {}", activeUsers.size());
 
-            for (User user : allUsers) {
+        for (String key : activeUsers) {
+            String username = key.replace("commit_active:", "");
+            User user = userRepository.findByUsername(username).orElse(null);
+            if (user != null) {
                 processUserCommit(user);
             }
-        } else {
-            Set<String> activeUsers = redisTemplate.keys("commit_active:*");
-            log.info("🔍 Active User Count: {}", activeUsers.size());
-
-            for (String key : activeUsers) {
-                String username = key.replace("commit_active:", "");
-                User user = userRepository.findByUsername(username).orElse(null);
-                if (user != null) {
-                    processUserCommit(user);
-                }
-            }
         }
+
     }
 
     // 🔹 유저 커밋 검사 및 반영

src/main/java/cmf/commitField/domain/commit/scheduler/CommitUpdateEvent.java

@@ -0,0 +1,22 @@
+package cmf.commitField.domain.commit.scheduler;
+
+import org.springframework.context.ApplicationEvent;
+
+public class CommitUpdateEvent extends ApplicationEvent {
+    private final Long userId;
+    private final int commitCount;
+
+    public CommitUpdateEvent(Object source, Long userId, int commitCount) {
+        super(source);
+        this.userId = userId;
+        this.commitCount = commitCount;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public int getCommitCount() {
+        return commitCount;
+    }
+}

src/main/java/cmf/commitField/domain/commit/scheduler/CommitUpdateListener.java

@@ -0,0 +1,18 @@
+package cmf.commitField.domain.commit.scheduler;
+
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CommitUpdateListener {
+
+    @EventListener
+    public void handleCommitUpdateEvent(CommitUpdateEvent event) {
+        // 이벤트 처리 로직
+        Long userId = event.getUserId();
+        int commitCount = event.getCommitCount();
+
+        // 커밋 갱신 후에 다른 서비스에서 필요한 작업 수행 (예: DB 업데이트, 상태 갱신 등)
+        System.out.println("User ID: " + userId + " has updated " + commitCount + " commits.");
+    }
+}

src/main/java/cmf/commitField/domain/commit/scheduler/CommitUpdateService.java

@@ -6,6 +6,7 @@
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -17,6 +18,8 @@ public class CommitUpdateService {
     private final UserRepository userRepository;
     private final PetService petService;
 
+    private final ApplicationEventPublisher eventPublisher;
+
     public UserInfoDto updateUserTier(String username){
         User user = userRepository.findByUsername(username).get();
         long seasonCommitCount;
@@ -36,15 +39,4 @@ public UserInfoDto updateUserTier(String username){
                 .tier(user.getTier().name())
                 .build();
     }
-
-    public User updateUserPet(String username){
-        User user = userRepository.findByUsername(username).get();
-
-        //추가된 펫 경험치
-        long totalcommits;
-        totalcommits = totalCommitService.getUpdateCommits(user.getUsername(), user.getCreatedAt(), LocalDateTime.now()).getTotalCommitContributions();
-
-        petService.getExpPet(user, (int)totalcommits);
-        return user;
-    }
 }

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

@@ -3,7 +3,6 @@
 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;
@@ -29,7 +28,7 @@ public ResponseEntity<UserPetDto> getUserTier(@AuthenticationPrincipal CustomOAu
         String username = oAuth2User.getName();  // CustomOAuth2User의 getName()은 user.getUsername()을 반환
 
         System.out.println("/pet/exp, Username: "+username);
-        UserPetDto userPetDto = petService.getExpPet(username);
+        UserPetDto userPetDto = petService.getExpPet(username, 0);
         return ResponseEntity.ok(userPetDto);
     }
 
@@ -67,7 +66,7 @@ public void deletePet(@PathVariable Long petId) {
     }
 
     public void getExpPet(User user, int commitCount){
-        petService.getExpPet(user, commitCount);
+        petService.getExpPet(user.getUsername(), commitCount);
 
     }
 }

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

@@ -1,15 +1,17 @@
 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.pet.service.UserPetService;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.service.CustomOAuth2UserService;
 import cmf.commitField.global.globalDto.GlobalResponse;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+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;
 
@@ -22,15 +24,7 @@ public class UserPetController {
     private final CustomOAuth2UserService customOAuth2UserService;
     private final PetService petService;
 
-    // 유저가 펫을 부화
-    @PostMapping("/hatch")
-    public GlobalResponse<UserPetDto> hatchPet(@RequestParam Long userId, @RequestParam Long petId) {
-        User user = customOAuth2UserService.getUserById(userId).orElse(null);
-        Pet pet = petService.getPetById(petId);
-        UserPetDto userPetDto = new UserPetDto(userPetService.hatchPet(user, pet));
-        return GlobalResponse.success(userPetDto);
-    }
-
+    // TODO: 기능 확장시 추가 예정
     // 유저의 도감 조회 (보유한 펫 목록)
     @GetMapping("/collection/{userId}")
     public GlobalResponse<List<Pet>> getUserPetCollection(@PathVariable Long userId) {

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

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