[merge] 260208 main merge

src/main/java/com/permitseoul/permitserver/domain/admin/guestticket/api/service/AdminGuestTicketService.java

@@ -1,6 +1,7 @@
 package com.permitseoul.permitserver.domain.admin.guestticket.api.service;
 
 import com.permitseoul.permitserver.domain.admin.guestticket.core.domain.GuestTicketStatus;
+import com.permitseoul.permitserver.domain.admin.guestticket.core.exception.GuestEmailSendException;
 import com.permitseoul.permitserver.domain.admin.guestticket.core.exception.GuestTicketNotFoundException;
 import com.permitseoul.permitserver.domain.admin.guestticket.core.facade.AdminGuestTicketFacade;
 import com.permitseoul.permitserver.domain.admin.property.QrCodeProperties;
@@ -55,9 +56,9 @@ public void issueGuestTickets(final long eventId, final List<GuestTicketIssueReq
             throw new AdminGuestTicketApiException(ErrorCode.NOT_FOUND_EVENT);
         } catch (GuestTicketNotFoundException e) {
             throw new AdminGuestTicketApiException(ErrorCode.NOT_FOUND_GUEST_TICKET);
-        } catch (Exception e) {
+        } catch (GuestEmailSendException e) {
             log.error("[Guest Ticket Email] 발송 실패 - 이벤트아이디:{}, 수신자 정보 : {}", eventId, guestTicketList, e);
-            throw new AdminGuestTicketApiException(ErrorCode.INTERNAL_SERVER_ERROR);
+            throw new AdminGuestTicketApiException(ErrorCode.INTERNAL_EMAIL_SEND_ERROR);
         }
     }
 

src/main/java/com/permitseoul/permitserver/domain/admin/guestticket/core/exception/GuestEmailSendException.java

@@ -0,0 +1,4 @@
+package com.permitseoul.permitserver.domain.admin.guestticket.core.exception;
+
+public class GuestEmailSendException extends GuestTicketCoreException {
+}

src/main/java/com/permitseoul/permitserver/domain/admin/util/GuestTicketEmailSender.java

@@ -1,5 +1,6 @@
 package com.permitseoul.permitserver.domain.admin.util;
 
+import com.permitseoul.permitserver.domain.admin.guestticket.core.exception.GuestEmailSendException;
 import com.permitseoul.permitserver.domain.admin.property.EmailProperties;
 import com.permitseoul.permitserver.domain.admin.util.exception.EmailSendException;
 import com.permitseoul.permitserver.domain.event.core.domain.EventType;
@@ -9,6 +10,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.InputStreamSource;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
@@ -37,6 +39,7 @@ public class GuestTicketEmailSender {
     private final static String INLINE_CONTENT_ID = "qr-";
     private final static String INLINE_CONTENT_TYPE = "image/png";
 
+
     public void sendGuestTicketsEmail(
             final String toEmail,
             final String guestName,
@@ -53,23 +56,39 @@ public void sendGuestTicketsEmail(
             context.setVariable(CONTEXT_TICKET_CODES, ticketCodes);
             final String html = templateEngine.process(TEMPLATE_NAME, context);
 
+
+            final String subject = "[" + eventType.getDisplayName() + "] Guest Ticket Info";
+            final String plain =
+                    subject + "\n" +
+                            "안녕하세요 " + guestName + "님\n" +
+                            "Event: " + eventName + "\n" +
+                            "Ticket Code: " + String.join(", ", ticketCodes) + "\n";
+
+
             final MimeMessage mimeMessage = mailSender.createMimeMessage();
             final MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, StandardCharsets.UTF_8.name()); //multipart:true는 인라인 이미지 추가
             helper.setFrom(emailProperties.sender(), SENDER_NAME);
             helper.setTo(toEmail);
-            helper.setSubject("​[" + eventType.getDisplayName() + "] Guest Ticket Info"); //Gmail thread subject가 맨앞 "[]" 태그를 무시/정규화하는 경우가 있어, Zero-width space(U+200B)로 패턴 인식을 회피
-            helper.setText(html, true);
+            mimeMessage.setSubject(subject, StandardCharsets.UTF_8.name());
+
+//            helper.setSubject("​ [" + eventType.getDisplayName() + "] Guest Ticket Info"); //Gmail thread subject가 맨앞 "[]" 태그를 무시/정규화하는 경우가 있어, Zero-width space(U+200B)로 패턴 인식을 회피
+            helper.setText(plain, html);
 
             for (int i = 0; i < qrPngs.size(); i++) {
                 final InputStreamSource src = new ByteArrayResource(qrPngs.get(i));
                 helper.addInline(INLINE_CONTENT_ID + i, src, INLINE_CONTENT_TYPE);
+
+                String fileName = "guest ticket-" + ticketCodes.get(i) + ".png";
+                helper.addAttachment(fileName, src, "image/png");
             }
 
             mailSender.send(mimeMessage);
             log.info("[Guest Ticket Email] 발송 완료 - 수신자: {} ({}), 이벤트: {}, 티켓 수: {}",
                     guestName, toEmail, eventName, ticketCodes.size());
-        } catch (MessagingException | UnsupportedEncodingException e) {
-            throw new EmailSendException(ErrorCode.INTERNAL_EMAIL_SEND_ERROR);
+        } catch (Exception e) {
+            log.error("[Guest Ticket Email] 발송 실패 - to={}, guestName={}, event={}, ticketCount={}",
+                    toEmail, guestName, eventName, ticketCodes.size(), e);
+            throw new GuestEmailSendException();
         }
     }
 }

src/main/java/com/permitseoul/permitserver/domain/admin/util/NotionResponseMapper.java

@@ -1,6 +1,5 @@
 package com.permitseoul.permitserver.domain.admin.util;
 
-import com.permitseoul.permitserver.domain.admin.base.AdminBaseException;
 import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.NotionPublicUrlNotFoundException;
 import com.permitseoul.permitserver.domain.admin.timetable.base.core.exception.NotionUrlMalformedException;
 import com.permitseoul.permitserver.domain.admin.util.exception.PermitListSizeNotMatchException;
@@ -9,9 +8,7 @@
 import com.permitseoul.permitserver.domain.eventtimetable.blockmedia.domain.entity.TimetableBlockMediaEntity;
 import com.permitseoul.permitserver.domain.eventtimetable.category.core.domain.entity.TimetableCategoryEntity;
 import com.permitseoul.permitserver.domain.eventtimetable.stage.core.domain.entity.TimetableStageEntity;
-import com.permitseoul.permitserver.global.exception.DateFormatException;
 import com.permitseoul.permitserver.global.exception.PermitIllegalStateException;
-import com.permitseoul.permitserver.global.exception.UrlSecureException;
 import com.permitseoul.permitserver.global.external.notion.dto.NotionCategoryDatasourceResponse;
 import com.permitseoul.permitserver.global.external.notion.dto.NotionStageDatasourceResponse;
 import com.permitseoul.permitserver.global.external.notion.dto.NotionTimetableDatasourceResponse;
@@ -21,8 +18,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

src/main/java/com/permitseoul/permitserver/domain/admin/util/PngFontUtil.java

@@ -0,0 +1,30 @@
+package com.permitseoul.permitserver.domain.admin.util;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+
+import java.awt.*;
+import java.io.InputStream;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Slf4j
+public final class PngFontUtil {
+    private static final Font BASE = loadBase();
+    private static final Font SIZE_12 = BASE.deriveFont(Font.PLAIN, 12f);
+
+
+    private static Font loadBase() {
+        try (InputStream is = new ClassPathResource("fonts/NotoSansKR-Regular.ttf").getInputStream()) {
+            return Font.createFont(Font.TRUETYPE_FONT, is);
+        } catch (Exception e) {
+            log.warn("Failed to load font", e);
+            return new Font("SansSerif", Font.PLAIN, 12);
+        }
+    }
+
+    public static Font size12() {
+        return SIZE_12;
+    }
+}

src/main/java/com/permitseoul/permitserver/domain/admin/util/QrCodeUtil.java

@@ -80,7 +80,7 @@ private static BufferedImage addEventNameOnTop(final BufferedImage qrImage, fina
             g.drawImage(qrImage, 0, TEXT_AREA_HEIGHT, null);
 
             g.setColor(Color.BLACK);
-            g.setFont(new Font("SansSerif", Font.PLAIN, 15));
+            g.setFont(PngFontUtil.size12());
             final FontMetrics fm = g.getFontMetrics();
 
             final String text = ellipsize(label, fm, width - (TEXT_PADDING_X * 2));