Skip to content

Adding database persistence and User models #10

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adding database persistence and User models #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dae81e9
models refactored
sanix-sandel Dec 20, 2020
08b58dd
services and repo
sanix-sandel Dec 20, 2020
59f4e32
OK 2.0
sanix-sandel Dec 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,23 @@
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-rest</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
Expand All @@ -41,7 +58,28 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-reactor-netty</artifactId>
</dependency>

<dependency>
<groupId>org.webjars</groupId>
<artifactId>sockjs-client</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>stomp-websocket</artifactId>
<version>2.3.3</version>
</dependency>
<!-- jQuery -->
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>3.1.1</version>
</dependency>
<!-- Bootstrap -->
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/com/example/websocketdemo/api/RestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.example.websocketdemo.api;

import com.example.websocketdemo.models.Message;
import com.example.websocketdemo.models.User;
import com.example.websocketdemo.services.MessageService;
import com.example.websocketdemo.services.UserService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

import java.util.List;

@org.springframework.web.bind.annotation.RestController
@RequestMapping("/api")
public class RestController {

private final UserService userService;
private final MessageService messageService;

public RestController(UserService userService, MessageService messageService) {
this.userService = userService;
this.messageService=messageService;
}

@GetMapping("/users")
List<User> getAllUsers(){
return userService.findAll();
}

@GetMapping("/messages")
List<Message> getMessages(){
return messageService.findAll();
}

}
38 changes: 32 additions & 6 deletions src/main/java/com/example/websocketdemo/controller/ChatController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
package com.example.websocketdemo.controller;

import com.example.websocketdemo.model.ChatMessage;
import com.example.websocketdemo.models.Message;
import com.example.websocketdemo.models.MessageDTO;
import com.example.websocketdemo.models.User;
import com.example.websocketdemo.services.MessageService;
import com.example.websocketdemo.services.UserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.messaging.handler.annotation.MessageMapping;
import org.springframework.messaging.handler.annotation.Payload;
import org.springframework.messaging.handler.annotation.SendTo;
Expand All @@ -12,20 +18,40 @@
*/
@Controller
public class ChatController {
private final UserService userService;
private final MessageService messageService;
private static Logger logger= LoggerFactory.getLogger(ChatController.class);

public ChatController(UserService userService, MessageService messageService) {
this.userService = userService;
this.messageService = messageService;
}

@MessageMapping("/chat.sendMessage")
@SendTo("/topic/public")
public ChatMessage sendMessage(@Payload ChatMessage chatMessage) {
return chatMessage;
public Message sendMessage(@Payload MessageDTO messageDTO) {
Message message=new Message();
User user=userService.findByUsername(messageDTO.getUsername());
message.setAuthor(user);
message.setContent(messageDTO.getContent());
message.setMessageType(messageDTO.getType());
System.out.println(messageDTO);
messageService.save(message);
logger.info(">>>"+message.getAuthor().getUsername()+ " sent a message");
return message;
}

@MessageMapping("/chat.addUser")
@SendTo("/topic/public")
public ChatMessage addUser(@Payload ChatMessage chatMessage,
public MessageDTO addUser(@Payload MessageDTO message,
SimpMessageHeaderAccessor headerAccessor) {
// Add username in web socket session
headerAccessor.getSessionAttributes().put("username", chatMessage.getSender());
return chatMessage;
headerAccessor.getSessionAttributes().put("username", message.getUsername());
User user=new User();
user.setUsername(message.getUsername());
userService.save(user);
logger.info(message.getUsername()+" joined the chat ! Great !");
return message;
}

}
13 changes: 8 additions & 5 deletions src/main/java/com/example/websocketdemo/controller/WebSocketEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package com.example.websocketdemo.controller;

import com.example.websocketdemo.model.ChatMessage;

import com.example.websocketdemo.models.MessageDTO;
import com.example.websocketdemo.models.MessageType;
import com.example.websocketdemo.models.User;
import com.example.websocketdemo.services.UserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -34,10 +38,9 @@ public void handleWebSocketDisconnectListener(SessionDisconnectEvent event) {
String username = (String) headerAccessor.getSessionAttributes().get("username");
if(username != null) {
logger.info("User Disconnected : " + username);

ChatMessage chatMessage = new ChatMessage();
chatMessage.setType(ChatMessage.MessageType.LEAVE);
chatMessage.setSender(username);
MessageDTO chatMessage = new MessageDTO();
chatMessage.setType(MessageType.LEAVE);
chatMessage.setUsername(username);

messagingTemplate.convertAndSend("/topic/public", chatMessage);
}
Expand Down
40 changes: 0 additions & 40 deletions src/main/java/com/example/websocketdemo/model/ChatMessage.java
View file
Open in desktop

This file was deleted.

74 changes: 74 additions & 0 deletions src/main/java/com/example/websocketdemo/models/Message.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package com.example.websocketdemo.models;

import com.fasterxml.jackson.annotation.JsonManagedReference;

import javax.persistence.Entity;
import javax.persistence.*;

import java.util.Date;
import java.util.UUID;

import static javax.persistence.FetchType.EAGER;

@Entity
public class Message {

@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private UUID id;

private String content;
private Date created=new Date();

@JsonManagedReference
@ManyToOne(fetch=EAGER)
@JoinColumn(name="fk_author")
private User author;

@Enumerated(value=EnumType.STRING)
private MessageType messageType;

public MessageType getMessageType() {
return messageType;
}

public void setMessageType(MessageType messageType) {
this.messageType = messageType;
}

public UUID getId() {
return id;
}

public String getContent() {
return content;
}

public void setContent(String content) {
this.content = content;
}

public Date getCreated() {
return created;
}


public User getAuthor() {
return author;
}

public void setAuthor(User author) {
this.author = author;
}

@Override
public String toString() {
return "Message{" +
"id=" + id +
", content='" + content + '\'' +
", created=" + created +
", author=" + author +
", messageType=" + messageType +
'}';
}
}
43 changes: 43 additions & 0 deletions src/main/java/com/example/websocketdemo/models/MessageDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.example.websocketdemo.models;

public class MessageDTO {


private String username;
private String content;
private MessageType type;

public String getUsername() {
return username;
}

public void setUsername(String username) {
this.username = username;
}

public String getContent() {
return content;
}

public void setContent(String content) {
this.content = content;
}


public MessageType getType() {
return type;
}

public void setType(MessageType type) {
this.type = type;
}

@Override
public String toString() {
return "MessageDTO{" +
"username='" + username + '\'' +
", content='" + content + '\'' +
", type=" + type +
'}';
}
}
5 changes: 5 additions & 0 deletions src/main/java/com/example/websocketdemo/models/MessageType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.example.websocketdemo.models;

public enum MessageType {
JOIN, CHAT, LEAVE
}
Loading