Merge pull request #152 from boostcampwm-2022/feature/ProfileView

jinwoong16 · web-flow · commit 810850d8c68f · 2022-12-14T10:13:56.000+09:00
Feature/profile view
diff --git a/DailyQuest/DailyQuest.xcodeproj/project.pbxproj b/DailyQuest/DailyQuest.xcodeproj/project.pbxproj
@@ -140,7 +140,6 @@
 		9BED4DE8293FA01400C60631 /* ProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BED4DE7293FA01400C60631 /* ProfileViewModel.swift */; };
 		9BED4DEA293FA92900C60631 /* UIImageView+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BED4DE9293FA92900C60631 /* UIImageView+.swift */; };
 		9BED4DEC2940EA8900C60631 /* UserImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BED4DEB2940EA8900C60631 /* UserImageView.swift */; };
-		9BED4DEE2941932200C60631 /* CameraIconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BED4DED2941932200C60631 /* CameraIconView.swift */; };
 		9BED4DF12941C47D00C60631 /* RxGesture in Frameworks */ = {isa = PBXBuildFile; productRef = 9BED4DF02941C47D00C60631 /* RxGesture */; };
 		9BED4DF629470D8C00C60631 /* LaunchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BED4DF529470D8C00C60631 /* LaunchViewController.swift */; };
 		9BED4DFF2947109D00C60631 /* max.lottie.json in Resources */ = {isa = PBXBuildFile; fileRef = 9BED4DFE2947109C00C60631 /* max.lottie.json */; };
@@ -383,7 +382,6 @@
 		9BED4DE7293FA01400C60631 /* ProfileViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewModel.swift; sourceTree = "<group>"; };
 		9BED4DE9293FA92900C60631 /* UIImageView+.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImageView+.swift"; sourceTree = "<group>"; };
 		9BED4DEB2940EA8900C60631 /* UserImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserImageView.swift; sourceTree = "<group>"; };
-		9BED4DED2941932200C60631 /* CameraIconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraIconView.swift; sourceTree = "<group>"; };
 		9BED4DF529470D8C00C60631 /* LaunchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchViewController.swift; sourceTree = "<group>"; };
 		9BED4DFE2947109C00C60631 /* max.lottie.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = max.lottie.json; sourceTree = "<group>"; };
 		A5003AB3293F5FEC00082A9C /* SignUpViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpViewModel.swift; sourceTree = "<group>"; };
@@ -1084,7 +1082,6 @@
 				345687F729374D2500CA51E3 /* DayNamePickerView.swift */,
 				345687F92937815900CA51E3 /* QuantityView.swift */,
 				9BED4DEB2940EA8900C60631 /* UserImageView.swift */,
-				9BED4DED2941932200C60631 /* CameraIconView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1577,7 +1574,6 @@
 				349955122923220E007AB99E /* SwiftUIPreview.swift in Sources */,
 				9BD8CD022938418500E6EA2F /* LastFollowingCell.swift in Sources */,
 				3449AD6029222B3900B87619 /* UserInfoCell.swift in Sources */,
-				9BED4DEE2941932200C60631 /* CameraIconView.swift in Sources */,
 				34ACC32F291DE9C000741371 /* SceneDelegate.swift in Sources */,
 				34A529D829247A87001BAD34 /* HomeCoordinator.swift in Sources */,
 				3472E8F7294213BE00BB304F /* DefaultFriendQuestUseCase.swift in Sources */,
diff --git a/DailyQuest/DailyQuest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DailyQuest/DailyQuest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/DailyQuest/DailyQuest/Application/SyncManager.swift b/DailyQuest/DailyQuest/Application/SyncManager.swift
@@ -69,7 +69,7 @@ final class SyncManager {
             
             do {
                 let quests = try persistentStorage
-                    .fetchEntities(type: QuestEntity.self, filter: nil)
+                    .readEntities(type: QuestEntity.self, filter: nil)
                     .compactMap { $0.toDomain() }
                 single(.success(quests))
             } catch let error {
diff --git a/DailyQuest/DailyQuest/Data/PersistentStorages/BrowseQuestsStorage/RealmStorage/RealmBrowseQuestsStorage.swift b/DailyQuest/DailyQuest/Data/PersistentStorages/BrowseQuestsStorage/RealmStorage/RealmBrowseQuestsStorage.swift
@@ -24,7 +24,7 @@ extension RealmBrowseQuestsStorage: BrowseQuestsStorage {
             }
 
             do {
-                let browseQuests = try realmStorage.fetchEntities(type: BrowseQuestEntity.self)
+                let browseQuests = try realmStorage.readEntities(type: BrowseQuestEntity.self)
                     .compactMap { $0.toDomain() }
                 single(.success(browseQuests))
             } catch let error {
@@ -44,7 +44,7 @@ extension RealmBrowseQuestsStorage: BrowseQuestsStorage {
             let browseQuestEntity = BrowseQuestEntity(browseQuest: browseQuest)
 
             do {
-                try realmStorage.saveEntity(entity: browseQuestEntity)
+                try realmStorage.createEntity(entity: browseQuestEntity)
                 single(.success(browseQuest))
             } catch let error {
                 single(.failure(RealmStorageError.saveError(error)))
diff --git a/DailyQuest/DailyQuest/Data/PersistentStorages/QuestsStorage/RealmStorage/RealmQuestsStorage.swift b/DailyQuest/DailyQuest/Data/PersistentStorages/QuestsStorage/RealmStorage/RealmQuestsStorage.swift
@@ -26,7 +26,7 @@ extension RealmQuestsStorage: QuestsStorage {
             do {
                 for quest in quests {
                     let questEntity = QuestEntity(quest: quest)
-                    try realmStorage.saveEntity(entity: questEntity)
+                    try realmStorage.createEntity(entity: questEntity)
                 }
                 single(.success(quests))
             } catch let error {
@@ -43,7 +43,7 @@ extension RealmQuestsStorage: QuestsStorage {
             }
             do {
                 let quests = try realmStorage
-                    .fetchEntities(type: QuestEntity.self, filter: NSPredicate(format: "date == %@", date.toString))
+                    .readEntities(type: QuestEntity.self, filter: NSPredicate(format: "date == %@", date.toString))
                     .compactMap { $0.toDomain() }
                 single(.success(quests))
             } catch let error {
@@ -75,7 +75,7 @@ extension RealmQuestsStorage: QuestsStorage {
                 return Disposables.create()
             }
             do {
-                guard let entity = try realmStorage.findEntities(type: QuestEntity.self, filter: NSPredicate(format: "uuid == %@", questId as CVarArg)).first else {
+                guard let entity = try realmStorage.readEntities(type: QuestEntity.self, filter: NSPredicate(format: "uuid == %@", questId as CVarArg)).first else {
                     throw RealmStorageError.noDataError
                 }
                 let quest = entity.toDomain()
@@ -96,7 +96,7 @@ extension RealmQuestsStorage: QuestsStorage {
             }
             
             do {
-                let entities = try realmStorage.findEntities(type: QuestEntity.self, filter: NSPredicate(format: "groupId == %@", groupId as CVarArg))
+                let entities = try realmStorage.readEntities(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)
@@ -115,7 +115,7 @@ extension RealmQuestsStorage: QuestsStorage {
                 return Disposables.create()
             }
             do {
-                let entities = try realmStorage.fetchEntities(type: QuestEntity.self)
+                let entities = try realmStorage.readEntities(type: QuestEntity.self)
                 let quests = entities.compactMap { $0.toDomain() }
                 for entity in entities {
                     try realmStorage.deleteEntity(entity: entity)
@@ -137,7 +137,7 @@ extension RealmQuestsStorage: QuestsStorage {
             
             do {
                 let quests = try realmStorage
-                    .fetchEntities(type: QuestEntity.self, filter: nil)
+                    .readEntities(type: QuestEntity.self, filter: nil)
                     .compactMap { $0.toDomain() }
                 single(.success(quests))
             } catch let error {
diff --git a/DailyQuest/DailyQuest/Data/PersistentStorages/RealmStorage/RealmStorage.swift b/DailyQuest/DailyQuest/Data/PersistentStorages/RealmStorage/RealmStorage.swift
@@ -19,18 +19,19 @@ enum RealmStorageError: Error {
 
 final class RealmStorage {
     static let shared = RealmStorage()
-
+    private let persistentContainer = try? Realm()
+    
     private init() {
         // Realm file path
         #if DEBUG
-            print(Realm.Configuration.defaultConfiguration.fileURL!)
+        print(Realm.Configuration.defaultConfiguration.fileURL!)
         #endif
     }
+}
 
-    private let persistentContainer = try? Realm()
-
+extension RealmStorage {
     @discardableResult
-    func saveEntity<O: Object>(entity: O) throws -> O {
+    func createEntity<O: Object>(entity: O) throws -> O {
         guard let persistentContainer = persistentContainer else {
             throw RealmStorageError.realmObjectError
         }
@@ -39,8 +40,8 @@ final class RealmStorage {
         }
         return entity
     }
-
-    func fetchEntities<O: Object>(type: O.Type, filter: NSPredicate? = nil) throws -> [O] {
+    
+    func readEntities<O: Object>(type: O.Type, filter: NSPredicate? = nil) throws -> [O] {
         guard let persistentContainer = persistentContainer else {
             throw RealmStorageError.realmObjectError
         }
@@ -50,7 +51,7 @@ final class RealmStorage {
             return Array(persistentContainer.objects(type))
         }
     }
-
+    
     @discardableResult
     func updateEntity<O: Object>(entity: O) throws -> O {
         guard let persistentContainer = persistentContainer else {
@@ -61,7 +62,7 @@ final class RealmStorage {
         }
         return entity
     }
-
+    
     @discardableResult
     func deleteEntity<O: Object>(entity: O) throws -> O {
         guard let persistentContainer = persistentContainer else {
@@ -70,10 +71,10 @@ final class RealmStorage {
         try persistentContainer.write {
             persistentContainer.delete(entity)
         }
-
+        
         return entity
     }
-
+    
     @discardableResult
     func deleteAllEntity<O: Object>(type: O.Type) throws -> [O] {
         guard let persistentContainer = persistentContainer else {
@@ -86,12 +87,4 @@ final class RealmStorage {
         }
         return Array(persistentContainer.objects(type))
     }
-
-    func findEntities<O: Object>(type: O.Type, filter: NSPredicate) throws -> [O] {
-        guard let persistentContainer = persistentContainer else {
-            throw RealmStorageError.realmObjectError
-        }
-        return Array(persistentContainer.objects(type).filter(filter))
-    }
-
 }
diff --git a/DailyQuest/DailyQuest/Data/PersistentStorages/UserInfoStorage/RealmStorage/RealmUserInfoStorage.swift b/DailyQuest/DailyQuest/Data/PersistentStorages/UserInfoStorage/RealmStorage/RealmUserInfoStorage.swift
@@ -21,7 +21,7 @@ extension RealmUserInfoStorage: UserInfoStorage {
         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)
+                guard let userInfoEntity = try realmStorage.readEntities(type: UserInfoEntity.self)
                     .first else {
                     throw RealmStorageError.noDataError
                 }
diff --git a/DailyQuest/DailyQuest/Data/Repositories/DefaultBrowseRepository.swift b/DailyQuest/DailyQuest/Data/Repositories/DefaultBrowseRepository.swift
@@ -27,11 +27,10 @@ extension DefaultBrowseRepository: BrowseRepository {
     /// Firebase 우선, 실패시 persistentStorage, persistentStorage도 실패시 Error반환
     /// - Returns: Observable<[BrowseQuest]>
     func fetch() -> Single<[BrowseQuest]> {
-        let uid = networkService.uid.value
         return networkService.getAllowUsers(limit: 10)
             .map { $0.toDomain() }
             .flatMap(fetchBrowseQuestNetworkService(user:))
-            .filter { !$0.quests.isEmpty &&  uid != $0.user.uuid }
+            .filter { !$0.quests.isEmpty }
             .toArray()
             .do(afterSuccess: { [weak self] browseQuests in
             guard let self = self else { return }
diff --git a/DailyQuest/DailyQuest/Domain/Entities/User.swift b/DailyQuest/DailyQuest/Domain/Entities/User.swift
@@ -70,4 +70,13 @@ extension User {
                     introduce: self.introduce,
                     allow: self.allow)
     }
+    
+    func setIntroduce(introduce: String) -> User {
+        return User(uuid: self.uuid,
+                    nickName: self.nickName,
+                    profileURL: self.profileURL,
+                    backgroundImageURL: self.backgroundImageURL,
+                    introduce: introduce,
+                    allow: self.allow)
+    }
 }
diff --git a/DailyQuest/DailyQuest/Domain/UseCases/Home/DefaultUserUseCase.swift b/DailyQuest/DailyQuest/Domain/UseCases/Home/DefaultUserUseCase.swift
@@ -53,5 +53,12 @@ extension DefaultUserUseCase: UserUseCase {
         return userRepository.deleteUser()
             .catchAndReturn(false)
     }
+    
+    func updateIntroduce(introduce: String) -> Single<Bool> {
+        userRepository.readUser()
+            .map { $0.setIntroduce(introduce: introduce) }
+            .flatMap(userRepository.updateUser(by:))
+            .map { _ in true }
+            .catchAndReturn(false)
+    }
 }
-
diff --git a/DailyQuest/DailyQuest/Domain/UseCases/Home/Protocols/UserUseCase.swift b/DailyQuest/DailyQuest/Domain/UseCases/Home/Protocols/UserUseCase.swift
@@ -17,4 +17,6 @@ protocol UserUseCase {
     func saveBackgroundImage(data: Data) -> Single<Bool>
     
     func delete() -> Single<Bool>
+    
+    func updateIntroduce(introduce: String) -> Single<Bool>
 }
diff --git a/DailyQuest/DailyQuest/Infrastructure/FirebaseService/FirebaseService.swift b/DailyQuest/DailyQuest/Infrastructure/FirebaseService/FirebaseService.swift
@@ -437,8 +437,10 @@ extension FirebaseService {
                         do {
                             guard let querySnapshot = querySnapshot else { throw NetworkServiceError.noDataError }
                             for document in querySnapshot.documents {
-                                let quest = try document.data(as: UserDTO.self)
-                                observer.onNext(quest)
+                                let user = try document.data(as: UserDTO.self)
+                                if user.uuid != self.uid.value {
+                                    observer.onNext(user)
+                                }
                             }
                         } catch let error {
                             observer.onError(error)
diff --git a/DailyQuest/DailyQuest/Presentation/Common/View/FriendStatusView.swift b/DailyQuest/DailyQuest/Presentation/Common/View/FriendStatusView.swift
@@ -31,14 +31,15 @@ final class FriendStatusView: UIView {
     private(set) lazy var userNameLabel: UILabel = {
         let userNameLabel = UILabel()
         userNameLabel.text = "User name label님의 Quest"
+        userNameLabel.font = .systemFont(ofSize: 22,weight: .bold)
         
         return userNameLabel
     }()
     
     private(set) lazy var introduceLabel: UILabel = {
         let introduceLabel = UILabel()
         introduceLabel.text = "introduceLabel"
-        introduceLabel.textColor = .maxLightGrey
+        introduceLabel.textColor = .darkGray
         
         return introduceLabel
     }()
diff --git a/DailyQuest/DailyQuest/Presentation/Home/View/CameraIconView.swift b/DailyQuest/DailyQuest/Presentation/Home/View/CameraIconView.swift
diff --git a/DailyQuest/DailyQuest/Presentation/Home/View/UserImageView.swift b/DailyQuest/DailyQuest/Presentation/Home/View/UserImageView.swift
@@ -19,10 +19,6 @@ final class UserImageView: UIView {
         return userImage
     }()
     
-    private lazy var cameraIcon: CameraIconView = {
-        return CameraIconView()
-    }()
-    
     
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -36,20 +32,12 @@ final class UserImageView: UIView {
     
     private func addSubviews() {
         addSubview(userImage)
-        addSubview(cameraIcon)
     }
     
     private func setupConstraints() {
         userImage.snp.makeConstraints { make in
             make.centerX.centerY.equalToSuperview()
             make.width.height.equalTo(100)
         }
-        cameraIcon.snp.makeConstraints { make in
-            make.left.equalTo(75)
-            make.top.equalTo(75)
-        }
-        self.snp.makeConstraints { make in
-            make.width.height.equalTo(110)
-        }
     }
 }
diff --git a/DailyQuest/DailyQuest/Presentation/Home/ViewController/ProfileViewController.swift b/DailyQuest/DailyQuest/Presentation/Home/ViewController/ProfileViewController.swift
diff --git a/DailyQuest/DailyQuest/Presentation/Home/ViewModel/ProfileViewModel.swift b/DailyQuest/DailyQuest/Presentation/Home/ViewModel/ProfileViewModel.swift

Original file line number	Diff line number	Diff line change
`@@ -19,18 +19,19 @@ enum RealmStorageError: Error {`
`19`	`19`
`20`	`20`	`final class RealmStorage {`
`21`	`21`	`static let shared = RealmStorage()`
`22`		`-`
	`22`	`+ private let persistentContainer = try? Realm()`
	`23`	`+`
`23`	`24`	`private init() {`
`24`	`25`	`// Realm file path`
`25`	`26`	`#if DEBUG`
`26`		`- print(Realm.Configuration.defaultConfiguration.fileURL!)`
	`27`	`+ print(Realm.Configuration.defaultConfiguration.fileURL!)`
`27`	`28`	`#endif`
`28`	`29`	`}`
	`30`	`+}`
`29`	`31`
`30`		`- private let persistentContainer = try? Realm()`
`31`		`-`
	`32`	`+extension RealmStorage {`
`32`	`33`	`@discardableResult`
`33`		`- func saveEntity<O: Object>(entity: O) throws -> O {`
	`34`	`+ func createEntity<O: Object>(entity: O) throws -> O {`
`34`	`35`	`guard let persistentContainer = persistentContainer else {`
`35`	`36`	`throw RealmStorageError.realmObjectError`
`36`	`37`	`}`
`@@ -39,8 +40,8 @@ final class RealmStorage {`
`39`	`40`	`}`
`40`	`41`	`return entity`
`41`	`42`	`}`
`42`		`-`
`43`		`- func fetchEntities<O: Object>(type: O.Type, filter: NSPredicate? = nil) throws -> [O] {`
	`43`	`+`
	`44`	`+ func readEntities<O: Object>(type: O.Type, filter: NSPredicate? = nil) throws -> [O] {`
`44`	`45`	`guard let persistentContainer = persistentContainer else {`
`45`	`46`	`throw RealmStorageError.realmObjectError`
`46`	`47`	`}`
`@@ -50,7 +51,7 @@ final class RealmStorage {`
`50`	`51`	`return Array(persistentContainer.objects(type))`
`51`	`52`	`}`
`52`	`53`	`}`
`53`		`-`
	`54`	`+`
`54`	`55`	`@discardableResult`
`55`	`56`	`func updateEntity<O: Object>(entity: O) throws -> O {`
`56`	`57`	`guard let persistentContainer = persistentContainer else {`
`@@ -61,7 +62,7 @@ final class RealmStorage {`
`61`	`62`	`}`
`62`	`63`	`return entity`
`63`	`64`	`}`
`64`		`-`
	`65`	`+`
`65`	`66`	`@discardableResult`
`66`	`67`	`func deleteEntity<O: Object>(entity: O) throws -> O {`
`67`	`68`	`guard let persistentContainer = persistentContainer else {`
`@@ -70,10 +71,10 @@ final class RealmStorage {`
`70`	`71`	`try persistentContainer.write {`
`71`	`72`	`persistentContainer.delete(entity)`
`72`	`73`	`}`
`73`		`-`
	`74`	`+`
`74`	`75`	`return entity`
`75`	`76`	`}`
`76`		`-`
	`77`	`+`
`77`	`78`	`@discardableResult`
`78`	`79`	`func deleteAllEntity<O: Object>(type: O.Type) throws -> [O] {`
`79`	`80`	`guard let persistentContainer = persistentContainer else {`
`@@ -86,12 +87,4 @@ final class RealmStorage {`
`86`	`87`	`}`
`87`	`88`	`return Array(persistentContainer.objects(type))`
`88`	`89`	`}`
`89`		`-`
`90`		`- func findEntities<O: Object>(type: O.Type, filter: NSPredicate) throws -> [O] {`
`91`		`- guard let persistentContainer = persistentContainer else {`
`92`		`- throw RealmStorageError.realmObjectError`
`93`		`- }`
`94`		`- return Array(persistentContainer.objects(type).filter(filter))`
`95`		`- }`
`96`		`-`
`97`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ extension RealmUserInfoStorage: UserInfoStorage {`
`21`	`21`	`return Single<User>.create { [weak self] single in`
`22`	`22`	`do {`
`23`	`23`	`guard let realmStorage = self?.realmStorage else { throw RealmStorageError.realmObjectError }`
`24`		`- guard let userInfoEntity = try realmStorage.fetchEntities(type: UserInfoEntity.self)`
	`24`	`+ guard let userInfoEntity = try realmStorage.readEntities(type: UserInfoEntity.self)`
`25`	`25`	`.first else {`
`26`	`26`	`throw RealmStorageError.noDataError`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,13 @@ extension User {`
`70`	`70`	`introduce: self.introduce,`
`71`	`71`	`allow: self.allow)`
`72`	`72`	`}`
	`73`	`+`
	`74`	`+ func setIntroduce(introduce: String) -> User {`
	`75`	`+ return User(uuid: self.uuid,`
	`76`	`+ nickName: self.nickName,`
	`77`	`+ profileURL: self.profileURL,`
	`78`	`+ backgroundImageURL: self.backgroundImageURL,`
	`79`	`+ introduce: introduce,`
	`80`	`+ allow: self.allow)`
	`81`	`+ }`
`73`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,12 @@ extension DefaultUserUseCase: UserUseCase {`
`53`	`53`	`return userRepository.deleteUser()`
`54`	`54`	`.catchAndReturn(false)`
`55`	`55`	`}`
	`56`	`+`
	`57`	`+ func updateIntroduce(introduce: String) -> Single<Bool> {`
	`58`	`+ userRepository.readUser()`
	`59`	`+ .map { $0.setIntroduce(introduce: introduce) }`
	`60`	`+ .flatMap(userRepository.updateUser(by:))`
	`61`	`+ .map { _ in true }`
	`62`	`+ .catchAndReturn(false)`
	`63`	`+ }`
`56`	`64`	`}`
`57`		`-`