diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 4a391f7b..1de35607 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -1369,7 +1369,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = T3VFJ764ZC; INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -1391,7 +1391,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = T3VFJ764ZC; INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Card/CardCreationRequest.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Card/CardCreationRequest.swift index 43d12cde..0a8204ac 100644 --- a/NADA-iOS-forRelease/Sources/NetworkModel/Card/CardCreationRequest.swift +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Card/CardCreationRequest.swift @@ -26,5 +26,5 @@ struct FrontCardDataModel: Codable { struct BackCardDataModel: Codable { let isMincho, isSoju, isBoomuk, isSauced: Bool - let firstTMI, secondTMI, thirdTMI: String + let oneTMI, twoTMI, threeTMI: String } diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift index 131e0896..afc5d8a9 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift @@ -88,12 +88,12 @@ extension CardService: TargetType { multiPartData.append(MultipartFormData(provider: .data(isBoomukData), name: "card.isBoomuk")) let isSaucedData = Bool(request.backCard.isSauced).description.data(using: .utf8) ?? Data() multiPartData.append(MultipartFormData(provider: .data(isSaucedData), name: "card.isSauced")) - let firstTMI = request.backCard.firstTMI.data(using: .utf8) ?? Data() - multiPartData.append(MultipartFormData(provider: .data(firstTMI), name: "card.firstTMI")) - let secondTMI = request.backCard.secondTMI.data(using: .utf8) ?? Data() - multiPartData.append(MultipartFormData(provider: .data(secondTMI), name: "card.secondTMI")) - let thirdTMI = request.backCard.thirdTMI.data(using: .utf8) ?? Data() - multiPartData.append(MultipartFormData(provider: .data(thirdTMI), name: "card.thirdTMI")) + let oneTMI = request.backCard.oneTMI.data(using: .utf8) ?? Data() + multiPartData.append(MultipartFormData(provider: .data(oneTMI), name: "card.oneTmi")) + let twoTMI = request.backCard.twoTMI.data(using: .utf8) ?? Data() + multiPartData.append(MultipartFormData(provider: .data(twoTMI), name: "card.twoTmi")) + let threeTMI = request.backCard.threeTMI.data(using: .utf8) ?? Data() + multiPartData.append(MultipartFormData(provider: .data(threeTMI), name: "card.threeTmi")) let imageData = MultipartFormData(provider: .data(image.pngData() ?? Data()), name: "image", fileName: "image", mimeType: "image/png") multiPartData.append(imageData) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift index 75063c31..2e5fc0b3 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift @@ -149,9 +149,9 @@ extension CardCreationPreviewViewController { backCardDataModel.isSoju, backCardDataModel.isBoomuk, backCardDataModel.isSauced, - backCardDataModel.firstTMI, - backCardDataModel.secondTMI, - backCardDataModel.thirdTMI, + backCardDataModel.oneTMI, + backCardDataModel.twoTMI, + backCardDataModel.threeTMI, isShareable: isShareable) cardView.addSubview(backCard) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift index 840c6e9a..442c4064 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift @@ -350,9 +350,9 @@ extension CardCreationViewController: BackCardCreationDelegate { isSoju: requiredInfo["isSoju"] ?? false, isBoomuk: requiredInfo["isBoomuk"] ?? false, isSauced: requiredInfo["isSauced"] ?? false, - firstTMI: optionalInfo["firstTMI"] ?? "", - secondTMI: optionalInfo["secondTMI"] ?? "", - thirdTMI: optionalInfo["thirdTMI"] ?? "") + oneTMI: optionalInfo["firstTMI"] ?? "", + twoTMI: optionalInfo["secondTMI"] ?? "", + threeTMI: optionalInfo["thirdTMI"] ?? "") } }