refact :: [#118] 자습감독 Combine Refact

Author: leejh08

Projects/Domain/CheckSelfStudyTeacher/Interface/CheckSelfStudyTeacherDomainInterface.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Combine
 
 public protocol CheckSelfStudyTeacherDomainInterface {}
 
@@ -17,9 +18,9 @@ public struct SelfStudyTeacherEntity: Equatable, Identifiable {
 }
 
 public protocol CheckSelfStudyTeacherRepository {
-    func getSelfStudyTeacher(date: String) async throws -> [SelfStudyTeacherEntity]
+    func getSelfStudyTeacher(date: String) -> AnyPublisher<[SelfStudyTeacherEntity], Error>
 }
 
 public protocol FetchSelfStudyTeacherUseCaseProtocol {
-    func execute(date: String) async throws -> [SelfStudyTeacherEntity]
+    func execute(date: String) -> AnyPublisher<[SelfStudyTeacherEntity], Error>
 }

Projects/Domain/CheckSelfStudyTeacher/Sources/DataSource/CheckSelfStudyTeacherDataSource.swift

@@ -1,5 +1,6 @@
 import Foundation
+import Combine
 
 public protocol CheckSelfStudyTeacherDataSource {
-    func getSelfStudyTeacher(date: String) async throws -> [SelfStudyTeacherResponseDTO]
+    func getSelfStudyTeacher(date: String) -> AnyPublisher<[SelfStudyTeacherResponseDTO], Error>
 }

Projects/Domain/CheckSelfStudyTeacher/Sources/DataSource/CheckSelfStudyTeacherDataSourceImpl.swift

@@ -1,39 +1,15 @@
 import Foundation
+import Combine
 import BaseDomain
 import Core
-import Moya
 
-public class CheckSelfStudyTeacherDataSourceImpl: CheckSelfStudyTeacherDataSource {
-    private let keychain: any Keychain
-    private let provider: MoyaProvider<CheckSelfStudyTeacherAPI>
+public class CheckSelfStudyTeacherDataSourceImpl: BaseRemoteDataSource<CheckSelfStudyTeacherAPI>, CheckSelfStudyTeacherDataSource {
 
-    public init(keychain: any Keychain) {
-        self.keychain = keychain
-        self.provider = MoyaProvider<CheckSelfStudyTeacherAPI>(plugins: [MoyaLoggingPlugin()])
-    }
-
-    public func getSelfStudyTeacher(date: String) async throws -> [SelfStudyTeacherResponseDTO] {
-        try await withCheckedThrowingContinuation { continuation in
-            provider.request(.getSelfStudyTeacher(date: date)) { result in
-                switch result {
-                case .success(let response):
-                    do {
-                        let data = try response.map([SelfStudyTeacherResponseDTO].self)
-                        continuation.resume(returning: data)
-                    } catch {
-                        continuation.resume(throwing: error)
-                    }
-                case .failure(let error):
-                    if let moyaError = error as? MoyaError,
-                       let code = moyaError.response?.statusCode,
-                       let errorMap = CheckSelfStudyTeacherAPI.getSelfStudyTeacher(date: date).errorMap,
-                       let mappedError = errorMap[code] {
-                        continuation.resume(throwing: mappedError)
-                    } else {
-                        continuation.resume(throwing: error)
-                    }
-                }
+    public func getSelfStudyTeacher(date: String) -> AnyPublisher<[SelfStudyTeacherResponseDTO], Error> {
+        request(.getSelfStudyTeacher(date: date))
+            .tryMap { response in
+                try response.map([SelfStudyTeacherResponseDTO].self)
             }
-        }
+            .eraseToAnyPublisher()
     }
 }

Projects/Domain/CheckSelfStudyTeacher/Sources/Repository/CheckSelfStudyTeacherRepositoryImpl.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Combine
 import CheckSelfStudyTeacherDomainInterface
 
 public class CheckSelfStudyTeacherRepositoryImpl: CheckSelfStudyTeacherRepository {
@@ -8,8 +9,10 @@ public class CheckSelfStudyTeacherRepositoryImpl: CheckSelfStudyTeacherRepositor
         self.dataSource = dataSource
     }
 
-    public func getSelfStudyTeacher(date: String) async throws -> [SelfStudyTeacherEntity] {
-        try await dataSource.getSelfStudyTeacher(date: date).map { $0.toEntity() }
+    public func getSelfStudyTeacher(date: String) -> AnyPublisher<[SelfStudyTeacherEntity], Error> {
+        dataSource.getSelfStudyTeacher(date: date)
+            .map { $0.map { $0.toEntity() } }
+            .eraseToAnyPublisher()
     }
 }
 

Projects/Domain/CheckSelfStudyTeacher/Sources/UseCase/FetchSelfStudyTeacherUseCase.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Combine
 import CheckSelfStudyTeacherDomainInterface
 
 public class FetchSelfStudyTeacherUseCase: FetchSelfStudyTeacherUseCaseProtocol {
@@ -8,7 +9,7 @@ public class FetchSelfStudyTeacherUseCase: FetchSelfStudyTeacherUseCaseProtocol
         self.repository = repository
     }
 
-    public func execute(date: String) async throws -> [SelfStudyTeacherEntity] {
-        try await repository.getSelfStudyTeacher(date: date)
+    public func execute(date: String) -> AnyPublisher<[SelfStudyTeacherEntity], Error> {
+        repository.getSelfStudyTeacher(date: date)
     }
 }

Projects/Feature/CheckSelfStudyTeacherFeature/Sources/CheckSelfStudyTeacherReducer.swift

@@ -1,6 +1,7 @@
 import ComposableArchitecture
 import CheckSelfStudyTeacherDomainInterface
 import Foundation
+import Combine
 
 public struct CheckSelfStudyTeacherReducer: Reducer {
     private let fetchSelfStudyTeacherUseCase: any FetchSelfStudyTeacherUseCaseProtocol
@@ -40,11 +41,11 @@ public struct CheckSelfStudyTeacherReducer: Reducer {
 
             case let .fetchSelfStudyTeacher(date):
                 state.isLoading = true
-                return .run { send in
-                    let result = await TaskResult {
-                        try await fetchSelfStudyTeacherUseCase.execute(date: date)
-                    }
-                    await send(.selfStudyTeacherResponse(Result(result)))
+                return .publisher {
+                    fetchSelfStudyTeacherUseCase.execute(date: date)
+                        .mapError { $0 as Error }
+                        .map { Action.selfStudyTeacherResponse(.success($0)) }
+                        .catch { Just(Action.selfStudyTeacherResponse(.failure($0))) }
                 }
 
             case let .selfStudyTeacherResponse(.success(teachers)):