[Refactor] #192 - S3 저장소 낭비 방지를 위한 업로드 플로우 통합

Author: OneTen19

Neki-iOS/APP/Sources/MainTab/MainTabCoordinator.swift

@@ -24,11 +24,12 @@ struct MainTabCoordinator {
         var archive = ArchiveCoordinator.State()
         var map = MapCoordinator.State()
         var myPage: MyPageCoordinator.State
-        var imagePicker = ImagePickerFeature.State(mediaType: .photoBooth)
+        
+        var imagePicker = ImagePickerFeature.State(mediaType: .photoBooth, autoUpload: false)
+        
         var isPhotoPickerPresented: Bool = false
         var pendingPresentation: PendingPresentation?
         var isLoading: Bool = false
-
 
         @Presents var destination: Destination.State?
 
@@ -81,37 +82,19 @@ struct MainTabCoordinator {
     var body: some ReducerOf<Self> {
         BindingReducer()
 
-        Scope(state: \.archive, action: \.archive) {
-            ArchiveCoordinator()
-        }
-        
-        Scope(state: \.pose, action: \.pose) {
-            PoseCoordinator()
-        }
-        
-        Scope(state: \.map, action: \.map) {
-            MapCoordinator()
-        }
-        
-        Scope(state: \.myPage, action: \.myPage) {
-            MyPageCoordinator()
-        }
-        
-        Scope(state: \.imagePicker, action: \.imagePicker) {
-            ImagePickerFeature()
-        }
+        Scope(state: \.archive, action: \.archive) { ArchiveCoordinator() }
+        Scope(state: \.pose, action: \.pose) { PoseCoordinator() }
+        Scope(state: \.map, action: \.map) { MapCoordinator() }
+        Scope(state: \.myPage, action: \.myPage) { MyPageCoordinator() }
+        Scope(state: \.imagePicker, action: \.imagePicker) { ImagePickerFeature() }
 
         Reduce { (state: inout State, action: Action) -> Effect<Action> in
             switch action {
-            case .binding:
-                return .none
-                
+            case .binding: return .none
             case .onTapAddButton:
                 state.destination = .uploadSelection
                 return .none
 
-                
-                // MARK: - Gallary Logic
             case .onTapGallery:
                 guard state.destination != nil else { return .none }
                 state.pendingPresentation = .gallery
@@ -121,23 +104,18 @@ struct MainTabCoordinator {
             case .uploadSelectionSheetDismissed:
                 guard let pendingPresentation = state.pendingPresentation else { return .none }
                 state.pendingPresentation = nil
-                
                 switch pendingPresentation {
-                case .gallery:
-                    return .send(.setPhotosPickerPresented(true))
+                case .gallery: return .send(.setPhotosPickerPresented(true))
                 }
 
             case let .setPhotosPickerPresented(isPresented):
                 state.isPhotoPickerPresented = isPresented
                 return .none
 
-                // MARK: - QR Scan Logic
             case .onTapQRScan:
                 state.destination = nil
                 switch qrScannerClient.checkAuthorizationStatus() {
-                case .authorized:
-                    return .send(.qrScannerPresented)
-                    
+                case .authorized: return .send(.qrScannerPresented)
                 case .notDetermined:
                     return .run { send in
                         let isAuthorized = await qrScannerClient.requestAccess()
@@ -171,18 +149,14 @@ struct MainTabCoordinator {
                     await openURL(url)
                 }
 
-                
-                // MARK: - Child Features Logic
-            case .archive(.delegate(.requestQRScan)):
+            case .archive(.delegate(.requestQRScan)), .pose(.delegate(.requestQRScan)):
                 state.destination = nil
                 return .send(.onTapQRScan)
 
             case let .archive(.delegate(.showToast(item))):
                 state.toast = item
                 return .none
 
-            case .pose(.delegate(.requestQRScan)):
-                return .send(.onTapQRScan)
 
             case .myPage(.delegate(.didLogout)):
                 return .run { send in
@@ -199,22 +173,12 @@ struct MainTabCoordinator {
             case let .myPage(.delegate(.profileUpdated(user))):
                 return .send(.delegate(.profileUpdated(user)))
 
-            case .imagePicker(.uploadStarted):
-                state.isLoading = true
-                return .none
-                
-            case let .imagePicker(.uploadCompleted(imageIDs)):
+            case let .imagePicker(.delegate(.imagesConverted(entities))):
                 state.isPhotoPickerPresented = false
                 state.isLoading = false
                 state.selectedTab = .archive
-                guard imageIDs.isEmpty == false else { return .none }
-                return .send(.archive(.root(.processUploadImages(imageIDs: imageIDs))))
-                
-            case .imagePicker(.uploadFailed):
-                state.isPhotoPickerPresented = false
-                state.isLoading = false
-                state.toast = NekiToastItem("이미지 업로드에 실패했어요.", style: .error)
-                return .none
+                guard !entities.isEmpty else { return .none }
+                return .send(.archive(.root(.processUploadImages(entities: entities))))
 
             case let .destination(.presented(.qrScan(.addPhotoFromQRScanner(imageID)))):
                 state.destination = nil
@@ -234,48 +198,25 @@ struct MainTabCoordinator {
         }
         .ifLet(\.$destination, action: \.destination)
 
-        /// 피그마 확인 결과 탭바가 사라지는 모든 case는 depth가 1 이상일 경우더라구요
-        /// 즉, 메인 홈 화면에서 depth가 추가되어 넘어가는 뷰들은 전부 탭바가 사라집니다.
-        /// 그래서 각 Feature의 state에서 path에 하나라도 추가될 경우 탭바를 가리게 설계했습니다.
-        /// 한 가지 문제는, 나중에 depth가 추가되어도 탭바가 보여져야 하는 경우가 생긴다면 다시 머리 싸매야함
         Reduce { (state: inout State, action: Action) -> Effect<Action> in
             switch state.selectedTab {
-            case .archive:
-                state.isTabbarHidden = !state.archive.path.isEmpty
-                
-            case .pose:
-                state.isTabbarHidden = !state.pose.path.isEmpty
-                
-            case .add:
-                return .none
-                
-            case .map:
-                state.isTabbarHidden = !state.map.path.isEmpty
-                
-            case .myPage:
-                state.isTabbarHidden = !state.myPage.path.isEmpty
+            case .archive: state.isTabbarHidden = !state.archive.path.isEmpty
+            case .pose: state.isTabbarHidden = !state.pose.path.isEmpty
+            case .add: return .none
+            case .map: state.isTabbarHidden = !state.map.path.isEmpty
+            case .myPage: state.isTabbarHidden = !state.myPage.path.isEmpty
             }
-            
             return .none
         }
     }
 }
 
-
-// MARK: - Child Reducer
-
 extension MainTabCoordinator {
     @Reducer
     enum Destination {
         case uploadSelection
         case qrScan(QRCodeScanFeature)
     }
-}
-
-
-// MARK: - Nested Types
-
-extension MainTabCoordinator {
     enum PendingPresentation {
         case gallery
     }

Neki-iOS/Core/Sources/ImagePicker/Presentation/ImagePickerFeature.swift

@@ -19,32 +19,36 @@ public struct ImagePickerFeature {
         public var maxCount: Int
         public let mediaType: ImageMediaType
 
+        public var autoUpload: Bool
+        
         public var selectedImages: IdentifiedArrayOf<ImageUploadEntity> = []
         public var pickerItems: [PhotosPickerItem] = []
         public var isLoading: Bool = false
 
         public var remainingCount: Int { max(.zero, maxCount - selectedImages.count) }
 
-        public init(maxCount: Int = 10, mediaType: ImageMediaType) {
+        public init(maxCount: Int = 10, mediaType: ImageMediaType, autoUpload: Bool = true) {
             self.maxCount = maxCount
             self.mediaType = mediaType
+            self.autoUpload = autoUpload
         }
     }
 
     public enum Action: BindableAction {
         case binding(BindingAction<State>)
 
-        // User Action
         case pickerItemsChanged([PhotosPickerItem])
-        
-        // Internal Action (Data Load Complete)
         case imageConverted([ImageUploadEntity])
 
-        // Upload Action
         case requestUpload
         case uploadStarted
         case uploadCompleted([Int])
         case uploadFailed
+        
+        case delegate(Delegate)
+        public enum Delegate {
+            case imagesConverted([ImageUploadEntity])
+        }
     }
 
     @Dependency(\.imageUploadClient) var imageUploadClient
@@ -70,7 +74,15 @@ public struct ImagePickerFeature {
                 if remaining > 0 { state.selectedImages.append(contentsOf: newEntities.prefix(remaining)) }
 
                 state.pickerItems.removeAll()
-                return .send(.requestUpload)
+                
+                if state.autoUpload {
+                    return .send(.requestUpload)
+                } else {
+                    state.isLoading = false
+                    let validEntities = Array(state.selectedImages)
+                    state.selectedImages.removeAll()
+                    return .send(.delegate(.imagesConverted(validEntities)))
+                }
 
             case .requestUpload:
                 guard !state.selectedImages.isEmpty else {
@@ -102,17 +114,14 @@ public struct ImagePickerFeature {
 
             default:
                 return .none
-                
             }
         }
     }
-}
-
-
-// MARK: - ImagePickerFeature Private Func
-
-private extension ImagePickerFeature {
-    static func convert(items: [PhotosPickerItem]) async -> [ImageUploadEntity] {
+    
+    
+    // MARK: - Private Methods
+    
+    private static func convert(items: [PhotosPickerItem]) async -> [ImageUploadEntity] {
         await withTaskGroup(of: ImageUploadEntity?.self) { group in
             for item in items {
                 group.addTask {
@@ -129,7 +138,6 @@ private extension ImagePickerFeature {
                     )
                 }
             }
-            
             var results: [ImageUploadEntity] = []
             for await result in group {
                 guard let result else { continue }
@@ -139,10 +147,8 @@ private extension ImagePickerFeature {
         }
     }
 
-    static func detectFormat(from data: Data) -> ImageFileFormat {
-        // 데이터가 너무 짧으면 기본값(JPEG) 반환
+    private static func detectFormat(from data: Data) -> ImageFileFormat {
         guard data.count > 12 else { return .jpeg }
-        
         let header = data.prefix(12)
         let firstByte = header[0]
 
@@ -159,22 +165,20 @@ private extension ImagePickerFeature {
             header[8] == 0x57 && header[9] == 0x45 && header[10] == 0x42 && header[11] == 0x50 { // "WEBP"
             return .webp
         }
-        
-        // 나머지는 JPEG로
         return .jpeg
     }
 
-    static func extractDimensions(from data: Data) -> (width: Int, height: Int)? {
+    private static func extractDimensions(from data: Data) -> (width: Int, height: Int)? {
         let options: [CFString: Any] = [kCGImageSourceShouldCache: false]
-        
         guard let source = CGImageSourceCreateWithData(data as CFData, options as CFDictionary),
               let properties = CGImageSourceCopyPropertiesAtIndex(source, 0, options as CFDictionary) as? [CFString: Any] else {
             return nil
         }
-        
         var width = properties[kCGImagePropertyPixelWidth] as? Int
         var height = properties[kCGImagePropertyPixelHeight] as? Int
-        
+        if let orientation = properties[kCGImagePropertyOrientation] as? Int, (5...8).contains(orientation) {
+            swap(&width, &height)
+        }
         if let w = width, let h = height { return (w, h) }
         return nil
     }