From 1bbacd66c438d76fcc05c507d59757804d574aa2 Mon Sep 17 00:00:00 2001 From: AhnSangHoon Date: Fri, 26 Aug 2022 01:01:19 +0900 Subject: [PATCH] =?UTF-8?q?:recycle:=20=EB=A7=88=EA=B0=90=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EC=9D=B4=ED=9B=84=EC=97=90=EB=8F=84=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EC=97=90=20=EA=B8=B0=ED=94=84=ED=8B=B0?= =?UTF-8?q?=EC=BD=98=EC=9D=B4=20=EB=82=A8=EC=95=84=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=EB=8C=80=EC=9D=91=20(#189)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Projects/App/Sources/Main/MainViewModel.swift | 3 +++ Projects/App/Sources/Usecase/GifticonEntity.swift | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Projects/App/Sources/Main/MainViewModel.swift b/Projects/App/Sources/Main/MainViewModel.swift index 4df50490..e934ff13 100644 --- a/Projects/App/Sources/Main/MainViewModel.swift +++ b/Projects/App/Sources/Main/MainViewModel.swift @@ -191,7 +191,10 @@ extension MainViewModel { }) .disposed(by: disposeBag) + // 마감 시간이 지나고 바로 리스트 재요청 시 그대로 남아있는 이슈가 있음 + // 따라서 delay 500ms를 추가함 mainDataSource.didDeadLineCountdownTimeOver + .delay(.milliseconds(500), scheduler: MainScheduler.instance) .subscribe(onNext: { [weak self] in self?.reload() }) diff --git a/Projects/App/Sources/Usecase/GifticonEntity.swift b/Projects/App/Sources/Usecase/GifticonEntity.swift index 0cbd904d..9d349daf 100644 --- a/Projects/App/Sources/Usecase/GifticonEntity.swift +++ b/Projects/App/Sources/Usecase/GifticonEntity.swift @@ -13,7 +13,9 @@ struct GifticonEntity { init(_ responseModel: [GifticonResponseModel] = []) { gifticonList = responseModel.compactMap({ model in - GifticonCard( + // 마감 시간이 지난 경우 리스트에 노출되지 않도록 방어 + guard model.sprinkleAt.fullStringDate().compare(Date()) != .orderedAscending else { return nil } + return GifticonCard( sprinkleTime: model.sprinkleAt, gifticonInfo: Gifticon( id: model.sprinkleID, @@ -22,7 +24,8 @@ struct GifticonEntity { expirationDate: model.expiredAt, category: Category(rawValue: model.category) ?? .all), numberOfParticipants: model.participants, - isParticipating: model.participateIn) + isParticipating: model.participateIn + ) }) } }