From fe7d6d2d63216f80e4f6c4d91ed089ee3330980f Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Wed, 17 Nov 2021 16:43:41 +0900 Subject: [PATCH] =?UTF-8?q?[FEAT]=20=EB=AA=85=ED=95=A8=EC=83=9D=EC=84=B1?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=ED=99=9C=EC=84=B1=ED=99=94,=EB=92=B7?= =?UTF-8?q?=EB=A9=B4=20=EC=9E=91=EC=84=B1=20=EA=B5=AC=ED=98=84(#58)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Descriptions - 명사 + 동사 + InGroup 네이밍 변경 --- .../NetworkService/Group/GroupAPI.swift | 12 ++++++------ .../NetworkService/Group/GroupService.swift | 18 +++++++++--------- .../CardCreationViewController.swift | 16 ++++++++-------- .../Group/GroupViewController.swift | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift index 234f143d..1edd3678 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift @@ -31,8 +31,8 @@ public class GroupAPI { } } - func cardInGroupDelete(groupID: Int, cardID: String, completion: @escaping (NetworkResult) -> Void) { - groupProvider.request(.cardInGroupDelete(groupID: groupID, cardID: cardID)) { (result) in + func cardDeleteInGroup(groupID: Int, cardID: String, completion: @escaping (NetworkResult) -> Void) { + groupProvider.request(.cardDeleteInGroup(groupID: groupID, cardID: cardID)) { (result) in switch result { case .success(let response): let statusCode = response.statusCode @@ -127,14 +127,14 @@ public class GroupAPI { } } - func cardListInGroupFetch(cardListInGroupRequest: CardListInGroupRequest, completion: @escaping (NetworkResult) -> Void) { - groupProvider.request(.cardListInGroupFetch(cardListInGroupRequest: cardListInGroupRequest)) { (result) in + func cardListFetchInGroup(cardListInGroupRequest: CardListInGroupRequest, completion: @escaping (NetworkResult) -> Void) { + groupProvider.request(.cardListFetchInGroup(cardListInGroupRequest: cardListInGroupRequest)) { (result) in switch result { case .success(let response): let statusCode = response.statusCode let data = response.data - let networkResult = self.judgeCardListInGroupFetchStatus(by: statusCode, data) + let networkResult = self.judgeCardListFetchInGroupStatus(by: statusCode, data) completion(networkResult) case .failure(let err): @@ -163,7 +163,7 @@ public class GroupAPI { } } - private func judgeCardListInGroupFetchStatus(by statusCode: Int, _ data: Data) -> NetworkResult { + private func judgeCardListFetchInGroupStatus(by statusCode: Int, _ data: Data) -> NetworkResult { let decoder = JSONDecoder() guard let decodedData = try? decoder.decode(GenericResponse.self, from: data) diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift index d925f7f8..0d32a0ec 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Group/GroupService.swift @@ -14,9 +14,9 @@ enum GroupService { case groupAdd(groupRequest: GroupAddRequest) case groupEdit(groupRequest: GroupEditRequest) case cardAddInGroup(cardRequest: CardAddInGroupRequest) - case cardListInGroupFetch(cardListInGroupRequest: CardListInGroupRequest) + case cardListFetchInGroup(cardListInGroupRequest: CardListInGroupRequest) case changeCardGroup(request: ChangeGroupRequest) - case cardInGroupDelete(groupID: Int, cardID: String) + case cardDeleteInGroup(groupID: Int, cardID: String) } extension GroupService: TargetType { @@ -36,20 +36,20 @@ extension GroupService: TargetType { return "/group" case .cardAddInGroup: return "/groups/card" - case .cardListInGroupFetch: + case .cardListFetchInGroup: return "/groups/cards" case .changeCardGroup: return "/groups/card" - case .cardInGroupDelete(let groupID, let cardID): + case .cardDeleteInGroup(let groupID, let cardID): return "/group/\(groupID)/\(cardID)" } } var method: Moya.Method { switch self { - case .groupListFetch, .cardListInGroupFetch: + case .groupListFetch, .cardListFetchInGroup: return .get - case .groupDelete, .cardInGroupDelete: + case .groupDelete, .cardDeleteInGroup: return .delete case .groupAdd, .cardAddInGroup: return .post @@ -67,7 +67,7 @@ extension GroupService: TargetType { case .groupListFetch(let userID): return .requestParameters(parameters: ["userId": userID], encoding: URLEncoding.queryString) - case .groupDelete, .cardInGroupDelete: + case .groupDelete, .cardDeleteInGroup: return .requestPlain case .groupAdd(let groupRequest): return .requestJSONEncodable(groupRequest) @@ -75,7 +75,7 @@ extension GroupService: TargetType { return .requestJSONEncodable(groupRequest) case .cardAddInGroup(let cardRequest): return .requestJSONEncodable(cardRequest) - case .cardListInGroupFetch(let cardListInGroupRequest): + case .cardListFetchInGroup(let cardListInGroupRequest): return .requestParameters(parameters: ["userId": cardListInGroupRequest.userId, "groupId": cardListInGroupRequest.groupId, "offset": cardListInGroupRequest.offset], encoding: URLEncoding.queryString) @@ -86,7 +86,7 @@ extension GroupService: TargetType { var headers: [String: String]? { switch self { - case .groupListFetch, .cardListInGroupFetch, .groupDelete, .cardInGroupDelete: + case .groupListFetch, .cardListFetchInGroup, .groupDelete, .cardDeleteInGroup: return .none case .groupAdd, .groupEdit, .cardAddInGroup, .changeCardGroup: return ["Content-Type": "application/json"] diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift index 992db354..abaf20a4 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift @@ -70,7 +70,7 @@ class CardCreationViewController: UIViewController { // changeGroupWithAPI(request: changeGroupRequest) // FIXME: group.서버통신 테스트 중. 추후 호출 위치 변경. -// cardInGroupDeleteWithAPI(groupID: 3, cardID: "cardA") +// cardDeleteInGroupWithAPI(groupID: 3, cardID: "cardA") } // MARK: - @IBAction Properties @@ -272,19 +272,19 @@ extension CardCreationViewController { } } // TODO: - group 서버통신. 위치변경. - func cardInGroupDeleteWithAPI(groupID: Int, cardID: String) { - GroupAPI.shared.cardInGroupDelete(groupID: groupID, cardID: cardID) { response in + func cardDeleteInGroupWithAPI(groupID: Int, cardID: String) { + GroupAPI.shared.cardDeleteInGroup(groupID: groupID, cardID: cardID) { response in switch response { case .success: - print("cardInGroupDeleteWithAPI - success") + print("cardDeleteInGroupWithAPI - success") case .requestErr(let message): - print("cardInGroupDeleteWithAPI - requestErr: \(message)") + print("cardDeleteInGroupWithAPI - requestErr: \(message)") case .pathErr: - print("cardInGroupDeleteWithAPI - pathErr") + print("cardDeleteInGroupWithAPI - pathErr") case .serverErr: - print("cardInGroupDeleteWithAPI - serverErr") + print("cardDeleteInGroupWithAPI - serverErr") case .networkFail: - print("cardInGroupDeleteWithAPI - networkFail") + print("cardDeleteInGroupWithAPI - networkFail") } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 33638357..420ab4fd 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -135,7 +135,7 @@ extension GroupViewController { } func cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest) { - GroupAPI.shared.cardListInGroupFetch(cardListInGroupRequest: cardListInGroupRequest) { response in + GroupAPI.shared.cardListFetchInGroup(cardListInGroupRequest: cardListInGroupRequest) { response in switch response { case .success(let data): if let cards = data as? CardsInGroupResponse {