Minor Refactoring

* Move NightscoutManager and NightscoutAPI to folder of their own in /Services/Network
* Replace manual for local for enteredBy constant for cohesiveness
* Respective adjustments for above changes

FreeAPS.xcodeproj/project.pbxproj

@@ -1697,9 +1697,8 @@
 				38E44521274E3DDC00EC9A94 /* NetworkReachabilityManager.swift */,
 				38192E03261B82FA0094D973 /* ReachabilityManager.swift */,
 				3811DE9625C9D88300A708ED /* HTTPResponseStatus.swift */,
-				3811DE9725C9D88300A708ED /* NightscoutManager.swift */,
+				DDC9B9962CFD2332003E7721 /* Nightscout */,
 				38FE826925CC82DB001FF17A /* NetworkService.swift */,
-				38FE826C25CC8461001FF17A /* NightscoutAPI.swift */,
 				CE1F6DDA2BAE08B60064EB8D /* TidepoolManager.swift */,
 			);
 			path = Network;
@@ -2830,6 +2829,15 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		DDC9B9962CFD2332003E7721 /* Nightscout */ = {
+			isa = PBXGroup;
+			children = (
+				3811DE9725C9D88300A708ED /* NightscoutManager.swift */,
+				38FE826C25CC8461001FF17A /* NightscoutAPI.swift */,
+			);
+			path = Nightscout;
+			sourceTree = "<group>";
+		};
 		DDD163032C4C67B400CD525A /* Adjustments */ = {
 			isa = PBXGroup;
 			children = (

FreeAPS/Sources/APS/FetchTreatmentsManager.swift

@@ -31,12 +31,12 @@ final class BaseFetchTreatmentsManager: FetchTreatmentsManager, Injectable {
                     async let carbs = self.nightscoutManager.fetchCarbs()
                     async let tempTargets = self.nightscoutManager.fetchTempTargets()
 
-                    let filteredCarbs = await carbs.filter { !($0.enteredBy?.contains(CarbsEntry.manual) ?? false) }
+                    let filteredCarbs = await carbs.filter { !($0.enteredBy?.contains(CarbsEntry.local) ?? false) }
                     if filteredCarbs.isNotEmpty {
                         await self.carbsStorage.storeCarbs(filteredCarbs, areFetchedFromRemote: true)
                     }
 
-                    let filteredTargets = await tempTargets.filter { !($0.enteredBy?.contains(TempTarget.manual) ?? false) }
+                    let filteredTargets = await tempTargets.filter { !($0.enteredBy?.contains(TempTarget.local) ?? false) }
                     if filteredTargets.isNotEmpty {
                         for tempTarget in filteredTargets {
                             await self.tempTargetsStorage.storeTempTarget(tempTarget: tempTarget)

FreeAPS/Sources/APS/Storage/CarbsStorage.swift

@@ -165,7 +165,7 @@ final class BaseCarbsStorage: CarbsStorage, Injectable {
                 fat: 0,
                 protein: 0,
                 note: nil,
-                enteredBy: CarbsEntry.manual,
+                enteredBy: CarbsEntry.local,
                 isFPU: true,
                 fpuID: fpuID
             )
@@ -365,7 +365,7 @@ final class BaseCarbsStorage: CarbsStorage, Injectable {
                     rate: nil,
                     eventType: .nsCarbCorrection,
                     createdAt: result.date,
-                    enteredBy: CarbsEntry.manual,
+                    enteredBy: CarbsEntry.local,
                     bolus: nil,
                     insulin: nil,
                     notes: result.note,
@@ -402,7 +402,7 @@ final class BaseCarbsStorage: CarbsStorage, Injectable {
                     rate: nil,
                     eventType: .nsCarbCorrection,
                     createdAt: result.date,
-                    enteredBy: CarbsEntry.manual,
+                    enteredBy: CarbsEntry.local,
                     bolus: nil,
                     insulin: nil,
                     carbs: Decimal(result.carbs),
@@ -440,7 +440,7 @@ final class BaseCarbsStorage: CarbsStorage, Injectable {
                     fat: Decimal(result.fat),
                     protein: Decimal(result.protein),
                     note: result.note,
-                    enteredBy: CarbsEntry.manual,
+                    enteredBy: CarbsEntry.local,
                     isFPU: result.isFPU,
                     fpuID: result.fpuID?.uuidString
                 )
@@ -471,7 +471,7 @@ final class BaseCarbsStorage: CarbsStorage, Injectable {
                     fat: nil,
                     protein: nil,
                     note: result.note,
-                    enteredBy: CarbsEntry.manual,
+                    enteredBy: CarbsEntry.local,
                     isFPU: nil,
                     fpuID: nil
                 )

FreeAPS/Sources/APS/Storage/GlucoseStorage.swift

@@ -303,7 +303,7 @@ final class BaseGlucoseStorage: GlucoseStorage, Injectable {
                     rate: nil,
                     eventType: .capillaryGlucose,
                     createdAt: result.date,
-                    enteredBy: CarbsEntry.manual,
+                    enteredBy: CarbsEntry.local,
                     bolus: nil,
                     insulin: nil,
                     notes: "Trio User",

FreeAPS/Sources/APS/Storage/TempTargetsStorage.swift

@@ -246,10 +246,10 @@ final class BaseTempTargetsStorage: TempTargetsStorage, Injectable {
                     rate: nil,
                     eventType: .nsTempTarget,
                     createdAt: tempTarget.date ?? Date(),
-                    enteredBy: TempTarget.manual,
+                    enteredBy: TempTarget.local,
                     bolus: nil,
                     insulin: nil,
-                    notes: tempTarget.name ?? "Custom Temporary Target",
+                    notes: tempTarget.name ?? TempTarget.custom,
                     carbs: nil,
                     targetTop: tempTarget
                         .target as Decimal? ?? (self.settingsManager.settings.units == .mgdL ? 100.0 : 100.asMmolL),
@@ -287,10 +287,10 @@ final class BaseTempTargetsStorage: TempTargetsStorage, Injectable {
                     rate: nil,
                     eventType: .nsTempTarget,
                     createdAt: (tempTargetRun.startDate ?? tempTargetRun.tempTarget?.date) ?? Date(),
-                    enteredBy: TempTarget.manual,
+                    enteredBy: TempTarget.local,
                     bolus: nil,
                     insulin: nil,
-                    notes: nil,
+                    notes: tempTargetRun.tempTarget?.name ?? TempTarget.custom,
                     carbs: nil,
                     targetTop: tempTargetRun
                         .target as Decimal? ?? (self.settingsManager.settings.units == .mgdL ? 100.0 : 100.asMmolL),

FreeAPS/Sources/Models/AlertEntry.swift

@@ -15,7 +15,7 @@ struct AlertEntry: JSON, Codable, Hashable {
     let contentBody: String?
     var errorMessage: String?
 
-    static let manual = "Trio"
+    static let local = "Trio"
 
     static func == (lhs: AlertEntry, rhs: AlertEntry) -> Bool {
         lhs.issuedDate == rhs.issuedDate

FreeAPS/Sources/Models/CarbsEntry.swift

@@ -13,7 +13,7 @@ struct CarbsEntry: JSON, Equatable, Hashable, Identifiable {
     let isFPU: Bool?
     let fpuID: String?
 
-    static let manual = "Trio"
+    static let local = "Trio"
     static let appleHealth = "applehealth"
 
     static func == (lhs: CarbsEntry, rhs: CarbsEntry) -> Bool {

FreeAPS/Sources/Models/TempTarget.swift

@@ -13,7 +13,7 @@ struct TempTarget: JSON, Identifiable, Equatable, Hashable {
     let enabled: Bool?
     let halfBasalTarget: Decimal?
 
-    static let manual = "Trio"
+    static let local = "Trio"
     static let custom = "Temp Target"
     static let cancel = "Cancel"
 
@@ -36,7 +36,7 @@ struct TempTarget: JSON, Identifiable, Equatable, Hashable {
             targetTop: 0,
             targetBottom: 0,
             duration: 0,
-            enteredBy: TempTarget.manual,
+            enteredBy: TempTarget.local,
             reason: TempTarget.cancel,
             isPreset: nil,
             enabled: nil,

FreeAPS/Sources/Modules/Adjustments/AdjustmentsStateModel+Extensions/AdjustmentsStateModel+TempTargets.swift

@@ -127,7 +127,7 @@ extension Adjustments.StateModel {
             targetTop: tempTargetTarget,
             targetBottom: tempTargetTarget,
             duration: tempTargetDuration,
-            enteredBy: TempTarget.manual,
+            enteredBy: TempTarget.local,
             reason: TempTarget.custom,
             isPreset: false,
             enabled: false,
@@ -185,7 +185,7 @@ extension Adjustments.StateModel {
             targetTop: tempTargetTarget,
             targetBottom: tempTargetTarget,
             duration: tempTargetDuration,
-            enteredBy: TempTarget.manual,
+            enteredBy: TempTarget.local,
             reason: TempTarget.custom,
             isPreset: false,
             enabled: true,
@@ -206,7 +206,7 @@ extension Adjustments.StateModel {
             targetTop: tempTargetTarget,
             targetBottom: tempTargetTarget,
             duration: tempTargetDuration,
-            enteredBy: TempTarget.manual,
+            enteredBy: TempTarget.local,
             reason: TempTarget.custom,
             isPreset: true,
             enabled: false,
@@ -245,7 +245,7 @@ extension Adjustments.StateModel {
                 targetTop: tempTargetToEnact?.target?.decimalValue,
                 targetBottom: tempTargetToEnact?.target?.decimalValue,
                 duration: tempTargetToEnact?.duration?.decimalValue ?? 0,
-                enteredBy: TempTarget.manual,
+                enteredBy: TempTarget.local,
                 reason: TempTarget.custom,
                 isPreset: true,
                 enabled: true,

FreeAPS/Sources/Modules/Adjustments/View/TempTargets/EditTempTargetForm.swift

@@ -329,7 +329,7 @@ struct EditTempTargetForm: View {
                                     targetTop: target,
                                     targetBottom: target,
                                     duration: duration,
-                                    enteredBy: TempTarget.manual,
+                                    enteredBy: TempTarget.local,
                                     reason: TempTarget.custom,
                                     isPreset: isPreset ? true : false,
                                     enabled: isEnabled ? true : false,

FreeAPS/Sources/Modules/DataTable/DataTableStateModel.swift

@@ -159,7 +159,7 @@ extension DataTable {
                                 withSyncId: id,
                                 carbs: Decimal(carbEntry.carbs),
                                 at: entryDate,
-                                enteredBy: CarbsEntry.manual
+                                enteredBy: CarbsEntry.local
                             )
                         }
                     }

FreeAPS/Sources/Modules/Treatments/TreatmentsStateModel.swift

@@ -542,7 +542,7 @@ extension Treatments {
                 fat: fat,
                 protein: protein,
                 note: note,
-                enteredBy: CarbsEntry.manual,
+                enteredBy: CarbsEntry.local,
                 isFPU: false, fpuID: UUID().uuidString
             )]
             await carbsStorage.storeCarbs(carbsToStore, areFetchedFromRemote: false)

FreeAPS/Sources/Services/Network/NightscoutAPI.swift

@@ -108,7 +108,7 @@ extension NightscoutAPI {
             URLQueryItem(name: "find[carbs][$exists]", value: "true"),
             URLQueryItem(
                 name: "find[enteredBy][$ne]",
-                value: CarbsEntry.manual.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
+                value: CarbsEntry.local.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
             ),
             URLQueryItem(
                 name: "find[enteredBy][$ne]",
@@ -247,7 +247,7 @@ extension NightscoutAPI {
             URLQueryItem(name: "find[eventType]", value: "Temporary+Target"),
             URLQueryItem(
                 name: "find[enteredBy][$ne]",
-                value: TempTarget.manual.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
+                value: TempTarget.local.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
             ),
             URLQueryItem(
                 name: "find[enteredBy][$ne]",

FreeAPS/Sources/Services/RemoteControl/TrioRemoteControl+Meal.swift

@@ -67,7 +67,7 @@ extension TrioRemoteControl {
             fat: fatDecimal,
             protein: proteinDecimal,
             note: "Remote meal command",
-            enteredBy: CarbsEntry.manual,
+            enteredBy: CarbsEntry.local,
             isFPU: false,
             fpuID: nil
         )

FreeAPS/Sources/Services/RemoteControl/TrioRemoteControl+TempTarget.swift

@@ -18,7 +18,7 @@ extension TrioRemoteControl {
             targetTop: Decimal(targetValue),
             targetBottom: Decimal(targetValue),
             duration: Decimal(durationInMinutes),
-            enteredBy: TempTarget.manual,
+            enteredBy: TempTarget.local,
             reason: TempTarget.custom,
             isPreset: false,
             enabled: true,

FreeAPS/Sources/Services/WatchManager/WatchManager.swift

@@ -433,7 +433,7 @@ extension BaseWatchManager: WCSessionDelegate {
                         fat: Decimal(fat),
                         protein: Decimal(protein),
                         note: nil,
-                        enteredBy: CarbsEntry.manual,
+                        enteredBy: CarbsEntry.local,
                         isFPU: false,
                         fpuID: nil
                     )],
@@ -459,7 +459,7 @@ extension BaseWatchManager: WCSessionDelegate {
                         targetTop: 0,
                         targetBottom: 0,
                         duration: 0,
-                        enteredBy: TempTarget.manual,
+                        enteredBy: TempTarget.local,
                         reason: TempTarget.cancel,
                         isPreset: false,
                         enabled: false,

FreeAPS/Sources/Shortcuts/Carbs/CarbPresetIntentRequest.swift

@@ -23,7 +23,7 @@ import Foundation
                 fat: Decimal(quantityFat),
                 protein: Decimal(quantityProtein),
                 note: "add with shortcuts",
-                enteredBy: CarbsEntry.manual,
+                enteredBy: CarbsEntry.local,
                 isFPU: false, fpuID: nil
             )],
             areFetchedFromRemote: false