Skip to content

Commit 0374a0d

Browse files
thingineeerthingineeer
authored
Merge pull request #225 from thingineeer/#224---코스-발견-이벤트-처리-해결
[Feat] #224 - 코스발견, 코스보관함, 코스 상세, 유저프로필 1차 QA 진행 하였습니다.
2 parents 0cd869d + 2ee47b4 commit 0374a0d

File tree

21 files changed

+329
-634
lines changed

21 files changed

+329
-634
lines changed

‎Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@
1919
71288ED32B26ED2500D6C921 /* UserUploadedLabelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71288ED22B26ED2500D6C921 /* UserUploadedLabelCell.swift */; };
2020
712F661D2A7B7BAB00D9539B /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 712F661C2A7B7BAB00D9539B /* Config.swift */; };
2121
7136BF8A2AF921A900679364 /* CustomBottomSheetVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7136BF892AF921A900679364 /* CustomBottomSheetVC.swift */; };
22+
713A98F02B29DD9900189B3C /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 713A98EF2B29DD9900189B3C /* GoogleService-Info.plist */; };
2223
717916DA2B13613B009CEF97 /* MarathonListResponseDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 717916D92B13613B009CEF97 /* MarathonListResponseDto.swift */; };
23-
717916DE2B137DC3009CEF97 /* TotalPageCountDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 717916DD2B137DC3009CEF97 /* TotalPageCountDto.swift */; };
2424
71BAD06A2B24CECC0061E31D /* UserProfileDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71BAD0692B24CECC0061E31D /* UserProfileDto.swift */; };
2525
71BAD06C2B24D1F70061E31D /* UserProfileVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71BAD06B2B24D1F70061E31D /* UserProfileVC.swift */; };
2626
71F7804E2B0893B600B53253 /* MarathonTitleCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71F7804D2B0893B600B53253 /* MarathonTitleCollectionViewCell.swift */; };
2727
71F780502B0893D700B53253 /* MarathonMapCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71F7804F2B0893D700B53253 /* MarathonMapCollectionViewCell.swift */; };
28-
71F7BF072B0CDFE300B752B3 /* MarathonCourseListCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71F7BF062B0CDFE300B752B3 /* MarathonCourseListCVC.swift */; };
2928
A3305A97296EF58C000B1A10 /* GoalRewardInfoDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3305A96296EF58C000B1A10 /* GoalRewardInfoDto.swift */; };
3029
A3BC2F2B2962C3D500198261 /* GoalRewardInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F2A2962C3D500198261 /* GoalRewardInfoVC.swift */; };
3130
A3BC2F2D2962C3F200198261 /* ActivityRecordInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F2C2962C3F200198261 /* ActivityRecordInfoVC.swift */; };
@@ -172,7 +171,6 @@
172171
DA97A033296E65D80086760E /* CourseUploadingRequestDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA97A032296E65D80086760E /* CourseUploadingRequestDto.swift */; };
173172
DAD5A3D8296C6D9600C8166B /* AdImageCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAD5A3D7296C6D9600C8166B /* AdImageCollectionViewCell.swift */; };
174173
DAD5A3DA296C6DA500C8166B /* TitleCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAD5A3D9296C6DA500C8166B /* TitleCollectionViewCell.swift */; };
175-
DAD5A3DC296C6DB800C8166B /* MapCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAD5A3DB296C6DB800C8166B /* MapCollectionViewCell.swift */; };
176174
DAD5A3E2296D4C6500C8166B /* PickedMapListResponseDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAD5A3E1296D4C6500C8166B /* PickedMapListResponseDto.swift */; };
177175
/* End PBXBuildFile section */
178176

@@ -191,14 +189,12 @@
191189
71288ED22B26ED2500D6C921 /* UserUploadedLabelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserUploadedLabelCell.swift; sourceTree = "<group>"; };
192190
712F661C2A7B7BAB00D9539B /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
193191
7136BF892AF921A900679364 /* CustomBottomSheetVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomBottomSheetVC.swift; sourceTree = "<group>"; };
192+
713A98EF2B29DD9900189B3C /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
194193
717916D92B13613B009CEF97 /* MarathonListResponseDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarathonListResponseDto.swift; sourceTree = "<group>"; };
195-
717916DD2B137DC3009CEF97 /* TotalPageCountDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalPageCountDto.swift; sourceTree = "<group>"; };
196194
71BAD0692B24CECC0061E31D /* UserProfileDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileDto.swift; sourceTree = "<group>"; };
197195
71BAD06B2B24D1F70061E31D /* UserProfileVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileVC.swift; sourceTree = "<group>"; };
198196
71F7804D2B0893B600B53253 /* MarathonTitleCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarathonTitleCollectionViewCell.swift; sourceTree = "<group>"; };
199197
71F7804F2B0893D700B53253 /* MarathonMapCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarathonMapCollectionViewCell.swift; sourceTree = "<group>"; };
200-
71F7BF062B0CDFE300B752B3 /* MarathonCourseListCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarathonCourseListCVC.swift; sourceTree = "<group>"; };
201-
202198
A3305A96296EF58C000B1A10 /* GoalRewardInfoDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoDto.swift; sourceTree = "<group>"; };
203199
A3BC2F2A2962C3D500198261 /* GoalRewardInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoVC.swift; sourceTree = "<group>"; };
204200
A3BC2F2C2962C3F200198261 /* ActivityRecordInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityRecordInfoVC.swift; sourceTree = "<group>"; };
@@ -357,7 +353,6 @@
357353
DA97A032296E65D80086760E /* CourseUploadingRequestDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseUploadingRequestDto.swift; sourceTree = "<group>"; };
358354
DAD5A3D7296C6D9600C8166B /* AdImageCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdImageCollectionViewCell.swift; sourceTree = "<group>"; };
359355
DAD5A3D9296C6DA500C8166B /* TitleCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleCollectionViewCell.swift; sourceTree = "<group>"; };
360-
DAD5A3DB296C6DB800C8166B /* MapCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapCollectionViewCell.swift; sourceTree = "<group>"; };
361356
DAD5A3E1296D4C6500C8166B /* PickedMapListResponseDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PickedMapListResponseDto.swift; sourceTree = "<group>"; };
362357
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 = "<group>"; };
363358
/* End PBXFileReference section */
@@ -768,7 +763,6 @@
768763
71F7804D2B0893B600B53253 /* MarathonTitleCollectionViewCell.swift */,
769764
71F7804F2B0893D700B53253 /* MarathonMapCollectionViewCell.swift */,
770765
DAD5A3D9296C6DA500C8166B /* TitleCollectionViewCell.swift */,
771-
DAD5A3DB296C6DB800C8166B /* MapCollectionViewCell.swift */,
772766
CE17F0432961C3D600E1DED0 /* VC */,
773767
);
774768
path = Views;
@@ -865,7 +859,7 @@
865859
CE6655A9295D7FAA00C64E12 /* Network */,
866860
CE6655A8295D7F7D00C64E12 /* Presentation */,
867861
CE4545D6295D7AF5003201E1 /* Info.plist */,
868-
713BA40A2B218AF8009091A8 /* GoogleService-Info.plist */,
862+
713A98EF2B29DD9900189B3C /* GoogleService-Info.plist */,
869863
);
870864
path = "Runnect-iOS";
871865
sourceTree = "<group>";
@@ -1201,7 +1195,6 @@
12011195
isa = PBXGroup;
12021196
children = (
12031197
CE6B63D2296725E6003F900F /* CourseListCVC.swift */,
1204-
71F7BF062B0CDFE300B752B3 /* MarathonCourseListCVC.swift */,
12051198
);
12061199
path = CVC;
12071200
sourceTree = "<group>";
@@ -1254,7 +1247,6 @@
12541247
children = (
12551248
717916D92B13613B009CEF97 /* MarathonListResponseDto.swift */,
12561249
DAD5A3E1296D4C6500C8166B /* PickedMapListResponseDto.swift */,
1257-
717916DD2B137DC3009CEF97 /* TotalPageCountDto.swift */,
12581250
);
12591251
path = ResponseDto;
12601252
sourceTree = "<group>";
@@ -1322,7 +1314,7 @@
13221314
files = (
13231315
CE665615295D989A00C64E12 /* .swiftlint.yml in Resources */,
13241316
CE17F0342961BEF800E1DED0 /* Pretendard-Bold.otf in Resources */,
1325-
713BA40B2B218AF8009091A8 /* GoogleService-Info.plist in Resources */,
1317+
713A98F02B29DD9900189B3C /* GoogleService-Info.plist in Resources */,
13261318
CE17F0352961BEF800E1DED0 /* Pretendard-SemiBold.otf in Resources */,
13271319
CE17F0332961BEF800E1DED0 /* Pretendard-Medium.otf in Resources */,
13281320
CE6655BF295D82E200C64E12 /* .gitkeep in Resources */,
@@ -1495,12 +1487,10 @@
14951487
A3D1A77E29CF09B600DD54EC /* SignInResponseDto.swift in Sources */,
14961488
CE21C028299E5FFC00F62AF5 /* PublicCourseRouter.swift in Sources */,
14971489
CE18E894296C79B900FEB569 /* CourseDrawingRequestDto.swift in Sources */,
1498-
71F7BF072B0CDFE300B752B3 /* MarathonCourseListCVC.swift in Sources */,
14991490
DA20D84E2966A9B300F1581F /* CourseSearchVC.swift in Sources */,
15001491
CE1006572968230800FD31FB /* DepartureLocationModel.swift in Sources */,
15011492
CECA695C296E61D6002AF05C /* PrivateCourseNotUploadedResponseDto.swift in Sources */,
15021493
CE6655EC295D88D000C64E12 /* UITableView+.swift in Sources */,
1503-
717916DE2B137DC3009CEF97 /* TotalPageCountDto.swift in Sources */,
15041494
CEEC6B3A2961C4F300D00E1E /* CourseDrawingHomeVC.swift in Sources */,
15051495
CEB0BCBC29D123350048CCD5 /* GuideView.swift in Sources */,
15061496
CEC2A6902962B06C00160BF7 /* convertLocationObject.swift in Sources */,
@@ -1518,7 +1508,6 @@
15181508
CE665608295D921500C64E12 /* setImage.swift in Sources */,
15191509
CE146770296568DC00DCEA1B /* RunTrackingVC.swift in Sources */,
15201510
DA20D849296697B400F1581F /* CourseUploadVC.swift in Sources */,
1521-
DAD5A3DC296C6DB800C8166B /* MapCollectionViewCell.swift in Sources */,
15221511
CE665612295D92E400C64E12 /* UserDefaultWrapper.swift in Sources */,
15231512
A3BC2F3A2963D0ED00198261 /* ActivityRecordInfoTVC.swift in Sources */,
15241513
CE665610295D92C200C64E12 /* setTextLineHeight.swift in Sources */,

‎Runnect-iOS/Runnect-iOS/Network/Dto/CourseDiscoveryDto/ResponseDto/MarathonListResponseDto.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct marathonCourse: Codable {
1919
let id, courseId: Int
2020
let title: String
2121
let image: String
22-
let scrap: Bool?
22+
var scrap: Bool?
2323
let departure: MarathonDeparture
2424
}
2525

‎Runnect-iOS/Runnect-iOS/Network/Dto/CourseDiscoveryDto/ResponseDto/TotalPageCountDto.swift‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎Runnect-iOS/Runnect-iOS/Network/Dto/CourseStorageDto/ResponseDto/PrivateCourseResponseDto.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ struct PrivateCourseResponseDto: Codable {
1717

1818
struct PrivateCourse: Codable {
1919
let id: Int
20+
let title: String
2021
let image, createdAt: String
2122
let distance: Float?
2223
let path: [[Double]]?

‎Runnect-iOS/Runnect-iOS/Network/Router/CourseRouter.swift‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ enum CourseRouter {
1414
case getAllPrivateCourse
1515
case getPrivateCourseNotUploaded
1616
case getCourseDetail(courseId: Int)
17+
case updateCourseTitle(courseId: Int, title: String)
1718
case deleteCourse(courseIdList: [Int])
1819
}
1920

@@ -34,6 +35,8 @@ extension CourseRouter: TargetType {
3435
return "/course/user"
3536
case .getPrivateCourseNotUploaded:
3637
return "/course/private/user"
38+
case .updateCourseTitle(let courseId, _):
39+
return "/course/\(courseId)"
3740
case .getCourseDetail(let courseId):
3841
return "/course/detail/\(courseId)"
3942
case .deleteCourse:
@@ -43,10 +46,12 @@ extension CourseRouter: TargetType {
4346

4447
var method: Moya.Method {
4548
switch self {
46-
case .uploadCourseDrawing:
47-
return .post
4849
case .getAllPrivateCourse, .getPrivateCourseNotUploaded, .getCourseDetail:
4950
return .get
51+
case .uploadCourseDrawing:
52+
return .post
53+
case .updateCourseTitle:
54+
return .patch
5055
case .deleteCourse:
5156
return .put
5257
}
@@ -88,6 +93,9 @@ extension CourseRouter: TargetType {
8893
}
8994

9095
return .uploadMultipart(multipartFormData)
96+
case .updateCourseTitle(_, let title):
97+
return .requestParameters(parameters: ["title": title], encoding: JSONEncoding.default)
98+
9199
case .deleteCourse(let courseIdList):
92100
return .requestParameters(parameters: ["courseIdList": courseIdList], encoding: JSONEncoding.default)
93101
case .getAllPrivateCourse, .getPrivateCourseNotUploaded, .getCourseDetail:

‎Runnect-iOS/Runnect-iOS/Network/Router/PublicCourseRouter.swift‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ enum PublicCourseRouter {
1212
case getCourseData(pageNo: Int, sort: String)
1313
case getCourseSearchData(keyword: String)
1414
case getMarathonCourseData
15-
case getTotalPageCount
1615
case courseUploadingData(param: CourseUploadingRequestDto)
1716
case getUploadedCourseDetail(publicCourseId: Int)
1817
case getUploadedCourseInfo
@@ -37,8 +36,6 @@ extension PublicCourseRouter: TargetType {
3736
return "/public-course/marathon"
3837
case .getCourseSearchData:
3938
return "/public-course/search"
40-
case .getTotalPageCount:
41-
return "public-course/total-page-count"
4239
case .getUploadedCourseDetail(let publicCourseId):
4340
return "/public-course/detail/\(publicCourseId)"
4441
case .getUploadedCourseInfo:
@@ -52,7 +49,7 @@ extension PublicCourseRouter: TargetType {
5249

5350
var method: Moya.Method {
5451
switch self {
55-
case .getCourseData, .getCourseSearchData, .getMarathonCourseData, .getUploadedCourseDetail, .getUploadedCourseInfo, .getTotalPageCount:
52+
case .getCourseData, .getCourseSearchData, .getMarathonCourseData, .getUploadedCourseDetail, .getUploadedCourseInfo:
5653
return .get
5754
case .courseUploadingData:
5855
return .post
@@ -66,7 +63,7 @@ extension PublicCourseRouter: TargetType {
6663
var task: Moya.Task {
6764
switch self {
6865
case .getCourseData(let pageNo, let sort):
69-
var parameters: [String: Any] = ["pageNo": pageNo, "sort": sort]
66+
let parameters: [String: Any] = ["pageNo": pageNo, "sort": sort]
7067
return .requestParameters(parameters: parameters, encoding: URLEncoding.default)
7168
case .getCourseSearchData(let keyword):
7269
return .requestParameters(parameters: ["keyword": keyword], encoding: URLEncoding.default)
@@ -82,7 +79,7 @@ extension PublicCourseRouter: TargetType {
8279
fatalError("Encoding 실패")}
8380
case .deleteUploadedCourse(let publicCourseIdList):
8481
return .requestParameters(parameters: ["publicCourseIdList": publicCourseIdList], encoding: JSONEncoding.default)
85-
case .getMarathonCourseData, .getTotalPageCount, .getUploadedCourseDetail, .getUploadedCourseInfo:
82+
case .getMarathonCourseData, .getUploadedCourseDetail, .getUploadedCourseInfo:
8683
return .requestPlain
8784
}
8885
}

0 commit comments

Comments
 (0)