Feat: chat 채팅방 생성

Author: skyeong42

build.gradle.kts

@@ -69,6 +69,11 @@ dependencies {
 
 	// WebClient
 	implementation ("org.springframework.boot:spring-boot-starter-webflux")
+
+	// Spring Security OAuth2
+	implementation ("org.springframework.security:spring-security-oauth2-client:6.4.2") // Or the version you're using
+	implementation ("org.springframework.security:spring-security-oauth2-core:6.4.2") // Or the version you're using
+
 }
 
 tasks.withType<Test> {

src/main/java/cmf/commitField/domain/chat/chatMessage/controller/ChatController.java

@@ -23,9 +23,9 @@ public class ChatController {
     private final ChatMessageRepository chatMessageRepository;
     private final ChatRoomRepository chatRoomRepository;
     private final UserRepository userRepository;
-    private final SimpMessagingTemplate messagingTemplate; // 특정 채널로 메시지를 보내기 위함
+    private final SimpMessagingTemplate messagingTemplate;
 
-    @MessageMapping("/chat.sendMessage")
+    @MessageMapping("/chat.sendMessage") // 클라이언트에서 "/app/chat.sendMessage"로 보낼 때 처리됨
     public void sendMessage(ChatMessage chatMessage) {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 

src/main/java/cmf/commitField/domain/chat/chatRoom/controller/ChatRoomController.java

@@ -0,0 +1,48 @@
+package cmf.commitField.domain.chat.chatRoom.controller;
+
+import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
+import cmf.commitField.domain.chat.chatRoom.service.ChatRoomService;
+import cmf.commitField.domain.user.entity.CustomOAuth2User;
+import cmf.commitField.global.globalDto.GlobalResponse;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/chat")
+public class ChatRoomController {
+    private final ChatRoomService chatRoomService;
+
+    @PostMapping("/room")
+    public GlobalResponse<Object> createRoom(
+            @RequestBody @Valid ChatRoomRequest chatRoomRequest) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+            Long userId = principal.getId();  // getId()를 통해 userId를 추출
+            chatRoomService.createRoom(chatRoomRequest, userId);  // userId를 전달
+            return GlobalResponse.success();
+        } else {
+            throw new IllegalArgumentException("User not logged in.");
+        }
+    }
+
+    @PostMapping("/room/join/{roomId}")
+    public GlobalResponse<Object> joinRoom(@PathVariable Long roomId) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+            Long userId = principal.getId();  // getId()를 통해 userId를 추출
+            chatRoomService.joinRoom(roomId, userId);  // userId를 전달
+            return GlobalResponse.success();
+        } else {
+            throw new IllegalArgumentException("User not logged in.");
+        }
+    }
+}

src/main/java/cmf/commitField/domain/chat/chatRoom/controller/request/ChatRoomRequest.java

@@ -0,0 +1,25 @@
+package cmf.commitField.domain.chat.chatRoom.controller.request;
+
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChatRoomRequest {
+
+    @NotEmpty
+    @Length(min = 2, max = 20)
+    private String title;
+
+    @NotNull
+    @Max(100)
+    private Integer userCountMax;
+
+
+}

src/main/java/cmf/commitField/domain/chat/chatRoom/controller/response/ChatRoomResponse.java

@@ -0,0 +1,4 @@
+package cmf.commitField.domain.chat.chatRoom.controller.response;
+
+public class ChatRoomResponse {
+}

src/main/java/cmf/commitField/domain/chat/chatRoom/entity/ChatRoom.java

@@ -8,7 +8,6 @@
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Entity
@@ -21,8 +20,11 @@ public class ChatRoom extends BaseEntity {
 
     private String title;
     private String tier;
+    private Long roomCreator;
+    //최대 인원 100명
+    private Integer userCountMax;
 
-    private LocalDateTime deletedAt;
+//    private LocalDateTime deletedAt;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")

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

@@ -1,9 +1,19 @@
 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.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
+
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @QueryHints({@QueryHint(name = "javax.persistence.lock.timeout", value ="1000")})
+    Optional<ChatRoom> findById(Long aLong);
 }

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

@@ -0,0 +1,10 @@
+package cmf.commitField.domain.chat.chatRoom.service;
+
+import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
+
+public interface ChatRoomService {
+
+    void createRoom(ChatRoomRequest chatRoomRequest, Long userId);  // userId를 받도록 수정
+
+    void joinRoom(Long roomId, Long userId);  // userId를 받도록 수정
+}

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

@@ -0,0 +1,77 @@
+package cmf.commitField.domain.chat.chatRoom.service;
+
+import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
+import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
+import cmf.commitField.domain.chat.chatRoom.repository.ChatRoomRepository;
+import cmf.commitField.domain.chat.userChatRoom.entity.UserChatRoom;
+import cmf.commitField.domain.chat.userChatRoom.repository.UserChatRoomRepository;
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.repository.UserRepository;
+import cmf.commitField.global.error.ErrorCode;
+import cmf.commitField.global.exception.CustomException;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Service
+@RequiredArgsConstructor
+public class ChatRoomServiceImpl implements ChatRoomService {
+
+    private final ChatRoomRepository chatRoomRepository;
+    private final UserRepository userRepository;
+    private final UserChatRoomRepository userChatRoomRepository;
+
+    @Override
+    @Transactional
+    public void createRoom(ChatRoomRequest chatRoomRequest, Long userId) {
+        // 유저정보 조회
+        User findUser = userRepository.findById(userId)
+                .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
+
+        // ChatRoom 생성
+        ChatRoom chatRoom = ChatRoom.builder()
+                .roomCreator(findUser.getId())
+                .title(chatRoomRequest.getTitle())
+                .userCountMax(chatRoomRequest.getUserCountMax())
+                .createdAt(LocalDateTime.now())
+                .modifiedAt(LocalDateTime.now())
+                .build();
+        ChatRoom savedChatRoom = chatRoomRepository.save(chatRoom);
+
+        // 연관관계 user_chat room 생성
+        UserChatRoom userChatRoom = UserChatRoom.builder()
+                .user(findUser)
+                .chatRoom(savedChatRoom)
+                .build();
+        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);
+        }
+
+        // user_chatroom 관계 생성
+        UserChatRoom userChatRoom = UserChatRoom.builder()
+                .user(findUser)
+                .chatRoom(chatRoom)
+                .build();
+        userChatRoomRepository.save(userChatRoom);
+    }
+}

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

@@ -0,0 +1,4 @@
+package cmf.commitField.domain.chat.chatRoom.service;
+
+public class ChatRoomServiceImplTest {
+}