From dd3eab6cd4ae3873b673a9db554544626f84792b Mon Sep 17 00:00:00 2001 From: chemi Date: Thu, 7 Dec 2023 18:02:48 +0900 Subject: [PATCH] =?UTF-8?q?[CHORE]=20timeInterval=20=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20(#604)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Manito/Util/Extension/Type/Date+Extension.swift | 4 ++-- Manito/ManitoTests/Domain/Entity/RoomInfoTest.swift | 12 ++++-------- .../ManitoTests/Domain/Entity/RoomListItemTest.swift | 2 +- .../Domain/Usecase/DetailEditUsecaseTest.swift | 3 +-- .../Util/Extension/Type/Date+ExtensionTest.swift | 12 ++++-------- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/Manito/Manito/Util/Extension/Type/Date+Extension.swift b/Manito/Manito/Util/Extension/Type/Date+Extension.swift index 17f7358d5..4c939a168 100644 --- a/Manito/Manito/Util/Extension/Type/Date+Extension.swift +++ b/Manito/Manito/Util/Extension/Type/Date+Extension.swift @@ -12,13 +12,13 @@ extension Date { var isToday: Bool { let now = Date() let distance = self.distance(to: now) - return distance > 0 && distance < 86400 + return distance > 0 && distance < .oneDayInterval } /// 해당 날짜가 지난날인지 var isPast: Bool { let distance = self.distance(to: Date()) - return distance > 86400 + return distance > .oneDayInterval } /// Date 값을 yy.MM.dd 형식의 String 값으로 변환 diff --git a/Manito/ManitoTests/Domain/Entity/RoomInfoTest.swift b/Manito/ManitoTests/Domain/Entity/RoomInfoTest.swift index 514864dce..4ed5e33fd 100644 --- a/Manito/ManitoTests/Domain/Entity/RoomInfoTest.swift +++ b/Manito/ManitoTests/Domain/Entity/RoomInfoTest.swift @@ -42,9 +42,8 @@ final class RoomInfoTest: XCTestCase { func test_canStart_방장이아니고_시작인원이4명이하고_시작날짜가오늘일때() { // given - let oneTimeInterval: TimeInterval = 86400 let todayString = Date().toFullString - let endDate = todayString.toDefaultDate! + oneTimeInterval + let endDate = todayString.toDefaultDate! + .oneDayInterval let endDateString = endDate.toFullString let sut = RoomInfo( roomInformation: RoomListItem(id: 0, @@ -96,9 +95,8 @@ final class RoomInfoTest: XCTestCase { func test_canStart_방장이아니고_시작인원이4명이상이고_시작날짜가오늘일때() { // given - let oneTimeInterval: TimeInterval = 86400 let todayString = Date().toFullString - let endDate = todayString.toDefaultDate! + oneTimeInterval + let endDate = todayString.toDefaultDate! + .oneDayInterval let endDateString = endDate.toFullString let sut = RoomInfo( roomInformation: RoomListItem(id: 0, @@ -150,9 +148,8 @@ final class RoomInfoTest: XCTestCase { func test_canStart_방장이고_시작인원이4명이하고_시작날짜가오늘일때() { // given - let oneTimeInterval: TimeInterval = 86400 let todayString = Date().toFullString - let endDate = todayString.toDefaultDate! + oneTimeInterval + let endDate = todayString.toDefaultDate! + .oneDayInterval let endDateString = endDate.toFullString let sut = RoomInfo( roomInformation: RoomListItem(id: 0, @@ -204,9 +201,8 @@ final class RoomInfoTest: XCTestCase { func test_canStart_방장이고_시작인원이4명이상이고_시작날짜가오늘일때() { // given - let oneTimeInterval: TimeInterval = 86400 let todayString = Date().toFullString - let endDate = todayString.toDefaultDate! + oneTimeInterval + let endDate = todayString.toDefaultDate! + .oneDayInterval let endDateString = endDate.toFullString let sut = RoomInfo( roomInformation: RoomListItem(id: 0, diff --git a/Manito/ManitoTests/Domain/Entity/RoomListItemTest.swift b/Manito/ManitoTests/Domain/Entity/RoomListItemTest.swift index aaa1147a6..0d89e2388 100644 --- a/Manito/ManitoTests/Domain/Entity/RoomListItemTest.swift +++ b/Manito/ManitoTests/Domain/Entity/RoomListItemTest.swift @@ -69,7 +69,7 @@ final class RoomListItemTest: XCTestCase { func test_isStartDatePast_오늘날짜에대해_올바르게_반환하는가() { // given let today = Date() - let ondDay: TimeInterval = 86400 + let ondDay: TimeInterval = .oneDayInterval let todayAfterFiveDays = Date() + ondDay let todayString = today.toFullString let endDateString = todayAfterFiveDays.toFullString diff --git a/Manito/ManitoTests/Domain/Usecase/DetailEditUsecaseTest.swift b/Manito/ManitoTests/Domain/Usecase/DetailEditUsecaseTest.swift index 49d2fd7d6..eb74330d3 100644 --- a/Manito/ManitoTests/Domain/Usecase/DetailEditUsecaseTest.swift +++ b/Manito/ManitoTests/Domain/Usecase/DetailEditUsecaseTest.swift @@ -48,8 +48,7 @@ final class DetailEditUsecaseTest: XCTestCase { func test_vaildStartDateIsNotPast함수에_내일날짜가_들어갔을때() { // given - let oneDay: TimeInterval = 86400 - let tomorrow = (Date() + oneDay).toFullString + let tomorrow = (Date() + .oneDayInterval).toFullString // when let sut = self.mockUsecase.vaildStartDateIsNotPast(startDate: tomorrow) // then diff --git a/Manito/ManitoTests/Util/Extension/Type/Date+ExtensionTest.swift b/Manito/ManitoTests/Util/Extension/Type/Date+ExtensionTest.swift index 73799e9b6..4346fe3d4 100644 --- a/Manito/ManitoTests/Util/Extension/Type/Date+ExtensionTest.swift +++ b/Manito/ManitoTests/Util/Extension/Type/Date+ExtensionTest.swift @@ -29,10 +29,9 @@ final class Date_ExtensionTest: XCTestCase { func test_isToday_과거날짜에_올바르게_반환하는가() { // given - let oneTimeInterval: TimeInterval = 86400 let dateString = Date().toFullString let today = dateString.toFullDate! - let sut = today - oneTimeInterval + let sut = today - .oneDayInterval // when let isToday = sut.isToday @@ -43,10 +42,9 @@ final class Date_ExtensionTest: XCTestCase { func test_isToday_미래날짜에_올바르게_반환하는가() { // given - let oneTimeInterval: TimeInterval = 86400 let dateString = Date().toFullString let today = dateString.toFullDate! - let sut = today + oneTimeInterval + let sut = today + .oneDayInterval // when let isToday = sut.isToday @@ -63,10 +61,9 @@ final class Date_ExtensionTest: XCTestCase { func test_isPast_과거날짜에_올바르게_반환하는가() { // given - let oneTimeInterval: TimeInterval = 86400 let dateString = Date().toFullString let today = dateString.toFullDate! - let sut = today - oneTimeInterval + let sut = today - .oneDayInterval // when let isPast = sut.isPast @@ -77,10 +74,9 @@ final class Date_ExtensionTest: XCTestCase { func test_isPast_미래날짜에_올바르게_반환하는가() { // given - let oneTimeInterval: TimeInterval = 86400 let dateString = Date().toFullString let today = dateString.toFullDate! - let sut = today + oneTimeInterval + let sut = today + .oneDayInterval // when let isPast = sut.isPast