From 97a296daab828a31df6c8daf3010d8d87adfbfaa Mon Sep 17 00:00:00 2001 From: yeonwoo Date: Tue, 21 Feb 2023 11:13:43 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Refactor]#113=20-=20CourseDiscoveryVC?= =?UTF-8?q?=EC=97=90=20=EC=97=B0=EA=B2=B0=EB=90=9C=20=EB=9D=BC=EC=9A=B0?= =?UTF-8?q?=ED=84=B0=EB=93=A4=20PublicCouseRouter=EB=A1=9C=20=ED=86=B5?= =?UTF-8?q?=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Runnect-iOS.xcodeproj/project.pbxproj | 46 ------------- .../UploadedCourseDetailRouter.swift | 52 --------------- .../CourseDiscoveryRouter.swift | 51 --------------- .../CourseSearchingRouter.swift | 51 --------------- .../CourseUploadingRouter.swift | 57 ---------------- .../Network/Router/MyPageRouter/.gitkeep | 0 .../Router/MyPageRouter/MyPageRouter.swift | 52 --------------- .../Network/Router/PublicCourseRouter.swift | 65 ++++++++++++++++++- .../CourseDetail/VC/CourseDetailVC.swift | 2 +- .../Views/VC/CourseDiscoveryVC.swift | 2 +- .../Views/VC/CourseSearchVC.swift | 4 +- .../Views/VC/CourseUploadVC.swift | 2 +- .../VC/InfoVC/UploadedCourseInfoVC.swift | 2 +- 13 files changed, 68 insertions(+), 318 deletions(-) delete mode 100644 Runnect-iOS/Runnect-iOS/Network/Router/CourseDetailRouter/UploadedCourseDetailRouter.swift delete mode 100644 Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseDiscoveryRouter.swift delete mode 100644 Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseSearchingRouter.swift delete mode 100644 Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseUploadingRouter.swift delete mode 100644 Runnect-iOS/Runnect-iOS/Network/Router/MyPageRouter/.gitkeep delete mode 100644 Runnect-iOS/Runnect-iOS/Network/Router/MyPageRouter/MyPageRouter.swift diff --git a/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj b/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj index 553883f2..32d003c4 100644 --- a/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj +++ b/Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj @@ -19,7 +19,6 @@ A3BC2F4129667A0D00198261 /* NicknameEditorVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F4029667A0D00198261 /* NicknameEditorVC.swift */; }; A3BC2F432966A93100198261 /* CourseDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F422966A93100198261 /* CourseDetailVC.swift */; }; A3F67AE2296D33AC001598A2 /* MyPageDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3F67AE1296D33AC001598A2 /* MyPageDto.swift */; }; - A3F67AE4296D33E0001598A2 /* MyPageRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3F67AE3296D33E0001598A2 /* MyPageRouter.swift */; }; A3F67AEA296E4936001598A2 /* ActivityRecordInfoDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3F67AE9296E4936001598A2 /* ActivityRecordInfoDto.swift */; }; CE09037D296E9ED900BEA710 /* ScrapCourseResponseDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE09037C296E9ED900BEA710 /* ScrapCourseResponseDto.swift */; }; CE0C23742966D62A00B45063 /* PagedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0C23732966D62A00B45063 /* PagedView.swift */; }; @@ -62,7 +61,6 @@ CE4545CD295D7AF4003201E1 /* TaBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4545CC295D7AF4003201E1 /* TaBarController.swift */; }; CE4545D2295D7AF5003201E1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CE4545D1295D7AF5003201E1 /* Assets.xcassets */; }; CE4545D5295D7AF5003201E1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CE4545D3295D7AF5003201E1 /* LaunchScreen.storyboard */; }; - CE4942AA296FCCFC00736701 /* UploadedCourseDetailRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4942A9296FCCFC00736701 /* UploadedCourseDetailRouter.swift */; }; CE4942AD296FCD2300736701 /* UploadedCourseDetailResponseDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4942AC296FCD2300736701 /* UploadedCourseDetailResponseDto.swift */; }; CE55BC11296D4EA600E8CD69 /* RunningRecordRequestDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE55BC10296D4EA600E8CD69 /* RunningRecordRequestDto.swift */; }; CE5645162961B72E000A2856 /* ImageLiterals.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE5645152961B72E000A2856 /* ImageLiterals.swift */; }; @@ -137,14 +135,11 @@ DA20D847296697A600F1581F /* MyCourseSelectVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA20D846296697A600F1581F /* MyCourseSelectVC.swift */; }; DA20D849296697B400F1581F /* CourseUploadVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA20D848296697B400F1581F /* CourseUploadVC.swift */; }; DA20D84E2966A9B300F1581F /* CourseSearchVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA20D84D2966A9B300F1581F /* CourseSearchVC.swift */; }; - DA97A02F296DC3300086760E /* CourseSearchingRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA97A02E296DC3300086760E /* CourseSearchingRouter.swift */; }; DA97A033296E65D80086760E /* CourseUploadingRequestDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA97A032296E65D80086760E /* CourseUploadingRequestDto.swift */; }; - DA97A035296E685C0086760E /* CourseUploadingRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA97A034296E685C0086760E /* CourseUploadingRouter.swift */; }; DAD5A3D8296C6D9600C8166B /* AdImageCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAD5A3D7296C6D9600C8166B /* AdImageCollectionViewCell.swift */; }; DAD5A3DA296C6DA500C8166B /* TitleCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAD5A3D9296C6DA500C8166B /* TitleCollectionViewCell.swift */; }; DAD5A3DC296C6DB800C8166B /* MapCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAD5A3DB296C6DB800C8166B /* MapCollectionViewCell.swift */; }; DAD5A3E2296D4C6500C8166B /* PickedMapListResponseDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAD5A3E1296D4C6500C8166B /* PickedMapListResponseDto.swift */; }; - DAD5A3E4296D526D00C8166B /* CourseDiscoveryRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAD5A3E3296D526D00C8166B /* CourseDiscoveryRouter.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -161,7 +156,6 @@ A3BC2F4029667A0D00198261 /* NicknameEditorVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NicknameEditorVC.swift; sourceTree = ""; }; A3BC2F422966A93100198261 /* CourseDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseDetailVC.swift; sourceTree = ""; }; A3F67AE1296D33AC001598A2 /* MyPageDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageDto.swift; sourceTree = ""; }; - A3F67AE3296D33E0001598A2 /* MyPageRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageRouter.swift; sourceTree = ""; }; A3F67AE9296E4936001598A2 /* ActivityRecordInfoDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityRecordInfoDto.swift; sourceTree = ""; }; CE09037C296E9ED900BEA710 /* ScrapCourseResponseDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrapCourseResponseDto.swift; sourceTree = ""; }; CE0C23732966D62A00B45063 /* PagedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagedView.swift; sourceTree = ""; }; @@ -170,7 +164,6 @@ CE0D9FD229648DA300CEB5CD /* CustomAlertVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAlertVC.swift; sourceTree = ""; }; CE10063929680C5700FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = ""; }; CE10063D29680C8100FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = ""; }; - CE10064329680CB400FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = ""; }; CE10064D29680D2500FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = ""; }; CE10064F29680D3300FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = ""; }; CE10065029680D3800FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = ""; }; @@ -213,7 +206,6 @@ CE4545D1295D7AF5003201E1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; CE4545D4295D7AF5003201E1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; CE4545D6295D7AF5003201E1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CE4942A9296FCCFC00736701 /* UploadedCourseDetailRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadedCourseDetailRouter.swift; sourceTree = ""; }; CE4942AC296FCD2300736701 /* UploadedCourseDetailResponseDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadedCourseDetailResponseDto.swift; sourceTree = ""; }; CE55BC10296D4EA600E8CD69 /* RunningRecordRequestDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunningRecordRequestDto.swift; sourceTree = ""; }; CE5645152961B72E000A2856 /* ImageLiterals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageLiterals.swift; sourceTree = ""; }; @@ -292,14 +284,11 @@ DA20D846296697A600F1581F /* MyCourseSelectVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyCourseSelectVC.swift; sourceTree = ""; }; DA20D848296697B400F1581F /* CourseUploadVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseUploadVC.swift; sourceTree = ""; }; DA20D84D2966A9B300F1581F /* CourseSearchVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseSearchVC.swift; sourceTree = ""; }; - DA97A02E296DC3300086760E /* CourseSearchingRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseSearchingRouter.swift; sourceTree = ""; }; DA97A032296E65D80086760E /* CourseUploadingRequestDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseUploadingRequestDto.swift; sourceTree = ""; }; - DA97A034296E685C0086760E /* CourseUploadingRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseUploadingRouter.swift; sourceTree = ""; }; DAD5A3D7296C6D9600C8166B /* AdImageCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdImageCollectionViewCell.swift; sourceTree = ""; }; DAD5A3D9296C6DA500C8166B /* TitleCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleCollectionViewCell.swift; sourceTree = ""; }; DAD5A3DB296C6DB800C8166B /* MapCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapCollectionViewCell.swift; sourceTree = ""; }; DAD5A3E1296D4C6500C8166B /* PickedMapListResponseDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PickedMapListResponseDto.swift; sourceTree = ""; }; - DAD5A3E3296D526D00C8166B /* CourseDiscoveryRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseDiscoveryRouter.swift; sourceTree = ""; }; E837271A78E1C0A0C30789BF /* Pods-Runnect-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runnect-iOS.release.xcconfig"; path = "Target Support Files/Pods-Runnect-iOS/Pods-Runnect-iOS.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -720,33 +709,6 @@ path = CourseDrawingRouter; sourceTree = ""; }; - CE40BB28296808300030ABCA /* CourseDiscoveryRouter */ = { - isa = PBXGroup; - children = ( - DAD5A3E3296D526D00C8166B /* CourseDiscoveryRouter.swift */, - DA97A02E296DC3300086760E /* CourseSearchingRouter.swift */, - DA97A034296E685C0086760E /* CourseUploadingRouter.swift */, - ); - path = CourseDiscoveryRouter; - sourceTree = ""; - }; - CE40BB292968083B0030ABCA /* MyPageRouter */ = { - isa = PBXGroup; - children = ( - CE10064329680CB400FD31FB /* .gitkeep */, - A3F67AE3296D33E0001598A2 /* MyPageRouter.swift */, - ); - path = MyPageRouter; - sourceTree = ""; - }; - CE40BB2A296808440030ABCA /* CourseDetailRouter */ = { - isa = PBXGroup; - children = ( - CE4942A9296FCCFC00736701 /* UploadedCourseDetailRouter.swift */, - ); - path = CourseDetailRouter; - sourceTree = ""; - }; CE4545BC295D7AF4003201E1 = { isa = PBXGroup; children = ( @@ -898,9 +860,6 @@ CE21C02B299E601000F62AF5 /* ScrapRouter.swift */, CE21C02D299E601700F62AF5 /* StampRouter.swift */, CE40BB26296808020030ABCA /* CourseDrawingRouter */, - CE40BB28296808300030ABCA /* CourseDiscoveryRouter */, - CE40BB292968083B0030ABCA /* MyPageRouter */, - CE40BB2A296808440030ABCA /* CourseDetailRouter */, ); path = Router; sourceTree = ""; @@ -1322,11 +1281,9 @@ CEEC6B3C2961C51A00D00E1E /* CourseStorageVC.swift in Sources */, CE4545C9295D7AF4003201E1 /* AppDelegate.swift in Sources */, CE6655C8295D849F00C64E12 /* StringLiterals.swift in Sources */, - DAD5A3E4296D526D00C8166B /* CourseDiscoveryRouter.swift in Sources */, CEEC6B3E2961C53700D00E1E /* CourseDiscoveryVC.swift in Sources */, A3F67AEA296E4936001598A2 /* ActivityRecordInfoDto.swift in Sources */, CE6655E0295D87D200C64E12 /* UIDevice+.swift in Sources */, - DA97A02F296DC3300086760E /* CourseSearchingRouter.swift in Sources */, CE40BB242968068E0030ABCA /* Config.swift in Sources */, CE17F0382961BF8B00E1DED0 /* FontLiterals.swift in Sources */, CE6655E8295D889600C64E12 /* UISwitch+.swift in Sources */, @@ -1344,7 +1301,6 @@ CE40BB1C2967E4910030ABCA /* RunningWaitingVC.swift in Sources */, CE6B63D6296731F9003F900F /* ScrapCourseListView.swift in Sources */, CE6655F8295D90CF00C64E12 /* adjusted+.swift in Sources */, - A3F67AE4296D33E0001598A2 /* MyPageRouter.swift in Sources */, DAD5A3E2296D4C6500C8166B /* PickedMapListResponseDto.swift in Sources */, CE4545CB295D7AF4003201E1 /* SceneDelegate.swift in Sources */, A3F67AE2296D33AC001598A2 /* MyPageDto.swift in Sources */, @@ -1401,11 +1357,9 @@ CE17F02D2961BBA100E1DED0 /* ColorLiterals.swift in Sources */, CEC2A68E2962AF2C00160BF7 /* RNMarker.swift in Sources */, CE6655D2295D862A00C64E12 /* Publisher+Driver.swift in Sources */, - CE4942AA296FCCFC00736701 /* UploadedCourseDetailRouter.swift in Sources */, CE21C02E299E601700F62AF5 /* StampRouter.swift in Sources */, CE6655E6295D887F00C64E12 /* UIStackView+.swift in Sources */, A3BC2F34296303A600198261 /* GoalRewardInfoCVC.swift in Sources */, - DA97A035296E685C0086760E /* CourseUploadingRouter.swift in Sources */, CEB8416E2962C45300BF8080 /* LocationSearchResultTVC.swift in Sources */, CE6655CA295D84DD00C64E12 /* UserDefaultKeyList.swift in Sources */, CE6655F2295D894D00C64E12 /* UIView+.swift in Sources */, diff --git a/Runnect-iOS/Runnect-iOS/Network/Router/CourseDetailRouter/UploadedCourseDetailRouter.swift b/Runnect-iOS/Runnect-iOS/Network/Router/CourseDetailRouter/UploadedCourseDetailRouter.swift deleted file mode 100644 index caf87e03..00000000 --- a/Runnect-iOS/Runnect-iOS/Network/Router/CourseDetailRouter/UploadedCourseDetailRouter.swift +++ /dev/null @@ -1,52 +0,0 @@ -// -// UploadedCourseDetailRouter.swift -// Runnect-iOS -// -// Created by sejin on 2023/01/12. -// - -import Foundation - -import Moya - -enum UploadedCourseDetailRouter { - case getUploadedCourseDetail(publicCourseId: Int) -} - -extension UploadedCourseDetailRouter: 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 .getUploadedCourseDetail(let publicCourseId): - return "/public-course/detail/\(publicCourseId)" - } - } - - var method: Moya.Method { - switch self { - case .getUploadedCourseDetail: - return .get - } - } - - var task: Moya.Task { - switch self { - case .getUploadedCourseDetail: - return .requestPlain - } - } - - var headers: [String: String]? { - switch self { - case .getUploadedCourseDetail: - return Config.headerWithDeviceId - } - } -} diff --git a/Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseDiscoveryRouter.swift b/Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseDiscoveryRouter.swift deleted file mode 100644 index 7992ab49..00000000 --- a/Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseDiscoveryRouter.swift +++ /dev/null @@ -1,51 +0,0 @@ -// -// pickedMapListRouter.swift -// Runnect-iOS -// -// Created by YEONOO on 2023/01/10. -// - -import Foundation - -import Moya - -enum pickedMapListRouter { - case getCourseData -} - -extension pickedMapListRouter: 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 .getCourseData: - return "/public-course" - } - } - - var method: Moya.Method { - switch self { - case .getCourseData: - return .get - } - } - - var task: Moya.Task { - switch self { - case .getCourseData: - return .requestPlain - } - } - - var headers: [String: String]? { - switch self { - case .getCourseData: - return Config.headerWithDeviceId - } - } -} diff --git a/Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseSearchingRouter.swift b/Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseSearchingRouter.swift deleted file mode 100644 index da06fafa..00000000 --- a/Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseSearchingRouter.swift +++ /dev/null @@ -1,51 +0,0 @@ -// -// CourseSearchingRouter.swift -// Runnect-iOS -// -// Created by YEONOO on 2023/01/11. -// - -import Foundation - -import Moya - -enum CourseSearchingRouter { - case getCourseData(keyword: String) -} - -extension CourseSearchingRouter: 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 .getCourseData: - return "/public-course/search" - } - } - - var method: Moya.Method { - switch self { - case .getCourseData: - return .get - } - } - - var task: Moya.Task { - switch self { - case .getCourseData(let keyword): - return .requestParameters(parameters: ["keyword": keyword], encoding: URLEncoding.default) - } - } - - var headers: [String: String]? { - switch self { - case .getCourseData: - return Config.headerWithDeviceId - } - } -} diff --git a/Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseUploadingRouter.swift b/Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseUploadingRouter.swift deleted file mode 100644 index b6923df1..00000000 --- a/Runnect-iOS/Runnect-iOS/Network/Router/CourseDiscoveryRouter/CourseUploadingRouter.swift +++ /dev/null @@ -1,57 +0,0 @@ -// -// CourseUploadingRouter.swift -// Runnect-iOS -// -// Created by YEONOO on 2023/01/11. -// - -import Foundation - -import Moya - -enum CourseUploadingRouter { - case courseUploadingData(param: CourseUploadingRequestDto) -} - -extension CourseUploadingRouter: 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 .courseUploadingData: - return "/public-course" - } - } - - var method: Moya.Method { - switch self { - case .courseUploadingData: - return .post - } - } - - var task: Moya.Task { - switch self { - case .courseUploadingData(param: let param): - do { - return .requestParameters(parameters: try param.asParameter(), encoding: JSONEncoding.default) - } catch { - fatalError("Encoding 실패") - } - } - } - - var headers: [String: String]? { - switch self { - case .courseUploadingData: - return Config.headerWithDeviceId - } - } - -} diff --git a/Runnect-iOS/Runnect-iOS/Network/Router/MyPageRouter/.gitkeep b/Runnect-iOS/Runnect-iOS/Network/Router/MyPageRouter/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Runnect-iOS/Runnect-iOS/Network/Router/MyPageRouter/MyPageRouter.swift b/Runnect-iOS/Runnect-iOS/Network/Router/MyPageRouter/MyPageRouter.swift deleted file mode 100644 index 3a8c1237..00000000 --- a/Runnect-iOS/Runnect-iOS/Network/Router/MyPageRouter/MyPageRouter.swift +++ /dev/null @@ -1,52 +0,0 @@ -// -// MyPageRouter.swift -// Runnect-iOS -// -// Created by 몽이 누나 on 2023/01/10. -// - -import Foundation - -import Moya - -enum MyPageRouter { - case getUploadedCourseInfo -} - -extension MyPageRouter: 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 .getUploadedCourseInfo: - return "/public-course/user" - } - } - - var method: Moya.Method { - switch self { - case .getUploadedCourseInfo: - return .get - } - } - - var task: Moya.Task { - switch self { - case .getUploadedCourseInfo: - return .requestPlain - } - } - - var headers: [String: String]? { - switch self { - case .getUploadedCourseInfo: - return Config.headerWithDeviceId - } - } -} diff --git a/Runnect-iOS/Runnect-iOS/Network/Router/PublicCourseRouter.swift b/Runnect-iOS/Runnect-iOS/Network/Router/PublicCourseRouter.swift index f436acf4..fb1e8e3f 100644 --- a/Runnect-iOS/Runnect-iOS/Network/Router/PublicCourseRouter.swift +++ b/Runnect-iOS/Runnect-iOS/Network/Router/PublicCourseRouter.swift @@ -1,8 +1,67 @@ // -// PublicCourseRouter.swift -// Runnect-iOS +//  PublicCourseRouter.swift +//  Runnect-iOS // -// Created by sejin on 2023/02/16. +//  Created by sejin on 2023/02/16. // import Foundation +import Moya +enum PublicCourseRouter { + case getCourseData + case getCourseSearchData(keyword: String) + case courseUploadingData(param: CourseUploadingRequestDto) + case getUploadedCourseDetail(publicCourseId: Int) + case getUploadedCourseInfo +} + +extension PublicCourseRouter: 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 .getCourseData, .courseUploadingData: + return "/public-course" + case .getCourseSearchData: + return "/public-course/search" + case .getUploadedCourseDetail(let publicCourseId): + return "/public-course/detail/\(publicCourseId)" + case .getUploadedCourseInfo: + return "/public-course/user" + } + } + var method: Moya.Method { + switch self { + case .getCourseData, .getCourseSearchData, .getUploadedCourseDetail, .getUploadedCourseInfo: + return .get + case .courseUploadingData: + return .post + } + + } + var task: Moya.Task { + switch  self { + case .getCourseSearchData(let keyword): + return .requestParameters(parameters: ["keyword": keyword], encoding: URLEncoding.default) + case .courseUploadingData(param: let param): + do { + return .requestParameters(parameters: try param.asParameter(), encoding: JSONEncoding.default) + + } catch { + fatalError("Encoding 실패")} + case .getCourseData, .getUploadedCourseDetail, .getUploadedCourseInfo: + return .requestPlain + } + } + var headers: [String: String]? { + switch self { + case .getCourseData, .courseUploadingData, .getUploadedCourseInfo, .getUploadedCourseDetail, .getCourseSearchData: + 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 index cc84fdce..386faedd 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift @@ -20,7 +20,7 @@ final class CourseDetailVC: UIViewController { plugins: [NetworkLoggerPlugin(verbose: true)] ) - private let courseDetailProvider = MoyaProvider( + private let courseDetailProvider = MoyaProvider( plugins: [NetworkLoggerPlugin(verbose: true)] ) diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift index b2f1a2ee..a4917141 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift @@ -15,7 +15,7 @@ import Moya final class CourseDiscoveryVC: UIViewController { // MARK: - Properties - private let pickedMapListProvider = MoyaProvider( + private let pickedMapListProvider = MoyaProvider( plugins: [NetworkLoggerPlugin(verbose: true)] ) diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseSearchVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseSearchVC.swift index d7a8cf81..a08de4d0 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseSearchVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseSearchVC.swift @@ -15,7 +15,7 @@ final class CourseSearchVC: UIViewController { // MARK: - Properties - private let CourseSearchingRouter = MoyaProvider( + private let CourseSearchingRouter = MoyaProvider( plugins: [NetworkLoggerPlugin(verbose: true)] ) @@ -218,7 +218,7 @@ extension CourseSearchVC: CourseListCVCDeleagte { extension CourseSearchVC { private func searchCourseWithKeyword(keyword: String) { LoadingIndicator.showLoading() - CourseSearchingRouter.request(.getCourseData(keyword: keyword)) { response in + CourseSearchingRouter.request(.getCourseSearchData(keyword: keyword)) { response in LoadingIndicator.hideLoading() switch response { case .success(let result): diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift index b162417d..ad35f71b 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift @@ -15,7 +15,7 @@ class CourseUploadVC: UIViewController { // MARK: - Properties // private var runningModel: RunningModel? - private let courseUploadingProvider = MoyaProvider( + private let courseUploadingProvider = MoyaProvider( plugins: [NetworkLoggerPlugin(verbose: true)] ) private var courseModel: Course? diff --git a/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/InfoVC/UploadedCourseInfoVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/InfoVC/UploadedCourseInfoVC.swift index f2164e40..4dea323a 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/InfoVC/UploadedCourseInfoVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/InfoVC/UploadedCourseInfoVC.swift @@ -15,7 +15,7 @@ final class UploadedCourseInfoVC: UIViewController { // MARK: - Properties - private var uploadedCourseProvider = MoyaProvider( + private var uploadedCourseProvider = MoyaProvider( plugins: [NetworkLoggerPlugin(verbose: true)] ) From dc75283e536ea900eb7c2e2248f11be794b118d1 Mon Sep 17 00:00:00 2001 From: yeonwoo Date: Tue, 21 Feb 2023 13:27:13 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Fix]=20#113=20-=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Runnect-iOS/Network/Router/PublicCourseRouter.swift | 4 +--- .../Presentation/CourseDetail/VC/CourseDetailVC.swift | 4 ++-- .../CourseDiscovery/Views/VC/CourseDiscoveryVC.swift | 4 ++-- .../CourseDiscovery/Views/VC/CourseSearchVC.swift | 4 ++-- .../CourseDiscovery/Views/VC/CourseUploadVC.swift | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Runnect-iOS/Runnect-iOS/Network/Router/PublicCourseRouter.swift b/Runnect-iOS/Runnect-iOS/Network/Router/PublicCourseRouter.swift index fb1e8e3f..6e70575d 100644 --- a/Runnect-iOS/Runnect-iOS/Network/Router/PublicCourseRouter.swift +++ b/Runnect-iOS/Runnect-iOS/Network/Router/PublicCourseRouter.swift @@ -50,7 +50,6 @@ extension PublicCourseRouter: TargetType { case .courseUploadingData(param: let param): do { return .requestParameters(parameters: try param.asParameter(), encoding: JSONEncoding.default) - } catch { fatalError("Encoding 실패")} case .getCourseData, .getUploadedCourseDetail, .getUploadedCourseInfo: @@ -59,9 +58,8 @@ extension PublicCourseRouter: TargetType { } var headers: [String: String]? { switch self { - case .getCourseData, .courseUploadingData, .getUploadedCourseInfo, .getUploadedCourseDetail, .getCourseSearchData: + default: 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 index 386faedd..ce70efcb 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift @@ -20,7 +20,7 @@ final class CourseDetailVC: UIViewController { plugins: [NetworkLoggerPlugin(verbose: true)] ) - private let courseDetailProvider = MoyaProvider( + private let PublicCourseProvider = MoyaProvider( plugins: [NetworkLoggerPlugin(verbose: true)] ) @@ -299,7 +299,7 @@ extension CourseDetailVC { private func getUploadedCourseDetail() { guard let publicCourseId = self.publicCourseId else { return } LoadingIndicator.showLoading() - courseDetailProvider.request(.getUploadedCourseDetail(publicCourseId: publicCourseId)) { [weak self] response in + PublicCourseProvider.request(.getUploadedCourseDetail(publicCourseId: publicCourseId)) { [weak self] response in guard let self = self else { return } LoadingIndicator.hideLoading() 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 index a4917141..4686de86 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseDiscoveryVC.swift @@ -15,7 +15,7 @@ import Moya final class CourseDiscoveryVC: UIViewController { // MARK: - Properties - private let pickedMapListProvider = MoyaProvider( + private let PublicCourseProvider = MoyaProvider( plugins: [NetworkLoggerPlugin(verbose: true)] ) @@ -249,7 +249,7 @@ extension CourseDiscoveryVC: CourseListCVCDeleagte { extension CourseDiscoveryVC { private func getCourseData() { LoadingIndicator.showLoading() - pickedMapListProvider.request(.getCourseData) { response in + PublicCourseProvider.request(.getCourseData) { response in LoadingIndicator.hideLoading() switch response { case .success(let result): diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseSearchVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseSearchVC.swift index a08de4d0..9146e531 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseSearchVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseSearchVC.swift @@ -15,7 +15,7 @@ final class CourseSearchVC: UIViewController { // MARK: - Properties - private let CourseSearchingRouter = MoyaProvider( + private let PublicCourseRouter = MoyaProvider( plugins: [NetworkLoggerPlugin(verbose: true)] ) @@ -218,7 +218,7 @@ extension CourseSearchVC: CourseListCVCDeleagte { extension CourseSearchVC { private func searchCourseWithKeyword(keyword: String) { LoadingIndicator.showLoading() - CourseSearchingRouter.request(.getCourseSearchData(keyword: keyword)) { response in + PublicCourseRouter.request(.getCourseSearchData(keyword: keyword)) { response in LoadingIndicator.hideLoading() switch response { case .success(let result): diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift index ad35f71b..4d5eaf5f 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift @@ -15,7 +15,7 @@ class CourseUploadVC: UIViewController { // MARK: - Properties // private var runningModel: RunningModel? - private let courseUploadingProvider = MoyaProvider( + private let PublicCourseProvider = MoyaProvider( plugins: [NetworkLoggerPlugin(verbose: true)] ) private var courseModel: Course? @@ -327,7 +327,7 @@ extension CourseUploadVC { let requsetDto = CourseUploadingRequestDto(courseId: courseId, title: titletext, description: descriptiontext) LoadingIndicator.showLoading() - courseUploadingProvider.request(.courseUploadingData(param: requsetDto)) { [weak self] response in + PublicCourseProvider.request(.courseUploadingData(param: requsetDto)) { [weak self] response in LoadingIndicator.hideLoading() guard let self = self else { return } switch response {