fix: 콜밴팟 QA

Koin/Core/View/BottomSheetViewControllerB.swift

@@ -17,6 +17,7 @@ protocol BottomSheetViewControllerBDelegate: AnyObject {
 final class BottomSheetViewControllerB: UIViewController {
 
     // MARK: - Properties
+    private var contentViewBottomConstraint: Constraint?
     private var safeAreaHeightConstraint: Constraint?
     private var alpha: CGFloat
 
@@ -54,7 +55,6 @@ final class BottomSheetViewControllerB: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         configureView()
-        addObserver()
         setGesture()
         hideKeyboardWhenTappedAround()
     }
@@ -69,33 +69,26 @@ final class BottomSheetViewControllerB: UIViewController {
 extension BottomSheetViewControllerB: BottomSheetViewControllerBDelegate {
 
     func present() {
-        contentView.snp.remakeConstraints {
-            $0.bottom.equalTo(view.safeAreaLayoutGuide.snp.bottom)
-            $0.leading.trailing.equalToSuperview()
-        }
+//        view.layoutIfNeeded()
+        contentViewBottomConstraint?.update(offset: 0)
         UIView.animate(withDuration: 0.25) { [weak self] in
             guard let self else { return }
             dimView.alpha = alpha
-            view.setNeedsLayout()
             view.layoutIfNeeded()
         }
     }
 
     func dismiss() {
-        contentView.snp.remakeConstraints {
-            $0.top.equalTo(view.snp.bottom)
-            $0.leading.trailing.equalToSuperview()
-        }
+        contentViewBottomConstraint?.update(offset: contentView.bounds.height)
         UIView.animate(
             withDuration: 0.25,
             animations: { [weak self] in
                 guard let self else { return }
                 dimView.alpha = 0
-                view.setNeedsLayout()
                 view.layoutIfNeeded()
             },
             completion: { [weak self] _ in
-                self?.dismiss(animated: true)
+                self?.dismiss(animated: false)
             })
     }
 }
@@ -107,34 +100,10 @@ extension BottomSheetViewControllerB {
         dimView.addGestureRecognizer(tapGesture)
     }
 
-    private func addObserver() {
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)), name: UIResponder.keyboardWillShowNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardWillHideNotification, object: nil)
-    }
-
     @objc private func dimViewTapped() {
         dismissKeyboard()
         dismiss()
     }
-
-    @objc private func keyboardWillShow(_ notification: Notification) {
-        contentView.snp.remakeConstraints {
-            $0.bottom.equalTo(view.keyboardLayoutGuide.snp.top)
-            $0.leading.trailing.equalToSuperview()
-        }
-        UIView.animate(withDuration: 0.25) { [weak self] in
-            self?.view.layoutIfNeeded()
-        }
-    }
-    @objc private func keyboardWillHide(_ notification: Notification) {
-        contentView.snp.remakeConstraints {
-            $0.bottom.equalTo(view.safeAreaLayoutGuide.snp.bottom)
-            $0.leading.trailing.equalToSuperview()
-        }
-        UIView.animate(withDuration: 0.25) { [weak self] in
-            self?.view.layoutIfNeeded()
-        }
-    }
 }
 
 extension BottomSheetViewControllerB {
@@ -155,7 +124,8 @@ extension BottomSheetViewControllerB {
             $0.edges.equalToSuperview()
         }
         contentView.snp.makeConstraints {
-            $0.top.equalTo(view.snp.bottom)
+            contentView.layoutIfNeeded()
+            contentViewBottomConstraint = $0.bottom.equalTo(view.keyboardLayoutGuide.snp.top).offset(contentView.bounds.height).constraint
             $0.leading.trailing.equalToSuperview()
         }
         safeAreaView.snp.makeConstraints {

Koin/Core/View/KoinPickerDropDownView/Delegates/KoinPickerDropDownViewDateDelegate.swift

@@ -11,14 +11,12 @@ import Then
 final class KoinPickerDropDownViewDateDelegate {
 
     // MARK: - Properties
-    let columnWidths: [CGFloat] = [53, 31, 31]
+    private var dates: [Int: [Int: [Int]]] = [:]
+    private let columnWidths: [CGFloat] = [53, 31, 31]
 
-    private let inputFormatter = DateFormatter().then {
-        $0.dateFormat = "yyyy-MM-dd"
-    }
-
-    private let outputFormatter = DateFormatter().then {
-        $0.dateFormat = "yyyy년*M월*d일"
+    // MARK: - Initialzier
+    init(range: Range<Int>) {
+        resetDates(range: range)
     }
 }
 
@@ -29,68 +27,90 @@ extension KoinPickerDropDownViewDateDelegate: KoinPickerDropDownViewDelegate {
     }
 
     func reset(koinPicker: KoinPickerDropDownView, initialDate: Date) {
+        let year = initialDate.year
+        let month = initialDate.month
+        let day = initialDate.day
 
-        let selectedItem = outputFormatter.string(from: initialDate).components(separatedBy: "*")
-        let items = getItems(selectedItem: selectedItem)
+        let items = getItems(year: year, month: month)
+        let selectedItem: [String] = ["\(year)년", "\(month)월", "\(day)일"]
 
-        koinPicker.reset(items: items, selectedItem: selectedItem, columnWidths: [53, 31, 31])
+        koinPicker.reset(items: items, selectedItem: selectedItem, columnWidths: columnWidths)
     }
 
     func selectedItemUpdated(koinPicker: KoinPickerDropDownView, selectedItem: [String]) {
 
-        guard let yearInt = Int(selectedItem[0].filter { $0.isNumber }),
-              let monthInt = Int(selectedItem[1].filter { $0.isNumber }),
-              var dayInt = Int(selectedItem[2].filter { $0.isNumber }) else {
+        guard let selectedYear = Int(selectedItem[0].filter { $0.isNumber }),
+              var selectedMonth = Int(selectedItem[1].filter { $0.isNumber }),
+              var selectedDay = Int(selectedItem[2].filter { $0.isNumber }) else {
             assert(false)
             return
         }
-        let maxDay = getAllDays(year: yearInt, month: monthInt).count
-        if dayInt > maxDay {
-            dayInt = maxDay
+        let items = getItems(year: selectedYear, month: selectedMonth)
+        guard let minMonthString = items[1].first?.filter({ $0.isNumber}),
+              let minMonth = Int(minMonthString),
+              let maxMonthString = items[1].last?.filter({ $0.isNumber}),
+              let maxMonth = Int(maxMonthString) else {
+            assert(false)
+            return
         }
-        guard let validDate = inputFormatter.date(from: String(format: "%d-%d-%d", yearInt, monthInt, dayInt)) else {
+        guard let minDayString = items[2].first?.filter({ $0.isNumber }),
+              let minDay = Int(minDayString),
+              let maxDayString = items[2].last?.filter({ $0.isNumber }),
+              let maxDay = Int(maxDayString) else {
             assert(false)
             return
         }
-        reset(koinPicker: koinPicker, initialDate: validDate)
+        selectedMonth = min(max(selectedMonth, minMonth), maxMonth)
+        selectedDay = min(max(selectedDay, minDay), maxDay)
+        let selectedItem: [String] = ["\(selectedYear)년", "\(selectedMonth)월", "\(selectedDay)일"]
+        koinPicker.reset(items: items, selectedItem: selectedItem, columnWidths: columnWidths)
     }
 }
 
 extension KoinPickerDropDownViewDateDelegate {
 
-    private func getItems(selectedItem: [String]) -> [[String]] {
-
-        guard let selectedYearInt = Int(selectedItem[0].filter { $0.isNumber }),
-              let selectedMonthInt = Int(selectedItem[1].filter { $0.isNumber }) else {
-            assert(false)
-            return [[],[],[]]
+    private func resetDates(range: Range<Int>) {
+        let calendar = Calendar.current
+        let startDay = calendar.startOfDay(for: Date())
+        let availableDates = range.compactMap {
+            calendar.date(byAdding: .day, value: $0, to: startDay)
         }
 
-        let years: [String] = {
-            let thisYearInt = Date().year
-            let lowestYearInt = min(selectedYearInt, thisYearInt)
-            let heighestYearInt = thisYearInt + 1
-            return Range(lowestYearInt...heighestYearInt).map { String($0)+"년" }
-        }()
-        let months: [String] = Range(1...12).map { String($0)+"월" }
-        let days: [String] = getAllDays(year: selectedYearInt, month: selectedMonthInt)
+        var dates: [Int: [Int: [Int]]] = [:]
 
-        return [years, months, days]
+        for date in availableDates {
+            if dates[date.year] == nil {
+                dates[date.year] = [:]
+            }
+
+            if dates[date.year]?[date.month] == nil {
+                dates[date.year]?[date.month] = []
+            }
+
+            dates[date.year]?[date.month]?.append(date.day)
+        }
+
+        self.dates = dates
     }
 
-    func getAllDays(year: Int, month: Int) -> [String] {
-
-        let calendar = Calendar.current
-        var components = DateComponents()
-        components.year = year
-        components.month = month
+    private func getItems(year: Int, month: Int) -> [[String]] {
+        guard let minYear: Int = dates.keys.sorted().first,
+              let maxYear: Int = dates.keys.sorted().last else {
+            assert(false)
+            return [[],[],[]]
+        }
+        let year = min(max(minYear, year), maxYear)
 
-        guard let date = calendar.date(from: components),
-              let dayRange = calendar.range(of: .day, in: .month, for: date) else {
+        guard let minMonth: Int = dates[year]?.keys.sorted().first,
+              let maxMonth: Int = dates[year]?.keys.sorted().last else {
             assert(false)
-            return []
+            return [[],[],[]]
         }
+        let month = min(max(minMonth, month), maxMonth)
 
-        return dayRange.map { String($0) + "일" }
+        let years: [String] = dates.keys.sorted().map { "\($0)년" }
+        let months: [String] = dates[year]!.keys.sorted().map { "\($0)월" }
+        let days: [String] = dates[year]![month]!.sorted().compactMap { "\($0)일" }
+        return [years, months, days]
     }
 }

Koin/Data/DTOs/Decodable/CallVan/CallVanDataDto.swift

@@ -95,7 +95,7 @@ extension CallVanDataDto {
             formatter.dateFormat = "yyyy-MM-dd"
             formatter.locale = Locale(identifier: "ko_KR")
             if let date = formatter.date(from: departureDate) {
-                formatter.dateFormat = "MM.dd (a)"
+                formatter.dateFormat = "MM.dd (E)"
                 return formatter.string(from: date)
             } else {
                 return departureDate

Koin/Presentation/CallVan/CallVanChat/CallVanChatViewModel.swift

@@ -125,7 +125,11 @@ extension CallVanChatViewModel {
 
     private func fetchData() {
         fetchCallVanDataUseCase.execute(postId: postId).sink(
-            receiveCompletion: { _ in },
+            receiveCompletion: { [weak self] comepltion in
+                if case .failure(let error) = comepltion {
+                    self?.outputSubject.send(.showToast(error.message))
+                }
+            },
             receiveValue: { [weak self] callVanData in
                 self?.outputSubject.send(.updateData(callVanData))
             }

Koin/Presentation/CallVan/CallVanData/CallVanDataViewController.swift

@@ -68,6 +68,8 @@ extension CallVanDataViewController {
                 participantsTableView.configure(participants: callVanData.participants)
             case let .updateBell(alert):
                 configureRightBarButton(alert: alert)
+            case let .showToast(message):
+                showToastMessage(message: message)
             }
             refreshControl.endRefreshing()
         }.store(in: &subscriptions)

Koin/Presentation/CallVan/CallVanData/CallVanDataViewModel.swift

@@ -13,6 +13,7 @@ final class CallVanDataViewModel: ViewModelProtocol {
     enum Output {
         case update(CallVanData)
         case updateBell(alert: Bool)
+        case showToast(String)
     }
     enum Input {
         case viewWillAppear
@@ -64,7 +65,11 @@ extension CallVanDataViewModel {
 
     private func fetchData() {
         fetchCallVanDataUseCase.execute(postId: postId).sink(
-            receiveCompletion: { _ in },
+            receiveCompletion: { [weak self] completion in
+                if case .failure(let error) = completion {
+                    self?.outputSubject.send(.showToast(error.message))
+                }
+            },
             receiveValue: { [weak self] callVanData in
                 self?.outputSubject.send(.update(callVanData))
             }
@@ -73,7 +78,11 @@ extension CallVanDataViewModel {
 
     private func fetchNotification() {
         fetchCallVanNotificationListUseCase.execute().sink(
-            receiveCompletion: { _ in },
+            receiveCompletion: { [weak self] completion in
+                if case .failure(let error) = completion {
+                    self?.outputSubject.send(.showToast(error.message))
+                }
+            },
             receiveValue: { [weak self] notifications in
                 let alert = notifications.filter { !$0.isRead }.count != 0
                 self?.outputSubject.send(.updateBell(alert: alert))

Koin/Presentation/CallVan/CallVanList/CallVanListViewModel.swift

@@ -129,7 +129,11 @@ extension CallVanListViewModel {
 
     private func fetchNotification() {
         fetchCallVanNotificationListUseCase.execute().sink(
-            receiveCompletion: { _ in },
+            receiveCompletion: { [weak self] completion in
+                if case .failure(let error) = completion {
+                    self?.outputSubject.send(.showToast(error.message))
+                }
+            },
             receiveValue: { [weak self] notifications in
                 let alert = notifications.filter { !$0.isRead }.count != 0
                 self?.outputSubject.send(.updateBell(alert: alert))

Koin/Presentation/CallVan/CallVanPost/CallVanPostViewModel.swift

@@ -37,7 +37,7 @@ final class CallVanPostViewModel: ViewModelProtocol {
     }
     private(set) var request = CallVanPostRequest() {
         didSet {
-            validateRequest()
+            validate()
         }
     }
 
@@ -98,13 +98,42 @@ extension CallVanPostViewModel {
         outputSubject.send(.updateArrival(request.arrivalType, request.arrivalCustomName))
     }
 
-    private func validateRequest() {
-        let validation = request.departureType != nil
-            && request.arrivalType != nil
-            && request.departureDate != nil
-            && request.departureTime != nil
+    private func validate() {
+        var isValid = true
 
-        outputSubject.send(.enablePostButton(validation))
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd HH:mm"
+        let tenMinutes: TimeInterval = 1 * 60 * 10
+
+        /// 빈 값이 있는지 확인
+        if request.departureType == nil
+            || request.arrivalType == nil
+            || request.departureDate?.isEmpty == true
+            || request.departureTime?.isEmpty == true {
+            isValid = false
+        }
+
+        /// 출발지와 도착지가 다른지 확인
+        switch (request.departureType, request.arrivalType) {
+        case (.custom, .custom):
+            if request.departureCustomName == request.arrivalCustomName {
+                isValid = false
+            }
+        default:
+            if request.departureType == request.arrivalType {
+                isValid = false
+            }
+        }
+
+        /// 현재 시각으로부터 최소 10분 이후 일정인지 확인
+        let date = request.departureDate ?? ""
+        let time = request.departureTime ?? ""
+        if let requestDate = formatter.date(from: "\(date) \(time)"),
+           requestDate.timeIntervalSince(Date()) < tenMinutes {
+            isValid = false
+        }
+
+        outputSubject.send(.enablePostButton(isValid))
     }
 
     private func postData() {

Koin/Presentation/CallVan/CallVanPost/Subviews/CallVanPostDateView.swift

@@ -25,7 +25,7 @@ final class CallVanPostDateView: ExtendedTouchAreaView {
     private let dateButton = UIButton()
     private let dateLabel = UILabel()
     private let downArrowImageView = UIImageView()
-    private let dateDropDownView = KoinPickerDropDownView(delegate: KoinPickerDropDownViewDateDelegate())
+    private let dateDropDownView = KoinPickerDropDownView(delegate: KoinPickerDropDownViewDateDelegate(range: 0..<365))
 
     // MARK: - Initializer
     init() {