diff --git a/Projects/App/Sources/Application/GPleApp.swift b/Projects/App/Sources/Application/GPleApp.swift index 29f1033..2cd5dae 100644 --- a/Projects/App/Sources/Application/GPleApp.swift +++ b/Projects/App/Sources/Application/GPleApp.swift @@ -4,8 +4,8 @@ import SwiftUI struct GPleApp: App { var body: some Scene { WindowGroup { - RankView(postViewModel: PostViewModel()) - //MyPageView(viewModel: MyPageViewModel(),postViewModel: PostViewModel()) + //RankView(postViewModel: PostViewModel()) + MyPageView(viewModel: MyPageViewModel(),postViewModel: PostViewModel()) } } } diff --git a/Projects/App/Sources/Feature/MyPageFeature/Sources/MyPageView.swift b/Projects/App/Sources/Feature/MyPageFeature/Sources/MyPageView.swift index 5ea16da..24a836a 100644 --- a/Projects/App/Sources/Feature/MyPageFeature/Sources/MyPageView.swift +++ b/Projects/App/Sources/Feature/MyPageFeature/Sources/MyPageView.swift @@ -31,7 +31,7 @@ struct MyPageView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 4) { - Text("\(viewModel.name)님,") + Text("\(postViewModel.myInfo?.name ?? "")님,") .foregroundStyle(.white) .font(GPleFontFamily.Pretendard.regular.swiftUIFont(size: 20)) @@ -242,6 +242,14 @@ struct MyPageView: View { print("반응 게시물 최신화 실패") } } + + postViewModel.myInfo { success in + if success { + print("내 정보 불러오기 성공") + } else { + print("내 정보 불러오기 실패") + } + } } .navigationBarBackButtonHidden(true) } diff --git a/Projects/App/Sources/Feature/PostCreateFeature/Sources/PostViewModel.swift b/Projects/App/Sources/Feature/PostCreateFeature/Sources/PostViewModel.swift index 34eb7cd..288c97a 100644 --- a/Projects/App/Sources/Feature/PostCreateFeature/Sources/PostViewModel.swift +++ b/Projects/App/Sources/Feature/PostCreateFeature/Sources/PostViewModel.swift @@ -208,7 +208,7 @@ public final class PostViewModel: ObservableObject { switch result { case let .success(response): do { - print("성공: 유저 리스트 불러오기") + print("성공: 내 정보 불러오기") self.myInfo = try JSONDecoder().decode(MyInfoResponse.self, from: response.data) diff --git a/Projects/Domain/Sources/API/User/UserAPI.swift b/Projects/Domain/Sources/API/User/UserAPI.swift index 26ce312..22b523c 100644 --- a/Projects/Domain/Sources/API/User/UserAPI.swift +++ b/Projects/Domain/Sources/API/User/UserAPI.swift @@ -13,7 +13,7 @@ extension UserAPI: TargetType { public var path: String { switch self { case .userInfoInput: - return "/User/profile" + return "/user/profile" } } diff --git a/Projects/Domain/Sources/Response/Post/MyInfoResponse.swift b/Projects/Domain/Sources/Response/Post/MyInfoResponse.swift index 9ae9626..c7a2c27 100644 --- a/Projects/Domain/Sources/Response/Post/MyInfoResponse.swift +++ b/Projects/Domain/Sources/Response/Post/MyInfoResponse.swift @@ -2,7 +2,7 @@ import Foundation public struct MyInfoResponse: Identifiable, Codable { public let id: Int - public let name: String public let grade: Int + public let name: String public let profileImage: String }