[Feat/#83] 답장 조회 시 읽음 여부 변수 DTO 추가 및 isNew 변수 삭제

Team-Clody · Sep 5, 2024 · b0075d8 · b0075d8
1 parent 49aaebc
commit b0075d8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 54 deletions.
diff --git a/Clody_iOS/Clody_iOS.xcodeproj/project.pbxproj b/Clody_iOS/Clody_iOS.xcodeproj/project.pbxproj
@@ -139,7 +139,6 @@
 		95310FA62C41D97E00023C7B /* SplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FA52C41D97E00023C7B /* SplashViewController.swift */; };
 		95310FAB2C42D9EC00023C7B /* ReplyDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FAA2C42D9EC00023C7B /* ReplyDetailViewController.swift */; };
 		95310FAD2C42D9FB00023C7B /* ReplyDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FAC2C42D9FB00023C7B /* ReplyDetailView.swift */; };
-		95310FB02C42E0CB00023C7B /* ReplyDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FAF2C42E0CB00023C7B /* ReplyDetailModel.swift */; };
 		95310FB22C434E0B00023C7B /* ReplyWaitingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FB12C434E0B00023C7B /* ReplyWaitingView.swift */; };
 		95310FB42C434E1E00023C7B /* ReplyWaitingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FB32C434E1E00023C7B /* ReplyWaitingViewController.swift */; };
 		95310FB72C43B07100023C7B /* ReplyWaitingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FB62C43B07100023C7B /* ReplyWaitingViewModel.swift */; };
@@ -276,7 +275,6 @@
 		95310FA52C41D97E00023C7B /* SplashViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashViewController.swift; sourceTree = "<group>"; };
 		95310FAA2C42D9EC00023C7B /* ReplyDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyDetailViewController.swift; sourceTree = "<group>"; };
 		95310FAC2C42D9FB00023C7B /* ReplyDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyDetailView.swift; sourceTree = "<group>"; };
-		95310FAF2C42E0CB00023C7B /* ReplyDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyDetailModel.swift; sourceTree = "<group>"; };
 		95310FB12C434E0B00023C7B /* ReplyWaitingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyWaitingView.swift; sourceTree = "<group>"; };
 		95310FB32C434E1E00023C7B /* ReplyWaitingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyWaitingViewController.swift; sourceTree = "<group>"; };
 		95310FB62C43B07100023C7B /* ReplyWaitingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyWaitingViewModel.swift; sourceTree = "<group>"; };
@@ -857,7 +855,6 @@
 			isa = PBXGroup;
 			children = (
 				95310FB52C43B06600023C7B /* ViewModels */,
-				95310FAE2C42E0BD00023C7B /* Models */,
 				95310FA92C42D98900023C7B /* ViewControllers */,
 				95310FA82C42D98400023C7B /* Views */,
 			);
@@ -882,14 +879,6 @@
 			path = ViewControllers;
 			sourceTree = "<group>";
 		};
-		95310FAE2C42E0BD00023C7B /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				95310FAF2C42E0CB00023C7B /* ReplyDetailModel.swift */,
-			);
-			path = Models;
-			sourceTree = "<group>";
-		};
 		95310FB52C43B06600023C7B /* ViewModels */ = {
 			isa = PBXGroup;
 			children = (
@@ -1104,7 +1093,6 @@
 				0BE7E9F12C4636DE000C5358 /* CalendarMonthlyResponseDTO.swift in Sources */,
 				0BFCC5DA2C2E8F0200B5E0DB /* CalendarModel.swift in Sources */,
 				0B4A1BC62C45401500E31EC4 /* MoyaPlugin.swift in Sources */,
-				95310FB02C42E0CB00023C7B /* ReplyDetailModel.swift in Sources */,
 				95310FAD2C42D9FB00023C7B /* ReplyDetailView.swift in Sources */,
 				95310F922C40706600023C7B /* NicknameView.swift in Sources */,
 				2CE637912C3D56C300B6EC6D /* AccountViewModel.swift in Sources */,

diff --git a/Clody_iOS/Clody_iOS/Network/Service/DTO/DiaryModel/GetReplyResponseDTO.swift b/Clody_iOS/Clody_iOS/Network/Service/DTO/DiaryModel/GetReplyResponseDTO.swift
@@ -12,4 +12,5 @@ struct GetReplyResponseDTO: Codable {
     let nickname: String
     let month: Int
     let date: Int
+    let isRead: Bool
 }
diff --git a/Clody_iOS/Clody_iOS/Presentation/Calendar/ViewControllers/CalendarViewController.swift b/Clody_iOS/Clody_iOS/Presentation/Calendar/ViewControllers/CalendarViewController.swift
@@ -196,7 +196,6 @@ private extension CalendarViewController {
                 guard let self = self else { return }
                 let date = viewModel.selectedDateRelay.value
                 if viewModel.dailyDiaryDataRelay.value.diaries.count != 0 {
-                    var isNew = false
                     let dateIndex = Int(DateFormatter.string(from: viewModel.selectedDateRelay.value, format: "dd")) ?? 1
                     let diaries = viewModel.monthlyCalendarDataRelay.value.diaries
 
@@ -207,13 +206,7 @@ private extension CalendarViewController {
                         replyStatus = "특정 값"
                     }
 
-                    if replyStatus == "READY_NOT_READ" {
-                        isNew = true
-                    } else {
-                        isNew = false
-                    }
-
-                    self.navigationController?.pushViewController(ReplyWaitingViewController(date: date, isNew: isNew, isHomeBackButton: false), animated: true)
+                    self.navigationController?.pushViewController(ReplyWaitingViewController(date: date, isHomeBackButton: false), animated: true)
                 } else {
                     self.navigationController?.pushViewController(WritingDiaryViewController(date: date), animated: true)
                 }

diff --git a/Clody_iOS/Clody_iOS/Presentation/List/ViewControllers/ListViewController.swift b/Clody_iOS/Clody_iOS/Presentation/List/ViewControllers/ListViewController.swift
@@ -93,9 +93,8 @@ private extension ListViewController {
                 guard let self = self else { return }
                 let dateData = DateFormatter.date(from: date)
                 let diaryStatus = viewModel.listDataRelay.value.diaries.first(where: { $0.date == date})?.replyStatus
-                let isNew = diaryStatus == "READY_NOT_READ"
 
-                self.navigationController?.pushViewController(ReplyWaitingViewController(date: dateData ?? Date(), isNew: isNew, isHomeBackButton: false), animated: true)
+                self.navigationController?.pushViewController(ReplyWaitingViewController(date: dateData ?? Date(), isHomeBackButton: false), animated: true)
             })
             .disposed(by: disposeBag)
 

diff --git a/Clody_iOS/Clody_iOS/Presentation/Reply/Models/ReplyDetailModel.swift b/Clody_iOS/Clody_iOS/Presentation/Reply/Models/ReplyDetailModel.swift
diff --git a/Clody_iOS/Clody_iOS/Presentation/Reply/ViewControllers/ReplyDetailViewController.swift b/Clody_iOS/Clody_iOS/Presentation/Reply/ViewControllers/ReplyDetailViewController.swift
@@ -26,7 +26,6 @@ final class ReplyDetailViewController: UIViewController {
     private let year: Int
     private let month: Int
     private let day: Int
-    private let isNew: Bool
 
     // MARK: - UI Components
 
@@ -36,11 +35,10 @@ final class ReplyDetailViewController: UIViewController {
 
     // MARK: - Life Cycles
 
-    init(year: Int, month: Int, day: Int, isNew: Bool) {
+    init(year: Int, month: Int, day: Int) {
         self.year = year
         self.month = month
         self.day = day
-        self.isNew = isNew
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -142,8 +140,8 @@ private extension ReplyDetailViewController {
         }
     }
 
-    func judgeIsAlert(isNew: Bool) {
-        if isNew {
+    func judgeIsAlert(isRead: Bool) {
+        if !isRead {
             showAlert()
         }
     }
@@ -178,7 +176,7 @@ private extension ReplyDetailViewController {
             self.hideLoadingIndicator()
             self.nickname = data.nickname
             self.rootView.bindData(nickname: data.nickname, content: data.content)
-            self.judgeIsAlert(isNew: self.isNew)
+            self.judgeIsAlert(isRead: data.isRead)
         }
     }
 }
diff --git a/Clody_iOS/Clody_iOS/Presentation/Reply/ViewControllers/ReplyWaitingViewController.swift b/Clody_iOS/Clody_iOS/Presentation/Reply/ViewControllers/ReplyWaitingViewController.swift
@@ -19,7 +19,6 @@ final class ReplyWaitingViewController: UIViewController {
     private let disposeBag = DisposeBag()
     private var totalSeconds = 60
     private var date: Date
-    private var isNew: Bool
     private let isHomeBackButton: Bool
     private let secondsToWaitForFirstReply = 60
     private let secondsToWaitForNormalReply = 12 * 60 * 60
@@ -32,9 +31,8 @@ final class ReplyWaitingViewController: UIViewController {
 
     // MARK: - Life Cycles
 
-    init(date: Date, isNew: Bool, isHomeBackButton: Bool) {
+    init(date: Date, isHomeBackButton: Bool) {
         self.date = date
-        self.isNew = isNew
         self.isHomeBackButton = isHomeBackButton
 
         super.init(nibName: nil, bundle: nil)
@@ -186,8 +184,7 @@ private extension ReplyWaitingViewController {
                 ReplyDetailViewController(
                     year: year,
                     month: month,
-                    day: day,
-                    isNew: self.isNew
+                    day: day
                 ),
                 animated: true
             )

diff --git a/..._iOS/Clody_iOS/Presentation/WritingDiary/ViewControllers/WritingDiaryViewController.swift b/..._iOS/Clody_iOS/Presentation/WritingDiary/ViewControllers/WritingDiaryViewController.swift
@@ -149,7 +149,7 @@ private extension WritingDiaryViewController {
                                 if type == "DELETED" {
                                     self.navigationController?.popViewController(animated: true)
                                 } else {
-                                    self.navigationController?.pushViewController(ReplyWaitingViewController(date: self.date, isNew: true, isHomeBackButton: true), animated: true)
+                                    self.navigationController?.pushViewController(ReplyWaitingViewController(date: self.date, isHomeBackButton: true), animated: true)
                                 }
                             case .network:
                                 self.showErrorAlert(isNetworkError: true)