#4 연차 수정

FC-MINI-6 · Aug 3, 2023 · a143700 · a143700
1 parent 3ad1f55
commit a143700
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 34 deletions.
diff --git a/src/main/java/com/example/kdtbe5_miniproject/dayoff/DayOff.java b/src/main/java/com/example/kdtbe5_miniproject/dayoff/DayOff.java
@@ -34,12 +34,13 @@ public class DayOff {
     private LocalDate processAt;
 
     public float getUsedDayOff() {
-        if (this.status != null && this.status == DayOffStatus.valueOf("승인")) {
+        if (this.status != null && (this.status == DayOffStatus.valueOf("승인") || this.status == DayOffStatus.valueOf("대기"))) {
             return this.numOfDayOff;
         } else {
             return 0f;
         }
     }
+
     public void setStatus(DayOffStatus status) {
         this.status = status;
     }

diff --git a/src/main/java/com/example/kdtbe5_miniproject/dayoff/DayOffService.java b/src/main/java/com/example/kdtbe5_miniproject/dayoff/DayOffService.java
@@ -28,7 +28,7 @@ public void registerDayOff(Long userId, DayOffRequest.RegisterDTO registerDTO) {
         List<DayOff> dayOffs = dayOffRepository.findByUser(user);
 
         // 동일한 날짜에 신청했는지 체크
-        for(DayOff dayOff : dayOffs) {
+        for (DayOff dayOff : dayOffs) {
             if (!((dayOff.getEndDate().isBefore(registerDTO.getStartDate()) ||
                     dayOff.getEndDate().isEqual(registerDTO.getStartDate())) ||
                     (dayOff.getStartDate().isAfter(registerDTO.getEndDate()) ||
@@ -49,10 +49,11 @@ public void registerDayOff(Long userId, DayOffRequest.RegisterDTO registerDTO) {
         }
 
         // 연차 유형에 따른 신청일 계산
-        float appliedDayOff = 0.0f;
+        float appliedDayOff = 1.0f;
         if (registerDTO.getType() == DayOffType.연차) {
             appliedDayOff = registerDTO.getStartDate().datesUntil(registerDTO.getEndDate()).filter(d -> d.getDayOfWeek().getValue() < 6).count();
         } else if (registerDTO.getType() == DayOffType.오전반차 || registerDTO.getType() == DayOffType.오후반차) {
+            // 반차일 경우 총 연차에서 0.5 차감
             appliedDayOff = 0.5f;
         }
 
@@ -62,64 +63,42 @@ public void registerDayOff(Long userId, DayOffRequest.RegisterDTO registerDTO) {
         }
 
         // 남은 휴가 확인
-        float totalDayOff = determineInitialDayOff(user);
+        float totalDayOff = user.determineInitialDayOff();
         float usedDayOff = 0f;
 
-        for(DayOff dayOff : dayOffs){
+        for (DayOff dayOff : dayOffs) {
             usedDayOff += dayOff.getStartDate().datesUntil(dayOff.getEndDate()).filter(d -> d.getDayOfWeek().getValue() < 6).count();
         }
 
-        float remainingDayOff = totalDayOff - usedDayOff;
+        float remainingDayOff = totalDayOff - usedDayOff - appliedDayOff;
 
-        if (remainingDayOff < appliedDayOff) {
+        if (remainingDayOff < 0) {
             throw new IllegalArgumentException("남은 연차가 부족합니다.");
         }
 
-
         DayOff dayOff = registerDTO.toEntity(user, appliedDayOff);
         dayOffRepository.save(dayOff);
     }
 
-
     // 나의 남은 연차 (초기 연차만 설정)
     @Transactional(readOnly = true)
     public DayOffResponse.MyDayOffDTO myDayOffInfo(Long userId) {
         User user = userRepository.findById(userId).orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다."));
 
-        float totalDayOff = determineInitialDayOff(user);
+        float totalDayOff = user.determineInitialDayOff();
         float usedDayOff = 0;
-
         List<DayOff> dayOffs = dayOffRepository.findByUser(user);
+
         for(DayOff dayOff : dayOffs){
-            usedDayOff += dayOff.getUsedDayOff();
+            if (dayOff.getStatus() == DayOffStatus.승인 || dayOff.getStatus() == DayOffStatus.대기) {
+                usedDayOff += dayOff.getUsedDayOff();
+            }
         }
 
         float remainingDayOff = totalDayOff - usedDayOff;
         return new DayOffResponse.MyDayOffDTO(totalDayOff, usedDayOff, remainingDayOff);
     }
 
-
-
-    // 직급별 연차 계산
-    private int determineInitialDayOff(User user) {
-        int position = user.getPosition().getTypeNumber();
-        if (position == 0) {
-            return 15;                  // 사원
-        } else if (position == 1) {
-            return 17;                  // 주임
-        }else if (position == 2) {
-            return 20;                  // 대리
-        }else if (position == 3) {
-            return 22;                  // 과장
-        }else if (position == 4) {
-            return 23;                  // 차장
-        } else if (position == 5) {
-            return 26;                  // 부장
-        } else {
-            throw new IllegalArgumentException("직급: " + position);
-        }
-    }
-
     // 내 연차 리스트
     @Transactional(readOnly = true)
     public DayOffResponse.AppliedDayOffDTO[] myAppliedDayOffs(Long userId) {

diff --git a/src/main/java/com/example/kdtbe5_miniproject/user/User.java b/src/main/java/com/example/kdtbe5_miniproject/user/User.java
@@ -32,4 +32,23 @@ public void updatePhoneNumber(String newPhoneNum) {
         this.phoneNumber = newPhoneNum;
     }
 
+    // 직급별 연차 계산
+    public int determineInitialDayOff() {
+        int position = this.getPosition().getTypeNumber();
+        if (position == 0) {
+            return 15;                  // 사원
+        } else if (position == 1) {
+            return 17;                  // 주임
+        } else if (position == 2) {
+            return 20;                  // 대리
+        } else if (position == 3) {
+            return 22;                  // 과장
+        } else if (position == 4) {
+            return 23;                  // 차장
+        } else if (position == 5) {
+            return 26;                  // 부장
+        } else {
+            throw new IllegalArgumentException("직급: " + position);
+        }
+    }
 }