From d0a70997628cb3716c9174e2599fe27e7a52213e Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Fri, 7 Feb 2025 16:02:01 +0900
Subject: [PATCH 1/3] =?UTF-8?q?CLAP-321=20Feat:=20=EC=9D=B4=EB=A9=94?=
 =?UTF-8?q?=EC=9D=BC=20=EC=A0=84=EC=86=A1=20=EB=B0=A9=EC=8B=9D=20=EB=B9=84?=
 =?UTF-8?q?=EB=8F=99=EA=B8=B0=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #399
---
 .../admin/SendInvitationEmailService.java     | 29 ++++++++++++++++++
 .../service/admin/SendInvitationService.java  |  5 ++--
 .../service/member/ResetPasswordService.java  |  5 ++--
 .../member/SendPasswordEmailService.java      | 30 +++++++++++++++++++
 4 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/clap/server/application/service/admin/SendInvitationEmailService.java
 create mode 100644 src/main/java/clap/server/application/service/member/SendPasswordEmailService.java

diff --git a/src/main/java/clap/server/application/service/admin/SendInvitationEmailService.java b/src/main/java/clap/server/application/service/admin/SendInvitationEmailService.java
new file mode 100644
index 00000000..f7795289
--- /dev/null
+++ b/src/main/java/clap/server/application/service/admin/SendInvitationEmailService.java
@@ -0,0 +1,29 @@
+package clap.server.application.service.admin;
+
+import clap.server.application.port.outbound.email.SendEmailPort;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.CompletableFuture;
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SendInvitationEmailService {
+    private final SendEmailPort sendEmailPort;
+
+    @Async("emailExecutor")
+    public void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword, String userNickname) {
+        CompletableFuture.runAsync(() -> {
+            try {
+                sendEmailPort.sendInvitationEmail(memberEmail, receiverName, initialPassword, userNickname);
+            } catch (Exception e) {
+                log.error("Failed to send new password email to: {}", memberEmail, e);
+            }
+        }).exceptionally(ex -> {
+            log.error("Unexpected error occurred while sending new password email", ex);
+            return null;
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/service/admin/SendInvitationService.java b/src/main/java/clap/server/application/service/admin/SendInvitationService.java
index 7981a6e1..f350726c 100644
--- a/src/main/java/clap/server/application/service/admin/SendInvitationService.java
+++ b/src/main/java/clap/server/application/service/admin/SendInvitationService.java
@@ -4,7 +4,6 @@
 import clap.server.application.port.inbound.admin.SendInvitationUsecase;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadMemberPort;
-import clap.server.application.port.outbound.email.SendEmailPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.common.utils.InitialPasswordGenerator;
 import clap.server.domain.model.member.Member;
@@ -19,7 +18,7 @@
 public class SendInvitationService implements SendInvitationUsecase {
     private final LoadMemberPort loadMemberPort;
     private final CommandMemberPort commandMemberPort;
-    private final SendEmailPort sendEmailPort;
+    private final SendInvitationEmailService sendInvitationEmailService;
     private final InitialPasswordGenerator passwordGenerator;
     private final PasswordEncoder passwordEncoder;
 
@@ -37,7 +36,7 @@ public void sendInvitation(SendInvitationRequest request) {
 
         member.changeToApproveRequested();
 
-        sendEmailPort.sendInvitationEmail(
+        sendInvitationEmailService.sendInvitationEmail(
                 member.getMemberInfo().getEmail(),
                 member.getMemberInfo().getName(),
                 initialPassword,
diff --git a/src/main/java/clap/server/application/service/member/ResetPasswordService.java b/src/main/java/clap/server/application/service/member/ResetPasswordService.java
index 59ce3e39..488def12 100644
--- a/src/main/java/clap/server/application/service/member/ResetPasswordService.java
+++ b/src/main/java/clap/server/application/service/member/ResetPasswordService.java
@@ -5,7 +5,6 @@
 import clap.server.application.port.inbound.member.ResetInitialPasswordUsecase;
 import clap.server.application.port.inbound.member.ResetPasswordUsecase;
 import clap.server.application.port.inbound.member.SendNewPasswordUsecase;
-import clap.server.application.port.outbound.email.SendEmailPort;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.common.annotation.architecture.ApplicationService;
@@ -28,7 +27,7 @@ class ResetPasswordService implements ResetPasswordUsecase, ResetInitialPassword
     private final CommandMemberPort commandMemberPort;
     private final LoadMemberPort loadMemberPort;
     private final InitialPasswordGenerator initialPasswordGenerator;
-    private final SendEmailPort sendEmailPort;
+    private final SendPasswordEmailService sendPasswordEmailService;
 
     @Override
     public void resetPassword(Long memberId, String inputPassword) {
@@ -52,7 +51,7 @@ public void sendInitialPassword(SendInitialPasswordRequest request) {
                         () -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
 
         String newPassword = initialPasswordGenerator.generateRandomPassword();
-        sendEmailPort.sendNewPasswordEmail(request.email(), request.name(), newPassword);
+        sendPasswordEmailService.sendNewPasswordEmail(request.email(), request.name(), newPassword);
         String encodedPassword = passwordEncoder.encode(newPassword);
         member.resetPassword(encodedPassword);
         commandMemberPort.save(member);
diff --git a/src/main/java/clap/server/application/service/member/SendPasswordEmailService.java b/src/main/java/clap/server/application/service/member/SendPasswordEmailService.java
new file mode 100644
index 00000000..6e122826
--- /dev/null
+++ b/src/main/java/clap/server/application/service/member/SendPasswordEmailService.java
@@ -0,0 +1,30 @@
+package clap.server.application.service.member;
+
+import clap.server.application.port.outbound.email.SendEmailPort;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.CompletableFuture;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SendPasswordEmailService {
+    private final SendEmailPort sendEmailPort;
+
+    @Async("emailExecutor")
+    public void sendNewPasswordEmail(String email, String name, String newPassword) {
+        CompletableFuture.runAsync(() -> {
+            try {
+                sendEmailPort.sendNewPasswordEmail(email, name, newPassword);
+            } catch (Exception e) {
+                log.error("Failed to send new password email to: {}", email, e);
+            }
+        }).exceptionally(ex -> {
+            log.error("Unexpected error occurred while sending new password email", ex);
+            return null;
+        });
+    }
+}

From fe4525c5e5608891d027d81db849e83d0e3700cd Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Fri, 7 Feb 2025 16:02:25 +0900
Subject: [PATCH 2/3] =?UTF-8?q?CLAP-321=20Fix:=20=ED=86=A0=ED=81=B0=20?=
 =?UTF-8?q?=EB=A7=8C=EB=A3=8C=EC=8B=9C=20=EC=98=88=EC=99=B8=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EC=97=90=EB=9F=AC=EC=BD=94=EB=93=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/adapter/outbound/jwt/access/AccessTokenProvider.java | 2 +-
 .../outbound/jwt/access/temporary/TemporaryTokenProvider.java   | 2 +-
 .../adapter/outbound/jwt/refresh/RefreshTokenProvider.java      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/jwt/access/AccessTokenProvider.java b/src/main/java/clap/server/adapter/outbound/jwt/access/AccessTokenProvider.java
index 918555b3..371e8631 100644
--- a/src/main/java/clap/server/adapter/outbound/jwt/access/AccessTokenProvider.java
+++ b/src/main/java/clap/server/adapter/outbound/jwt/access/AccessTokenProvider.java
@@ -71,7 +71,7 @@ public boolean isTokenExpired(String token) {
             return claims.getExpiration().before(new Date());
         } catch (Exception e) {
             log.error("Token is expired: {}", e.getMessage());
-            throw new JwtException(AuthErrorCode.EMPTY_ACCESS_KEY);
+            throw new JwtException(AuthErrorCode.EXPIRED_TOKEN);
         }
     }
 
diff --git a/src/main/java/clap/server/adapter/outbound/jwt/access/temporary/TemporaryTokenProvider.java b/src/main/java/clap/server/adapter/outbound/jwt/access/temporary/TemporaryTokenProvider.java
index 6dd921ae..fe0e18db 100644
--- a/src/main/java/clap/server/adapter/outbound/jwt/access/temporary/TemporaryTokenProvider.java
+++ b/src/main/java/clap/server/adapter/outbound/jwt/access/temporary/TemporaryTokenProvider.java
@@ -71,7 +71,7 @@ public boolean isTokenExpired(String token) {
             return claims.getExpiration().before(new Date());
         } catch (Exception e) {
             log.error("Token is expired: {}", e.getMessage());
-            throw new JwtException(AuthErrorCode.EMPTY_ACCESS_KEY);
+            throw new JwtException(AuthErrorCode.EXPIRED_TOKEN);
         }
     }
 
diff --git a/src/main/java/clap/server/adapter/outbound/jwt/refresh/RefreshTokenProvider.java b/src/main/java/clap/server/adapter/outbound/jwt/refresh/RefreshTokenProvider.java
index f434181b..1326f037 100644
--- a/src/main/java/clap/server/adapter/outbound/jwt/refresh/RefreshTokenProvider.java
+++ b/src/main/java/clap/server/adapter/outbound/jwt/refresh/RefreshTokenProvider.java
@@ -68,7 +68,7 @@ public boolean isTokenExpired(String token) {
             return claims.getExpiration().before(new Date());
         } catch (Exception e) {
             log.error("Token is expired: {}", e.getMessage());
-            throw new JwtException(AuthErrorCode.EMPTY_ACCESS_KEY);
+            throw new JwtException(AuthErrorCode.EXPIRED_TOKEN);
         }
     }
 

From 9bc3af28141b6402508ac1dce6c488de12d2bb3a Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Fri, 7 Feb 2025 16:05:58 +0900
Subject: [PATCH 3/3] =?UTF-8?q?CLAP-321=20Fix:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EA=B3=A0=EC=9C=A0=20=EC=BD=94=EB=93=9C=20=ED=98=95=EC=8B=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/clap/server/domain/model/task/Task.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index bab637dc..4af89644 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -98,7 +98,7 @@ public void approveTask(Member reviewer, Member processor, LocalDateTime dueDate
     }
 
     private static String toTaskCode(Category category) {
-        return category.getMainCategory().getCode() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
+        return category.getMainCategory().getCode() + category.getCode() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
     }
 
     public void updateProcessorOrder(long newProcessorOrder) {