From 61086f419fed3320f60848319f3917c39cca7ea5 Mon Sep 17 00:00:00 2001
From: Rinjae <dearmai@dearmai.net>
Date: Wed, 26 Aug 2026 12:57:03 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EB=8F=84=EA=B5=AC=20=EC=B6=94=EA=B0=80:=20-=20SCSS?=
 =?UTF-8?q?=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B0=8F=20HTML=20=ED=85=9C?=
 =?UTF-8?q?=ED=94=8C=EB=A6=BF=20=EA=B5=AC=ED=98=84=20-=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=20=EB=B0=9C=EC=86=A1/=EC=83=81=ED=83=9C=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EC=9E=90=EB=B0=94=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20-=20=ED=81=B4=EB=9D=BC=EC=9D=B4=EC=96=B8=ED=8A=B8?=
 =?UTF-8?q?=20JS:=20=EB=8F=99=EC=A0=81=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EB=B0=94=EC=9D=B8=EB=94=A9,=20=EB=B0=9C=EC=86=A1/=EC=9D=B4?=
 =?UTF-8?q?=EB=A0=A5=20=EA=B4=80=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/service/MessageSendService.java  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/eactive/apim/portal/template/service/MessageSendService.java b/src/main/java/com/eactive/apim/portal/template/service/MessageSendService.java
index c098224..324727c 100644
--- a/src/main/java/com/eactive/apim/portal/template/service/MessageSendService.java
+++ b/src/main/java/com/eactive/apim/portal/template/service/MessageSendService.java
@@ -37,22 +37,24 @@ public class MessageSendService {
     private final PortalPropertyService portalPropertyService;
 
     @Transactional
-    public void sendMessage(MessageCode messageCode, MessageRecipient recipient, Map<String, String> messageParams) {
-        processMessage(messageCode.name(), recipient, messageParams);
+    public List<MessageRequest> sendMessage(MessageCode messageCode, MessageRecipient recipient, Map<String, String> messageParams) {
+        return processMessage(messageCode.name(), recipient, messageParams);
     }
 
-    private void processMessage(String messageCode, MessageRecipient recipient, Map<String, String> messageParams) {
+    private List<MessageRequest> processMessage(String messageCode, MessageRecipient recipient, Map<String, String> messageParams) {
 
         Optional<MessageTemplate> template = messageTemplateRepository.findById(messageCode.toUpperCase());
 
+        List<MessageRequest> created = new ArrayList<>();
         if (template.isPresent()) {
             List<MessageRecipient> recipients = prepareRecipients(template.get(), recipient);
             for (MessageRecipient user : recipients) {
-                processSingleRecipient(user, template.get(), messageParams);
+                created.addAll(processSingleRecipient(user, template.get(), messageParams));
             }
         } else {
             log.warn("메세지 템플릿이 존재 하지 않음 - {}", messageCode);
         }
+        return created;
     }
 
     private List<MessageRecipient> prepareRecipients(MessageTemplate template, MessageRecipient recipient) {
@@ -70,13 +72,15 @@ public class MessageSendService {
     }
 
 
-    public void processSingleRecipient(MessageRecipient user, MessageTemplate template, Map<String, String> messageParams) {
+    public List<MessageRequest> processSingleRecipient(MessageRecipient user, MessageTemplate template, Map<String, String> messageParams) {
         Map<String, String> portalProperties = portalPropertyService.getPortalPropertiesAsMap("Portal");
 
         updateMessageParams(user, messageParams);
 
         String subject = buildMessage(template.getSubjectTemplate(), messageParams);
 
+        List<MessageRequest> created = new ArrayList<>();
+
         if (template.getEnableSms().equalsIgnoreCase("Y")) {
             String smsEaiInterfaceId  = portalProperties.get("djb.ums.sms.if_id");
             MessageRequest smsRequest = new MessageRequest();
@@ -91,7 +95,7 @@ public class MessageSendService {
             smsRequest.setServiceId(portalProperties.get("djb.ums.sms.tx_id"));
             smsRequest.setUserId(user.getUserId());
             smsRequest.setMessageType("SMS");
-            messageRequestRepository.save(smsRequest);
+            created.add(messageRequestRepository.save(smsRequest));
             logger.debug(smsRequest.toString());
         }
 
@@ -109,7 +113,7 @@ public class MessageSendService {
             emailRequest.setServiceId(portalProperties.get("djb.ums.email.tx_id"));
             emailRequest.setMessageType("EMAIL");
             emailRequest.setUserId(user.getUserId());
-            messageRequestRepository.save(emailRequest);
+            created.add(messageRequestRepository.save(emailRequest));
             logger.debug(emailRequest.toString());
         }
 
@@ -127,9 +131,11 @@ public class MessageSendService {
             messengerRequest.setServiceId(portalProperties.get("djb.ums.messenger.tx_id"));
             messengerRequest.setMessageType("MESSENGER");
             messengerRequest.setUserId(user.getUserId());
-            messageRequestRepository.save(messengerRequest);
+            created.add(messageRequestRepository.save(messengerRequest));
             logger.debug(messengerRequest.toString());
         }
+
+        return created;
     }
 
     /**