Merge pull request #20 from gdsc-ssu/feat/#19

daeun084 · web-flow · commit 33b26bb5393a · 2025-04-25T08:01:19.000+09:00
diff --git a/src/main/java/com/gdg/poppet/PoppetApplication.java b/src/main/java/com/gdg/poppet/PoppetApplication.java
@@ -3,9 +3,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableJpaAuditing
+@EnableScheduling
 public class PoppetApplication {
 
 	public static void main(String[] args) {
diff --git a/src/main/java/com/gdg/poppet/chat/domain/repository/ChatRoomRepository.java b/src/main/java/com/gdg/poppet/chat/domain/repository/ChatRoomRepository.java
@@ -30,5 +30,5 @@ public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
             "WHERE cr.username = :username " +
             "AND cr.isMailSent = FALSE " +
             "ORDER BY cr.createdAt DESC")
-    List<ChatRoom> findByUsernameAndCreatedAtAndIsMailSent(@Param(value = "username") String username);
+    List<ChatRoom> findByUsernameAndCreatedAtAndNotMailSent(@Param(value = "username") String username);
 }
diff --git a/src/main/java/com/gdg/poppet/email/application/service/EmailService.java b/src/main/java/com/gdg/poppet/email/application/service/EmailService.java
@@ -17,5 +17,5 @@ public interface EmailService {
     void patchEmailAddress(String name, Long emailId, EmailRequestDto emailRequestDto);
     void deleteEmailAddress(String name, Long emailId);
 
-    void sendEmail(String username);
+    void sendEmail();
 }
diff --git a/src/main/java/com/gdg/poppet/email/application/service/EmailServiceImpl.java b/src/main/java/com/gdg/poppet/email/application/service/EmailServiceImpl.java
@@ -3,7 +3,6 @@
 import com.gdg.poppet.chat.domain.model.ChatRoom;
 import com.gdg.poppet.chat.domain.repository.ChatRoomRepository;
 import com.gdg.poppet.email.application.event.EmailSendEvent;
-import com.gdg.poppet.email.infra.application.EmailSendService;
 import com.gdg.poppet.global.exception.GlobalException;
 import com.gdg.poppet.global.status.ErrorStatus;
 import com.gdg.poppet.email.application.dto.request.EmailRequestDto;
@@ -31,7 +30,6 @@ public class EmailServiceImpl implements EmailService {
     private final UserRepository userRepository;
     private final EmailRepository emailRepository;
     private final ChatRoomRepository chatRoomRepository;
-    private final EmailSendService emailSendService;
     private final ApplicationEventPublisher applicationEventPublisher;
 
     /**
@@ -146,24 +144,24 @@ public void deleteEmailAddress(String username, Long emailId) {
      */
     @Transactional
     @Override
-    public void sendEmail(String username) {
-        // TODO: user data 얻는 과정 수정
-        User user = getUser(username);
+    public void sendEmail() {
+        for (User user : userRepository.findAll()) {
 
-        // 가장 최근 생성되고 메일을 보내지 않은 채팅방 조회
-        List<ChatRoom> chatRooms = chatRoomRepository.findByUsernameAndCreatedAtAndIsMailSent(username);
-        if (chatRooms.isEmpty()) return;
+            // 가장 최근 생성되고 메일을 보내지 않은 채팅방 조회
+            List<ChatRoom> chatRooms = chatRoomRepository.findByUsernameAndCreatedAtAndNotMailSent(user.getUsername());
+            if (chatRooms.isEmpty()) return;
 
-        // 메일 보낼 채팅방 요약 내용 추출
-        ChatRoom chatRoom = chatRooms.get(0);
-        String chatSummary = chatRoom.getSummary();
-        if (chatSummary == null) return;
+            // 메일 보낼 채팅방 요약 내용 추출
+            ChatRoom chatRoom = chatRooms.get(0);
+            String chatSummary = chatRoom.getSummary();
+            if (chatSummary == null) return;
 
-        // 메일 보냄 여부 수정
-        chatRoom.updateIsMailSent();
+            // 메일 보냄 여부 수정
+            chatRoom.updateIsMailSent();
 
-        // 메일 전송 이벤트 발행
-        applicationEventPublisher.publishEvent(new EmailSendEvent(user, chatRoom));
+            // 메일 전송 이벤트 발행
+            applicationEventPublisher.publishEvent(new EmailSendEvent(user, chatRoom));
+        }
     }
 
     private void validateIsUserAuthorizedForEmail(User user, Email email) {
diff --git a/src/main/java/com/gdg/poppet/email/infra/scheduler/EmailSendScheduler.java b/src/main/java/com/gdg/poppet/email/infra/scheduler/EmailSendScheduler.java
@@ -0,0 +1,23 @@
+package com.gdg.poppet.email.infra.scheduler;
+
+import com.gdg.poppet.email.application.service.EmailService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class EmailSendScheduler {
+    private final EmailService emailService;
+
+    // 매일 12시에 스케쥴러 수행
+    @Scheduled(cron = "0 0 12 * * *")
+    public void sendUnsentEmails() {
+        emailService.sendEmail();
+        log.info("[*] {} Email 전송 완료", LocalDateTime.now());
+    }
+}
diff --git a/src/main/java/com/gdg/poppet/email/infra/sender/listener/EmailSendEventListener.java b/src/main/java/com/gdg/poppet/email/infra/sender/listener/EmailSendEventListener.java
@@ -1,8 +1,10 @@
-package com.gdg.poppet.email.infra.application;
+package com.gdg.poppet.email.infra.sender.listener;
 
 import com.gdg.poppet.chat.domain.model.ChatRoom;
 import com.gdg.poppet.email.application.event.EmailSendEvent;
 import com.gdg.poppet.email.domain.model.Email;
+import com.gdg.poppet.email.infra.sender.service.EmailSendService;
+import com.gdg.poppet.email.infra.template.EmailTemplateGenerator;
 import com.gdg.poppet.user.domain.model.User;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -18,14 +20,14 @@
 public class EmailSendEventListener {
 
     private final EmailSendService emailSendService;
-    private final EmailTemplateService emailTemplateService;
+    private final EmailTemplateGenerator emailTemplateGenerator;
 
     @Async
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     public void handleEmailSendEvent(EmailSendEvent event) {
         User user = event.getUser();
         ChatRoom chatRoom = event.getChatRoom();
-        ByteArrayResource body = emailTemplateService.makeEmailBackground(user, chatRoom);
+        ByteArrayResource body = emailTemplateGenerator.makeEmailBackground(user, chatRoom);
 
         for (Email email : user.getEmails()) {
             try {
diff --git a/src/main/java/com/gdg/poppet/email/infra/sender/service/EmailSendService.java b/src/main/java/com/gdg/poppet/email/infra/sender/service/EmailSendService.java
@@ -1,4 +1,4 @@
-package com.gdg.poppet.email.infra.application;
+package com.gdg.poppet.email.infra.sender.service;
 
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
diff --git a/src/main/java/com/gdg/poppet/email/infra/template/ContentStream.java b/src/main/java/com/gdg/poppet/email/infra/template/ContentStream.java
@@ -1,5 +1,6 @@
-package com.gdg.poppet.email.infra.application;
+package com.gdg.poppet.email.infra.template;
 
+import com.gdg.poppet.email.infra.template.v1.RGB;
 import lombok.Getter;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDFont;
@@ -27,9 +28,9 @@ public void setFontSize(int fontSize){
         }
     }
 
-    public void setColor(float r, float g, float b){
+    public void setColor(RGB rgb){
         try {
-            this.pageContentStream.setNonStrokingColor(r, g, b);
+            this.pageContentStream.setNonStrokingColor(rgb.r(), rgb.g(), rgb.b());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/src/main/java/com/gdg/poppet/email/infra/template/EmailTemplateGenerator.java b/src/main/java/com/gdg/poppet/email/infra/template/EmailTemplateGenerator.java
@@ -1,6 +1,9 @@
-package com.gdg.poppet.email.infra.application;
+package com.gdg.poppet.email.infra.template;
 
 import com.gdg.poppet.chat.domain.model.ChatRoom;
+import com.gdg.poppet.email.infra.template.v1.TemplateV1;
+import com.gdg.poppet.email.infra.template.v1.TemplateV1Config;
+import com.gdg.poppet.email.infra.template.v1.TemplateV1Pos;
 import com.gdg.poppet.user.domain.model.User;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -25,14 +28,14 @@
 @Slf4j
 @Component
 @NoArgsConstructor
-public class EmailTemplateService {
+public class EmailTemplateGenerator {
 
     private final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-    private final int fontSize = 18;
+    private final TemplateV1Config templateV1Config = new TemplateV1().getConfig();
 
     public ByteArrayResource makeEmailBackground(User user, ChatRoom chatRoom) {
         // 배경용 PDF 파일 로드
-        PDDocument doc = loadPDDocument("email/email_background.pdf");
+        PDDocument doc = loadPDDocument("email/" + templateV1Config.BACKGROUND_FILE_NAME());
 
         // 배경용 PDF 편집
         drawBackgroundImg(doc, user, chatRoom);
@@ -73,12 +76,10 @@ private void drawBackgroundImg(PDDocument doc, User user, ChatRoom chatRoom) {
 
         try {
             PDPageContentStream pageContentStream = new PDPageContentStream(doc, page, PDPageContentStream.AppendMode.APPEND, true, true);
-            InputStream fontFile = loadFontFile("fonts/Pretendard.ttf");
+            InputStream fontFile = loadFontFile("fonts/" + templateV1Config.FONT_NAME());
             PDFont font = PDType0Font.load(doc, fontFile);
 
             ContentStream contentStream = new ContentStream(pageContentStream, font);
-            contentStream.setFontSize(fontSize);
-            contentStream.setColor(0.3f, 0.3f, 0.3f);
 
             drawUserInfo(contentStream, user.getUsername(), user.getEmailPeriod().getValue());
             drawDateTime(contentStream, chatRoom.getCreatedAt());
@@ -91,30 +92,21 @@ private void drawBackgroundImg(PDDocument doc, User user, ChatRoom chatRoom) {
     }
 
     private void drawUserInfo(ContentStream contentStream, String username, int emailPeriod) {
-        int nameX = 273;
-        int nameY = 556;
-        int periodX = 343;
-        int periodY = 522;
+        contentStream.setFontSize(TemplateV1Pos.USERNAME.fontSize);
+        contentStream.setColor(TemplateV1Pos.USERNAME.color);
 
-        contentStream.writeText(nameX, nameY, username);
-        contentStream.writeText(periodX, periodY, emailPeriod + "일");
+        contentStream.writeText(TemplateV1Pos.USERNAME.x, TemplateV1Pos.USERNAME.y, username);
+        contentStream.writeText(TemplateV1Pos.EMAIL_PERIOD.x, TemplateV1Pos.EMAIL_PERIOD.y, emailPeriod + "일");
     }
 
     private void drawDateTime(ContentStream contentStream, LocalDateTime createdAt) {
-        int createdAtX = 308;
-        int createdAtY = 488;
-        int nowY = 454;
-
-        contentStream.writeText(createdAtX, createdAtY, dateTimeFormatter.format(createdAt));
-        contentStream.writeText(createdAtX, nowY, dateTimeFormatter.format(LocalDateTime.now()));
+        contentStream.writeText(TemplateV1Pos.CREATED_AT.x, TemplateV1Pos.CREATED_AT.y, dateTimeFormatter.format(createdAt));
+        contentStream.writeText(TemplateV1Pos.NOW.x, TemplateV1Pos.NOW.y, dateTimeFormatter.format(LocalDateTime.now()));
     }
 
     private void drawSummary(ContentStream contentStream, String summary) {
-        contentStream.setFontSize(16);
-        int summaryX = 215;
-        int summaryY = 299;
-        int lineHeight = 50;
-        int maxChars = 45;
+        contentStream.setFontSize(TemplateV1Pos.SUMMARY.fontSize);
+        contentStream.setColor(TemplateV1Pos.SUMMARY.color);
 
         // 개행문자 제거
         StringBuilder summaryStringBuilder = new StringBuilder();
@@ -123,13 +115,13 @@ private void drawSummary(ContentStream contentStream, String summary) {
         }
         String summaryLine = summaryStringBuilder.toString();
 
-        // 45자 단위로 문장 분리
+        // 글자수 단위로 문장 분리
         List<String> texts = new ArrayList<>();
-        for (int start = 0; start < summaryLine.length(); start += maxChars) {
-            int end = Math.min(summaryLine.length(), start + maxChars);
-            texts.add(summaryLine.substring(start, end));
+        for (int start = 0; start < summaryLine.length(); start += templateV1Config.MAX_CHARS_IN_LINE()) {
+            int end = Math.min(summaryLine.length(), start + templateV1Config.MAX_CHARS_IN_LINE());
+            texts.add(summaryLine.substring(start, end).strip());
         }
-        contentStream.writeWrappedText(summaryX, summaryY, lineHeight, texts);
+        contentStream.writeWrappedText(TemplateV1Pos.SUMMARY.x, TemplateV1Pos.SUMMARY.y, templateV1Config.LINE_HEIGHT(), texts);
     }
 
     private PDDocument loadPDDocument(String path){
@@ -151,4 +143,4 @@ private InputStream loadFontFile(String path){
             return null;
         }
     }
-}
+}
diff --git a/src/main/java/com/gdg/poppet/email/infra/template/v1/RGB.java b/src/main/java/com/gdg/poppet/email/infra/template/v1/RGB.java
@@ -0,0 +1,4 @@
+package com.gdg.poppet.email.infra.template.v1;
+
+public record RGB(float r, float g, float b) {
+}
diff --git a/src/main/java/com/gdg/poppet/email/infra/template/v1/TemplateV1.java b/src/main/java/com/gdg/poppet/email/infra/template/v1/TemplateV1.java
@@ -0,0 +1,18 @@
+package com.gdg.poppet.email.infra.template.v1;
+
+import lombok.Getter;
+
+@Getter
+public class TemplateV1 {
+    private final TemplateV1Config config;
+
+    public TemplateV1() {
+        this.config = new TemplateV1Config(
+                "email_background.pdf",
+                "Pretendard.ttf",
+                50,
+                45,
+                18,
+                new RGB(0.3f, 0.3f, 0.3f));
+    }
+}
diff --git a/src/main/java/com/gdg/poppet/email/infra/template/v1/TemplateV1Config.java b/src/main/java/com/gdg/poppet/email/infra/template/v1/TemplateV1Config.java
@@ -0,0 +1,9 @@
+package com.gdg.poppet.email.infra.template.v1;
+
+public record TemplateV1Config(String BACKGROUND_FILE_NAME,
+                               String FONT_NAME,
+                               int LINE_HEIGHT,
+                               int MAX_CHARS_IN_LINE,
+                               int DEFAULT_FONT_SIZE,
+                               RGB DEFAULT_TEXT_COLOR) {
+}
diff --git a/src/main/java/com/gdg/poppet/email/infra/template/v1/TemplateV1Pos.java b/src/main/java/com/gdg/poppet/email/infra/template/v1/TemplateV1Pos.java
@@ -0,0 +1,17 @@
+package com.gdg.poppet.email.infra.template.v1;
+
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public enum TemplateV1Pos {
+    USERNAME(273, 556, 18, new RGB(0.3f, 0.3f, 0.3f)),
+    EMAIL_PERIOD(343, 522, 18, new RGB(0.3f, 0.3f, 0.3f)),
+    CREATED_AT(308, 488, 18, new RGB(0.3f, 0.3f, 0.3f)),
+    NOW(308, 454, 18, new RGB(0.3f, 0.3f, 0.3f)),
+    SUMMARY(215, 299, 16, new RGB(0.5f, 0.5f, 0.5f));
+
+    public final int x;
+    public final int y;
+    public final int fontSize;
+    public final RGB color;
+}
diff --git a/src/main/java/com/gdg/poppet/email/presentation/EmailController.java b/src/main/java/com/gdg/poppet/email/presentation/EmailController.java
@@ -67,13 +67,4 @@ public ResponseEntity<ApiResponse<String>> deleteEmail(
         emailService.deleteEmailAddress(name, emailId);
         return ApiResponse.success(SuccessStatus.DELETE_EMAIL_SUCCESS);
     }
-
-    @GetMapping("/send")
-    public ResponseEntity<ApiResponse<EmailDto>> sendEmail(
-            @RequestParam("name") String name
-    ) {
-        emailService.sendEmail(name);
-        // TODO: 이메일 발송 후 response 수정
-        return ApiResponse.success(SuccessStatus.OK);
-    }
 }
diff --git a/src/main/java/com/gdg/poppet/user/domain/repository/UserRepository.java b/src/main/java/com/gdg/poppet/user/domain/repository/UserRepository.java
@@ -1,6 +1,8 @@
 package com.gdg.poppet.user.domain.repository;
 
 import com.gdg.poppet.user.domain.model.User;
+
+import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -19,4 +21,9 @@ public interface UserRepository extends JpaRepository<User, Long> {
             "JOIN FETCH u.emails el " +
             "WHERE u.username = :username" )
     Optional<User> findByUsername(String username);
+
+    @Query("SELECT u " +
+            "FROM User u " +
+            "JOIN FETCH u.emails el ")
+    List<User> findAll();
 }

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {`
`30`	`30`	`"WHERE cr.username = :username " +`
`31`	`31`	`"AND cr.isMailSent = FALSE " +`
`32`	`32`	`"ORDER BY cr.createdAt DESC")`
`33`		`- List<ChatRoom> findByUsernameAndCreatedAtAndIsMailSent(@Param(value = "username") String username);`
	`33`	`+ List<ChatRoom> findByUsernameAndCreatedAtAndNotMailSent(@Param(value = "username") String username);`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ public interface EmailService {`
`17`	`17`	`void patchEmailAddress(String name, Long emailId, EmailRequestDto emailRequestDto);`
`18`	`18`	`void deleteEmailAddress(String name, Long emailId);`
`19`	`19`
`20`		`- void sendEmail(String username);`
	`20`	`+ void sendEmail();`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.gdg.poppet.email.infra.application;`
	`1`	`+package com.gdg.poppet.email.infra.sender.service;`
`2`	`2`
`3`	`3`	`import jakarta.mail.MessagingException;`
`4`	`4`	`import jakarta.mail.internet.MimeMessage;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`		`-package com.gdg.poppet.email.infra.application;`
	`1`	`+package com.gdg.poppet.email.infra.template;`
`2`	`2`
	`3`	`+import com.gdg.poppet.email.infra.template.v1.RGB;`
`3`	`4`	`import lombok.Getter;`
`4`	`5`	`import org.apache.pdfbox.pdmodel.PDPageContentStream;`
`5`	`6`	`import org.apache.pdfbox.pdmodel.font.PDFont;`
`@@ -27,9 +28,9 @@ public void setFontSize(int fontSize){`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
`30`		`- public void setColor(float r, float g, float b){`
	`31`	`+ public void setColor(RGB rgb){`
`31`	`32`	`try {`
`32`		`- this.pageContentStream.setNonStrokingColor(r, g, b);`
	`33`	`+ this.pageContentStream.setNonStrokingColor(rgb.r(), rgb.g(), rgb.b());`
`33`	`34`	`} catch (IOException e) {`
`34`	`35`	`throw new RuntimeException(e);`
`35`	`36`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package com.gdg.poppet.email.infra.template.v1;
++
 +public record RGB(float r, float g, float b) {
 +}