[feat] Observable -> Single

DailyQuest/DailyQuest/Data/PersistentStorages/BrowseQuestsStorage/BrowseQuestsStorage.swift

@@ -8,7 +8,7 @@
 import RxSwift
 
 protocol BrowseQuestsStorage {
-    func fetchBrowseQuests() -> Observable<[BrowseQuest]>
+    func fetchBrowseQuests() -> Single<[BrowseQuest]>
     func saveBrowseQuest(browseQuest: BrowseQuest) -> Single<BrowseQuest>
     func deleteBrowseQuests() -> Single<Bool>
 }

DailyQuest/DailyQuest/Data/PersistentStorages/BrowseQuestsStorage/RealmStorage/RealmBrowseQuestsStorage.swift

@@ -17,19 +17,18 @@ final class RealmBrowseQuestsStorage {
 }
 
 extension RealmBrowseQuestsStorage: BrowseQuestsStorage {
-    func fetchBrowseQuests() -> Observable<[BrowseQuest]> {
-        return Observable<[BrowseQuest]>.create { [weak self] observer in
+    func fetchBrowseQuests() -> Single<[BrowseQuest]> {
+        return Single<[BrowseQuest]>.create { [weak self] single in
             guard let realmStorage = self?.realmStorage else {
                 return Disposables.create()
             }
 
             do {
                 let browseQuests = try realmStorage.fetchEntities(type: BrowseQuestEntity.self)
                     .compactMap { $0.toDomain() }
-                observer.onNext(browseQuests)
-                observer.onCompleted()
+                single(.success(browseQuests))
             } catch let error {
-                observer.onError(error)
+                single(.failure(error))
             }
 
             return Disposables.create()

DailyQuest/DailyQuest/Data/PersistentStorages/UserInfoStorage/RealmStorage/RealmUserInfoStorage.swift

@@ -17,40 +17,27 @@ final class RealmUserInfoStorage {
 }
 
 extension RealmUserInfoStorage: UserInfoStorage {
-    func fetchUserInfo() -> Observable<User> {
-        return Observable<User>.create { [weak self] observer in
-            guard let realmStorage = self?.realmStorage else {
-                // self가 존재하지 않을 경우, 반환하지 않고 종료
-                return Disposables.create()
-            }
-
+    func fetchUserInfo() -> Single<User> {
+        return Single<User>.create { [weak self] single in
             do {
+                guard let realmStorage = self?.realmStorage else { throw RealmStorageError.realmObjectError }
                 guard let userInfoEntity = try realmStorage.fetchEntities(type: UserInfoEntity.self)
                     .first else {
                     throw RealmStorageError.noDataError
                 }
-
-                observer.onNext(userInfoEntity.toDomain())
-                observer.onCompleted()
+                single(.success(userInfoEntity.toDomain()))
             } catch let error {
-                // Realm을 불러올 수 없을 경우, realmObjectError
-                // User 정보가 없을 경우, noDataError
-                observer.onError(error)
+                single(.failure(error))
             }
-
             return Disposables.create()
         }
     }
 
     func updateUserInfo(user: User) -> Single<User> {
         return Single.create { [weak self] single in
-            guard let realmStorage = self?.realmStorage else {
-                return Disposables.create()
-            }
-
             let userInfo = UserInfoEntity(user: user)
-
             do {
+                guard let realmStorage = self?.realmStorage else { throw RealmStorageError.realmObjectError }
                 // update 성공했을 경우, success(user)
                 try realmStorage.updateEntity(entity: userInfo)
                 single(.success(user))
@@ -65,12 +52,8 @@ extension RealmUserInfoStorage: UserInfoStorage {
 
     func deleteUserInfo() -> Single<User> {
         return Single.create { [weak self] single in
-            guard let realmStorage = self?.realmStorage else {
-                return Disposables.create()
-            }
-
             do {
-                // update 성공했을 경우, success(user)
+                guard let realmStorage = self?.realmStorage else { throw RealmStorageError.realmObjectError }
                 guard let user = try realmStorage.deleteAllEntity(type: UserInfoEntity.self).first?.toDomain() else {
                     throw RealmStorageError.noDataError
                 }
@@ -79,7 +62,6 @@ extension RealmUserInfoStorage: UserInfoStorage {
                 // update 성공하지 못했을 경우, failure(error)
                 single(.failure(RealmStorageError.deleteError(error)))
             }
-
             return Disposables.create()
         }
     }

DailyQuest/DailyQuest/Data/PersistentStorages/UserInfoStorage/UserInfoStorage.swift

@@ -8,7 +8,7 @@
 import RxSwift
 
 protocol UserInfoStorage {
-    func fetchUserInfo() -> Observable<User>
+    func fetchUserInfo() -> Single<User>
     func updateUserInfo(user: User) -> Single<User>
     func deleteUserInfo() -> Single<User>
 }

DailyQuest/DailyQuest/Data/Repositories/DefaultBrowseRepository.swift

@@ -26,14 +26,14 @@ extension DefaultBrowseRepository: BrowseRepository {
     /// Fetch BrowseQuests
     /// Firebase 우선, 실패시 persistentStorage, persistentStorage도 실패시 Error반환
     /// - Returns: Observable<[BrowseQuest]>
-    func fetch() -> Observable<[BrowseQuest]> {
-        return self.networkService.getAllowUsers(limit: 10)
+    func fetch() -> Single<[BrowseQuest]> {
+        let uid = networkService.uid.value
+        return networkService.getAllowUsers(limit: 10)
             .map { $0.toDomain() }
             .flatMap(fetchBrowseQuestNetworkService(user:))
-            .filter { !$0.quests.isEmpty }
+            .filter { !$0.quests.isEmpty &&  uid != $0.user.uuid }
             .toArray()
-            .asObservable()
-            .do(afterNext: { [weak self] browseQuests in
+            .do(afterSuccess: { [weak self] browseQuests in
             guard let self = self else { return }
             self.persistentStorage.deleteBrowseQuests()
                 .asObservable()
@@ -45,20 +45,20 @@ extension DefaultBrowseRepository: BrowseRepository {
                 .disposed(by: self.disposeBag)
         })
             .timeout(.seconds(5), scheduler: MainScheduler.instance)
-            .catch { _ in
-            return self.persistentStorage.fetchBrowseQuests()
+            .catch { [weak self] _ in
+                guard let self = self else { return Single.just([])}
+                return self.persistentStorage.fetchBrowseQuests()
         }
     }
 }
 
 private extension DefaultBrowseRepository {
-    func fetchBrowseQuestNetworkService(user: User) -> Observable<BrowseQuest> {
+    func fetchBrowseQuestNetworkService(user: User) -> Single<BrowseQuest> {
         networkService
             .read(type: QuestDTO.self, userCase: .anotherUser(user.uuid), access: .quests, filter: .today(Date()))
             .map { $0.toDomain() }
             .toArray()
-            .asObservable()
-            .map { return BrowseQuest(user: user, quests: $0) }
+            .map { BrowseQuest(user: user, quests: $0) }
     }
 
     func saveBrowseQuestPersistentStorage(browseQuest: BrowseQuest) -> Observable<BrowseQuest> {

DailyQuest/DailyQuest/Data/Repositories/DefaultQuestsRepository.swift

@@ -24,11 +24,10 @@ extension DefaultQuestsRepository: QuestsRepository {
             .flatMap (saveNetworkService(quests:))
     }
 
-    func fetch(by date: Date) -> Observable<[Quest]> {
+    func fetch(by date: Date) -> Single<[Quest]> {
         return persistentStorage.fetchQuests(by: date)
-            .asObservable()
             .catch { [weak self] _ in
-                guard let self = self else { return Observable.just([]) }
+                guard let self = self else { return Single.just([]) }
                 return self.fetchNetworkService(date: date)
             }
             .catchAndReturn([])
@@ -49,14 +48,13 @@ extension DefaultQuestsRepository: QuestsRepository {
             .flatMap(deleteAllNetworkService(quests:))
     }
 
-    func fetch(by uuid: String, date: Date) -> Observable<[Quest]> {
+    func fetch(by uuid: String, date: Date) -> Single<[Quest]> {
         return networkService.read(type: QuestDTO.self,
                                    userCase: .anotherUser(uuid),
                                    access: .quests,
                                    filter: .today(date))
         .map { $0.toDomain() }
         .toArray()
-        .asObservable()
     }
 }
 
@@ -74,11 +72,10 @@ private extension DefaultQuestsRepository {
             .toArray()
     }
 
-    func fetchNetworkService(date: Date) -> Observable<[Quest]> {
+    func fetchNetworkService(date: Date) -> Single<[Quest]> {
         return networkService.read(type: QuestDTO.self, userCase: .currentUser, access: .quests, filter: .today(date))
             .map { $0.toDomain() }
             .toArray()
-            .asObservable()
             .catchAndReturn([])
     }
 

DailyQuest/DailyQuest/Data/Repositories/DefaultUserRepository.swift

@@ -30,17 +30,14 @@ extension DefaultUserRepository: UserRepository {
     func readUser() -> Single<User> {
         return self.persistentStorage.fetchUserInfo()
             .catch { [weak self] _ in
-                guard let self = self else { return Observable.just(User()) }
+                guard let self = self else { return Single.just(User()) }
                 return self.fetchUserNetworkService()
             }
-            .asSingle()
     }
 
     func updateUser(by user: User) -> Single<User> {
         return persistentStorage.updateUserInfo(user: user)
-            .asObservable()
             .flatMap(updateUserNetworkService(user:))
-            .asSingle()
     }
 
     func fetchUser(by uuid: String) -> Single<User> {
@@ -67,13 +64,12 @@ extension DefaultUserRepository: UserRepository {
                         return self.networkService.update(userCase: .currentUser, access: .userInfo, dto: userDto)
                     }
                     .map { $0.toDomain() }
-                    .asSingle()
             }
             .flatMap(updateUser(by:))
             .map { _ in true }
             .catchAndReturn(false)
-            .do(afterSuccess: { _ in
-                NotificationCenter.default.post(name: .userUpdated, object: nil)
+            .do(afterSuccess: { result in
+                NotificationCenter.default.post(name: .userUpdated, object: result)
             })
     }
 
@@ -92,7 +88,6 @@ extension DefaultUserRepository: UserRepository {
                         return self.networkService.update(userCase: .currentUser, access: .userInfo, dto: userDto)
                     }
                     .map { $0.toDomain() }
-                    .asSingle()
             }
             .flatMap(updateUser(by:))
             .map { _ in true }
@@ -105,20 +100,19 @@ extension DefaultUserRepository: UserRepository {
 }
 
 extension DefaultUserRepository: ProtectedUserRepository {
-    func deleteUser() -> Observable<Bool> {
+    func deleteUser() -> Single<Bool> {
         return networkService
             .delete(userCase: .currentUser, access: .userInfo, dto: UserDTO())
             .flatMap { [weak self] _ in
-                guard let self = self else { return .just(true) }
+                guard let self = self else { return .just(false) }
                 return self.networkService.deleteUser()
                     .flatMap { _ in
                         return self.persistentStorage.deleteUserInfo()
                             .map{ _ in true}
                     }
             }
             .catchAndReturn(false)
-            .asObservable()
-            .do(onNext: { [weak self]_ in
+            .do(onSuccess: { [weak self]_ in
                 guard let self = self else { return }
                 self.networkService.signOut().subscribe()
                     .disposed(by: self.disposeBag)
@@ -127,15 +121,15 @@ extension DefaultUserRepository: ProtectedUserRepository {
 }
 
 private extension DefaultUserRepository {
-    func fetchUserNetworkService() -> Observable<User> {
+    func fetchUserNetworkService() -> Single<User> {
         networkService.read(type: UserDTO.self, userCase: .currentUser, access: .userInfo, filter: nil)
             .map { $0.toDomain() }
+            .asSingle()
     }
 
-    func updateUserNetworkService(user: User) -> Observable<User> {
+    func updateUserNetworkService(user: User) -> Single<User> {
         networkService.update(userCase: .currentUser, access: .userInfo, dto: user.toDTO())
             .map { $0.toDomain() }
-            .asObservable()
             .catchAndReturn(user)
     }
 }

DailyQuest/DailyQuest/Domain/Interfaces/Repositories/BrowseRepository.swift

@@ -9,5 +9,5 @@ import RxSwift
 
 protocol BrowseRepository {
     // TODO: 무한 스크롤을 위한 페이징 추가
-    func fetch() -> Observable<[BrowseQuest]>
+    func fetch() -> Single<[BrowseQuest]>
 }

DailyQuest/DailyQuest/Domain/Interfaces/Repositories/ProtectedUserRepository.swift

@@ -10,5 +10,5 @@ import RxSwift
 protocol ProtectedUserRepository {
     /// 유저정보를 삭제합니다.
     /// - Returns: 삭제 성공 여부를 방출하는 Observable입니다.
-    func deleteUser() -> Observable<Bool>
+    func deleteUser() -> Single<Bool>
 }

DailyQuest/DailyQuest/Domain/Interfaces/Repositories/QuestsRepository.swift

@@ -26,7 +26,7 @@ protocol QuestsRepository {
         - date: 받아오길 원하는 날짜입니다.
      - Returns: Quest의 배열을 방출하는 Observable입니다. 비어있다면 비어있는 배열을 방출합니다.
      */
-    func fetch(by date: Date) -> Observable<[Quest]>
+    func fetch(by date: Date) -> Single<[Quest]>
 
     /**
      해당 날짜의 퀘스트 값(`currentCount`)을 업데이트 합니다.
@@ -56,5 +56,5 @@ protocol QuestsRepository {
      */
     func deleteAll(with groupId: UUID) -> Single<[Quest]>
 
-    func fetch(by uuid: String, date: Date) -> Observable<[Quest]>
+    func fetch(by uuid: String, date: Date) -> Single<[Quest]>
 }

DailyQuest/DailyQuest/Domain/UseCases/Browse/DefaultBrowseUseCase.swift

@@ -18,13 +18,13 @@ final class DefaultBrowseUseCase {
 }
 
 extension DefaultBrowseUseCase: BrowseUseCase {
-    func excute() -> Observable<[BrowseQuest]> {
+    func excute() -> Single<[BrowseQuest]> {
         return browseRepository.fetch()
     }
 }
 
 final class BrowseMockRepo: BrowseRepository {
-    func fetch() -> RxSwift.Observable<[BrowseQuest]> {
+    func fetch() -> Single<[BrowseQuest]> {
         return .just([BrowseQuest(user: User(uuid: "", nickName: "test", profileURL: "", backgroundImageURL: "", introduce: "", allow: false), quests: [])])
     }
 }

DailyQuest/DailyQuest/Domain/UseCases/Browse/Protocols/BrowseUseCase.swift

@@ -10,5 +10,5 @@ import Foundation
 import RxSwift
 
 protocol BrowseUseCase {
-    func excute() -> Observable<[BrowseQuest]>
+    func excute() -> Single<[BrowseQuest]>
 }

DailyQuest/DailyQuest/Domain/UseCases/Common/DefaultFriendCalendarUseCase.swift

@@ -68,6 +68,7 @@ extension DefaultFriendCalendarUseCase {
 
                 return self.questsRepository
                     .fetch(by: self.user.uuid, date: date)
+                    .asObservable()
                     .map { quests -> DailyQuestCompletion in
                         let isSelected = (try? self.selectedDate.value().startOfDay == date) ?? false
 

DailyQuest/DailyQuest/Domain/UseCases/Common/DefaultFriendQuestUseCase.swift

@@ -18,7 +18,7 @@ final class DefaultFriendUseCase {
 }
 
 extension DefaultFriendUseCase: FriendQuestUseCase {
-    func fetch(with uuid: String, by date: Date) -> Observable<[Quest]> {
+    func fetch(with uuid: String, by date: Date) -> Single<[Quest]> {
         return questsRepository.fetch(by: uuid, date: date)
     }
 }

DailyQuest/DailyQuest/Domain/UseCases/Common/Protocols/FriendQuestUseCase.swift

@@ -10,5 +10,5 @@ import Foundation
 import RxSwift
 
 protocol FriendQuestUseCase {
-    func fetch(with uuid: String, by date: Date) -> Observable<[Quest]>
+    func fetch(with uuid: String, by date: Date) -> Single<[Quest]>
 }

DailyQuest/DailyQuest/Domain/UseCases/Home/DefaultEnrollUseCase.swift

@@ -18,7 +18,7 @@ final class DefaultEnrollUseCase {
 }
 
 extension DefaultEnrollUseCase: EnrollUseCase {
-    func save(with quests: [Quest]) -> Observable<Bool> {
+    func save(with quests: [Quest]) -> Single<Bool> {
         return questsRepository
             .save(with: quests)
             .map { _ in
@@ -29,6 +29,5 @@ extension DefaultEnrollUseCase: EnrollUseCase {
                 let dates = quests.map { $0.date }
                 NotificationCenter.default.post(name: .updated, object: dates)
             })
-            .asObservable()
     }
 }

DailyQuest/DailyQuest/Domain/UseCases/Home/DefaultQuestUseCase.swift

@@ -18,11 +18,11 @@ final class DefaultQuestUseCase {
 }
 
 extension DefaultQuestUseCase: QuestUseCase {
-    func fetch(by date: Date) -> Observable<[Quest]> {
+    func fetch(by date: Date) -> Single<[Quest]> {
         return questsRepository.fetch(by: date)
     }
 
-    func update(with quest: Quest) -> Observable<Bool> {
+    func update(with quest: Quest) -> Single<Bool> {
         return questsRepository
             .update(with: quest)
             .do(onSuccess: { quest in
@@ -32,6 +32,5 @@ extension DefaultQuestUseCase: QuestUseCase {
             })
             .map { _ in true }
             .catchAndReturn(false)
-            .asObservable()
     }
 }