Merge pull request #77 from uhooi/feature/fix_showing_error

Fix Error alert appears at first launch
uhooi · Nov 20, 2022 · 29fb26a · 29fb26a
2 parents 32e4f4e + 4365b55
commit 29fb26a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/TotonoiPackage/Sources/Core/UserDefaults/UserDefaultsClient.swift b/TotonoiPackage/Sources/Core/UserDefaults/UserDefaultsClient.swift
@@ -4,13 +4,13 @@ public typealias UserDefaultsGettable = Decodable
 public typealias UserDefaultsSettable = Encodable
 public typealias UserDefaultsPersistable = UserDefaultsGettable & UserDefaultsSettable
 
-private enum UserDefaultsError: LocalizedError {
-    case gettingFailed(key: String)
+public enum UserDefaultsError: LocalizedError {
+    case missingValue(key: String)
 
-    var errorDescription: String? {
+    public var errorDescription: String? {
         switch self {
-        case .gettingFailed:
-            return "オブジェクトの取得に失敗しました。"
+        case .missingValue:
+            return "対象のキーに値が存在しません。"
         }
     }
 }
@@ -26,7 +26,7 @@ public struct UserDefaultsClient {
         let jsonDecoder = JSONDecoder()
         jsonDecoder.keyDecodingStrategy = .convertFromSnakeCase
         guard let data = userDefaults.data(forKey: defaultName) else {
-            throw UserDefaultsError.gettingFailed(key: defaultName)
+            throw UserDefaultsError.missingValue(key: defaultName)
         }
         return try jsonDecoder.decode(V.self, from: data)
     }

diff --git a/TotonoiPackage/Sources/Data/Sakatsu/SakatsuRepository.swift b/TotonoiPackage/Sources/Data/Sakatsu/SakatsuRepository.swift
@@ -16,7 +16,13 @@ public struct SakatsuUserDefaultsClient {
 
 extension SakatsuUserDefaultsClient: SakatsuRepository {
     public func sakatsus() throws -> [Sakatsu] {
-        try userDefaultsClient.object(forKey: Self.sakatsusKey)
+        do {
+            return try userDefaultsClient.object(forKey: Self.sakatsusKey)
+        } catch UserDefaultsError.missingValue {
+            return []
+        } catch {
+            throw error
+        }
     }
 
     public func saveSakatsus(_ sakatsus: [Sakatsu]) throws {