Merge pull request #584 from TeamNado-Sunbae/chore/#580-EditProfile

✅ [CHORE] 프로필 수정 뷰 정상화
TeamNado-Sunbae · Oct 26, 2022 · a4a56c8 · a4a56c8
2 parents 446a19a + c3df23c
commit a4a56c8
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 128 deletions.
diff --git a/NadoSunbae-iOS/NadoSunbae-iOS/Network/APIManagers/MypageSettingAPI.swift b/NadoSunbae-iOS/NadoSunbae-iOS/Network/APIManagers/MypageSettingAPI.swift
@@ -15,7 +15,7 @@ class MypageSettingAPI {
     private init() {}
 
     /// [PUT] 프로필 수정
-    func editProfile(data: EditProfileRequestModel, completion: @escaping (NetworkResult<Any>) -> (Void)) {
+    func editProfile(data: MypageEditProfileRequestBodyModel, completion: @escaping (NetworkResult<Any>) -> (Void)) {
         provider.request(.editProfile(data: data)) { result in
             switch result {
 

diff --git a/...OS/NadoSunbae-iOS/Network/APIModels/Models/Mypage/MypageEditProfileRequestBodyModel.swift b/...OS/NadoSunbae-iOS/Network/APIModels/Models/Mypage/MypageEditProfileRequestBodyModel.swift
@@ -0,0 +1,30 @@
+//
+//  MypageEditProfileBodyModel.swift
+//  NadoSunbae
+//
+//  Created by madilyn on 2022/10/26.
+//
+
+import Foundation
+
+struct MypageEditProfileRequestBodyModel: Codable, Equatable {
+    var profileImageID: Int = 1
+    var nickname: String = ""
+    var bio: String = ""
+    var isOnQuestion: Bool = false
+    var firstMajorName: String? = ""
+    var firstMajorID: Int = 0
+    var firstMajorStart: String = ""
+    var secondMajorName: String? = ""
+    var secondMajorID: Int = 0
+    var secondMajorStart: String = ""
+
+    enum CodingKeys: String, CodingKey {
+        case profileImageID = "profileImageId"
+        case nickname, bio, isOnQuestion
+        case firstMajorID = "firstMajorId"
+        case firstMajorStart
+        case secondMajorID = "secondMajorId"
+        case secondMajorStart
+    }
+}
diff --git a/...adoSunbae-iOS/Network/APIModels/Models/Mypage/MypageSetting/EditProfileRequestModel.swift b/...adoSunbae-iOS/Network/APIModels/Models/Mypage/MypageSetting/EditProfileRequestModel.swift
diff --git a/NadoSunbae-iOS/NadoSunbae-iOS/Network/MoyaTarget/MypageSettingService.swift b/NadoSunbae-iOS/NadoSunbae-iOS/Network/MoyaTarget/MypageSettingService.swift
@@ -9,7 +9,7 @@ import Foundation
 import Moya
 
 enum MypageSettingService {
-    case editProfile(data: EditProfileRequestModel)
+    case editProfile(data: MypageEditProfileRequestBodyModel)
     case getLatestVersion
     case getBlockList
     case requestResetPW(email: String)
@@ -23,7 +23,7 @@ extension MypageSettingService: TargetType {
     var path: String {
         switch self {
         case .editProfile:
-            return "/user/mypage"
+            return "/user/"
         case .getLatestVersion:
             return "/app/version/recent"
         case .getBlockList:
@@ -48,12 +48,14 @@ extension MypageSettingService: TargetType {
         switch self {
         case .editProfile(let data):
             return .requestParameters(parameters: [
-                "nickname": data.nickName,
+                "profileImageId": data.profileImageID,
+                "nickname": data.nickname,
+                "bio": data.bio,
+                "isOnQuestion": data.isOnQuestion,
                 "firstMajorId": data.firstMajorID,
                 "firstMajorStart": data.firstMajorStart,
                 "secondMajorId": data.secondMajorID,
-                "secondMajorStart": data.secondMajorStart,
-                "isOnQuestion": data.isOnQuestion
+                "secondMajorStart": data.secondMajorStart
             ], encoding: JSONEncoding.default)
         case .getLatestVersion, .getBlockList:
             return .requestPlain