Deploy | CAKK-56 | v2.0.4 배포

build.gradle.kts

@@ -41,7 +41,7 @@ subprojects {
 		}
 	}
 
-	if (project.name == "cakk-admin") {
+	if (project.name == "cakk-admin" || project.name == "cakk-external") {
 		apply(plugin = "org.jetbrains.kotlin.jvm")
 		apply(plugin = "org.jetbrains.kotlin.plugin.spring")
 		apply(plugin = "org.jetbrains.kotlin.plugin.jpa")
@@ -114,6 +114,7 @@ subprojects {
 			"com.cakk.api.provider.oauth.PublicKeyProvider",
 			"com.cakk.api.dto.**",
 			"com.cakk.api.mapper.**",
+			"com.cakk.api.listener.**",
 			"com.cakk.api.vo.**",
 			"com.cakk.domain.**"
 		)

cakk-api/build.gradle.kts

@@ -0,0 +1,48 @@
+description = "api module"
+
+dependencies {
+	implementation(project(":cakk-common"))
+	implementation(project(":cakk-domain:mysql"))
+	implementation(project(":cakk-domain:redis"))
+	implementation(project(":cakk-client"))
+	implementation(project(":cakk-external"))
+
+	// basic
+    implementation("org.springframework.boot:spring-boot-starter-web")
+	implementation("org.springframework.boot:spring-boot-starter-validation")
+	implementation("org.springframework.boot:spring-boot-starter-aop:3.3.0")
+	implementation("org.springframework:spring-tx")
+	annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
+
+	// Security & OAuth
+	implementation("org.springframework.boot:spring-boot-starter-security")
+	implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
+	implementation("com.google.api-client:google-api-client-jackson2:2.2.0")
+	implementation("com.google.api-client:google-api-client:2.2.0")
+
+	// Jwt
+	implementation("io.jsonwebtoken:jjwt-api:0.11.5")
+	implementation("io.jsonwebtoken:jjwt-impl:0.11.5")
+	implementation("io.jsonwebtoken:jjwt-jackson:0.11.5")
+
+	// test
+	testImplementation("com.tngtech.archunit:archunit-junit5:1.1.0")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testImplementation("org.springframework.security:spring-security-test")
+	testImplementation("com.navercorp.fixturemonkey:fixture-monkey-starter:1.0.23")
+
+	// test container
+	testImplementation("org.testcontainers:junit-jupiter:1.19.7")
+	testImplementation("org.testcontainers:mysql:1.19.7")
+
+	// Point
+	implementation("org.locationtech.jts:jts-core:1.18.2")
+}
+
+tasks.bootJar {
+	enabled = true
+}
+
+tasks.jar {
+	enabled = false
+}

cakk-api/src/main/java/com/cakk/api/config/MessageTemplateConfig.java

@@ -0,0 +1,28 @@
+package com.cakk.api.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.cakk.external.extractor.CertificationSlackMessageExtractor;
+import com.cakk.external.extractor.ErrorAlertSlackMessageExtractor;
+import com.cakk.external.extractor.MessageExtractor;
+import com.cakk.external.template.MessageTemplate;
+
+@Configuration
+public class MessageTemplateConfig {
+
+	@Bean
+	public MessageTemplate certificationTemplate() {
+		return new MessageTemplate();
+	}
+
+	@Bean
+	public MessageExtractor certificationMessageExtractor() {
+		return new CertificationSlackMessageExtractor();
+	}
+
+	@Bean
+	public MessageExtractor errorAlertMessageExtractor() {
+		return new ErrorAlertSlackMessageExtractor();
+	}
+}

cakk-api/src/main/java/com/cakk/api/controller/advice/GlobalControllerAdvice.java

@@ -9,6 +9,8 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
@@ -20,27 +22,37 @@
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import com.cakk.api.service.slack.SlackService;
+import com.cakk.api.mapper.EventMapper;
 import com.cakk.common.enums.ReturnCode;
 import com.cakk.common.exception.CakkException;
 import com.cakk.common.response.ApiResponse;
 
 @Slf4j
 @RestControllerAdvice
-@RequiredArgsConstructor
 public class GlobalControllerAdvice {
 
-	private final SlackService slackService;
+	private final ApplicationEventPublisher applicationEventPublisher;
+
+	private final String profile;
+
+	public GlobalControllerAdvice(
+		ApplicationEventPublisher applicationEventPublisher,
+		@Value("${spring.profiles.active}") String profile
+	) {
+		this.applicationEventPublisher = applicationEventPublisher;
+		this.profile = profile;
+	}
 
 	@ExceptionHandler(CakkException.class)
 	public ResponseEntity<ApiResponse<Void>> handleCakkException(CakkException exception, HttpServletRequest request) {
 		final ReturnCode returnCode = exception.getReturnCode();
+
 		if (returnCode.equals(ReturnCode.INTERNAL_SERVER_ERROR) || returnCode.equals(ReturnCode.EXTERNAL_SERVER_ERROR)) {
-			slackService.sendSlackForError(exception, request);
+			applicationEventPublisher.publishEvent(EventMapper.supplyErrorAlertEventBy(exception, request, profile));
 		}
+
 		log.error(exception.getMessage());
 		return getResponseEntity(BAD_REQUEST, ApiResponse.fail(exception.getReturnCode()));
 	}
@@ -79,8 +91,9 @@ public ResponseEntity<ApiResponse<Map<String, String>>> handleMethodArgNotValidE
 		RuntimeException.class
 	})
 	public ResponseEntity<ApiResponse<String>> handleServerException(Exception exception, HttpServletRequest request) {
-		slackService.sendSlackForError(exception, request);
+		applicationEventPublisher.publishEvent(EventMapper.supplyErrorAlertEventBy(exception, request, profile));
 		log.error(exception.getMessage());
+
 		return getResponseEntity(INTERNAL_SERVER_ERROR, ApiResponse.error(ReturnCode.INTERNAL_SERVER_ERROR, exception.getMessage()));
 	}
 

cakk-api/src/main/java/com/cakk/api/dto/event/ErrorAlertEvent.java

@@ -0,0 +1,10 @@
+package com.cakk.api.dto.event;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+public record ErrorAlertEvent(
+	Exception exception,
+	HttpServletRequest request,
+	String profile
+) {
+}

cakk-api/src/main/java/com/cakk/api/listener/CertificationEventListener.java

@@ -1,27 +1,39 @@
 package com.cakk.api.listener;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
 
-import lombok.RequiredArgsConstructor;
-
 import com.cakk.api.annotation.ApplicationEventListener;
 import com.cakk.api.mapper.EventMapper;
-import com.cakk.api.template.CertificationTemplate;
 import com.cakk.domain.mysql.event.shop.CertificationEvent;
+import com.cakk.external.extractor.MessageExtractor;
+import com.cakk.external.sender.MessageSender;
+import com.cakk.external.template.MessageTemplate;
 import com.cakk.external.vo.CertificationMessage;
 
-@RequiredArgsConstructor
 @ApplicationEventListener
 public class CertificationEventListener {
 
-	private final CertificationTemplate certificationTemplate;
+	private final MessageTemplate messageTemplate;
+	private final MessageExtractor messageExtractor;
+	private final MessageSender messageSender;
+
+	public CertificationEventListener(
+		MessageTemplate messageTemplate,
+		@Qualifier("certificationMessageExtractor") MessageExtractor messageExtractor,
+		@Qualifier("slackMessageSender") MessageSender messageSender
+	) {
+		this.messageTemplate = messageTemplate;
+		this.messageExtractor = messageExtractor;
+		this.messageSender = messageSender;
+	}
 
 	@Async
 	@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
 	public void sendMessageToSlack(CertificationEvent certificationEvent) {
 		CertificationMessage certificationMessage = EventMapper.supplyCertificationMessageBy(certificationEvent);
-		certificationTemplate.sendMessageForCertification(certificationMessage);
+		messageTemplate.sendMessage(certificationMessage, messageExtractor, messageSender);
 	}
 }

cakk-api/src/main/java/com/cakk/api/listener/EmailSendEventListener.java

@@ -1,25 +1,39 @@
 package com.cakk.api.listener;
 
-import java.util.Objects;
-
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 
-import lombok.RequiredArgsConstructor;
-
 import com.cakk.api.annotation.ApplicationEventListener;
 import com.cakk.api.dto.event.EmailWithVerificationCodeSendEvent;
-import com.cakk.external.service.MailService;
+import com.cakk.api.mapper.EventMapper;
+import com.cakk.external.extractor.MessageExtractor;
+import com.cakk.external.sender.MessageSender;
+import com.cakk.external.template.MessageTemplate;
+import com.cakk.external.vo.VerificationMessage;
 
-@RequiredArgsConstructor
 @ApplicationEventListener
 public class EmailSendEventListener {
 
-	private final MailService mailService;
+
+	private final MessageTemplate messageTemplate;
+	private final MessageExtractor messageExtractor;
+	private final MessageSender messageSender;
+
+	public EmailSendEventListener(
+		MessageTemplate messageTemplate,
+		@Qualifier("verificationCodeMimeMessageExtractor") MessageExtractor messageExtractor,
+		@Qualifier("emailMessageSender") MessageSender messageSender
+	) {
+		this.messageTemplate = messageTemplate;
+		this.messageExtractor = messageExtractor;
+		this.messageSender = messageSender;
+	}
 
 	@Async
 	@EventListener
 	public void sendEmailIncludeVerificationCode(EmailWithVerificationCodeSendEvent event) {
-		mailService.sendEmail(Objects.requireNonNull(event.email()), Objects.requireNonNull(event.code()));
+		final VerificationMessage verificationMessage = EventMapper.supplyVerificationMessageBy(event);
+		messageTemplate.sendMessage(verificationMessage, messageExtractor, messageSender);
 	}
 }