develop 병합

.github/workflows/be-rolling-deploy.yml

@@ -3,7 +3,7 @@ name: Rolling Deployment
 on:
   push:
     branches:
-      - develop
+      - main
 
 jobs:
   deploy-prod1:

.github/workflows/cd-prod.yml

@@ -1,40 +0,0 @@
-name: cd-prod
-
-on:
-  push:
-    branches:
-      - develop
-
-jobs:
-  deploy-on-prod1:
-    runs-on: [self-hosted, runner-prod1]
-
-    steps:
-      - name: update properties if exists
-        run: |
-          if [ -n "${{ secrets.NEW_PROPERTIES }}" ]; then
-            cd ~/deploy
-            echo "${{ secrets.NEW_PROPERTIES }}" > new_properties
-            ./update-properties.sh
-          fi
-
-      - name: deploy
-        run: |
-          cd ~/deploy && ./deploy.sh
-
-  deploy-on-prod2:
-    runs-on: [self-hosted, runner-prod2]
-    needs: deploy-on-prod1
-
-    steps:
-      - name: update properties if exists
-        run: |
-          if [ -n "${{ secrets.NEW_PROPERTIES }}" ]; then
-            cd ~/deploy
-            echo "${{ secrets.NEW_PROPERTIES }}" > new_properties
-            ./update-properties.sh
-          fi
-
-      - name: deploy
-        run: |
-          cd ~/deploy && ./deploy.sh

backend/src/main/java/mouda/backend/chat/business/ChatService.java

@@ -14,7 +14,7 @@
 import mouda.backend.chat.domain.Chats;
 import mouda.backend.chat.implement.ChatRoomFinder;
 import mouda.backend.chat.implement.ChatWriter;
-import mouda.backend.chat.implement.sender.ChatNotificationSender;
+import mouda.backend.chat.implement.notification.ChatNotificationSender;
 import mouda.backend.chat.presentation.request.ChatCreateRequest;
 import mouda.backend.chat.presentation.request.DateTimeConfirmRequest;
 import mouda.backend.chat.presentation.request.LastReadChatRequest;

backend/src/main/java/mouda/backend/chat/domain/ChatNotificationEvent.java

@@ -0,0 +1,15 @@
+package mouda.backend.chat.domain;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+@Builder
+public class ChatNotificationEvent {
+
+	private final Long darakbangId;
+	private final ChatRoom chatRoom;
+	private final Chat appendedChat;
+}

backend/src/main/java/mouda/backend/chat/exception/ChatErrorMessage.java

@@ -11,8 +11,9 @@ public enum ChatErrorMessage {
 	BET_DARAKBANG_MEMBER_NOT_FOUND("참여하지 않은 안내면진다입니다."),
 	INVALID_CHATROOM_TYPE("잘못된 채팅 방 타입입니다."),
 	UNAUTHORIZED("권한이 없습니다."),
-
 	INVALID_DATE_TIME_FORMAT("날짜와 시간 형식이 올바르지 않습니다."),
+	CHATROOM_ALREADY_EXISTS("이미 존재하는 채팅방입니다."), // 새로 추가된 메시지
+
 	;
 
 	private final String message;

backend/src/main/java/mouda/backend/chat/implement/ChatRoomValidator.java

@@ -0,0 +1,23 @@
+package mouda.backend.chat.implement;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import mouda.backend.chat.domain.ChatRoomType;
+import mouda.backend.chat.exception.ChatErrorMessage;
+import mouda.backend.chat.exception.ChatException;
+import mouda.backend.chat.infrastructure.ChatRoomRepository;
+
+@Component
+@RequiredArgsConstructor
+public class ChatRoomValidator {
+
+	private final ChatRoomRepository chatRoomRepository;
+
+	public void validateAlreadyExists(long targetId, ChatRoomType chatRoomType) {
+		if (chatRoomRepository.existsByTargetIdAndType(targetId, chatRoomType)) {
+			throw new ChatException(HttpStatus.BAD_REQUEST, ChatErrorMessage.CHATROOM_ALREADY_EXISTS);
+		}
+	}
+}

backend/src/main/java/mouda/backend/chat/implement/ChatRoomWriter.java

@@ -12,8 +12,11 @@
 public class ChatRoomWriter {
 
 	private final ChatRoomRepository chatRoomRepository;
+	private final ChatRoomValidator chatRoomValidator;
 
 	public long append(long targetId, long darakbangId, ChatRoomType chatRoomType) {
+		chatRoomValidator.validateAlreadyExists(targetId, chatRoomType);
+
 		ChatRoomEntity chatRoomEntity = ChatRoomEntity.builder()
 			.targetId(targetId)
 			.darakbangId(darakbangId)

backend/src/main/java/mouda/backend/chat/implement/sender/ChatNotificationSender.java → backend/src/main/java/mouda/backend/chat/implement/notification/ChatNotificationEventHandler.java

@@ -1,16 +1,20 @@
-package mouda.backend.chat.implement.sender;
+package mouda.backend.chat.implement.notification;
 
 import java.util.List;
 
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import mouda.backend.bet.domain.Bet;
 import mouda.backend.bet.implement.BetFinder;
 import mouda.backend.chat.domain.Chat;
+import mouda.backend.chat.domain.ChatNotificationEvent;
 import mouda.backend.chat.domain.ChatRoom;
 import mouda.backend.chat.domain.ChatRoomType;
 import mouda.backend.chat.entity.ChatType;
@@ -20,82 +24,93 @@
 import mouda.backend.darakbang.implement.DarakbangFinder;
 import mouda.backend.moim.domain.Moim;
 import mouda.backend.moim.implement.finder.MoimFinder;
-import mouda.backend.notification.domain.NotificationEvent;
+import mouda.backend.notification.domain.NotificationPayload;
 import mouda.backend.notification.domain.NotificationType;
 import mouda.backend.notification.domain.Recipient;
+import mouda.backend.notification.implement.NotificationProcessor;
 
 @Component
-@EnableConfigurationProperties(UrlConfig.class)
 @RequiredArgsConstructor
-public class ChatNotificationSender {
+public class ChatNotificationEventHandler {
 
 	private final UrlConfig urlConfig;
-	private final ChatRecipientFinder chatRecipientFinder;
-	private final ApplicationEventPublisher eventPublisher;
 	private final MoimFinder moimFinder;
 	private final BetFinder betFinder;
 	private final DarakbangFinder darakbangFinder;
+	private final ChatRecipientFinder chatRecipientFinder;
+	private final NotificationProcessor notificationProcessor;
 
+	@Async
+	@Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW)
+	@TransactionalEventListener(classes = ChatNotificationEvent.class, phase = TransactionPhase.AFTER_COMMIT)
 	public void sendChatNotification(
-		long darakbangId, ChatRoom chatRoom, Chat appendedChat
+		ChatNotificationEvent chatNotificationEvent
 	) {
+		long darakbangId = chatNotificationEvent.getDarakbangId();
+		ChatRoom chatRoom = chatNotificationEvent.getChatRoom();
+		Chat appendedChat = chatNotificationEvent.getAppendedChat();
+
 		ChatRoomType chatRoomType = chatRoom.getType();
 		long chatRoomId = chatRoom.getId();
 
 		if (chatRoomType == ChatRoomType.BET) {
 			Bet bet = betFinder.find(darakbangId, chatRoom.getTargetId());
-			sendBetNotification(bet, appendedChat, chatRoomId);
+			handleBetNotification(bet, appendedChat, chatRoomId);
 			return;
 		}
 
 		Moim moim = moimFinder.read(chatRoom.getTargetId(), darakbangId);
-		sendMoimNotification(moim, appendedChat, chatRoomId);
+		handleMoimNotification(moim, appendedChat, chatRoomId);
 	}
 
-	private void sendMoimNotification(
+	private void handleMoimNotification(
 		Moim moim, Chat chat, long chatRoomId
 	) {
 		List<Recipient> recipients = chatRecipientFinder.getMoimChatNotificationRecipients(moim.getId(),
 			chat.getAuthor());
 		long darakbangId = moim.getDarakbangId();
 
-		publishEvent(darakbangId, chatRoomId, moim.getTitle(), chat, recipients);
+		processNotification(darakbangId, chatRoomId, moim.getTitle(), chat, recipients);
 	}
 
-	private void sendBetNotification(Bet bet, Chat chat, long chatRoomId) {
+	private void handleBetNotification(Bet bet, Chat chat, long chatRoomId) {
 		List<Recipient> recipients = chatRecipientFinder.getBetChatNotificationRecipients(bet.getId(),
 			chat.getAuthor());
 		long darakbangId = bet.getDarakbangId();
 
-		publishEvent(darakbangId, chatRoomId, bet.getTitle(), chat, recipients);
+		processNotification(darakbangId, chatRoomId, bet.getTitle(), chat, recipients);
 	}
 
-	private void publishEvent(long darakbangId, long chatRoomId, String title, Chat chat, List<Recipient> recipients) {
+	private void processNotification(
+		long darakbangId, long chatRoomId, String title, Chat chat, List<Recipient> recipients
+	) {
 		Darakbang darakbang = darakbangFinder.findById(darakbangId);
-		ChatNotification chatNotification = ChatNotification.create(darakbang.getName(), title, chat);
+		ChatNotificationMessage chatNotificationMessage = ChatNotificationMessage.create(darakbang.getName(), title,
+			chat);
 
-		NotificationEvent notificationEvent = NotificationEvent.chatEvent(
-			chatNotification.getType(),
+		NotificationPayload payload = NotificationPayload.createChatPayload(
+			chatNotificationMessage.getType(),
 			darakbang.getName(),
-			chatNotification.getMessage(),
+			chatNotificationMessage.getMessage(),
 			urlConfig.getChatRoomUrl(darakbangId, chatRoomId),
 			recipients,
 			darakbangId,
 			chatRoomId
 		);
 
-		eventPublisher.publishEvent(notificationEvent);
+		notificationProcessor.process(payload);
 	}
 
 	@Getter
 	@RequiredArgsConstructor
-	static class ChatNotification {
+	static class ChatNotificationMessage {
 
 		private final String title;
 		private final NotificationType type;
 		private final String message;
 
-		public static ChatNotification create(String darakbangName, String title, Chat chat) {
+		public static ChatNotificationMessage create(String darakbangName, String title,
+			Chat chat) {
 			ChatType chatType = chat.getChatType();
 			String content = chat.getContent();
 
@@ -114,16 +129,19 @@ public static ChatNotification create(String darakbangName, String title, Chat c
 			return basicChat(title, message);
 		}
 
-		private static ChatNotification placeConfirmChat(String title, String message) {
-			return new ChatNotification(title, NotificationType.MOIM_PLACE_CONFIRMED, message);
+		private static ChatNotificationMessage placeConfirmChat(String title, String message) {
+			return new ChatNotificationMessage(title, NotificationType.MOIM_PLACE_CONFIRMED,
+				message);
 		}
 
-		private static ChatNotification dateTimeConfirmChat(String title, String message) {
-			return new ChatNotification(title, NotificationType.MOIM_TIME_CONFIRMED, message);
+		private static ChatNotificationMessage dateTimeConfirmChat(String title,
+			String message) {
+			return new ChatNotificationMessage(title, NotificationType.MOIM_TIME_CONFIRMED,
+				message);
 		}
 
-		private static ChatNotification basicChat(String title, String message) {
-			return new ChatNotification(title, NotificationType.NEW_CHAT, message);
+		private static ChatNotificationMessage basicChat(String title, String message) {
+			return new ChatNotificationMessage(title, NotificationType.NEW_CHAT, message);
 		}
 	}
 }

backend/src/main/java/mouda/backend/chat/implement/notification/ChatNotificationSender.java

@@ -0,0 +1,26 @@
+package mouda.backend.chat.implement.notification;
+
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import mouda.backend.chat.domain.Chat;
+import mouda.backend.chat.domain.ChatNotificationEvent;
+import mouda.backend.chat.domain.ChatRoom;
+
+@Component
+@RequiredArgsConstructor
+public class ChatNotificationSender {
+
+	private final ApplicationEventPublisher eventPublisher;
+
+	public void sendChatNotification(long darakbangId, ChatRoom chatRoom, Chat appendedChat) {
+		ChatNotificationEvent event = ChatNotificationEvent.builder()
+			.darakbangId(darakbangId)
+			.chatRoom(chatRoom)
+			.appendedChat(appendedChat)
+			.build();
+
+		eventPublisher.publishEvent(event);
+	}
+}

backend/src/main/java/mouda/backend/chat/implement/sender/ChatRecipientFinder.java → backend/src/main/java/mouda/backend/chat/implement/notification/ChatRecipientFinder.java

@@ -1,4 +1,4 @@
-package mouda.backend.chat.implement.sender;
+package mouda.backend.chat.implement.notification;
 
 import java.util.List;
 import java.util.stream.Stream;
@@ -48,25 +48,4 @@ public List<Recipient> getNotificationRecipients(Stream<DarakbangMember> memberS
 				.build())
 			.toList();
 	}
-
-	// todo: 구버전 채팅 기능 삭제시 같이 지워주세요.
-	public List<Recipient> getMoimChatNotificationRecipients(long moimId, DarakbangMember sender) {
-		List<Chamyo> chamyos = chamyoRepository.findAllByMoimId(moimId);
-
-		Stream<DarakbangMember> darakbangMemberStream = chamyos.stream()
-			.map(Chamyo::getDarakbangMember);
-
-		return getNotificationRecipients(darakbangMemberStream, sender);
-	}
-
-	// todo: 구버전 채팅 기능 삭제시 같이 지워주세요.
-	public List<Recipient> getNotificationRecipients(Stream<DarakbangMember> memberStream, DarakbangMember sender) {
-		return memberStream
-			.filter(darakbangMember -> darakbangMember.isNotSameMemberWith(sender))
-			.map(darakbangMember -> Recipient.builder()
-				.memberId(darakbangMember.getMemberId())
-				.darakbangMemberId(darakbangMember.getId())
-				.build())
-			.toList();
-	}
 }

backend/src/main/java/mouda/backend/chat/infrastructure/ChatRoomRepository.java

@@ -11,4 +11,6 @@ public interface ChatRoomRepository extends JpaRepository<ChatRoomEntity, Long>
 	Optional<ChatRoomEntity> findByIdAndDarakbangId(Long chatRoomId, long darakbangId);
 
 	Optional<ChatRoomEntity> findByTargetIdAndType(long targetId, ChatRoomType chatRoomType);
+
+	boolean existsByTargetIdAndType(long targetId, ChatRoomType chatRoomType);
 }

backend/src/main/java/mouda/backend/moim/business/ChamyoService.java

@@ -12,7 +12,7 @@
 import mouda.backend.moim.domain.MoimRole;
 import mouda.backend.moim.implement.finder.ChamyoFinder;
 import mouda.backend.moim.implement.finder.MoimFinder;
-import mouda.backend.moim.implement.sender.ChamyoNotificationSender;
+import mouda.backend.moim.implement.notificiation.MoimRelatedNotificationSender;
 import mouda.backend.moim.implement.writer.ChamyoWriter;
 import mouda.backend.moim.implement.writer.MoimWriter;
 import mouda.backend.moim.presentation.response.chamyo.ChamyoFindAllResponses;
@@ -28,7 +28,7 @@ public class ChamyoService {
 	private final MoimWriter moimWriter;
 	private final ChamyoFinder chamyoFinder;
 	private final ChamyoWriter chamyoWriter;
-	private final ChamyoNotificationSender chamyoNotificationSender;
+	private final MoimRelatedNotificationSender notificationSender;
 
 	@Transactional(readOnly = true)
 	public MoimRoleFindResponse findMoimRole(Long darakbangId, Long moimId, DarakbangMember darakbangMember) {
@@ -51,14 +51,14 @@ public void chamyoMoim(Long darakbangId, Long moimId, DarakbangMember darakbangM
 		Chamyo chamyo = chamyoWriter.saveAsMoimee(moim, darakbangMember);
 		moimWriter.updateMoimStatusIfFull(moim);
 
-		chamyoNotificationSender.sendChamyoNotification(moimId, darakbangMember, NotificationType.NEW_MOIMEE_JOINED);
+		notificationSender.sendChamyoNotification(chamyo, NotificationType.NEW_MOIMEE_JOINED);
 	}
 
 	public void cancelChamyo(Long darakbangId, Long moimId, DarakbangMember darakbangMember) {
 		Moim moim = moimFinder.read(moimId, darakbangId);
 		Chamyo chamyo = chamyoFinder.read(moim, darakbangMember);
 		chamyoWriter.delete(chamyo);
 
-		chamyoNotificationSender.sendChamyoNotification(moimId, darakbangMember, NotificationType.MOIMEE_LEFT);
+		notificationSender.sendChamyoNotification(chamyo, NotificationType.MOIMEE_LEFT);
 	}
 }