Merge pull request #38 from LiveOnv1/feat/#34_group_chat

#34/feat/채팅전송기능 추가
LiveOnv1 · Oct 3, 2024 · 6a29eb4 · 6a29eb4
2 parents e3dbac3 + bc48644
commit 6a29eb4
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 38 deletions.
diff --git a/build.gradle b/build.gradle
@@ -23,6 +23,11 @@ repositories {
 	mavenCentral()
 }
 
+tasks.withType(JavaCompile).configureEach {
+	options.compilerArgs << '-parameters'
+}
+
+
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'

diff --git a/src/main/java/com/chat/liveon/auth/controller/AuthController.java b/src/main/java/com/chat/liveon/auth/controller/AuthController.java
@@ -1,7 +1,8 @@
 package com.chat.liveon.auth.controller;
 
-import com.chat.liveon.auth.dto.LoginRequest;
-import com.chat.liveon.auth.dto.RegisterRequest;
+import com.chat.liveon.auth.dto.request.LoginRequest;
+import com.chat.liveon.auth.dto.request.RegisterRequest;
+import com.chat.liveon.auth.dto.response.LoginResponse;
 import com.chat.liveon.auth.service.AuthService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -37,11 +38,11 @@ public ResponseEntity<String> register(@RequestBody RegisterRequest authRequest)
 
     @PostMapping("/login")
     @Operation(summary = "로그인", description = "로그인 요청")
-    public ResponseEntity<String> login(@RequestBody LoginRequest loginRequest, HttpServletRequest request, HttpServletResponse response) {
+    public LoginResponse login(@RequestBody LoginRequest loginRequest, HttpServletRequest request, HttpServletResponse response) {
         log.info("[로그인 요청] 아이디: {}", loginRequest.personId());
-        authService.login(loginRequest, request, response);
+        LoginResponse loginResponse = authService.login(loginRequest, request, response);
         log.info("[로그인 성공] 아이디: {}", loginRequest.personId());
-        return ResponseEntity.ok("로그인 성공");
+        return loginResponse;
     }
 
     @PostMapping("/logout")

diff --git a/src/main/java/com/chat/liveon/auth/dto/LoginRequest.java b/src/main/java/com/chat/liveon/auth/dto/LoginRequest.java
diff --git a/src/main/java/com/chat/liveon/auth/dto/request/LoginRequest.java b/src/main/java/com/chat/liveon/auth/dto/request/LoginRequest.java
@@ -0,0 +1,4 @@
+package com.chat.liveon.auth.dto.request;
+
+public record LoginRequest(String personId, String personPassword) {
+}
diff --git a/...chat/liveon/auth/dto/RegisterRequest.java → ...eon/auth/dto/request/RegisterRequest.java b/...chat/liveon/auth/dto/RegisterRequest.java → ...eon/auth/dto/request/RegisterRequest.java
@@ -1,4 +1,4 @@
-package com.chat.liveon.auth.dto;
+package com.chat.liveon.auth.dto.request;
 
 public record RegisterRequest(String personId, String personName, String personPassword, String profilePicture) {
 }
diff --git a/src/main/java/com/chat/liveon/auth/dto/response/LoginResponse.java b/src/main/java/com/chat/liveon/auth/dto/response/LoginResponse.java
@@ -0,0 +1,5 @@
+package com.chat.liveon.auth.dto.response;
+
+public record LoginResponse(
+        String personId
+) {}
diff --git a/src/main/java/com/chat/liveon/auth/service/AuthService.java b/src/main/java/com/chat/liveon/auth/service/AuthService.java
@@ -1,7 +1,8 @@
 package com.chat.liveon.auth.service;
 
-import com.chat.liveon.auth.dto.LoginRequest;
-import com.chat.liveon.auth.dto.RegisterRequest;
+import com.chat.liveon.auth.dto.request.LoginRequest;
+import com.chat.liveon.auth.dto.request.RegisterRequest;
+import com.chat.liveon.auth.dto.response.LoginResponse;
 import com.chat.liveon.auth.entity.Person;
 import com.chat.liveon.auth.entity.Role;
 import com.chat.liveon.auth.exception.AuthenticationFailureException;
@@ -17,7 +18,6 @@
 import java.io.UnsupportedEncodingException;
 import java.security.NoSuchAlgorithmException;
 
-@Slf4j
 @Service
 public class AuthService {
     private final PasswordEncoder passwordEncoder;
@@ -39,7 +39,7 @@ public void register(RegisterRequest authRequest) {
     }
 
     @Transactional
-    public void login(LoginRequest loginRequest, HttpServletRequest request, HttpServletResponse response) {
+    public LoginResponse login(LoginRequest loginRequest, HttpServletRequest request, HttpServletResponse response) {
         boolean isAuthenticated = authenticate(loginRequest.personId(), loginRequest.personPassword());
         if (!isAuthenticated) {
             throw new AuthenticationFailureException("로그인에 실패했습니다.");
@@ -55,6 +55,7 @@ public void login(LoginRequest loginRequest, HttpServletRequest request, HttpSer
 
             response.addCookie(sessionCookie);
             response.setStatus(HttpServletResponse.SC_OK);
+            return new LoginResponse(loginRequest.personId());
     }
 
     @Transactional

diff --git a/src/main/java/com/chat/liveon/chat/controller/ChatMessageController.java b/src/main/java/com/chat/liveon/chat/controller/ChatMessageController.java
@@ -1,6 +1,7 @@
 package com.chat.liveon.chat.controller;
 
 import com.chat.liveon.chat.dto.request.ChatMessageRequest;
+import com.chat.liveon.chat.dto.response.ChatMessageResponse;
 import com.chat.liveon.chat.service.ChatMessageService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
@@ -17,9 +18,9 @@ public class ChatMessageController {
     private final ChatMessageService chatMessageService;
 
     @MessageMapping("/chat/{roomId}")
-    @SendTo("/topic/public/{roomId}")
-    public ChatMessageRequest sendMessage(@DestinationVariable Long roomId, ChatMessageRequest message) {
-        return chatMessageService.sendMessage(roomId, message);
+    @SendTo("/topic/chatroom/{roomId}")
+    public ChatMessageResponse sendMessage(@DestinationVariable("roomId") String roomId, ChatMessageRequest message) {
+        Long roomIdLong = Long.parseLong(roomId);
+        return chatMessageService.sendMessage(roomIdLong, message);
     }
-
 }
diff --git a/src/main/java/com/chat/liveon/chat/dto/request/ChatMessageRequest.java b/src/main/java/com/chat/liveon/chat/dto/request/ChatMessageRequest.java
@@ -3,9 +3,7 @@
 import java.time.LocalDateTime;
 
 public record ChatMessageRequest(
-        Long messageId,
-        Long chatRoomId,
-        String senderName,
+        String personId,
         String message,
         LocalDateTime timestamp
-) {}
+) {}
diff --git a/src/main/java/com/chat/liveon/chat/dto/response/ChatMessageResponse.java b/src/main/java/com/chat/liveon/chat/dto/response/ChatMessageResponse.java
@@ -1,4 +1,11 @@
 package com.chat.liveon.chat.dto.response;
 
-public class ChatMessageResponse {
-}
+import java.time.LocalDateTime;
+
+public record ChatMessageResponse(
+        Long chatRoomId,
+        String personId,
+        String message,
+        LocalDateTime timestamp
+) {}
+
diff --git a/src/main/java/com/chat/liveon/chat/entity/ChatRoom.java b/src/main/java/com/chat/liveon/chat/entity/ChatRoom.java
@@ -15,6 +15,7 @@ public class ChatRoom {
     @Column(name = "chat_room_id")
     private Long id;
 
+    @Column(nullable = false)
     private String chatRoomName;
 
     @ManyToOne(fetch = FetchType.LAZY)

diff --git a/src/main/java/com/chat/liveon/chat/repository/ChatRoomRepository.java b/src/main/java/com/chat/liveon/chat/repository/ChatRoomRepository.java
@@ -2,6 +2,11 @@
 
 import com.chat.liveon.chat.entity.ChatRoom;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.lang.NonNull;
+
+import java.util.Optional;
 
 public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
-}
+    @NonNull
+    Optional<ChatRoom> findById(Long roomId);
+}
diff --git a/src/main/java/com/chat/liveon/chat/service/ChatMessageService.java b/src/main/java/com/chat/liveon/chat/service/ChatMessageService.java
@@ -3,6 +3,7 @@
 import com.chat.liveon.auth.entity.Person;
 import com.chat.liveon.auth.repository.PersonRepository;
 import com.chat.liveon.chat.dto.request.ChatMessageRequest;
+import com.chat.liveon.chat.dto.response.ChatMessageResponse;
 import com.chat.liveon.chat.entity.ChatMessage;
 import com.chat.liveon.chat.entity.ChatRoom;
 import com.chat.liveon.chat.repository.ChatMessageRepository;
@@ -22,12 +23,11 @@ public class ChatMessageService {
     private final PersonRepository personRepository;
 
     @Transactional
-    public ChatMessageRequest sendMessage(Long roomId, ChatMessageRequest messageRequest) {
+    public ChatMessageResponse sendMessage(Long roomId, ChatMessageRequest messageRequest) {
         ChatRoom chatRoom = chatRoomRepository.findById(roomId)
-                .orElseThrow(() -> new RuntimeException("ChatRoom not found"));
-
-        Person sender = personRepository.findByPersonId(messageRequest.senderName())
-                .orElseThrow(() -> new RuntimeException("Sender not found"));
+                .orElseThrow(() -> new RuntimeException("채팅방이 없음: " + roomId));
+        Person sender = personRepository.findByPersonId(messageRequest.personId())
+                .orElseThrow(() -> new RuntimeException("사용자가 없음: " + messageRequest.personId()));
 
         ChatMessage chatMessage = ChatMessage.builder()
                 .chatRoom(chatRoom)
@@ -37,15 +37,15 @@ public ChatMessageRequest sendMessage(Long roomId, ChatMessageRequest messageReq
 
         chatMessage = chatMessageRepository.save(chatMessage);
 
-        log.info("[메시지 전송 성공] 채팅방: {}, 사용자: {}, 메시지: {}", roomId, sender.getPersonName(), messageRequest.message());
+        log.info("[메시지 전송 성공] 채팅방: {}, 사용자: {}, 메시지: {}, 시간: {}", roomId, sender.getPersonId(), messageRequest.message(), chatMessage.getSendDate());
 
-        return new ChatMessageRequest(
-                chatMessage.getId(),
+        return new ChatMessageResponse(
                 chatMessage.getChatRoom().getId(),
-                sender.getPersonName(),
+                sender.getPersonId(),
                 chatMessage.getMessage(),
                 chatMessage.getSendDate()
         );
-
     }
+
+
 }