From 62664f893a0b54e58dcc33e8b1e9c47b0343a4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B5=D0=BD=D0=B8=D1=81=20=D0=9A=D0=B0=D0=B7=D0=B0?= =?UTF-8?q?=D0=BD=D1=86=D0=B5=D0=B2?= <51866756+denis14082000@users.noreply.github.com> Date: Wed, 12 Jan 2022 19:07:36 +0300 Subject: [PATCH] Changed datatype in dateUtils (#60) --- common/src/main/kotlin/ru/touchin/common/date/DateUtils.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/kotlin/ru/touchin/common/date/DateUtils.kt b/common/src/main/kotlin/ru/touchin/common/date/DateUtils.kt index e8113d5..bca957d 100644 --- a/common/src/main/kotlin/ru/touchin/common/date/DateUtils.kt +++ b/common/src/main/kotlin/ru/touchin/common/date/DateUtils.kt @@ -6,6 +6,7 @@ import java.time.LocalDate import java.time.LocalDateTime import java.time.ZoneId import java.time.ZonedDateTime +import java.time.temporal.TemporalAmount import java.util.* object DateUtils { @@ -20,9 +21,9 @@ object DateUtils { currentDate: ZonedDateTime = ZonedDateTime.now() ) = !isExpired(currentDate) - fun ZonedDateTime.isExpired(duration: Duration) = isExpired(ZonedDateTime.now().minus(duration)) + fun ZonedDateTime.isExpired(temporalAmount: TemporalAmount) = isExpired(ZonedDateTime.now().minus(temporalAmount)) - fun ZonedDateTime.isNotExpired(duration: Duration) = !isExpired(duration) + fun ZonedDateTime.isNotExpired(temporalAmount: TemporalAmount) = !isExpired(temporalAmount) fun ZonedDateTime.equals(arg: ZonedDateTime, maxDiff: Duration) = Duration.between(this, arg) <= maxDiff