Merge pull request #106 from YAPP-Github/TNT-302-TraineeMypage

[TNT-32] 트레이니 마이페이지 정보 수정 화면 구현 완료

Author: syss220211

.gitignore

@@ -77,4 +77,7 @@ Signing/
 master.key
 
 # PList
-GoogleService-Info.plist
+GoogleService-Info.plist
+
+# CLAUDE
+CLAUDE.md

TnT/Projects/Data/Sources/Network/Service/User/UserRepositoryImpl.swift

@@ -55,4 +55,15 @@ public struct UserRepositoryImpl: UserRepository {
     public func getMyPageInfo() async throws -> GetMyPageInfoResDTO {
         return try await networkService.request(UserTargetType.getMyPageInfo, decodingType: GetMyPageInfoResDTO.self)
     }
+
+    /// 회원 정보 수정 요청을 수행
+    public func putUpdateUserInfo(_ reqDTO: UpdateUserInfoRequestDTO, profileImage: Data?) async throws -> EmptyResponse {
+        return try await networkService.request(
+            UserTargetType.putUpdateUserInfo(
+                reqDTO: reqDTO,
+                imgData: profileImage
+            ),
+            decodingType: EmptyResponse.self
+        )
+    }
 }

TnT/Projects/Data/Sources/Network/Service/User/UserTargetType.swift

@@ -24,6 +24,8 @@ public enum UserTargetType {
     case postWithdrawal
     /// 마이페이지 정보 요청
     case getMyPageInfo
+    /// 회원 정보 수정 요청
+    case putUpdateUserInfo(reqDTO: UpdateUserInfoRequestDTO, imgData: Data?)
 }
 
 extension UserTargetType: TargetType {
@@ -35,20 +37,20 @@ extension UserTargetType: TargetType {
         switch self {
         case .getSessionCheck:
             return "/check-session"
-            
+
         case .postSocialLogin:
             return "/login"
-            
+
         case .postSignUp:
             return "/members/sign-up"
-            
+
         case .postLogout:
             return "/logout"
-            
+
         case .postWithdrawal:
             return "/members/withdraw"
-            
-        case .getMyPageInfo:
+
+        case .getMyPageInfo, .putUpdateUserInfo:
             return "/members"
         }
     }
@@ -57,28 +59,41 @@ extension UserTargetType: TargetType {
         switch self {
         case .getSessionCheck, .getMyPageInfo:
             return .get
-            
+
         case .postSocialLogin, .postSignUp, .postLogout, .postWithdrawal:
             return .post
+
+        case .putUpdateUserInfo:
+            return .put
         }
     }
 
     var task: RequestTask {
         switch self {
         case .getSessionCheck, .postLogout, .postWithdrawal, .getMyPageInfo:
             return .requestPlain
-        
+
         case .postSocialLogin(let reqDto):
             return .requestJSONEncodable(encodable: reqDto)
-            
+
         case let .postSignUp(reqDto, imgData):
             let jsons: [MultipartJSON] = [.init(jsonName: "request", json: reqDto)]
-            
+
+            // 프로필 이미지가 있을 경우 멀티파트 업로드 처리
+            let files: [MultipartFile] = imgData.map {
+                [.init(fieldName: "profileImage", fileName: "profile.png", mimeType: "image/png", data: $0)]
+            } ?? []
+
+            return .uploadMultipart(jsons: jsons, files: files, additionalFields: [:])
+
+        case let .putUpdateUserInfo(reqDto, imgData):
+            let jsons: [MultipartJSON] = [.init(jsonName: "request", json: reqDto)]
+
             // 프로필 이미지가 있을 경우 멀티파트 업로드 처리
             let files: [MultipartFile] = imgData.map {
                 [.init(fieldName: "profileImage", fileName: "profile.png", mimeType: "image/png", data: $0)]
             } ?? []
-            
+
             return .uploadMultipart(jsons: jsons, files: files, additionalFields: [:])
         }
     }
@@ -87,21 +102,18 @@ extension UserTargetType: TargetType {
         switch self {
         case .getSessionCheck, .postLogout, .postWithdrawal, .getMyPageInfo:
             return nil
-            
+
         case .postSocialLogin:
             return ["Content-Type": "application/json"]
-            
-        case .postSignUp:
-            return [
-                "Content-Type": "multipart/form-data",
-                "Authorization": "SESSION-ID 1111"
-            ]
+
+        case .postSignUp, .putUpdateUserInfo:
+            return ["Content-Type": "multipart/form-data"]
         }
     }
 
     var interceptors: [any Interceptor] {
         switch self {
-        case .getSessionCheck, .postLogout, .postWithdrawal, .getMyPageInfo:
+        case .getSessionCheck, .postLogout, .postWithdrawal, .getMyPageInfo, .putUpdateUserInfo:
             return [
                 LoggingInterceptor(),
                 AuthTokenInterceptor(),

TnT/Projects/Domain/Sources/DTO/User/UserRequestDTO.swift

@@ -95,3 +95,43 @@ public struct PostSignUpReqDTO: Encodable {
         self.goalContents = goalContents
     }
 }
+
+/// 회원 정보 수정 요청 DTO
+public struct UpdateUserInfoRequestDTO: Encodable, Equatable {
+    /// 이미지 삭제 여부
+    public let removeImage: Bool
+    /// 회원 타입 (TRAINER, TRAINEE)
+    public let memberType: String
+    /// 회원 이름
+    public let name: String
+    /// 생년월일 (yyyy-MM-dd)
+    public let birthday: String?
+    /// 키 (cm)
+    public let height: Double?
+    /// 몸무게 (kg)
+    public let weight: Double?
+    /// 주의사항
+    public let cautionNote: String?
+    /// PT 목적 (한글 문자열 배열)
+    public let ptGoals: [String]?
+
+    public init(
+        removeImage: Bool,
+        memberType: String,
+        name: String,
+        birthday: String?,
+        height: Double?,
+        weight: Double?,
+        cautionNote: String?,
+        ptGoals: [String]?
+    ) {
+        self.removeImage = removeImage
+        self.memberType = memberType
+        self.name = name
+        self.birthday = birthday
+        self.height = height
+        self.weight = weight
+        self.cautionNote = cautionNote
+        self.ptGoals = ptGoals
+    }
+}

TnT/Projects/Domain/Sources/Entity/MyPageEntity.swift

@@ -17,6 +17,56 @@ public struct TraineeMyPageEntity: Equatable, Sendable {
     public let profileImageUrl: String
     /// 소셜 타입
     public let socialType: String
+    
+    /// 생년월일
+    public let birthday: String?
+    /// 나이
+    public let age: Int?
+    /// 키 (cm)
+    public let height: Double?
+    /// 몸무게 (kg)
+    public let weight: Double?
+    /// 주의사항
+    public let cautionNote: String?
+    /// PT 목표
+    public let ptGoals: [String]
+    
+    public init(
+        isConnected: Bool,
+        name: String,
+        profileImageUrl: String,
+        socialType: String,
+        birthday: String?,
+        age: Int?,
+        height: Double?,
+        weight: Double?,
+        cautionNote: String?,
+        ptGoals: [String]
+    ) {
+        self.isConnected = isConnected
+        self.name = name
+        self.profileImageUrl = profileImageUrl
+        self.socialType = socialType
+        self.birthday = birthday
+        self.age = age
+        self.height = height
+        self.weight = weight
+        self.cautionNote = cautionNote
+        self.ptGoals = ptGoals
+    }
+    
+    public init() {
+        self.isConnected = false
+        self.name = ""
+        self.profileImageUrl = ""
+        self.socialType = ""
+        self.birthday = ""
+        self.age = 0
+        self.height = 0
+        self.weight = 0
+        self.cautionNote = ""
+        self.ptGoals = []
+    }
 }
 
 public struct TrainerMyPageEntity: Equatable, Sendable {

TnT/Projects/Domain/Sources/Entity/TrainingPurpose.swift

@@ -42,4 +42,24 @@ public extension TrainingPurpose {
             return "자세 교정"
         }
     }
+
+    /// 한글 이름으로부터 TrainingPurpose를 생성
+    init?(koreanName: String) {
+        switch koreanName {
+        case "체중 감량":
+            self = .loseWeight
+        case "근력 향상":
+            self = .gainMuscle
+        case "건강 관리":
+            self = .healthWellness
+        case "유연성 향상":
+            self = .flexibilityImprovement
+        case "바디프로필":
+            self = .bodyProfile
+        case "자세 교정":
+            self = .postureCorrection
+        default:
+            return nil
+        }
+    }
 }

TnT/Projects/Domain/Sources/Mapper/UserMapper.swift

@@ -14,7 +14,13 @@ public extension GetMyPageInfoResDTO {
             isConnected: self.trainee?.isConnected ?? false,
             name: self.name,
             profileImageUrl: self.profileImageUrl,
-            socialType: self.socialType
+            socialType: self.socialType,
+            birthday: self.trainee?.birthday,
+            age: self.trainee?.age,
+            height: self.trainee?.height,
+            weight: self.trainee?.weight,
+            cautionNote: self.trainee?.cautionNote,
+            ptGoals: self.trainee?.ptGoals ?? []
         )
     }
 

TnT/Projects/Domain/Sources/Policy/AppStorage.swift

@@ -6,8 +6,6 @@
 //  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
 //
 
-import Foundation
-
 public enum AppStorage {
     public static let hideHomePopupUntil: String = "hideHomePopupUntil"
     public static let isConnected: String = "isConnected"

TnT/Projects/Domain/Sources/Repository/UserRepository.swift

@@ -44,4 +44,12 @@ public protocol UserRepository {
     /// - Returns: 마이페이지 표시에 필요한 응답 DTO (`GetMyPageInfoResDTO`)
     /// - Throws: 네트워크 오류 또는 서버에서 반환한 오류를 발생시킬 수 있음
     func getMyPageInfo() async throws -> GetMyPageInfoResDTO
+
+    /// 회원 정보 수정 요청
+    /// - Parameters:
+    ///   - reqDTO: 회원 정보 수정 요청에 필요한 데이터
+    ///   - profileImage: 사용자가 업로드한 프로필 이미지 (옵션)
+    /// - Returns: 회원 정보 수정 성공 시 빈 응답
+    /// - Throws: 네트워크 오류 또는 서버에서 반환한 오류를 발생시킬 수 있음
+    func putUpdateUserInfo(_ reqDTO: UpdateUserInfoRequestDTO, profileImage: Data?) async throws -> EmptyResponse
 }

TnT/Projects/Domain/Sources/UseCase/UserUseCase.swift

@@ -91,4 +91,8 @@ extension DefaultUserUseCase: UserRepository {
     public func getMyPageInfo() async throws -> GetMyPageInfoResDTO {
         return try await userRepostiory.getMyPageInfo()
     }
+
+    public func putUpdateUserInfo(_ reqDTO: UpdateUserInfoRequestDTO, profileImage: Data?) async throws -> EmptyResponse {
+        return try await userRepostiory.putUpdateUserInfo(reqDTO, profileImage: profileImage)
+    }
 }