[FEAT] TeamNADA#54 - 리퀘스트 쿼리 맞춰서 코드 수정

mini-min · Nov 12, 2021 · c7c7a5f · c7c7a5f
1 parent f181521
commit c7c7a5f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git 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 = "<group>"; };
 		39523E5A2701A48900536900 /* CardListTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CardListTableViewCell.xib; sourceTree = "<group>"; };
 		39523E5E2701AA9000536900 /* CardListDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListDataModel.swift; sourceTree = "<group>"; };
+		39584580273E951C009CC6B9 /* MainListRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainListRequest.swift; sourceTree = "<group>"; };
 		3958F238270FFBBF00B100B2 /* GroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupViewController.swift; sourceTree = "<group>"; };
 		3958F23B270FFBD500B100B2 /* Group.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Group.storyboard; sourceTree = "<group>"; };
 		3979709526FA0BE5003FB4F5 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
@@ -356,6 +358,7 @@
 				F871227727330A3800A24E74 /* CardCreationRequest.swift */,
 				3981148D273BEBB300E28630 /* CardListEditRequest.swift */,
 				3981148F273BEBCE00E28630 /* CardListRequest.swift */,
+				39584580273E951C009CC6B9 /* MainListRequest.swift */,
 			);
 			path = Card;
 			sourceTree = "<group>";
@@ -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
@@ -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
@@ -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
@@ -100,7 +100,7 @@ extension CardListViewController: UITableViewDelegate {
                 // 취소 눌렀을 때 액션이 들어갈 부분
             }, deleteAction: { _ in
                 // FIXME: - 카드 삭제 서버 테스트
-                self.deleteCardWithAPI(cardID: "cardA")
+                // self.deleteCardWithAPI(cardID: "cardA")
             }, completion: nil)
         })
         deleteAction.backgroundColor = .red