Refactor #123: PushAlarmAspect에서 AOP @Around -> @AfterReturning

dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/MemberCommandUseCase.java

@@ -4,9 +4,9 @@
 import b1nd.dodam.domain.rds.member.entity.Student;
 import b1nd.dodam.domain.rds.member.entity.Teacher;
 import b1nd.dodam.domain.rds.member.enumeration.ActiveStatus;
-import b1nd.dodam.domain.rds.member.enumeration.MemberRole;
 import b1nd.dodam.domain.rds.member.event.StudentRegisteredEvent;
-import b1nd.dodam.domain.rds.member.exception.*;
+import b1nd.dodam.domain.rds.member.exception.BroadcastClubMemberDuplicateException;
+import b1nd.dodam.domain.rds.member.exception.MemberDuplicateException;
 import b1nd.dodam.domain.rds.member.repository.BroadcastClubMemberRepository;
 import b1nd.dodam.domain.rds.member.repository.MemberRepository;
 import b1nd.dodam.domain.rds.member.repository.StudentRepository;

dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/nightstudy/application/NightStudyUseCase.java

@@ -63,7 +63,7 @@ private void throwExceptionWhenStudentIsNotApplicant(NightStudy nightStudy, Stud
         }
     }
 
-    @PushAlarmEvent(target = "심야자습", status = ApprovalStatus.PENDING)
+    @PushAlarmEvent(target = "심야자습", status = ApprovalStatus.ALLOWED)
     public Response allow(Long id) {
         modifyStatus(id, ApprovalStatus.ALLOWED, null);
         return Response.noContent("심야자습 승인 성공");
@@ -75,7 +75,7 @@ public Response reject(Long id, Optional<RejectNightStudyReq> req) {
         return Response.noContent("심야자습 거절 성공");
     }
 
-    @PushAlarmEvent(target = "심야자습", status = ApprovalStatus.PENDING)
+    @PushAlarmEvent(target = "심야자습", status = ApprovalStatus.REJECTED)
     public Response revert(Long id) {
         modifyStatus(id, ApprovalStatus.PENDING, null);
         return Response.noContent("심야자습 대기 성공");

dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/outsleeping/application/OutSleepingUseCase.java

@@ -57,7 +57,7 @@ public void throwExceptionWhenStudentIsNotApplicant(OutSleeping o) {
         }
     }
 
-    @PushAlarmEvent(target = "외박", status = ApprovalStatus.PENDING)
+    @PushAlarmEvent(target = "외박", status = ApprovalStatus.ALLOWED)
     public Response allow(Long id) {
         modifyStatus(id, ApprovalStatus.ALLOWED, null);
         return Response.noContent("외박 승인 성공");
@@ -69,7 +69,7 @@ public Response reject(Long id, Optional<RejectOutSleepingReq> req) {
         return Response.noContent("외박 거절 성공");
     }
 
-    @PushAlarmEvent(target = "외박", status = ApprovalStatus.PENDING)
+    @PushAlarmEvent(target = "외박", status = ApprovalStatus.REJECTED)
     public Response revert(Long id) {
         modifyStatus(id, ApprovalStatus.PENDING, null);
         return Response.noContent("외박 대기 성공");

dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/support/pushalarm/PushAlarmAspect.java

@@ -9,6 +9,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.context.ApplicationEventPublisher;
@@ -26,44 +27,27 @@ public class PushAlarmAspect {
     private final OutGoingService outGoingService;
     private final OutSleepingService outSleepingService;
 
-    @Around("@annotation(pushAlarmEvent)")
-    public Object handlePushAlarmEvent(ProceedingJoinPoint joinPoint, PushAlarmEvent pushAlarmEvent) {
-
-        Object result = proceedJoinPointSafely(joinPoint);
-
-        Long id = getIdFromArgs(joinPoint.getArgs());
-        String rejectReason = getRejectReasonFromArgs(joinPoint.getArgs());
+    @AfterReturning(pointcut = "@annotation(pushAlarmEvent)", returning = "result")
+    public void handlePushAlarmEvent(Object result, PushAlarmEvent pushAlarmEvent) {
         String target = pushAlarmEvent.target();
-        ApprovalStatus status = pushAlarmEvent.status();
-
-        Student student = getStudentByTargetAndId(target, id);
-
-        sendPushAlarm(student, target, rejectReason, status);
-
-        return result;
-    }
-
-    private Object proceedJoinPointSafely(ProceedingJoinPoint joinPoint) {
-        try {
-            return joinPoint.proceed();
-        } catch (Throwable e) {
-            throw new InternalServerException();
-        }
+        sendPushAlarm(
+                getStudentByTargetAndId(target, getIdFromArgs(result)),
+                target,
+                getRejectReasonFromArgs(result),
+                pushAlarmEvent.status()
+        );
     }
 
-    private Long getIdFromArgs(Object[] args) {
-        if (args[0] instanceof Long id) {
+    private Long getIdFromArgs(Object result) {
+        if (result instanceof Long id)
             return id;
-        } else {
-            throw new InternalServerException();
-        }
+        else throw new InternalServerException();
     }
 
-    private String getRejectReasonFromArgs(Object[] args) {
-        if (args.length > 1 && args[1] instanceof Optional<?> optionalArg) {
+    private String getRejectReasonFromArgs(Object result) {
+        if (result instanceof Optional<?> optionalArg)
             return (String) optionalArg.orElse(null);
-        }
-        return null;
+        else throw new InternalServerException();
     }
 
     private Student getStudentByTargetAndId(String target, Long id) {
@@ -76,8 +60,7 @@ private Student getStudentByTargetAndId(String target, Long id) {
     }
 
     private void sendPushAlarm(Student student, String target, String rejectReason, ApprovalStatus status) {
-        String pushToken = student.getMember().getPushToken();
-        ApprovalAlarmEvent alarmEvent = ApprovalAlarmUtil.createAlarmEvent(pushToken, target, rejectReason, status);
-        eventPublisher.publishEvent(alarmEvent);
+        eventPublisher.publishEvent(ApprovalAlarmUtil.createAlarmEvent(
+                student.getMember().getPushToken(), target, rejectReason, status));
     }
 }

dodam-in-system-available/dodam-firebase-client/src/main/java/b1nd/dodam/firebase/client/FCMClient.java

@@ -15,7 +15,7 @@
 public class FCMClient {
     public void sendMessage(String pushToken, String title, String body) {
         try {
-            if(!pushToken.isBlank()){
+            if(pushToken != null && !pushToken.isBlank()){
                 FirebaseMessaging.getInstance().send(Message.builder()
                         .setNotification(Notification.builder()
                                 .setTitle(title)

dodam-system-domain/dodam-domain-rds/src/main/java/b1nd/dodam/domain/rds/member/entity/Member.java

@@ -46,7 +46,6 @@ public class Member extends BaseEntity {
     @NotNull
     private String phone;
 
-    @NotNull
     @JsonIgnore
     @Column(columnDefinition = "TEXT")
     private String pushToken;