Merge pull request #78 from Team-Clody/network/#77-WrittingDiary

[Feat/#77] 네트워크 반영
Team-Clody · Aug 25, 2024 · a36d27b · a36d27b
2 parents 0e8ffe9 + 6a08100
commit a36d27b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Clody_iOS/Clody_iOS/Network/Service/DTO/DiaryModel/PostDiaryResponseDTO.swift b/Clody_iOS/Clody_iOS/Network/Service/DTO/DiaryModel/PostDiaryResponseDTO.swift
@@ -9,4 +9,5 @@ import Foundation
 
 struct PostDiaryResponseDTO: Codable {
     let createdAt: String
+    let replyType: String
 }
diff --git a/..._iOS/Clody_iOS/Presentation/WritingDiary/ViewControllers/WritingDiaryViewController.swift b/..._iOS/Clody_iOS/Presentation/WritingDiary/ViewControllers/WritingDiaryViewController.swift
@@ -142,11 +142,15 @@ private extension WritingDiaryViewController {
                             from: self.date,
                             format: "yyyy-MM-dd"
                         )
-                        self.viewModel.postDiary(date: dateString, content: self.viewModel.diariesRelay.value, completion: {status in
+                        self.viewModel.postDiary(date: dateString, content: self.viewModel.diariesRelay.value, completion: {statusCode,type  in
                             self.hideLoadingIndicator()
-                            switch status {
+                            switch statusCode {
                             case .success:
-                                self.navigationController?.pushViewController(ReplyWaitingViewController(date: self.date, isNew: true, isHomeBackButton: true), animated: true)
+                                if type == "NO_REPLY" {
+                                    self.navigationController?.popViewController(animated: true)
+                                } else {
+                                    self.navigationController?.pushViewController(ReplyWaitingViewController(date: self.date, isNew: true, isHomeBackButton: true), animated: true)
+                                }
                             case .network:
                                 self.showErrorAlert(isNetworkError: true)
                             case .unknowned:

diff --git a/Clody_iOS/Clody_iOS/Presentation/WritingDiary/ViewModels/WritingDiaryViewModel.swift b/Clody_iOS/Clody_iOS/Presentation/WritingDiary/ViewModels/WritingDiaryViewModel.swift
@@ -200,7 +200,7 @@ extension WritingDiaryViewModel {
         self.isFirstRelay.accept(isFirst)
     }
 
-    func postDiary(date: String, content: [String], completion: @escaping (NetworkViewJudge) -> ()) {
+    func postDiary(date: String, content: [String], completion: @escaping (NetworkViewJudge, String) -> ()) {
         let provider = Providers.diaryRouter
         let data = PostDiaryRequestDTO(date: date, content: content)
 
@@ -211,8 +211,8 @@ extension WritingDiaryViewModel {
             case -1: dataStatus = .network
             default: dataStatus = .unknowned
             }
-            completion(dataStatus)
             guard let data = data.data else { return }
+            completion(dataStatus, data.replyType)
         }
     }
 }