Merge branch 'master' of https://git.eactive.synology.me:8090/eapim/djbank/elink-portal-common.git

- InquiryCommentCreatedAdminEvent 삭제 및 경로 변경
- userName 정보 추가 및 description 업데이트
- inquirySubject 처리 로직 개선

src/main/java/com/eactive/apim/portal/qna/event/InquiryCommentCreatedEvent.java

@@ -0,0 +1,56 @@
+package com.eactive.apim.portal.qna.event;
+
+import com.eactive.apim.portal.template.entity.MessageCode;
+import com.eactive.apim.portal.template.service.MessageEventHandler;
+import com.eactive.apim.portal.template.service.MessageRecipient;
+import com.eactive.apim.portal.template.service.MessageSendEvent;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class InquiryCommentCreatedEvent implements MessageEventHandler {
+
+    public static final MessageCode KEY = MessageCode.INQUIRY_COMMENT_CREATED;
+
+    @Override
+    public MessageCode getKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean allowAdditionalRecipients() {
+        return true;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "Q&A 댓글 등록 알림";
+    }
+
+    @Override
+    public String getDescription() {
+        return "<div>사용 가능 변수: </div><br/>"
+                + "<div> - userName: 수신자 이름 </div><br/>"
+                + "<div> - userId: 수신자 ID </div><br/>"
+                + "<div> - inquiryId: 문의 ID </div><br/>"
+                + "<div> - inquirySubject: 문의 제목 </div><br/>"
+                + "<div> - commentContent: 댓글 본문 </div><br/>"
+                + "<div> - writerName: 작성자 이름 </div><br/>";
+    }
+
+    @Override
+    public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
+        Map<String, String> requestParams = new HashMap<>();
+        requestParams.put("inquiryId", toStr(params.get("inquiryId")));
+        requestParams.put("inquirySubject", toStr(params.get("inquirySubject")));
+        requestParams.put("commentContent", toStr(params.get("commentContent")));
+        requestParams.put("writerName", toStr(params.get("writerName")));
+        return new MessageSendEvent(source, KEY, recipient, requestParams);
+    }
+
+    private String toStr(Object value) {
+        return value == null ? "" : value.toString();
+    }
+}

src/main/java/com/eactive/apim/portal/qna/event/InquiryCreatedEvent.java

@@ -23,11 +23,21 @@ public class InquiryCreatedEvent implements MessageEventHandler {
     @Override
     public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
         Map<String, String> requestParams = new HashMap<>();
-        requestParams.put("inquiryId", (String) params.get("inquiryId"));
-        requestParams.put("subject", (String) params.get("subject"));
+        String subject = toStr(params.get("inquirySubject"));
+        if (subject.isEmpty()) {
+            subject = toStr(params.get("subject"));
+        }
+        requestParams.put("inquiryId", toStr(params.get("inquiryId")));
+        requestParams.put("inquirySubject", subject);
+        requestParams.put("subject", subject);
+        requestParams.put("writerName", toStr(params.get("writerName")));
         return new MessageSendEvent(source, KEY, recipient, requestParams);
     }
 
+    private String toStr(Object value) {
+        return value == null ? "" : value.toString();
+    }
+
     @Override
     public MessageCode getKey() {
         return KEY;
@@ -44,7 +54,9 @@ public class InquiryCreatedEvent implements MessageEventHandler {
                 + "<div> - userName: 수신자 이름 </div><br/>"
                 + "<div> - userId: 수신자 ID (이메일) </div><br/>"
                 + "<div> - inquiryId: 질문 ID </div><br/>"
-                + "<div> - subject: 제목 </div><br/>";
+                + "<div> - inquirySubject: 질문 제목 </div><br/>"
+                + "<div> - subject: 질문 제목 (별칭) </div><br/>"
+                + "<div> - writerName: 작성자 이름 </div><br/>";
     }
 }
 

src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java

@@ -25,19 +25,17 @@ public enum MessageCode {
     MANAGER_WITH_ORG_REGISTER_APPROVED("법인관리자 및 법인 등록 승인", "FM_APIM007", Channels.EMAIL),
     MANAGER_WITH_ORG_REGISTER_REJECTED("법인관리자 및 법인 등록 거절", "FM_APIM008", Channels.EMAIL),
 
-
     // 관리자 영역
     APP_REGISTER_APPROVED("앱 등록 승인", "FM_APIM009", Channels.EMAIL),
     APP_REGISTER_REJECTED("앱 등록 거절", "FM_APIM010", Channels.EMAIL),
 
-    // Q&A 댓글 등록 (DJBank 커스텀)
-    INQUIRY_COMMENT_CREATED_ADMIN("Q&A 댓글 등록 알림", null, Channels.NONE),
+    // Q&A 등록/댓글 등록 알림 (DJBank 커스텀 — portal-admin 수신)
+    INQUIRY_CREATED("Q&A 등록 알림", null, Channels.NONE),
+    INQUIRY_COMMENT_CREATED("Q&A 댓글 등록 알림", null, Channels.NONE),
     
-    
-    // API상태 모니터링
-    API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.MESSENGER),
-    // 유량제어 토큰 획득 실패
-    INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.MESSENGER),
+    // 제주은행
+    API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.SWING),
+    INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.SWING),
 
 
     // 미 사용, 미 분류
@@ -87,9 +85,6 @@ public enum MessageCode {
     @Deprecated // 정확한 용도 모름
     USER_REGISTRATION_REQUEST_USER("사용자 등록 요청 완료", null, Channels.NONE),
 
-    @Deprecated // 정확한 용도 모름
-    INQUIRY_CREATED("QnA 질문 등록", null, Channels.NONE),
-
     @Deprecated
     INQUIRY_RESPONSE("QnA 답변 작성", null, Channels.NONE)
     ;
@@ -124,7 +119,7 @@ public enum MessageCode {
         NONE            (0b0000),
         EMAIL           (0b0001),
         KAKAO_ALIMTALK  (0b0010),
-        MESSENGER		(0b0100),
+        SWING		(0b0100),
         ;
 
         @Getter

src/main/java/com/eactive/apim/portal/template/entity/MessageRequest.java

@@ -66,7 +66,7 @@ public class MessageRequest implements Serializable {
     private PortalUser user;
 
     @Comment("UMS 연계용 UID")
-    @Column(name="ums_uid", length = 16)
+    @Column(name="ums_uid", length = 36)
     private String umsUid;
 
     @Column(name = "messenger_id")

src/main/java/com/eactive/apim/portal/template/service/MessageSendService.java

@@ -78,7 +78,7 @@ public class MessageSendService {
         String subject = buildMessage(template.getSubjectTemplate(), messageParams);
 
         if (template.getEnableSms().equalsIgnoreCase("Y")) {
-            String smsEaiInterfaceId  = portalProperties.get("message.integration.eaiId.sms");
+            String smsEaiInterfaceId  = portalProperties.get("ums.sms.if_id");
             MessageRequest smsRequest = new MessageRequest();
             smsRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode().toUpperCase()));
             smsRequest.setSubject(subject);
@@ -88,14 +88,14 @@ public class MessageSendService {
             smsRequest.setUsername(user.getUsername());
             smsRequest.setPhone(user.getPhone());
             smsRequest.setEaiInterfaceId(smsEaiInterfaceId);
-            smsRequest.setServiceId(portalProperties.get("message.integration.template.sms." + template.getMessageCode()));
-            smsRequest.setMessageType("KAKAO");
+            smsRequest.setServiceId(portalProperties.get("ums.sms.tx_id"));
+            smsRequest.setMessageType("SMS");
             messageRequestRepository.save(smsRequest);
             logger.debug(smsRequest.toString());
         }
 
         if (template.getEnableEmail().equalsIgnoreCase("Y")) {
-            String mailEaiInterfaceId  = portalProperties.get("message.integration.eaiId.email");
+            String mailEaiInterfaceId  = portalProperties.get("ums.email.if_id");
             MessageRequest emailRequest = new MessageRequest();
             emailRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode().toUpperCase()));
             emailRequest.setSubject(subject);
@@ -105,13 +105,14 @@ public class MessageSendService {
             emailRequest.setUsername(user.getUsername());
             emailRequest.setEmail(user.getUserId());
             emailRequest.setEaiInterfaceId(mailEaiInterfaceId);
-            emailRequest.setServiceId(portalProperties.get("message.integration.template.email." + template.getMessageCode()));
+            emailRequest.setServiceId(portalProperties.get("ums.email.tx_id"));
             emailRequest.setMessageType("EMAIL");
             messageRequestRepository.save(emailRequest);
             logger.debug(emailRequest.toString());
         }
 
         if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
+            String swingEaiInterfaceId  = portalProperties.get("ums.messenger.if_id");
             MessageRequest messengerRequest = new MessageRequest();
             messengerRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode()));
             messengerRequest.setSubject(subject);
@@ -120,6 +121,9 @@ public class MessageSendService {
             messengerRequest.setRequestDate(LocalDateTime.now());
             messengerRequest.setUsername(user.getUsername());
             messengerRequest.setMessengerId(user.getUserId());
+            messengerRequest.setEaiInterfaceId(swingEaiInterfaceId);
+            messengerRequest.setServiceId(portalProperties.get("ums.messenger.tx_id"));
+            messengerRequest.setMessageType("MESSENGER");
             messageRequestRepository.save(messengerRequest);
         }
     }