RAC-451 fix : 정산 자동 생성시 성공 여부 확인 후 재시도 하도록 수정

WE-ARE-RACCOONS · Oct 28, 2024 · 3f15399 · 3f15399
1 parent ac57a30
commit 3f15399
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 2 deletions.
diff --git a/src/main/java/com/postgraduate/batch/scheduler/JobSchedulerConfig.java b/src/main/java/com/postgraduate/batch/scheduler/JobSchedulerConfig.java
@@ -1,5 +1,8 @@
 package com.postgraduate.batch.scheduler;
 
+import com.postgraduate.domain.member.senior.domain.service.SeniorGetService;
+import com.postgraduate.domain.salary.domain.service.SalaryGetService;
+import com.postgraduate.global.slack.SlackErrorMessage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.batch.core.Job;
@@ -20,6 +23,8 @@
 @Slf4j
 @RequiredArgsConstructor
 public class JobSchedulerConfig {
+    private static final int MAX_RETRIES = 5;
+
     private final JobLauncher jobLauncher;
     @Qualifier("cancelJob")
     private final Job cancelJob;
@@ -30,6 +35,10 @@ public class JobSchedulerConfig {
     @Qualifier("salaryJobWithAdmin")
     private final Job salaryJobWithAdmin;
 
+    private final SeniorGetService seniorGetService;
+    private final SalaryGetService salaryGetService;
+    private final SlackErrorMessage slackErrorMessage;
+
     @Scheduled(cron = "0 59 23 * * *", zone = "Asia/Seoul")
     public void launchCancelJob() throws JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException {
         JobParameters jobParameters = new JobParametersBuilder()
@@ -52,12 +61,32 @@ public void launchSalaryJob() throws JobInstanceAlreadyCompleteException, JobExe
                 .addLocalDateTime("date", LocalDateTime.now())
                 .toJobParameters();
         jobLauncher.run(salaryJob, jobParameters);
+        checkSalaryJobSuccess(jobParameters);
     }
 
     public void launchSalaryJobWithAdmin() throws JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException {
         JobParameters jobParameters = new JobParametersBuilder()
                 .addLocalDateTime("date", LocalDateTime.now())
                 .toJobParameters();
-        jobLauncher.run(salaryJobWithAdmin, jobParameters);
+        checkSalaryJobSuccess(jobParameters);
+    }
+
+    private void checkSalaryJobSuccess(JobParameters jobParameters) throws JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException, JobParametersInvalidException {
+        int retries = 0;
+        boolean success = false;
+        int seniorSize = seniorGetService.allSeniorId()
+                .size();
+        while (retries < MAX_RETRIES){
+            int salarySize = salaryGetService.findAllNext()
+                    .size();
+            if (salarySize == seniorSize) {
+                success = true;
+                break;
+            }
+            jobLauncher.run(salaryJobWithAdmin, jobParameters);
+        }
+        if (!success) {
+            slackErrorMessage.sendSlackSalaryError();
+        }
     }
 }
diff --git a/src/main/java/com/postgraduate/domain/salary/domain/repository/SalaryRepository.java b/src/main/java/com/postgraduate/domain/salary/domain/repository/SalaryRepository.java
@@ -11,4 +11,5 @@
 public interface SalaryRepository extends JpaRepository<Salary, Long>, SalaryDslRepository {
     Optional<Salary> findBySeniorAndSalaryDateAndSenior_User_IsDeleteIsFalse(Senior senior, LocalDate salaryDate);
     List<Salary> findAllBySenior(Senior senior);
+    List<Salary> findAllBySalaryDate(LocalDate salaryDate);
 }
diff --git a/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java b/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java
@@ -42,4 +42,10 @@ public List<Salary> findAllLast() {
         log.info("salaryDate : {}", salaryDate);
         return salaryRepository.findAllLastSalary(salaryDate);
     }
+
+    public List<Salary> findAllNext() {
+        LocalDate salaryDate = SalaryUtil.getSalaryDate()
+                .plusDays(7);
+        return salaryRepository.findAllBySalaryDate(salaryDate);
+    }
 }
diff --git a/src/main/java/com/postgraduate/global/slack/SlackErrorMessage.java b/src/main/java/com/postgraduate/global/slack/SlackErrorMessage.java
@@ -51,6 +51,19 @@ public void sendSlackSalaryError(Long seniorId, Throwable ex) {
         }
     }
 
+    public void sendSlackSalaryError() {
+        try {
+            slackClient.send(logWebHookUrl, Payload.builder()
+                    .text("정산 자동 생성 에러 발생!! 백엔드팀 확인 요망!!")
+                    .attachments(
+                            List.of(generateSalaryErrorSlackAttachment())
+                    )
+                    .build());
+        } catch (IOException e) {
+            log.error("slack 전송 오류");
+        }
+    }
+
     public void sendSlackBizppurioError(String phoneNumber) {
         try {
             slackClient.send(logWebHookUrl, Payload.builder()
@@ -99,6 +112,18 @@ private Attachment generateSalaryErrorSlackAttachment(Long seniorId, Throwable e
                 ))
                 .build();
     }
+
+    private Attachment generateSalaryErrorSlackAttachment() {
+        String requestTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:SS").format(LocalDateTime.now());
+        return Attachment.builder()
+                .color("ff0000")
+                .title(requestTime + "에 발생한 에러 로그")
+                .fields(List.of(
+                        generateSlackField("정산 자동 생성 실패")
+                ))
+                .build();
+    }
+
     private Attachment generateBizppurioErrorSlackAttachment(String phoneNumber) {
         String requestTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:SS").format(LocalDateTime.now());
         return Attachment.builder()

diff --git a/src/main/java/com/postgraduate/global/slack/SlackUtils.java b/src/main/java/com/postgraduate/global/slack/SlackUtils.java
@@ -13,4 +13,11 @@ public static Field generateSlackField(String title, String value) {
                 .valueShortEnough(false)
                 .build();
     }
+
+    public static Field generateSlackField(String title) {
+        return Field.builder()
+                .title(title)
+                .valueShortEnough(false)
+                .build();
+    }
 }
diff --git a/src/main/resources/templates/adminPayment.html b/src/main/resources/templates/adminPayment.html
@@ -42,7 +42,7 @@
         <td><button th:paymentId="${paymentInfo.paymentId()}"
                     th:onclick="goToPost('정말 환불하겠습니까??', '/adminServer/payment/refund/' + this.getAttribute('paymentId'))">
             환불/취소</button></td>
-        <td th:text="${paymentInfo.mentoringStatus()}">mentoringStatus</td>
+        <td th:text="${paymentInfo.status()}">mentoringStatus</td>
     </tr>
     </tbody>
 </table>