diff --git a/.DS_Store b/.DS_Store index d4a6dd4..2998a33 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/tutoRefactoring/.DS_Store b/tutoRefactoring/.DS_Store index 6fa8ae7..aedee3b 100644 Binary files a/tutoRefactoring/.DS_Store and b/tutoRefactoring/.DS_Store differ diff --git a/tutoRefactoring/src/main/java/DateUtils.java b/tutoRefactoring/src/main/java/DateUtils.java index d7efec2..f81b0fd 100644 --- a/tutoRefactoring/src/main/java/DateUtils.java +++ b/tutoRefactoring/src/main/java/DateUtils.java @@ -1,8 +1,16 @@ import java.time.LocalDate; public class DateUtils { - public static boolean isNowBetween(LocalDate startingDate, LocalDate endingDate) { - return isaBoolean(startingDate, endingDate, LocalDate.now()); + public static boolean isNowBetween(LocalDate startingDate, LocalDate endingDate, boolean inclusive) { + return inclusive ? isaBoolean( + startingDate.minusDays(1), + endingDate.plusDays(1), + LocalDate.now() + ) : isaBoolean( + startingDate, + endingDate, + LocalDate.now() + ); } private static boolean isaBoolean(LocalDate startingDate, LocalDate endingDate, LocalDate now) {