[Refactor] Runnect#112 - createAndDeleteScrap API를 ScrapRouter로 위치 변경

dlwogus0128 · Feb 19, 2023 · 38440f9 · 38440f9
1 parent a92a9ff
commit 38440f9
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 15 deletions.
diff --git a/Runnect-iOS/Runnect-iOS/Network/Router/CourseDetailRouter/UploadedCourseDetailRouter.swift b/Runnect-iOS/Runnect-iOS/Network/Router/CourseDetailRouter/UploadedCourseDetailRouter.swift
@@ -11,7 +11,6 @@ import Moya
 
 enum UploadedCourseDetailRouter {
     case getUploadedCourseDetail(publicCourseId: Int)
-    case createAndDeleteScrap(publicCourseId: Int, scrapTF: Bool)
 }
 
 extension UploadedCourseDetailRouter: TargetType {
@@ -27,32 +26,26 @@ extension UploadedCourseDetailRouter: TargetType {
         switch self {
         case .getUploadedCourseDetail(let publicCourseId):
             return "/public-course/detail/\(publicCourseId)"
-        case .createAndDeleteScrap:
-            return "/scrap"
         }
     }
 
     var method: Moya.Method {
         switch self {
         case .getUploadedCourseDetail:
             return .get
-        case .createAndDeleteScrap:
-            return .post
         }
     }
 
     var task: Moya.Task {
         switch self {
         case .getUploadedCourseDetail:
             return .requestPlain
-        case .createAndDeleteScrap(let publicCourseId, let scrapTF):
-            return .requestParameters(parameters: ["publicCourseId": publicCourseId, "scrapTF": scrapTF], encoding: JSONEncoding.default)
         }
     }
 
     var headers: [String: String]? {
         switch self {
-        case .getUploadedCourseDetail, .createAndDeleteScrap:
+        case .getUploadedCourseDetail:
             return Config.headerWithDeviceId
         }
     }

diff --git a/Runnect-iOS/Runnect-iOS/Network/Router/ScrapRouter.swift b/Runnect-iOS/Runnect-iOS/Network/Router/ScrapRouter.swift
@@ -6,3 +6,47 @@
 //
 
 import Foundation
+
+import Moya
+
+enum ScrapRouter {
+    case createAndDeleteScrap(publicCourseId: Int, scrapTF: Bool)
+}
+
+extension ScrapRouter: TargetType {
+    var baseURL: URL {
+        guard let url = URL(string: Config.baseURL) else {
+            fatalError("baseURL could not be configured")
+        }
+
+        return url
+    }
+
+    var path: String {
+        switch self {
+        case .createAndDeleteScrap:
+            return "/scrap"
+        }
+    }
+
+    var method: Moya.Method {
+        switch self {
+        case .createAndDeleteScrap:
+            return .post
+        }
+    }
+
+    var task: Moya.Task {
+        switch self {
+        case .createAndDeleteScrap(let publicCourseId, let scrapTF):
+            return .requestParameters(parameters: ["publicCourseId": publicCourseId, "scrapTF": scrapTF], encoding: JSONEncoding.default)
+        }
+    }
+
+    var headers: [String: String]? {
+        switch self {
+        case .createAndDeleteScrap:
+            return Config.headerWithDeviceId
+        }
+    }
+}
diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift
@@ -16,6 +16,10 @@ final class CourseDetailVC: UIViewController {
 
     // MARK: - Properties
 
+    private let scrapProvider = MoyaProvider<ScrapRouter>(
+        plugins: [NetworkLoggerPlugin(verbose: true)]
+    )
+
     private let courseDetailProvider = MoyaProvider<UploadedCourseDetailRouter>(
         plugins: [NetworkLoggerPlugin(verbose: true)]
     )
@@ -353,7 +357,7 @@ extension CourseDetailVC {
     private func scrapCourse(scrapTF: Bool) {
         guard let publicCourseId = self.publicCourseId else { return }
         LoadingIndicator.showLoading()
-        courseDetailProvider.request(.createAndDeleteScrap(publicCourseId: publicCourseId, scrapTF: scrapTF)) { [weak self] response in
+        scrapProvider.request(.createAndDeleteScrap(publicCourseId: publicCourseId, scrapTF: scrapTF)) { [weak self] response in
             LoadingIndicator.hideLoading()
             guard let self = self else { return }
             switch response {

diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift
@@ -19,7 +19,7 @@ final class CourseDiscoveryVC: UIViewController {
         plugins: [NetworkLoggerPlugin(verbose: true)]
     )
 
-    private let courseDetailProvider = MoyaProvider<UploadedCourseDetailRouter>(
+    private let scrapProvider = MoyaProvider<ScrapRouter>(
         plugins: [NetworkLoggerPlugin(verbose: true)]
     )
 
@@ -276,7 +276,7 @@ extension CourseDiscoveryVC {
 
     private func scrapCourse(publicCourseId: Int, scrapTF: Bool) {
         LoadingIndicator.showLoading()
-        courseDetailProvider.request(.createAndDeleteScrap(publicCourseId: publicCourseId, scrapTF: scrapTF)) { [weak self] response in
+        scrapProvider.request(.createAndDeleteScrap(publicCourseId: publicCourseId, scrapTF: scrapTF)) { [weak self] response in
             LoadingIndicator.hideLoading()
             guard let self = self else { return }
             switch response {

diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseSearchVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseSearchVC.swift
@@ -19,7 +19,7 @@ final class CourseSearchVC: UIViewController {
         plugins: [NetworkLoggerPlugin(verbose: true)]
     )
 
-    private let courseDetailProvider = MoyaProvider<UploadedCourseDetailRouter>(
+    private let scrapProvider = MoyaProvider<ScrapRouter>(
         plugins: [NetworkLoggerPlugin(verbose: true)]
     )
 
@@ -246,7 +246,7 @@ extension CourseSearchVC {
 
     private func scrapCourse(publicCourseId: Int, scrapTF: Bool) {
         LoadingIndicator.showLoading()
-        courseDetailProvider.request(.createAndDeleteScrap(publicCourseId: publicCourseId, scrapTF: scrapTF)) { [weak self] response in
+        scrapProvider.request(.createAndDeleteScrap(publicCourseId: publicCourseId, scrapTF: scrapTF)) { [weak self] response in
             LoadingIndicator.hideLoading()
             guard let self = self else { return }
             switch response {

diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/VC/CourseStorageVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/VC/CourseStorageVC.swift
@@ -18,7 +18,7 @@ final class CourseStorageVC: UIViewController {
         plugins: [NetworkLoggerPlugin(verbose: true)]
     )
 
-    private let courseDetailProvider = MoyaProvider<UploadedCourseDetailRouter>(
+    private let scrapProvider = MoyaProvider<ScrapRouter>(
         plugins: [NetworkLoggerPlugin(verbose: true)]
     )
 
@@ -198,7 +198,7 @@ extension CourseStorageVC {
 
     private func scrapCourse(publicCourseId: Int, scrapTF: Bool) {
         LoadingIndicator.showLoading()
-        courseDetailProvider.request(.createAndDeleteScrap(publicCourseId: publicCourseId, scrapTF: scrapTF)) { [weak self] response in
+        scrapProvider.request(.createAndDeleteScrap(publicCourseId: publicCourseId, scrapTF: scrapTF)) { [weak self] response in
             LoadingIndicator.hideLoading()
             guard let self = self else { return }
             switch response {