refactor: Date -> String으로 반환해주는 로직 변경

Author: chansooo

Trinap/Sources/Domain/UseCases/Photographer/DefaultConvertDateToStringUseCase.swift

@@ -9,42 +9,13 @@
 import Foundation
 
 final class DefaultConvertDateToStringUseCase: ConvertDateToStringUseCase {
-
-    // MARK: UI
-    
-    // MARK: Properties
-    
-    // MARK: Initializers
 
     // MARK: Methods
     func convert(startDate: Date, endDate: Date) -> String? {
-        let startSeperated = startDate.toString(type: .yearToSecond).components(separatedBy: " ")
-        let endSeperated = endDate.toString(type: .yearToSecond).components(separatedBy: " ")
-        
-        guard let date = startSeperated[safe: 0] else { return nil }
-        let dateSeperated = date.components(separatedBy: "-")
-        guard
-            let month = dateSeperated[safe: 1],
-            let day = dateSeperated[safe: 2]
-        else { return nil }
-        
-        guard
-            let startTime = startSeperated.last,
-            let endTime = endSeperated.last
-        else { return nil }
-        let startHourToSec = startTime.components(separatedBy: ":")
-        let endHourToSec = endTime.components(separatedBy: ":")
-        guard
-            let startHour = startHourToSec[safe: 0],
-            let startMin = startHourToSec[safe: 1],
-            let endHour = endHourToSec[safe: 0],
-            let endMin = endHourToSec[safe: 1]
-        else { return nil }
-
-        let reservationDate = "\(month)/\(day)"
-        let reservationStart = "\(startHour):\(startMin)"
-        let reservationEnd = "\(endHour):\(endMin)"
-        let dateInfo = "\(reservationDate) \(reservationStart)-\(reservationEnd)\n"
+        let daate = startDate.toString(type: .monthAndDate2)
+        let startTime = startDate.toString(type: .hourAndMinute)
+        let endTime = endDate.toString(type: .hourAndMinute)
+        let dateInfo = "\(daate) \(startTime)-\(endTime)\n"
         return dateInfo
     }
 }

Trinap/Sources/Presenter/TabBar/Main/PhotographerDetail/PhotographerDetailViewController.swift

@@ -148,13 +148,8 @@ class PhotographerDetailViewController: BaseViewController {
             .disposed(by: disposeBag)
 
         output.resevationDates
-            .drive { [weak self] dates in
-                guard
-                    let start = dates[safe: 0],
-                    let end = dates[safe: 1]
-                else { return }
-                      
-                self?.configureCalendarButton(startDate: start, endDate: end)
+            .drive { [weak self] dateString in
+                self?.configureCalendarButton(dateString: dateString)
             }
             .disposed(by: disposeBag)
     }
@@ -274,18 +269,14 @@ extension PhotographerDetailViewController {
 
 extension PhotographerDetailViewController {
 
-    private func configureCalendarButton(startDate: Date, endDate: Date) {
-        guard let dateInfo = formattingCalendarButtonText(
-            startDate: startDate,
-            endDate: endDate
-        )
-        else { return }
+    private func configureCalendarButton(dateString: String) {
+        if dateString.isEmpty { return }
 
         calendarButton.titleLabel?.numberOfLines = 0
         calendarButton.titleLabel?.textAlignment = .left
         calendarButton.setTitle(nil, for: .normal)
         let buttonText = NSMutableAttributedString()
-            .bold(string: dateInfo)
+            .bold(string: dateString)
             .regular(string: "날짜 변경하기")
         calendarButton.setAttributedTitle(buttonText, for: .normal)
     }

Trinap/Sources/Presenter/TabBar/Main/PhotographerDetail/PhotographerDetailViewModel.swift

@@ -21,7 +21,7 @@ final class PhotographerDetailViewModel: ViewModelType {
 
     struct Output {
         let confirmButtonEnabled: Driver<Bool>
-        let resevationDates: Driver<[Date]>
+        let resevationDates: Driver<String>
         let dataSource: Driver<[PhotographerDataSource]>
     }
 
@@ -77,7 +77,6 @@ final class PhotographerDetailViewModel: ViewModelType {
 
     // MARK: - Methods
     func transform(input: Input) -> Output {
-        coordinator?.calendarViewModel.rx.selectedDates
 
         input.viewWillAppear
             .map { _ in }
@@ -163,7 +162,15 @@ final class PhotographerDetailViewModel: ViewModelType {
                 return self.mappingDataSource(isEditable: false, state: section, photographer: photographer, review: review)
             }
 
-        let reservationDates = self.reservationDate.asDriver(onErrorJustReturn: [])
+        let reservationDates = self.reservationDate
+            .asDriver(onErrorJustReturn: [])
+            .map { [weak self] dates -> String in
+                guard
+                    let start = dates[safe: 0],
+                    let end = dates[safe: 1]
+                else { return "" }
+                return self?.convertDateToStringUseCase.convert(startDate: start, endDate: end) ?? ""
+            }
 
 
         return Output(
@@ -294,8 +301,12 @@ extension PhotographerDetailViewModel {
     }
 }
 
-//TODO: 프록시로 바꿔보기
-// 2. 이 이벤트 발생했을 때 캘린더 버튼 string도 같이 전달해주기
+extension PhotographerDetailViewModel {
+    func blockPhotographer() -> Single<Void> {
+        self.createBlockUseCase.create(blockedUserId: self.userId)
+    }
+}
+
 extension PhotographerDetailViewModel: SelectReservationDateViewModelDelegate {
 
     func selectedReservationDate(startDate: Date, endDate: Date) {

Trinap/Sources/Utils/Date+.swift

@@ -16,6 +16,7 @@ extension Date {
         case timeStamp = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
         case hourAndMinute = "HH:mm"
         case monthAndDate = "M월 d일"
+        case monthAndDate2 = "MM/dd"
         case yearAndMonthAndDate = "YYYY년 M월 d일"
         case yearAndMonth = "YYYY년 M월"
     }