-
Notifications
You must be signed in to change notification settings - Fork 1
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
Feat/54 chatting #72
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
02807db
feat: ํ์ ์ํฐํฐ ๊ตฌํ
JunYoung-C 0779e03
feat: chatRoom, Message JPARepository ์์ ์ธํฐํ์ด์ค ๊ตฌํ
JunYoung-C 5d06fe6
style: ํจํค์ง๋ช
๋ณ๊ฒฝ
JunYoung-C 2fbe891
chore: websocket ์ค์
JunYoung-C de009ab
feat: ์ฑํ
๋ฐฉ์ด ์กด์ฌํ์ง ์๋ ๊ฒฝ์ฐ ์์ธ ์ถ๊ฐ
JunYoung-C e12d9c8
feat: ์ฑํ
๊ธฐ๋ฅ ๊ตฌํ
JunYoung-C 57f37e5
test: messageService ๋จ์ ํ
์คํธ
JunYoung-C 9f56c6e
chore: gitignore์ initDB ๋ฌด์ ์ค์
JunYoung-C d5a8306
feat: ์ฑํ
ํ
์คํธ์ฉ ๊ธฐ๋ฅ ๊ตฌํ
JunYoung-C 768cbd4
Revert "feat: ์ฑํ
ํ
์คํธ์ฉ ๊ธฐ๋ฅ ๊ตฌํ"
JunYoung-C 609f549
fix: ์๋ชป๋ ์ปฌ๋ผ๋ช
์์
JunYoung-C a80bd13
Merge branch 'develop' of https://github.com/Arrties/backend into feaโฆ
JunYoung-C e6fadb5
feat: delelop ๋ธ๋์น์ ๋ณ๊ฒฝ ์ฌํญ ๋ฐ์
JunYoung-C 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 |
---|---|---|
|
@@ -37,4 +37,7 @@ out/ | |
.vscode/ | ||
|
||
##### | ||
env.properties | ||
env.properties | ||
|
||
### ์ด๊ธฐ ๋ฐ์ดํฐ ### | ||
initDB.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
21 changes: 21 additions & 0 deletions
21
src/main/java/com/sptp/backend/artwork/repository/ArtWork.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,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
35
src/main/java/com/sptp/backend/chat_room/repository/ChatRoom.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,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; | ||
} |
6 changes: 6 additions & 0 deletions
6
src/main/java/com/sptp/backend/chat_room/repository/ChatRoomRepository.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,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
29
src/main/java/com/sptp/backend/common/config/WebSocketConfig.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,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 ๋ฏธ์ง์ ๋ธ๋ผ์ฐ์ ๋ฅผ ์ํด ์ถ๊ฐ | ||
} | ||
} |
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
35 changes: 35 additions & 0 deletions
35
src/main/java/com/sptp/backend/message/repository/Message.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,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") | ||
private ChatRoom chatRoom; | ||
|
||
private String message; | ||
// private LocalDateTime sendTime; | ||
} |
6 changes: 6 additions & 0 deletions
6
src/main/java/com/sptp/backend/message/repository/MessageRepository.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,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
41
src/main/java/com/sptp/backend/message/service/MessageService.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,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
29
src/main/java/com/sptp/backend/message/web/MessageController.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,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
20
src/main/java/com/sptp/backend/message/web/dto/MessageRequest.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,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
135
src/test/java/com/sptp/backend/message/service/MessageServiceTest.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,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()); | ||
} | ||
} | ||
} |
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.
name์ chat_room_id๊ฐ ์๋๋ผ artist_id๋ก ํ์ ์ด์ ๊ฐ ์์๊น์ฌ?