feat: 프로필 변경 화면 VIP 구현

iOS/Layover/Layover.xcodeproj/project.pbxproj

@@ -59,6 +59,7 @@
 		198167A32B20583D0032F563 /* SettingModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1981679E2B20583D0032F563 /* SettingModels.swift */; };
 		198167A42B20583D0032F563 /* SettingInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1981679F2B20583D0032F563 /* SettingInteractor.swift */; };
 		198167A62B20593B0032F563 /* SettingConfigurator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 198167A52B20593B0032F563 /* SettingConfigurator.swift */; };
+		198167A82B20DD670032F563 /* PresignedURLDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 198167A72B20DD670032F563 /* PresignedURLDTO.swift */; };
 		19A169232B176C5F00DB34C0 /* TagPlayListPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1691D2B176C5F00DB34C0 /* TagPlayListPresenter.swift */; };
 		19A169242B176C5F00DB34C0 /* TagPlayListWorker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1691E2B176C5F00DB34C0 /* TagPlayListWorker.swift */; };
 		19A169252B176C5F00DB34C0 /* TagPlayListRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1691F2B176C5F00DB34C0 /* TagPlayListRouter.swift */; };
@@ -271,6 +272,7 @@
 		1981679E2B20583D0032F563 /* SettingModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingModels.swift; sourceTree = "<group>"; };
 		1981679F2B20583D0032F563 /* SettingInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingInteractor.swift; sourceTree = "<group>"; };
 		198167A52B20593B0032F563 /* SettingConfigurator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingConfigurator.swift; sourceTree = "<group>"; };
+		198167A72B20DD670032F563 /* PresignedURLDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresignedURLDTO.swift; sourceTree = "<group>"; };
 		19A1691D2B176C5F00DB34C0 /* TagPlayListPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagPlayListPresenter.swift; sourceTree = "<group>"; };
 		19A1691E2B176C5F00DB34C0 /* TagPlayListWorker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagPlayListWorker.swift; sourceTree = "<group>"; };
 		19A1691F2B176C5F00DB34C0 /* TagPlayListRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagPlayListRouter.swift; sourceTree = "<group>"; };
@@ -625,6 +627,7 @@
 				FC4084C52B1F1C5B00CE4727 /* UploadPostDTO.swift */,
 				FC4084C92B1F291200CE4727 /* UploadVideoDTO.swift */,
 				1915D6E42B1FB82000CE1DD0 /* CheckSignUpDTO.swift */,
+				198167A72B20DD670032F563 /* PresignedURLDTO.swift */,
 			);
 			path = DTOs;
 			sourceTree = "<group>";
@@ -1354,6 +1357,7 @@
 				FC68E2A52B0233D3001AABFF /* Provider.swift in Sources */,
 				FC930E7E2B0CDB2900AA48E3 /* ThumbnailCollectionViewCell.swift in Sources */,
 				194552112B03AF2B00299768 /* MainTabBarConfigurator.swift in Sources */,
+				198167A82B20DD670032F563 /* PresignedURLDTO.swift in Sources */,
 				8321A2F72B1E14A1000A12AF /* LOPopUpView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

iOS/Layover/Layover/Network/DTOs/PresignedURLDTO.swift

@@ -0,0 +1,17 @@
+//
+//  PresignedURLDTO.swift
+//  Layover
+//
+//  Created by 김인환 on 12/7/23.
+//  Copyright © 2023 CodeBomber. All rights reserved.
+//
+
+import Foundation
+
+struct PresignedURLDTO: Decodable {
+    let preSignedURL: String
+
+    enum CodingKeys: String, CodingKey {
+        case preSignedURL = "preSignedUrl"
+    }
+}

iOS/Layover/Layover/Network/EndPoint/Factories/UserEndPointFactory.swift

@@ -15,6 +15,7 @@ protocol UserEndPointFactory {
     func makeUserWithDrawEndPoint() -> EndPoint<Response<NicknameDTO>>
     func makeUserInformationEndPoint(with id: Int?) -> EndPoint<Response<MemberDTO>>
     func makeUserPostsEndPoint(at page: Int, of id: Int?) -> EndPoint<Response<[PostDTO]>>
+    func makeFetchUserProfilePresignedURL(of fileType: String) -> EndPoint<Response<PresignedURLDTO>>
 }
 
 final class DefaultUserEndPointFactory: UserEndPointFactory {
@@ -75,7 +76,6 @@ final class DefaultUserEndPointFactory: UserEndPointFactory {
     }
 
     func makeUserPostsEndPoint(at page: Int, of id: Int? = nil) -> EndPoint<Response<[PostDTO]>> {
-
         var queryParameters = [String: String]()
         queryParameters.updateValue(String(page), forKey: "page")
 
@@ -89,4 +89,15 @@ final class DefaultUserEndPointFactory: UserEndPointFactory {
             queryParameters: queryParameters
         )
     }
+
+    func makeFetchUserProfilePresignedURL(of fileType: String) -> EndPoint<Response<PresignedURLDTO>> {
+        var bodyParameters = [String: String]()
+        bodyParameters.updateValue(fileType, forKey: "fileType")
+
+        return EndPoint(
+            path: "/member/profile-image/presigned-url",
+            method: .POST,
+            bodyParameters: bodyParameters
+        )
+    }
 }

iOS/Layover/Layover/Network/Provider/Provider.swift

@@ -13,6 +13,7 @@ protocol ProviderType {
     func request(url: URL) async throws -> Data
     func request(url: String) async throws -> Data
     func upload(data: Data, to url: String, method: HTTPMethod) async throws -> Data
+    func upload(from fileURL: URL, to url: String, method: HTTPMethod) async throws -> Data
     func upload(fromFile: URL,
                           to url: String,
                           method: HTTPMethod,
@@ -35,6 +36,10 @@ extension ProviderType {
                                 method: method)
     }
 
+    func upload(from fileURL: URL, to url: String, method: HTTPMethod = .PUT) async throws -> Data {
+        return try await upload(from: fileURL, to: url, method: method)
+    }
+
     func upload(fromFile: URL,
                           to url: String,
                           method: HTTPMethod = .PUT,
@@ -136,6 +141,16 @@ class Provider: ProviderType {
         return data
     }
 
+    func upload(from fileURL: URL, to url: String, method: HTTPMethod = .PUT) async throws -> Data {
+        guard let url = URL(string: url) else { throw NetworkError.components }
+        var request = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalCacheData)
+        request.httpMethod = method.rawValue
+
+        let (data, response) = try await session.upload(for: request, fromFile: fileURL)
+        try self.checkStatusCode(of: response)
+        return data
+    }
+
     // 동영상 업로드용
     func upload(fromFile: URL,
                 to url: String,

iOS/Layover/Layover/Scenes/EditProfile/EditProfileConfigurator.swift

@@ -20,7 +20,7 @@ final class EditProfileConfigurator: Configurator {
         let viewController = viewController
         let interactor = EditProfileInteractor()
         let presenter = EditProfilePresenter()
-        let worker = MockUserWorker()
+        let worker = UserWorker()
         let router = EditProfileRouter()
 
         router.viewController = viewController

iOS/Layover/Layover/Scenes/EditProfile/EditProfileInteractor.swift

@@ -10,10 +10,11 @@ import Foundation
 import OSLog
 
 protocol EditProfileBusinessLogic {
-    func fetchProfile()
-    func validateProfileInfo(with request: EditProfileModels.ValidateProfileInfo.Request)
+    func fetchProfile(with request: EditProfileModels.FetchProfile.Request)
+    func changeProfile(with request: EditProfileModels.ChangeProfile.Request)
     func checkDuplication(with request: EditProfileModels.CheckNicknameDuplication.Request)
-    func editProfile(with requeset: EditProfileModels.EditProfile.Request)
+    @discardableResult
+    func editProfile(with request: EditProfileModels.EditProfile.Request) -> Task<Bool, Never>
 }
 
 protocol EditProfileDataStore {
@@ -31,6 +32,10 @@ final class EditProfileInteractor: EditProfileBusinessLogic, EditProfileDataStor
     var userWorker: UserWorkerProtocol?
     var presenter: EditProfilePresentationLogic?
 
+    private var didCheckedNicknameDuplicate = true
+    private var nicknameState: NicknameState = .valid
+    private var introduceState: Models.ChangeProfile.IntroduceLengthState = .valid
+
     // MARK: - Data Store
 
     var nickname: String?
@@ -39,20 +44,52 @@ final class EditProfileInteractor: EditProfileBusinessLogic, EditProfileDataStor
 
     // MARK: - Use Case
 
-    func fetchProfile() {
-        presenter?.presentProfile(with: EditProfileModels.FetchProfile.Reponse(nickname: nickname,
-                                                                               introduce: introduce,
-                                                                               profileImageData: profileImageData))
+    func fetchProfile(with request: EditProfileModels.FetchProfile.Request) {
+        presenter?.presentProfile(with: EditProfileModels.FetchProfile.Response(nickname: nickname,
+                                                                                introduce: introduce,
+                                                                                profileImageData: profileImageData))
     }
 
-    func validateProfileInfo(with request: Models.ValidateProfileInfo.Request) {
-        let nicknameChanged = nickname != request.nickname
-        let introduceChanged = introduce != request.introduce
-        let profileInfoChanged = nicknameChanged || request.profileImageChanged || introduceChanged
-        let profileInfoValiation = (userWorker?.validateNickname(request.nickname) == .valid) && validateIntroduce(request.introduce ?? "")
-        let response = EditProfileModels.ValidateProfileInfo.Response(isValid: profileInfoChanged && profileInfoValiation,
-                                                                      nicknameChanged: nicknameChanged)
-        presenter?.presentProfileInfoValidation(with: response)
+    func changeProfile(with request: Models.ChangeProfile.Request) {
+        let response: Models.ChangeProfile.Response
+
+        switch request.changedProfileComponent {
+        case .nickname(let changedNickname):
+            didCheckedNicknameDuplicate = changedNickname == nickname
+            nicknameState = userWorker?.validateNickname(changedNickname ?? "") ?? .invalidCharacter
+
+            let canCheckNicknameDuplication = changedNickname == nickname ? false : nicknameState == .valid
+
+            response = Models.ChangeProfile.Response(nicknameAlertDescription: nicknameState != .valid ? nicknameState.description : nil,
+                                                     introduceAlertDescription: nil,
+                                                     canCheckNicknameDuplication: canCheckNicknameDuplication,
+                                                     canEditProfile: false)
+
+        case .introduce(let changedIntroduce):
+            introduceState = introduceLengthState(of: changedIntroduce ?? "", by: request.validIntroduceLength)
+            let canEditProfile = changedIntroduce != introduce
+            && introduceState == .valid
+            && nicknameState == .valid
+            && didCheckedNicknameDuplicate
+
+            let introduceAlertDescription = introduce == changedIntroduce || introduceState == .valid ? nil : introduceState.description
+
+            response = Models.ChangeProfile.Response(nicknameAlertDescription: nil,
+                                                     introduceAlertDescription: introduceAlertDescription,
+                                                     canCheckNicknameDuplication: nil,
+                                                     canEditProfile: canEditProfile)
+
+        case .profileImage(_):
+            let canEditProfile = didCheckedNicknameDuplicate
+            && nicknameState == .valid
+            && introduceState == .valid
+            response = Models.ChangeProfile.Response(nicknameAlertDescription: nil,
+                                                     introduceAlertDescription: nil,
+                                                     canCheckNicknameDuplication: nil,
+                                                     canEditProfile: canEditProfile)
+        }
+
+        presenter?.presentProfileState(with: response)
     }
 
     func checkDuplication(with request: Models.CheckNicknameDuplication.Request) {
@@ -61,18 +98,90 @@ final class EditProfileInteractor: EditProfileBusinessLogic, EditProfileDataStor
                 os_log(.error, log: .data, "checkDuplication Server Error")
                 return
             }
+            didCheckedNicknameDuplicate = response
+            let canEditProfile = didCheckedNicknameDuplicate && nicknameState == .valid && introduceState == .valid
             await MainActor.run {
-                presenter?.presentNicknameDuplication(with: Models.CheckNicknameDuplication.Response(isValid: response))
+                presenter?.presentNicknameDuplication(with: Models.CheckNicknameDuplication.Response(isValid: response, canEditProfile: canEditProfile))
             }
         }
     }
 
-    func editProfile(with requeset: Models.EditProfile.Request) {
+    private func profileImageEditRequest(into imageData: Data, fileExtension: String) async -> Bool {
+        guard let presignedUploadURL = await userWorker?.fetchImagePresignedURL(with: fileExtension),
+              await userWorker?.modifyProfileImage(data: imageData, to: presignedUploadURL) != nil else {
+            os_log(.error, log: .data, "Edit ProfileImage Error")
+            await MainActor.run {
+                presenter?.presentProfile(with: Models.EditProfile.Response(isSuccess: false))
+            }
+            profileImageData = imageData
+            return false
+        }
 
+        await MainActor.run {
+            presenter?.presentProfile(with: Models.EditProfile.Response(isSuccess: true))
+        }
+        return true
     }
 
-    private func validateIntroduce(_ introduce: String) -> Bool {
-        return introduce.count <= 50
+    @discardableResult
+    func editProfile(with request: Models.EditProfile.Request) -> Task<Bool, Never> {
+        Task {
+            async let isSuccessNicknameEdit = nicknameEditRequest(into: request.nickname)
+            async let isSuccessIntroduceEdit = introduceEditRequest(into: request.introduce)
+
+            guard await isSuccessNicknameEdit, await isSuccessIntroduceEdit else {
+                await MainActor.run {
+                    presenter?.presentProfile(with: Models.EditProfile.Response(isSuccess: false))
+                }
+                return false
+            }
+
+            // 이미지 변경 시도
+            if let profileImageData = request.profileImageData, let profileImageExtension = request.profileImageExtension {
+                guard await profileImageEditRequest(into: profileImageData, fileExtension: profileImageExtension) else {
+                    await MainActor.run {
+                        presenter?.presentProfile(with: Models.EditProfile.Response(isSuccess: false))
+                    }
+                    return false
+                }
+            } else { // 이미지 변경이 없는 경우 이미지 삭제 시도
+                guard await userWorker?.fetchImagePresignedURL(with: "jpeg") != nil else {
+                    await MainActor.run {
+                        presenter?.presentProfile(with: Models.EditProfile.Response(isSuccess: false))
+                    }
+                    return false
+                }
+                profileImageData = nil
+            }
+
+            await MainActor.run {
+                presenter?.presentProfile(with: Models.EditProfile.Response(isSuccess: true))
+            }
+            return true
+        }
     }
 
+    private func nicknameEditRequest(into nickname: String) async -> Bool {
+        if self.nickname != nickname {
+            guard let response = await userWorker?.modifyNickname(to: nickname) else {
+                os_log(.error, log: .data, "Edit Profile Error")
+                return false
+            }
+            self.nickname = nickname
+        }
+        return true
+    }
+
+    private func introduceEditRequest(into introduce: String?) async -> Bool {
+        guard let modifyIntroduceResponse = await userWorker?.modifyIntroduce(to: introduce ?? "") else {
+            os_log(.error, log: .data, "Edit Profile Error")
+            return false
+        }
+        self.introduce = introduce
+        return true
+    }
+
+    private func introduceLengthState(of introduce: String, by length: Int) -> Models.ChangeProfile.IntroduceLengthState {
+        introduce.count <= length ? .valid : .overLength
+    }
 }