Skip to content

[Refactor/#231] 종원 서버 1차 리팩토링 #237

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
BAEK0111 wants to merge 5 commits into
base: develop
Choose a base branch
from
+616 −567
Open

[Refactor/#231] 종원 서버 1차 리팩토링 #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a7df9d
refactor/#231
BAEK0111 Jan 1, 2026
e57359d
refactor/#231
BAEK0111 Jan 1, 2026
d4f4ddc
refactor/#231
BAEK0111 Jan 1, 2026
2e82dc5
refactor/#231
BAEK0111 Jan 1, 2026
d7a34fa
refactor/#231
BAEK0111 Jan 18, 2026
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
37 changes: 0 additions & 37 deletions src/main/java/com/assu/server/domain/certification/config/CertifyWebSocketConfig.java
View file
Open in desktop

This file was deleted.

93 changes: 0 additions & 93 deletions src/main/java/com/assu/server/domain/chat/config/WebSocketConfig.java
View file
Open in desktop

This file was deleted.

94 changes: 19 additions & 75 deletions src/main/java/com/assu/server/domain/chat/controller/ChatController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
package com.assu.server.domain.chat.controller;

import com.assu.server.domain.chat.dto.*;
import com.assu.server.domain.chat.repository.MessageRepository;
import com.assu.server.domain.chat.redis.RedisPublisher;
import com.assu.server.domain.chat.service.BlockService;
import com.assu.server.domain.chat.service.ChatService;
import com.assu.server.domain.member.repository.MemberRepository;
import com.assu.server.domain.notification.service.NotificationCommandService;
import com.assu.server.global.apiPayload.BaseResponse;
import com.assu.server.global.apiPayload.code.status.SuccessStatus;
import com.assu.server.global.util.PresenceTracker;
import com.assu.server.global.util.PrincipalDetails;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.messaging.handler.annotation.MessageMapping;
import org.springframework.messaging.handler.annotation.Payload;
import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;
import com.assu.server.global.apiPayload.BaseResponse;
import org.springframework.messaging.simp.SimpMessagingTemplate;

import java.util.List;

Expand All @@ -28,16 +25,13 @@
public class ChatController {
private final ChatService chatService;
private final SimpMessagingTemplate simpMessagingTemplate;
// private final PresenceTracker presenceTracker;
// private final MessageRepository messageRepository;
// private final MemberRepository memberRepository;
private final BlockService blockService;
// private final NotificationCommandService notificationCommandService;
private final RedisPublisher redisPublisher;

@Operation(
summary = "채팅방을 생성하는 API",
description = "# [v1.0 (2025-08-05)](https://clumsy-seeder-416.notion.site/2241197c19ed80c38871ec77deced713) 채팅방을 생성합니다.\n"+
"- storeId: Request Body, Long\n" +
"- adminId: Request Body, Long\n" +
"- partnerId: Request Body, Long\n"
)
@PostMapping("/rooms")
Expand All @@ -53,7 +47,7 @@ public BaseResponse<ChatResponseDTO.CreateChatRoomResponseDTO> createChatRoom(
description = "# [v1.0 (2025-08-05)](https://clumsy-seeder-416.notion.site/API-1d71197c19ed819f8f70fb437e9ce62b?p=2241197c19ed816993c3c5ae17d6f099&pm=s) 채팅방 목록을 조회합니다.\n"
)
@GetMapping("/rooms")
public BaseResponse<List<com.assu.server.domain.chat.dto.ChatRoomListResultDTO>> getChatRoomList(
public BaseResponse<List<ChatRoomListResultDTO>> getChatRoomList(
@AuthenticationPrincipal PrincipalDetails pd
) {
Long memberId = pd.getMember().getId();
Expand All @@ -66,70 +60,21 @@ public BaseResponse<List<com.assu.server.domain.chat.dto.ChatRoomListResultDTO>>
"- roomId: Request Body, Long\n" +
"- senderId: Request Body, Long\n"+
"- receiverId: Request Body, Long\n" +
"- message: Request Body, String\n"
"- message: Request Body, String\n" +
"- unreadCountForSender: Request Body, int\n"
)
@MessageMapping("/send")
public void handleMessage(@Payload ChatRequestDTO.ChatMessageRequestDTO request) {

// 1. 서비스 호출 (모든 비즈니스 로직 위임)
// 1. 서비스 호출
MessageHandlingResult result = chatService.handleMessage(request);

// 2. [항상 전송] 채팅방 메시지 전송
simpMessagingTemplate.convertAndSend("/sub/chat/" + request.getRoomId(), result.sendMessageResponseDTO());

redisPublisher.publishChatMessage(request.roomId(), result.sendMessageResponseDTO());
// 3. [조건부 전송] 채팅방 목록 업데이트 전송
if (result.hasRoomUpdates()) {
simpMessagingTemplate.convertAndSendToUser(
result.receiverId().toString(),
"/queue/updates",
result.chatRoomUpdateDTO()
);
redisPublisher.publishChatRoomUpdate(result.receiverId(), result.chatRoomUpdateDTO());
}
}

// @Transactional
// @MessageMapping("/send")
// public void handleMessage(@Payload ChatRequestDTO.ChatMessageRequestDTO request) {
// // 먼저 접속 여부 확인 후 unreadCount 계산
// boolean receiverInRoom = presenceTracker.isInRoom(request.getReceiverId(), request.getRoomId());
// int unreadForSender = receiverInRoom ? 0 : 1;
// request.setUnreadCountForSender(unreadForSender);
//
// ChatResponseDTO.SendMessageResponseDTO saved = chatService.handleMessage(request);
// simpMessagingTemplate.convertAndSend("/sub/chat/" + request.getRoomId(), saved);
//
// if (!receiverInRoom) {
// Long totalUnreadCount = messageRepository.countUnreadMessagesByRoomAndReceiver(
// request.getRoomId(),
// request.getReceiverId()
// );
//
// ChatRoomUpdateDTO updateDTO = ChatRoomUpdateDTO.builder()
// .roomId(request.getRoomId())
// .lastMessage(saved.message())
// .lastMessageTime(saved.sentAt())
// .unreadCount(totalUnreadCount)
// .build();
//
// simpMessagingTemplate.convertAndSendToUser(
// request.getReceiverId().toString(),
// "/queue/updates",
// updateDTO
// );
// Member sender = memberRepository.findById(request.getSenderId()).orElse(null);
// String senderName;
// if (sender.getRole()== UserRole.ADMIN) {
// senderName = sender.getAdminProfile().getName();
// } else {
// senderName = sender.getPartnerProfile().getName();
// }
//
// log.info(">>>>>>>>메시지 전송은 될걸");
// notificationCommandService.sendChat(request.getReceiverId(), request.getRoomId(), senderName, request.getMessage());
// log.info(">>>>>>>>알림이 가나");
// }
// }

@Operation(
summary = "메시지 읽음 처리 API",
description = "# [v1.0 (2025-08-05)](https://clumsy-seeder-416.notion.site/2241197c19ed800eab45c35073761c97?v=2241197c19ed8134b64f000cc26c5d31&p=2241197c19ed81ffa771cb18ab157b54&pm=s) 메시지를 읽음처리합니다.\n"+
Expand Down Expand Up @@ -178,23 +123,23 @@ public BaseResponse<ChatResponseDTO.LeaveChattingRoomResponseDTO> leaveChattingR
@Operation(
summary = "상대방을 차단하는 API" +
"상대방을 차단합니다. 메시지를 주고받을 수 없습니다.",
description = "# [v1.0 (2025-09-25)]() 상대방을 차단합니다.\n"+
"- memberId: Request Body, Long\n"
description = "# [v1.0 (2025-09-25)](https://clumsy-seeder-416.notion.site/2db1197c19ed804ba3dbf57ba36860c4) 상대방을 차단합니다.\n"+
"- opponentId: Request Body, Long\n"
)
@PostMapping("/block")
public BaseResponse<BlockResponseDTO.BlockMemberDTO> block(
@AuthenticationPrincipal PrincipalDetails pd,
@RequestBody BlockRequestDTO.BlockMemberRequestDTO request
) {
Long memberId = pd.getMember().getId();
return BaseResponse.onSuccess(SuccessStatus._OK, blockService.blockMember(memberId, request.getOpponentId()));
return BaseResponse.onSuccess(SuccessStatus._OK, blockService.blockMember(memberId, request.opponentId()));
}

@Operation(
summary = "상대방을 차단했는지 확인하는 API" +
"상대방을 차단했는지 여부를 알려줍니다.",
description = "# [v1.0 (2025-09-25)]() 상대방을 차단했는지 검사합니다.\n"+
"- memberId: Request Body, Long\n"
description = "# [v1.0 (2025-09-25)](https://clumsy-seeder-416.notion.site/2db1197c19ed80769521eab9660ac53f) 상대방을 차단했는지 검사합니다.\n"+
"- opponentId: Request Body, Long\n"
)
@GetMapping("/check/block/{opponentId}")
public BaseResponse<BlockResponseDTO.CheckBlockMemberDTO> checkBlock(
Expand All @@ -208,8 +153,8 @@ public BaseResponse<BlockResponseDTO.CheckBlockMemberDTO> checkBlock(
@Operation(
summary = "상대방을 차단 해제하는 API" +
"상대방을 차단해제합니다. 앞으로 다시 메시지를 주고받을 수 있습니다.",
description = "# [v1.0 (2025-09-25)]() 상대방을 차단 해제합니다.\n"+
"- memberId: Request Body, Long\n"
description = "# [v1.0 (2025-09-25)](https://clumsy-seeder-416.notion.site/2db1197c19ed80b6a93fcbe277fc934c?pvs=74) 상대방을 차단 해제합니다.\n"+
"- opponentId: Request Body, Long\n"
)
@DeleteMapping("/unblock")
public BaseResponse<BlockResponseDTO.BlockMemberDTO> unblock(
Expand All @@ -223,8 +168,7 @@ public BaseResponse<BlockResponseDTO.BlockMemberDTO> unblock(
@Operation(
summary = "차단한 대상을 조회합니다." +
"본인이 차단한 대상을 모두 조회합니다.",
description = "# [v1.0 (2025-09-25)]() 차단한 대상을 조회합니다..\n"+
"- memberId: Request Body, Long\n"
description = "# [v1.0 (2025-09-25)](https://clumsy-seeder-416.notion.site/2db1197c19ed8000b047d9857bcbbb2f) 차단한 대상을 조회합니다..\n"
)
@GetMapping("/blockList")
public BaseResponse<List<BlockResponseDTO.BlockMemberDTO>> getBlockList(
Expand Down
51 changes: 0 additions & 51 deletions src/main/java/com/assu/server/domain/chat/converter/BlockConverter.java
View file
Open in desktop

This file was deleted.

Loading