feat: 레디스 및 레드판다 세팅, 예제 확인

whale22 · whale22 · commit 524758d38aa0 · 2025-02-26T11:43:04.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -75,6 +75,8 @@ docker-compose.yaml
 
 ### db파일
 db/
+.docker
+data/
 
 ### secret 프로필
 application-secret.yml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,6 +35,7 @@ dependencies {
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.security:spring-security-test")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+	implementation ("org.springframework.kafka:spring-kafka") // Kafka 통합
 
 	// Lombok
 	compileOnly("org.projectlombok:lombok")
diff --git a/src/main/java/cmf/commitField/domain/commit/scheduler/CommitScheduler.java b/src/main/java/cmf/commitField/domain/commit/scheduler/CommitScheduler.java
@@ -0,0 +1,38 @@
+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.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.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class CommitScheduler {
+    private final GithubService githubService;
+    private final CommitCacheService commitCacheService;
+    private final RedpandaProducer redpandaProducer;
+    private final UserRepository userRepository;
+
+    @Scheduled(fixedRate = 60000) // 1분마다 실행
+    public void updateUserCommits() {
+        List<User> activeUsers = userRepository.findAll(); // 💫 변경 필요, 차후 active 상태인 user만 찾게끔 변경해야 함.
+
+        for (User user : activeUsers) {
+            Integer cachedCount = commitCacheService.getCachedCommitCount(user.getUsername());
+            int newCommitCount = githubService.getUserCommitCount(user.getUsername());
+
+            if (cachedCount == null || cachedCount != newCommitCount) { // 변화가 있을 때만 처리
+                commitCacheService.updateCachedCommitCount(user.getUsername(), newCommitCount);
+                redpandaProducer.sendCommitUpdate(user.getUsername(), newCommitCount);
+            }
+        }
+    }
+}
diff --git a/src/main/java/cmf/commitField/domain/commit/sinceCommit/controller/SinceCommitController.java b/src/main/java/cmf/commitField/domain/commit/sinceCommit/controller/SinceCommitController.java
@@ -1,11 +1,13 @@
 package cmf.commitField.domain.commit.sinceCommit.controller;
 
 import cmf.commitField.domain.commit.sinceCommit.dto.SinceCommitResponseDto;
+import cmf.commitField.domain.commit.sinceCommit.service.GithubService;
 import cmf.commitField.domain.commit.sinceCommit.service.SinceCommitService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,6 +19,7 @@
 @RequiredArgsConstructor
 public class SinceCommitController {
     private final SinceCommitService sinceCommitService;
+    private final GithubService githubService;
 
     @GetMapping("/api/github/commits-since")
     public ResponseEntity<List<SinceCommitResponseDto>> getCommits(
@@ -92,4 +95,12 @@ public ResponseEntity<List<SinceCommitResponseDto>> getWinterSeasonCommits(
 
         return ResponseEntity.ok(sinceCommits);
     }
+
+    // api 테스트 메소드 추가
+    @GetMapping("/api/commit-count/{username}")
+    public ResponseEntity<Integer> getCommitCount(@PathVariable String username) {
+        System.out.println("⚡ API 엔드포인트 호출: " + username);
+        int commitCount = githubService.getUserCommitCount(username);
+        return ResponseEntity.ok(commitCount);
+    }
 }
diff --git a/src/main/java/cmf/commitField/domain/commit/sinceCommit/dto/CommitData.java b/src/main/java/cmf/commitField/domain/commit/sinceCommit/dto/CommitData.java
@@ -0,0 +1,15 @@
+package cmf.commitField.domain.commit.sinceCommit.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+public class CommitData {
+    String user;
+    int commits;
+}
diff --git a/src/main/java/cmf/commitField/domain/commit/sinceCommit/service/CommitCacheService.java b/src/main/java/cmf/commitField/domain/commit/sinceCommit/service/CommitCacheService.java
@@ -0,0 +1,26 @@
+package cmf.commitField.domain.commit.sinceCommit.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class CommitCacheService {
+    private final StringRedisTemplate redisTemplate;
+
+    public Integer getCachedCommitCount(String username) {
+        String key = "commit:" + username;
+        String value = redisTemplate.opsForValue().get(key);
+        return value != null ? Integer.parseInt(value) : null;
+    }
+
+    public void updateCachedCommitCount(String username, int count) {
+        String key = "commit:" + username;
+        redisTemplate.opsForValue().set(key, String.valueOf(count), Duration.ofHours(1)); // 1시간 캐싱
+    }
+}
diff --git a/src/main/java/cmf/commitField/domain/commit/sinceCommit/service/GithubService.java b/src/main/java/cmf/commitField/domain/commit/sinceCommit/service/GithubService.java
@@ -0,0 +1,70 @@
+package cmf.commitField.domain.commit.sinceCommit.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class GithubService {
+    private final RestTemplate restTemplate;
+    private final String GITHUB_API_URL = "https://api.github.com";
+
+    @Value("${github.token}")
+    private String GITHUB_TOKEN;
+
+    public int getUserCommitCount(String username) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", "Bearer " + GITHUB_TOKEN);
+        headers.set("Accept", "application/vnd.github.v3+json"); // 최신 GitHub API 버전 지정
+
+        HttpEntity<String> entity = new HttpEntity<>(headers);
+        String url = String.format("%s/users/%s/events", GITHUB_API_URL, username);
+
+        // 📌 API 호출 횟수 확인용 로그 추가
+        System.out.println("GitHub API 호출: " + url);
+
+        try {
+            ResponseEntity<List<Map<String, Object>>> response =
+                    restTemplate.exchange(url, HttpMethod.GET, entity, new ParameterizedTypeReference<>() {});
+
+            // GitHub API Rate Limit 확인 (남은 요청 횟수 로깅)
+            HttpHeaders responseHeaders = response.getHeaders();
+            String remainingRequests = responseHeaders.getFirst("X-RateLimit-Remaining");
+            System.out.println("GitHub API 남은 요청 횟수: " + remainingRequests);
+
+            int commitCount = 0;
+            if (response.getBody() != null) {
+                for (Map<String, Object> event : response.getBody()) {
+                    if ("PushEvent".equals(event.get("type"))) {
+                        Map<String, Object> payload = (Map<String, Object>) event.get("payload");
+                        if (payload != null && payload.containsKey("commits")) {
+                            List<?> commits = (List<?>) payload.get("commits");
+                            commitCount += (commits != null) ? commits.size() : 0;
+                        }
+                    }
+                }
+            }
+            return commitCount;
+
+        } catch (HttpClientErrorException e) {
+            System.err.println("GitHub API 요청 실패: " + e.getStatusCode() + " - " + e.getResponseBodyAsString());
+            if (e.getStatusCode() == HttpStatus.UNAUTHORIZED) {
+                throw new RuntimeException("GitHub API 인증 실패: 올바른 토큰을 사용하세요.");
+            } else if (e.getStatusCode() == HttpStatus.FORBIDDEN) {
+                throw new RuntimeException("GitHub API 요청 제한 초과 (Rate Limit 초과). 잠시 후 다시 시도하세요.");
+            }
+            return 0; // 기본값 반환
+        } catch (Exception e) {
+            System.err.println("예기치 않은 오류 발생: " + e.getMessage());
+            return 0; // 기본값 반환
+        }
+    }
+}
diff --git a/src/main/java/cmf/commitField/domain/redpanda/KafkaConsumer.java b/src/main/java/cmf/commitField/domain/redpanda/KafkaConsumer.java
@@ -0,0 +1,13 @@
+package cmf.commitField.domain.redpanda;
+
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Service;
+
+@Service
+public class KafkaConsumer {
+
+    @KafkaListener(topics = "commit-topic", groupId = "commit-group")
+    public void listen(String message) {
+        System.out.println("Received message: " + message);
+    }
+}
diff --git a/src/main/java/cmf/commitField/domain/redpanda/RedpandaProducer.java b/src/main/java/cmf/commitField/domain/redpanda/RedpandaProducer.java
@@ -0,0 +1,28 @@
+package cmf.commitField.domain.redpanda;
+
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RedpandaProducer {
+
+    private final KafkaTemplate<String, String> kafkaTemplate;
+    private static final String TOPIC = "commit-topic"; // Redpanda에서 사용할 토픽명
+
+    public RedpandaProducer(KafkaTemplate<String, String> kafkaTemplate) {
+        this.kafkaTemplate = kafkaTemplate;
+    }
+
+    // 메시지 전송 메서드
+    public void sendMessage(String message) {
+        kafkaTemplate.send(TOPIC, message);
+        System.out.println("📨 Sent message to Redpanda: " + message);
+    }
+
+    // 커밋 업데이트 전송 메서드
+    public void sendCommitUpdate(String username, int commitCount) {
+        String message = String.format("{\"user\": \"%s\", \"commits\": %d}", username, commitCount);
+        kafkaTemplate.send(TOPIC, message);
+        System.out.println("📨 Sent commit update to Redpanda: " + message);
+    }
+}
diff --git a/src/main/java/cmf/commitField/domain/redpanda/commit/CommitConsumer.java b/src/main/java/cmf/commitField/domain/redpanda/commit/CommitConsumer.java
@@ -0,0 +1,21 @@
+package cmf.commitField.domain.redpanda.commit;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CommitConsumer {
+
+    @Autowired
+    private SimpMessagingTemplate messagingTemplate;
+
+    @KafkaListener(topics = "commit-events", groupId = "commit-group")
+    public void consume(String message) {
+        System.out.println("Received commit event: " + message);
+        // WebSocket을 통해 Frontend로 전송
+        messagingTemplate.convertAndSend("/topic/commits", message);
+    }
+
+}
diff --git a/src/main/java/cmf/commitField/domain/redpanda/commit/WebhookCommitController.java b/src/main/java/cmf/commitField/domain/redpanda/commit/WebhookCommitController.java
@@ -0,0 +1,16 @@
+package cmf.commitField.domain.redpanda.commit;
+
+import cmf.commitField.domain.commit.sinceCommit.dto.CommitData;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class WebhookCommitController {
+    @MessageMapping("/topic/commits") // 클라이언트가 구독하는 topic
+    public void handleCommitUpdate(@Payload CommitData commitData) {
+        // commitData는 자동으로 JSON에서 변환된 객체입니다.
+        System.out.println("User: " + commitData.getUser());
+        System.out.println("Commits: " + commitData.getCommits());
+    }
+}
diff --git a/src/main/java/cmf/commitField/global/config/AppConfig.java b/src/main/java/cmf/commitField/global/config/AppConfig.java
@@ -23,4 +23,5 @@ public void setSiteBackUrl(String siteBackUrl) {
     public void setSiteCookieDomain(String siteCookieDomain) {
         this.siteCookieDomain = siteCookieDomain;
     }
+
 }
diff --git a/src/main/java/cmf/commitField/global/config/KafkaProducerConfig.java b/src/main/java/cmf/commitField/global/config/KafkaProducerConfig.java
@@ -0,0 +1,37 @@
+package cmf.commitField.global.config;
+
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.core.DefaultKafkaProducerFactory;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.core.ProducerFactory;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+public class KafkaProducerConfig {
+
+    @Bean
+    public ProducerFactory<String, String> producerFactory() {
+        Map<String, Object> configProps = new HashMap<>();
+        configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092"); // Kafka 서버 주소
+        configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+        configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+
+        return new DefaultKafkaProducerFactory<>(configProps);
+    }
+
+    @Bean
+    public KafkaTemplate<String, String> kafkaTemplate() {
+        return new KafkaTemplate<>(producerFactory());
+    }
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+}
diff --git a/src/main/java/cmf/commitField/global/config/RedisConfig.java b/src/main/java/cmf/commitField/global/config/RedisConfig.java
@@ -0,0 +1,35 @@
+package cmf.commitField.global.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class RedisConfig {
+    // Redis 연결을 위한 ConnectionFactory 빈 등록
+    @Bean
+    public RedisConnectionFactory redisConnectionFactory() {
+        return new LettuceConnectionFactory();  // Lettuce 사용
+    }
+
+    @Bean
+    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        StringRedisTemplate template = new StringRedisTemplate();
+        template.setConnectionFactory(redisConnectionFactory);
+        return template;
+    }
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate() {
+        RedisTemplate<String, Object> template = new RedisTemplate<>();
+        template.setConnectionFactory(redisConnectionFactory());
+        template.setKeySerializer(new StringRedisSerializer());
+        template.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+        return template;
+    }
+}
diff --git a/src/main/java/cmf/commitField/global/websocket/WebSocketConfig.java b/src/main/java/cmf/commitField/global/websocket/WebSocketConfig.java
@@ -14,9 +14,13 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
     public void registerStompEndpoints(StompEndpointRegistry registry) {
         // 클라이언트가 연결할 WebSocket 엔드포인트
         registry.addEndpoint("/ws-stomp")
-                .setAllowedOrigins("*")
+                .setAllowedOriginPatterns("*") // setAllowedOriginPatterns 사용
                 // SockJS 사용 (WebSocket 미지원 브라우저 대응)
                 .withSockJS();
+
+        registry.addEndpoint("/ws")
+                .setAllowedOriginPatterns("*") // setAllowedOriginPatterns 사용
+                .withSockJS();
     }
 
     @Override
diff --git a/src/main/resources/application-secret.yml.default b/src/main/resources/application-secret.yml.default
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
