feat: 슬랙 이모지 호출 기능 다중 사용자 지원으로 개선 (#748)

khyojun · claude · web-flow · commit 724b8ceb8892 · 2025-10-11T23:18:46.000+09:00
* feat: 슬랙 이모지 호출 기능 다중 사용자 지원으로 개선 동일한 이모지로 여러 사용자를 호출할 수 있도록 기능을 확장했습니다. 주요 변경사항: - MakersUserSlackRepository: 사용자별 이모지 조회/삭제 메서드 추가 - MessageContext: 단일 사용자에서 다중 사용자 리스트로 변경 - SlackMessageService: 다중 사용자 멘션 처리 로직 구현 - SlackUtils: 다중 사용자 멘션 포매팅 유틸리티 메서드 추가 - DTO: userSlackId 파라미터 추가로 사용자별 관리 지원 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * refactor: 오타수정 * chore: 필요없는 테스트 제거 --------- Co-authored-by: Claude <noreply@anthropic.com>
diff --git a/main/src/main/java/org/sopt/makers/crew/main/entity/slack/MakersUserSlackRepository.java b/main/src/main/java/org/sopt/makers/crew/main/entity/slack/MakersUserSlackRepository.java
@@ -1,5 +1,6 @@
 package org.sopt.makers.crew.main.entity.slack;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,11 +10,16 @@
 
 public interface MakersUserSlackRepository extends JpaRepository<MakersUserSlack, Long> {
 
+	Optional<MakersUserSlack> findByCallEmojiAndUserSlackId(String callEmoji, String userSlackId);
+
 	@Query("select m from makers_user_slack m where m.callEmoji = :emoji")
-	Optional<MakersUserSlack> findByCallEmoji(@Param("emoji") String emoji);
+	List<MakersUserSlack> findByCallEmoji(@Param("emoji") String emoji);
 
 	@Modifying
 	void deleteByCallEmoji(String callEmoji);
 
-	boolean existsByCallEmoji(String callEmoji);
+	boolean existsByCallEmojiAndUserSlackId(String callEmoji, String userSlackId);
+
+	@Modifying
+	void deleteByCallEmojiAndUserSlackId(String callEmoji, String userSlackId);
 }
diff --git a/main/src/main/java/org/sopt/makers/crew/main/slack/MessageContext.java b/main/src/main/java/org/sopt/makers/crew/main/slack/MessageContext.java
@@ -1,5 +1,7 @@
 package org.sopt.makers.crew.main.slack;
 
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -9,9 +11,9 @@
 @Builder
 public class MessageContext {
 	private String callUser;
-	private String calledUser;
+	private List<String> calledUser;
 
-	public static MessageContext create(String user, String userSlackId) {
+	public static MessageContext create(String user, List<String> userSlackId) {
 		return MessageContext
 			.builder()
 			.callUser(user)
diff --git a/main/src/main/java/org/sopt/makers/crew/main/slack/SlackMessageService.java b/main/src/main/java/org/sopt/makers/crew/main/slack/SlackMessageService.java
@@ -1,5 +1,7 @@
 package org.sopt.makers.crew.main.slack;
 
+import java.util.List;
+
 import org.sopt.makers.crew.main.entity.slack.MakersUserSlack;
 import org.sopt.makers.crew.main.entity.slack.MakersUserSlackRepository;
 import org.sopt.makers.crew.main.entity.slack.SlackMessageTemplate;
@@ -31,31 +33,34 @@ public class SlackMessageService {
 
 	@Transactional
 	public void insertEvent(SlackEmojiEventDto dto) {
-		if (makersUserSlackRepository.existsByCallEmoji((dto.getCallEmoji())))
+		if (makersUserSlackRepository.existsByCallEmojiAndUserSlackId(dto.getCallEmoji(), dto.getUserSlackId()))
 			throw new IllegalArgumentException("Call Emoji already exists");
 
 		makersUserSlackRepository.save(dto.toEntity());
 	}
 
 	@Transactional
 	public void updateEvent(SlackUpdateEmojiEventDto dto) {
-		MakersUserSlack makersUserSlack = makersUserSlackRepository.findByCallEmoji(dto.getCallEmoji())
-			.orElseThrow(() -> new IllegalArgumentException("Invalid call emoji: " + dto.getCallEmoji()));
+		MakersUserSlack makersUserSlack = makersUserSlackRepository.findByCallEmojiAndUserSlackId(dto.getCallEmoji(),
+				dto.getUserSlackId())
+			.orElseThrow(() -> new IllegalArgumentException(
+				"Invalid call emoji or user slack Id : " + dto.getCallEmoji() + " " + dto.getUserSlackId()));
 
 		makersUserSlack.updateEmoji(dto.getUpdateCallEmoji());
 	}
 
 	@Transactional
 	public void deleteEvent(SlackDeleteEmojiEventDto dto) {
-		if (!makersUserSlackRepository.existsByCallEmoji((dto.getCallEmoji())))
+		if (!makersUserSlackRepository.existsByCallEmojiAndUserSlackId(dto.getCallEmoji(), dto.getUserSlackId()))
 			throw new IllegalArgumentException("Call Emoji not exists");
-		makersUserSlackRepository.deleteByCallEmoji(dto.getCallEmoji());
+
+		makersUserSlackRepository.deleteByCallEmojiAndUserSlackId(dto.getCallEmoji(), dto.getUserSlackId());
 	}
 
 	public void sendMention(MethodsClient client, ReactionAddedEvent event) {
 		String channel = event.getItem().getChannel();
 		String user = event.getUser();
-		MakersUserSlack slackUser = resolveSlackUser(event);
+		List<MakersUserSlack> slackUser = resolveSlackUser(event);
 
 		String sendMessage = messageBuild(slackUser, user);
 
@@ -76,22 +81,40 @@ public void sendMention(MethodsClient client, ReactionAddedEvent event) {
 		}
 	}
 
-	private MakersUserSlack resolveSlackUser(ReactionAddedEvent event) {
+	private List<MakersUserSlack> resolveSlackUser(ReactionAddedEvent event) {
 		String reaction = event.getReaction();
 
-		MakersUserSlack slackUser = makersUserSlackRepository.findByCallEmoji(reaction)
-			.orElseThrow(() -> new IllegalArgumentException("slack 전송 오류"));
+		List<MakersUserSlack> slackUser = makersUserSlackRepository.findByCallEmoji(reaction);
+
+		if (slackUser.isEmpty())
+			throw new IllegalArgumentException("Invalid reaction emoji : " + reaction);
+
 		return slackUser;
 	}
 
-	private String messageBuild(MakersUserSlack slackUser, String user) {
-		String slackTemplateCd = slackUser.getSlackTemplateCd();
+	private String messageBuild(List<MakersUserSlack> slackUsers, String user) {
+
+		String slackTemplateCd = extractTemplateCd(slackUsers);
 		SlackMessageTemplate slackMessageTemplate = slackMessageTemplateRepository.findByTemplateCd(slackTemplateCd)
 			.orElseThrow(() -> new IllegalArgumentException("해당 슬랙 메시지 템플릿이 존재하지 않습니다."));
 		SlackMessageBuilder slackMessageBuilder = selector.selectSlackMessageBuilder(slackTemplateCd);
 		String sendMessage = slackMessageBuilder.buildSlackMessage(slackMessageTemplate.getTemplateContent(),
-			MessageContext.create(user, slackUser.getUserSlackId()));
+			MessageContext.create(user, userIdList(slackUsers)));
 		return sendMessage;
 	}
 
+	private List<String> userIdList(List<MakersUserSlack> slackUsers) {
+		return slackUsers.stream().map(MakersUserSlack::getUserSlackId).toList();
+	}
+
+	private String extractTemplateCd(List<MakersUserSlack> slackUser) {
+		if (slackUser.size() > 1) {
+			return slackUser.stream()
+				.map(MakersUserSlack::getSlackTemplateCd)
+				.findFirst().orElseThrow(() -> new IllegalArgumentException("templateCd not found"));
+		}
+
+		return slackUser.get(0).getSlackTemplateCd();
+	}
+
 }
diff --git a/main/src/main/java/org/sopt/makers/crew/main/slack/SlackUtils.java b/main/src/main/java/org/sopt/makers/crew/main/slack/SlackUtils.java
@@ -1,8 +1,17 @@
 package org.sopt.makers.crew.main.slack;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class SlackUtils {
 
 	public static String mentionFormattingUser(String slackUserId) {
 		return String.format("<@%s>", slackUserId);
 	}
+
+	public static String mentionFormattingUsers(List<String> slackUserIds, String delimiter) {
+		return slackUserIds.stream()
+			.map(SlackUtils::mentionFormattingUser)
+			.collect(Collectors.joining(delimiter));
+	}
 }
diff --git a/main/src/main/java/org/sopt/makers/crew/main/slack/dto/SlackEmojiEventDto.java b/main/src/main/java/org/sopt/makers/crew/main/slack/dto/SlackEmojiEventDto.java
@@ -29,13 +29,15 @@ public MakersUserSlack toEntity() {
 	@AllArgsConstructor
 	public static class SlackUpdateEmojiEventDto {
 		private String callEmoji;
+		private String userSlackId;
 		private String updateCallEmoji;
 	}
 
 	@Getter
 	@Builder
 	@AllArgsConstructor
 	public static class SlackDeleteEmojiEventDto {
+		private String userSlackId;
 		private String callEmoji;
 	}
 
diff --git a/main/src/main/java/org/sopt/makers/crew/main/slack/strategy/CallMessageBuilder.java b/main/src/main/java/org/sopt/makers/crew/main/slack/strategy/CallMessageBuilder.java
@@ -10,13 +10,14 @@
 @RequiredArgsConstructor
 public class CallMessageBuilder implements SlackMessageBuilder {
 
+	private static final String DELIMITER = " ";
 	private static final String TEMPLATE_CODE = "call_message";
 
 	@Override
 	public String buildSlackMessage(String text, MessageContext messageContext) {
 		return text
 			.replace("{callUser}", SlackUtils.mentionFormattingUser(messageContext.getCallUser()))
-			.replace("{user}", SlackUtils.mentionFormattingUser(messageContext.getCalledUser()));
+			.replace("{user}", SlackUtils.mentionFormattingUsers(messageContext.getCalledUser(), DELIMITER));
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,15 @@ public MakersUserSlack toEntity() {`
`29`	`29`	`@AllArgsConstructor`
`30`	`30`	`public static class SlackUpdateEmojiEventDto {`
`31`	`31`	`private String callEmoji;`
	`32`	`+ private String userSlackId;`
`32`	`33`	`private String updateCallEmoji;`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`@Getter`
`36`	`37`	`@Builder`
`37`	`38`	`@AllArgsConstructor`
`38`	`39`	`public static class SlackDeleteEmojiEventDto {`
	`40`	`+ private String userSlackId;`
`39`	`41`	`private String callEmoji;`
`40`	`42`	`}`
`41`	`43`