Merge pull request #315 from boostcampwm2023/iOS/feat#299

feat: 프로필 뷰에서 업로드 중인 영상 로딩 처리, 각종 버그 수정

iOS/Layover/Layover/Models/Board.swift

@@ -16,4 +16,5 @@ struct Board {
     let videoURL: URL?
     let latitude: Double
     let longitude: Double
+    let status: BoardStatus
 }

iOS/Layover/Layover/Network/DTOs/BoardDTO.swift

@@ -14,12 +14,34 @@ struct BoardDTO: Decodable {
     let videoThumbnailURL: String
     let latitude, longitude: Double
     let title, content: String
+    let status: BoardStatus
 
     enum CodingKeys: String, CodingKey {
         case id
         case encodedVideoURL = "encoded_video_url"
         case videoThumbnailURL = "video_thumbnail_url"
         case latitude, longitude, title, content
+        case status
+    }
+}
+
+enum BoardStatus: String, Decodable {
+    case running
+    case waiting
+    case failure
+    case complete
+    case deleted
+    case inactive
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        let rawValue = try container.decode(String.self)
+
+        if let value = BoardStatus(rawValue: rawValue.lowercased()) {
+            self = value
+        } else {
+            self = .inactive
+        }
     }
 }
 
@@ -32,7 +54,8 @@ extension BoardDTO {
             thumbnailImageURL: URL(string: videoThumbnailURL),
             videoURL: URL(string: encodedVideoURL),
             latitude: latitude,
-            longitude: longitude
+            longitude: longitude,
+            status: status
         )
     }
 }

iOS/Layover/Layover/Network/Mock/MockData/PostList.json

@@ -16,7 +16,8 @@
                 "longitude" : 37.0532156213,
                 "latitude" : 127.060123123,
                 "title" : "최강 아이돌",
-                "content" : "게시글 설명"
+                "content" : "게시글 설명",
+                "status": "COMPLETE"
             },
             "tag" : ["나도몰라요", "너도몰라요"]
         },
@@ -34,7 +35,8 @@
                 "longitude" : 37.0532156213,
                 "latitude" : 127.060123123,
                 "title" : "프로듀스 101",
-                "content" : "게시글 설명"
+                "content" : "게시글 설명",
+                "status": "COMPLETE"
             },
             "tag" : ["해시태그", "해시태그2"]
         },
@@ -52,7 +54,8 @@
                 "longitude" : 37.0532156213,
                 "latitude" : 127.060123123,
                 "title" : "프로미스 나인",
-                "content" : "게시글 설명"
+                "content" : "게시글 설명",
+                "status": "COMPLETE"
             },
             "tag" : ["해시태그1", "해시태그2"]
         },
@@ -70,7 +73,8 @@
                 "longitude" : 37.0532156213,
                 "latitude" : 127.060123123,
                 "title" : "아이즈원",
-                "content" : "게시글 설명2"
+                "content" : "게시글 설명2",
+                "status": "COMPLETE"
             },
             "tag" : ["해시태그1", "해시태그6"]
         },
@@ -88,7 +92,8 @@
                 "longitude" : 37.0532156213,
                 "latitude" : 127.060123123,
                 "title" : "아이즈원",
-                "content" : "게시글 설명2"
+                "content" : "게시글 설명2",
+                "status": "COMPLETE"
             },
             "tag" : ["해시태그1", "해시태그6"]
         }

iOS/Layover/Layover/Network/Mock/MockData/PostListMore.json

@@ -16,7 +16,8 @@
                 "longitude" : 37.0532156213,
                 "latitude" : 127.060123123,
                 "title" : "최강 아이돌",
-                "content" : "게시글 설명"
+                "content" : "게시글 설명",
+                "status": "COMPLETE"
             },
             "tag" : ["나도몰라요", "너도몰라요"]
         },
@@ -34,7 +35,8 @@
                 "longitude" : 37.0532156213,
                 "latitude" : 127.060123123,
                 "title" : "프로듀스 101",
-                "content" : "게시글 설명"
+                "content" : "게시글 설명",
+                "status": "COMPLETE"
             },
             "tag" : ["해시태그", "해시태그2"]
         },
@@ -52,7 +54,8 @@
                 "longitude" : 37.0532156213,
                 "latitude" : 127.060123123,
                 "title" : "프로미스 나인",
-                "content" : "게시글 설명"
+                "content" : "게시글 설명",
+                "status": "COMPLETE"
             },
             "tag" : ["해시태그1", "해시태그2"]
         },
@@ -70,7 +73,8 @@
                 "longitude" : 37.0532156213,
                 "latitude" : 127.060123123,
                 "title" : "아이즈원",
-                "content" : "게시글 설명2"
+                "content" : "게시글 설명2",
+                "status": "COMPLETE"
             },
             "tag" : ["해시태그1", "해시태그6"]
         }

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

@@ -141,22 +141,24 @@ final class EditProfileInteractor: EditProfileBusinessLogic, EditProfileDataStor
                 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))
+            // 이미지 변경 요청
+            if request.changeProfileImageNeeded {
+                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
                     }
-                    return false
-                }
-            } else { // 이미지 변경이 없는 경우 이미지 삭제 시도
-                guard await userWorker?.setProfileImageDefault() == true else {
-                    await MainActor.run {
-                        presenter?.presentProfile(with: Models.EditProfile.Response(isSuccess: false))
+                } else { // 이미지 데이터 없는 경우 이미지 삭제 시도
+                    guard await userWorker?.setProfileImageDefault() == true else {
+                        await MainActor.run {
+                            presenter?.presentProfile(with: Models.EditProfile.Response(isSuccess: false))
+                        }
+                        return false
                     }
-                    return false
+                    profileImageData = nil
                 }
-                profileImageData = nil
             }
 
             await MainActor.run {
@@ -168,7 +170,7 @@ final class EditProfileInteractor: EditProfileBusinessLogic, EditProfileDataStor
 
     private func nicknameEditRequest(into nickname: String) async -> Bool {
         if self.nickname != nickname {
-            guard let response = await userWorker?.modifyNickname(to: nickname) else {
+            guard await userWorker?.modifyNickname(to: nickname) != nil else {
                 os_log(.error, log: .data, "Edit Profile Error")
                 return false
             }
@@ -178,7 +180,7 @@ final class EditProfileInteractor: EditProfileBusinessLogic, EditProfileDataStor
     }
 
     private func introduceEditRequest(into introduce: String?) async -> Bool {
-        guard let modifyIntroduceResponse = await userWorker?.modifyIntroduce(to: introduce ?? "") else {
+        guard await userWorker?.modifyIntroduce(to: introduce ?? "") != nil else {
             os_log(.error, log: .data, "Edit Profile Error")
             return false
         }

iOS/Layover/Layover/Scenes/EditProfile/EditProfileModels.swift

@@ -93,6 +93,7 @@ enum EditProfileModels {
         struct Request {
             let nickname: String
             let introduce: String?
+            let changeProfileImageNeeded: Bool
             let profileImageData: Data?
             let profileImageExtension: String?
         }

iOS/Layover/Layover/Scenes/EditProfile/EditProfileViewController.swift

@@ -95,6 +95,7 @@ final class EditProfileViewController: BaseViewController {
             guard let self else { return }
             self.changedProfileImageData = nil
             self.changedProfileImageExtension = nil
+            self.changeProfileImageNeeded = true
             self.profileImageView.image = UIImage.profile
             self.profileImageDataChanged()
         }
@@ -114,6 +115,7 @@ final class EditProfileViewController: BaseViewController {
     var interactor: EditProfileBusinessLogic?
 
     private var isValidNickname = true
+    private var changeProfileImageNeeded = false
     private var changedProfileImageData: Data?
     private var changedProfileImageExtension: String?
 
@@ -223,6 +225,7 @@ final class EditProfileViewController: BaseViewController {
 
         let request = Models.EditProfile.Request(nickname: nickname,
                                                  introduce: introduce,
+                                                 changeProfileImageNeeded: changeProfileImageNeeded,
                                                  profileImageData: changedProfileImageData,
                                                  profileImageExtension: changedProfileImageExtension)
         showLoading()
@@ -252,6 +255,7 @@ extension EditProfileViewController: PHPickerViewControllerDelegate {
                                     self.profileImageView.image = UIImage(contentsOfFile: temporaryCopyFileURL.path())
                                     self.changedProfileImageExtension = pathExtension
                                     self.changedProfileImageData = try? Data(contentsOf: temporaryCopyFileURL)
+                                    self.changeProfileImageNeeded = true
                                     self.profileImageDataChanged()
                                 }
                                 try FileManager.default.removeItem(at: temporaryCopyFileURL)

iOS/Layover/Layover/Scenes/Profile/ProfileConfigurator.swift

@@ -19,7 +19,6 @@ final class ProfileConfigurator: Configurator {
     func configure(_ viewController: ViewController) {
         let viewController = viewController
         let interactor = ProfileInteractor()
-//        let worker = MockUserWorker()
         let worker = UserWorker()
         let presenter = ProfilePresenter()
         let router = ProfileRouter()

iOS/Layover/Layover/Scenes/Profile/ProfileInteractor.swift

@@ -56,11 +56,12 @@ final class ProfileInteractor: ProfileBusinessLogic, ProfileDataStore {
     func fetchProfile(with request: ProfileModels.FetchProfile.Request) -> Task<Bool, Never> {
         fetchPostsPage = 1
         canFetchMorePosts = true
+        posts = []
+
         return Task {
             guard let userProfile = await userWorker?.fetchProfile(by: profileId) else {
                 return false
             }
-            posts = []
             nickname = userProfile.username
             introduce = userProfile.introduce
 
@@ -76,7 +77,7 @@ final class ProfileInteractor: ProfileBusinessLogic, ProfileDataStore {
             let response = Models.FetchProfile.Response(userProfile: ProfileModels.Profile(username: userProfile.username,
                                                                                            introduce: userProfile.introduce,
                                                                                            profileImageData: imageData),
-                                                        posts: posts)
+                                                        displayedPosts: posts)
             await MainActor.run {
                 presenter?.presentProfile(with: response)
             }
@@ -96,7 +97,7 @@ final class ProfileInteractor: ProfileBusinessLogic, ProfileDataStore {
                 return false
             }
 
-            let response = Models.FetchMorePosts.Response(posts: fetchedPosts)
+            let response = Models.FetchMorePosts.Response(displayedPosts: fetchedPosts)
 
             await MainActor.run {
                 presenter?.presentMorePosts(with: response)
@@ -106,22 +107,22 @@ final class ProfileInteractor: ProfileBusinessLogic, ProfileDataStore {
         }
     }
 
-    private func fetchPosts() async -> [Models.Post] {
+    private func fetchPosts() async -> [Models.DisplayedPost] {
         guard let fetchedPosts = await userWorker?.fetchPosts(at: fetchPostsPage, of: profileId),
               fetchedPosts.count > 0 else {
             return []
         }
         posts += fetchedPosts
 
-        var responsePosts = [Models.Post]()
+        var responsePosts = [Models.DisplayedPost]()
         for post in fetchedPosts {
             guard let thumbnailURL = post.board.thumbnailImageURL,
                   let profileImageData = await userWorker?.fetchImageData(with: thumbnailURL) else {
-                responsePosts.append(.init(id: post.board.identifier, thumbnailImageData: nil))
+                responsePosts.append(.init(id: post.board.identifier, thumbnailImageData: nil, status: post.board.status))
                 continue
             }
 
-            responsePosts.append(Models.Post(id: post.board.identifier, thumbnailImageData: profileImageData))
+            responsePosts.append(Models.DisplayedPost(id: post.board.identifier, thumbnailImageData: profileImageData, status: post.board.status))
         }
 
         return responsePosts

iOS/Layover/Layover/Scenes/Profile/ProfileModels.swift

@@ -16,9 +16,10 @@ enum ProfileModels {
         let profileImageData: Data?
     }
 
-    struct Post: Hashable {
+    struct DisplayedPost: Hashable {
         let id: Int
         let thumbnailImageData: Data?
+        let status: BoardStatus
     }
 
     enum FetchProfile {
@@ -28,12 +29,12 @@ enum ProfileModels {
 
         struct Response {
             let userProfile: Profile
-            let posts: [Post]
+            let displayedPosts: [DisplayedPost]
         }
 
         struct ViewModel {
             let userProfile: Profile
-            let posts: [Post]
+            let displayedPosts: [DisplayedPost]
         }
     }
 
@@ -42,11 +43,11 @@ enum ProfileModels {
         }
 
         struct Response {
-            let posts: [Post]
+            let displayedPosts: [DisplayedPost]
         }
 
         struct ViewModel {
-            let posts: [Post]
+            let displayedPosts: [DisplayedPost]
         }
     }
 

iOS/Layover/Layover/Scenes/Profile/ProfilePresenter.swift

@@ -25,12 +25,12 @@ final class ProfilePresenter: ProfilePresentationLogic {
 
     func presentProfile(with response: Models.FetchProfile.Response) {
         let viewModel = Models.FetchProfile.ViewModel(userProfile: response.userProfile,
-                                                      posts: response.posts)
+                                                      displayedPosts: response.displayedPosts)
         viewController?.displayProfile(viewModel: viewModel)
     }
 
     func presentMorePosts(with response: ProfileModels.FetchMorePosts.Response) {
-        let viewModel = Models.FetchMorePosts.ViewModel(posts: response.posts)
+        let viewModel = Models.FetchMorePosts.ViewModel(displayedPosts: response.displayedPosts)
         viewController?.displayMorePosts(viewModel: viewModel)
     }