Merge pull request #337 from boostcampwm-2024/refactor/email-service-coupling

♻️ refactor: mailService 내 강결합 제거

Author: asn6878

server/src/common/email/email.service.ts

@@ -31,33 +31,41 @@ export class EmailService {
     });
   }
 
-  async sendMail(rss: Rss, approveFlag: boolean, description?: string) {
+  private async sendMail(
+    mailOptions: nodemailer.SendMailOptions,
+  ): Promise<void> {
     try {
-      const { subject, content } = this.createEmail(
-        rss,
-        approveFlag,
-        description,
-      );
-      await this.transporter.sendMail({
-        from: `Denamu<${this.emailUser}>`,
-        to: `${rss.userName}<${rss.email}>`,
-        subject,
-        html: content,
-      });
-      this.logger.log(`${rss.email} 주소로 메일이 전송되었습니다`);
+      await this.transporter.sendMail(mailOptions);
+      this.logger.log(`${mailOptions.to} 이메일 전송 성공`);
     } catch (error) {
-      this.logger.error(
-        `${rss.email} 주소로 메일 전송 중 오류가 발생했습니다: ${error}`,
-      );
+      this.logger.error(`${mailOptions.to} 이메일 전송 실패: ${error}`);
     }
   }
 
-  private createEmail(rss: Rss, approveFlag: boolean, description?: string) {
-    const result = approveFlag ? `승인` : `거부`;
-    const mail = {
+  async sendRssMail(
+    rss: Rss,
+    approveFlag: boolean,
+    description?: string,
+  ): Promise<void> {
+    const mailOptions = this.createRssRegistrationMail(
+      rss,
+      approveFlag,
+      description,
+    );
+    await this.sendMail(mailOptions);
+  }
+
+  private createRssRegistrationMail(
+    rss: Rss,
+    approveFlag: boolean,
+    description?: string,
+  ): nodemailer.SendMailOptions {
+    const result = approveFlag ? '승인' : '거부';
+    return {
+      from: `Denamu<${this.emailUser}>`,
+      to: `${rss.userName}<${rss.email}>`,
       subject: `[🎋 Denamu] RSS 등록이 ${result} 되었습니다.`,
-      content: createMailContent(rss, approveFlag, this.emailUser, description),
+      html: createMailContent(rss, approveFlag, this.emailUser, description),
     };
-    return mail;
   }
 }

server/src/rss/service/rss.service.ts

@@ -107,7 +107,11 @@ export class RssService {
       ]);
       return rejectRss;
     });
-    this.emailService.sendMail(rejectRss, false, rssRejectBodyDto.description);
+    this.emailService.sendRssMail(
+      rejectRss,
+      false,
+      rssRejectBodyDto.description,
+    );
   }
 
   async readAcceptHistory() {
@@ -167,6 +171,6 @@ export class RssService {
       rssAccept,
     );
     this.feedCrawlerService.saveAiQueue(feedsWithId);
-    this.emailService.sendMail(rssAccept, true);
+    this.emailService.sendRssMail(rssAccept, true);
   }
 }