Skip to content

Commit

Permalink
[fix] 코어데이터 에러 시 디버깅 문구 알림에 추가, 알림 시점 변경 #163
Browse files Browse the repository at this point in the history
  • Loading branch information
@skkimeo
skkimeo committed Apr 14, 2022
1 parent be65aa8 commit bb4c227
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 93 deletions.
72 changes: 27 additions & 45 deletions Happiggy-bank/Happiggy-bank/CoreData/PersistenceStore.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class PersistenceStore {
static var shared: PersistenceStore = {
PersistenceStore(name: StringLiteral.sharedPersistenceStoreName)
}()

static private(set) var fatalErrorNeeded = false

/// persistence container 의 viewContext 에 접근하기 위한 syntactic sugar
Expand Down Expand Up @@ -68,25 +68,28 @@ class PersistenceStore {

// MARK: - Core Data Saving support

/// 현재 context 를 저장, 에러가 발생하면 설정한 에러 메시지(기본은 에러 이름)를 출력함
func save(errorMessage: String? = nil) {
/// 현재 context 를 저장, 에러가 발생하면 발생한 에러 메시지(기본은 에러 이름)를 출력함
@discardableResult
func save() -> (String, String)? {
if self.context.hasChanges {
do {
try self.context.save()
return nil

} catch {
let nserror = error as NSError
if let errorMessage = errorMessage {
print("\(errorMessage)+\(nserror.localizedDescription)+\(nserror.userInfo)")
} else {
print("\(nserror.localizedDescription), \(nserror.userInfo)")
}

self.presentErrorAlert(
title: StringLiteral.saveErrorTitle,
message: StringLiteral.saveErrorMessage
)
let title = StringLiteral.saveErrorTitle
let message = """
\(StringLiteral.saveErrorMessage)
\(nserror.localizedDescription)
\(nserror.localizedFailureReason ?? .empty)
\(nserror.userInfo)
"""
return (title, message)
}
}
return nil
}


Expand All @@ -113,43 +116,22 @@ class PersistenceStore {

// MARK: - Alert

/// 작업 실패 시 알림
private func presentErrorAlert(
/// 알림
func makeErrorAlert(
title: String?,
message: String?,
handler: ((UIAlertAction) -> Void)? = nil
) {
let alert = self.makeErrorAlert(
title: title,
message: message,
handler: handler
)
self.windowScene?.topMostViewController?.present(alert, animated: true)
}

/// 알림 생성
private func makeErrorAlert(
title: String?,
message: String?,
handler: ((UIAlertAction) -> Void)? = nil
confirmHandler: ((UIAlertAction) -> Void)? = nil
) -> UIAlertController {
let alert = UIAlertController(
title: title,
message: message,
preferredStyle: .alert
)

let confirmationAction = UIAlertAction(
let confirmAction = UIAlertAction.confirmAction(
title: StringLiteral.okButtonTitle,
style: .default
) { action in
guard let handler = handler
else { return }

handler(action)
}

alert.addAction(confirmationAction)
return alert
handler: confirmHandler
)

return UIAlertController.basic(
alertTitle: title,
alertMessage: message,
confirmAction: confirmAction
)
}
}
33 changes: 27 additions & 6 deletions Happiggy-bank/Happiggy-bank/ViewController/BottleMessageViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ final class BottleMessageViewController: UIViewController {

self.tapGestureRecognizer.isEnabled.toggle()
HapticManager.instance.selection()
self.saveBottleUpdatesAndDismiss()
guard self.saveBottleUpdates() == true
else { return }

self.dismissWithAnimation()
}


Expand Down Expand Up @@ -179,19 +182,37 @@ final class BottleMessageViewController: UIViewController {
}

/// 저금통 상태를 업데이트하고 다른 뷰 컨트롤러로 이동
private func saveBottleUpdatesAndDismiss() {
private func saveBottleUpdates() -> Bool {
self.bottle.isOpen.toggle()


if self.bottle.notes.isEmpty {
PersistenceStore.shared.delete(self.bottle)
}

guard let (errorTitle, errorMessage) = PersistenceStore.shared.save()
else { return true }

let alert = PersistenceStore.shared.makeErrorAlert(
title: errorTitle,
message: errorMessage
) { _ in
self.dismiss(animated: false)
self.fadeOut()
}

self.present(alert, animated: true)
return false
}

/// 애니메이션과 함께 홈뷰/쪽지리스트로 이동
private func dismissWithAnimation() {
if !self.bottle.notes.isEmpty {
self.moveToNoteListWithAnimation()
}

if self.bottle.notes.isEmpty {
PersistenceStore.shared.delete(self.bottle)
self.dismiss(animated: false)
self.fadeOut()
}

PersistenceStore.shared.save()
}
}
24 changes: 20 additions & 4 deletions Happiggy-bank/Happiggy-bank/ViewController/BottleNameEditViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ final class BottleNameEditViewController: UIViewController {
return
}

saveBottleData(with: text)
guard saveBottleData(with: text) == true
else { return }

self.dismiss(animated: true)
}

Expand Down Expand Up @@ -117,10 +119,22 @@ final class BottleNameEditViewController: UIViewController {

// MARK: Functions

private func saveBottleData(with text: String) {
private func saveBottleData(with text: String) -> Bool {
self.bottle.title = text
self.bottle.hasFixedTitle = true
PersistenceStore.shared.save()

guard let (errorTitle, errorMessage) = PersistenceStore.shared.save()
else { return true }

let alert = PersistenceStore.shared.makeErrorAlert(
title: errorTitle,
message: errorMessage
) { _ in
self.dismiss(animated: false)
}

self.present(alert, animated: true)
return false
}


Expand Down Expand Up @@ -209,7 +223,9 @@ extension BottleNameEditViewController: UITextFieldDelegate {
return true
}

saveBottleData(with: text)
guard saveBottleData(with: text) == true
else { return false }

self.dismiss(animated: true)
return true
}
Expand Down
25 changes: 21 additions & 4 deletions Happiggy-bank/Happiggy-bank/ViewController/NewBottleMessageFieldViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ final class NewBottleMessageFieldViewController: UIViewController {
// MARK: Functions

/// 새 저금통 저장하는 메서드
private func saveNewBottle() {
private func saveNewBottle() -> Bool {
guard let title = self.bottleData?.name,
let endDate = self.bottleData?.endDate
else { return }
else { return true }

if let openMessage = self.bottleData.openMessage {
_ = Bottle(
Expand All @@ -87,7 +87,22 @@ final class NewBottleMessageFieldViewController: UIViewController {
)
}

PersistenceStore.shared.save()
guard let (errorTitle, errorMessage) = PersistenceStore.shared.save()
else { return true }

let alert = PersistenceStore.shared.makeErrorAlert(
title: errorTitle,
message: errorMessage
) { _ in
self.fadeOut()
self.performSegue(
withIdentifier: SegueIdentifier.unwindFromNewBottlePopupToHomeView,
sender: self
)
}

self.present(alert, animated: true)
return false
}


Expand Down Expand Up @@ -134,7 +149,9 @@ final class NewBottleMessageFieldViewController: UIViewController {
let confirmAction = UIAlertAction.confirmAction(
title: StringLiteral.confirmationAlertConfirmButtonTitle
) { _ in
self.saveNewBottle()
guard self.saveNewBottle() == true
else { return }

self.performSegue(
withIdentifier: SegueIdentifier.unwindFromNewBottlePopupToHomeView,
sender: self
Expand Down
79 changes: 45 additions & 34 deletions Happiggy-bank/Happiggy-bank/ViewController/NewNoteTextViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,20 @@ final class NewNoteTextViewController: UIViewController {
)
}

/// 새로 생성한 노트 엔티티를 저장하고 알림을 포스트
private func saveAndPostNewNote(_ note: Note) {
let noteAndDelay = (note: note, delay: CATransition.transitionDuration)
self.post(name: .noteDidAdd, object: noteAndDelay)
PersistenceStore.shared.save()
/// 새로 생성한 노트 엔티티를 저장하고 성공 여부에 따라 불 리턴
private func saveAndPostNewNote() -> Bool {
guard let (errorTitle, errorMessage) = PersistenceStore.shared.save()
else { return true }

let alert = PersistenceStore.shared.makeErrorAlert(
title: errorTitle,
message: errorMessage
) { _ in
self.dismissWithAnimation()
}
self.present(alert, animated: true)

return false
}

/// 쪽지 저장 의사를 재확인 하는 알림을 띄움
Expand All @@ -237,38 +246,40 @@ final class NewNoteTextViewController: UIViewController {

/// 쪽지 저장 의사를 재확인하는 알림 생성
private func makeConfirmationAlert() -> UIAlertController {
let alert = UIAlertController(
title: StringLiteral.alertTitle,
message: StringLiteral.message,
preferredStyle: .alert
)

let confirmAction = UIAlertAction(
title: StringLiteral.confirmButtonTitle,
style: .default) { _ in

let note = self.makeNewNote()

self.saveAndPostNewNote(note)
self.fadeOut()
self.performSegue(
withIdentifier: SegueIdentifier.unwindFromNoteTextViewToHomeView,
sender: note
)
}

let cancelAction = UIAlertAction(
title: StringLiteral.cancelButtonTitle,
style: .cancel) { _ in
self.textView.becomeFirstResponder()
}
let confirmAction = UIAlertAction.confirmAction(
title: StringLiteral.confirmButtonTitle
) { _ in

let note = self.makeNewNote()

guard self.saveAndPostNewNote() == true
else { return }

let noteAndDelay = (note: note, delay: CATransition.transitionDuration)
self.post(name: .noteDidAdd, object: noteAndDelay)
self.dismissWithAnimation()
}

alert.addAction(confirmAction)
alert.addAction(cancelAction)
let cancelAction = UIAlertAction.cancelAction { _ in
self.textView.becomeFirstResponder()
}

return alert
return UIAlertController.basic(
alertTitle: StringLiteral.alertTitle,
alertMessage: StringLiteral.message,
confirmAction: confirmAction,
cancelAction: cancelAction
)
}

/// 페이드아웃 효과와 함께 종료
private func dismissWithAnimation() {
self.fadeOut()
self.performSegue(
withIdentifier: SegueIdentifier.unwindFromNoteTextViewToHomeView,
sender: self
)
}


// MARK: - Navigation

Expand Down

0 comments on commit bb4c227

Please sign in to comment.