diff --git a/Diary/Controller/CreateDiaryViewController.swift b/Diary/Controller/CreateDiaryViewController.swift index 98320985e..6904b834f 100644 --- a/Diary/Controller/CreateDiaryViewController.swift +++ b/Diary/Controller/CreateDiaryViewController.swift @@ -141,6 +141,7 @@ extension CreateDiaryViewController { } } +// MARK: - UITextViewDelegate extension CreateDiaryViewController: UITextViewDelegate { func textViewDidEndEditing(_ textView: UITextView) { let contents = textView.text.split(separator: "\n") diff --git a/Diary/Controller/DiaryListViewController.swift b/Diary/Controller/DiaryListViewController.swift index 06b77cd82..21639728f 100644 --- a/Diary/Controller/DiaryListViewController.swift +++ b/Diary/Controller/DiaryListViewController.swift @@ -66,7 +66,7 @@ final class DiaryListViewController: UIViewController { extension DiaryListViewController: AlertDisplayable { private func readCoreData() { do { - let fetchedDiaries = try container.viewContext.fetch(Diary.fetchRequest()) + let fetchedDiaries = try CoreDataManager.shared.fetchDiary() diaryList = fetchedDiaries.filter { $0.title != nil } tableView.reloadData() } catch { diff --git a/Diary/DataManager/CoreDataManager.swift b/Diary/DataManager/CoreDataManager.swift index d4f7f6de6..3aadd7451 100644 --- a/Diary/DataManager/CoreDataManager.swift +++ b/Diary/DataManager/CoreDataManager.swift @@ -10,6 +10,15 @@ import CoreData class CoreDataManager { static let shared = CoreDataManager() private init() {} + + func fetchDiary() throws -> [Diary] { + let request: NSFetchRequest = Diary.fetchRequest() + let sortByDate = NSSortDescriptor(key: "createdAt", ascending: false) + request.sortDescriptors = [sortByDate] + + let diaries = try persistentContainer.viewContext.fetch(request) + return diaries + } func createDiary() -> Diary { let newDiary = Diary(context: persistentContainer.viewContext)