feat: userChatInfo 추가

Author: whale22

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

@@ -7,6 +7,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
@@ -23,9 +24,32 @@ public class CommitScheduler {
     private final UserRepository userRepository;
     private final StringRedisTemplate redisTemplate;
     private final AtomicInteger counter = new AtomicInteger(0);
+    private final SimpMessagingTemplate messagingTemplate;
 
     private final ApplicationEventPublisher eventPublisher;
 
+    // TODO: 확장시 추가
+
+//    @Scheduled(fixedRate = 60000) // 1분마다 실행
+//    public void updateMatchCommitCounts() {
+//        Map<Object, Object> entries = redisTemplate.opsForHash().entries("active_matches");
+//
+//        Map<String, MatchSession> activeMatches = new HashMap<>();
+//        for (Map.Entry<Object, Object> entry : entries.entrySet()) {
+//            if (entry.getKey() instanceof String && entry.getValue() instanceof MatchSession) {
+//                activeMatches.put((String) entry.getKey(), (MatchSession) entry.getValue());
+//            }
+//        }
+//
+//        for (MatchSession match : activeMatches.values()) {
+//            long player1Commits = Long.parseLong(redisTemplate.opsForValue().get("commit_active:"+match.getPlayer1()));
+//            long player2Commits = Long.parseLong(redisTemplate.opsForValue().get("commit_active:"+match.getPlayer2()));
+//
+//            redisTemplate.opsForHash().put("active_matches", match.getMatchId(), match);
+//
+//            messagingTemplate.convertAndSend("/topic/match/" + match.getMatchId(), match);
+//        }
+//    }
 
     @Scheduled(fixedRate = 60000) // 1분마다 실행
     public void updateUserCommits() {

src/main/java/cmf/commitField/domain/user/controller/MatchController.java

@@ -0,0 +1,22 @@
+package cmf.commitField.domain.user.controller;
+
+import cmf.commitField.domain.user.service.MatchService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/match")
+public class MatchController {
+    private final MatchService matchService;
+
+    @PostMapping("/request")
+    public ResponseEntity<String> requestMatch(@RequestParam String userId, @RequestParam int duration) {
+        matchService.enqueueUser(userId, duration);
+        return ResponseEntity.ok("매칭 대기열에 추가됨");
+    }
+}

src/main/java/cmf/commitField/domain/user/controller/UserController.java

@@ -1,6 +1,7 @@
 package cmf.commitField.domain.user.controller;
 
 import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
+import cmf.commitField.domain.user.dto.UserChatInfoDto;
 import cmf.commitField.domain.user.dto.UserInfoDto;
 import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.domain.user.service.UserService;
@@ -18,6 +19,17 @@ public class UserController {
     private final UserService userService;
     private final TotalCommitService totalCommitService;
 
+    @GetMapping("/chatinfo")
+    public ResponseEntity<UserChatInfoDto> getUserChatInfo(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
+        String username = oAuth2User.getName();
+
+        //유저 정보의 조회
+        //이 이벤트가 일어나면 유저의 정보를 확인하고, 조회한 유저를 active 상태로 만든다.
+        UserChatInfoDto userChatInfoDto = userService.showUserChatInfo(username);
+
+        return ResponseEntity.ok(userChatInfoDto);
+    }
+
     @GetMapping("/info")
     public ResponseEntity<UserInfoDto> getUserInfo(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
         String username = oAuth2User.getName();

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

@@ -0,0 +1,13 @@
+package cmf.commitField.domain.user.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class UserChatInfoDto {
+    private long id;
+    private String username;
+    private String nickname;
+    private String email;
+}

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

@@ -0,0 +1,30 @@
+package cmf.commitField.domain.user.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class MatchSession {
+    private String matchId;
+    private String player1;
+    private String player2;
+    private int matchDuration; // 1/3/5시간
+    private long startTime;
+    private int player1Commits;
+    private int player2Commits;
+
+    public MatchSession(String matchId, String player1, String player2, int matchDuration) {
+        this.matchId = matchId;
+        this.player1 = player1;
+        this.player2 = player2;
+        this.matchDuration = matchDuration;
+        this.startTime = System.currentTimeMillis();
+        this.player1Commits = 0;
+        this.player2Commits = 0;
+    }
+
+    public boolean isTimeUp() {
+        return System.currentTimeMillis() - startTime >= matchDuration * 3600000;
+    }
+}

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

@@ -0,0 +1,47 @@
+package cmf.commitField.domain.user.service;
+
+import cmf.commitField.domain.user.entity.MatchSession;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.UUID;
+
+@Service
+@RequiredArgsConstructor
+public class MatchService {
+    private final String MATCH_QUEUE_KEY = "commit_match_queue";
+    private final RedisTemplate<String, String> redisTemplate;
+    private final SimpMessagingTemplate messagingTemplate;
+
+    public void enqueueUser(String userId, int matchDuration) {
+        redisTemplate.opsForList().rightPush(MATCH_QUEUE_KEY, userId + ":" + matchDuration);
+        checkAndMatch();
+    }
+
+    private void checkAndMatch() {
+        List<String> queue = redisTemplate.opsForList().range(MATCH_QUEUE_KEY, 0, -1);
+        if (queue != null && queue.size() >= 2) {
+            String player1 = queue.get(0);
+            String player2 = queue.get(1);
+
+            // 두 유저를 매칭 후 제거
+            redisTemplate.opsForList().leftPop(MATCH_QUEUE_KEY);
+            redisTemplate.opsForList().leftPop(MATCH_QUEUE_KEY);
+
+            startMatch(player1, player2);
+        }
+    }
+
+    private void startMatch(String player1, String player2) {
+        String matchId = UUID.randomUUID().toString();
+        int matchDuration = Integer.parseInt(player1.split(":")[1]); // 경쟁 시간 가져오기
+
+        MatchSession matchSession = new MatchSession(matchId, player1, player2, matchDuration);
+        redisTemplate.opsForHash().put("active_matches", matchId, matchSession);
+
+        messagingTemplate.convertAndSend("/topic/match", "매칭 완료: " + player1 + " vs " + player2);
+    }
+}

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

@@ -5,6 +5,7 @@
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.repository.PetRepository;
 import cmf.commitField.domain.pet.service.PetService;
+import cmf.commitField.domain.user.dto.UserChatInfoDto;
 import cmf.commitField.domain.user.dto.UserInfoDto;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
@@ -33,7 +34,18 @@ public void updateUserStatus(String username, boolean status) {
         userRepository.updateStatus(username, status);
     }
 
-    @Transactional
+    public UserChatInfoDto showUserChatInfo(String username) {
+        User user = userRepository.findByUsername(username).get();
+
+        return UserChatInfoDto.builder()
+                .id(user.getId())
+                .email(user.getEmail())
+                .nickname(user.getNickname())
+                .username(user.getUsername())
+                .build();
+    }
+
+        @Transactional
     public UserInfoDto showUserInfo(String username) {
         User user = userRepository.findByUsername(username).get();
         Pet pet = petRepository.findByUserEmail(user.getEmail()).get(0); // TODO: 확장시 코드 수정 필요