Merge pull request #66 from winebarrel/fix_PagerDutyModel_error

Fix pager duty model error
winebarrel · Nov 5, 2024 · ab478af · ab478af
2 parents eb59a74 + 15ff456
commit ab478af
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/PagerCall.xcodeproj/project.pbxproj b/PagerCall.xcodeproj/project.pbxproj
@@ -293,7 +293,7 @@
 				CODE_SIGN_ENTITLEMENTS = PagerCall/PagerCall.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 97A8B2WE2P;
@@ -324,7 +324,7 @@
 				CODE_SIGN_ENTITLEMENTS = PagerCall/PagerCall.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 97A8B2WE2P;

diff --git a/PagerCall/ContentView.swift b/PagerCall/ContentView.swift
@@ -1,12 +1,12 @@
 import SwiftUI
 
 struct ContentView: View {
-    @ObservedObject var pagerDuty: PagerDuty
+    @ObservedObject var pagerDuty: PagerDutyModel
     @State private var hoverId = ""
 
     var body: some View {
         VStack {
-            if let pdErr = self.pagerDuty.error as? PagerDutyError {
+            if let pdErr = self.pagerDuty.error {
                 List {
                     HStack {
                         Spacer()
@@ -76,5 +76,5 @@ struct ContentView: View {
 }
 
 #Preview {
-    ContentView(pagerDuty: PagerDuty())
+    ContentView(pagerDuty: PagerDutyModel())
 }
diff --git a/PagerCall/PagerCallApp.swift b/PagerCall/PagerCallApp.swift
@@ -10,7 +10,7 @@ struct PagerCallApp: App {
     // NOTE: Define "apiKey" in PagerCallApp so that values are not lost during sleep.
     @State private var apiKey = Vault.apiKey
     @AppStorage("interval") private var interval = Constants.defaultInterval
-    @StateObject private var pagerDuty = PagerDuty()
+    @StateObject private var pagerDuty = PagerDutyModel()
 
     // swiftlint:disable unused_declaration
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate

diff --git a/PagerCall/PagerDutyAPI.swift b/PagerCall/PagerDutyAPI.swift
@@ -55,10 +55,6 @@ struct PagerDutyAPI {
         decoder.dateDecodingStrategy = .iso8601
         let resp = try decoder.decode(IncidentsResp.self, from: data)
 
-        for iii in resp.incidents {
-            print(iii.createdAt.relative())
-        }
-
         return resp.incidents
     }
 

diff --git a/PagerCall/PagerDutyModel.swift b/PagerCall/PagerDutyModel.swift
@@ -9,13 +9,13 @@ enum Status: String {
 }
 
 @MainActor
-class PagerDuty: ObservableObject {
+class PagerDutyModel: ObservableObject {
     private let api = PagerDutyAPI()
 
     @Published var incidents: Incidents = []
     @Published var status: Status = .notOnCallWithoutIncident
     @Published var updatedAt: Date?
-    @Published var error: Error?
+    @Published var error: PagerDutyError?
 
     func update() async {
         do {
@@ -40,8 +40,11 @@ class PagerDuty: ObservableObject {
             }
         } catch {
             Logger.shared.error("failed to get incidents: \(error)")
-            status = .error
-            self.error = error
+
+            if let pdErr = error as? PagerDutyError {
+                status = .error
+                self.error = pdErr
+            }
         }
     }