Merge pull request #171 from WE-ARE-RACCOONS/develop

RAC-322 deploy : 운영 반영
WE-ARE-RACCOONS · Mar 12, 2024 · 1123150 · 1123150
2 parents 7bb3cb6 + 2408b87
commit 1123150
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
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
@@ -7,6 +7,7 @@
 import com.postgraduate.domain.salary.util.SalaryUtil;
 import com.postgraduate.domain.senior.domain.entity.Senior;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -17,13 +18,15 @@
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class SalaryGetService {
     private static final int ADMIN_PAGE_SIZE = 15;
 
     private final SalaryRepository salaryRepository;
 
     public Salary bySenior(Senior senior) {
         LocalDate salaryDate = SalaryUtil.getSalaryDate();
+        log.info("salaryDate : {}", salaryDate);
         return salaryRepository.findBySeniorAndSalaryDate(senior, salaryDate).orElseThrow(SalaryNotFoundException::new);
     }
 
@@ -37,6 +40,7 @@ public List<Salary> findAllLast() {
         LocalDate salaryDate =
                 SalaryUtil.getSalaryDate()
                 .minusDays(7);
+        log.info("salaryDate : {}", salaryDate);
         return salaryRepository.findAllLastSalary(salaryDate);
     }
 }
diff --git a/src/main/java/com/postgraduate/domain/salary/util/SalaryUtil.java b/src/main/java/com/postgraduate/domain/salary/util/SalaryUtil.java
@@ -2,15 +2,19 @@
 
 import com.postgraduate.domain.admin.presentation.constant.SalaryStatus;
 import com.postgraduate.domain.salary.domain.entity.Salary;
+import lombok.extern.slf4j.Slf4j;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 
 import static com.postgraduate.domain.admin.presentation.constant.SalaryStatus.*;
 
+@Slf4j
 public class SalaryUtil {
     private static final int SALARY_DATE = 4; // 목요일
     private static final int SALARY_END_DATE = 7; // 일요일
+    private static final int ONE_WEEK = 7;
+    private static final int ZERO = 0;
 
     private SalaryUtil() {
         throw new IllegalArgumentException();
@@ -20,12 +24,12 @@ public static LocalDate getSalaryDate() {
         LocalDate now = LocalDate.now();
         DayOfWeek dayOfWeek = now.getDayOfWeek();
         return dayOfWeek.getValue() == SALARY_END_DATE
-                ? now.plusDays(7 + (SALARY_DATE - dayOfWeek.getValue()))
-                : now.plusDays(7 + SALARY_DATE);
+                ? now.plusDays(ONE_WEEK + SALARY_DATE)
+                : now.plusDays(ONE_WEEK + (SALARY_DATE - dayOfWeek.getValue()));
     }
 
     public static SalaryStatus getStatus(Salary salary) {
-        if (salary.getTotalAmount() == 0) {
+        if (salary.getTotalAmount() == ZERO) {
             return NONE;
         }
         if (salary.status())