From c7c7a5f328d5a15a3695a36b4e30038ccc5a9b2e Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Fri, 12 Nov 2021 21:47:35 +0900 Subject: [PATCH] =?UTF-8?q?[FEAT]=20#54=20-=20=EB=A6=AC=ED=80=98=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=BF=BC=EB=A6=AC=20=EB=A7=9E=EC=B6=B0=EC=84=9C=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 4 ++++ .../NetworkModel/Card/MainListRequest.swift | 15 +++++++++++++++ .../Sources/NetworkService/Card/CardService.swift | 7 +++++-- .../CardList/CardListViewController.swift | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 NADA-iOS-forRelease/Sources/NetworkModel/Card/MainListRequest.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 8fd6a89e..adb047e5 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -18,6 +18,7 @@ 39523E5B2701A48900536900 /* CardListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39523E592701A48900536900 /* CardListTableViewCell.swift */; }; 39523E5C2701A48900536900 /* CardListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39523E5A2701A48900536900 /* CardListTableViewCell.xib */; }; 39523E5F2701AA9000536900 /* CardListDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39523E5E2701AA9000536900 /* CardListDataModel.swift */; }; + 39584581273E951C009CC6B9 /* MainListRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39584580273E951C009CC6B9 /* MainListRequest.swift */; }; 3958F239270FFBBF00B100B2 /* GroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3958F238270FFBBF00B100B2 /* GroupViewController.swift */; }; 3958F23C270FFBD500B100B2 /* Group.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3958F23B270FFBD500B100B2 /* Group.storyboard */; }; 3979709626FA0BE5003FB4F5 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3979709526FA0BE5003FB4F5 /* LoginViewController.swift */; }; @@ -91,6 +92,7 @@ 39523E592701A48900536900 /* CardListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListTableViewCell.swift; sourceTree = ""; }; 39523E5A2701A48900536900 /* CardListTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CardListTableViewCell.xib; sourceTree = ""; }; 39523E5E2701AA9000536900 /* CardListDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListDataModel.swift; sourceTree = ""; }; + 39584580273E951C009CC6B9 /* MainListRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainListRequest.swift; sourceTree = ""; }; 3958F238270FFBBF00B100B2 /* GroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupViewController.swift; sourceTree = ""; }; 3958F23B270FFBD500B100B2 /* Group.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Group.storyboard; sourceTree = ""; }; 3979709526FA0BE5003FB4F5 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = ""; }; @@ -356,6 +358,7 @@ F871227727330A3800A24E74 /* CardCreationRequest.swift */, 3981148D273BEBB300E28630 /* CardListEditRequest.swift */, 3981148F273BEBCE00E28630 /* CardListRequest.swift */, + 39584580273E951C009CC6B9 /* MainListRequest.swift */, ); path = Card; sourceTree = ""; @@ -753,6 +756,7 @@ F8C83FC7272FA2A20009DF0D /* CardService.swift in Sources */, F871227827330A3800A24E74 /* CardCreationRequest.swift in Sources */, F8FC43B326C020B90033E151 /* TempProtocols.swift in Sources */, + 39584581273E951C009CC6B9 /* MainListRequest.swift in Sources */, F8FC43B526C020C10033E151 /* TempViews.swift in Sources */, F8C83FBB272F9F370009DF0D /* NetworkResult.swift in Sources */, 39D2E130270B43DA00AD0889 /* UIFont+Extension.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Card/MainListRequest.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Card/MainListRequest.swift new file mode 100644 index 00000000..e2f726ea --- /dev/null +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Card/MainListRequest.swift @@ -0,0 +1,15 @@ +// +// MainListRequest.swift +// NADA-iOS-forRelease +// +// Created by 민 on 2021/11/12. +// + +import Foundation + +// MARK: - MainList +struct MainListRequest: Codable { + var userId: String + var list: Bool + var offset: Int +} diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift index 7634a39d..ec193766 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift @@ -105,8 +105,11 @@ extension CardService: TargetType { multiPartData.append(imageData) return .uploadMultipart(multiPartData) - case .cardListFetch(let userID): - return .requestParameters(parameters: ["userId": userID], encoding: URLEncoding.queryString) + case .cardListFetch(let mainListRequest): + return .requestParameters(parameters: ["userId": mainListRequest.userID, + "list": mainListRequest.isList, + "offset": mainListRequest.offset + ], encoding: URLEncoding.queryString) case .cardListEdit(let requestModel): return .requestJSONEncodable(requestModel) case .cardDelete: diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift index b0007816..11f3f432 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift @@ -100,7 +100,7 @@ extension CardListViewController: UITableViewDelegate { // 취소 눌렀을 때 액션이 들어갈 부분 }, deleteAction: { _ in // FIXME: - 카드 삭제 서버 테스트 - self.deleteCardWithAPI(cardID: "cardA") + // self.deleteCardWithAPI(cardID: "cardA") }, completion: nil) }) deleteAction.backgroundColor = .red