Refactor/quests repository (1) #84
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,80 +11,84 @@ import Foundation | |
| final class DefaultQuestsRepository { | ||
|
|
||
| private let persistentStorage: QuestsStorage | ||
| private let networkService: NetworkService | ||
|
|
||
| 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() | ||
| .asObservable() | ||
| .asSingle() | ||
|
Comment on lines
+32
to
+35
There was a problem hiding this comment.
There was a problem hiding this comment. toArrayλ₯Ό νλ κ²½μ° μλ£νμ΄ λ°λμ΄λ²λ €μ asSingleμ λ°λ‘ μ€νμ΄ μ λμ΄ asObservableλ‘ obseravaleλ‘ λ°κΎΌλ€ singleλ‘ λ°κΎΈμμ΅λλ€ π There was a problem hiding this comment. μ κ° μκΈ°λ‘ toArray()μ κ²°κ³Όλ singleμ΄ λλκ±Έλ‘ κΈ°μ΅ν΄μ. (μ ννμ§ μμ§λ§..!) There was a problem hiding this comment. νμΈν΄λ³΄λ κ·Έλ λ€μ. λ°©κΈ κ³ μ³μ 컀λ°ν΄λ¨μ΅λλ€. toArrayμ λ°νκ°μ΄ PrimitiveSequence<SingleTrait, [Quest]>λΌμ κ³ μ³€λκ±΄λ° κ°λ₯νλ€μ κ°μ¬ν©λλ€ There was a problem hiding this comment. μ¬μ€ Singleμ PrimitiveSequence<SingleTrait, Element>μ νμ
μ리μ΄μ€(typealias)λΌκ³ ν©λλ€! |
||
| } | ||
| } | ||
|
|
||
| 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: .month(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) | ||
| .flatMap { quests in | ||
| return Observable.from(quests) | ||
| .concatMap { quest in | ||
| self.networkService.delete(userCase: .currentUser, | ||
| access: .quests, | ||
| dto: quest.toDTO()) | ||
| } | ||
| .map { $0.toDomain() } | ||
| .toArray() | ||
| .asObservable() | ||
| .asSingle() | ||
| } | ||
| } | ||
|
|
||
| func fetch(by uuid: String) -> Observable<[Quest]> { // λ°μ λ μ§κΉμ§ λ°μμμΌν¨ | ||
| return self.networkService.read(type: QuestDTO.self, | ||
| userCase: .anotherUser(uuid), | ||
| access: .quests, | ||
| filter: .month(Date())) | ||
| .map { $0.toDomain() } | ||
| .toArray() | ||
| .asObservable() | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,12 +33,6 @@ enum CRUD { | |
| case delete | ||
| } | ||
|
|
||
| enum StoragePath { | ||
| case profileImages | ||
| case backgroundImages | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
μ΄κ² μ°μ monthκ°μ λ°μ΄ν°λ₯Ό κ°μ Έμ¬λ νμνκ²μ΄μ§μ?
κ·Όλ° μμ§μ RealmServiceμλ§ μλ κ²μ΄μ£ ?