-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/quest repository #34
Merged
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
010514b
[feat] add Date Extension
Jeonhui dc4e6d2
[feat] NetworkService & FirebaseService - Base Settings
Jeonhui 078c39e
[feat] NetworkService protocol
Jeonhui ac9696f
Merge pull request #29 from boostcampwm-2022/feature/QuestRepositoryPβ¦
sprituz 946c2a3
[feat] create DefaultQuestsRepository
Jeonhui cbaa233
[feat] Add DTO
sprituz 751b921
[feat] firebase test
Jeonhui cdce33b
[feat] update DTO Protocol
Jeonhui 1f20391
[feat] update NetworkService & firebaseService
Jeonhui 69c184e
[fix] UserQuestEntity
Jeonhui 9ebd39c
[fix] UserQuestEntity
Jeonhui 9946293
[fix] change func name (updateEntity->saveEntity))
Jeonhui bc20aa6
[feat] DefaultQuestsRepository
Jeonhui e145dfe
[fix] change EntityName (UserQuestEntity->QuestEntity))
Jeonhui 278303c
[feat] RealmQuestsStorage
Jeonhui b865ad0
[fix] change Directory name (UserQuestsStorage->QuestsStorage)
Jeonhui 5e9f0a1
[fix] Quest struct (add Date)
Jeonhui b694713
[feat] add String extension
Jeonhui 263d8e1
[feat] Implement update and delete function
sprituz 0a93ed0
[feat] DefaultQuestsRepository
Jeonhui d596b49
Merge branch 'develop' into feature/QuestRepository
Jeonhui 219a05e
[feat] Delete Completion
sprituz 31c8b09
Merge branch 'feature/firebase' into feature/QuestRepository
Jeonhui File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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,12 @@ | ||
// | ||
// DTO.swift | ||
// DailyQuest | ||
// | ||
// Created by μ΄μ ν¬ on 2022/11/21. | ||
// | ||
|
||
import Foundation | ||
|
||
protocol DTO: Codable { | ||
var uuid: UUID { get } | ||
} |
26 changes: 26 additions & 0 deletions
26
DailyQuest/DailyQuest/Data/Network/DataMapping/QuestDTO+Mapping.swift
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,26 @@ | ||
// | ||
// QuestDTO+Mapping.swift | ||
// DailyQuest | ||
// | ||
// Created by μ΄λ€μ° on 2022/11/21. | ||
// | ||
|
||
import Foundation | ||
|
||
struct QuestDTO: DTO { | ||
let uuid: UUID | ||
let title: String | ||
let currentCount: Int | ||
let totalCount: Int | ||
let groupUid: UUID | ||
} | ||
|
||
extension QuestDTO { | ||
func toDomain() -> Quest { | ||
return Quest(groupId: groupUid, | ||
uuid: uuid, | ||
title: title, | ||
currentCount: currentCount, | ||
totalCount: totalCount) | ||
} | ||
} |
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
17 changes: 17 additions & 0 deletions
17
DailyQuest/DailyQuest/Data/PersistentStorages/QuestsStorage/QuestsStorage.swift
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,17 @@ | ||
// | ||
// QuestsStorage.swift | ||
// DailyQuest | ||
// | ||
// Created by μ΄μ ν¬ on 2022/11/14. | ||
// | ||
|
||
import Foundation | ||
import RxSwift | ||
|
||
protocol QuestsStorage { | ||
func saveQuests(with quests: [Quest]) -> Single<[Quest]> | ||
func fetchQuests(by date: Date) -> Observable<[Quest]> | ||
func updateQuest(with quest: Quest) -> Single<Quest> | ||
func deleteQuest(with questId: UUID) -> Single<Quest> | ||
func deleteQuestGroup(with groupId: UUID) -> Single<[Quest]> | ||
} |
31 changes: 31 additions & 0 deletions
31
...ata/PersistentStorages/QuestsStorage/RealmStorage/EntityMapping/QuestEntity+Mapping.swift
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,31 @@ | ||
// | ||
// QuestEntity+Mapping.swift | ||
// DailyQuest | ||
// | ||
// Created by μ΄μ ν¬ on 2022/11/14. | ||
// | ||
|
||
import Foundation | ||
|
||
extension QuestEntity { | ||
convenience init(quest: Quest) { // Questμ date λ€μ΄κ°λ©΄ μμ | ||
self.init( | ||
groupId: quest.groupId, | ||
uuid: quest.uuid, | ||
date: quest.date.toString, | ||
title: quest.title, | ||
currentCount: quest.currentCount, | ||
totalCount: quest.totalCount) | ||
} | ||
} | ||
|
||
extension QuestEntity { | ||
func toDomain() -> Quest { | ||
return Quest(groupId: groupId, | ||
uuid: uuid, | ||
date: date.toDate() ?? Date(), | ||
title: title, | ||
currentCount: currentCount, | ||
totalCount: totalCount) | ||
} | ||
} |
123 changes: 123 additions & 0 deletions
123
...st/DailyQuest/Data/PersistentStorages/QuestsStorage/RealmStorage/RealmQuestsStorage.swift
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,123 @@ | ||
// | ||
// RealmQuestsStorage.swift | ||
// DailyQuest | ||
// | ||
// Created by μ΄μ ν¬ on 2022/11/14. | ||
// | ||
|
||
import Foundation | ||
import RxSwift | ||
|
||
final class RealmQuestsStorage { | ||
|
||
private let realmStorage: RealmStorage | ||
|
||
init(realmStorage: RealmStorage = RealmStorage.shared) { | ||
self.realmStorage = realmStorage | ||
} | ||
} | ||
|
||
extension RealmQuestsStorage: QuestsStorage { | ||
|
||
func saveQuests(with quests: [Quest]) -> Single<[Quest]> { | ||
return Single.create { [weak self] single in | ||
guard let realmStorage = self?.realmStorage else { | ||
return Disposables.create() | ||
} | ||
|
||
do { | ||
for quest in quests { | ||
let questEntity = QuestEntity(quest: quest) | ||
try realmStorage.saveEntity(entity: questEntity) | ||
} | ||
single(.success(quests)) | ||
} catch let error { | ||
single(.failure(RealmStorageError.saveError(error))) | ||
|
||
} | ||
return Disposables.create() | ||
} | ||
} | ||
|
||
func fetchQuests(by date: Date) -> Observable<[Quest]> { | ||
return Observable<[Quest]>.create { [weak self] observer in | ||
guard let realmStorage = self?.realmStorage else { | ||
return Disposables.create() | ||
} | ||
|
||
do { | ||
let quests = try realmStorage | ||
.fetchEntities(type: QuestEntity.self, filter: NSPredicate(format: "date == %@", date.toString)) | ||
.compactMap { $0.toDomain() } | ||
observer.onNext(quests) | ||
observer.onCompleted() | ||
} catch let error { | ||
observer.onError(error) | ||
} | ||
|
||
return Disposables.create() | ||
} | ||
} | ||
|
||
func updateQuest(with quest: Quest) -> Single<Quest> { | ||
return Single.create { [weak self] single in | ||
guard let realmStorage = self?.realmStorage else { | ||
return Disposables.create() | ||
} | ||
let questEntity = QuestEntity(quest: quest) | ||
do { | ||
try realmStorage.updateEntity(entity: questEntity) | ||
single(.success(quest)) | ||
} catch let error { | ||
single(.failure(RealmStorageError.saveError(error))) | ||
} | ||
|
||
return Disposables.create() | ||
} | ||
} | ||
|
||
func deleteQuest(with questId: UUID) -> Single<Quest> { | ||
return Single.create { [weak self] single in | ||
guard let realmStorage = self?.realmStorage else { | ||
return Disposables.create() | ||
} | ||
|
||
do { | ||
guard let entity = try realmStorage.findEntities(type: QuestEntity.self, filter: NSPredicate(format: "uuid == %@", questId as CVarArg)).first else { | ||
throw RealmStorageError.noDataError | ||
} | ||
let quest = entity.toDomain() | ||
try realmStorage.deleteEntity(entity: entity) | ||
single(.success(quest)) | ||
|
||
} catch let error { | ||
single(.failure(RealmStorageError.saveError(error))) | ||
} | ||
|
||
return Disposables.create() | ||
} | ||
|
||
} | ||
|
||
func deleteQuestGroup(with groupId: UUID) -> Single<[Quest]> { | ||
return Single.create { [weak self] single in | ||
guard let realmStorage = self?.realmStorage else { | ||
return Disposables.create() | ||
} | ||
|
||
do { | ||
let entities = try realmStorage.findEntities(type: QuestEntity.self, filter: NSPredicate(format: "groupId == %@", groupId as CVarArg)) | ||
let quests = entities.compactMap { $0.toDomain() } | ||
for entity in entities { | ||
try realmStorage.deleteEntity(entity: entity) | ||
} | ||
single(.success(quests)) | ||
|
||
} catch let error { | ||
single(.failure(RealmStorageError.saveError(error))) | ||
} | ||
|
||
return Disposables.create() | ||
} | ||
} | ||
} |
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
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
Oops, something went wrong.
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.
κ°μΈμ μΈ μ견μ λλ€λ§ κ°λ₯νλ€λ©΄ NSPredicateλ€μ enum μ΄λ structλ‘ predicateμ λν΄ μ΄λ¦μ΄ μμΌλ©΄ ν¨μ¬ μ½κΈ° μ¬μΈ κ² κ°μ΅λλΉ. μλλ©΄ ν¨μ λ΄μμ letμΌλ‘ λΉΌκ±°λ?