Merge pull request loopandlearn#390 from loopandlearn/remote-command-logging

marionbarker · web-flow · commit ce4f36fcd92b · 2025-04-15T18:03:35.000-07:00
Add logging for remote commands
diff --git a/LoopFollow/Remote/Loop/LoopOverrideView.swift b/LoopFollow/Remote/Loop/LoopOverrideView.swift
@@ -201,9 +201,11 @@ struct LoopOverrideView: View {
             if success {
                 self.statusMessage = "Override command sent successfully."
                 self.alertType = .statusSuccess
+                LogManager.shared.log(category: .nightscout, message: "LoopOverrideView: sendActivateOverrideRequest succeeded for override: \(override.name)")
             } else {
                 self.statusMessage = message ?? "Failed to send override command."
                 self.alertType = .statusFailure
+                LogManager.shared.log(category: .nightscout, message: "LoopOverrideView: sendActivateOverrideRequest failed for override: \(override.name) with error: \(message ?? "unknown error")")
             }
             self.showAlert = true
         }
@@ -216,9 +218,11 @@ struct LoopOverrideView: View {
             if success {
                 self.statusMessage = "Cancellation request successfully sent to Nightscout."
                 self.alertType = .statusSuccess
+                LogManager.shared.log(category: .nightscout, message: "LoopOverrideView: sendCancelOverrideRequest succeeded")
             } else {
-                self.statusMessage = message ?? "Failed to cancel temp target."
+                self.statusMessage = message ?? "Failed to cancel override."
                 self.alertType = .statusFailure
+                LogManager.shared.log(category: .nightscout, message: "LoopOverrideView: sendCancelOverrideRequest failed with error: \(message ?? "unknown error")")
             }
             self.showAlert = true
         }
diff --git a/LoopFollow/Remote/Nightscout/TrioNightscoutRemoteView.swift b/LoopFollow/Remote/Nightscout/TrioNightscoutRemoteView.swift
@@ -255,28 +255,48 @@ struct TrioNightscoutRemoteView: View {
     private func enactTempTarget() {
         isLoading = true
         remoteController.sendTempTarget(newTarget: newHKTarget, duration: duration) { success in
-            self.isLoading = false
-            if success {
-                self.statusMessage = "Command successfully sent to Nightscout."
-            } else {
-                self.statusMessage = "Failed to enact target."
+            DispatchQueue.main.async {
+                self.isLoading = false
+                if success {
+                    self.statusMessage = "Command successfully sent to Nightscout."
+                    LogManager.shared.log(
+                        category: .nightscout,
+                        message: "sendTempTarget succeeded - New Target: \(Localizer.formatQuantity(newHKTarget)) \(UserDefaultsRepository.getPreferredUnit().localizedShortUnitString), Duration: \(Int(duration.doubleValue(for: HKUnit.minute()))) minutes"
+                    )
+                } else {
+                    self.statusMessage = "Failed to enact target."
+                    LogManager.shared.log(
+                        category: .nightscout,
+                        message: "sendTempTarget failed - New Target: \(Localizer.formatQuantity(newHKTarget)) \(UserDefaultsRepository.getPreferredUnit().localizedShortUnitString), Duration: \(Int(duration.doubleValue(for: HKUnit.minute()))) minutes"
+                    )
+                }
+                self.alertType = .status
+                self.showAlert = true
             }
-            self.alertType = .status
-            self.showAlert = true
         }
     }
 
     private func cancelTempTarget() {
         isLoading = true
         remoteController.cancelExistingTarget { success in
-            self.isLoading = false
-            if success {
-                self.statusMessage = "Cancellation request successfully sent to Nightscout."
-            } else {
-                self.statusMessage = "Failed to cancel temp target."
+            DispatchQueue.main.async {
+                self.isLoading = false
+                if success {
+                    self.statusMessage = "Cancellation request successfully sent to Nightscout."
+                    LogManager.shared.log(
+                        category: .nightscout,
+                        message: "cancelExistingTarget succeeded"
+                    )
+                } else {
+                    self.statusMessage = "Failed to cancel temp target."
+                    LogManager.shared.log(
+                        category: .nightscout,
+                        message: "cancelExistingTarget failed"
+                    )
+                }
+                self.alertType = .status
+                self.showAlert = true
             }
-            self.alertType = .status
-            self.showAlert = true
         }
     }
 
diff --git a/LoopFollow/Remote/TRC/BolusView.swift b/LoopFollow/Remote/TRC/BolusView.swift
@@ -119,10 +119,12 @@ struct BolusView: View {
                 isLoading = false
                 if success {
                     statusMessage = "Bolus command sent successfully."
+                    LogManager.shared.log(category: .apns, message: "sendBolusPushNotification succeeded - Bolus: \(bolusAmount.doubleValue(for: .internationalUnit())) U")
                     bolusAmount = HKQuantity(unit: .internationalUnit(), doubleValue: 0.0)
                     alertType = .statusSuccess
                 } else {
                     statusMessage = errorMessage ?? "Failed to send bolus command."
+                    LogManager.shared.log(category: .apns, message: "sendBolusPushNotification failed with error: \(errorMessage ?? "unknown error")")
                     alertType = .statusFailure
                 }
                 showAlert = true
diff --git a/LoopFollow/Remote/TRC/MealView.swift b/LoopFollow/Remote/TRC/MealView.swift
@@ -269,6 +269,12 @@ struct MealView: View {
                 isLoading = false
                 if success {
                     statusMessage = "Meal command sent successfully."
+                    LogManager.shared.log(
+                        category: .apns,
+                        message: "sendMealPushNotification succeeded - Carbs: \(carbs.doubleValue(for: .gram())) g, Protein: \(protein.doubleValue(for: .gram())) g, Fat: \(fat.doubleValue(for: .gram())) g, Bolus: \(bolusAmount.doubleValue(for: .internationalUnit())) U, Scheduled: \(scheduledDate != nil ? formatDate(scheduledDate!) : "now")"
+                    )
+
+                    // Reset meal values and scheduled data after success
                     carbs = HKQuantity(unit: .gram(), doubleValue: 0.0)
                     protein = HKQuantity(unit: .gram(), doubleValue: 0.0)
                     fat = HKQuantity(unit: .gram(), doubleValue: 0.0)
@@ -277,6 +283,10 @@ struct MealView: View {
                     alertType = .statusSuccess
                 } else {
                     statusMessage = errorMessage ?? "Failed to send meal command."
+                    LogManager.shared.log(
+                        category: .apns,
+                        message: "sendMealPushNotification failed with error: \(errorMessage ?? "unknown error")"
+                    )
                     alertType = .statusFailure
                 }
                 showAlert = true
diff --git a/LoopFollow/Remote/TRC/OverrideView.swift b/LoopFollow/Remote/TRC/OverrideView.swift
@@ -179,9 +179,11 @@ struct OverrideView: View {
                 if success {
                     self.statusMessage = "Override command sent successfully."
                     self.alertType = .statusSuccess
+                    LogManager.shared.log(category: .apns, message: "sendOverridePushNotification succeeded for override: \(override.name)")
                 } else {
                     self.statusMessage = errorMessage ?? "Failed to send override command."
                     self.alertType = .statusFailure
+                    LogManager.shared.log(category: .apns, message: "sendOverridePushNotification failed for override: \(override.name). Error: \(errorMessage ?? "unknown error")")
                 }
                 self.showAlert = true
             }
@@ -197,9 +199,11 @@ struct OverrideView: View {
                 if success {
                     self.statusMessage = "Cancel override command sent successfully."
                     self.alertType = .statusSuccess
+                    LogManager.shared.log(category: .apns, message: "sendCancelOverridePushNotification succeeded")
                 } else {
                     self.statusMessage = errorMessage ?? "Failed to send cancel override command."
                     self.alertType = .statusFailure
+                    LogManager.shared.log(category: .apns, message: "sendCancelOverridePushNotification failed. Error: \(errorMessage ?? "unknown error")")
                 }
                 self.showAlert = true
             }
diff --git a/LoopFollow/Remote/TRC/TempTargetView.swift b/LoopFollow/Remote/TRC/TempTargetView.swift
@@ -259,9 +259,11 @@ struct TempTargetView: View {
                 if success {
                     self.statusMessage = "Temp target command successfully sent."
                     self.alertType = .statusSuccess
+                    LogManager.shared.log(category: .apns, message: "sendTempTargetPushNotification succeeded with target: \(newHKTarget), duration: \(duration)")
                 } else {
                     self.statusMessage = errorMessage ?? "Failed to send temp target command."
                     self.alertType = .statusFailure
+                    LogManager.shared.log(category: .apns, message: "sendTempTargetPushNotification failed with target: \(newHKTarget), duration: \(duration), error: \(errorMessage ?? "unknown error")")
                 }
                 self.showAlert = true
             }
@@ -277,9 +279,11 @@ struct TempTargetView: View {
                 if success {
                     self.statusMessage = "Cancel temp target command successfully sent."
                     self.alertType = .statusSuccess
+                    LogManager.shared.log(category: .apns, message: "sendCancelTempTargetPushNotification succeeded")
                 } else {
                     self.statusMessage = errorMessage ?? "Failed to send cancel temp target command."
                     self.alertType = .statusFailure
+                    LogManager.shared.log(category: .apns, message: "sendCancelTempTargetPushNotification failed with error: \(errorMessage ?? "unknown error")")
                 }
                 self.showAlert = true
             }

Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,11 @@ struct LoopOverrideView: View {`
`201`	`201`	`if success {`
`202`	`202`	`self.statusMessage = "Override command sent successfully."`
`203`	`203`	`self.alertType = .statusSuccess`
	`204`	`+ LogManager.shared.log(category: .nightscout, message: "LoopOverrideView: sendActivateOverrideRequest succeeded for override: \(override.name)")`
`204`	`205`	`} else {`
`205`	`206`	`self.statusMessage = message ?? "Failed to send override command."`
`206`	`207`	`self.alertType = .statusFailure`
	`208`	`+ LogManager.shared.log(category: .nightscout, message: "LoopOverrideView: sendActivateOverrideRequest failed for override: \(override.name) with error: \(message ?? "unknown error")")`
`207`	`209`	`}`
`208`	`210`	`self.showAlert = true`
`209`	`211`	`}`
`@@ -216,9 +218,11 @@ struct LoopOverrideView: View {`
`216`	`218`	`if success {`
`217`	`219`	`self.statusMessage = "Cancellation request successfully sent to Nightscout."`
`218`	`220`	`self.alertType = .statusSuccess`
	`221`	`+ LogManager.shared.log(category: .nightscout, message: "LoopOverrideView: sendCancelOverrideRequest succeeded")`
`219`	`222`	`} else {`
`220`		`- self.statusMessage = message ?? "Failed to cancel temp target."`
	`223`	`+ self.statusMessage = message ?? "Failed to cancel override."`
`221`	`224`	`self.alertType = .statusFailure`
	`225`	`+ LogManager.shared.log(category: .nightscout, message: "LoopOverrideView: sendCancelOverrideRequest failed with error: \(message ?? "unknown error")")`
`222`	`226`	`}`
`223`	`227`	`self.showAlert = true`
`224`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,9 +179,11 @@ struct OverrideView: View {`
`179`	`179`	`if success {`
`180`	`180`	`self.statusMessage = "Override command sent successfully."`
`181`	`181`	`self.alertType = .statusSuccess`
	`182`	`+ LogManager.shared.log(category: .apns, message: "sendOverridePushNotification succeeded for override: \(override.name)")`
`182`	`183`	`} else {`
`183`	`184`	`self.statusMessage = errorMessage ?? "Failed to send override command."`
`184`	`185`	`self.alertType = .statusFailure`
	`186`	`+ LogManager.shared.log(category: .apns, message: "sendOverridePushNotification failed for override: \(override.name). Error: \(errorMessage ?? "unknown error")")`
`185`	`187`	`}`
`186`	`188`	`self.showAlert = true`
`187`	`189`	`}`
`@@ -197,9 +199,11 @@ struct OverrideView: View {`
`197`	`199`	`if success {`
`198`	`200`	`self.statusMessage = "Cancel override command sent successfully."`
`199`	`201`	`self.alertType = .statusSuccess`
	`202`	`+ LogManager.shared.log(category: .apns, message: "sendCancelOverridePushNotification succeeded")`
`200`	`203`	`} else {`
`201`	`204`	`self.statusMessage = errorMessage ?? "Failed to send cancel override command."`
`202`	`205`	`self.alertType = .statusFailure`
	`206`	`+ LogManager.shared.log(category: .apns, message: "sendCancelOverridePushNotification failed. Error: \(errorMessage ?? "unknown error")")`
`203`	`207`	`}`
`204`	`208`	`self.showAlert = true`
`205`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -259,9 +259,11 @@ struct TempTargetView: View {`
`259`	`259`	`if success {`
`260`	`260`	`self.statusMessage = "Temp target command successfully sent."`
`261`	`261`	`self.alertType = .statusSuccess`
	`262`	`+ LogManager.shared.log(category: .apns, message: "sendTempTargetPushNotification succeeded with target: \(newHKTarget), duration: \(duration)")`
`262`	`263`	`} else {`
`263`	`264`	`self.statusMessage = errorMessage ?? "Failed to send temp target command."`
`264`	`265`	`self.alertType = .statusFailure`
	`266`	`+ LogManager.shared.log(category: .apns, message: "sendTempTargetPushNotification failed with target: \(newHKTarget), duration: \(duration), error: \(errorMessage ?? "unknown error")")`
`265`	`267`	`}`
`266`	`268`	`self.showAlert = true`
`267`	`269`	`}`
`@@ -277,9 +279,11 @@ struct TempTargetView: View {`
`277`	`279`	`if success {`
`278`	`280`	`self.statusMessage = "Cancel temp target command successfully sent."`
`279`	`281`	`self.alertType = .statusSuccess`
	`282`	`+ LogManager.shared.log(category: .apns, message: "sendCancelTempTargetPushNotification succeeded")`
`280`	`283`	`} else {`
`281`	`284`	`self.statusMessage = errorMessage ?? "Failed to send cancel temp target command."`
`282`	`285`	`self.alertType = .statusFailure`
	`286`	`+ LogManager.shared.log(category: .apns, message: "sendCancelTempTargetPushNotification failed with error: \(errorMessage ?? "unknown error")")`
`283`	`287`	`}`
`284`	`288`	`self.showAlert = true`
`285`	`289`	`}`