[feat] #188 프로필 설정 API 구성

stealmh · stealmh · commit 29a59db14525 · 2025-02-25T01:05:08.000+09:00
diff --git a/Projects/CoreKit/Sources/Data/DTO/User/ProfileEditRequest.swift b/Projects/CoreKit/Sources/Data/DTO/User/ProfileEditRequest.swift
@@ -0,0 +1,36 @@
+//
+//  ProfileEditRequest.swift
+//  CoreKit
+//
+//  Created by 김민호 on 2/25/25.
+//
+
+import Foundation
+/// 프로필 수정 API Request
+public struct ProfileEditRequest: Encodable {
+    public let profileImageId: Int?
+    public let nickname: String
+    
+    public init(profileImageId: Int?, nickname: String) {
+        self.profileImageId = profileImageId
+        self.nickname = nickname
+    }
+}
+
+extension ProfileEditRequest {
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        
+        try container.encodeIfPresent(profileImageId, forKey: .profileImageId)
+        try container.encode(nickname, forKey: .nickname)
+        
+        if profileImageId == nil {
+            try container.encodeNil(forKey: .profileImageId)
+        }
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case profileImageId
+        case nickname
+    }
+}
diff --git a/Projects/CoreKit/Sources/Data/Network/User/UserClient+LiveKey.swift b/Projects/CoreKit/Sources/Data/Network/User/UserClient+LiveKey.swift
@@ -15,6 +15,9 @@ extension UserClient: DependencyKey {
         let provider = MoyaProvider<UserEndpoint>.build()
 
         return Self(
+            프로필_수정: { model in
+                try await provider.request(.프로필_수정(model: model))
+            },
             닉네임_수정: { model in
                 try await provider.request(.닉네임_수정(model: model))
             },
diff --git a/Projects/CoreKit/Sources/Data/Network/User/UserClient+TestKey.swift b/Projects/CoreKit/Sources/Data/Network/User/UserClient+TestKey.swift
@@ -12,6 +12,7 @@ import Dependencies
 extension UserClient: TestDependencyKey {
     public static let previewValue: Self = {
         Self(
+            프로필_수정: { _ in .mock },
             닉네임_수정: { _ in .mock },
             회원등록: { _ in .mock },
             닉네임_중복_체크: { _ in .mock },
diff --git a/Projects/CoreKit/Sources/Data/Network/User/UserClient.swift b/Projects/CoreKit/Sources/Data/Network/User/UserClient.swift
@@ -9,6 +9,7 @@ import DependenciesMacros
 
 @DependencyClient
 public struct UserClient {
+    public var 프로필_수정: @Sendable (_ model: ProfileEditRequest) async throws -> BaseUserResponse
     public var 닉네임_수정: @Sendable (_ model: NicknameEditRequest) async throws -> BaseUserResponse
     public var 회원등록: @Sendable (_ model: SignupRequest) async throws -> BaseUserResponse
     public var 닉네임_중복_체크: @Sendable (_ nickname: String) async throws -> NicknameCheckResponse
diff --git a/Projects/CoreKit/Sources/Data/Network/User/UserEndpoint.swift b/Projects/CoreKit/Sources/Data/Network/User/UserEndpoint.swift
@@ -11,6 +11,7 @@ import Util
 import Moya
 /// 컨텐츠 전용 Endpont
 public enum UserEndpoint {
+    case 프로필_수정(model: ProfileEditRequest)
     case 닉네임_수정(model: NicknameEditRequest)
     case 회원등록(model: SignupRequest)
     case 닉네임_중복_체크(nickname: String)
@@ -27,6 +28,8 @@ extension UserEndpoint: TargetType {
     
     public var path: String {
         switch self {
+        case .프로필_수정:
+            return ""
         case .닉네임_수정, .닉네임_조회:
             return "/nickname"
         case .회원등록:
@@ -44,7 +47,7 @@ extension UserEndpoint: TargetType {
     
     public var method: Moya.Method {
         switch self {
-        case .닉네임_수정:
+        case .프로필_수정, .닉네임_수정:
             return .put
             
         case .회원등록,
@@ -61,6 +64,8 @@ extension UserEndpoint: TargetType {
     
     public var task: Moya.Task {
         switch self {
+        case let .프로필_수정(model):
+            return .requestJSONEncodable(model)
         case let .닉네임_수정(model):
             return .requestJSONEncodable(model)
         case let .회원등록(model):
diff --git a/Projects/Domain/Sources/DTO/User/BaseUserResponse+Extension.swift b/Projects/Domain/Sources/DTO/User/BaseUserResponse+Extension.swift
@@ -15,10 +15,9 @@ public extension BaseUserResponse {
             id: self.id,
             email: self.email,
             nickname: self.nickname,
-            profile: BaseProfile(
-                id: self.profileImage?.id ?? 0,
-                url: self.profileImage?.url ?? ""
-            )
+            profile: self.profileImage == nil
+            ? nil
+            : BaseProfile(id: self.profileImage?.id ?? 0, url: self.profileImage?.url ?? "")
         )
     }
 }
diff --git a/Projects/Domain/Sources/NicknameSetting/NicknameSetting.swift b/Projects/Domain/Sources/NicknameSetting/NicknameSetting.swift
@@ -13,16 +13,23 @@ public struct NicknameSetting: Equatable {
     public var user: BaseUser? = nil
     /// 닉네임 중복 여부
     public var isDuplicate: Bool
+    /// 유저 선택 프로필
+    public var selectedProfile: BaseCategoryImage?
+    /// 프로필에 설정할 수 있는 이미지
+    public var imageList: [BaseCategoryImage]
     
     // - MARK: Request
     /// 등록할 닉네임
     public var nickname: String
     
     public init(
         isDuplicate: Bool = false,
-        nickname: String = ""
+        nickname: String = "",
+        selectedProfile: BaseCategoryImage?
     ) {
+        self.imageList = []
         self.isDuplicate = isDuplicate
         self.nickname = nickname
+        self.selectedProfile = selectedProfile
     }
 }
diff --git a/Projects/Feature/FeatureSetting/Sources/Setting/NickNameSetting/NickNameSettingFeature.swift b/Projects/Feature/FeatureSetting/Sources/Setting/NickNameSetting/NickNameSettingFeature.swift
@@ -5,21 +5,27 @@
 //  Created by 김민호 on 7/22/24.
 
 import ComposableArchitecture
-import Domain
+
 import CoreKit
+import Domain
 import DSKit
 import Util
 
 @Reducer
 public struct NickNameSettingFeature {
     /// - Dependency
-    @Dependency(\.dismiss) var dismiss
-    @Dependency(\.mainQueue) var mainQueue
-    @Dependency(UserClient.self) var userClient
+    @Dependency(\.dismiss)
+    var dismiss
+    @Dependency(\.mainQueue)
+    var mainQueue
+    @Dependency(UserClient.self)
+    var userClient
+    @Dependency(CategoryClient.self)
+    var categoryClient
     /// - State
     @ObservableState
     public struct State: Equatable {
-        fileprivate var domain = NicknameSetting()
+        fileprivate var domain: NicknameSetting
         var text: String {
             get { self.domain.nickname }
             set { self.domain.nickname = newValue }
@@ -28,10 +34,32 @@ public struct NickNameSettingFeature {
             get { domain.user }
         }
         
+        var selectedProfile: BaseCategoryImage? {
+            get { domain.selectedProfile }
+            set { domain.selectedProfile = newValue }
+        }
+        
+        var profileImages: [BaseCategoryImage] {
+            get { domain.imageList }
+        }
+        
         var textfieldState: PokitInputStyle.State = .default
         var buttonState: PokitButtonStyle.State = .disable
+        var isProfileSheetPresented: Bool = false
         
-        public init() {}
+        public init(user: BaseUser?) {
+            if let user,
+               let profile = user.profile {
+                self.domain = .init(
+                    selectedProfile: BaseCategoryImage(
+                        imageId: profile.id,
+                        imageURL: profile.url
+                    )
+                )
+            } else {
+                self.domain = .init(selectedProfile: nil)
+            }
+        }
     }
     
     /// - Action
@@ -46,23 +74,29 @@ public struct NickNameSettingFeature {
         public enum View: BindableAction, Equatable {
             case binding(BindingAction<State>)
             case dismiss
+            
             case 저장_버튼_눌렀을때
             case 뷰가_나타났을때
             case 닉네임지우기_버튼_눌렀을때
+            case 프로필_설정_버튼_눌렀을때
         }
         
         public enum InnerAction: Equatable {
             case 닉네임_텍스트_변경되었을때
             case 닉네임_중복_확인_API_반영(Bool)
             case 닉네임_조회_API_반영(BaseUser)
+            case 프로필_목록_조회_API_반영(images: [BaseCategoryImage])
         }
         
         public enum AsyncAction: Equatable {
             case 닉네임_중복_확인_API
             case 닉네임_조회_API
+            case 프로필_목록_조회_API
         }
         
-        public enum ScopeAction: Equatable { case 없음 }
+        public enum ScopeAction {
+            case profile(PokitProfileBottomSheet<BaseCategoryImage>.Delegate)
+        }
         
         public enum DelegateAction: Equatable { case 없음 }
     }
@@ -124,17 +158,30 @@ private extension NickNameSettingFeature {
             return .run { _ in await dismiss() }
             
         case .저장_버튼_눌렀을때:
-            return .run { [nickName = state.text] send in
-                let request = NicknameEditRequest(nickname: nickName)
-                let _ = try await userClient.닉네임_수정(request)
+            return .run { [nickName = state.text, selectedImage = state.selectedProfile] send in
+                if let selectedImage {
+                    let request = ProfileEditRequest(profileImageId: selectedImage.id, nickname: nickName)
+                    let _ = try await userClient.프로필_수정(model: request)
+                } else {
+                    let request = ProfileEditRequest(profileImageId: nil, nickname: nickName)
+                    let _ = try await userClient.프로필_수정(model: request)
+                }
                 await dismiss()
             }
             
         case .뷰가_나타났을때:
-            return .send(.async(.닉네임_조회_API))
+            return .merge(
+                .send(.async(.프로필_목록_조회_API)),
+                .send(.async(.닉네임_조회_API))
+            )
+            
         case .닉네임지우기_버튼_눌렀을때:
             state.domain.nickname = ""
             return .none
+            
+        case .프로필_설정_버튼_눌렀을때:
+            state.isProfileSheetPresented.toggle()
+            return .none
         }
     }
     
@@ -176,6 +223,15 @@ private extension NickNameSettingFeature {
         case let .닉네임_조회_API_반영(user):
             state.domain.user = user
             state.domain.nickname = user.nickname
+            if let profile = user.profile {
+                state.selectedProfile =  BaseCategoryImage(imageId: profile.id, imageURL: profile.url)
+            } else {
+                state.selectedProfile = nil
+            }
+            return .none
+            
+        case let .프로필_목록_조회_API_반영(images):
+            state.domain.imageList = images
             return .none
         }
     }
@@ -194,12 +250,24 @@ private extension NickNameSettingFeature {
                 let user = try await userClient.닉네임_조회().toDomain()
                 await send(.inner(.닉네임_조회_API_반영(user)), animation: .easeInOut)
             }
+            
+        case .프로필_목록_조회_API:
+            return .run { send in
+                let response = try await categoryClient.카테고리_프로필_목록_조회()
+                let images = response.map { $0.toDomain() }
+                await send(.inner(.프로필_목록_조회_API_반영(images: images)))
+            }
         }
     }
     
     /// - Scope Effect
     func handleScopeAction(_ action: Action.ScopeAction, state: inout State) -> Effect<Action> {
-        return .none
+        switch action {
+        case .profile(.이미지_선택했을때(let imageInfo)):
+            state.isProfileSheetPresented = false
+            state.selectedProfile = imageInfo
+            return .none
+        }
     }
     
     /// - Delegate Effect
diff --git a/Projects/Feature/FeatureSetting/Sources/Setting/NickNameSetting/NickNameSettingView.swift b/Projects/Feature/FeatureSetting/Sources/Setting/NickNameSetting/NickNameSettingView.swift
diff --git a/Projects/Feature/FeatureSetting/Sources/Setting/PokitSettingFeature.swift b/Projects/Feature/FeatureSetting/Sources/Setting/PokitSettingFeature.swift

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,9 @@ public extension BaseUserResponse {`
`15`	`15`	`id: self.id,`
`16`	`16`	`email: self.email,`
`17`	`17`	`nickname: self.nickname,`
`18`		`- profile: BaseProfile(`
`19`		`- id: self.profileImage?.id ?? 0,`
`20`		`- url: self.profileImage?.url ?? ""`
`21`		`- )`
	`18`	`+ profile: self.profileImage == nil`
	`19`	`+ ? nil`
	`20`	`+ : BaseProfile(id: self.profileImage?.id ?? 0, url: self.profileImage?.url ?? "")`
`22`	`21`	`)`
`23`	`22`	`}`
`24`	`23`	`}`