Merge pull request #63 from CommitField/feat/#20

Feat: 채팅 방 생성, 입장, chatRoom 수정

Author: skyeong42

build.gradle.kts

@@ -59,7 +59,10 @@ dependencies {
 
 	//Swagger
 	implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0")
+
+	//Web Socket
 	implementation("org.java-websocket:Java-WebSocket:1.5.2")
+	implementation ("org.springframework:spring-messaging")
 
 	// JWT
 	implementation("io.jsonwebtoken:jjwt-api:0.12.6")
@@ -68,6 +71,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

@@ -0,0 +1,55 @@
+package cmf.commitField.domain.chat.chatMessage.controller;
+
+import cmf.commitField.domain.chat.chatMessage.entity.ChatMessage;
+import cmf.commitField.domain.chat.chatMessage.repository.ChatMessageRepository;
+import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
+import cmf.commitField.domain.chat.chatRoom.repository.ChatRoomRepository;
+import cmf.commitField.domain.user.entity.CustomOAuth2User;
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Controller;
+
+import java.util.Optional;
+
+@Controller
+@RequiredArgsConstructor
+public class ChatController {
+
+    private final ChatMessageRepository chatMessageRepository;
+    private final ChatRoomRepository chatRoomRepository;
+    private final UserRepository userRepository;
+    private final SimpMessagingTemplate messagingTemplate;
+
+    @MessageMapping("/chat.sendMessage") // 클라이언트에서 "/app/chat.sendMessage"로 보낼 때 처리됨
+    public void sendMessage(ChatMessage chatMessage) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication != null && authentication.isAuthenticated() &&
+                authentication.getPrincipal() instanceof CustomOAuth2User) {
+
+            CustomOAuth2User oauth2User = (CustomOAuth2User) authentication.getPrincipal();
+            Optional<User> userOptional = userRepository.findByUsername(oauth2User.getName());
+
+            if (userOptional.isPresent()) {
+                User user = userOptional.get();
+                Optional<ChatRoom> chatRoomOptional = chatRoomRepository.findById(chatMessage.getChatRoom().getId());
+
+                if (chatRoomOptional.isPresent()) {
+                    ChatRoom chatRoom = chatRoomOptional.get();
+                    chatMessage.setUser(user);
+                    chatMessage.setChatRoom(chatRoom);
+
+                    ChatMessage savedMessage = chatMessageRepository.save(chatMessage);
+
+                    // 채팅방 구독자들에게 메시지 전송
+                    messagingTemplate.convertAndSend("/sub/chat/room/" + chatRoom.getId(), savedMessage);
+                }
+            }
+        }
+    }
+}

src/main/java/cmf/commitField/domain/chat/chatMessage/entity/ChatMessage.java

@@ -7,23 +7,20 @@
 import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 
-import java.time.LocalDateTime;
-
 @Entity
 @SuperBuilder
 @Getter
-@NoArgsConstructor
-@AllArgsConstructor
+@Setter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
 public class ChatMessage extends BaseEntity {
 
     private String message;
 
-    private LocalDateTime sendTime;
+//    private LocalDateTime sendTime;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")

src/main/java/cmf/commitField/domain/chat/chatMessage/repository/ChatMessageRepository.java

@@ -0,0 +1,9 @@
+package cmf.commitField.domain.chat.chatMessage.repository;
+
+import cmf.commitField.domain.chat.chatMessage.entity.ChatMessage;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ChatMessageRepository extends JpaRepository<ChatMessage, Long> {
+}

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

@@ -0,0 +1,50 @@
+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

@@ -5,24 +5,26 @@
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.global.jpa.BaseEntity;
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Entity
 @SuperBuilder
 @Getter
-@NoArgsConstructor
-@AllArgsConstructor
+@Setter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
 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

@@ -0,0 +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를 받도록 수정
+}