Merge pull request #82 from Central-MakeUs/feature/MODY-288

[MODY-288] 마이페이지 프로필 편집 기능 개발 완료

Author: kdjun97

Projects/App/Sources/DI/Assemblies/MyPage/AppAssembly+MyPage.swift

@@ -7,6 +7,7 @@
 
 import Swinject
 import CoreAuthInterface
+import CoreCameraInterface
 import CoreModyImageInterface
 import CoreNetworkInterface
 import MyPageInterface
@@ -48,6 +49,7 @@ extension AppAssembly {
 
         container.register(MyPageBuildable.self) { resolver in
             let imageLoader: RemoteImageLoading = resolver.resolve()
+            let cameraCaptureBuilder: CameraCaptureBuildable = resolver.resolve()
 
             return MyPageBuilder(
                 makeMyPageFeature: { router, outputHandler in
@@ -65,7 +67,8 @@ extension AppAssembly {
                 makeHealthDataSettingsFeature: { router in
                     resolver.resolve(argument: router)
                 },
-                imageLoader: imageLoader
+                imageLoader: imageLoader,
+                cameraCaptureBuilder: cameraCaptureBuilder
             )
         }
     }

Projects/App/Sources/DI/Assemblies/MyPage/AppAssembly+MyPageProfile.swift

@@ -7,6 +7,7 @@
 
 import Swinject
 import CoreAuthInterface
+import CoreModyImageInterface
 import MyPageInterface
 import MyPage
 
@@ -19,10 +20,14 @@ extension AppAssembly {
             let (router, outputHandler) = arguments
             let authUseCase: AuthUseCaseProtocol = resolver.resolve()
             let myPageUseCase: MyPageUseCase = resolver.resolve()
+            let imageUploadUseCase: ImageUploadUseCaseProtocol = resolver.resolve()
+            let temporaryImageFileUseCase: TemporaryImageFileUseCaseProtocol = resolver.resolve()
 
             return ProfileFeature(
                 authUseCase: authUseCase,
                 myPageUseCase: myPageUseCase,
+                imageUploadUseCase: imageUploadUseCase,
+                temporaryImageFileUseCase: temporaryImageFileUseCase,
                 router: { [weak router] route in
                     router?.route(from: route)
                 },

Projects/Core/CoreCamera/Interface/Sources/Capture/CameraCaptureBuildable.swift

@@ -11,6 +11,7 @@ public protocol CameraCaptureBuildable {
     @MainActor
     func makeCameraViewController(
         source: CameraCaptureSource,
+        isCropEnabled: Bool,
         onComplete: @escaping (CameraCaptureResult) -> Void,
         onCancel: @escaping () -> Void
     ) -> UIViewController

Projects/Core/CoreCamera/Interface/Sources/Capture/CameraCaptureResult.swift

@@ -8,10 +8,10 @@
 import CoreModyImageInterface
 import UIKit
 
-/// 촬영 완료 후 호출자에게 전달되는 원본 파일과 화면용 크롭 정보입니다.
+/// 촬영 완료 후 호출자에게 전달되는 원본 파일과 화면용 미리보기 정보입니다.
 public struct CameraCaptureResult {
     public let originalFile: TemporaryImageFile
-    /// 화면 표시용으로 다운샘플된 이미지에서 만든 크롭 미리보기입니다.
+    /// crop이 활성화되면 crop 결과이며, 비활성화되면 전체 미리보기입니다.
     public let croppedPreviewImage: UIImage
     public let normalizedSelectionFrame: CGRect
 

Projects/Core/CoreCamera/Sources/Builder/CameraCaptureBuilder.swift

@@ -19,6 +19,7 @@ public struct CameraCaptureBuilder: CameraCaptureBuildable {
     @MainActor
     public func makeCameraViewController(
         source: CameraCaptureSource,
+        isCropEnabled: Bool,
         onComplete: @escaping (CameraCaptureResult) -> Void,
         onCancel: @escaping () -> Void
     ) -> UIViewController {
@@ -29,6 +30,7 @@ public struct CameraCaptureBuilder: CameraCaptureBuildable {
 
         return CameraContainerViewController(
             initialSource: source,
+            isCropEnabled: isCropEnabled,
             capturedPhotoProcessor: capturedPhotoProcessor,
             onComplete: onComplete,
             onCancel: onCancel

Projects/Core/CoreCamera/Sources/Presentation/Camera/CameraContainerViewController.swift

@@ -16,6 +16,7 @@ final class CameraContainerViewController: UIViewController {
     static let previewMaxPixelSize = 2048
 
     private let initialSource: CameraCaptureSource
+    let isCropEnabled: Bool
     let onComplete: (CameraCaptureResult) -> Void
     let onCancel: () -> Void
     let sessionController = CameraCaptureSessionController()
@@ -35,11 +36,13 @@ final class CameraContainerViewController: UIViewController {
 
     init(
         initialSource: CameraCaptureSource,
+        isCropEnabled: Bool = true,
         capturedPhotoProcessor: CameraCapturedPhotoProcessor,
         onComplete: @escaping (CameraCaptureResult) -> Void,
         onCancel: @escaping () -> Void
     ) {
         self.initialSource = initialSource
+        self.isCropEnabled = isCropEnabled
         self.capturedPhotoProcessor = capturedPhotoProcessor
         self.onComplete = onComplete
         self.onCancel = onCancel
@@ -102,14 +105,17 @@ private extension CameraContainerViewController {
     }
 
     func setupLayout() {
-        [
+        var subviews: [UIView] = [
             previewView,
             selectedImageView,
-            roiOverlayView,
             closeButton,
             bottomCameraShutterView,
             photoConfirmationContainerView
-        ].forEach {
+        ]
+        if isCropEnabled {
+            subviews.insert(roiOverlayView, at: 2)
+        }
+        subviews.forEach {
             view.addSubview($0)
         }
 
@@ -121,8 +127,10 @@ private extension CameraContainerViewController {
             $0.edges.equalToSuperview()
         }
 
-        roiOverlayView.snp.makeConstraints {
-            $0.edges.equalToSuperview()
+        if isCropEnabled {
+            roiOverlayView.snp.makeConstraints {
+                $0.edges.equalToSuperview()
+            }
         }
 
         closeButton.snp.makeConstraints {

Projects/Core/CoreCamera/Sources/Presentation/Camera/Extensions/CameraContainerViewController+.swift

@@ -55,7 +55,7 @@ extension CameraContainerViewController {
         selectedImageView.isHidden = false
         bottomCameraShutterView.isHidden = true
         photoConfirmationContainerView.isHidden = false
-        roiOverlayView.isHidden = false
+        roiOverlayView.isHidden = !isCropEnabled
         closeButton.tintColor = .systemWhite
         sessionController.stop()
     }
@@ -77,17 +77,28 @@ extension CameraContainerViewController {
         guard let result = autoreleasepool(invoking: { () -> CameraCaptureResult? in
             guard let capturedPhoto else { return nil }
 
-            let cropOutput = CameraImageCropper().crop(
-                image: capturedPhoto.previewImage,
-                selectionFrame: roiOverlayView.selectionFrame,
-                containerSize: roiOverlayView.bounds.size
-            )
-            guard let cropOutput else { return nil }
+            let previewImage: UIImage
+            let normalizedSelectionFrame: CGRect
+
+            if isCropEnabled {
+                guard let cropOutput = CameraImageCropper().crop(
+                    image: capturedPhoto.previewImage,
+                    selectionFrame: roiOverlayView.selectionFrame,
+                    containerSize: roiOverlayView.bounds.size
+                ) else {
+                    return nil
+                }
+                previewImage = cropOutput.croppedImage
+                normalizedSelectionFrame = cropOutput.normalizedSelectionFrame
+            } else {
+                previewImage = capturedPhoto.previewImage
+                normalizedSelectionFrame = CGRect(x: 0, y: 0, width: 1, height: 1)
+            }
 
             let result = CameraCaptureResult(
                 originalFile: capturedPhoto.originalFile,
-                croppedPreviewImage: cropOutput.croppedImage,
-                normalizedSelectionFrame: cropOutput.normalizedSelectionFrame
+                croppedPreviewImage: previewImage,
+                normalizedSelectionFrame: normalizedSelectionFrame
             )
             clearCapturedPhoto(removingFile: false)
             return result

Projects/Core/CoreCamera/Tests/Sources/CameraImageProcessingTests.swift

@@ -5,6 +5,8 @@
 //  Created by 김동준 on 7/25/26.
 //
 
+import CoreCameraInterface
+import CoreModyImageInterface
 import UIKit
 import XCTest
 @testable import CoreCamera
@@ -47,6 +49,43 @@ final class CameraImageProcessingTests: XCTestCase {
             CGRect(x: 0.25, y: 0.25, width: 0.5, height: 0.5)
         )
     }
+
+    @MainActor
+    func testCropDisabledReturnsExistingPreviewAndFullFrame() throws {
+        let previewImage = makeImage(size: CGSize(width: 300, height: 150))
+        var capturedResult: CameraCaptureResult?
+        let viewController = CameraContainerViewController(
+            initialSource: .photoLibrary,
+            isCropEnabled: false,
+            capturedPhotoProcessor: CameraCapturedPhotoProcessor(
+                temporaryImageFileUseCase: CameraTemporaryImageFileUseCaseStub(),
+                previewMaxPixelSize: CameraContainerViewController.previewMaxPixelSize
+            ),
+            onComplete: { capturedResult = $0 },
+            onCancel: {}
+        )
+
+        viewController.loadViewIfNeeded()
+        viewController.setCapturedPhoto(
+            CameraCapturedPhoto(
+                originalFile: TemporaryImageFile(
+                    fileURL: FileManager.default.temporaryDirectory
+                        .appendingPathComponent(UUID().uuidString),
+                    fileName: "profile.jpg",
+                    contentType: "image/jpeg"
+                ),
+                previewImage: previewImage
+            )
+        )
+        viewController.completeCapture()
+
+        XCTAssertNil(viewController.roiOverlayView.superview)
+        XCTAssertTrue(capturedResult?.croppedPreviewImage === previewImage)
+        XCTAssertEqual(
+            capturedResult?.normalizedSelectionFrame,
+            CGRect(x: 0, y: 0, width: 1, height: 1)
+        )
+    }
 }
 
 private extension CameraImageProcessingTests {
@@ -59,3 +98,23 @@ private extension CameraImageProcessingTests {
         }
     }
 }
+
+private struct CameraTemporaryImageFileUseCaseStub: TemporaryImageFileUseCaseProtocol {
+    func saveImage(
+        data: Data,
+        fileName: String
+    ) throws -> TemporaryImageFile {
+        throw CocoaError(.featureUnsupported)
+    }
+
+    func copyImage(
+        at sourceURL: URL,
+        fileName: String
+    ) throws -> TemporaryImageFile {
+        throw CocoaError(.featureUnsupported)
+    }
+
+    func removeImage(at fileURL: URL) throws {}
+
+    func removeExpiredImages(olderThan expirationInterval: TimeInterval) throws {}
+}

Projects/Core/CoreModyImage/Sources/Upload/Data/Processing/ImageUploadFileProcessor.swift

@@ -0,0 +1,48 @@
+//
+//  ImageUploadFileProcessor.swift
+//  CoreModyImage
+//
+//  Created by 김동준 on 7/26/26.
+//
+
+import CommonDomain
+import Foundation
+import Nuke
+
+struct ImageUploadFileProcessor {
+    func makeDownsampledJPEG(
+        from sourceURL: URL,
+        maximumPixelSize: Int
+    ) throws -> URL {
+        guard maximumPixelSize > 0 else {
+            throw NetworkError.invalidResponse
+        }
+
+        let thumbnailOptions = ImageRequest.ThumbnailOptions(
+            maxPixelSize: Float(maximumPixelSize)
+        )
+        let jpegEncoder = ImageEncoders.ImageIO(
+            type: .jpeg,
+            compressionRatio: 0.9
+        )
+
+        guard let sourceData = try? Data(contentsOf: sourceURL, options: .mappedIfSafe),
+              let thumbnail = thumbnailOptions.makeThumbnail(with: sourceData),
+              let jpegData = jpegEncoder.encode(thumbnail) else {
+            throw NetworkError.invalidResponse
+        }
+
+        let destinationURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent(UUID().uuidString)
+            .appendingPathExtension("jpg")
+
+        do {
+            try jpegData.write(to: destinationURL, options: .atomic)
+        } catch {
+            try? FileManager.default.removeItem(at: destinationURL)
+            throw NetworkError.invalidResponse
+        }
+
+        return destinationURL
+    }
+}

Projects/Core/CoreModyImage/Sources/Upload/Data/Repository/ImageUploadRepository.swift

@@ -46,12 +46,28 @@ public struct ImageUploadRepository: ImageUploadRepositoryProtocol {
 
     public func putImage(
         fileURL: URL,
-        to url: URL
+        to url: URL,
+        maximumPixelSize: Int?
     ) async throws {
-        let contentType = try contentType(for: fileURL)
+        let uploadFileURL: URL
+        if let maximumPixelSize {
+            uploadFileURL = try ImageUploadFileProcessor().makeDownsampledJPEG(
+                from: fileURL,
+                maximumPixelSize: maximumPixelSize
+            )
+        } else {
+            uploadFileURL = fileURL
+        }
+        defer {
+            if uploadFileURL != fileURL {
+                try? FileManager.default.removeItem(at: uploadFileURL)
+            }
+        }
+
+        let contentType = try contentType(for: uploadFileURL)
         let response = await uploadSession
             .upload(
-                fileURL,
+                uploadFileURL,
                 to: url,
                 method: .put,
                 headers: [.contentType(contentType)]