refactor(domain): 정렬 인터페이스 구현 삭제

src/main/java/domain/AttendanceHistories.java

@@ -4,8 +4,8 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
-import java.util.Optional;
 
 public class AttendanceHistories {
     private final List<AttendanceHistory> attendanceHistories;
@@ -41,7 +41,12 @@ public AttendanceResult editAttendanceHistory(LocalDateTime editTime) {
     public List<AttendanceHistory> getBeforeAttendanceHistories(LocalDate localDate) {
         return attendanceHistories.stream()
                 .filter(attendanceHistory -> attendanceHistory.isBeforeAttendanceHistory(localDate))
-                .sorted()
+                .sorted(new Comparator<AttendanceHistory>() {
+                    @Override
+                    public int compare(AttendanceHistory o1, AttendanceHistory o2) {
+                        return o1.getAttendanceDate().compareTo(o2.getAttendanceDate());
+                    }
+                })
                 .toList();
     }
 
@@ -51,23 +56,20 @@ public AttendanceAnalyze getAttendanceAnalyze(LocalDate standard) {
 
     private void createAttendance(List<LocalDateTime> histories, LocalDate localDate,
                                   List<AttendanceHistory> allHistories) {
-        if (!Holiday.isHoliday(localDate)) {
-            Optional<LocalDateTime> date = histories.stream().filter(history -> {
-                        LocalDate historyDate = history.toLocalDate();
-                        return historyDate.isEqual(localDate);
-                    })
-                    .findAny();
-            allHistories.add(makeAttendanceHistory(date, localDate));
+        if (Holiday.isHoliday(localDate)) {
+            return;
         }
+        AttendanceHistory attendanceHistory = histories.stream()
+                .filter(history -> {
+                    LocalDate historyDate = history.toLocalDate();
+                    return historyDate.isEqual(localDate);
+                })
+                .findAny()
+                .map(AttendanceHistory::new)
+                .orElseGet(() -> new AttendanceHistory(localDate, null));
+        allHistories.add(attendanceHistory);
     }
 
-    private AttendanceHistory makeAttendanceHistory(Optional<LocalDateTime> date, LocalDate standardDate) {
-        return date.map(AttendanceHistory::new)
-                .orElseGet(() -> new AttendanceHistory(standardDate, null));
-
-    }
-
-
     public static class Validator {
         public static void validateAddAttendanceHistory(List<AttendanceHistory> attendanceHistories,
                                                         LocalDateTime localDateTime) {

src/main/java/domain/AttendanceHistory.java

@@ -8,25 +8,25 @@
 import java.util.Optional;
 import util.DateFormatter;
 
-public class AttendanceHistory implements Comparable<AttendanceHistory> {
+public class AttendanceHistory {
     private final LocalDate attendanceDate;
     private final LocalTime attendanceTime;
-    private final AttendanceResult AttendanceResult;
+    private final AttendanceResult attendanceResult;
 
     public AttendanceHistory(LocalDateTime attendanceTime) {
         AttendanceValidator.validateAttendanceTime(attendanceTime.toLocalTime());
         AttendanceValidator.validateAttendanceDate(attendanceTime.toLocalDate());
         this.attendanceDate = attendanceTime.toLocalDate();
         this.attendanceTime = attendanceTime.toLocalTime();
-        this.AttendanceResult = findAttendanceResult(this.attendanceDate, this.attendanceTime);
+        this.attendanceResult = findAttendanceResult(this.attendanceDate, this.attendanceTime);
     }
 
     public AttendanceHistory(LocalDate attendanceDate, LocalTime attendanceTime) {
         AttendanceValidator.validateAttendanceTime(attendanceTime);
         AttendanceValidator.validateAttendanceDate(attendanceDate);
         this.attendanceDate = attendanceDate;
         this.attendanceTime = attendanceTime;
-        this.AttendanceResult = findAttendanceResult(this.attendanceDate, this.attendanceTime);
+        this.attendanceResult = findAttendanceResult(this.attendanceDate, this.attendanceTime);
     }
 
     private AttendanceResult findAttendanceResult(LocalDate attendanceDate, LocalTime attendanceTime) {
@@ -51,21 +51,16 @@ public boolean equals(Object o) {
         }
         AttendanceHistory that = (AttendanceHistory) o;
         return Objects.equals(attendanceDate, that.attendanceDate) && Objects.equals(attendanceTime,
-                that.attendanceTime) && Objects.equals(AttendanceResult, that.AttendanceResult);
+                that.attendanceTime) && Objects.equals(attendanceResult, that.attendanceResult);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(attendanceDate, attendanceTime, AttendanceResult);
-    }
-
-    @Override
-    public int compareTo(AttendanceHistory o) {
-        return this.attendanceDate.compareTo(o.attendanceDate);
+        return Objects.hash(attendanceDate, attendanceTime, attendanceResult);
     }
 
     public AttendanceResult getAttendanceResult() {
-        return AttendanceResult;
+        return attendanceResult;
     }
 
     public LocalDate getAttendanceDate() {
@@ -78,7 +73,7 @@ public Optional<LocalTime> getAttendanceTime() {
 
     public static class AttendanceValidator {
         private static void validateAttendanceTime(LocalTime attendanceTime) {
-            if (attendanceTime != null && CampusOpenTime.cantAttendance(attendanceTime)) {
+            if (attendanceTime != null && CampusOpenTime.canNotAttendance(attendanceTime)) {
                 throw new IllegalArgumentException("[ERROR] 캠퍼스 운영 시간은 08:00 ~ 23:00 입니다.");
             }
         }