[Refacotr] #495 - UserRepository 의존성 분리

Team-WSS · Mar 6, 2025 · 2c46a61 · 2c46a61
1 parent 45f09d1
commit 2c46a61
Show file tree

Hide file tree

Showing 20 changed files with 145 additions and 112 deletions.
diff --git a/WSSiOS/WSSiOS/Resource/Extensions/UIViewController+.swift b/WSSiOS/WSSiOS/Resource/Extensions/UIViewController+.swift
@@ -158,9 +158,8 @@ extension UIViewController {
 
     func pushToMyPageDeleteIDWarningViewController() {
         let viewController = MyPageDeleteIDWarningViewController(
-            userRepository: DefaultUserRepository(
-                userService: DefaultUserService(),
-                blocksService: DefaultBlocksService()
+            userRepository: DefaultUserInfoRepository(
+                userService: DefaultUserService()
             )
         )
         self.navigationController?.pushViewController(viewController, animated: true)
@@ -180,9 +179,8 @@ extension UIViewController {
     func pushToMyPageInfoViewController() {
         let viewController = MyPageInfoViewController(
             viewModel: MyPageInfoViewModel(
-                userRepository: DefaultUserRepository(
-                    userService: DefaultUserService(),
-                    blocksService: DefaultBlocksService()),
+                userRepository: DefaultUserInfoRepository(
+                    userService: DefaultUserService()),
                 authRepository: DefaultAuthRepository(
                     authService: DefaultAuthService())))
         self.navigationController?.pushViewController(viewController, animated: true)
@@ -230,8 +228,7 @@ extension UIViewController {
 
     func pushToBlockUserViewController() {
         let viewController = MyPageBlockUserViewController(
-            userRepository: DefaultUserRepository(
-                userService: DefaultUserService(),
+            userRepository: DefaultUserBlockRepository(
                 blocksService: DefaultBlocksService()
             )
         )
@@ -285,9 +282,8 @@ extension UIViewController {
             viewModel: FeedDetailViewModel(
                 feedDetailRepository: DefaultFeedDetailRepository(
                     feedDetailService: DefaultFeedDetailService()
-                ), userRepository: DefaultUserRepository(
-                    userService: DefaultUserService(),
-                    blocksService: DefaultBlocksService()
+                ), userRepository: DefaultUserInfoRepository(
+                    userService: DefaultUserService()
                 ),
                 feedId: feedId
             )
@@ -308,8 +304,10 @@ extension UIViewController {
         let viewController = MyPageViewController(
             viewModel: MyPageViewModel(
                 userRepository: DefaultUserRepository(
-                    userService: DefaultUserService(),
-                    blocksService: DefaultBlocksService()),
+                    userInfoRepository: DefaultUserInfoRepository(
+                        userService: DefaultUserService()),
+                    userBlockRepository: DefaultUserBlockRepository(
+                        blocksService: DefaultBlocksService())),
                 profileId: userId))
 
         viewController.hidesBottomBarWhenPushed = true
@@ -319,9 +317,9 @@ extension UIViewController {
     func pushToMyPageEditViewController(entryType: MyPageEditEntryType, profile: MyProfileResult?) {
         let viewController = MyPageEditProfileViewController(
             viewModel: MyPageEditProfileViewModel(
-                userRepository: DefaultUserRepository(
-                    userService: DefaultUserService(),
-                    blocksService: DefaultBlocksService()),
+                userRepository: DefaultUserInfoRepository(
+                    userService: DefaultUserService()
+                ),
                 entryType: entryType,
                 profileData: profile))
 
@@ -363,9 +361,8 @@ extension UIViewController {
     func pushToMyPageProfileVisibilityViewController() {
         let viewController = MyPageProfileVisibilityViewController(
             viewModel: MyPageProfileVisibilityViewModel(
-                userRepository: DefaultUserRepository(
-                    userService: DefaultUserService(),
-                    blocksService: DefaultBlocksService()
+                userRepository: DefaultUserInfoRepository(
+                    userService: DefaultUserService()
                 )
             )
         )
@@ -386,9 +383,11 @@ extension UIViewController {
     func pushToChangeUserInfoViewController() {
         let viewController = MyPageChangeUserInfoViewController(
             viewModel: MyPageChangeUserInfoViewModel(
-                userRepository: DefaultUserRepository(
-                    userService: DefaultUserService(),
-                    blocksService: DefaultBlocksService())))
+                userRepository: DefaultUserInfoRepository(
+                    userService: DefaultUserService()
+                )
+            )
+        )
         viewController.hidesBottomBarWhenPushed = true
 
         self.navigationController?.pushViewController(viewController, animated: true)
@@ -405,9 +404,9 @@ extension UIViewController {
     func pushToMyPageFeedDetailViewController(userId: Int, useData: MyProfileResult) {
         let viewController = MyPageFeedDetailViewController(
             viewModel: MyPageFeedDetailViewModel(
-                userRepository: DefaultUserRepository(
-                    userService: DefaultUserService(),
-                    blocksService: DefaultBlocksService()),
+                userRepository: DefaultUserInfoRepository(
+                    userService: DefaultUserService()
+                ),
                 profileId: userId,
                 profileData: useData))
         self.navigationController?.pushViewController(viewController, animated: true)

diff --git a/WSSiOS/WSSiOS/Resource/Helper/ModuleFactory.swift b/WSSiOS/WSSiOS/Resource/Helper/ModuleFactory.swift
@@ -43,8 +43,7 @@ extension ModuleFactory: OnboardingModuleFactory {
 
     func makeOnboardingViewController() -> UIViewController {
         return OnboardingViewController(viewModel: OnboardingViewModel(onboardingRepository: DefaultOnboardingRepository(onboardingService: DefaultOnboardingService()),
-                                                                       userRepository: DefaultUserRepository(userService: DefaultUserService(),
-                                                                                                             blocksService: DefaultBlocksService())))
+                                                                       userRepository: DefaultUserInfoRepository(userService: DefaultUserService())))
     }
 
     func makeOnboardingSuccessViewController(nickname: String) -> UIViewController {
@@ -54,7 +53,6 @@ extension ModuleFactory: OnboardingModuleFactory {
 
 extension ModuleFactory: ServiceTermAgreementFactory {
     func makeServiceTermAgreementViewController() -> UIViewController {
-        return ServiceTermAgreementViewController(repository: DefaultUserRepository(userService: DefaultUserService(),
-                                                                                    blocksService: DefaultBlocksService()))
+        return ServiceTermAgreementViewController(repository: DefaultUserInfoRepository(userService: DefaultUserService()))
     }
 }
diff --git a/WSSiOS/WSSiOS/Source/Data/Repository/UserRepository/UserBlockRepository.swift b/WSSiOS/WSSiOS/Source/Data/Repository/UserRepository/UserBlockRepository.swift
@@ -0,0 +1,42 @@
+//
+//  UserBlockRepository.swift
+//  WSSiOS
+//
+//  Created by 신지원 on 3/6/25.
+//
+
+import Foundation
+
+import RxSwift
+
+protocol UserBlockRepository {
+    func getBlocksList() -> Observable<BlockUserEntity>
+    func deleteBlockUser(blockID: Int) -> Observable<Void>
+    func postBlockUser(userId: Int) -> Observable<Void>
+}
+
+struct DefaultUserBlockRepository: UserBlockRepository {
+    private var blocksService: BlocksService
+
+    init(blocksService: BlocksService) {
+        self.blocksService = blocksService
+    }
+
+    //MARK: - BlockService
+
+    func getBlocksList() -> Observable<BlockUserEntity> {
+        return blocksService.getBlocksList()
+            .map { $0.toEntity() }
+            .asObservable()
+    }
+
+    func deleteBlockUser(blockID: Int) -> Observable<Void> {
+        return blocksService.deleteBlockUser(blockID: blockID)
+            .asObservable()
+    }
+
+    func postBlockUser(userId: Int) -> Observable<Void> {
+        return blocksService.postBlockUser(blockID: userId)
+            .asObservable()
+    }
+}
diff --git a/...urce/Data/Repository/UserRepository.swift → ...y/UserRepository/UserInfoRepository.swift b/...urce/Data/Repository/UserRepository.swift → ...y/UserRepository/UserInfoRepository.swift
@@ -1,15 +1,15 @@
 //
-//  UserRepository.swift
+//  UserInfoRepository.swift
 //  WSSiOS
 //
-//  Created by 신지원 on 1/5/24.
+//  Created by 신지원 on 3/6/25.
 //
 
 import Foundation
 
 import RxSwift
 
-protocol UserRepositoryWithUserService {
+protocol UserInfoRepository {
     func getUserMeData() -> Observable<UserMeResult>
     func getMyProfileData() -> Observable<MyProfileResult>
     func getOtherProfile(userId: Int) -> Observable<OtherProfileResult>
@@ -34,23 +34,14 @@ protocol UserRepositoryWithUserService {
     func patchTermSetting(serviceAgreed: Bool, privacyAgreed: Bool, marketingAgreed: Bool) -> Single<Void>
 }
 
-protocol UserRepositoryWithBlockService {
-    func getBlocksList() -> Observable<BlockUserEntity>
-    func deleteBlockUser(blockID: Int) -> Observable<Void>
-    func postBlockUser(userId: Int) -> Observable<Void>
-}
-
-struct DefaultUserRepository: UserRepositoryWithUserService, UserRepositoryWithBlockService {
-    private var userService: UserService
-    private var blocksService: BlocksService
+struct DefaultUserInfoRepository: UserInfoRepository {
 
-    init(userService: UserService, blocksService: BlocksService) {
+    private let userService: UserService
+
+    init(userService: UserService) {
         self.userService = userService
-        self.blocksService = blocksService
     }
-
-    //MARK: - UserService
-
+
     func getUserMeData() -> Observable<UserMeResult> {
         return userService.getUserData()
             .asObservable()
@@ -151,22 +142,4 @@ struct DefaultUserRepository: UserRepositoryWithUserService, UserRepositoryWithB
                                              marketingAgreed: marketingAgreed)
         return userService.patchTermSetting(requestBody)
     }
-
-    //MARK: - BlockService
-
-    func getBlocksList() -> Observable<BlockUserEntity> {
-        return blocksService.getBlocksList()
-            .map { $0.toEntity() }
-            .asObservable()
-    }
-
-    func deleteBlockUser(blockID: Int) -> Observable<Void> {
-        return blocksService.deleteBlockUser(blockID: blockID)
-            .asObservable()
-    }
-
-    func postBlockUser(userId: Int) -> Observable<Void> {
-        return blocksService.postBlockUser(blockID: userId)
-            .asObservable()
-    }
 }
diff --git a/WSSiOS/WSSiOS/Source/Data/Repository/UserRepository/UserRepository.swift b/WSSiOS/WSSiOS/Source/Data/Repository/UserRepository/UserRepository.swift
@@ -0,0 +1,20 @@
+//
+//  UserRepository.swift
+//  WSSiOS
+//
+//  Created by 신지원 on 1/5/24.
+//
+
+import Foundation
+
+import RxSwift
+
+protocol UserRepository {
+    var userInfoRepository: UserInfoRepository { get }
+    var userBlockRepository: UserBlockRepository { get }
+}
+
+struct DefaultUserRepository: UserRepository {
+    var userInfoRepository: any UserInfoRepository
+    var userBlockRepository: any UserBlockRepository
+}
diff --git a/...OS/Source/Presentation/Base/ServiceTermAgreement/ServiceTermAgreementViewController.swift b/...OS/Source/Presentation/Base/ServiceTermAgreement/ServiceTermAgreementViewController.swift
@@ -14,7 +14,7 @@ final class ServiceTermAgreementViewController: UIViewController {
 
     //MARK: - Properties
 
-    private let userRepository: UserRepositoryWithUserService
+    private let userRepository: UserInfoRepository
     private let disposeBag = DisposeBag()
 
     private let agreedTerms = BehaviorRelay<Set<ServiceTerm>>(value: [])
@@ -26,7 +26,7 @@ final class ServiceTermAgreementViewController: UIViewController {
 
     //MARK: - Life Cycle
 
-    init(repository: UserRepositoryWithUserService) {
+    init(repository: UserInfoRepository) {
         self.userRepository = repository
 
         super.init(nibName: nil, bundle: nil)

diff --git a/WSSiOS/WSSiOS/Source/Presentation/Base/WSSTabBarItem.swift b/WSSiOS/WSSiOS/Source/Presentation/Base/WSSTabBarItem.swift
@@ -57,9 +57,8 @@ enum WSSTabBarItem: CaseIterable {
                 recommendRepository: DefaultRecommendRepository(
                     recommendService: DefaultRecommendService()
                 ),
-                userRepository: DefaultUserRepository(
-                    userService: DefaultUserService(),
-                    blocksService: DefaultBlocksService()
+                userRepository: DefaultUserInfoRepository(
+                    userService: DefaultUserService()
                 ),
                 notificationRepository: DefaultNotificationRepository(
                     notificationService: DefaultNotificationService())
@@ -76,8 +75,11 @@ enum WSSTabBarItem: CaseIterable {
             let myPageVC = MyPageViewController(
                 viewModel: MyPageViewModel(
                     userRepository: DefaultUserRepository(
-                        userService: DefaultUserService(),
-                        blocksService: DefaultBlocksService()), profileId: userId))
+                        userInfoRepository: DefaultUserInfoRepository(
+                            userService: DefaultUserService()),
+                        userBlockRepository: DefaultUserBlockRepository(
+                            blocksService: DefaultBlocksService())),
+                    profileId: userId))
             myPageVC.entryType = .tabBar
             return myPageVC
         }

diff --git a/WSSiOS/WSSiOS/Source/Presentation/FeedDetail/FeedDetailViewModel/FeedDetailViewModel.swift b/WSSiOS/WSSiOS/Source/Presentation/FeedDetail/FeedDetailViewModel/FeedDetailViewModel.swift
@@ -15,7 +15,7 @@ final class FeedDetailViewModel: ViewModelType {
     //MARK: - Properties
 
     private let feedDetailRepository: FeedDetailRepository
-    private let userRepository: UserRepositoryWithUserService
+    private let userRepository: UserInfoRepository
     private let disposeBag = DisposeBag()
 
     let feedId: Int
@@ -77,7 +77,7 @@ final class FeedDetailViewModel: ViewModelType {
     //MARK: - Life Cycle
 
     init(feedDetailRepository: FeedDetailRepository,
-         userRepository: UserRepositoryWithUserService,
+         userRepository: UserInfoRepository,
          feedId: Int) {
         self.feedDetailRepository = feedDetailRepository
         self.userRepository = userRepository

diff --git a/WSSiOS/WSSiOS/Source/Presentation/Home/Home/HomeViewModel/HomeViewModel.swift b/WSSiOS/WSSiOS/Source/Presentation/Home/Home/HomeViewModel/HomeViewModel.swift
@@ -15,7 +15,7 @@ final class HomeViewModel: ViewModelType {
     //MARK: - Properties
 
     private let recommendRepository: RecommendRepository
-    private let userRepository: UserRepositoryWithUserService
+    private let userRepository: UserInfoRepository
     private let notificationRepository: NotificationRepository
     private let disposeBag = DisposeBag()
 
@@ -91,7 +91,7 @@ final class HomeViewModel: ViewModelType {
     //MARK: - init
 
     init(recommendRepository: RecommendRepository,
-         userRepository: UserRepositoryWithUserService,
+         userRepository: UserInfoRepository,
          notificationRepository: NotificationRepository) {
         self.recommendRepository = recommendRepository
         self.userRepository = userRepository
@@ -269,7 +269,7 @@ extension HomeViewModel {
     //MARK: - API
 
     // 유저 정보 조회
-    func getUserMeData() -> Observable<UserMeResponse> {
+    func getUserMeData() -> Observable<UserMeResult> {
         return userRepository.getUserMeData()
     }
 

diff --git a/WSSiOS/WSSiOS/Source/Presentation/Library/LibraryViewController/LibraryViewController.swift b/WSSiOS/WSSiOS/Source/Presentation/Library/LibraryViewController/LibraryViewController.swift
@@ -182,9 +182,9 @@ extension LibraryViewController {
     private func setLibraryChildViewController(userId: Int, data: UserNovelNovelStatus) -> LibraryChildViewController {
         return LibraryChildViewController(
             libraryViewModel: LibraryChildViewModel(
-                userRepository: DefaultUserRepository(
-                    userService: DefaultUserService(),
-                    blocksService: DefaultBlocksService()),
+                userRepository: DefaultUserInfoRepository(
+                    userService: DefaultUserService()
+                ),
                 initData: data,
                 userId: userId))
     }

diff --git a/WSSiOS/WSSiOS/Source/Presentation/Library/LibraryViewModel/LibraryChildViewModel.swift b/WSSiOS/WSSiOS/Source/Presentation/Library/LibraryViewModel/LibraryChildViewModel.swift
@@ -18,7 +18,7 @@ final class LibraryChildViewModel: ViewModelType {
 
     // MARK: - Properties
 
-    private let userRepository: UserRepositoryWithUserService
+    private let userRepository: UserInfoRepository
     private let initData: UserNovelNovelStatus
     private let userId: Int
 
@@ -49,7 +49,7 @@ final class LibraryChildViewModel: ViewModelType {
 
     // MARK: - Life Cycle
 
-    init(userRepository: UserRepositoryWithUserService, initData: UserNovelNovelStatus, userId: Int) {
+    init(userRepository: UserInfoRepository, initData: UserNovelNovelStatus, userId: Int) {
         self.userRepository = userRepository
         self.initData = initData
         self.userId = userId