-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
V4 ws #86
Merged
Merged
V4 ws #86
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
16d94b0
Added pull_request: v3
Vladik-gif 6d91e08
ChatController and WebSocketEventListener
3c84e98
ChatController
a37bdf7
ChatController
c611214
ChatController
7000fbd
ChatController
c0d6813
ChatController fix for review
1e31ec0
ChatController.sendMessage fix for review
ab870c8
ChatController.sendMessage fix for review
c8f8905
Merge pull request #87 from Chat-Your-Way/v3
Vladik-gif File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,9 @@ on: | |
push: | ||
branches: | ||
- v3 | ||
pull_request: | ||
branches: | ||
- v3 | ||
|
||
permissions: | ||
contents: read | ||
|
36 changes: 36 additions & 0 deletions
36
src/main/java/com/chat/yourway/controller/websocket/ChatController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package com.chat.yourway.controller.websocket; | ||
|
||
|
||
import com.chat.yourway.dto.request.MessageRequestDto; | ||
import com.chat.yourway.dto.response.MessageResponseDto; | ||
import com.chat.yourway.service.MessageService; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.messaging.handler.annotation.DestinationVariable; | ||
import org.springframework.messaging.handler.annotation.MessageMapping; | ||
import org.springframework.messaging.simp.SimpMessagingTemplate; | ||
import org.springframework.stereotype.Controller; | ||
|
||
import java.util.UUID; | ||
|
||
@Controller | ||
@Slf4j | ||
@RequiredArgsConstructor | ||
public class ChatController { | ||
|
||
private final SimpMessagingTemplate messagingTemplate; | ||
private final MessageService messageService; | ||
|
||
@MessageMapping("/app/topic/public/{topicId}") | ||
public void sendMessage(@DestinationVariable UUID topicId, MessageRequestDto message) { | ||
|
||
log.info("Received message for topic ID: {}", topicId); | ||
|
||
MessageResponseDto savedMessage = messageService.sendToTopic(topicId, message); | ||
log.info("Message was saved in DB"); | ||
|
||
messagingTemplate.convertAndSend("/topic/public/" + topicId, message); | ||
log.info("Message sent to topic ID: {}", topicId) ; | ||
|
||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ця строчка не де не примається, треба лише messageService.sendToTopic(topicId, message);
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oк. Зрозумів, виправлю