Merge pull request #87 from DDD-Community/qa/bugFix

qa: 오류사항 대응

Author: Hansangjin98

Targets/DomainLayer/Sources/Entities/Post.swift

@@ -50,15 +50,22 @@ public struct Post: Equatable {
     activityEndDate = translateToRequestFormat(for: activityEndDate)
   }
 
-  public static func == (lhs: Post, rhs: Post) -> Bool {
-    lhs.title == rhs.title &&
-    lhs.organization == rhs.organization &&
-    lhs.postUrlString == rhs.postUrlString
+  public mutating func mapDateValuesToResponseFormat() {
+    recruitStartDate = translateToResponseFormat(for: recruitStartDate)
+    recruitEndDate = translateToResponseFormat(for: recruitEndDate)
+    activityStartDate = translateToResponseFormat(for: activityStartDate)
+    activityEndDate = translateToResponseFormat(for: activityEndDate)
   }
 
   private func translateToRequestFormat(for dateValue: String) -> String {
     guard !dateValue.isEmpty else { return "" }
     let date = DateFormatter.yyyyMMddResponseFormat.date(from: dateValue) ?? .init()
     return DateFormatter.yyyyMMddRequestFormat.string(from: date)
   }
+  
+  private func translateToResponseFormat(for dateValue: String) -> String {
+    guard !dateValue.isEmpty else { return "" }
+    let date = DateFormatter.yyyyMMddRequestFormat.date(from: dateValue) ?? .init()
+    return DateFormatter.yyyyMMddResponseFormat.string(from: date)
+  }
 }

Targets/PresentationLayer/Sources/PostDetail/Coordinator/PostDetailCoordinator.swift

@@ -10,6 +10,8 @@ import DIContainer
 import DomainLayer
 import UIKit
 
+import RxSwift
+
 protocol PostDetailCoordinatorType: CoordinatorType {
   func start(postID: Int)
   func pushWebView(urlString: String)
@@ -23,6 +25,12 @@ final class PostDetailCoordinator: PostDetailCoordinatorType {
   weak var parentCoordinator: CoordinatorType?
   var childCoordinators: [CoordinatorType] = []
   var navigationController: UINavigationController
+  
+  private let disposeBag = DisposeBag()
+  private let childCompletedSubject = PublishSubject<Post>()
+  var childCompletedObservable: Observable<Post> {
+    childCompletedSubject.asObservable()
+  }
 
   // MARK: - Initialize
   init(navigationController: UINavigationController) {
@@ -46,6 +54,9 @@ final class PostDetailCoordinator: PostDetailCoordinatorType {
     postUploadCoordinator.parentCoordinator = self
     addChild(postUploadCoordinator)
     postUploadCoordinator.startEdit(originID: id, originPost: post)
+    postUploadCoordinator.postEditObservable
+      .bind(to: childCompletedSubject)
+      .disposed(by: disposeBag)
   }
 
   func pushWebView(urlString: String) {

Targets/PresentationLayer/Sources/PostDetail/Reactor/PostDetailReactor.swift

@@ -25,6 +25,7 @@ final class PostDetailReactor: Reactor {
     case didTapImageView
     case dismissImageViewController
     case didTapBookmarkButton
+    case updatePost(Post)
   }
 
   enum Mutation {
@@ -66,6 +67,7 @@ final class PostDetailReactor: Reactor {
     case .didTapImageView: return .just(.setIsPresentFullImage(true))
     case .dismissImageViewController: return .just(.setIsPresentFullImage(false))
     case .didTapBookmarkButton: return toggleBookmark()
+    case .updatePost(let post): return .just(.setPost(post))
     }
   }
 

Targets/PresentationLayer/Sources/PostDetail/View/PostDetailViewController.swift

@@ -115,7 +115,6 @@ final class PostDetailViewController: BaseViewController<PostDetailReactor>, Coo
     super.init()
 
     self.reactor = reactor
-    bind()
   }
 
   required init?(coder: NSCoder) {
@@ -127,6 +126,12 @@ final class PostDetailViewController: BaseViewController<PostDetailReactor>, Coo
   }
 
   // MARK: - LifeCycle
+  override func viewDidLoad() {
+    super.viewDidLoad()
+    
+    bind()
+  }
+  
   override func viewDidLayoutSubviews() {
     navigationBar.pin.top().left().right()
     bottomShadowView.pin.bottom().left().right().height(Metric.bottomShadowViewHeightPercent)
@@ -345,16 +350,6 @@ private extension PostDetailViewController {
       })
       .disposed(by: disposeBag)
 
-    reactor.state
-      .map { $0.isLoading }
-      .distinctUntilChanged()
-      .filter { $0 }
-      .asSignal(onErrorSignalWith: .empty())
-      .emit(with: self, onNext: { owner, _ in
-        // TODO: 스켈레톤 적용
-      })
-      .disposed(by: disposeBag)
-    
     reactor.state
       .map(\.isPresentFullImage)
       .distinctUntilChanged()
@@ -380,6 +375,14 @@ private extension PostDetailViewController {
   }
 
   func bind() {
+    coordinator?.childCompletedObservable
+      .filter { [weak self] in self?.reactor?.currentState.post != $0 }
+      .bind(with: self, onNext: { owner, post in
+        owner.reactor?.action.onNext(.updatePost(post))
+        owner.postBinder.onNext(post)
+      })
+      .disposed(by: disposeBag)
+    
     navigationBar.backButtonTapObservable
       .asSignal(onErrorSignalWith: .empty())
       .emit(with: self, onNext: { owner, _ in
@@ -413,6 +416,8 @@ private extension PostDetailViewController {
   }
 
   func addTagLabel(_ jobGroups: [String]) {
+    tagLabelAreaView.subviews.forEach { $0.removeFromSuperview() }
+    
     for jobGroup in jobGroups {
       let tagLabel: TagLabel = .init()
       tagLabel.text = "\(jobGroup)"

Targets/PresentationLayer/Sources/PostUpload/Coordinator/PostUploadCoordinator.swift

@@ -10,8 +10,11 @@ import DIContainer
 import DomainLayer
 import UIKit
 
+import RxSwift
+
 protocol PostUploadCoordinatorType: CoordinatorType {
   func startEdit(originID: Int, originPost: Post)
+  func completedEdit(post: Post)
 }
 
 final class PostUploadCoordinator: PostUploadCoordinatorType {
@@ -20,6 +23,11 @@ final class PostUploadCoordinator: PostUploadCoordinatorType {
   weak var parentCoordinator: CoordinatorType?
   var childCoordinators: [CoordinatorType] = []
   var navigationController: UINavigationController
+  
+  private let postEditSubject = PublishSubject<Post>()
+  var postEditObservable: Observable<Post> {
+    postEditSubject.asObservable()
+  }
 
   // MARK: - Initialize
   init(navigationController: UINavigationController) {
@@ -38,6 +46,12 @@ final class PostUploadCoordinator: PostUploadCoordinatorType {
     let postUploadViewController = postUploadViewController(originID: originID, originPost: mappedOriginPost)
     navigationController.pushViewController(postUploadViewController, animated: true)
   }
+  
+  func completedEdit(post: Post) {
+    var mappedPost = post
+    mappedPost.mapDateValuesToResponseFormat()
+    postEditSubject.onNext(mappedPost)
+  }
 }
 
 // MARK: - Private

Targets/PresentationLayer/Sources/PostUpload/View/PostUploadViewController.swift

@@ -172,6 +172,7 @@ private extension PostUploadViewController {
     return .init(self) { owner, uploadResult in
       switch uploadResult {
       case .success:
+        owner.coordinator?.completedEdit(post: owner.reactor?.post ?? .init())
         owner.coordinator?.didFinish()
 
         if owner.reactor?.originID != nil {
@@ -323,7 +324,7 @@ private extension PostUploadViewController {
       .map { $0.isLoading }
       .distinctUntilChanged()
       .bind(with: self, onNext: { owner, isLoading in
-        // TODO: 서버 통신 시간 동안의 액션 추가 예정
+        isLoading ? LoadingIndicator.start(withDimming: true) : LoadingIndicator.stop()
       })
       .disposed(by: disposeBag)