Merge branch 'dev' into feat/#80

Author: seoyeonson

build.gradle.kts

@@ -47,6 +47,9 @@ dependencies {
 
 	//redis
 	implementation("org.springframework.boot:spring-boot-starter-data-redis")
+	implementation ("org.redisson:redisson-spring-boot-starter:3.42.0") // redis message broker(lock)
+	implementation ("org.springframework.session:spring-session-data-redis")
+
 
 	// Security
 	implementation("org.springframework.boot:spring-boot-starter-security")

src/main/java/cmf/commitField/domain/chat/chatRoom/repository/ChatRoomRepository.java

@@ -1,14 +1,10 @@
 package cmf.commitField.domain.chat.chatRoom.repository;
 
 import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
-import jakarta.persistence.LockModeType;
-import jakarta.persistence.QueryHint;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
@@ -17,8 +13,8 @@
 @Repository
 public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
 
-    @Lock(LockModeType.PESSIMISTIC_WRITE)
-    @QueryHints({@QueryHint(name = "javax.persistence.lock.timeout", value ="1000")})
+//    @Lock(LockModeType.PESSIMISTIC_WRITE)
+//    @QueryHints({@QueryHint(name = "javax.persistence.lock.timeout", value ="1000")})
     Optional<ChatRoom> findById(Long aLong);
 
     Optional<ChatRoom> findChatRoomById(Long id);

src/main/java/cmf/commitField/domain/chat/chatRoom/service/ChatRoomServiceImpl.java

@@ -12,24 +12,33 @@
 import cmf.commitField.global.error.ErrorCode;
 import cmf.commitField.global.exception.CustomException;
 import lombok.RequiredArgsConstructor;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 @Service
 @RequiredArgsConstructor
 public class ChatRoomServiceImpl implements ChatRoomService {
 
     private final ChatRoomRepository chatRoomRepository;
+
+    private final ChatMessageRepository chatMessageRepository;
+
     private final UserRepository userRepository;
+
     private final UserChatRoomRepository userChatRoomRepository;
-    private final ChatMessageRepository chatMessageRepository;
+
+    private final RedissonClient redissonClient;
 
     @Override
     @Transactional
@@ -61,38 +70,6 @@ public void createRoom(ChatRoomRequest chatRoomRequest, Long userId) {
         userChatRoomRepository.save(userChatRoom);
     }
 
-    @Override
-    @Transactional
-    public void joinRoom(Long roomId, Long userId) {
-        // 유저 조회
-        User findUser = userRepository.findById(userId)
-                .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
-
-        // room 조회
-        ChatRoom chatRoom = chatRoomRepository.findById(roomId)
-                .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_ROOM));
-
-        // 현재 인원 수 조회
-        Long currentUserCount = userChatRoomRepository.countByChatRoomId(roomId);
-        // 채팅방이 꽉 찼을 경우 예외 처리
-        if (currentUserCount >= chatRoom.getUserCountMax()) {
-            throw new CustomException(ErrorCode.ROOM_USER_FULL);
-        }
-
-        // 이미 참여한 방인지 확인
-        if (userChatRoomRepository.existsByChatRoomIdAndUserId(roomId, userId)) {
-            throw new CustomException(ErrorCode.ALREADY_JOIN_ROOM);
-        }
-
-
-        // user_chatroom 관계 생성
-        UserChatRoom userChatRoom = UserChatRoom.builder()
-                .user(findUser)
-                .chatRoom(chatRoom)
-                .build();
-        userChatRoomRepository.save(userChatRoom);
-    }
-
     // 방 조회 DTO 변환 메서드 추출
     private static List<ChatRoomDto> getChatRoomDtos(Page<ChatRoom> all) {
         List<ChatRoomDto> chatRoomList = new ArrayList<>();
@@ -110,6 +87,7 @@ private static List<ChatRoomDto> getChatRoomDtos(Page<ChatRoom> all) {
         return chatRoomList;
     }
 
+
     // 채팅방 전체 조회
     @Override
     @Transactional(readOnly = true)
@@ -135,12 +113,57 @@ public List<ChatRoomDto> getUserByRoomPartList(Long userId, Pageable pageable) {
         return getChatRoomDtos(allByUserIdAndUserChatRooms);
     }
 
+    @Override
+    @Transactional(isolation = Isolation.READ_UNCOMMITTED)
+    public void joinRoom(Long roomId, Long userId) {
+        RLock lock = redissonClient.getLock("joinRoomLock:" + roomId);
+        try {
+            boolean available = lock.tryLock(1, TimeUnit.SECONDS);
+
+            if (!available) {
+                throw new CustomException(ErrorCode.FAILED_GET_LOCK);
+            }
+            // 유저 조회
+            User findUser = getUser(userId);
+
+            // room 조회
+            ChatRoom chatRoom = chatRoomRepository.findById(roomId) // lock (기존)
+                    .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_ROOM));
+
+            // user_chatroom 현재 인원 카운트 (비즈니스 로직)
+            Long currentUserCount = userChatRoomRepository.countNonLockByChatRoomId(roomId); // lock (기존)
+
+            List<Long> userChatRoomByChatRoomId = userChatRoomRepository
+                    .findUserChatRoomByChatRoom_Id(roomId);
+
+            if (userChatRoomByChatRoomId.contains(userId)) {
+                throw new CustomException(ErrorCode.ALREADY_JOIN_ROOM);
+            }
+
+            // chatroom 입장
+            if (currentUserCount >= chatRoom.getUserCountMax()) {
+                throw new CustomException(ErrorCode.ROOM_USER_FULL);
+            }
+
+            UserChatRoom userChatRoom = UserChatRoom.builder()
+                    .user(findUser)
+                    .chatRoom(chatRoom)
+                    .build();
+            userChatRoomRepository.save(userChatRoom);
+            // 비즈니스 로직 끝
+        } catch (InterruptedException e) {
+            throw new CustomException(ErrorCode.FAILED_GET_LOCK);
+        } finally {
+            lock.unlock();
+        }
+
+
+    }
+
     @Override
     @Transactional
     public void outRoom(Long userId, Long roomId) {
-        ChatRoom room = chatRoomRepository
-                .findChatRoomById(roomId)
-                .orElseThrow(() -> new CustomException(ErrorCode.NO_ROOM_FOUND));
+        ChatRoom room = getChatRoom(roomId);
         // 방장이 아니라면
         if (!Objects.equals(room.getRoomCreator(), userId)) {
             userChatRoomRepository.deleteUserChatRoomByChatRoom_IdAndUserId(roomId, userId);
@@ -153,13 +176,10 @@ public void outRoom(Long userId, Long roomId) {
 
     }
 
-
     @Override
     @Transactional
     public void deleteRoom(Long userId, Long roomId) {
-        ChatRoom room = chatRoomRepository
-                .findChatRoomById(roomId)
-                .orElseThrow(() -> new CustomException(ErrorCode.NO_ROOM));
+        ChatRoom room = getChatRoom(roomId);
         //방장이 아닐 경우, 삭제 불가
         if (!Objects.equals(room.getRoomCreator(), userId)) {
             throw new CustomException(ErrorCode.NOT_ROOM_CREATOR);
@@ -169,8 +189,19 @@ public void deleteRoom(Long userId, Long roomId) {
         userChatRoomRepository.deleteUserChatRoomByChatRoom_Id(roomId);
         chatRoomRepository.deleteById(roomId);
 
-}
+    }
+
+    private User getUser(Long userId) {
+        return userRepository.findById(userId)
+                .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
+    }
 
 
+    private ChatRoom getChatRoom(Long roomId) {
+        return chatRoomRepository
+                .findChatRoomById(roomId)
+                .orElseThrow(() -> new CustomException(ErrorCode.NONE_ROOM));
+
+    }
 
 }

src/main/java/cmf/commitField/domain/chat/userChatRoom/repository/UserChatRoomRepository.java

@@ -1,12 +1,8 @@
 package cmf.commitField.domain.chat.userChatRoom.repository;
 
 import cmf.commitField.domain.chat.userChatRoom.entity.UserChatRoom;
-import jakarta.persistence.LockModeType;
-import jakarta.persistence.QueryHint;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
@@ -15,8 +11,8 @@
 @Repository
 public interface UserChatRoomRepository extends JpaRepository<UserChatRoom, Long> {
 
-    @Lock(LockModeType.PESSIMISTIC_WRITE)
-    @QueryHints({@QueryHint(name = "javax.persistence.lock.timeout", value = "1000")})
+//    @Lock(LockModeType.PESSIMISTIC_WRITE)
+//    @QueryHints({@QueryHint(name = "javax.persistence.lock.timeout", value = "1000")})
     Long countByChatRoomId(Long roomId); // 비관적 락
 
 //    @Query("select count(*) from UserChatRoom u where u.chatRoom.id = ?1 ")
@@ -32,7 +28,8 @@ public interface UserChatRoomRepository extends JpaRepository<UserChatRoom, Long
     boolean existsByChatRoomIdAndUserId(Long roomId, Long userId);
     // 특정 방에 참여한 모든 UserChatRoom 관계 조회
     List<UserChatRoom> findByChatRoom_Id(Long chatRoomId);
-
+    @Query("select u.user.id from UserChatRoom u where u.chatRoom.id = ?1")
+    List<Long> findUserChatRoomByChatRoom_Id(Long chatRoomId);
 
 
 }

src/main/java/cmf/commitField/domain/commit/totalCommit/controller/TotalCommitController.java

@@ -2,9 +2,10 @@
 
 import cmf.commitField.domain.commit.totalCommit.dto.TotalCommitResponseDto;
 import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
+import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
@@ -15,41 +16,62 @@
 public class TotalCommitController {
     private final TotalCommitService totalCommitService;
 
-    @GetMapping("/api/commits/{username}")
-    public TotalCommitResponseDto getTotalCommits(@PathVariable String username) {
+//    @GetMapping("/api/commits/{username}")
+//    public TotalCommitResponseDto getTotalCommits(@PathVariable String username) {
+//        return totalCommitService.getTotalCommitCount(username);
+//    }
+
+    // 로그인한 사용자의 username 이용
+    @GetMapping("/api/commits")
+    public TotalCommitResponseDto getTotalCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        String username = oAuth2User.getName();  // CustomOAuth2User의 getName()은 user.getUsername()을 반환
+
         return totalCommitService.getTotalCommitCount(username);
     }
 
     // 봄 시즌(3/1 - 5/31)
-    @GetMapping("/api/commits/{username}/spring")
-    public TotalCommitResponseDto getSpringSeasonCommits(@PathVariable String username) {
+//    @GetMapping("/api/commits/{username}/spring")
+//    public TotalCommitResponseDto getSpringSeasonCommits(@PathVariable String username) {
+//        int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
+//        LocalDateTime since = LocalDateTime.of(2024, 3, 1, 0, 0);
+//        LocalDateTime until = LocalDateTime.of(2024, 5, 31, 23, 59, 59);
+//        return totalCommitService.getSeasonCommits(username, since, until);
+//    }
+
+    // 마찬가지로 로그인한 사용자의 username 이용
+    @GetMapping("/api/commits/spring")
+    public TotalCommitResponseDto getSpringSeasonCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        String username = oAuth2User.getName();
         int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
         LocalDateTime since = LocalDateTime.of(2024, 3, 1, 0, 0);
         LocalDateTime until = LocalDateTime.of(2024, 5, 31, 23, 59, 59);
         return totalCommitService.getSeasonCommits(username, since, until);
     }
 
     // 여름 시즌(6/1 - 8/31)
-    @GetMapping("/api/commits/{username}/summer")
-    public TotalCommitResponseDto getSummerSeasonCommits(@PathVariable String username) {
+    @GetMapping("/api/commits/summer")
+    public TotalCommitResponseDto getSummerSeasonCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        String username = oAuth2User.getName();
         int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
         LocalDateTime since = LocalDateTime.of(2024, 6, 1, 0, 0);
         LocalDateTime until = LocalDateTime.of(2024, 8, 31, 23, 59, 59);
         return totalCommitService.getSeasonCommits(username, since, until);
     }
 
     // 가을 시즌(9/1 - 11/30)
-    @GetMapping("/api/commits/{username}/fall")
-    public TotalCommitResponseDto getFallSeasonCommits(@PathVariable String username) {
+    @GetMapping("/api/commits/fall")
+    public TotalCommitResponseDto getFallSeasonCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        String username = oAuth2User.getName();
         int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
         LocalDateTime since = LocalDateTime.of(2024, 9, 1, 0, 0);
         LocalDateTime until = LocalDateTime.of(2024, 11, 30, 23, 59, 59);
         return totalCommitService.getSeasonCommits(username, since, until);
     }
 
     // 겨울 시즌(이전 년도 12/1 - 다음 년도 2/28)
-    @GetMapping("/api/commits/{username}/winter")
-    public TotalCommitResponseDto getWinterSeasonCommits(@PathVariable String username) {
+    @GetMapping("/api/commits/winter")
+    public TotalCommitResponseDto getWinterSeasonCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        String username = oAuth2User.getName();
         int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
         LocalDateTime since = LocalDateTime.of(2024 - 1, 12, 1, 0, 0);
         LocalDateTime until = LocalDateTime.of(2024, 2, 1, 23, 59, 59)