[UPLUS-138] 이메일, SMS 전송 로직 구현, usage-noti request 복호화/마스킹

build.gradle

@@ -46,6 +46,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 
     // Kafka
     implementation 'org.springframework.kafka:spring-kafka'

src/main/java/com/project/controller/TestNotificationController.java

@@ -0,0 +1,51 @@
+package com.project.controller;
+
+import java.util.Map;
+import java.util.UUID;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.project.notification.consumer.UsageNotificationEvent;
+import com.project.notification.service.MessageSendService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class TestNotificationController {
+
+    private final MessageSendService messageSendService;
+
+    /** [테스트용] Kafka 없이 HTTP 요청으로 알림 발송 로직 직접 트리거 */
+    @PostMapping("/test/send-notification")
+    public String sendTest(@RequestBody Map<String, Object> request) {
+
+        // 1. Postman JSON 데이터를 추출
+        Long subId = Long.valueOf((Integer) request.get("subId"));
+        String email = (String) request.get("email");
+        String phoneNumber = (String) request.get("phoneNumber");
+        Long templateGroupId = Long.valueOf((Integer) request.get("templateGroupId"));
+
+        // variables는 리스트가 포함될 수 있으므로 Object로 캐스팅
+        Map<String, Object> variables = (Map<String, Object>) request.get("variables");
+
+        // 2. 가짜 이벤트 객체(UsageNotificationEvent) 생성
+        UsageNotificationEvent event =
+                new UsageNotificationEvent(
+                        UUID.randomUUID(), // 임의의 Event ID 생성
+                        templateGroupId,
+                        new UsageNotificationEvent.SubscriptionInfo(subId, phoneNumber, email),
+                        variables);
+
+        log.info("[TEST TRIGGER] subId={}, groupId={}", subId, templateGroupId);
+
+        // 3. 서비스 로직 실행 (템플릿 조립 -> Mock Server 전송)
+        messageSendService.processEvent(event);
+
+        return "Test Triggered! EventID: " + event.eventId();
+    }
+}

src/main/java/com/project/global/util/MaskingUtil.java

@@ -0,0 +1,60 @@
+package com.project.global.util;
+
+public final class MaskingUtil {
+
+    private MaskingUtil() {}
+
+    // 마스킹 010-**12-**12의 형식
+    public static String maskPhone(String phone) {
+        if (phone == null || phone.isBlank()) {
+            return phone;
+        }
+
+        // 숫자만 추출
+        String digits = phone.replaceAll("\\D", "");
+
+        // 휴대폰 번호 길이 최소 검증 (010XXXXXXXX 기준)
+        if (digits.length() != 11) {
+            return "***";
+        }
+
+        String first = digits.substring(0, 3);
+        String middle = digits.substring(3, 7);
+        String last = digits.substring(7, 11);
+
+        // 010-**34-**12
+        return String.format("%s-**%s-**%s", first, middle.substring(2), last.substring(2));
+    }
+
+    public static String maskEmail(String email) {
+        if (email == null || email.isBlank()) {
+            return email;
+        }
+
+        int at = email.indexOf('@');
+        if (at < 0) {
+            return null;
+        } // @ 없으면 null
+
+        String local = email.substring(0, at);
+        String domain = email.substring(at); // "@domain.com"
+
+        // local 비어있으면 "***@domain.com"
+        if (local.isEmpty()) {
+            return "***" + domain;
+        }
+
+        // local 1글자 이상이면 "첫 글자 + *** + @domain.com"
+        return local.substring(0, 1) + "***" + domain;
+    }
+
+    public static Object maskByFieldName(String key, Object value) {
+        if (!(value instanceof String strVal)) return value;
+        String lowerKey = key.toLowerCase();
+
+        if (lowerKey.contains("email")) return maskEmail(strVal);
+        if (lowerKey.contains("phone") || lowerKey.contains("contact")) return maskPhone(strVal);
+
+        return value;
+    }
+}

src/main/java/com/project/notification/consumer/UsageNotificationEvent.java

@@ -7,7 +7,7 @@ public record UsageNotificationEvent(
         UUID eventId,
         Long templateGroupId,
         SubscriptionInfo subscriptionInfo,
-        Map<String, String> variables) {
+        Map<String, Object> variables) {
 
     public record SubscriptionInfo(Long subId, String phoneNumber, String email) {}
 }

src/main/java/com/project/notification/infra/entity/MessageLog.java

@@ -4,7 +4,6 @@
 import java.util.Map;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -15,7 +14,9 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
 
-import com.project.global.util.JsonMapConverter;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+
 import com.project.notification.infra.entity.enums.Channel;
 import com.project.notification.infra.entity.enums.MessageStatus;
 
@@ -68,7 +69,7 @@ public class MessageLog {
     @Column(name = "error_message", columnDefinition = "TEXT")
     private String errorMessage;
 
-    @Convert(converter = JsonMapConverter.class)
+    @JdbcTypeCode(SqlTypes.JSON)
     @Column(name = "request_payload", columnDefinition = "jsonb")
     private Map<String, Object> requestPayload;
 

src/main/java/com/project/notification/infra/entity/TemplateGroup.java

@@ -22,14 +22,14 @@ public class TemplateGroup {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "group_id")
-    private Long groupId;
+    @Column(name = "id")
+    private Long id;
 
-    @Column(name = "group_code", nullable = false, unique = true, length = 50)
-    private String groupCode;
+    @Column(name = "code", nullable = false, unique = true, length = 50)
+    private String code;
 
-    @Column(name = "group_name", nullable = false, length = 100)
-    private String groupName;
+    @Column(name = "name", nullable = false, length = 100)
+    private String name;
 
     @Column(name = "description")
     private String description;
@@ -38,9 +38,9 @@ public class TemplateGroup {
     private LocalDateTime createdAt;
 
     @Builder
-    public TemplateGroup(String groupCode, String groupName, String description) {
-        this.groupCode = groupCode;
-        this.groupName = groupName;
+    public TemplateGroup(String code, String name, String description) {
+        this.code = code;
+        this.name = name;
         this.description = description;
         this.createdAt = LocalDateTime.now();
     }

src/main/java/com/project/notification/infra/entity/TemplateVersion.java

@@ -30,8 +30,8 @@ public class TemplateVersion {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "version_id")
-    private Long versionId;
+    @Column(name = "id")
+    private Long id;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "group_id", nullable = false)
@@ -48,7 +48,7 @@ public class TemplateVersion {
     private String body;
 
     @Enumerated(EnumType.STRING)
-    @Column(name = "status", nullable = false, length = 10)
+    @Column(name = "template_status", nullable = false, length = 10)
     private TemplateStatus status;
 
     @Column(name = "version", nullable = false)

src/main/java/com/project/notification/infra/repository/TemplateGroupJpaRepository.java

@@ -8,5 +8,5 @@
 
 public interface TemplateGroupJpaRepository extends JpaRepository<TemplateGroup, Long> {
 
-    Optional<TemplateGroup> findByGroupCode(String groupCode);
+    Optional<TemplateGroup> findByCode(String code);
 }

src/main/java/com/project/notification/infra/repository/TemplateGroupRepository.java

@@ -6,5 +6,5 @@
 
 public interface TemplateGroupRepository {
 
-    Optional<TemplateGroup> findByGroupCode(String groupCode);
+    Optional<TemplateGroup> findByCode(String code);
 }

src/main/java/com/project/notification/infra/repository/TemplateGroupRepositoryImpl.java

@@ -15,7 +15,7 @@ public class TemplateGroupRepositoryImpl implements TemplateGroupRepository {
     private final TemplateGroupJpaRepository templateGroupJpaRepository;
 
     @Override
-    public Optional<TemplateGroup> findByGroupCode(String groupCode) {
-        return templateGroupJpaRepository.findByGroupCode(groupCode);
+    public Optional<TemplateGroup> findByCode(String code) {
+        return templateGroupJpaRepository.findByCode(code);
     }
 }

src/main/java/com/project/notification/infra/repository/TemplateVersionJpaRepository.java

@@ -14,25 +14,25 @@ public interface TemplateVersionJpaRepository extends JpaRepository<TemplateVers
 
     @Query(
             "SELECT tv FROM TemplateVersion tv "
-                    + "WHERE tv.templateGroup.groupCode = :groupCode "
+                    + "WHERE tv.templateGroup.code = :code "
                     + "AND tv.channel = :channel "
                     + "AND tv.status = :status "
                     + "ORDER BY tv.version DESC "
                     + "LIMIT 1")
-    Optional<TemplateVersion> findLatestByGroupCodeAndChannelAndStatus(
-            @Param("groupCode") String groupCode,
+    Optional<TemplateVersion> findLatestByCodeAndChannelAndStatus(
+            @Param("code") String code,
             @Param("channel") Channel channel,
             @Param("status") TemplateStatus status);
 
     @Query(
             "SELECT tv FROM TemplateVersion tv "
-                    + "WHERE tv.templateGroup.groupId = :groupId "
+                    + "WHERE tv.templateGroup.id = :id "
                     + "AND tv.channel = :channel "
                     + "AND tv.status = :status "
                     + "ORDER BY tv.version DESC "
                     + "LIMIT 1")
-    Optional<TemplateVersion> findLatestByGroupIdAndChannelAndStatus(
-            @Param("groupId") Long groupId,
+    Optional<TemplateVersion> findLatestByIdAndChannelAndStatus(
+            @Param("id") Long id,
             @Param("channel") Channel channel,
             @Param("status") TemplateStatus status);
 }

src/main/java/com/project/notification/infra/repository/TemplateVersionRepositoryImpl.java

@@ -19,14 +19,14 @@ public class TemplateVersionRepositoryImpl implements TemplateVersionRepository
     @Override
     public Optional<TemplateVersion> findLatestActiveByGroupCodeAndChannel(
             String groupCode, Channel channel) {
-        return templateVersionJpaRepository.findLatestByGroupCodeAndChannelAndStatus(
+        return templateVersionJpaRepository.findLatestByCodeAndChannelAndStatus(
                 groupCode, channel, TemplateStatus.ACTIVE);
     }
 
     @Override
     public Optional<TemplateVersion> findLatestActiveByGroupIdAndChannel(
             Long groupId, Channel channel) {
-        return templateVersionJpaRepository.findLatestByGroupIdAndChannelAndStatus(
+        return templateVersionJpaRepository.findLatestByIdAndChannelAndStatus(
                 groupId, channel, TemplateStatus.ACTIVE);
     }
 }

src/main/java/com/project/notification/sender/EmailSender.java

@@ -8,6 +8,7 @@
 import org.springframework.web.client.RestClient;
 import org.springframework.web.client.RestClientException;
 
+import com.project.global.util.MaskingUtil;
 import com.project.notification.dto.EmailSendRequest;
 import com.project.notification.dto.SendResponse;
 
@@ -31,7 +32,7 @@ public SendResponse send(EmailSendRequest request) {
         log.info(
                 "[EMAIL] Sending to subId: {}, email: {}, subject: {}",
                 request.subId(),
-                maskEmail(request.email()),
+                MaskingUtil.maskEmail(request.email()),
                 request.subject());
 
         if (!mockServerEnabled) {
@@ -62,15 +63,4 @@ public SendResponse send(EmailSendRequest request) {
             return new SendResponse(null, "FAIL");
         }
     }
-
-    private String maskEmail(String email) {
-        if (email == null || email.length() < 5) {
-            return "***";
-        }
-        int atIndex = email.indexOf('@');
-        if (atIndex <= 1) {
-            return "***";
-        }
-        return email.substring(0, 2) + "***" + email.substring(atIndex);
-    }
 }

src/main/java/com/project/notification/sender/SmsSender.java

@@ -8,6 +8,7 @@
 import org.springframework.web.client.RestClient;
 import org.springframework.web.client.RestClientException;
 
+import com.project.global.util.MaskingUtil;
 import com.project.notification.dto.SendResponse;
 import com.project.notification.dto.SmsSendRequest;
 
@@ -31,7 +32,7 @@ public SendResponse send(SmsSendRequest request) {
         log.info(
                 "[SMS] Sending to subId: {}, phone: {}",
                 request.subId(),
-                maskPhone(request.phone()));
+                MaskingUtil.maskPhone(request.phone()));
 
         if (!mockServerEnabled) {
             String mockMessageId = "mock-sms-" + UUID.randomUUID();
@@ -61,11 +62,4 @@ public SendResponse send(SmsSendRequest request) {
             return new SendResponse(null, "FAIL");
         }
     }
-
-    private String maskPhone(String phone) {
-        if (phone == null || phone.length() < 4) {
-            return "***";
-        }
-        return phone.substring(0, phone.length() - 4) + "****";
-    }
 }