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.

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

Jump to bottom

[BE] release v1.0.0 -> develop 병합 #729

Merged
merged 6 commits into from
Nov 4, 2024
Merged

[BE] release v1.0.0 -> develop 병합 #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8cd3bf7
hotfix: test hotfix
takoyakimchi Oct 23, 2024
6b278aa
[BE] fix: 외부 메시지 큐(RabbitMQ) 도입, 분산 환경 채팅 안 되던 버그 수정 (#711)
takoyakimchi Oct 23, 2024
847ef42
[BE] feat: 채팅 알림에 모임 정보(모임 사진, 모임 이름) 추가 (#713)
takoyakimchi Oct 23, 2024
efcc423
fix: 컨플릭트 해결
takoyakimchi Oct 23, 2024
bc5201c
fix: in-memory 큐 쓰던 것을 rabbitmq로 수정
takoyakimchi Oct 23, 2024
b8a96c4
Merge branch 'release/backend' into develop
takoyakimchi Nov 4, 2024
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
1 change: 0 additions & 1 deletion backend/src/main/java/com/happy/friendogly/auth/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
@RestController
@RequestMapping("/auth")
public class AuthController {

// TODO: KakaoMemberService와 AuthService 통합
private final KakaoMemberService kakaoMemberService;
private final AuthService authService;
Expand Down
15 changes: 8 additions & 7 deletions backend/src/main/java/com/happy/friendogly/chat/service/ChatCommandService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@ public class ChatCommandService {
private static final String EMPTY_CONTENT = "";

private final MemberRepository memberRepository;
private final ClubRepository clubRepository;
private final ChatRoomRepository chatRoomRepository;
private final ChatMessageRepository chatMessageRepository;
private final ClubRepository clubRepository;
private final NotificationService notificationService;
private final ChatTemplate chatTemplate;
private final ChatTemplate template;

public ChatCommandService(
MemberRepository memberRepository,
ClubRepository clubRepository,
ChatRoomRepository chatRoomRepository,
ChatMessageRepository chatMessageRepository,
ClubRepository clubRepository,
NotificationService notificationService,
ChatTemplate chatTemplate
ChatTemplate template
) {
this.memberRepository = memberRepository;
this.clubRepository = clubRepository;
this.chatRoomRepository = chatRoomRepository;
this.chatMessageRepository = chatMessageRepository;
this.clubRepository = clubRepository;
this.notificationService = notificationService;
this.chatTemplate = chatTemplate;
this.template = template;
}

public void sendEnter(Long senderMemberId, Long chatRoomId) {
Expand Down Expand Up @@ -78,8 +78,9 @@ private void sendAndSave(MessageType messageType, String content, ChatRoom chatR
ChatMessageSocketResponse chat = new ChatMessageSocketResponse(
messageType, content, senderMember, LocalDateTime.now());
Club club = clubRepository.getByChatRoomId(chatRoom.getId());

notificationService.sendChatNotification(chatRoom.getId(), chat, club);
chatTemplate.convertAndSend(chatRoom.getId(), chat);
template.convertAndSend(chatRoom.getId(), chat);
chatMessageRepository.save(new ChatMessage(chatRoom, messageType, senderMember, content));
}
}
Loading