Merge pull request #103 from Hanaemong/hyeonu

Hyeonu

src/main/java/com/hana/hanalink/chat/config/MongoConfig.java

@@ -2,20 +2,23 @@
 
 import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.MongoClients;
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 
 @Configuration
+@RequiredArgsConstructor
 public class MongoConfig {
-
     @Bean
     public MongoClient reactiveMongoClient() {
-        return MongoClients.create("mongodb://52.79.132.3:27017");
+        String connectionString = "mongodb://52.79.132.3:27017";
+        return MongoClients.create(connectionString);
     }
 
     @Bean
     public ReactiveMongoTemplate reactiveMongoTemplate() {
         return new ReactiveMongoTemplate(reactiveMongoClient(), "chat");
     }
+
 }

src/main/java/com/hana/hanalink/chat/controller/ChatController.java

@@ -5,7 +5,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
-import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
 import org.springframework.stereotype.Controller;
 import reactor.core.publisher.Mono;
@@ -22,7 +21,10 @@ public class ChatController {
      */
     @MessageMapping("/send")
     public Mono<Void> message(@Payload ChatDto chatDto) {
-        simpMessageSendingOperations.convertAndSend("topic" + chatDto.getRoomId(), chatDto);
+        simpMessageSendingOperations.convertAndSend("/topic/" + chatDto.getRoomId(), chatDto);
         return chatService.saveChat(chatDto.toEntity()).then();
     }
+
+
+
 }

src/main/java/com/hana/hanalink/chat/controller/ChatRestController.java

@@ -0,0 +1,22 @@
+package com.hana.hanalink.chat.controller;
+
+import com.hana.hanalink.chat.domain.Chat;
+import com.hana.hanalink.chat.service.ChatService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
+
+@RestController
+@RequestMapping("/api/v1/chat")
+@RequiredArgsConstructor
+public class ChatRestController {
+    private final ChatService chatService;
+
+    @GetMapping("/{roomId}")
+    public Flux<Chat> getChatsByRoomId(@PathVariable String roomId) {
+        return chatService.getChatsByRoomId(roomId);
+    }
+}

src/main/java/com/hana/hanalink/chat/repository/ChatRepository.java

@@ -1,7 +1,12 @@
 package com.hana.hanalink.chat.repository;
 
 import com.hana.hanalink.chat.domain.Chat;
-import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
 
-public interface ChatRepository extends MongoRepository<Chat, String> {
+
+@Repository
+public interface ChatRepository extends ReactiveMongoRepository<Chat, String> {
+    Flux<Chat> findByRoomId(String roomId);
 }

src/main/java/com/hana/hanalink/chat/service/ChatService.java

@@ -1,17 +1,27 @@
 package com.hana.hanalink.chat.service;
 
 import com.hana.hanalink.chat.domain.Chat;
+import com.hana.hanalink.chat.repository.ChatRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+
+
 @Service
 @RequiredArgsConstructor
 public class ChatService {
     private final ReactiveMongoTemplate reactiveMongoTemplate;
+    private final ChatRepository chatRepository;
+
+
     public Mono<Chat> saveChat(Chat chat) {
         return reactiveMongoTemplate.save(chat);
     }
 
+    public Flux<Chat> getChatsByRoomId(String roomId) {
+        return chatRepository.findByRoomId(roomId);
+    }
 }