알림톡 템플릿 수정 - 템플릿 코드 변경

- ApiKeyInterceptor 삭제, InternalApiTokenInterceptor 도입
- 관련 config 및 테스트 코드 X-Internal-Token 방식으로 수정
- PortalPropertyService 연관 코드 정리 및 불필요 메서드 제거"

src/main/java/com/eactive/apim/portal/app/repository/CredentialRepository.java

@@ -9,6 +9,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
 
 @EMSDataSource
 public interface CredentialRepository extends BaseRepository<Credential, String> {
@@ -19,6 +20,9 @@ public interface CredentialRepository extends BaseRepository<Credential, String>
 
     List<Credential> findAllByOrgid(String orgid);
 
+    @Transactional
+    long deleteByOrgid(String orgid);
+
     Optional<Credential> findByClientidAndOrgid(String clientid, String orgid);
 
     /**

src/main/java/com/eactive/apim/portal/apprequest/repository/AppRequestRepository.java

@@ -31,6 +31,9 @@ public interface AppRequestRepository extends BaseRepository<AppRequest, String>
 
     Optional<AppRequest> findByIdAndOrgAndTypeIsIn(String id, PortalOrg org, List<AppRequestType> types);
 
+    /** 테스트 재실행 정리처럼 법인 내 동일 클라이언트명의 신청을 좁게 조회한다. */
+    List<AppRequest> findAllByOrgAndClientName(PortalOrg org, String clientName);
+
     List<AppRequest> findAllByClientIdsContainsAndTypeIsIn(String clientId, List<AppRequestType> types);
 
     List<AppRequest> findAllByOrgAndStatus(PortalOrg org, ApprovalStatus status);

src/main/java/com/eactive/apim/portal/common/internal/InternalApiTokenService.java

@@ -95,16 +95,15 @@ public class InternalApiTokenService {
      */
     public boolean matches(String presented) {
         String expected = ensureToken();
-        if (expected == null) {
+        return tokenMatches(presented, expected);
-            log.error("내부 API 토큰({}/{})을 확보하지 못해 요청을 거부합니다.", PROP_GROUP, PROP_TOKEN);
+    }
-            return false;
+
-        }
+    /**
-        if (isBlank(presented)) {
+     * admin 등 토큰을 생성하면 안 되는 애플리케이션용 검증.
-            return false;
+     * 프로퍼티가 없으면 생성하지 않고 거부한다.
-        }
+     */
-        return MessageDigest.isEqual(
+    public boolean matchesReadOnly(String presented) {
-            presented.trim().getBytes(StandardCharsets.UTF_8),
+        return tokenMatches(presented, findToken());
-            expected.getBytes(StandardCharsets.UTF_8));
     }
 
     /** 기동 시 1회 호출 — 헤더명/토큰 프로퍼티를 미리 만들어 둔다. (포탈 전용) */
@@ -138,6 +137,19 @@ public class InternalApiTokenService {
         }
     }
 
+    private boolean tokenMatches(String presented, String expected) {
+        if (expected == null) {
+            log.error("내부 API 토큰({}/{})을 확보하지 못해 요청을 거부합니다.", PROP_GROUP, PROP_TOKEN);
+            return false;
+        }
+        if (isBlank(presented)) {
+            return false;
+        }
+        return MessageDigest.isEqual(
+            presented.trim().getBytes(StandardCharsets.UTF_8),
+            expected.getBytes(StandardCharsets.UTF_8));
+    }
+
     /** JVM 당 1회만 생성되는 난수 토큰 (DB 에 값이 없을 때의 기본값). */
     private String localToken() {
         String token = generatedToken.get();

src/main/java/com/eactive/apim/portal/invitation/repository/UserInvitationRepository.java

@@ -17,6 +17,10 @@ public interface UserInvitationRepository extends JpaRepository<UserInvitation,
 
     List<UserInvitation> findByStatus(InvitationStatus status);
 
+    long deleteByOrgId(String orgId);
+
+    long deleteByInvitationMobile(String invitationMobile);
+
     Optional<UserInvitation> findFirstByInvitationEmailAndStatus(String email, InvitationStatus status);
 
     Optional<UserInvitation> findFirstByInvitationEmailAndOrgIdAndStatus(String email, String orgId, InvitationStatus status);

src/main/java/com/eactive/apim/portal/portaluser/repository/PortalUserPrivacyAgreementRepository.java

@@ -3,6 +3,7 @@ package com.eactive.apim.portal.portaluser.repository;
 import com.eactive.apim.portal.portaluser.entity.PortalUserPrivacyAgreement;
 import com.eactive.eai.data.jpa.BaseRepository;
 import com.eactive.eai.rms.data.EMSDataSource;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Optional;
@@ -15,4 +16,8 @@ public interface PortalUserPrivacyAgreementRepository extends BaseRepository<Por
     List<PortalUserPrivacyAgreement> findAllByCreatedBy(String createdBy);
 
 //    boolean existsByCreatedByAndTermsTypeAndTermsVersionGreaterThanEqual(String userId, String termsType, int latestVersion);
+
+    /** createdBy = PortalUser.id. */
+    @Transactional
+    long deleteByCreatedBy(String createdBy);
 }

src/main/java/com/eactive/apim/portal/portaluser/repository/PortalUserRepository.java

@@ -40,6 +40,8 @@ public interface PortalUserRepository extends BaseRepository<PortalUser, String>
 
     long countByPortalOrg(PortalOrg portalOrg);
 
+    List<PortalUser> findAllByPortalOrg_Id(String orgId);
+
     Optional<PortalUser> findByUserName(String userName);
 
     // 암복

src/main/java/com/eactive/apim/portal/portaluser/repository/UserPasswordHistoryRepository.java

@@ -5,6 +5,7 @@ import com.eactive.eai.rms.data.EMSDataSource;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Optional;
@@ -15,4 +16,8 @@ public interface UserPasswordHistoryRepository extends JpaRepository<UserPasswor
     List<UserPasswordHistory> findRecentPasswordsByUserId(@Param("loginId") String loginId);
 
     Optional<UserPasswordHistory> findTopByUserIdOrderByChangeDateDesc(String loginId);
+
+    /** userId = PortalUser.id (loginId 아님 — UserRoleHistory.userId 와 반대 시맨틱). */
+    @Transactional
+    long deleteByUserId(String userId);
 }

src/main/java/com/eactive/apim/portal/portaluser/repository/UserRoleHistoryRepository.java

@@ -3,6 +3,7 @@ package com.eactive.apim.portal.portaluser.repository;
 import com.eactive.apim.portal.portaluser.entity.UserRoleHistory;
 import com.eactive.eai.rms.data.EMSDataSource;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -10,4 +11,8 @@ import java.util.List;
 public interface UserRoleHistoryRepository extends JpaRepository<UserRoleHistory, Long> {
 
     List<UserRoleHistory> findByUserIdOrderByChangeDateDesc(String userId);
+
+    /** userId = PortalUser.loginId (id 아님 — UserPasswordHistory.userId 와 반대 시맨틱). */
+    @Transactional
+    long deleteByUserId(String userId);
 }

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

@@ -11,23 +11,22 @@ public enum MessageCode {
 
 	// 사용자 이벤트 영역
     USER_VERIFICATION_EMAIL("이메일 주소 인증", null, Channels.EMAIL),
-    USER_VERIFICATION_MOBILEPHONE("휴대폰 번호 인증", null, Channels.SMS),
+    USER_VERIFICATION_MOBILEPHONE("휴대폰 번호 인증", "JJB_85959019001", Channels.SMS),
 
-    USER_PASSWORD_RESET("비밀번호 재설정", null, Channels.SMS),
+    USER_PASSWORD_CHANGED("사용자 비밀번호 변경", "JJB_85959019003", Channels.SMS),
-    USER_PASSWORD_CHANGED("사용자 비밀번호 변경", null, Channels.SMS),
 
-    USER_ACCOUNT_LOCKED("계정 잠금 알림", null, Channels.SMS),
+    USER_ACCOUNT_LOCKED("계정 잠금 알림", "JJB_85959019002", Channels.SMS),
 
     // 법인관리자 이벤트 영역
-    USER_INVITATION("법인 이용자 이메일 초대", null, Channels.SMS),
+    USER_INVITATION("법인 이용자 이메일 초대", "JJB_85959019006", Channels.SMS),
-    USER_INVITATION_CANCELED("법인 이용자 이메일 초대 취소", null, Channels.SMS),
+    USER_INVITATION_CANCELED("법인 이용자 이메일 초대 취소", "JJB_85959019007", Channels.SMS),
 
-    MANAGER_WITH_ORG_REGISTER_APPROVED("법인관리자 및 법인 등록 승인", null, Channels.SMS),
+    MANAGER_WITH_ORG_REGISTER_APPROVED("법인관리자 및 법인 등록 승인", "JJB_85959019004", Channels.SMS),
-    MANAGER_WITH_ORG_REGISTER_REJECTED("법인관리자 및 법인 등록 거절", null, Channels.SMS),
+    MANAGER_WITH_ORG_REGISTER_REJECTED("법인관리자 및 법인 등록 거절", "JJB_85959019005", Channels.SMS),
 
     // 관리자 영역
-    APP_APPROVE("앱 사용 승인", null, Channels.SMS),
+    APP_APPROVE("앱 사용 승인", "JJB_85959019008", Channels.SMS),
-    APP_REJECTED("앱 사용 거절", null, Channels.SMS),
+    APP_REJECTED("앱 사용 거절", "JJB_85959019009", Channels.SMS),
 
     // Q&A 등록/댓글 등록 알림 (DJBank 커스텀 — portal-admin 수신)
     INQUIRY_CREATED("Q&A 등록 알림", null, Channels.SWING),
@@ -37,9 +36,10 @@ public enum MessageCode {
     // 제주은행
     API_STATUS_CHANGED("API 상태 변화", null, Channels.SWING),
     INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", null, Channels.SWING),
-    ADMIN_VERIFICATION_MOBILEPHONE("관리자포탈 휴대폰 번호 인증", null, Channels.SMS),
+    ADMIN_VERIFICATION_MOBILEPHONE("관리자포탈 휴대폰 번호 인증", "JJB_85999019001", Channels.SMS),
 
     // 레거시/미사용 — Event 핸들러 클래스 호환을 위해 유지 (실제 발송 없음)
+    USER_PASSWORD_RESET("비밀번호 재설정", null, Channels.SMS),
     API_APPROVED("API 승인 알림", null, Channels.NONE),
     APP_REGISTER_REQUEST("앱 등록 요청", null, Channels.NONE),
     APP_REGISTER_REJECTED("앱 등록 거절", null, Channels.NONE),

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

@@ -79,9 +79,16 @@ public class MessageRequest implements Serializable {
     @Column(name = "request_status")
     private String requestStatus = "PENDING"; // PENDING, SENT, FAILED
 
+    @Lob
+    @Column(name = "response_data")
+    private String responseData;
+
     @Column(name = "eai_interface_id")
     private String eaiInterfaceId;
 
+    @Column(name = "eai_tx_id")
+    private String eaiTxId;
+
     @Column(name = "service_id")
     private String serviceId;
 

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) {
+    public List<MessageRequest> sendMessage(MessageCode messageCode, MessageRecipient recipient, Map<String, String> messageParams) {
-        processMessage(messageCode.name(), recipient, messageParams);
+        return processMessage(messageCode, recipient, messageParams);
     }
 
-    private void processMessage(String messageCode, MessageRecipient recipient, Map<String, String> messageParams) {
+    private List<MessageRequest> processMessage(MessageCode messageCode, MessageRecipient recipient, Map<String, String> messageParams) {
 
-        Optional<MessageTemplate> template = messageTemplateRepository.findById(messageCode.toUpperCase());
+        Optional<MessageTemplate> template = messageTemplateRepository.findById(messageCode.name().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, messageCode));
             }
         } else {
-            log.warn("메세지 템플릿이 존재 하지 않음 - {}", messageCode);
+            log.warn("메세지 템플릿이 존재 하지 않음 - {}", messageCode.name());
         }
+        return created;
     }
 
     private List<MessageRecipient> prepareRecipients(MessageTemplate template, MessageRecipient recipient) {
@@ -70,15 +72,18 @@ 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, MessageCode messageCode) {
         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");
+            String smsEaiTxId = portalProperties.get("djb.ums.sms.tx_id");
             MessageRequest smsRequest = new MessageRequest();
             smsRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode().toUpperCase()));
             smsRequest.setSubject(subject);
@@ -88,15 +93,17 @@ public class MessageSendService {
             smsRequest.setUsername(user.getUsername());
             smsRequest.setPhone(user.getPhone());
             smsRequest.setEaiInterfaceId(smsEaiInterfaceId);
-            smsRequest.setServiceId(portalProperties.get("djb.ums.sms.tx_id"));
+            smsRequest.setEaiTxId(smsEaiTxId);
+            smsRequest.setServiceId(messageCode.getServiceId());
             smsRequest.setUserId(user.getUserId());
             smsRequest.setMessageType("SMS");
-            messageRequestRepository.save(smsRequest);
+            created.add(messageRequestRepository.save(smsRequest));
             logger.debug(smsRequest.toString());
         }
 
         if (template.getEnableEmail().equalsIgnoreCase("Y")) {
             String mailEaiInterfaceId  = portalProperties.get("djb.ums.email.if_id");
+            String mailEaiTxId = portalProperties.get("djb.ums.email.tx_id");
             MessageRequest emailRequest = new MessageRequest();
             emailRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode().toUpperCase()));
             emailRequest.setSubject(subject);
@@ -106,15 +113,17 @@ public class MessageSendService {
             emailRequest.setUsername(resolveEmailUsername(user));
             emailRequest.setEmail(user.getUserId());
             emailRequest.setEaiInterfaceId(mailEaiInterfaceId);
-            emailRequest.setServiceId(portalProperties.get("djb.ums.email.tx_id"));
+            emailRequest.setEaiTxId(mailEaiTxId);
+            emailRequest.setServiceId(messageCode.getServiceId());
             emailRequest.setMessageType("EMAIL");
             emailRequest.setUserId(user.getUserId());
-            messageRequestRepository.save(emailRequest);
+            created.add(messageRequestRepository.save(emailRequest));
             logger.debug(emailRequest.toString());
         }
 
         if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
             String swingEaiInterfaceId  = portalProperties.get("djb.ums.messenger.if_id");
+            String swingEaiTxId = portalProperties.get("djb.ums.messenger.tx_id");
             MessageRequest messengerRequest = new MessageRequest();
             messengerRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode()));
             messengerRequest.setSubject(subject);
@@ -122,14 +131,17 @@ public class MessageSendService {
             messengerRequest.setMessage(messengerTemplate);
             messengerRequest.setRequestDate(LocalDateTime.now());
             messengerRequest.setUsername(user.getUsername());
-            messengerRequest.setMessengerId(user.getUserId());
+            messengerRequest.setMessengerId(user.getMessengerId());
             messengerRequest.setEaiInterfaceId(swingEaiInterfaceId);
-            messengerRequest.setServiceId(portalProperties.get("djb.ums.messenger.tx_id"));
+            messengerRequest.setEaiTxId(swingEaiTxId);
+            messengerRequest.setServiceId(messageCode.getServiceId());
             messengerRequest.setMessageType("MESSENGER");
             messengerRequest.setUserId(user.getUserId());
-            messageRequestRepository.save(messengerRequest);
+            created.add(messageRequestRepository.save(messengerRequest));
             logger.debug(messengerRequest.toString());
         }
+
+        return created;
     }
 
     /**

src/main/java/com/eactive/apim/portal/user/repository/UserLogRepository.java

@@ -4,9 +4,13 @@ import com.eactive.apim.portal.user.entity.UserLog;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
 
 public interface UserLogRepository extends JpaRepository<UserLog, Long> {
 
     Optional<UserLog> findFirstByLoginIdAndSuccessOrderByLoginTimeDesc(@Param("loginId") String loginId,@Param("success") boolean success);
 
+    @Transactional
+    long deleteByLoginId(String loginId);
+
 }