feat: 이벤트 적용 완료

Author: whale22

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

@@ -5,6 +5,7 @@
 import cmf.commitField.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -19,11 +20,13 @@
 @RequiredArgsConstructor
 public class CommitScheduler {
     private final TotalCommitService totalCommitService;
-    private final CommitCacheService commitCacheService;
     private final UserRepository userRepository;
     private final StringRedisTemplate redisTemplate;
     private final AtomicInteger counter = new AtomicInteger(0);
 
+    private final ApplicationEventPublisher eventPublisher;
+
+
     @Scheduled(fixedRate = 60000) // 1분마다 실행
     public void updateUserCommits() {
         log.info("🔍 updateUserCommits 실행중");
@@ -62,8 +65,6 @@ private void processUserCommit(String username) {
         ).getTotalCommitContributions();
 
         newCommitCount = updateTotalCommit - currentCommit; // 새로 추가된 커밋 수
-        System.out.println("커밋 개수 불러들이기 완료, currentCommit : "+currentCommit);
-        System.out.println("커밋 개수 불러들이기 완료, updateTCommit : "+updateTotalCommit);
 
         if(newCommitCount > 0){
             User user = userRepository.findByUsername(username).get();
@@ -72,10 +73,12 @@ private void processUserCommit(String username) {
             user.setLastCommitted(now);
             userRepository.save(user);
 
-            String redisKey = "commit_update:" + username; // 변경 알림을 위한 변수
             redisTemplate.opsForValue().set(activeKey, String.valueOf(updateTotalCommit), 3, TimeUnit.HOURS);
             redisTemplate.opsForValue().set(lastcmKey, String.valueOf(now), 3, TimeUnit.HOURS);
 
+            CommitUpdateEvent event = new CommitUpdateEvent(this, username, newCommitCount);
+            eventPublisher.publishEvent(event); // 이벤트 발생
+            System.out.println("CommitCreatedEvent published for user: " + username);
         }
 
         // FIXME: 차후 리팩토링 필요

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

@@ -5,13 +5,12 @@
 
 @Getter
 public class CommitUpdateEvent extends ApplicationEvent {
-    private final Long userId;
-    private final int commitCount;
+    private final String username;
+    private final long newCommitCount;
 
-    public CommitUpdateEvent(Object source, Long userId, int commitCount) {
+    public CommitUpdateEvent(Object source, String username, long newCommitCount) {
         super(source);
-        this.userId = userId;
-        this.commitCount = commitCount;
+        this.username = username;
+        this.newCommitCount = newCommitCount;
     }
-
 }

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

@@ -1,18 +1,32 @@
 package cmf.commitField.domain.commit.scheduler;
 
+import cmf.commitField.domain.pet.service.PetService;
+import cmf.commitField.domain.user.service.UserService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 
-@Service
+@Component
+@RequiredArgsConstructor
 public class CommitUpdateListener {
+    private final UserService userService;
+    private final PetService petService;
+    private final CommitUpdateService commitUpdateService;
 
     @EventListener
     public void handleCommitUpdateEvent(CommitUpdateEvent event) {
+        String username = event.getUsername();
+        long commitCount = event.getNewCommitCount();
+
+        System.out.println("유저 시즌 경험치 업데이트: " + event.getUsername());
         // 이벤트 처리 로직
-        Long userId = event.getUserId();
-        int commitCount = event.getCommitCount();
+        boolean levelUp = userService.getExpUser(username,commitCount);
+        petService.getExpPet(username,commitCount);
+        if(levelUp) commitUpdateService.updateUserTier(username);
 
+        // 모든 작업이 끝났다면
+        userService.updateUserCommitCount(username, commitCount);
         // 커밋 갱신 후에 다른 서비스에서 필요한 작업 수행 (예: DB 업데이트, 상태 갱신 등)
-        System.out.println("User ID: " + userId + " has updated " + commitCount + " commits.");
+        System.out.println("유저명: " + username + " has updated " + commitCount + " commits.");
     }
 }

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

@@ -6,7 +6,6 @@
 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;
@@ -18,13 +17,10 @@ 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;
-//        seasonCommitCount = totalCommitService.getSeasonCommits(user.getUsername(), LocalDateTime.of(2024,12,01,0,0), LocalDateTime.of(2025,2,28,23,59)).getTotalCommitContributions();
-      seasonCommitCount = totalCommitService.getSeasonCommits(user.getUsername(), LocalDateTime.of(2025,03,01,0,0), LocalDateTime.of(2025,05,31,23,59)).getTotalCommitContributions();
+        seasonCommitCount = totalCommitService.getSeasonCommits(user.getUsername(), LocalDateTime.of(2025,03,01,0,0), LocalDateTime.of(2025,05,31,23,59)).getTotalCommitContributions();
         user.setTier(User.Tier.getLevelByExp((int)seasonCommitCount));
         userRepository.save(user);
 

src/main/java/cmf/commitField/domain/pet/entity/Pet.java

@@ -22,7 +22,7 @@ public class Pet extends BaseEntity {
     private int type; // 펫 타입 넘버, 현재 0~2까지 존재
     private String name;
     private String imageUrl;
-    private int exp; // 펫 경험치
+    private long exp; // 펫 경험치
 
     @Enumerated(EnumType.STRING)  // DB에 저장될 때 String 형태로 저장됨
     private PetGrow grow; // 성장 정도
@@ -48,9 +48,8 @@ public Pet(String name, User user){
     @JoinColumn(name = "user_id", nullable = false)
     private User user;
 
-    public int addExp(int commit){
+    public long addExp(long commit){
         exp+=commit;
-
         return exp;
     }
 }

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

@@ -9,6 +9,7 @@
 import cmf.commitField.global.aws.s3.S3Service;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -53,7 +54,8 @@ public void deletePet(Long petId) {
     }
 
     // 펫 성장
-    public UserPetDto getExpPet(String username, int commitCount) {
+    @Transactional
+    public UserPetDto getExpPet(String username, long commitCount) {
         User user = userRepository.findByUsername(username).get();
         Pet pet = user.getPets().get(0);
         pet.addExp(commitCount); // 경험치 증가

src/main/java/cmf/commitField/domain/user/dto/UserInfoDto.java

@@ -17,7 +17,7 @@ public class UserInfoDto {
     private long commitCount;
 
     private int petType;
-    private int petExp;
+    private long petExp;
     private String petGrow;
     private String tier;
 

src/main/java/cmf/commitField/domain/user/entity/User.java

@@ -31,7 +31,8 @@ public class User extends BaseEntity {
     private String avatarUrl; //아바타
     private Boolean status; //로그인 true, 로그아웃 false
     private LocalDateTime lastCommitted; // 마지막 커밋 시간
-    private long commitCount;
+    private long commitCount; // 전체
+    private long seasonCommitCount; // 이번 시즌
 
     @Enumerated(EnumType.STRING)  // 권한
     private Role role;
@@ -50,18 +51,18 @@ public enum Tier {
         FRUIT(283),     // 열매
         TREE(377);       // 나무
 
-        private final int requiredExp;
+        private final long requiredExp;
 
-        Tier(int requiredExp) {
+        Tier(long requiredExp) {
             this.requiredExp = requiredExp;
         }
 
-        public int getRequiredExp() {
+        public long getRequiredExp() {
             return requiredExp;
         }
 
         // 현재 경험치에 맞는 레벨 찾기
-        public static Tier getLevelByExp(int exp) {
+        public static Tier getLevelByExp(long exp) {
             Tier currentLevel = SEED;
             for (Tier level : values()) {
                 if (exp >= level.getRequiredExp()) {
@@ -106,9 +107,18 @@ public User(String username, String email, String nickname, String avatarUrl, Bo
         this.chatMsgs = cmsg;
         this.lastCommitted = LocalDateTime.now();
         this.commitCount = 0;
+        this.seasonCommitCount = 0;
     }
 
     public void addPets(Pet pet){
         pets.add(pet);
     }
+
+    public void addExp(long commitCount){
+        this.seasonCommitCount+=commitCount;
+    }
+
+    public void addCommitCount(long commitCount){
+        this.commitCount+=commitCount;
+    }
 }

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

@@ -75,15 +75,19 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
             pet = new Pet("알알", user); // TODO: 변경 필요
             petRepository.save(pet);
 
-            // 유저 펫, 커밋 카운트, 랭크를 서렂ㅇ
+            // 유저 펫, 커밋 카운트, 랭크를 설정
             user.addPets(pet);
             user.setCommitCount(totalCommitService.getTotalCommitCount(user.getUsername()).getTotalCommitContributions());
-            user.setTier(User.Tier.getLevelByExp((int) totalCommitService.getSeasonCommits(
+
+            long seasonCommitCount = totalCommitService.getSeasonCommits(
                     user.getUsername(),
                     LocalDateTime.of(2025,03,01,00,00),
-                    LocalDateTime.now()).getTotalCommitContributions()
-                )
-            );
+                    LocalDateTime.of(2025,05,31,23,59)
+            ).getTotalCommitContributions();
+
+            user.setSeasonCommitCount(seasonCommitCount);
+
+            user.setTier(User.Tier.getLevelByExp(seasonCommitCount));
 
             // 로그인하거나 회원가입한 유저는 커밋 기록에 상관없이 Redis에 입력해둔다.
             commitCacheService.updateCachedCommitCount(user.getUsername(),0);

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

@@ -42,8 +42,8 @@ public UserInfoDto showUserInfo(String username) {
         // 유저 정보 조회 후 변경사항은 업데이트
         // TODO: 스케쥴러 수정 후 펫 부분 수정 필요
         user.setCommitCount(totalCommit);
-        commitUpdateService.updateUserTier(user.getUsername());
-        petService.getExpPet(user.getUsername(), 0);
+//        commitUpdateService.updateUserTier(user.getUsername());
+//        petService.getExpPet(user.getUsername(), 0);
 
         String key = "commit_active:" + user.getUsername();
         if(redisTemplate.opsForValue().get(key)==null){
@@ -64,4 +64,21 @@ public UserInfoDto showUserInfo(String username) {
                 .petGrow(pet.getGrow().toString())
                 .build();
     }
+
+    // 유저 성장
+    @Transactional
+    public boolean getExpUser(String username, long commitCount) {
+        User user = userRepository.findByUsername(username).get();
+
+        // 경험치 증가 후, 만약 레벨업한다면 레벨업 시킨다.
+        user.addExp(commitCount);
+
+        return !(user.getTier().equals(User.Tier.getLevelByExp(user.getSeasonCommitCount())));
+    }
+
+    public void updateUserCommitCount(String username, long count){
+        User user = userRepository.findByUsername(username).get();
+        user.addCommitCount(count);
+        userRepository.save(user);
+    }
 }

src/main/java/cmf/commitField/global/security/SecurityConfig.java

@@ -72,8 +72,8 @@ protected SecurityFilterChain config(HttpSecurity http) throws Exception {
                             OAuth2User principal = oauth2Token.getPrincipal();
                             String username = principal.getAttribute("login");
 
-                            redisTemplate.delete("commit_active:" + username);  // Redis에서 삭제
-                            redisTemplate.delete("commit_lastCommitted:" + username);  // Redis에서 삭제
+                            //레디스에서 정보 삭제
+                            removeUserActive(username);
 
                             System.out.println("로그아웃 성공");
                             response.setStatus(HttpServletResponse.SC_OK);
@@ -101,5 +101,6 @@ public CorsConfigurationSource corsConfigurationSource() {
 
     public void removeUserActive(String username) {
         redisTemplate.delete("commit_active:" + username);
+        redisTemplate.delete("commit_lastCommitted:" + username);
     }
 }