From fc9137168633832246b01f4ac64bb27295d11f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=9D=B4=EC=A4=80?= Date: Sat, 6 Nov 2021 03:16:18 +0900 Subject: [PATCH 1/9] =?UTF-8?q?[FEAT]=20#56=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20=EC=84=9C?= =?UTF-8?q?=EB=B2=84=ED=86=B5=EC=8B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 12 ++++ .../Sources/NetworkModel/Group/Groups.swift | 17 ++++++ .../NetworkService/Group/GroupAPI.swift | 61 +++++++++++++++++++ .../NetworkService/Group/GroupService.swift | 54 ++++++++++++++++ .../Group/GroupViewController.swift | 26 +++++++- 5 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 NADA-iOS-forRelease/Sources/NetworkModel/Group/Groups.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 8181e686..0ba6adaf 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -32,6 +32,7 @@ 39D2E130270B43DA00AD0889 /* UIFont+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D2E12F270B43DA00AD0889 /* UIFont+Extension.swift */; }; 39F5A3D0271461EA00191F94 /* BackCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39F5A3CE271461EA00191F94 /* BackCardCell.swift */; }; 39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39F5A3CF271461EA00191F94 /* BackCardCell.xib */; }; + 777FF89B27359B7800BF69D3 /* Groups.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89A27359B7800BF69D3 /* Groups.swift */; }; DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; }; F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; }; F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */; }; @@ -102,6 +103,7 @@ 39F5A3CE271461EA00191F94 /* BackCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackCardCell.swift; sourceTree = ""; }; 39F5A3CF271461EA00191F94 /* BackCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackCardCell.xib; sourceTree = ""; }; 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 777FF89A27359B7800BF69D3 /* Groups.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Groups.swift; sourceTree = ""; }; 7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = ""; }; F822E7A82709CEB60020452C /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = ""; }; F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardCreation.storyboard; sourceTree = ""; }; @@ -258,6 +260,14 @@ name = Frameworks; sourceTree = ""; }; + 777FF89927359B1000BF69D3 /* Group */ = { + isa = PBXGroup; + children = ( + 777FF89A27359B7800BF69D3 /* Groups.swift */, + ); + path = Group; + sourceTree = ""; + }; F82FF8222701FFE300E57F8B /* RequiredFlavor */ = { isa = PBXGroup; children = ( @@ -384,6 +394,7 @@ F8C83FBA272F9F370009DF0D /* NetworkResult.swift */, F8C83FBC272F9F430009DF0D /* GenericResponse.swift */, F87122722733032300A24E74 /* Card */, + 777FF89927359B1000BF69D3 /* Group */, ); path = NetworkModel; sourceTree = ""; @@ -709,6 +720,7 @@ 3958F239270FFBBF00B100B2 /* GroupViewController.swift in Sources */, 3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */, 39523E09270184A700536900 /* CardListViewController.swift in Sources */, + 777FF89B27359B7800BF69D3 /* Groups.swift in Sources */, 399C55DF2711949D00845A54 /* CGPoint+Distance.swift in Sources */, F83206AA26F61E3700D61711 /* FrontCardCell.swift in Sources */, 3979709626FA0BE5003FB4F5 /* LoginViewController.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Group/Groups.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Group/Groups.swift new file mode 100644 index 00000000..b00eb4e1 --- /dev/null +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Group/Groups.swift @@ -0,0 +1,17 @@ +// +// GroupListResponse.swift +// NADA-iOS-forRelease +// +// Created by Yi Joon Choi on 2021/11/06. +// + +import Foundation + +struct Groups: Codable { + var groups: [Group]? +} + +struct Group: Codable { + var groupId: Int? + var groupName: String? +} diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift index 11200069..1f00d3d5 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift @@ -6,3 +6,64 @@ // import Foundation +import Moya + +public class GroupAPI { + + static let shared = GroupAPI() + var groupProvider = MoyaProvider(plugins: [MoyaLoggerPlugin()]) + + public init() { } + + func getGroupListFetch(userID: String, completion: @escaping (NetworkResult) -> Void) { + groupProvider.request(.groupListFetch(userID: userID)) { (result) in + switch result { + case .success(let response): + let statusCode = response.statusCode + let data = response.data + + let networkResult = self.judgeStatus(by: statusCode, data) + completion(networkResult) + + case .failure(let err): + print(err) + } + } + } + +// func deleteGroupFetch(userID: String, completion: @escaping (NetworkResult) -> Void) { +// groupProvider.request(.groupListFetch(userID: userID)) { (result) in +// switch result { +// case .success(let response): +// let statusCode = response.statusCode +// let data = response.data +// +// let networkResult = self.judgeStatus(by: statusCode, data) +// completion(networkResult) +// +// case .failure(let err): +// print(err) +// } +// } +// } + + private func judgeStatus(by statusCode: Int, _ data: Data) -> NetworkResult { + + let decoder = JSONDecoder() + guard let decodedData = try? decoder.decode(GenericResponse.self, from: data) + else { + return .pathErr + } + + switch statusCode { + case 200: + return .success(decodedData.data) + case 400..<500: + return .requestErr(decodedData.msg) + case 500: + return .serverErr + default: + return .networkFail + } + } +} diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift index c25fa6c6..aeebb58b 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift @@ -6,3 +6,57 @@ // import Foundation +import Moya + +enum GroupService { + case groupListFetch(userID: String) + case groupDelete(groupID: Int) +} + +extension GroupService: TargetType { + + var baseURL: URL { + return URL(string: Const.URL.baseURL)! + } + + var path: String { + switch self { + case .groupListFetch: + return "/groups" + case .groupDelete(let groupID): + return "/group/\(groupID)" + } + } + + var method: Moya.Method { + switch self { + case .groupListFetch: + return .get + case .groupDelete: + return .delete + } + } + + var sampleData: Data { + return Data() + } + + var task: Task { + switch self { + case .groupListFetch(let userID): + return .requestParameters(parameters: ["userId": userID], encoding: URLEncoding.queryString) + case .groupDelete: + return .requestPlain + } + } + + var headers: [String: String]? { + switch self { + case .groupListFetch: + return ["Content-Type": "application/json"] + case .groupDelete: + return ["Content-Type": "application/json"] + } + } + +} diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 035d1da2..5045d930 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -12,7 +12,31 @@ class GroupViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - // Do any additional setup after loading the view. + //그룹 리스트 조회 서버 테스트 + getGroupListFetchWithAPI(userID: "nada") } } + +// MARK: - Network + +extension GroupViewController { + func getGroupListFetchWithAPI(userID: String) { + GroupAPI.shared.getGroupListFetch(userID: userID) { response in + switch response { + case .success(let data): + if let group = data as? Groups { + print(group) + } + case .requestErr(let message): + print("getGroupListFetchWithAPI - requestErr", message) + case .pathErr: + print("getGroupListFetchWithAPI - pathErr") + case .serverErr: + print("getGroupListFetchWithAPI - serverErr") + case .networkFail: + print("getGroupListFetchWithAPI - networkFail") + } + } + } +} From f3c0dcb0df88354945c4d8714b656ed5fd55439f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=9D=B4=EC=A4=80?= Date: Sat, 6 Nov 2021 03:25:53 +0900 Subject: [PATCH 2/9] =?UTF-8?q?[FEAT]=20#56=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=84=9C=EB=B2=84=ED=86=B5=EC=8B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NetworkService/Group/GroupAPI.swift | 30 +++++++++---------- .../Group/GroupViewController.swift | 21 +++++++++++++ 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift index 1f00d3d5..eac95a13 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift @@ -31,21 +31,21 @@ public class GroupAPI { } } -// func deleteGroupFetch(userID: String, completion: @escaping (NetworkResult) -> Void) { -// groupProvider.request(.groupListFetch(userID: userID)) { (result) in -// switch result { -// case .success(let response): -// let statusCode = response.statusCode -// let data = response.data -// -// let networkResult = self.judgeStatus(by: statusCode, data) -// completion(networkResult) -// -// case .failure(let err): -// print(err) -// } -// } -// } + func deleteGroup(groupID: Int, completion: @escaping (NetworkResult) -> Void) { + groupProvider.request(.groupDelete(groupID: groupID)) { (result) in + switch result { + case .success(let response): + let statusCode = response.statusCode + let data = response.data + + let networkResult = self.judgeStatus(by: statusCode, data) + completion(networkResult) + + case .failure(let err): + print(err) + } + } + } private func judgeStatus(by statusCode: Int, _ data: Data) -> NetworkResult { diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 5045d930..f524afb8 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -14,6 +14,8 @@ class GroupViewController: UIViewController { //그룹 리스트 조회 서버 테스트 getGroupListFetchWithAPI(userID: "nada") + //그룹 삭제 서버 테스트 + deleteGroupWithAPI(groupID: 1) } } @@ -39,4 +41,23 @@ extension GroupViewController { } } } + + func deleteGroupWithAPI(groupID: Int) { + GroupAPI.shared.deleteGroup(groupID: groupID) { response in + switch response { + case .success(let data): + if let group = data as? Groups { + print(group) + } + case .requestErr(let message): + print("getGroupListFetchWithAPI - requestErr", message) + case .pathErr: + print("getGroupListFetchWithAPI - pathErr") + case .serverErr: + print("getGroupListFetchWithAPI - serverErr") + case .networkFail: + print("getGroupListFetchWithAPI - networkFail") + } + } + } } From 103c7f509c410eb32806e3dc12b6d15bb6ec01a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=9D=B4=EC=A4=80?= Date: Sat, 6 Nov 2021 04:11:02 +0900 Subject: [PATCH 3/9] =?UTF-8?q?[FEAT]=20#56=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=84=9C=EB=B2=84=ED=86=B5=EC=8B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 4 ++ .../NetworkModel/Group/GroupAddRequest.swift | 13 ++++++ .../NetworkService/Group/GroupAPI.swift | 16 +++++++ .../NetworkService/Group/GroupService.swift | 9 ++++ .../Group/GroupViewController.swift | 42 +++++++++++++++---- 5 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupAddRequest.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 0ba6adaf..06b9c571 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -33,6 +33,7 @@ 39F5A3D0271461EA00191F94 /* BackCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39F5A3CE271461EA00191F94 /* BackCardCell.swift */; }; 39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39F5A3CF271461EA00191F94 /* BackCardCell.xib */; }; 777FF89B27359B7800BF69D3 /* Groups.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89A27359B7800BF69D3 /* Groups.swift */; }; + 777FF89D2735B16B00BF69D3 /* GroupAddRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */; }; DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; }; F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; }; F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */; }; @@ -104,6 +105,7 @@ 39F5A3CF271461EA00191F94 /* BackCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackCardCell.xib; sourceTree = ""; }; 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 777FF89A27359B7800BF69D3 /* Groups.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Groups.swift; sourceTree = ""; }; + 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupAddRequest.swift; sourceTree = ""; }; 7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = ""; }; F822E7A82709CEB60020452C /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = ""; }; F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardCreation.storyboard; sourceTree = ""; }; @@ -264,6 +266,7 @@ isa = PBXGroup; children = ( 777FF89A27359B7800BF69D3 /* Groups.swift */, + 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */, ); path = Group; sourceTree = ""; @@ -732,6 +735,7 @@ F8C83FC9272FA3190009DF0D /* GroupAPI.swift in Sources */, F8FC43B826C0227D0033E151 /* Const.swift in Sources */, 394F314C27081B3A00C83291 /* FrontViewController.swift in Sources */, + 777FF89D2735B16B00BF69D3 /* GroupAddRequest.swift in Sources */, F8F5D0AA270800FD00D99D2E /* Xib.swift in Sources */, F82FF8252702000000E57F8B /* RequiredFlavorCollectionViewCell.swift in Sources */, F8C83FC7272FA2A20009DF0D /* CardService.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupAddRequest.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupAddRequest.swift new file mode 100644 index 00000000..83658249 --- /dev/null +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupAddRequest.swift @@ -0,0 +1,13 @@ +// +// GroupAddRequest.swift +// NADA-iOS-forRelease +// +// Created by Yi Joon Choi on 2021/11/06. +// + +import Foundation + +struct GroupAddRequest: Codable { + var userId: String? + var groupName: String? +} diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift index eac95a13..2f5bca29 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift @@ -47,6 +47,22 @@ public class GroupAPI { } } + func postGroupAdd(groupRequest: GroupAddRequest, completion: @escaping (NetworkResult) -> Void) { + groupProvider.request(.groupAdd(groupRequest: groupRequest)) { (result) in + switch result { + case .success(let response): + let statusCode = response.statusCode + let data = response.data + + let networkResult = self.judgeStatus(by: statusCode, data) + completion(networkResult) + + case .failure(let err): + print(err) + } + } + } + private func judgeStatus(by statusCode: Int, _ data: Data) -> NetworkResult { let decoder = JSONDecoder() diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift index aeebb58b..97427e6d 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift @@ -11,6 +11,7 @@ import Moya enum GroupService { case groupListFetch(userID: String) case groupDelete(groupID: Int) + case groupAdd(groupRequest: GroupAddRequest) } extension GroupService: TargetType { @@ -25,6 +26,8 @@ extension GroupService: TargetType { return "/groups" case .groupDelete(let groupID): return "/group/\(groupID)" + case .groupAdd: + return "/group" } } @@ -34,6 +37,8 @@ extension GroupService: TargetType { return .get case .groupDelete: return .delete + case .groupAdd: + return .post } } @@ -47,6 +52,8 @@ extension GroupService: TargetType { return .requestParameters(parameters: ["userId": userID], encoding: URLEncoding.queryString) case .groupDelete: return .requestPlain + case .groupAdd(let groupRequest): + return .requestJSONEncodable(groupRequest) } } @@ -56,6 +63,8 @@ extension GroupService: TargetType { return ["Content-Type": "application/json"] case .groupDelete: return ["Content-Type": "application/json"] + case .groupAdd: + return ["Content-Type": "application/json"] } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index f524afb8..b0b525e6 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -12,10 +12,12 @@ class GroupViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - //그룹 리스트 조회 서버 테스트 + // 그룹 리스트 조회 서버 테스트 getGroupListFetchWithAPI(userID: "nada") - //그룹 삭제 서버 테스트 + // 그룹 삭제 서버 테스트 deleteGroupWithAPI(groupID: 1) + // 그룹 추가 서버 테스트 + postGroupAddWithAPI(groupRequest: GroupAddRequest(userId: "nada", groupName: "나다나다")) } } @@ -28,7 +30,8 @@ extension GroupViewController { switch response { case .success(let data): if let group = data as? Groups { - print(group) +// print(group) + // 그룹 리스트 조회 서버통신 성공했을때 } case .requestErr(let message): print("getGroupListFetchWithAPI - requestErr", message) @@ -43,20 +46,41 @@ extension GroupViewController { } func deleteGroupWithAPI(groupID: Int) { - GroupAPI.shared.deleteGroup(groupID: groupID) { response in + GroupAPI.shared.deleteGroup(groupID: groupID) { response in switch response { case .success(let data): if let group = data as? Groups { - print(group) +// print(group) + // 그룹 삭제 서버 통신 성공했을 떄 } case .requestErr(let message): - print("getGroupListFetchWithAPI - requestErr", message) + print("deleteGroupWithAPI - requestErr", message) case .pathErr: - print("getGroupListFetchWithAPI - pathErr") + print("deleteGroupWithAPI - pathErr") case .serverErr: - print("getGroupListFetchWithAPI - serverErr") + print("deleteGroupWithAPI - serverErr") case .networkFail: - print("getGroupListFetchWithAPI - networkFail") + print("deleteGroupWithAPI - networkFail") + } + } + } + + func postGroupAddWithAPI(groupRequest: GroupAddRequest) { + GroupAPI.shared.postGroupAdd(groupRequest: groupRequest) { response in + switch response { + case .success(let data): + if let group = data as? Groups { +// print(group) + // 그룹 추가 서버 통신 성공했을 떄 + } + case .requestErr(let message): + print("postGroupAddWithAPI - requestErr", message) + case .pathErr: + print("postGroupAddWithAPI - pathErr") + case .serverErr: + print("postGroupAddWithAPI - serverErr") + case .networkFail: + print("postGroupAddWithAPI - networkFail") } } } From 11ab309087ed188ad7d2f9943dc28a31bbde06ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=9D=B4=EC=A4=80?= Date: Sat, 6 Nov 2021 14:42:26 +0900 Subject: [PATCH 4/9] =?UTF-8?q?[FEAT]=20#56=20=EA=B7=B8=EB=A3=B9=EB=AA=85?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=84=9C=EB=B2=84=ED=86=B5=EC=8B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 4 +++ .../NetworkModel/Group/GroupEditRequest.swift | 13 ++++++++++ .../NetworkService/Group/GroupAPI.swift | 16 ++++++++++++ .../NetworkService/Group/GroupService.swift | 9 +++++++ .../Group/GroupViewController.swift | 26 +++++++++++++++++-- 5 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupEditRequest.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 06b9c571..5d868d2a 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -34,6 +34,7 @@ 39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39F5A3CF271461EA00191F94 /* BackCardCell.xib */; }; 777FF89B27359B7800BF69D3 /* Groups.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89A27359B7800BF69D3 /* Groups.swift */; }; 777FF89D2735B16B00BF69D3 /* GroupAddRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */; }; + 777FF89F27364B7B00BF69D3 /* GroupEditRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */; }; DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; }; F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; }; F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */; }; @@ -106,6 +107,7 @@ 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 777FF89A27359B7800BF69D3 /* Groups.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Groups.swift; sourceTree = ""; }; 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupAddRequest.swift; sourceTree = ""; }; + 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditRequest.swift; sourceTree = ""; }; 7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = ""; }; F822E7A82709CEB60020452C /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = ""; }; F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardCreation.storyboard; sourceTree = ""; }; @@ -267,6 +269,7 @@ children = ( 777FF89A27359B7800BF69D3 /* Groups.swift */, 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */, + 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */, ); path = Group; sourceTree = ""; @@ -724,6 +727,7 @@ 3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */, 39523E09270184A700536900 /* CardListViewController.swift in Sources */, 777FF89B27359B7800BF69D3 /* Groups.swift in Sources */, + 777FF89F27364B7B00BF69D3 /* GroupEditRequest.swift in Sources */, 399C55DF2711949D00845A54 /* CGPoint+Distance.swift in Sources */, F83206AA26F61E3700D61711 /* FrontCardCell.swift in Sources */, 3979709626FA0BE5003FB4F5 /* LoginViewController.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupEditRequest.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupEditRequest.swift new file mode 100644 index 00000000..8393d1ad --- /dev/null +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupEditRequest.swift @@ -0,0 +1,13 @@ +// +// GroupEditRequest.swift +// NADA-iOS-forRelease +// +// Created by Yi Joon Choi on 2021/11/06. +// + +import Foundation + +struct GroupEditRequest: Codable { + var groupId: String? + var groupName: String? +} diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift index 2f5bca29..b94ec72c 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift @@ -63,6 +63,22 @@ public class GroupAPI { } } + func putGroupEdit(groupRequest: GroupEditRequest, completion: @escaping (NetworkResult) -> Void) { + groupProvider.request(.groupEdit(groupRequest: groupRequest)) { (result) in + switch result { + case .success(let response): + let statusCode = response.statusCode + let data = response.data + + let networkResult = self.judgeStatus(by: statusCode, data) + completion(networkResult) + + case .failure(let err): + print(err) + } + } + } + private func judgeStatus(by statusCode: Int, _ data: Data) -> NetworkResult { let decoder = JSONDecoder() diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift index 97427e6d..b55e655b 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift @@ -12,6 +12,7 @@ enum GroupService { case groupListFetch(userID: String) case groupDelete(groupID: Int) case groupAdd(groupRequest: GroupAddRequest) + case groupEdit(groupRequest: GroupEditRequest) } extension GroupService: TargetType { @@ -28,6 +29,8 @@ extension GroupService: TargetType { return "/group/\(groupID)" case .groupAdd: return "/group" + case .groupEdit: + return "/group" } } @@ -39,6 +42,8 @@ extension GroupService: TargetType { return .delete case .groupAdd: return .post + case .groupEdit: + return .put } } @@ -54,6 +59,8 @@ extension GroupService: TargetType { return .requestPlain case .groupAdd(let groupRequest): return .requestJSONEncodable(groupRequest) + case .groupEdit(let groupRequest): + return .requestJSONEncodable(groupRequest) } } @@ -65,6 +72,8 @@ extension GroupService: TargetType { return ["Content-Type": "application/json"] case .groupAdd: return ["Content-Type": "application/json"] + case .groupEdit: + return ["Content-Type": "application/json"] } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index b0b525e6..5dffcb79 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -15,9 +15,11 @@ class GroupViewController: UIViewController { // 그룹 리스트 조회 서버 테스트 getGroupListFetchWithAPI(userID: "nada") // 그룹 삭제 서버 테스트 - deleteGroupWithAPI(groupID: 1) +// deleteGroupWithAPI(groupID: 1) // 그룹 추가 서버 테스트 - postGroupAddWithAPI(groupRequest: GroupAddRequest(userId: "nada", groupName: "나다나다")) +// postGroupAddWithAPI(groupRequest: GroupAddRequest(userId: "nada", groupName: "나다나다")) + // 그룹 수정 서버 테스트 +// putGroupEditWithAPI(groupRequest: GroupEditRequest(groupId: "5", groupName: "수정나다")) } } @@ -70,6 +72,26 @@ extension GroupViewController { switch response { case .success(let data): if let group = data as? Groups { +// print(group) + // 그룹 추가 서버 통신 성공했을 떄 + } + case .requestErr(let message): + print("postGroupAddWithAPI - requestErr", message) + case .pathErr: + print("postGroupAddWithAPI - pathErr") + case .serverErr: + print("postGroupAddWithAPI - serverErr") + case .networkFail: + print("postGroupAddWithAPI - networkFail") + } + } + } + + func putGroupEditWithAPI(groupRequest: GroupEditRequest) { + GroupAPI.shared.putGroupEdit(groupRequest: groupRequest) { response in + switch response { + case .success(let data): + if let group = data as? Groups { // print(group) // 그룹 추가 서버 통신 성공했을 떄 } From e7a8ebe829dbeb4c7a8312c054e5038188c21c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=9D=B4=EC=A4=80?= Date: Sat, 6 Nov 2021 15:14:17 +0900 Subject: [PATCH 5/9] =?UTF-8?q?[FEAT]=20=EA=B7=B8=EB=A3=B9=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=84=9C=EB=B2=84=ED=86=B5=EC=8B=A0=20?= =?UTF-8?q?=ED=94=84=EB=A6=B0=ED=8A=B8=EB=AC=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewControllers/Group/GroupViewController.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 5dffcb79..2655ee83 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -96,13 +96,13 @@ extension GroupViewController { // 그룹 추가 서버 통신 성공했을 떄 } case .requestErr(let message): - print("postGroupAddWithAPI - requestErr", message) + print("putGroupEditWithAPI - requestErr", message) case .pathErr: - print("postGroupAddWithAPI - pathErr") + print("putGroupEditWithAPI - pathErr") case .serverErr: - print("postGroupAddWithAPI - serverErr") + print("putGroupEditWithAPI - serverErr") case .networkFail: - print("postGroupAddWithAPI - networkFail") + print("putGroupEditWithAPI - networkFail") } } } From b0a6aacec84c42ec6e16b317f39c4821bc1c829a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=9D=B4=EC=A4=80?= Date: Fri, 12 Nov 2021 12:27:57 +0900 Subject: [PATCH 6/9] =?UTF-8?q?[FEAT]=20#56=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EC=86=8D=20=EB=AA=85=ED=95=A8=20=EC=B6=94=EA=B0=80=20=EC=84=9C?= =?UTF-8?q?=EB=B2=84=ED=86=B5=EC=8B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 4 ++++ .../Group/CardAddInGroupRequest.swift | 14 +++++++++++ .../NetworkModel/Group/GroupEditRequest.swift | 2 +- .../NetworkService/Group/GroupAPI.swift | 16 +++++++++++++ .../NetworkService/Group/GroupService.swift | 9 ++++++++ .../Group/GroupViewController.swift | 23 ++++++++++++++++++- 6 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 NADA-iOS-forRelease/Sources/NetworkModel/Group/CardAddInGroupRequest.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 5d868d2a..b3d87c33 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -35,6 +35,7 @@ 777FF89B27359B7800BF69D3 /* Groups.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89A27359B7800BF69D3 /* Groups.swift */; }; 777FF89D2735B16B00BF69D3 /* GroupAddRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */; }; 777FF89F27364B7B00BF69D3 /* GroupEditRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */; }; + 77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */; }; DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; }; F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; }; F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */; }; @@ -108,6 +109,7 @@ 777FF89A27359B7800BF69D3 /* Groups.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Groups.swift; sourceTree = ""; }; 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupAddRequest.swift; sourceTree = ""; }; 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditRequest.swift; sourceTree = ""; }; + 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardAddInGroupRequest.swift; sourceTree = ""; }; 7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = ""; }; F822E7A82709CEB60020452C /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = ""; }; F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardCreation.storyboard; sourceTree = ""; }; @@ -270,6 +272,7 @@ 777FF89A27359B7800BF69D3 /* Groups.swift */, 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */, 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */, + 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */, ); path = Group; sourceTree = ""; @@ -759,6 +762,7 @@ 399C55DD271192D000845A54 /* CustomTabIndicatorView.swift in Sources */, F8C83FC1272FA06E0009DF0D /* UserAPI.swift in Sources */, F8C83FC3272FA17B0009DF0D /* URL.swift in Sources */, + 77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */, F8C83FAE272F99940009DF0D /* MoyaLoggerPlugin.swift in Sources */, F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */, F822E7A92709CEB60020452C /* Notification.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardAddInGroupRequest.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardAddInGroupRequest.swift new file mode 100644 index 00000000..0de27e2e --- /dev/null +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardAddInGroupRequest.swift @@ -0,0 +1,14 @@ +// +// CardAddInGroupRequest.swift +// NADA-iOS-forRelease +// +// Created by Yi Joon Choi on 2021/11/12. +// + +import Foundation + +struct CardAddInGroupRequest: Codable { + var cardId: String? + var userId: String? + var groupId: Int? +} diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupEditRequest.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupEditRequest.swift index 8393d1ad..0d78d6bf 100644 --- a/NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupEditRequest.swift +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Group/GroupEditRequest.swift @@ -8,6 +8,6 @@ import Foundation struct GroupEditRequest: Codable { - var groupId: String? + var groupId: Int? var groupName: String? } diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift index b94ec72c..3c75d996 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift @@ -79,6 +79,22 @@ public class GroupAPI { } } + func postCardAddInGroup(cardRequest: CardAddInGroupRequest, completion: @escaping (NetworkResult) -> Void) { + groupProvider.request(.cardAddInGroup(cardRequest: cardRequest)) { (result) in + switch result { + case .success(let response): + let statusCode = response.statusCode + let data = response.data + + let networkResult = self.judgeStatus(by: statusCode, data) + completion(networkResult) + + case .failure(let err): + print(err) + } + } + } + private func judgeStatus(by statusCode: Int, _ data: Data) -> NetworkResult { let decoder = JSONDecoder() diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift index b55e655b..4dc5458f 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift @@ -13,6 +13,7 @@ enum GroupService { case groupDelete(groupID: Int) case groupAdd(groupRequest: GroupAddRequest) case groupEdit(groupRequest: GroupEditRequest) + case cardAddInGroup(cardRequest: CardAddInGroupRequest) } extension GroupService: TargetType { @@ -31,6 +32,8 @@ extension GroupService: TargetType { return "/group" case .groupEdit: return "/group" + case .cardAddInGroup: + return "/groups/card" } } @@ -44,6 +47,8 @@ extension GroupService: TargetType { return .post case .groupEdit: return .put + case .cardAddInGroup: + return .post } } @@ -61,6 +66,8 @@ extension GroupService: TargetType { return .requestJSONEncodable(groupRequest) case .groupEdit(let groupRequest): return .requestJSONEncodable(groupRequest) + case .cardAddInGroup(let cardRequest): + return .requestJSONEncodable(cardRequest) } } @@ -74,6 +81,8 @@ extension GroupService: TargetType { return ["Content-Type": "application/json"] case .groupEdit: return ["Content-Type": "application/json"] + case .cardAddInGroup: + return ["Content-Type": "application/json"] } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 2655ee83..e5aa9b91 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -19,7 +19,8 @@ class GroupViewController: UIViewController { // 그룹 추가 서버 테스트 // postGroupAddWithAPI(groupRequest: GroupAddRequest(userId: "nada", groupName: "나다나다")) // 그룹 수정 서버 테스트 -// putGroupEditWithAPI(groupRequest: GroupEditRequest(groupId: "5", groupName: "수정나다")) +// putGroupEditWithAPI(groupRequest: GroupEditRequest(groupId: 5, groupName: "수정나다")) +// postCardAddInGroupWithAPI(cardRequest: CardAddInGroupRequest(cardId: "cardA", userId: "nada", groupId: 1)) } } @@ -106,4 +107,24 @@ extension GroupViewController { } } } + + func postCardAddInGroupWithAPI(cardRequest: CardAddInGroupRequest) { + GroupAPI.shared.postCardAddInGroup(cardRequest: cardRequest) { response in + switch response { + case .success(let data): + if let group = data as? Groups { +// print(group) + // 그룹 추가 서버 통신 성공했을 떄 + } + case .requestErr(let message): + print("postCardAddInGroupWithAPI - requestErr", message) + case .pathErr: + print("postCardAddInGroupWithAPI - pathErr") + case .serverErr: + print("postCardAddInGroupWithAPI - serverErr") + case .networkFail: + print("postCardAddInGroupWithAPI - networkFail") + } + } + } } From 1f62610687e5d1efcee44c95a08bc2d7bb0495ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=9D=B4=EC=A4=80?= Date: Fri, 12 Nov 2021 13:29:41 +0900 Subject: [PATCH 7/9] =?UTF-8?q?[FEAT]=20#56=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EC=86=8D=20=EB=AA=85=ED=95=A8=20=EC=A1=B0=ED=9A=8C=20=EC=84=9C?= =?UTF-8?q?=EB=B2=84=ED=86=B5=EC=8B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 4 +++ .../NetworkModel/Group/CardListRequest.swift | 14 +++++++++++ .../NetworkService/Group/GroupAPI.swift | 16 ++++++++++++ .../NetworkService/Group/GroupService.swift | 11 ++++++++ .../Group/GroupViewController.swift | 25 ++++++++++++++++++- 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 NADA-iOS-forRelease/Sources/NetworkModel/Group/CardListRequest.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index b3d87c33..e372b474 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -36,6 +36,7 @@ 777FF89D2735B16B00BF69D3 /* GroupAddRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */; }; 777FF89F27364B7B00BF69D3 /* GroupEditRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */; }; 77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */; }; + 77AA68EC273E202D009C89B0 /* CardListRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77AA68EB273E202D009C89B0 /* CardListRequest.swift */; }; DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; }; F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; }; F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */; }; @@ -110,6 +111,7 @@ 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupAddRequest.swift; sourceTree = ""; }; 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditRequest.swift; sourceTree = ""; }; 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardAddInGroupRequest.swift; sourceTree = ""; }; + 77AA68EB273E202D009C89B0 /* CardListRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListRequest.swift; sourceTree = ""; }; 7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = ""; }; F822E7A82709CEB60020452C /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = ""; }; F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardCreation.storyboard; sourceTree = ""; }; @@ -273,6 +275,7 @@ 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */, 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */, 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */, + 77AA68EB273E202D009C89B0 /* CardListRequest.swift */, ); path = Group; sourceTree = ""; @@ -766,6 +769,7 @@ F8C83FAE272F99940009DF0D /* MoyaLoggerPlugin.swift in Sources */, F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */, F822E7A92709CEB60020452C /* Notification.swift in Sources */, + 77AA68EC273E202D009C89B0 /* CardListRequest.swift in Sources */, F8C83FC5272FA2940009DF0D /* CardAPI.swift in Sources */, F8FC438626C01CDD0033E151 /* AppDelegate.swift in Sources */, F8C83FB8272F9E3F0009DF0D /* UtilAPI.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardListRequest.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardListRequest.swift new file mode 100644 index 00000000..41e54539 --- /dev/null +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardListRequest.swift @@ -0,0 +1,14 @@ +// +// CardListRequest.swift +// NADA-iOS-forRelease +// +// Created by Yi Joon Choi on 2021/11/12. +// + +import Foundation + +struct CardListRequest: Codable { + var userId: String + var groupId: Int + var offset: Int +} diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift index 3c75d996..278097ec 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift @@ -95,6 +95,22 @@ public class GroupAPI { } } + func getCardListFetch(cardListRequest: CardListRequest, completion: @escaping (NetworkResult) -> Void) { + groupProvider.request(.cardListFetch(cardListRequest: cardListRequest)) { (result) in + switch result { + case .success(let response): + let statusCode = response.statusCode + let data = response.data + + let networkResult = self.judgeStatus(by: statusCode, data) + completion(networkResult) + + case .failure(let err): + print(err) + } + } + } + private func judgeStatus(by statusCode: Int, _ data: Data) -> NetworkResult { let decoder = JSONDecoder() diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift index 4dc5458f..4e3a5808 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift @@ -14,6 +14,7 @@ enum GroupService { case groupAdd(groupRequest: GroupAddRequest) case groupEdit(groupRequest: GroupEditRequest) case cardAddInGroup(cardRequest: CardAddInGroupRequest) + case cardListFetch(cardListRequest: CardListRequest) } extension GroupService: TargetType { @@ -34,6 +35,8 @@ extension GroupService: TargetType { return "/group" case .cardAddInGroup: return "/groups/card" + case .cardListFetch: + return "/groups/cards" } } @@ -49,6 +52,8 @@ extension GroupService: TargetType { return .put case .cardAddInGroup: return .post + case .cardListFetch: + return .get } } @@ -68,6 +73,10 @@ extension GroupService: TargetType { return .requestJSONEncodable(groupRequest) case .cardAddInGroup(let cardRequest): return .requestJSONEncodable(cardRequest) + case .cardListFetch(let cardListRequest): + return .requestParameters(parameters: ["userId": cardListRequest.userId, + "groupId" : cardListRequest.groupId, + "offset" : cardListRequest.offset], encoding: URLEncoding.queryString) } } @@ -83,6 +92,8 @@ extension GroupService: TargetType { return ["Content-Type": "application/json"] case .cardAddInGroup: return ["Content-Type": "application/json"] + case .cardListFetch: + return ["Content-Type": "application/json"] } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index e5aa9b91..362e71bd 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -13,14 +13,17 @@ class GroupViewController: UIViewController { super.viewDidLoad() // 그룹 리스트 조회 서버 테스트 - getGroupListFetchWithAPI(userID: "nada") +// getGroupListFetchWithAPI(userID: "nada") // 그룹 삭제 서버 테스트 // deleteGroupWithAPI(groupID: 1) // 그룹 추가 서버 테스트 // postGroupAddWithAPI(groupRequest: GroupAddRequest(userId: "nada", groupName: "나다나다")) // 그룹 수정 서버 테스트 // putGroupEditWithAPI(groupRequest: GroupEditRequest(groupId: 5, groupName: "수정나다")) + // 그룹 속 명함 추가 테스트 // postCardAddInGroupWithAPI(cardRequest: CardAddInGroupRequest(cardId: "cardA", userId: "nada", groupId: 1)) + // 그룹 속 명함 조회 테스트 +// getCardListWithAPI(cardListRequest: CardListRequest(userId: "nada2", groupId: 3, offset: 0)) } } @@ -113,6 +116,26 @@ extension GroupViewController { switch response { case .success(let data): if let group = data as? Groups { +// print(group) + // 그룹 추가 서버 통신 성공했을 떄 + } + case .requestErr(let message): + print("postCardAddInGroupWithAPI - requestErr", message) + case .pathErr: + print("postCardAddInGroupWithAPI - pathErr") + case .serverErr: + print("postCardAddInGroupWithAPI - serverErr") + case .networkFail: + print("postCardAddInGroupWithAPI - networkFail") + } + } + } + + func getCardListWithAPI(cardListRequest: CardListRequest) { + GroupAPI.shared.getCardListFetch(cardListRequest: cardListRequest) { response in + switch response { + case .success(let data): + if let group = data as? Groups { // print(group) // 그룹 추가 서버 통신 성공했을 떄 } From 1fa120b685e0e44c2a36195bf4372dfc87c3541f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=9D=B4=EC=A4=80?= Date: Fri, 12 Nov 2021 13:52:26 +0900 Subject: [PATCH 8/9] =?UTF-8?q?[FEAT]=20#56=20=20=EB=AA=85=ED=95=A8=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=84=9C=EB=B2=84=ED=86=B5=EC=8B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NetworkService/Group/GroupService.swift | 4 ++-- .../Group/GroupViewController.swift | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift index 4e3a5808..43c275d2 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift @@ -75,8 +75,8 @@ extension GroupService: TargetType { return .requestJSONEncodable(cardRequest) case .cardListFetch(let cardListRequest): return .requestParameters(parameters: ["userId": cardListRequest.userId, - "groupId" : cardListRequest.groupId, - "offset" : cardListRequest.offset], encoding: URLEncoding.queryString) + "groupId": cardListRequest.groupId, + "offset": cardListRequest.offset], encoding: URLEncoding.queryString) } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 362e71bd..7f8aa7e0 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -24,6 +24,9 @@ class GroupViewController: UIViewController { // postCardAddInGroupWithAPI(cardRequest: CardAddInGroupRequest(cardId: "cardA", userId: "nada", groupId: 1)) // 그룹 속 명함 조회 테스트 // getCardListWithAPI(cardListRequest: CardListRequest(userId: "nada2", groupId: 3, offset: 0)) + // 명함 검색 테스트 +// getCardDetailFetchWithAPI(cardID: "cardA") + } } @@ -150,4 +153,24 @@ extension GroupViewController { } } } + + func getCardDetailFetchWithAPI(cardID: String) { + CardAPI.shared.getCardDetailFetch(cardID: cardID) { response in + switch response { + case .success(let data): + if let card = data as? Card { +// print(card) + //통신 성공 + } + case .requestErr(let message): + print("getCardDetailFetchWithAPI - requestErr", message) + case .pathErr: + print("getCardDetailFetchWithAPI - pathErr") + case .serverErr: + print("getCardDetailFetchWithAPI - serverErr") + case .networkFail: + print("getCardDetailFetchWithAPI - networkFail") + } + } + } } From c8844b03e2dd0c2f94a2da79db2b05502c9b3beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=9D=B4=EC=A4=80?= Date: Tue, 16 Nov 2021 21:15:32 +0900 Subject: [PATCH 9/9] =?UTF-8?q?[#56]=20=EA=B7=B8=EB=A3=B9=20=EC=86=8D=20?= =?UTF-8?q?=EB=AA=85=ED=95=A8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20datamodel,=20judgestatus=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 +++ .../Group/CardsInGroupResponse.swift | 26 +++++++++++++++++++ .../NetworkService/Group/GroupAPI.swift | 22 +++++++++++++++- .../Group/GroupViewController.swift | 3 ++- 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 NADA-iOS-forRelease/Sources/NetworkModel/Group/CardsInGroupResponse.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 67afa748..368af6dd 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -32,6 +32,7 @@ 39D2E130270B43DA00AD0889 /* UIFont+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D2E12F270B43DA00AD0889 /* UIFont+Extension.swift */; }; 39F5A3D0271461EA00191F94 /* BackCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39F5A3CE271461EA00191F94 /* BackCardCell.swift */; }; 39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39F5A3CF271461EA00191F94 /* BackCardCell.xib */; }; + 7729171F2743D604001593E0 /* CardsInGroupResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */; }; 777FF89B27359B7800BF69D3 /* Groups.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89A27359B7800BF69D3 /* Groups.swift */; }; 777FF89D2735B16B00BF69D3 /* GroupAddRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */; }; 777FF89F27364B7B00BF69D3 /* GroupEditRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */; }; @@ -108,6 +109,7 @@ 39F5A3CE271461EA00191F94 /* BackCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackCardCell.swift; sourceTree = ""; }; 39F5A3CF271461EA00191F94 /* BackCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackCardCell.xib; sourceTree = ""; }; 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardsInGroupResponse.swift; sourceTree = ""; }; 777FF89A27359B7800BF69D3 /* Groups.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Groups.swift; sourceTree = ""; }; 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupAddRequest.swift; sourceTree = ""; }; 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditRequest.swift; sourceTree = ""; }; @@ -278,6 +280,7 @@ 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */, 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */, 77AA68EB273E202D009C89B0 /* CardListRequest.swift */, + 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */, ); path = Group; sourceTree = ""; @@ -782,6 +785,7 @@ F822E7A92709CEB60020452C /* Notification.swift in Sources */, 77AA68EC273E202D009C89B0 /* CardListRequest.swift in Sources */, F8C83FC5272FA2940009DF0D /* CardAPI.swift in Sources */, + 7729171F2743D604001593E0 /* CardsInGroupResponse.swift in Sources */, F8FC438626C01CDD0033E151 /* AppDelegate.swift in Sources */, F8C83FB8272F9E3F0009DF0D /* UtilAPI.swift in Sources */, F8FC438826C01CDD0033E151 /* SceneDelegate.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardsInGroupResponse.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardsInGroupResponse.swift new file mode 100644 index 00000000..b4c772d9 --- /dev/null +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardsInGroupResponse.swift @@ -0,0 +1,26 @@ +// +// CardsInGroupResponse.swift +// NADA-iOS-forRelease +// +// Created by Yi Joon Choi on 2021/11/16. +// + +import Foundation + +struct CardsInGroupResponse: Codable { + let offset: Int + let cards: [Cards] +} + +// MARK: - Cards +struct Cards: Codable { + let cardID, background, title, name: String + let birthDate, age, mbti, instagram: String + let linkName, link, cardDescription: String + + enum CodingKeys: String, CodingKey { + case cardID = "cardId" + case background, title, name, birthDate, age, mbti, instagram, linkName, link + case cardDescription = "description" + } +} diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift index d90b00bf..d2fbbbd0 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift @@ -134,7 +134,7 @@ public class GroupAPI { let statusCode = response.statusCode let data = response.data - let networkResult = self.judgeStatus(by: statusCode, data) + let networkResult = self.judgeGetCardListStatus(by: statusCode, data) completion(networkResult) case .failure(let err): @@ -163,6 +163,26 @@ public class GroupAPI { } } + private func judgeGetCardListStatus(by statusCode: Int, _ data: Data) -> NetworkResult { + + let decoder = JSONDecoder() + guard let decodedData = try? decoder.decode(GenericResponse.self, from: data) + else { + return .pathErr + } + + switch statusCode { + case 200: + return .success(decodedData.data) + case 400..<500: + return .requestErr(decodedData.msg) + case 500: + return .serverErr + default: + return .networkFail + } + } + private func judgePutChangeGroupStatus(by statusCode: Int, _ data: Data) -> NetworkResult { let decoder = JSONDecoder() diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 7f8aa7e0..810e616e 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -138,9 +138,10 @@ extension GroupViewController { GroupAPI.shared.getCardListFetch(cardListRequest: cardListRequest) { response in switch response { case .success(let data): - if let group = data as? Groups { + if let cards = data as? CardsInGroupResponse { // print(group) // 그룹 추가 서버 통신 성공했을 떄 + print(cards) } case .requestErr(let message): print("postCardAddInGroupWithAPI - requestErr", message)