Merge pull request #104 from yangsubinn/fix/#100

[Fix] #100 - 스탬프 등록, 삭제, 수정 실패시 에러 처리
sopt-makers · Jan 11, 2023 · fc30863 · fc30863
2 parents b725437 + 9c89162
commit fc30863
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/SOPT-Stamp-iOS/Projects/Domain/Sources/UseCase/ListDetailUseCase.swift b/SOPT-Stamp-iOS/Projects/Domain/Sources/UseCase/ListDetailUseCase.swift
@@ -53,6 +53,7 @@ extension DefaultListDetailUseCase: ListDetailUseCase {
     public func postStamp(missionId: Int, stampData: ListDetailRequestModel) {
         let data = [stampData.imgURL as Any, stampData.content] as [Any]
         repository.postStamp(missionId: missionId, stampData: data)
+            .replaceError(with: ListDetailModel(image: "", content: "", date: "", stampId: 0))
             .sink { event in
                 print("completion: \(event)")
             } receiveValue: { model in
@@ -63,13 +64,15 @@ extension DefaultListDetailUseCase: ListDetailUseCase {
     public func putStamp(missionId: Int, stampData: ListDetailRequestModel) {
         let data = [stampData.imgURL as Any, stampData.content] as [Any]
         repository.putStamp(missionId: missionId, stampData: data)
+            .replaceError(with: -1)
             .sink { result in
-                self.editSuccess.send(true)
+                self.editSuccess.send(result == -1 ? false: true)
             }.store(in: self.cancelBag)
     }
 
     public func deleteStamp(stampId: Int) {
         repository.deleteStamp(stampId: stampId)
+            .replaceError(with: false)
             .sink { success in
                 self.deleteSuccess.send(success)
             }.store(in: self.cancelBag)

diff --git a/SOPT-Stamp-iOS/Projects/Presentation/Sources/ListDetailScene/VC/ListDetailVC.swift b/SOPT-Stamp-iOS/Projects/Presentation/Sources/ListDetailScene/VC/ListDetailVC.swift
@@ -163,18 +163,30 @@ extension ListDetailVC {
         output.$listDetailModel
             .compactMap { $0 }
             .sink { model in
-                self.setData(model)
-                if self.sceneType == .none {
-                    self.presentCompletedVC(level: self.starLevel)
+                if model.image.isEmpty {
+                    let networkAlert = self.factory.makeNetworkAlertVC()
+                    self.present(networkAlert, animated: true) {
+                        self.backgroundDimmerView.removeFromSuperview()
+                    }
+                } else {
+                    self.setData(model)
+                    if self.sceneType == .none {
+                        self.presentCompletedVC(level: self.starLevel)
+                    }
+                    self.sceneType = .completed
+                    self.reloadData(self.sceneType)
                 }
-                self.sceneType = .completed
-                self.reloadData(self.sceneType)
             }.store(in: self.cancelBag)
 
         output.editSuccessed
             .sink { successed in
-                self.reloadData(.completed)
-                self.showToast(message: I18N.ListDetail.editCompletedToast)
+                if successed {
+                    self.reloadData(.completed)
+                    self.showToast(message: I18N.ListDetail.editCompletedToast)
+                } else {
+                    let networkAlert = self.factory.makeNetworkAlertVC()
+                    self.present(networkAlert, animated: true)
+                }
             }.store(in: self.cancelBag)
 
         output.showDeleteAlert
@@ -191,7 +203,8 @@ extension ListDetailVC {
                 if success {
                     self.navigationController?.popViewController(animated: true)
                 } else {
-                    self.makeAlert(title: I18N.Default.error, message: I18N.Default.networkError)
+                    let networkAlert = self.factory.makeNetworkAlertVC()
+                    self.present(networkAlert, animated: true)
                 }
             }.store(in: self.cancelBag)
     }