[Chore] #206 - 변경된 dto 반영

Author: OneTen19

Neki-iOS/Features/Archive/Sources/Data/Sources/ArchiveEndpoint.swift

@@ -20,8 +20,8 @@ public enum ArchiveEndpoint {
     case excludePhotosInAlbum(albumID: Int, request: DeletePhotoRequestDTO)
     case editFolderName(albumID: Int, request: FolderDTO.Request)
     case updateMemo(photoID: Int, request: UpdateMemoRequestDTO)
-    case duplicatePhoto(request: UpdateMappingPhotoRequestDTO)
-    case movePhoto(request: UpdateMappingPhotoRequestDTO)
+    case duplicatePhoto(request: UpdateMappingPhotoDTO.DuplicatePhotos)
+    case movePhoto(request: UpdateMappingPhotoDTO.MovePhotos)
 }
 
 extension ArchiveEndpoint: Endpoint {

Neki-iOS/Features/Archive/Sources/Data/Sources/DTO/Request/UpdateMappingPhotoRequestDTO.swift

@@ -0,0 +1,30 @@
+//
+//  UpdateMappingPhotoDTO.swift
+//  Neki-iOS
+//
+//  Created by OneTen on 4/12/26.
+//
+
+import Foundation
+
+public enum UpdateMappingPhotoDTO {
+    public struct MovePhotos: Encodable {
+        let sourceFolderID: Int
+        let photoIDS, targetFolderIDS: [Int]
+        
+        enum CodingKeys: String, CodingKey {
+            case sourceFolderID = "sourceFolderId"
+            case photoIDS = "photoIds"
+            case targetFolderIDS = "targetFolderIds"
+        }
+    }
+    
+    public struct DuplicatePhotos: Encodable {
+        let photoIDS, targetFolderIDS: [Int]
+
+        enum CodingKeys: String, CodingKey {
+            case photoIDS = "photoIds"
+            case targetFolderIDS = "targetFolderIds"
+        }
+    }
+}

Neki-iOS/Features/Archive/Sources/Data/Sources/DTO/UpdateMappingPhotoDTO.swift

@@ -307,9 +307,8 @@ extension DefaultArchiveRepository {
 
     }
 
-    func duplicatePhoto(sourceFolderId: Int?, photoIDs: [Int], targetFolderIDs: [Int]) async throws {
-        let request = UpdateMappingPhotoRequestDTO(
-            sourceFolderID: sourceFolderId,
+    func duplicatePhoto(photoIDs: [Int], targetFolderIDs: [Int]) async throws {
+        let request = UpdateMappingPhotoDTO.DuplicatePhotos(
             photoIDS: photoIDs,
             targetFolderIDS: targetFolderIDs
         )
@@ -325,8 +324,8 @@ extension DefaultArchiveRepository {
         }
     }
 
-    func movePhoto(sourceFolderId: Int?, photoIDs: [Int], targetFolderIDs: [Int]) async throws {
-        let request = UpdateMappingPhotoRequestDTO(
+    func movePhoto(sourceFolderId: Int, photoIDs: [Int], targetFolderIDs: [Int]) async throws {
+        let request = UpdateMappingPhotoDTO.MovePhotos(
             sourceFolderID: sourceFolderId,
             photoIDS: photoIDs,
             targetFolderIDS: targetFolderIDs
@@ -337,23 +336,11 @@ extension DefaultArchiveRepository {
         // 앨범 정보 캐시 갱신
         self.isAlbumCacheDirty = true
 
-        // Source 폴더(혹은 전체 사진) 캐시 갱신
-        if let sourceID = sourceFolderId {
-            if var list = photoCache[sourceID] {
-                list.removeAll { photoIDs.contains($0.photoID) }
-                photoCache[sourceID] = list
-            }
-        } else {
-            self.isPhotoCacheDirty[nil] = true
-        }
+        self.isPhotoCacheDirty[sourceFolderId] = true
 
         // Target 폴더(혹은 전체 사진) 캐시 갱신
-        if targetFolderIDs.isEmpty {
-            self.isPhotoCacheDirty[nil] = true
-        } else {
-            for targetID in targetFolderIDs {
-                self.isPhotoCacheDirty[targetID] = true
-            }
+        for targetID in targetFolderIDs {
+            self.isPhotoCacheDirty[targetID] = true
         }
     }
 

Neki-iOS/Features/Archive/Sources/Data/Sources/DefaultArchiveRepository.swift

@@ -24,8 +24,8 @@ struct ArchiveClient {
     public var editAlbumName: (_ albumID: Int, _ name: String) async throws -> Void
     public var updatePhotoMemo: (_ photoID: Int, _ memo: String) async throws -> Void
     public var clearCache: () async -> Void
-    public var duplicatePhoto: (_ sourceFolderId: Int?, _ photoIDs: [Int], _ targetFolderIDs: [Int]) async throws -> Void
-    public var movePhoto: (_ sourceFolderId: Int?, _ photoIDs: [Int], _ targetFolderIDs: [Int]) async throws -> Void
+    public var duplicatePhoto: (_ photoIDs: [Int], _ targetFolderIDs: [Int]) async throws -> Void
+    public var movePhoto: (_ sourceFolderId: Int, _ photoIDs: [Int], _ targetFolderIDs: [Int]) async throws -> Void
 }
 
 extension ArchiveClient: DependencyKey {
@@ -72,8 +72,8 @@ extension ArchiveClient: DependencyKey {
             clearCache: {
                 await archiveRepository.clearCache()
             },
-            duplicatePhoto: { sourceFolderId, photoIDs, targetFolderIDs in
-                try await archiveRepository.duplicatePhoto(sourceFolderId: sourceFolderId, photoIDs: photoIDs, targetFolderIDs: targetFolderIDs)
+            duplicatePhoto: { photoIDs, targetFolderIDs in
+                try await archiveRepository.duplicatePhoto(photoIDs: photoIDs, targetFolderIDs: targetFolderIDs)
             },
             movePhoto: { sourceFolderId, photoIDs, targetFolderIDs in
                 try await archiveRepository.movePhoto(sourceFolderId: sourceFolderId, photoIDs: photoIDs, targetFolderIDs: targetFolderIDs)

Neki-iOS/Features/Archive/Sources/Domain/Sources/Client/ArchiveClient.swift

@@ -23,8 +23,8 @@ protocol ArchiveRepository: Sendable {
     func excludePhotosInAlbum(albumID: Int, photoIDs: [Int]) async throws
     func editAlbumName(albumID: Int, name: String) async throws
     func updatePhotoMemo(photoID: Int, memo: String) async throws
-    func duplicatePhoto(sourceFolderId: Int?, photoIDs: [Int], targetFolderIDs: [Int]) async throws
-    func movePhoto(sourceFolderId: Int?, photoIDs: [Int], targetFolderIDs: [Int]) async throws
+    func duplicatePhoto(photoIDs: [Int], targetFolderIDs: [Int]) async throws
+    func movePhoto(sourceFolderId: Int, photoIDs: [Int], targetFolderIDs: [Int]) async throws
 
     // Delete
     func deletePhotoList(photoIDs: [Int]) async throws