Skip to content
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

Feat/54 chatting #72

Merged
merged 13 commits into from
Jan 14, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,7 @@ out/
.vscode/

#####
env.properties
env.properties

### ์ดˆ๊ธฐ ๋ฐ์ดํ„ฐ ###
initDB.java
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-websocket'
implementation 'org.springframework.boot:spring-boot-starter-validation'
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
Expand Down
21 changes: 21 additions & 0 deletions src/main/java/com/sptp/backend/artwork/repository/ArtWork.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.sptp.backend.artwork.repository;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.persistence.*;

@Entity
@Getter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ArtWork {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "art_work_id")
private Long id;
}
35 changes: 35 additions & 0 deletions src/main/java/com/sptp/backend/chat_room/repository/ChatRoom.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.sptp.backend.chat_room.repository;

import com.sptp.backend.artwork.repository.ArtWork;
import com.sptp.backend.member.repository.Member;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.persistence.*;

@Entity
@Getter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ChatRoom {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "chat_room_id")
private Long id;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "artist_id")
private Member artist;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "collector_id")
private Member collector;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "art_work_id")
private ArtWork artWork;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.sptp.backend.chat_room.repository;

import org.springframework.data.jpa.repository.JpaRepository;

public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
}
29 changes: 29 additions & 0 deletions src/main/java/com/sptp/backend/common/config/WebSocketConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.sptp.backend.common.config;

import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.simp.config.MessageBrokerRegistry;
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;

@Configuration
@EnableWebSocketMessageBroker
public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {

@Override
public void configureMessageBroker(MessageBrokerRegistry registry) {
// ์ „์†ก์ž๊ฐ€ '/app/**' ๊ฒฝ๋กœ๋กœ ๋ฉ”์„ธ์ง€ ์ „์†ก
registry.setApplicationDestinationPrefixes("/app");

// '/queue/**' or '/topic/**' ๊ฒฝ๋กœ๋กœ ์†ก์‹ ๋˜์—ˆ์„ ๋•Œ, ์Šคํ”„๋ง ๋‚ด์žฅ์˜ simplebroker๊ฐ€ ๋ฉ”์„ธ์ง€ ์ฒ˜๋ฆฌ
// queue๋Š” 1:1, topic์€ 1:n ๊ด€๊ณ„ ์‹œ ๊ด€์Šต์ ์œผ๋กœ ์‚ฌ์šฉ
registry.enableSimpleBroker("/queue", "/topic");
}

@Override
public void registerStompEndpoints(StompEndpointRegistry registry) {
registry.addEndpoint("/ws-connection")
.setAllowedOrigins("*")
.withSockJS(); // websocket ๋ฏธ์ง€์› ๋ธŒ๋ผ์šฐ์ €๋ฅผ ์œ„ํ•ด ์ถ”๊ฐ€
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ public enum ErrorCode {

//ํ† ํฐ ์˜ˆ์™ธ
TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "ํ† ํฐ์ด ๋งŒ๋ฃŒ๋˜์—ˆ์Šต๋‹ˆ๋‹ค."),
TOKEN_INVALID(HttpStatus.NOT_FOUND, "ํ† ํฐ์ด ์œ ํšจํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค.");
TOKEN_INVALID(HttpStatus.NOT_FOUND, "ํ† ํฐ์ด ์œ ํšจํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค."),

//์ฑ„ํŒ… ์˜ˆ์™ธ
NOT_FOUND_CHAT_ROOM(HttpStatus.NOT_FOUND, "์กด์žฌํ•˜์ง€ ์•Š๋Š” ์ฑ„ํŒ…๋ฐฉ์ž…๋‹ˆ๋‹ค.");

private final HttpStatus httpStatus;
private final String detail;
Expand Down
35 changes: 35 additions & 0 deletions src/main/java/com/sptp/backend/message/repository/Message.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.sptp.backend.message.repository;

import com.sptp.backend.chat_room.repository.ChatRoom;
import com.sptp.backend.member.repository.Member;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.persistence.*;
import java.time.LocalDateTime;

@Entity
@Getter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class Message {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "message_id")
private Long id;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "sender_id")
private Member sender;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "artist_id")
Copy link
Member

@ChooSeoyeon ChooSeoyeon Jan 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

name์„ chat_room_id๊ฐ€ ์•„๋‹ˆ๋ผ artist_id๋กœ ํ•˜์‹  ์ด์œ ๊ฐ€ ์žˆ์„๊นŒ์—ฌ?

private ChatRoom chatRoom;

private String message;
// private LocalDateTime sendTime;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.sptp.backend.message.repository;

import org.springframework.data.jpa.repository.JpaRepository;

public interface MessageRepository extends JpaRepository<Message, Long> {
}
41 changes: 41 additions & 0 deletions src/main/java/com/sptp/backend/message/service/MessageService.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.sptp.backend.message.service;

import com.sptp.backend.chat_room.repository.ChatRoom;
import com.sptp.backend.chat_room.repository.ChatRoomRepository;
import com.sptp.backend.common.exception.CustomException;
import com.sptp.backend.common.exception.ErrorCode;
import com.sptp.backend.member.repository.Member;
import com.sptp.backend.member.repository.MemberRepository;
import com.sptp.backend.message.repository.Message;
import com.sptp.backend.message.repository.MessageRepository;
import com.sptp.backend.message.web.dto.MessageRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

@Service
@Slf4j
@RequiredArgsConstructor
public class MessageService {

private final MessageRepository messageRepository;
private final ChatRoomRepository chatRoomRepository;
private final MemberRepository memberRepository;

public void saveMessage(Long loginMemberId, MessageRequest messageRequest) {

Member sender = memberRepository.findById(loginMemberId)
.orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_MEMBER));

ChatRoom chatRoom = chatRoomRepository.findById(messageRequest.getChatRoomId())
.orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_CHAT_ROOM));

Message message = Message.builder()
.sender(sender)
.chatRoom(chatRoom)
.message(messageRequest.getMessage())
.build();

messageRepository.save(message);
}
}
29 changes: 29 additions & 0 deletions src/main/java/com/sptp/backend/message/web/MessageController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.sptp.backend.message.web;

import com.sptp.backend.jwt.service.dto.CustomUserDetails;
import com.sptp.backend.message.service.MessageService;
import com.sptp.backend.message.web.dto.MessageRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.messaging.handler.annotation.MessageMapping;
import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.RestController;

import javax.validation.Valid;

@Slf4j
@RestController
@RequiredArgsConstructor
public class MessageController {

private final MessageService messageService;
private final SimpMessagingTemplate simpMessagingTemplate;

@MessageMapping("/send")
public void chat(@Valid MessageRequest messageRequest, @AuthenticationPrincipal CustomUserDetails userDetails) {
messageService.saveMessage(userDetails.getMember().getId(), messageRequest);
simpMessagingTemplate.convertAndSend("/queue/chat-rooms/" + messageRequest.getChatRoomId(),
messageRequest.getMessage());
}
}
20 changes: 20 additions & 0 deletions src/main/java/com/sptp/backend/message/web/dto/MessageRequest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.sptp.backend.message.web.dto;

import lombok.*;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class MessageRequest {

@NotNull(message = "์ฑ„ํŒ…๋ฐฉ ๊ณ ์œ  ๋ฒˆํ˜ธ๋Š” ํ•„์ˆ˜์ž…๋‹ˆ๋‹ค.")
private Long chatRoomId;

@NotBlank(message = "์ฑ„ํŒ… ๋ฉ”์„ธ์ง€๋ฅผ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.")
private String message;
}
135 changes: 135 additions & 0 deletions src/test/java/com/sptp/backend/message/service/MessageServiceTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
package com.sptp.backend.message.service;

import com.sptp.backend.artwork.repository.ArtWork;
import com.sptp.backend.chat_room.repository.ChatRoom;
import com.sptp.backend.chat_room.repository.ChatRoomRepository;
import com.sptp.backend.common.exception.CustomException;
import com.sptp.backend.common.exception.ErrorCode;
import com.sptp.backend.member.repository.Member;
import com.sptp.backend.member.repository.MemberRepository;
import com.sptp.backend.message.repository.Message;
import com.sptp.backend.message.repository.MessageRepository;
import com.sptp.backend.message.web.dto.MessageRequest;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;

import java.util.Optional;

import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;

@ExtendWith(MockitoExtension.class)
class MessageServiceTest {

@InjectMocks
MessageService messageService;

@Mock
ChatRoomRepository chatRoomRepository;

@Mock
MemberRepository memberRepository;

@Mock
MessageRepository messageRepository;


@Nested
class saveMessageTest {
long senderId = 1L;
long receiverId = 2L;
long artWorkId = 4L;
long chatRoomId = 4L;
Member sender;
Member receiver;
ArtWork artWork;
ChatRoom chatRoom;
MessageRequest messageRequest;

@BeforeEach
void init() {
sender = Member.builder()
.id(senderId)
.userId("sender")
.password("12345678")
.build();

receiver = Member.builder()
.id(receiverId)
.userId("receiver")
.password("12345678")
.build();

artWork = ArtWork.builder()
.id(artWorkId)
.build();

chatRoom = ChatRoom.builder()
.id(chatRoomId)
.artist(sender)
.collector(receiver)
.artWork(artWork)
.build();

messageRequest = MessageRequest.builder()
.chatRoomId(chatRoomId)
.message("test")
.build();
}

@Test
void success() {
//given
when(memberRepository.findById(senderId))
.thenReturn(Optional.of(sender));

when(chatRoomRepository.findById(chatRoomId))
.thenReturn(Optional.of(chatRoom));

when(messageRepository.save(any(Message.class)))
.thenReturn(Message.builder().build());

//when
//then
assertThatNoException().isThrownBy(() -> messageService.saveMessage(senderId, messageRequest));
}

@Test
void failByNotFoundMember() {
//given
when(memberRepository.findById(senderId))
.thenReturn(Optional.empty());

//when
//then
assertThatThrownBy(() -> messageService.saveMessage(senderId, messageRequest))
.isInstanceOf(CustomException.class)
.message().isEqualTo(ErrorCode.NOT_FOUND_MEMBER.getDetail());
}

@Test
void failByNotFoundChatRoom() {
//given
when(memberRepository.findById(senderId))
.thenReturn(Optional.of(sender));

when(chatRoomRepository.findById(chatRoomId))
.thenReturn(Optional.empty());

//when
//then
assertThatThrownBy(() -> messageService.saveMessage(senderId, messageRequest))
.isInstanceOf(CustomException.class)
.message().isEqualTo(ErrorCode.NOT_FOUND_CHAT_ROOM.getDetail());
}
}
}