added chats with another users

src/main/java/com/krylov/refound/controller/ChatController.java

@@ -1,37 +1,45 @@
 package com.krylov.refound.controller;
 
-import com.krylov.refound.dto.ChatMessage;
-import com.krylov.refound.entity.Message;
-import com.krylov.refound.entity.User;
-import com.krylov.refound.repository.UserRepository;
-import com.krylov.refound.service.MessageService;
-import java.security.Principal;
-import java.util.Optional;
+import com.krylov.refound.dto.*;
+import com.krylov.refound.service.ChatService;
+import com.krylov.refound.service.UserService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.handler.annotation.Payload;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.stereotype.Controller;
+import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
 
-@Controller
+@RestController
 @RequiredArgsConstructor
+@RequestMapping("/api/v1/chats")
 public class ChatController {
-  private final MessageService service;
-  private final SimpMessagingTemplate messagingTemplate;
-  private final UserRepository userRepository;
 
+  private final UserService userService;
+  private final ChatService chatService;
 
-  @MessageMapping("/chat")
-  public void send(@Payload ChatMessage message, Principal principal) {
+  // Создать чат с пользователем или получить существующий
+  @PostMapping("/with/{otherUserId}")
+  public ChatDto createOrGetChat(@PathVariable Long otherUserId, @RequestParam(required = false) Long postId, Authentication auth) {
+    Long currentUserId = extractUserId(auth); // см. ниже как достать id
+    return chatService.getOrCreateChat(currentUserId, otherUserId, postId);
+  }
 
-    Optional<User> sender = userRepository.findByLogin(principal.getName());
-    Message saved = new Message();
-    if(sender.isPresent()){
-      saved = service.send(message.getReceiverId(), message.getContent());
-    }
+  // Список всех чатов текущего пользователя
+  @GetMapping
+  public List<ChatDto> getMyChats(Authentication auth) {
+    return chatService.getUserChats(extractUserId(auth));
+  }
 
-    // отправка получателю
-    messagingTemplate.convertAndSend("/topic/messages/" + message.getReceiverId(), saved);
+  // История сообщений конкретного чата
+  @GetMapping("/{chatId}/messages")
+  public List<MessageDto> getMessages(@PathVariable Long chatId) {
+    return chatService.getMessages(chatId);
+  }
+
+  private Long extractUserId(Authentication auth) {
+    // Подставь свою логику получения userId из JWT/Authentication
+    // Например если в токене login, а не id - подтяни через UserService
+    String login = auth.getName();
+    return userService.getUserIdByLogin(login);
   }
 
 }

src/main/java/com/krylov/refound/controller/ChatWebSocketController.java

@@ -0,0 +1,22 @@
+package com.krylov.refound.controller;
+
+import com.krylov.refound.dto.SendMessageRequest;
+import com.krylov.refound.service.ChatService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class ChatWebSocketController {
+  private final ChatService chatService;
+
+  // Клиент шлёт сюда: /app/chat.send
+  @MessageMapping("/chat.send")
+  public void sendMessage(SendMessageRequest request, SimpMessageHeaderAccessor headerAccessor) {
+    Long senderId = (Long) headerAccessor.getSessionAttributes().get("userId");
+    chatService.sendMessage(senderId, request.getChatId(), request.getContent());
+    // ChatService сам отправит сообщение всем подписчикам через messagingTemplate
+  }
+}

src/main/java/com/krylov/refound/controller/MessageController.java

@@ -1,41 +0,0 @@
-package com.krylov.refound.controller;
-
-import com.krylov.refound.dto.DialogResponse;
-import com.krylov.refound.entity.Message;
-import com.krylov.refound.service.MessageService;
-import java.util.List;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/v1/messages")
-@RequiredArgsConstructor
-public class MessageController {
-  private final MessageService service;
-
-  @PostMapping
-  public void send(@RequestParam Long receiverId,
-      @RequestParam String content) {
-    service.send(receiverId, content);
-  }
-
-  @GetMapping("/{userId}")
-  public List<Message> chat(@PathVariable Long userId) {
-    return service.getChat(userId);
-  }
-
-  @GetMapping("/dialogs")
-  public List<DialogResponse> getDialogs() {
-    return service.getDialogs();
-  }
-
-  @PostMapping("/read/{userId}")
-  public void markAsRead(@PathVariable Long userId) {
-    service.markAsRead(userId);
-  }
-}