[Merge] #192 - 3차 스프린트 이미지 관련 변경점 반영

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/Data/DTO/PresignedURLRequestDTO.swift

@@ -15,4 +15,5 @@ public struct PresignedURLRequestData: Encodable {
     public let filename: String
     public let contentType: String
     public let mediaType: String
+    public let width, height, size: Int?
 }

Neki-iOS/Core/Sources/ImagePicker/Data/DefaultImageUploadRepository.swift

@@ -24,7 +24,10 @@ public struct DefaultImageUploadRepository: ImageUploadRepository {
             PresignedURLRequestData(
                 filename: UUID().uuidString,
                 contentType: item.contentType,
-                mediaType: mediaType.rawValue
+                mediaType: mediaType.rawValue,
+                width: item.width,
+                height: item.height,
+                size: item.size
             )
         }
         let requestDTO = PresignedURLRequestDTO(items: requestItems)

Neki-iOS/Core/Sources/ImagePicker/Domain/ImageUploadClient.swift

@@ -5,14 +5,12 @@
 //  Created by OneTen on 1/21/26.
 //
 
+import Foundation
 import ComposableArchitecture
-import SwiftUI
-import PhotosUI
 
 public struct ImageUploadClient {
     public var upload: @Sendable (_ data: [ImageUploadEntity], _ mediaType: ImageMediaType) async throws -> [Int]
     public var uploadConcurrentlyFromURLs: @Sendable (_ fileURLs: [URL], _ mediaType: ImageMediaType) async throws -> [Int]
-    public var convert: @Sendable (_ items: [PhotosPickerItem]) async -> [ImageUploadEntity]
 }
 
 extension ImageUploadClient: DependencyKey {
@@ -33,31 +31,23 @@ extension ImageUploadClient: DependencyKey {
                     var entities: [ImageUploadEntity] = []
                     for url in chunk {
                         let data = try Data(contentsOf: url)
-                        entities.append(ImageUploadEntity(data: data, format: data.detectedImageFormat))
+                        let dimensions = data.imageDimensions
+                        
+                        entities.append(
+                            ImageUploadEntity(
+                                data: data,
+                                format: data.detectedImageFormat,
+                                width: dimensions?.width,
+                                height: dimensions?.height,
+                                size: data.count
+                            )
+                        )
                     }
 
                     let resultIDs = try await repository.upload(items: entities, mediaType: mediaType)
                     uploadedMediaIDs.append(contentsOf: resultIDs)
                 }
                 return uploadedMediaIDs
-            },
-            
-            convert: { items in
-                await withTaskGroup(of: ImageUploadEntity?.self) { group in
-                    for item in items {
-                        group.addTask {
-                            guard let data = try? await item.loadTransferable(type: Data.self) else { return nil }
-                            return ImageUploadEntity(data: data, format: data.detectedImageFormat)
-                        }
-                    }
-                    
-                    var results: [ImageUploadEntity] = []
-                    for await result in group {
-                        guard let result else { continue }
-                        results.append(result)
-                    }
-                    return results
-                }
             }
         )
     }()

Neki-iOS/Core/Sources/ImagePicker/Domain/ImageUploadEntity.swift

@@ -12,17 +12,27 @@ public struct ImageUploadEntity: Identifiable, Sendable {
     public let data: Data
     public let format: ImageFileFormat
 
+    public let width: Int?
+    public let height: Int?
+    public let size: Int?
+    
     public var contentType: String { format.contentType }
     public var fileExtension: String { format.fileExtension }
 
     public init(
         id: UUID = UUID(),
         data: Data,
-        format: ImageFileFormat
+        format: ImageFileFormat,
+        width: Int? = nil,
+        height: Int? = nil,
+        size: Int? = nil
     ) {
         self.id = id
         self.data = data
         self.format = format
+        self.width = width
+        self.height = height
+        self.size = size
     }
 }
 

Neki-iOS/Core/Sources/ImagePicker/Presentation/Extension/Data+.swift

@@ -42,4 +42,22 @@ extension Data {
         else { return nil }
         return UTType(typeIdentifier as String)
     }
+    
+    var imageDimensions: (width: Int, height: Int)? {
+        let options: [CFString: Any] = [kCGImageSourceShouldCache: false]
+        
+        guard let source = CGImageSourceCreateWithData(self 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 w = width, let h = height {
+            return (w, h)
+        }
+        
+        return nil
+    }
 }