Refactor/data layer (3)

DailyQuest/DailyQuest/Data/DataConfigure.swift

@@ -0,0 +1,14 @@
+//
+//  DataConfigure.swift
+//  DailyQuest
+//
+//  Created by 이전희 on 2022/12/05.
+//
+
+import Foundation
+
+enum DateFilter {
+    case today(_ date: Date)
+    case month(_ date: Date)
+    case year(_date: Date)
+}

DailyQuest/DailyQuest/Data/Network/DataMapping/QuestDTO+Mapping.swift

@@ -23,6 +23,15 @@ struct QuestDTO: DTO {
         self.currentCount = 0
         self.totalCount = 0
     }
+
+    init(groupId: UUID, uuid: String, date: String, title: String, currentCount: Int, totalCount: Int) {
+        self.groupId = groupId
+        self.uuid = uuid
+        self.date = date
+        self.title = title
+        self.currentCount = currentCount
+        self.totalCount = totalCount
+    }
 }
 
 extension QuestDTO {
@@ -35,3 +44,14 @@ extension QuestDTO {
                      totalCount: totalCount)
     }
 }
+
+extension Quest {
+    func toDTO() -> QuestDTO {
+        return QuestDTO(groupId: groupId,
+                        uuid: uuid.uuidString,
+                        date: date.toString,
+                        title: title,
+                        currentCount: currentCount,
+                        totalCount: totalCount)
+    }
+}

DailyQuest/DailyQuest/Data/Repositories/DefaultBrowseRepository.swift

@@ -9,64 +9,59 @@ import Foundation
 import RxSwift
 
 final class DefaultBrowseRepository {
-    
+
     private let persistentStorage: BrowseQuestsStorage
     private let networkService: NetworkService
-
-    init(persistentStorage: BrowseQuestsStorage, networkService: NetworkService = FirebaseService.shared) {
+
+    private let disposeBag: DisposeBag
+
+    init(persistentStorage: BrowseQuestsStorage,
+         networkService: NetworkService = FirebaseService.shared,
+         repositoryManager: RepositoryManager = RepositoryManager.shared) {
         self.persistentStorage = persistentStorage
         self.networkService = networkService
+        self.disposeBag = repositoryManager.disposeBag
     }
 }
 
 extension DefaultBrowseRepository: BrowseRepository {
-    
+
     /// Fetch BrowseQuests
     /// Firebase 우선, 실패시 persistentStorage, persistentStorage도 실패시 Error반환
     /// - Returns: Observable<[BrowseQuest]>
     func fetch() -> Observable<[BrowseQuest]> {
         return self.networkService.getAllowUsers(limit: 10)
             .map { $0.toDomain() }
             .flatMap { user in
-                self.networkService
-                    .read(type: QuestDTO.self, userCase: .anotherUser(user.uuid), access: .quests, filter: .today(Date()))
-                    .map { $0.toDomain() }
-                    .toArray()
-                    .asObservable()
-                    .map { questList in
-                        return BrowseQuest(user: user, quests: questList)
-                    }
+            self.networkService
+                .read(type: QuestDTO.self, userCase: .anotherUser(user.uuid), access: .quests, filter: .today(Date()))
+                .map { $0.toDomain() }
+                .toArray()
+                .asObservable()
+                .map { questList in
+                return BrowseQuest(user: user, quests: questList)
             }
-
+        }
+
             .filter { !$0.quests.isEmpty }
             .toArray()
             .asObservable()
             .do(afterNext: { browseQuests in
-                _ = self.persistentStorage.deleteBrowseQuests()
-                    .asObservable()
-                    .concatMap { _ in
-                        Observable.from(browseQuests)
-                            .flatMap { browseQuest in
-                                self.persistentStorage.saveBrowseQuest(browseQuest: browseQuest)
-                                    .asObservable()
-                            }
-                    }
-                    .subscribe(onError: { error in
-                        print(error)
-                    })
-            })
-            .catch { error in
-                return self.persistentStorage.fetchBrowseQuests()
+            self.persistentStorage.deleteBrowseQuests()
+                .asObservable()
+                .concatMap { _ in
+                Observable.from(browseQuests)
+                    .flatMap { browseQuest in
+                    self.persistentStorage.saveBrowseQuest(browseQuest: browseQuest)
+                        .asObservable()
+                }
             }
-    }
-}
-
-extension DefaultBrowseRepository {
-    static func test() {
-        let browseRepository = DefaultBrowseRepository(persistentStorage: RealmBrowseQuestsStorage(), networkService: FirebaseService.shared)
-        let fetchBrowseQuestsObserver = browseRepository.fetch()
-        _ = fetchBrowseQuestsObserver.subscribe { event in
-            print(event)
+                .subscribe(onError: { error in
+                print(error)
+                }).disposed(by: self.disposeBag)
+        })
+            .catch { error in
+            return self.persistentStorage.fetchBrowseQuests()
         }
     }
 }

DailyQuest/DailyQuest/Data/Repositories/DefaultQuestsRepository.swift

@@ -11,80 +11,80 @@ import Foundation
 final class DefaultQuestsRepository {
 
     private let persistentStorage: QuestsStorage
+    private let networkService: NetworkService
 
-    init(persistentStorage: QuestsStorage) {
+    init(persistentStorage: QuestsStorage, networkService: NetworkService = FirebaseService.shared) {
         self.persistentStorage = persistentStorage
+        self.networkService = networkService
     }
 }
 
 extension DefaultQuestsRepository: QuestsRepository {
     func save(with quest: [Quest]) -> Single<[Quest]> {
         return persistentStorage.saveQuests(with: quest)
+            .flatMap { quests in
+            return Observable.from(quests)
+                .concatMap { quest in
+                return self.networkService.create(userCase: .currentUser,
+                                                  access: .quests,
+                                                  dto: quest.toDTO())
+            }
+                .map { $0.toDomain() }
+                .toArray()
+        }
     }
 
     func fetch(by date: Date) -> Observable<[Quest]> {
         return persistentStorage.fetchQuests(by: date)
+            .catch { _ in
+            self.networkService.read(type: QuestDTO.self, userCase: .currentUser, access: .quests, filter: .today(date))
+                .map { $0.toDomain() }
+                .toArray()
+                .asObservable()
+        }
     }
 
     func update(with quest: Quest) -> Single<Quest> {
         return persistentStorage.updateQuest(with: quest)
+            .flatMap { quest in
+            self.networkService.update(userCase: .currentUser, access: .quests, dto: quest.toDTO())
+        }
+            .map { $0.toDomain() }
+            .asObservable()
+            .asSingle()
     }
 
     func delete(with questId: UUID) -> Single<Quest> {
         return persistentStorage.deleteQuest(with: questId)
+            .flatMap { quest in
+            self.networkService.delete(userCase: .currentUser, access: .quests, dto: quest.toDTO())
+        }
+            .map { $0.toDomain() }
+            .asObservable()
+            .asSingle()
     }
 
     func deleteAll(with groupId: UUID) -> Single<[Quest]> {
         return persistentStorage.deleteQuestGroup(with: groupId)
-    }
-
-    func fetch(by uuid: String) -> Observable<[Quest]> {
-        return .just([])
-    }
-}
-
-extension DefaultQuestsRepository {
-    static func test() {
-        let persistentStorage = RealmQuestsStorage()
-        let repository = DefaultQuestsRepository(persistentStorage: persistentStorage)
-        let dummyDate = ["2022-11-17".toDate()!,
-                         "2022-11-18".toDate()!,
-                         "2022-11-19".toDate()!,
-                         "2022-11-20".toDate()!,
-                         "2022-11-21".toDate()!,
-                         "2022-11-22".toDate()!,
-                         "2022-11-23".toDate()!,
-                         "2022-11-24".toDate()!]
-        let dummyData = (0...10).compactMap { i in
-            Quest(groupId: UUID(), uuid: UUID(), date: dummyDate[i % dummyDate.count], title: "\(i) dummyData", currentCount: 0, totalCount: i % 5)
-        }
-
-        print("🍀save")
-        let _ = repository.save(with: dummyData)
-            .subscribe { event in
-            print(event)
-        }
-
-        print("🍀fetch \(Date())")
-
-        let _ = repository.fetch(by: Date())
-            .subscribe { event in
-            print(event)
-        }
-
-        let temp = dummyData[0]
-        print("🍀update \(temp.uuid)")
-        let quest = Quest(groupId: temp.groupId, uuid: temp.uuid, date: temp.date, title: "change", currentCount: temp.currentCount + 1, totalCount: temp.totalCount)
-        let _ = repository.update(with: quest)
-            .subscribe { event in
-            print(event)
-        }
-
-        print("🍀delete \(dummyData[1].uuid)")
-        let _ = repository.delete(with: dummyData[1].uuid)
-            .subscribe { event in
-            print(event)
+            .flatMap { quests in
+            return Observable.from(quests)
+                .concatMap { quest in
+                self.networkService.delete(userCase: .currentUser,
+                                           access: .quests,
+                                           dto: quest.toDTO())
+            }
+                .map { $0.toDomain() }
+                .toArray()
         }
+    }
 
+    func fetch(by uuid: String, date: Date) -> Observable<[Quest]> { // 받을 날짜까지 받아와야함
+        return self.networkService.read(type: QuestDTO.self,
+                                        userCase: .anotherUser(uuid),
+                                        access: .quests,
+                                        filter: .today(date))
+            .map { $0.toDomain() }
+            .toArray()
+            .asObservable()
     }
 }

DailyQuest/DailyQuest/Data/Repositories/DefaultUserRepository.swift

@@ -42,6 +42,16 @@ extension DefaultUserRepository: UserRepository {
         }
     }
 
+    func fetchUser(by uuid: String) -> Observable<User> {
+        return self.networkService.read(type: UserDTO.self,
+                                        userCase: .anotherUser(uuid),
+                                        access: .userInfo,
+                                        filter: nil)
+            .map { $0.toDomain() }
+    }
+}
+
+extension DefaultUserRepository: ProtectedUserRepository {
     func deleteUser() -> Observable<Bool> {
         return self.persistentStorage.deleteUserInfo()
             .map { _ in true }
@@ -51,8 +61,4 @@ extension DefaultUserRepository: UserRepository {
                 .map { _ in true }
         }
     }
-
-    func fetchUser(by uuid: String) -> Observable<User> {
-        .just(User(uuid: "", nickName: "", profileURL: "", backgroundImageURL: "", description: "", allow: true))
-    }
 }

DailyQuest/DailyQuest/Data/Repositories/RepositoryManager.swift

@@ -0,0 +1,15 @@
+//
+//  RepositoryManager.swift
+//  DailyQuest
+//
+//  Created by 이전희 on 2022/12/05.
+//
+
+import RxSwift
+
+final class RepositoryManager {
+    static let shared = RepositoryManager()
+    private init() { }
+
+    var disposeBag: DisposeBag = DisposeBag()
+}

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

@@ -0,0 +1,14 @@
+//
+//  ProtectedUserRepository.swift
+//  DailyQuest
+//
+//  Created by 이전희 on 2022/12/05.
+//
+
+import RxSwift
+
+protocol ProtectedUserRepository {
+    /// 유저정보를 삭제합니다.
+    /// - Returns: 삭제 성공 여부를 방출하는 Observable입니다.
+    func deleteUser() -> Observable<Bool>
+}

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

@@ -18,7 +18,7 @@ protocol QuestsRepository {
      - Returns: 성공시 Quest를, 실패시, error를 방출하는 Observable입니다.
      */
     func save(with quest: [Quest]) -> Single<[Quest]>
-    
+
     /**
      해당 날짜의 퀘스트 배열을 받아옵니다.
 
@@ -27,7 +27,7 @@ protocol QuestsRepository {
      - Returns: Quest의 배열을 방출하는 Observable입니다. 비어있다면 비어있는 배열을 방출합니다.
      */
     func fetch(by date: Date) -> Observable<[Quest]>
-    
+
     /**
      해당 날짜의 퀘스트 값(`currentCount`)을 업데이트 합니다.
 
@@ -36,7 +36,7 @@ protocol QuestsRepository {
      - Returns: 성공시 Quest를, 실패시 error를 방출하는 Observable입니다.
      */
     func update(with quest: Quest) -> Single<Quest>
-    
+
     /**
      해당 날짜에 해당하는 퀘스트의 값을 업데이트 합니다.
 
@@ -45,7 +45,7 @@ protocol QuestsRepository {
      - Returns: 성공시 해당 Quest를, 실패시 error를 방출하는 Observable입니다.
      */
     func delete(with questId: UUID) -> Single<Quest>
-    
+
     /**
      해당 group의 Quest를 모두 삭제합니다.
 
@@ -55,6 +55,6 @@ protocol QuestsRepository {
      - Returns: 성공시 해당 Quest 배열을, 실패시 error를 방출하는 Observable입니다.
      */
     func deleteAll(with groupId: UUID) -> Single<[Quest]>
-    
-    func fetch(by uuid: String) -> Observable<[Quest]>
+
+    func fetch(by uuid: String, date: Date) -> Observable<[Quest]>
 }

DailyQuest/DailyQuest/Domain/Interfaces/Repositories/UserRepository.swift

@@ -22,9 +22,5 @@ protocol UserRepository {
     /// - Returns: 성공적으로 바뀐 유저의 정보를 방출하는 Observable입니다.
     func updateUser(by user: User) -> Observable<User>
 
-    /// 유저정보를 삭제합니다.
-    /// - Returns: 삭제 성공 여부를 방출하는 Observable입니다.
-    func deleteUser() -> Observable<Bool>
-
     func fetchUser(by uuid: String) -> Observable<User>
 }