Feat: 병합

Author: skyeong42

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

@@ -1,43 +1,102 @@
 package cmf.commitField.domain.commit.scheduler;
 
 import cmf.commitField.domain.commit.sinceCommit.service.CommitCacheService;
-import cmf.commitField.domain.commit.sinceCommit.service.GithubService;
+import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
 import cmf.commitField.domain.redpanda.RedpandaProducer;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 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;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class CommitScheduler {
-    private final GithubService githubService;
+    private final TotalCommitService totalCommitService;
     private final CommitCacheService commitCacheService;
     private final RedpandaProducer redpandaProducer;
     private final UserRepository userRepository;
+    private final StringRedisTemplate redisTemplate;
+    private final AtomicInteger counter = new AtomicInteger(0);
 
     @Scheduled(fixedRate = 60000) // 1분마다 실행
     public void updateUserCommits() {
         log.info("🔍 updateUserCommits 실행중");
-        List<User> activeUsers = userRepository.findAll(); // 💫 변경 필요, 차후 active 상태인 user만 찾게끔 변경해야 함.
+        int count = counter.incrementAndGet();
 
-        log.info("🔍 Active User Count: {}", activeUsers.size());
+        if (count % 10 == 0) {
+            List<User> allUsers = userRepository.findAll();
+            log.info("🔍 All User Count: {}", allUsers.size());
 
-        for (User user : activeUsers) {
-            Integer cachedCount = commitCacheService.getCachedCommitCount(user.getUsername());
-            int newCommitCount = githubService.getUserCommitCount(user.getUsername());
-
-            log.info("🔍 User: {}, Commit Count: {}", user.getUsername(), newCommitCount);
+            for (User user : allUsers) {
+                processUserCommit(user);
+            }
+        } else {
+            Set<String> activeUsers = redisTemplate.keys("commit_active:*");
+            log.info("🔍 Active User Count: {}", activeUsers.size());
 
-            if (cachedCount == null || cachedCount != newCommitCount) { // 변화가 있을 때만 처리
-                commitCacheService.updateCachedCommitCount(user.getUsername(), newCommitCount);
-                redpandaProducer.sendCommitUpdate(user.getUsername(), newCommitCount);
+            for (String key : activeUsers) {
+                String username = key.replace("commit_active:", "");
+                User user = userRepository.findByUsername(username).orElse(null);
+                if (user != null) {
+                    processUserCommit(user);
+                }
             }
         }
     }
+
+    // 🔹 유저 커밋 검사 및 반영
+    private void processUserCommit(User user) {
+        // Redis에서 lastCommitted 값 가져오기
+        String redisKey = "commit_last:" + user.getUsername();
+        String lastCommittedStr = redisTemplate.opsForValue().get(redisKey);
+        LocalDateTime lastCommitted;
+        if(lastCommittedStr != null){
+            lastCommitted=LocalDateTime.parse(lastCommittedStr);
+        }else{
+            user.setLastCommitted(LocalDateTime.now()); // 레디스에 저장되어있지 않았다면 등록 시점에 lastCommitted를 갱신
+            lastCommitted=user.getLastCommitted();  // Redis에 없으면 DB값 사용;
+        }
+
+        // 현재 커밋 개수 조회
+        long currentCommitCount = totalCommitService.getSeasonCommits(
+                user.getUsername(),
+                lastCommitted,  // 🚀 Redis에 저장된 lastCommitted 기준으로 조회
+                LocalDateTime.now()
+        ).getTotalCommitContributions();
+
+        // Redis에서 이전 커밋 개수 가져오기
+        Integer previousCommitCount = commitCacheService.getCachedCommitCount(user.getUsername());
+        long newCommitCount = previousCommitCount == null ? 0 : (currentCommitCount - previousCommitCount);
+
+        if (newCommitCount > 0) {
+            updateCommitData(user, currentCommitCount, newCommitCount);
+        }
+
+        log.info("🔍 User: {}, New Commits: {}, Total Commits: {}", user.getUsername(), newCommitCount, currentCommitCount);
+    }
+
+    // 🔹 새 커밋이 있으면 데이터 업데이트
+    private void updateCommitData(User user, long currentCommitCount, long newCommitCount) {
+        // 1️⃣ Redis에 lastCommitted 업데이트 (3시간 TTL)
+        String redisKey = "commit_last:" + user.getUsername();
+        redisTemplate.opsForValue().set(redisKey, LocalDateTime.now().toString(), 3, TimeUnit.HOURS);
+
+        // 2️⃣ Redis에 최신 커밋 개수 저장 (3시간 동안 유지)
+        commitCacheService.updateCachedCommitCount(user.getUsername(), currentCommitCount);
+
+        // 3️⃣ 메시지 큐 전송
+        redpandaProducer.sendCommitUpdate(user.getUsername(), newCommitCount);
+
+        log.info("✅ 커밋 반영 완료 - User: {}, New Commits: {}", user.getUsername(), newCommitCount);
+    }
 }

src/main/java/cmf/commitField/domain/commit/sinceCommit/entity/CommitHistory.java

@@ -14,14 +14,20 @@ public class CommitCacheService {
     private final StringRedisTemplate redisTemplate;
 
     public Integer getCachedCommitCount(String username) {
-        log.info("Redis Template: {}", redisTemplate);
-        String key = "commit:" + username; // Redis 키 생성 (ex: commit:hongildong)
+        String key = "commit_active:" + username; // Redis 키 생성 (ex: commit:hongildong)
         String value = redisTemplate.opsForValue().get(key); // Redis에서 값 가져오기
-        return value != null ? Integer.parseInt(value) : null; // 값이 있으면 정수 변환, 없으면 null 반환
+
+        if (value != null) {
+            log.info("✅ Redis Hit - {} : {}", key, value);
+            return Integer.parseInt(value);
+        } else {
+            log.info("❌ Redis Miss - {}", key);
+            return null;
+        }
     }
 
-    public void updateCachedCommitCount(String username, int count) {
-        String key = "commit:" + username;
-        redisTemplate.opsForValue().set(key, String.valueOf(count), Duration.ofHours(1)); // 1시간 캐싱
+    public void updateCachedCommitCount(String username, long count) {
+        String key = "commit_active:" + username;
+        redisTemplate.opsForValue().set(key, String.valueOf(count), Duration.ofHours(3)); // 3시간 캐싱
     }
 }

src/main/java/cmf/commitField/domain/commit/sinceCommit/repositoty/CommitHistoryRepository.java

@@ -2,8 +2,6 @@
 
 import cmf.commitField.domain.commit.sinceCommit.dto.CommitAnalysisResponseDto;
 import cmf.commitField.domain.commit.sinceCommit.dto.SinceCommitResponseDto;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/cmf/commitField/domain/commit/sinceCommit/service/CommitCacheService.java

@@ -3,12 +3,15 @@
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.global.jpa.BaseEntity;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.ManyToOne;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.ColumnDefault;
 
 import static lombok.AccessLevel.PROTECTED;
 
@@ -19,13 +22,17 @@
 @Getter
 @Setter
 public class Noti extends BaseEntity {
+    @Enumerated(EnumType.STRING)
+    private NotiType typeCode; // 알림 타입
+    private NotiDetailType type2Code; // 알림 세부 타입
     @ManyToOne
-    private User actor;
-    @ManyToOne
-    private User receiver;
-    private String relTypeCode;
-    private long relId;
-    private String typeCode;
-    private String type2Code;
-    private boolean read;
+    private User receiver; // 알림을 받는 사람
+    @ColumnDefault("false")
+    private boolean isRead; // 읽음 상태
+    private String message; // 알림 메시지
+
+    // TODO: 알림이 연결된 객체 어떻게 처리할지 고민 필요.
+//    private String relTypeCode; // 알림이 연결된 실제 객체 유형
+//    private long relId; // 알림 객체의 Id
+
 }

src/main/java/cmf/commitField/domain/commit/sinceCommit/service/SinceCommitService.java

@@ -0,0 +1,13 @@
+package cmf.commitField.domain.noti.noti.entity;
+
+public enum NotiDetailType {
+    // 업적
+    ACHIEVEMENT_COMPLETED,  // 업적 달성
+
+    // 연속
+    STREAK_CONTINUED,  // 연속 커밋 이어짐
+    STREAK_BROKEN,  // 연속 커밋 끊김
+
+    // 시즌
+    SEASON_START    // 시즌 시작
+}

src/main/java/cmf/commitField/domain/noti/noti/entity/Noti.java

@@ -0,0 +1,18 @@
+package cmf.commitField.domain.noti.noti.entity;
+
+import java.util.Map;
+
+public class NotiMessageTemplates {
+    // 알림 메시지 템플릿을 저장하는 맵
+    private static final Map<NotiDetailType, String> TEMPLATES = Map.of(
+            NotiDetailType.ACHIEVEMENT_COMPLETED, "🎉 {0}님이 '{1}' 업적을 달성했습니다!",
+            NotiDetailType.STREAK_CONTINUED, "🔥 {0}님의 연속 커밋이 {1}일째 이어지고 있습니다!",
+            NotiDetailType.STREAK_BROKEN, "😢 {0}님의 연속 커밋 기록이 끊겼습니다. 다음번엔 더 오래 유지해봐요!",
+            NotiDetailType.SEASON_START, "🚀 새로운 시즌 '{0}'이 시작되었습니다! 랭킹 경쟁을 준비하세요!"
+    );
+
+    // 알림 메시지 템플릿을 반환하는 메서드
+    public static String getTemplate(NotiDetailType type) {
+        return TEMPLATES.getOrDefault(type, "알림 메시지가 없습니다.");
+    }
+}

src/main/java/cmf/commitField/domain/noti/noti/entity/NotiDetailType.java

@@ -0,0 +1,10 @@
+package cmf.commitField.domain.noti.noti.entity;
+
+public enum NotiType {
+    RANK,           // 랭킹
+    ACHIEVEMENT,    // 업적
+    ABSENCE,        // 부재
+    STREAK,         // 연속
+    SEASON,         // 시즌
+    NOTICE          // 공지
+}

src/main/java/cmf/commitField/domain/noti/noti/entity/NotiMessageTemplates.java

@@ -1,24 +1,35 @@
 package cmf.commitField.domain.noti.noti.eventListener;
 
+import cmf.commitField.domain.noti.noti.entity.NotiDetailType;
+import cmf.commitField.domain.noti.noti.entity.NotiType;
 import cmf.commitField.domain.noti.noti.service.NotiService;
+import cmf.commitField.global.chat.ChatMessageDto;
+import cmf.commitField.global.event.CommitHistoryEvent;
 import lombok.RequiredArgsConstructor;
+import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
 public class NotiEventListener {
+    // 이벤트가 호출될 때 실행되는 메서드
+    // 메서드를 별도의 스레드에서 비동기적으로 실행하도록 만듦
     private final NotiService notiService;
 
-//    public void listenPost(PostCreatedEvent event){
-//        notiService.postCreated(event.getPost());
-//    }
-//
-//    public void consume(ChatMessageDto message){
-//        System.out.println("Consumed message: " + message);
-//    }
-//
-//    public void consumeChatRoom1DLT(byte[] in){
-//        String message = new String(in);
-//        System.out.println("Failed message: " + message);
-//    }
+    // 예시
+    // CommitHistoryEvent 이벤트가 발생하면 notiService.createCommitStreak() 메서드를 실행
+    public void listenCommitStreak(CommitHistoryEvent event){
+        notiService.createCommitStreak(event.getUsername(), NotiType.STREAK, NotiDetailType.STREAK_CONTINUED);
+    }
+
+    @KafkaListener(topics = "chat-room-1", groupId = "1")
+    public void consume(ChatMessageDto message){
+        System.out.println("Consumed message: " + message);
+    }
+
+    @KafkaListener(topics = "chat-room-1-dlt", groupId = "1")
+    public void consumeChatRoom1DLT(byte[] in){
+        String message = new String(in);
+        System.out.println("Failed message: " + message);
+    }
 }