[fix] UserRepository Firebase Error ignore

Author: Jeonhui

DailyQuest/DailyQuest/Data/Repositories/DefaultBrowseRepository.swift

@@ -27,7 +27,7 @@ extension DefaultBrowseRepository: BrowseRepository {
     /// Firebase 우선, 실패시 persistentStorage, persistentStorage도 실패시 Error반환
     /// - Returns: Observable<[BrowseQuest]>
     func fetch() -> Observable<[BrowseQuest]> {
-        return self.networkService.getAllowUsers(limit: 10)
+        return networkService.getAllowUsers(limit: 10)
             .map { $0.toDomain() }
             .flatMap { user in
             self.networkService

DailyQuest/DailyQuest/Data/Repositories/DefaultUserRepository.swift

@@ -21,32 +21,28 @@ final class DefaultUserRepository {
 
 extension DefaultUserRepository: UserRepository {
     func isLoggedIn() -> BehaviorRelay<String?> {
-        return self.networkService.uid
+        return networkService.uid
     }
 
     func readUser() -> Observable<User> {
         return self.persistentStorage.fetchUserInfo()
-            .catch { _ in
-            return self.networkService.read(type: UserDTO.self, userCase: .currentUser, access: .userInfo, filter: nil)
-                .map { $0.toDomain() }
+            .catch { [weak self] _ in
+            guard let self = self else { return Observable.just(User()) }
+            return self.fetchUserNetworkService()
         }
     }
 
     func updateUser(by user: User) -> Observable<User> {
-        return self.persistentStorage.updateUserInfo(user: user)
+        return persistentStorage.updateUserInfo(user: user)
             .asObservable()
-            .concatMap { _ in
-            return self.networkService.update(userCase: .currentUser, access: .userInfo, dto: user.toDTO())
-                .map { $0.toDomain() }
-                .asObservable()
-        }
+            .flatMap(updateUserNetworkService(user:))
     }
 
     func fetchUser(by uuid: String) -> Observable<User> {
-        return self.networkService.read(type: UserDTO.self,
-                                        userCase: .anotherUser(uuid),
-                                        access: .userInfo,
-                                        filter: nil)
+        return networkService.read(type: UserDTO.self,
+                                   userCase: .anotherUser(uuid),
+                                   access: .userInfo,
+                                   filter: nil)
             .map { $0.toDomain() }
     }
 }
@@ -62,3 +58,18 @@ extension DefaultUserRepository: ProtectedUserRepository {
         }
     }
 }
+
+private extension DefaultUserRepository {
+    func fetchUserNetworkService() -> Observable<User> {
+        networkService.read(type: UserDTO.self, userCase: .currentUser, access: .userInfo, filter: nil)
+            .map { $0.toDomain() }
+    }
+
+    func updateUserNetworkService(user: User) -> Observable<User> {
+        networkService.update(userCase: .currentUser, access: .userInfo, dto: user.toDTO())
+            .map { $0.toDomain() }
+            .asObservable()
+            .catchAndReturn(user)
+    }
+}
+

DailyQuest/DailyQuest/Domain/Entities/User.swift

@@ -14,4 +14,24 @@ struct User {
     let backgroundImageURL: String
     let description: String
     let allow: Bool
+    
+    init(){
+        self.uuid = ""
+        self.nickName = ""
+        self.profileURL = ""
+        self.backgroundImageURL = ""
+        self.description = ""
+        self.allow = false
+    }
+    
+    init(uuid: String, nickName: String, profileURL: String, backgroundImageURL: String, description: String, allow: Bool) {
+        self.uuid = uuid
+        self.nickName = nickName
+        self.profileURL = profileURL
+        self.backgroundImageURL = backgroundImageURL
+        self.description = description
+        self.allow = allow
+    }
+    
+    
 }