Merge pull request #191 from mash-up-kr/feature/sz/deadlinecell-refactor

mash-up-kr · Aug 26, 2022 · 420f110 · 420f110
2 parents f840651 + 1bbacd6
commit 420f110
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 21 deletions.
diff --git a/Projects/App/Sources/Common/SplashViewModel.swift b/Projects/App/Sources/Common/SplashViewModel.swift
@@ -44,19 +44,11 @@ final class SplashViewModel: SplashViewModelProtocol {
     }
 
     private func changeRootViewController(deadlineData: Int) {
-
-        var isDeadlineDataExist = true
-
-        if deadlineData == 0 {
-            isDeadlineDataExist = false
-        }
-
         let rootViewController = MainViewController(
             MainViewModel(
                 network: Network(),
                 repository: CategoryRepository(CategoryService(network: Network())),
-                OCRRepository: OCRRepository(OCRService(network: Network())),
-                deadlineDataExist: isDeadlineDataExist
+                OCRRepository: OCRRepository(OCRService(network: Network()))
             ))
 
         let navigationController = UINavigationController(rootViewController: rootViewController)

diff --git a/Projects/App/Sources/Main/MainCollectionViewDataSource.swift b/Projects/App/Sources/Main/MainCollectionViewDataSource.swift
@@ -24,7 +24,7 @@ final class MainCollectionViewDataSource: NSObject, UICollectionViewDataSource {
     var didDeadLineCountdownTimeOver = PublishRelay<Void>()
     var selectedCategoryIndexPath: IndexPath? = nil
 
-    private let disposeBag = DisposeBag()
+    private var deadLineDisposeBag = DisposeBag()
 
     func numberOfSections(in collectionView: UICollectionView) -> Int {
         // TODO: 마감임박 데이터 없을 때의 경우 처리 필요
@@ -67,7 +67,7 @@ final class MainCollectionViewDataSource: NSObject, UICollectionViewDataSource {
             cell.gifticonApplyButtonDelegate = self
             cell.countdownTimeOver
                 .bind(to: didDeadLineCountdownTimeOver)
-                .disposed(by: disposeBag)
+                .disposed(by: deadLineDisposeBag)
             return cell
         case .category:
             guard let cell = collectionView.dequeReusableCell(CategoryCollectionViewCell.self,
@@ -112,6 +112,7 @@ final class MainCollectionViewDataSource: NSObject, UICollectionViewDataSource {
 extension MainCollectionViewDataSource {
     func updateDeadLineData(_ list: [GifticonCard]) {
         deadLineData = list
+        deadLineDisposeBag = DisposeBag()
     }
 
     func updateCategoryData(_ list: [Category]) {

diff --git a/Projects/App/Sources/Main/MainViewController.swift b/Projects/App/Sources/Main/MainViewController.swift
@@ -144,8 +144,6 @@ final class MainViewController: BaseViewController<MainViewModelProtocol> {
         mainView.configureDataSource(viewModel.mainDataSource)
         mainView.configureDelegate(viewModel.mainDelegate)
 
-        mainView.isDeadlineDataExist.accept(viewModel.isDeadlineDataExist.value)
-
         view.addSubview(mainView)
         mainView.snp.makeConstraints {
             $0.top.equalTo(navigationBar.snp.bottom)

diff --git a/Projects/App/Sources/Main/MainViewModel.swift b/Projects/App/Sources/Main/MainViewModel.swift
@@ -96,17 +96,13 @@ final class MainViewModel: MainViewModelProtocol {
     init(
         network: Networking,
         repository: CategoryRepositoryLogic,
-        OCRRepository: OCRRepositoryLogic,
-        deadlineDataExist: Bool
+        OCRRepository: OCRRepositoryLogic
     ) {
         self.gifticonService = GifticonService(network: network)
         self.categoryRepository = repository
         self.OCRRepository = OCRRepository
-        self.isDeadlineDataExist.accept(deadlineDataExist)
 
-        deadlineInfo()
         category()
-        gifticonList()
         bind()
     }
 
@@ -195,9 +191,12 @@ extension MainViewModel {
             })
             .disposed(by: disposeBag)
 
+        // 마감 시간이 지나고 바로 리스트 재요청 시 그대로 남아있는 이슈가 있음
+        // 따라서 delay 500ms를 추가함
         mainDataSource.didDeadLineCountdownTimeOver
+            .delay(.milliseconds(500), scheduler: MainScheduler.instance)
             .subscribe(onNext: { [weak self] in
-                self?.deadlineInfo()
+                self?.reload()
             })
             .disposed(by: disposeBag)
     }

diff --git a/Projects/App/Sources/Main/View/MainView.swift b/Projects/App/Sources/Main/View/MainView.swift
@@ -34,6 +34,8 @@ final class MainView: BaseView {
         backgroundColor = .clear
 
         isDeadlineDataExist
+            .skip(1)
+            .throttle(.milliseconds(500), scheduler: MainScheduler.instance)
             .subscribe(onNext: { [weak self] _ in
                 self?.reloadCollectionViewSection(.deadLine)
             })

diff --git 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
+            )
         })
     }
 }