[#33] fix: fixed code issues

Covigator · Sep 22, 2024 · 7db05ef · 7db05ef
1 parent 16b89fe
commit 7db05ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/ku/covigator/controller/WebSocketController.java b/src/main/java/com/ku/covigator/controller/WebSocketController.java
@@ -9,6 +9,8 @@
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+
 @RestController
 @RequiredArgsConstructor
 public class WebSocketController {
@@ -21,7 +23,7 @@ public class WebSocketController {
     public void sendMessage(@DestinationVariable(value = "course_id") Long courseId,
                             SimpMessageHeaderAccessor accessor,
                             @Payload ChatMessageRequest request) {
-        Long memberId = Long.parseLong(accessor.getSessionAttributes().get("memberId").toString());
+        Long memberId = Long.parseLong(Objects.requireNonNull(accessor.getSessionAttributes()).get("memberId").toString());
         SaveMessageResponse saveMessageResponse = chatService.saveMessage(memberId, courseId, request.message());
         simpleMessageSendingOperations.convertAndSend("/topic/chat/" + courseId, saveMessageResponse);
     }

diff --git a/src/main/java/com/ku/covigator/service/ChatService.java b/src/main/java/com/ku/covigator/service/ChatService.java
@@ -25,8 +25,8 @@ public class ChatService {
 
     public List<Chat> getChatHistory(Long courseId) {
 
-        courseRepository.findById(courseId).orElseThrow(NotFoundCourseException::new);
-        return chatRepository.findChatByCourseIdOrderByTimestampAsc(courseId);
+        Course course = courseRepository.findById(courseId).orElseThrow(NotFoundCourseException::new);
+        return chatRepository.findChatByCourseIdOrderByTimestampAsc(course.getId());
     }
 
     public SaveMessageResponse saveMessage(Long memberId, Long courseId, String message) {