[Feature] 링크, 폴더 삭제 로직 구현

Mark-In/Sources/App/DIContainer+.swift

@@ -79,6 +79,15 @@ private extension DIContainer {
       linkRepository: resolve(),
       folderRepsoitory: resolve()
     )
+    let deleteLinkUseCase: DeleteLinkUseCase = DeleteLinkUseCaseImpl(
+      authUserManager: resolve(),
+      linkRepository: resolve()
+    )
+    let deleteFolderUseCase: DeleteFolderUseCase = DeleteFolderUseCaseImpl(
+      authUserManager: resolve(),
+      linkRepository: resolve(),
+      folderRepository: resolve()
+    )
 
     register(fetchLinkListUseCase)
     register(fetchFolderListUseCase)
@@ -87,5 +96,7 @@ private extension DIContainer {
     register(signInUseCase)
     register(signOutUseCase)
     register(withdrawalUseCase)
+    register(deleteLinkUseCase)
+    register(deleteFolderUseCase)
   }
 }

Mark-In/Sources/Data/DTOs/FolderDTO.swift

@@ -10,13 +10,19 @@ import Foundation
 struct FolderDTO: Codable {
   var id: String
   var name: String
-  var createdBy: Date
+  var createdAt: Date
+
+  enum CodingKeys: String, CodingKey {
+    case id = "id"
+    case name = "name"
+    case createdAt = "createdAt"
+  }
 
   func toEntity() -> Folder {
     return Folder(
       id: self.id,
       name: self.name,
-      createdBy: self.createdBy
+      createdAt: self.createdAt
     )
   }
 }

Mark-In/Sources/Data/DTOs/WebLinkDTO.swift

@@ -14,10 +14,22 @@ struct WebLinkDTO: Codable {
   var thumbnailUrl: String?
   var faviconUrl: String?
   var isPinned: Bool
-  var createdBy: Date
+  var createdAt: Date
   var lastAccessedAt: Date?
   var folderID: String?
 
+  enum CodingKeys: String, CodingKey {
+    case id = "id"
+    case url = "url"
+    case title = "title"
+    case thumbnailUrl = "thumbnailUrl"
+    case faviconUrl = "faviconUrl"
+    case isPinned = "isPinned"
+    case createdAt = "createdAt"
+    case lastAccessedAt = "lastAccessedAt"
+    case folderID = "folderID"
+  }
+
   func toEntity() -> WebLink {
     WebLink(
       id: self.id,
@@ -26,7 +38,7 @@ struct WebLinkDTO: Codable {
       thumbnailUrl: self.thumbnailUrl,
       faviconUrl: self.faviconUrl,
       isPinned: self.isPinned,
-      createdBy: self.createdBy,
+      createdAt: self.createdAt,
       lastAccessedAt: self.lastAccessedAt,
       folderID: self.folderID
     )

Mark-In/Sources/Data/FirestoreFieldKey.swift

@@ -0,0 +1,28 @@
+//
+//  FirestoreFieldKey.swift
+//  Mark-In
+//
+//  Created by 이정동 on 6/4/25.
+//
+
+import Foundation
+
+enum FirestoreFieldKey {
+  enum Link {
+    static let id = "id"
+    static let url = "url"
+    static let title = "title"
+    static let thumbnailUrl = "thumbnailUrl"
+    static let faviconUrl = "faviconUrl"
+    static let isPinned = "isPinned"
+    static let createdAt = "createdAt"
+    static let lastAccessedAt = "lastAccessedAt"
+    static let folderID = "folderID"
+  }
+
+  enum Folder {
+    static let id = "id"
+    static let name = "name"
+    static let createdAt = "createdAt"
+  }
+}

Mark-In/Sources/Data/Repositories/FolderRepositoryImpl.swift

@@ -11,7 +11,7 @@ import FirebaseFirestore
 
 struct FolderRepositoryImpl: FolderRepository {
 
-  typealias VoidCheckedContinuation = CheckedContinuation<Void, any Error>
+  typealias FolderFieldKey = FirestoreFieldKey.Folder
 
   private let db = Firestore.firestore()
 
@@ -20,27 +20,24 @@ struct FolderRepositoryImpl: FolderRepository {
     let path = FirebaseEndpoint.FirestoreDB.folders(userID: userID).path
     let folderDocRef = db.collection(path).document()
 
-    /// 2. Firestore에 저장할 DTO 객체 생성
-    let folderDTO = FolderDTO(
+    /// 2. 필드 값 생성
+    let createdAt = Date()
+
+    /// 3. Firestore에 추가
+    try await folderDocRef.setData([
+      FolderFieldKey.id: folderDocRef.documentID,
+      FolderFieldKey.name: folder.name,
+      FolderFieldKey.createdAt: createdAt
+    ])
+
+    /// 4. 생성된 데이터 반환
+    let folderEntity = Folder(
       id: folderDocRef.documentID,
       name: folder.name,
-      createdBy: .now
+      createdAt: .now
     )
 
-    /// 3. Firestore에 추가
-    try await withCheckedThrowingContinuation { (continuation: VoidCheckedContinuation) in
-      do {
-        try folderDocRef.setData(from: folderDTO) { error in
-          if let error { continuation.resume(throwing: error) }
-          else { continuation.resume(returning: ()) }
-        }
-      } catch {
-        continuation.resume(throwing: error)
-      }
-    }
-
-    /// 4. DocumentID가 업데이트 된 Folder Entity로 리턴
-    return folderDTO.toEntity()
+    return folderEntity
   }
 
   func fetchAll(userID: String) async throws -> [Folder] {
@@ -57,35 +54,8 @@ struct FolderRepositoryImpl: FolderRepository {
     }
   }
 
-  func update(userID: String, folder: Folder) async throws {
-    /// 1. Folder 문서 참조 생성
-    guard let folderID = folder.id else { return }
-    let path = FirebaseEndpoint.FirestoreDB.folder(userID: userID, folderID: folderID).path
-    let folderDocRef = db.document(path)
-
-    /// 2. Entity를 DTO로 변환
-    let folderDTO = FolderDTO(
-      id: folderDocRef.documentID,
-      name: folder.name,
-      createdBy: folder.createdBy
-    )
-
-    /// 3. 업데이트
-    try await withCheckedThrowingContinuation { (continuation: VoidCheckedContinuation) in
-      do {
-        try folderDocRef.setData(from: folderDTO) { error in
-          if let error { continuation.resume(throwing: error) }
-          else { continuation.resume(returning: ()) }
-        }
-      } catch {
-        continuation.resume(throwing: error)
-      }
-    }
-  }
-
-  func delete(userID: String, folder: Folder) async throws {
+  func delete(userID: String, folderID: String) async throws {
     /// 1. Folder 문서 참조 생성
-    guard let folderID = folder.id else { return }
     let path = FirebaseEndpoint.FirestoreDB.folder(userID: userID, folderID: folderID).path
     let folderDocRef = db.document(path)
 

Mark-In/Sources/Data/Repositories/LinkRepositoryImpl.swift

@@ -14,7 +14,7 @@ import LinkMetadataKitInterface
 
 struct LinkRepositoryImpl: LinkRepository {
 
-  typealias VoidCheckedContinuation = CheckedContinuation<Void, any Error>
+  typealias LinkFieldKey = FirestoreFieldKey.Link
 
   private let db = Firestore.firestore()
   private let storage = Storage.storage().reference()
@@ -40,33 +40,37 @@ struct LinkRepositoryImpl: LinkRepository {
       metadata: metadata
     )
 
-    /// 4. Firestore에 저장할 DTO 객체 생성
-    let linkDTO = WebLinkDTO(
+    /// 4. 필드 값 설정
+    let title = link.title ?? metadata.title
+    let createdAt = Date()
+
+    /// 5. Firestore에 추가
+    try await linkDocRef.setData([
+      LinkFieldKey.id: linkDocRef.documentID,
+      LinkFieldKey.url: link.url,
+      LinkFieldKey.title: title ?? NSNull(),
+      LinkFieldKey.thumbnailUrl: imageUrls.thumbnail ?? NSNull(),
+      LinkFieldKey.faviconUrl: imageUrls.favicon ?? NSNull(),
+      LinkFieldKey.isPinned: false,
+      LinkFieldKey.createdAt: createdAt,
+      LinkFieldKey.lastAccessedAt: NSNull(),
+      LinkFieldKey.folderID: link.folderID ?? NSNull()
+    ])
+
+    /// 6. 생성된 데이터 반환
+    let linkEntity = WebLink(
       id: linkDocRef.documentID,
       url: link.url,
-      title: link.title ?? metadata.title,
+      title: title,
       thumbnailUrl: imageUrls.thumbnail,
       faviconUrl: imageUrls.favicon,
       isPinned: false,
-      createdBy: .now,
+      createdAt: createdAt,
       lastAccessedAt: nil,
       folderID: link.folderID
     )
 
-    /// 5. Firestore에 추가
-    try await withCheckedThrowingContinuation { (continuation: VoidCheckedContinuation) in
-      do {
-        try linkDocRef.setData(from: linkDTO) { error in
-          if let error { continuation.resume(throwing: error) }
-          else { continuation.resume(returning: ()) }
-        }
-      } catch {
-        continuation.resume(throwing: error)
-      }
-    }
-
-    /// 6. 저장된 DTO 객체를 Entity로 변환 후 리턴
-    return linkDTO.toEntity()
+    return linkEntity
   }
 
   func fetchAll(userID: String) async throws -> [WebLink] {
@@ -83,40 +87,53 @@ struct LinkRepositoryImpl: LinkRepository {
     }
   }
 
-  func update(userID: String, link: WebLink) async throws {
+
+  func moveLinkInFolder(
+    userID: String,
+    target linkID: String,
+    to folderID: String?
+  ) async throws {
     /// 1. Link 문서 참조 생성
-    let path = FirebaseEndpoint.FirestoreDB.link(userID: userID, linkID: link.id).path
+    let path = FirebaseEndpoint.FirestoreDB.link(userID: userID, linkID: linkID).path
     let linkDocRef = db.document(path)
 
-    /// 2. Entity를 DTO로 변환
-    let linkDTO = WebLinkDTO(
-      id: link.id,
-      url: link.url,
-      title: link.title,
-      thumbnailUrl: link.thumbnailUrl,
-      faviconUrl: link.faviconUrl,
-      isPinned: link.isPinned,
-      createdBy: link.createdBy,
-      lastAccessedAt: link.lastAccessedAt,
-      folderID: link.folderID
-    )
+    /// 2. 문서 업데이트
+    try await linkDocRef.updateData([
+      LinkFieldKey.folderID: folderID ?? NSNull()
+    ])
+  }
+
+  func moveLinksInFolder(
+    userID: String,
+    fromFolderID: String?,
+    toFolderID: String?
+  ) async throws {
+    /// 1. Link 컬렉션 참조 생성
+    let path = FirebaseEndpoint.FirestoreDB.links(userID: userID).path
+    let linkColRef = db.collection(path)
+
+    /// 2. 조건에 해당하는 모든 문서 가져오기
+    let querySnapshot = try await linkColRef
+      .whereField(LinkFieldKey.folderID, isEqualTo: fromFolderID ?? NSNull())
+      .getDocuments()
 
-    /// 3. 업데이트
-    try await withCheckedThrowingContinuation { (continuation: VoidCheckedContinuation) in
-      do {
-        try linkDocRef.setData(from: linkDTO) { error in
-          if let error { continuation.resume(throwing: error) }
-          else { continuation.resume(returning: ()) }
+    /// 3. 병렬 작업으로 문서 업데이트
+    try await withThrowingTaskGroup(of: Void.self) { group in
+      querySnapshot.documents.forEach { document in
+        group.addTask {
+          try await document.reference.updateData([
+            LinkFieldKey.folderID: toFolderID ?? NSNull()
+          ])
         }
-      } catch {
-        continuation.resume(throwing: error)
       }
+
+      try await group.waitForAll()
     }
   }
 
-  func delete(userID: String, link: WebLink) async throws {
+  func delete(userID: String, linkID: String) async throws {
     /// 1. Link 문서 참조 생성
-    let path = FirebaseEndpoint.FirestoreDB.link(userID: userID, linkID: link.id).path
+    let path = FirebaseEndpoint.FirestoreDB.link(userID: userID, linkID: linkID).path
     let linkDocRef = db.document(path)
 
     /// 2. 이미지 데이터 삭제
@@ -126,6 +143,31 @@ struct LinkRepositoryImpl: LinkRepository {
     try await linkDocRef.delete()
   }
 
+  func deleteAllInFolder(userID: String, folderID: String?) async throws {
+    let path = FirebaseEndpoint.FirestoreDB.links(userID: userID).path
+    let querySnapshot = try await db.collection(path)
+      .whereField(LinkFieldKey.folderID, isEqualTo: folderID ?? NSNull())
+      .getDocuments()
+
+    /// 3. 병렬 작업으로 데이터 삭제
+    try await withThrowingTaskGroup(of: Void.self) { group in
+      /// 모둔 문서에 순차 접근
+      querySnapshot.documents.forEach { document in
+        /// Link 데이터 삭제
+        group.addTask {
+          try await document.reference.delete()
+        }
+
+        /// 이미지 데이터 삭제
+        group.addTask {
+          try await deleteImageData(userID: userID, fileID: document.documentID)
+        }
+      }
+
+      try await group.waitForAll()
+    }
+  }
+
   func deleteAll(userID: String) async throws {
     /// 1. Links 컬렉션 참조 생성
     let path = FirebaseEndpoint.FirestoreDB.links(userID: userID).path

Mark-In/Sources/Domain/Entities/Folder.swift

@@ -10,5 +10,5 @@ import Foundation
 struct Folder: Equatable, Hashable {
   var id: String?
   var name: String
-  var createdBy: Date
+  var createdAt: Date
 }

Mark-In/Sources/Domain/Entities/WebLink.swift

@@ -14,7 +14,7 @@ struct WebLink: Hashable {
   var thumbnailUrl: String?
   var faviconUrl: String?
   var isPinned: Bool
-  var createdBy: Date
+  var createdAt: Date
   var lastAccessedAt: Date?
   var folderID: String?
 }

Mark-In/Sources/Domain/Interfaces/FolderRepository.swift

@@ -10,7 +10,6 @@ import Foundation
 protocol FolderRepository {
   func create(userID: String, folder: WriteFolder) async throws -> Folder
   func fetchAll(userID: String) async throws -> [Folder]
-  func update(userID: String, folder: Folder) async throws
-  func delete(userID: String, folder: Folder) async throws
+  func delete(userID: String, folderID: String) async throws
   func deleteAll(userID: String) async throws
 }