Merge pull request #161 from TimeBank-Sparta/feat/#160-notification-service-slack

20152842 · web-flow · commit 8df538a843f8 · 2025-06-07T14:32:24.000+09:00
feat: slack 알림 추가 및 재시도 추가
diff --git a/common/src/main/java/com/timebank/common/infrastructure/external/notification/dto/NotificationEvent.java b/common/src/main/java/com/timebank/common/infrastructure/external/notification/dto/NotificationEvent.java
@@ -23,5 +23,5 @@ public class NotificationEvent {
 	private LocalDateTime sentAt;
 	private NotificationEventType eventType; // 이벤트 구분 (CREATED, UPDATED, DELETED)
 	private Map<String, String> payload;     // (추가 정보 전달용)
-
+	private String slackUserEmail;
 }
diff --git a/notification-service/build.gradle b/notification-service/build.gradle
@@ -38,12 +38,14 @@ dependencies {
     // ✅ 공통 모듈
     implementation 'com.timebank:common:0.0.1-SNAPSHOT'
     implementation 'org.springframework.kafka:spring-kafka'
-
+    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-mail'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-registry-prometheus'
-
+    implementation 'io.github.resilience4j:resilience4j-spring-boot3'
+    implementation 'io.github.resilience4j:resilience4j-retry'
+    
     runtimeOnly 'com.mysql:mysql-connector-j'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
diff --git a/notification-service/src/main/java/com/timebank/notification_service/application/client/SlackClient.java b/notification-service/src/main/java/com/timebank/notification_service/application/client/SlackClient.java
@@ -0,0 +1,13 @@
+package com.timebank.notification_service.application.client;
+
+import com.timebank.notification_service.application.dto.SlackBotMessage;
+import com.timebank.notification_service.application.dto.SlackWebHookMessage;
+
+public interface SlackClient {
+	void sendMessage(SlackWebHookMessage message);
+
+	void sendMessage(SlackBotMessage request);
+
+	String getUserIdByEmail(String email);
+
+}
diff --git a/notification-service/src/main/java/com/timebank/notification_service/application/dto/NotificationDto.java b/notification-service/src/main/java/com/timebank/notification_service/application/dto/NotificationDto.java
@@ -1,7 +1,7 @@
 package com.timebank.notification_service.application.dto;
 
+import com.timebank.common.infrastructure.external.notification.dto.NotificationType;
 import com.timebank.notification_service.domain.entity.Notification;
-import com.timebank.notification_service.domain.entity.NotificationType;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/notification-service/src/main/java/com/timebank/notification_service/application/dto/SlackBotMessage.java b/notification-service/src/main/java/com/timebank/notification_service/application/dto/SlackBotMessage.java
@@ -0,0 +1,20 @@
+package com.timebank.notification_service.application.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@Builder
+public class SlackBotMessage {
+	private String channel;
+	private String text;
+
+	public static SlackBotMessage of(String channel, String text) {
+		return SlackBotMessage.builder()
+			.channel(channel)
+			.text(text)
+			.build();
+	}
+}
diff --git a/notification-service/src/main/java/com/timebank/notification_service/application/dto/SlackUserResponse.java b/notification-service/src/main/java/com/timebank/notification_service/application/dto/SlackUserResponse.java
@@ -0,0 +1,23 @@
+package com.timebank.notification_service.application.dto;
+
+import lombok.Getter;
+
+@Getter
+public class SlackUserResponse {
+	private boolean ok;
+	private SlackUser user;
+
+	@Getter
+	public static class SlackUser {
+		private String id;
+		private String teamId;
+		private String name;
+		private String realName;
+		private SlackProfile profile;
+
+		@Getter
+		public static class SlackProfile {
+			private String email;
+		}
+	}
+}
diff --git a/notification-service/src/main/java/com/timebank/notification_service/application/dto/SlackWebHookMessage.java b/notification-service/src/main/java/com/timebank/notification_service/application/dto/SlackWebHookMessage.java
@@ -0,0 +1,18 @@
+package com.timebank.notification_service.application.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@Builder
+public class SlackWebHookMessage {
+	private String text;
+
+	public static SlackWebHookMessage from(String text) {
+		return SlackWebHookMessage.builder()
+			.text(text)
+			.build();
+	}
+}
diff --git a/notification-service/src/main/java/com/timebank/notification_service/application/event/NotificationEvent.java b/notification-service/src/main/java/com/timebank/notification_service/application/event/NotificationEvent.java
diff --git a/notification-service/src/main/java/com/timebank/notification_service/application/service/NotificationService.java b/notification-service/src/main/java/com/timebank/notification_service/application/service/NotificationService.java
@@ -11,10 +11,12 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.timebank.common.infrastructure.external.notification.dto.NotificationEventType;
+import com.timebank.notification_service.application.client.SlackClient;
 import com.timebank.notification_service.application.dto.NotificationDto;
-import com.timebank.notification_service.application.event.NotificationEvent;
+import com.timebank.notification_service.application.dto.SlackBotMessage;
+import com.timebank.notification_service.application.dto.SlackWebHookMessage;
 import com.timebank.notification_service.domain.entity.Notification;
-import com.timebank.notification_service.domain.entity.NotificationEventType;
 import com.timebank.notification_service.domain.repository.NotificationRepository;
 
 import jakarta.persistence.EntityNotFoundException;
@@ -29,6 +31,7 @@ public class NotificationService {
 
 	private final NotificationRepository notificationRepository;
 	private final KafkaTemplate<String, Object> kafkaTemplate;
+	private final SlackClient slackClient;
 
 	/**
 	 * 알림 생성
@@ -46,10 +49,6 @@ public NotificationDto createNotification(NotificationDto notificationDto) {
 			.build();
 		notification = notificationRepository.save(notification);
 
-		// Kafka 이벤트 발행 (CREATED)
-		NotificationEvent event = new NotificationEvent(notification, NotificationEventType.CREATED);
-		kafkaTemplate.send(NotificationEventType.CREATED.getTopic(), event);
-
 		return NotificationDto.fromEntity(notification);
 	}
 
@@ -96,10 +95,6 @@ public NotificationDto markAsRead(Long notificationId) {
 		notification.setIsRead(true);
 		notification = notificationRepository.save(notification);
 
-		// Kafka 이벤트 발행 (UPDATED)
-		NotificationEvent event = new NotificationEvent(notification, NotificationEventType.UPDATED);
-		kafkaTemplate.send(NotificationEventType.UPDATED.getTopic(), event);
-
 		return NotificationDto.fromEntity(notification);
 	}
 
@@ -113,9 +108,9 @@ public void deleteNotification(Long notificationId) {
 
 		notificationRepository.delete(notification);
 
-		// Kafka 이벤트 발행 (DELETED)
-		NotificationEvent event = new NotificationEvent(notification, NotificationEventType.DELETED);
-		kafkaTemplate.send(NotificationEventType.DELETED.getTopic(), event);
+		// // Kafka 이벤트 발행 (DELETED)
+		// NotificationEvent event = new NotificationEvent(notification, NotificationEventType.DELETED);
+		// kafkaTemplate.send(NotificationEventType.DELETED.getTopic(), event);
 	}
 
 	/**
@@ -131,4 +126,12 @@ public List<NotificationDto> getNotificationsByUser(Long userId) {
 			.map(NotificationDto::fromEntity)
 			.collect(Collectors.toList());
 	}
+
+	public void sendMessage(SlackWebHookMessage message, String email) {
+		//채널 알림
+		slackClient.sendMessage(message);
+
+		//사용자 DM
+		slackClient.sendMessage(SlackBotMessage.of(slackClient.getUserIdByEmail(email), message.getText()));
+	}
 }
diff --git a/notification-service/src/main/java/com/timebank/notification_service/domain/entity/Notification.java b/notification-service/src/main/java/com/timebank/notification_service/domain/entity/Notification.java
@@ -1,6 +1,8 @@
 package com.timebank.notification_service.domain.entity;
 
 import com.timebank.common.domain.Timestamped;
+import com.timebank.common.infrastructure.external.notification.dto.NotificationEventType;
+import com.timebank.common.infrastructure.external.notification.dto.NotificationType;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/notification-service/src/main/java/com/timebank/notification_service/domain/entity/NotificationEventType.java b/notification-service/src/main/java/com/timebank/notification_service/domain/entity/NotificationEventType.java
diff --git a/notification-service/src/main/java/com/timebank/notification_service/domain/entity/NotificationType.java b/notification-service/src/main/java/com/timebank/notification_service/domain/entity/NotificationType.java
diff --git a/notification-service/src/main/java/com/timebank/notification_service/infrastructure/kafka/NotificationConsumer.java b/notification-service/src/main/java/com/timebank/notification_service/infrastructure/kafka/NotificationConsumer.java
@@ -3,7 +3,9 @@
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
-import com.timebank.notification_service.application.event.NotificationEvent;
+import com.timebank.common.infrastructure.external.notification.dto.NotificationEvent;
+import com.timebank.notification_service.application.dto.SlackWebHookMessage;
+import com.timebank.notification_service.application.service.NotificationService;
 import com.timebank.notification_service.domain.entity.Notification;
 import com.timebank.notification_service.domain.repository.NotificationRepository;
 
@@ -16,20 +18,26 @@
 public class NotificationConsumer {
 
 	private final NotificationRepository notificationRepository;
+	private final NotificationService notificationService;
 
 	// CREATED 토픽 소비 메서드
 	@KafkaListener(topics = "notification.events.CREATED", groupId = "notification-group")
 	public void consumeCreated(NotificationEvent event) {
 		log.info("Consumed CREATED event: {}", event);
 		saveNotification(event);
-		// 필요시 추가 로직 처리 (예: 로깅)
+
+		notificationService.sendMessage(
+			SlackWebHookMessage.from(event.getMessage()), event.getSlackUserEmail());
 	}
 
 	// UPDATED 토픽 소비 메서드
 	@KafkaListener(topics = "notification.events.UPDATED", groupId = "notification-group")
 	public void consumeUpdated(NotificationEvent event) {
 		log.info("Consumed UPDATED event: {}", event);
-		// 업데이트 이벤트의 경우 추가 처리 로직이 있다면 구현합니다.
+
+		notificationService.sendMessage(
+			SlackWebHookMessage.from(event.getMessage()), event.getSlackUserEmail());
+
 		saveNotification(event);
 	}
 
@@ -38,7 +46,11 @@ public void consumeUpdated(NotificationEvent event) {
 	public void consumeDeleted(NotificationEvent event) {
 		log.info("Consumed DELETED event: {}", event);
 		// 삭제 이벤트는 삭제 후 로깅 혹은 관련 작업 수행
+		notificationService.sendMessage(
+			SlackWebHookMessage.from(event.getMessage()), event.getSlackUserEmail());
+
 		saveNotification(event);
+
 	}
 
 	// 공통적으로 Notification DB 저장 처리
diff --git a/notification-service/src/main/java/com/timebank/notification_service/infrastructure/slack/SlackBotClient.java b/notification-service/src/main/java/com/timebank/notification_service/infrastructure/slack/SlackBotClient.java
@@ -0,0 +1,23 @@
+package com.timebank.notification_service.infrastructure.slack;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.timebank.notification_service.application.dto.SlackBotMessage;
+import com.timebank.notification_service.application.dto.SlackUserResponse;
+
+@FeignClient(name = "slackBotClient", url = "https://slack.com/api")
+public interface SlackBotClient {
+
+	@PostMapping("/chat.postMessage")
+	void sendMessage(@RequestHeader("Authorization") String authorization,
+		@RequestBody SlackBotMessage body);
+
+	@GetMapping("/users.lookupByEmail")
+	SlackUserResponse lookupByEmail(@RequestHeader("Authorization") String authorization,
+		@RequestParam("email") String email);
+}
diff --git a/notification-service/src/main/java/com/timebank/notification_service/infrastructure/slack/SlackFeignClientImpl.java b/notification-service/src/main/java/com/timebank/notification_service/infrastructure/slack/SlackFeignClientImpl.java
diff --git a/notification-service/src/main/java/com/timebank/notification_service/infrastructure/slack/SlackWebHookClient.java b/notification-service/src/main/java/com/timebank/notification_service/infrastructure/slack/SlackWebHookClient.java

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ public class NotificationEvent {`
`23`	`23`	`private LocalDateTime sentAt;`
`24`	`24`	`private NotificationEventType eventType; // 이벤트 구분 (CREATED, UPDATED, DELETED)`
`25`	`25`	`private Map<String, String> payload; // (추가 정보 전달용)`
`26`		`-`
	`26`	`+ private String slackUserEmail;`
`27`	`27`	`}`