카테고리 CRUD를 CoreData와 연결하여 구현

MemorialHouse/MHApplication/MHApplication/Source/App/SceneDelegate.swift

@@ -35,7 +35,8 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     func registerDependency() {
         do {
-            registerRepositoryDependency()
+            try registerStorageDepedency()
+            try registerRepositoryDependency()
             try registerUseCaseDependency()
             try registerViewModelFactoryDependency()
         } catch let error as MHCoreError {
@@ -45,14 +46,26 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         }
     }
 
-    private func registerRepositoryDependency() {
+    private func registerStorageDepedency() throws {
+        DIContainer.shared.register(CoreDataStorage.self, object: CoreDataStorage())
+
+        let coreDataStorage = try DIContainer.shared.resolve(CoreDataStorage.self)
+        DIContainer.shared.register(
+            BookCategoryStorage.self,
+            object: CoreDataBookCategoryStorage(coreDataStorage: coreDataStorage)
+        )
+    }
+
+    private func registerRepositoryDependency() throws {
         DIContainer.shared.register(
             MemorialHouseRepository.self,
             object: DefaultMemorialHouseRepository()
         )
+
+        let bookCategoryStorage = try DIContainer.shared.resolve(BookCategoryStorage.self)
         DIContainer.shared.register(
-            CategoryRepository.self,
-            object: DefaultCategoryRepository()
+            BookCategoryRepository.self,
+            object: LocalBookCategoryRepository(storage: bookCategoryStorage)
         )
     }
 
@@ -65,47 +78,49 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         )
 
         // MARK: Category UseCase
-        let categoryRepository = try DIContainer.shared.resolve(CategoryRepository.self)
+        let bookCategoryRepository = try DIContainer.shared.resolve(BookCategoryRepository.self)
         DIContainer.shared.register(
-            CreateCategoryUseCase.self,
-            object: DefaultCreateCategoryUseCase(repository: categoryRepository)
+            CreateBookCategoryUseCase.self,
+            object: DefaultCreateBookCategoryUseCase(repository: bookCategoryRepository)
         )
         DIContainer.shared.register(
-            FetchCategoriesUseCase.self,
-            object: DefaultFetchCategoriesUseCase(repository: categoryRepository)
+            FetchBookCategoriesUseCase.self,
+            object: DefaultFetchBookCategoriesUseCase(repository: bookCategoryRepository)
         )
         DIContainer.shared.register(
-            UpdateCategoryUseCase.self,
-            object: DefaultUpdateCategoryUseCase(repository: categoryRepository)
+            UpdateBookCategoryUseCase.self,
+            object: DefaultUpdateBookCategoryUseCase(repository: bookCategoryRepository)
         )
         DIContainer.shared.register(
-            DeleteCategoryUseCase.self,
-            object: DefaultDeleteCategoryUseCase(repository: categoryRepository)
+            DeleteBookCategoryUseCase.self,
+            object: DefaultDeleteBookCategoryUseCase(repository: bookCategoryRepository)
         )
     }
 
     private func registerViewModelFactoryDependency() throws {
         // MARK: MemorialHouse ViewModel
         let fetchMemorialHouseUseCase = try DIContainer.shared.resolve(FetchMemorialHouseUseCase.self)
-        let fetchCategoryUseCase = try DIContainer.shared.resolve(FetchCategoriesUseCase.self)
+        let fetchBookCategoryUseCase = try DIContainer.shared.resolve(FetchBookCategoriesUseCase.self)
         DIContainer.shared.register(
             HomeViewModelFactory.self,
             object: HomeViewModelFactory(
                 fetchMemorialHouseUseCase: fetchMemorialHouseUseCase,
-                fetchCategoryUseCase: fetchCategoryUseCase
+                fetchCategoryUseCase: fetchBookCategoryUseCase
             )
         )
 
         // MARK: Category ViewModel
-        let createCategoryUseCase = try DIContainer.shared.resolve(CreateCategoryUseCase.self)
-        let updateCategoryUseCase = try DIContainer.shared.resolve(UpdateCategoryUseCase.self)
-        let deleteCategoryUseCase = try DIContainer.shared.resolve(DeleteCategoryUseCase.self)
+        let createBookCategoryUseCase = try DIContainer.shared.resolve(CreateBookCategoryUseCase.self)
+        let fetchBookCategoriesUseCase = try DIContainer.shared.resolve(FetchBookCategoriesUseCase.self)
+        let updateBookCategoryUseCase = try DIContainer.shared.resolve(UpdateBookCategoryUseCase.self)
+        let deleteBookCategoryUseCase = try DIContainer.shared.resolve(DeleteBookCategoryUseCase.self)
         DIContainer.shared.register(
-            CategoryViewModelFactory.self,
-            object: CategoryViewModelFactory(
-                createCategoryUseCase: createCategoryUseCase,
-                updateCategoryUseCase: updateCategoryUseCase,
-                deleteCategoryUseCase: deleteCategoryUseCase
+            BookCategoryViewModelFactory.self,
+            object: BookCategoryViewModelFactory(
+                createBookCategoryUseCase: createBookCategoryUseCase,
+                fetchBookCategoriesUseCase: fetchBookCategoriesUseCase,
+                updateBookCategoryUseCase: updateBookCategoryUseCase,
+                deleteBookCategoryUseCase: deleteBookCategoryUseCase
             )
         )
     }

MemorialHouse/MHCore/MHCore/MHDataError.swift

@@ -15,6 +15,7 @@ public enum MHDataError: Error, CustomStringConvertible, Equatable {
     case fileDeletionFailure
     case fileMovingFailure
     case fileNotExists
+    case generalFailure
 
     public var description: String {
         switch self {
@@ -46,6 +47,8 @@ public enum MHDataError: Error, CustomStringConvertible, Equatable {
             "파일 이동 실패"
         case .fileNotExists:
             "파일이 존재하지 않습니다"
+        case .generalFailure:
+            "알 수 없는 에러입니다."
         }
     }
 }

MemorialHouse/MHData/MHData/DTO/BookCategoryDTO.swift

@@ -0,0 +1,22 @@
+import MHFoundation
+import MHDomain
+
+public struct BookCategoryDTO {
+    let order: Int
+    let name: String
+
+    public init(
+        order: Int,
+        name: String
+    ) {
+        self.order = order
+        self.name = name
+    }
+
+    func convertToBookCategory() -> BookCategory {
+        BookCategory(
+            order: order,
+            name: name
+        )
+    }
+}

MemorialHouse/MHData/MHData/DTO/BookCoverDTO.swift

@@ -18,7 +18,7 @@ public struct BookCoverDTO {
         self.favorite = favorite
     }
 
-    func toBookCover() -> BookCover? {
+    func convertToBookCover() -> BookCover? {
         guard let color = BookColor(rawValue: self.color) else { return nil }
 
         return BookCover(

MemorialHouse/MHData/MHData/DTO/BookDTO.swift

@@ -10,10 +10,10 @@ public struct BookDTO {
         self.pages = pages
     }
 
-    func toBook() -> Book {
+    func convertToBook() -> Book {
         return Book(
             id: self.id,
-            pages: self.pages.map { $0.toPage() }
+            pages: self.pages.map { $0.convertToPage() }
         )
     }
 }

MemorialHouse/MHData/MHData/DTO/MediaDescriptionDTO.swift

@@ -12,9 +12,9 @@
         self.attributes = attributes
     }
 
-    func toMediaDescription() -> MediaDescription? {
+    func convertToMediaDescription() -> MediaDescription? {
         guard let type = MediaType(rawValue: self.type) else { return nil }
         let attributes = try? JSONSerialization.jsonObject(with: attributes ?? Data(), options: []) as? [String: any Sendable]
 
         return MediaDescription(
             id: self.id,

MemorialHouse/MHData/MHData/DTO/PageDTO.swift

@@ -12,9 +12,9 @@ public struct PageDTO {
         self.text = text
     }
 
-    func toPage() -> Page {
+    func convertToPage() -> Page {
         let metadata = self.metadata
-            .compactMapValues { $0.toMediaDescription() }
+            .compactMapValues { $0.convertToMediaDescription() }
 
         return Page(
             id: self.id,

MemorialHouse/MHData/MHData/LocalStorage/BookCategoryStorage.swift

@@ -0,0 +1,9 @@
+import MHFoundation
+import MHCore
+
+public protocol BookCategoryStorage: Sendable {
+    func create(with category: BookCategoryDTO) async -> Result<Void, MHDataError>
+    func fetch() async -> Result<[BookCategoryDTO], MHDataError>
+    func update(oldName: String, with category: BookCategoryDTO) async -> Result<Void, MHDataError>
+    func delete(with categoryName: String) async -> Result<Void, MHDataError>
+}

MemorialHouse/MHData/MHData/LocalStorage/CoreData/CoreDataBookCategoryStorage.swift

@@ -0,0 +1,90 @@
+import MHFoundation
+import MHCore
+import CoreData
+
+public final class CoreDataBookCategoryStorage {
+    private let coreDataStorage: CoreDataStorage
+
+    public init(coreDataStorage: CoreDataStorage) {
+        self.coreDataStorage = coreDataStorage
+    }
+
+    private func performDatabaseTask<T>(
+        _ task: @escaping (NSManagedObjectContext) throws -> T
+    ) async -> Result<T, MHDataError> {
+        let context = coreDataStorage.persistentContainer.viewContext
+        do {
+            return try await context.perform {
+                do {
+                    return .success(try task(context))
+                } catch let error as MHDataError {
+                    MHLogger.debug("Core Data 에러: \(error.description)")
+                    throw error
+                } catch {
+                    MHLogger.debug("알 수 없는 Core Data 에러: \(error.localizedDescription)")
+                    throw error
+                }
+            }
+        } catch let error as MHDataError {
+            return .failure(error)
+        } catch {
+            return .failure(MHDataError.generalFailure)
+        }
+    }
+}
+
+extension CoreDataBookCategoryStorage: BookCategoryStorage {
+    public func create(with category: BookCategoryDTO) async -> Result<Void, MHDataError> {
+        return await performDatabaseTask { context in
+            guard let entity = NSEntityDescription.entity(forEntityName: "BookCategoryEntity", in: context) else {
+                throw MHDataError.noSuchEntity(key: "BookCategoryEntity")
+            }
+            let bookCategory = NSManagedObject(entity: entity, insertInto: context)
+            bookCategory.setValue(category.order, forKey: "order")
+            bookCategory.setValue(category.name, forKey: "name")
+            try context.save()
+        }
+    }
+
+    public func fetch() async -> Result<[BookCategoryDTO], MHDataError> {
+        return await performDatabaseTask { [weak self] context in
+            let request = BookCategoryEntity.fetchRequest()
+            let bookCategoryEntities = try context.fetch(request)
+            return bookCategoryEntities.compactMap { self?.coreBookCategoryToDTO($0) }
+        }
+    }
+
+    public func update(oldName: String, with category: BookCategoryDTO) async -> Result<Void, MHDataError> {
+        return await performDatabaseTask { context in
+            let request = BookCategoryEntity.fetchRequest()
+            if let entity = try context.fetch(request).first(where: { $0.name == oldName }) {
+                entity.setValue(category.name, forKey: "name")
+                entity.setValue(category.order, forKey: "order")
+                try context.save()
+            }
+        }
+    }
+
+    public func delete(with categoryName: String) async -> Result<Void, MHDataError> {
+        return await performDatabaseTask { context in
+            let request = BookCategoryEntity.fetchRequest()
+            if let entity = try context.fetch(request).first(where: { $0.name == categoryName }) {
+                context.delete(entity)
+                try context.save()
+            }
+        }
+    }
+}
+
+// MARK: - Mapper
+extension CoreDataBookCategoryStorage {
+    func coreBookCategoryToDTO(_ bookCategory: BookCategoryEntity) -> BookCategoryDTO? {
+        guard let name = bookCategory.name else { return nil }
+        let order = Int(bookCategory.order)
+
+        return BookCategoryDTO(
+            order: order,
+            name: name
+        )
+    }
+}

MemorialHouse/MHData/MHData/LocalStorage/CoreData/CoreDataStorage.swift

@@ -1,7 +1,17 @@
 import CoreData
 import MHCore
 
-class CoreDataStorage {
+/// Core Data 스택을 구성하는 기본 클래스이며, 다른 코어데이터 구현체의 프로퍼티로 사용됩니다.
+/// 또한, 테스트 환경에서 `MockCoreDataStorage`를 상속받아 확장할 수 있도록 설계되었습니다.
+///
+/// 이 클래스를 프로토콜로 작성하지 않은 이유는,
+/// 테스트 코드에서도 `MemorialHouseModel`이라는 Core Data 모델을 동일하게 사용하기 위해서입니다.
+/// 이를 통해 테스트 환경에서도 실제 DB 모델 구조를 유지하며 간단히 확장할 수 있습니다.
+///
+/// - 주요 특징:
+///   - `NSPersistentContainer`를 활용해 Core Data 스택을 구성합니다.
+///   - `saveContext` 메서드를 통해 변경된 컨텍스트를 저장합니다.
+public class CoreDataStorage: @unchecked Sendable {
     static let modelName: String = "MemorialHouseModel"
 
     nonisolated(unsafe) static let memorialHouseModel: NSManagedObjectModel = {
@@ -15,7 +25,7 @@
     }()
 
     lazy var persistentContainer: NSPersistentContainer = {
-        let container = NSPersistentContainer(name: CoreDataStorage.modelName)
+        let container = NSPersistentContainer(name: CoreDataStorage.modelName, managedObjectModel: Self.memorialHouseModel)
         container.loadPersistentStores { _, error in
             guard let error else { return }
             MHLogger.error("\(#function): PersistentContainer 호출에 실패; \(error.localizedDescription)")
@@ -24,7 +34,7 @@
         return container
     }()
 
-    init() { }
+    public init() { }
 
     func saveContext() async {
         let context = persistentContainer.viewContext

MemorialHouse/MHData/MHData/LocalStorage/CoreData/MemorialHouseModel.xcdatamodeld/MemorialHouseModel.xcdatamodel/contents

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23507" systemVersion="24A348" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23507" systemVersion="24B2082" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+    <entity name="BookCategoryEntity" representedClassName="BookCategoryEntity" syncable="YES" codeGenerationType="class">
+        <attribute name="name" optional="YES" attributeType="String"/>
+        <attribute name="order" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+    </entity>
     <entity name="BookCoverEntity" representedClassName="BookCoverEntity" syncable="YES" codeGenerationType="class">
         <attribute name="category" optional="YES" attributeType="String"/>
         <attribute name="color" optional="YES" attributeType="String" customClassName="BookColor"/>