clean up

FreeAPS/Sources/Modules/DataTable/DataTableDataFlow.swift

@@ -222,5 +222,4 @@ protocol DataTableProvider: Provider {
     func carbs() -> [CarbsEntry]
     func deleteCarbs(_ treatement: DataTable.Treatment)
     func deleteInsulin(_ treatement: DataTable.Treatment)
-    func deleteGlucose(id: String)
 }

FreeAPS/Sources/Modules/DataTable/DataTableProvider.swift

@@ -42,11 +42,6 @@ extension DataTable {
             }
         }
 
-        func deleteGlucose(id: String) {
-            glucoseStorage.removeGlucose(ids: [id])
-            healthkitManager.deleteGlucose(syncID: id)
-        }
-
         func deleteManualGlucose(date: Date?) {
             nightscoutManager.deleteManualGlucose(at: date ?? .distantPast)
         }

FreeAPS/Sources/Modules/DataTable/DataTableStateModel.swift

@@ -186,39 +186,7 @@ extension DataTable {
                 print("authentication error: \(error.localizedDescription)")
             }
         }
-
-        func deleteGlucose(_ glucose: Glucose) {
-            let id = glucose.id
-            provider.deleteGlucose(id: id)
-
-            let fetchRequest: NSFetchRequest<NSFetchRequestResult>
-            fetchRequest = NSFetchRequest(entityName: "GlucoseStored")
-            fetchRequest.predicate = NSPredicate(format: "id == %@", id)
-            let deleteRequest = NSBatchDeleteRequest(
-                fetchRequest: fetchRequest
-            )
-            deleteRequest.resultType = .resultTypeObjectIDs
-            do {
-                let deleteResult = try coredataContext.execute(deleteRequest) as? NSBatchDeleteResult
-                if let objectIDs = deleteResult?.result as? [NSManagedObjectID] {
-                    NSManagedObjectContext.mergeChanges(
-                        fromRemoteContextSave: [NSDeletedObjectsKey: objectIDs],
-                        into: [coredataContext]
-                    )
-                }
-                debugPrint("Data Table State: \(CoreDataStack.identifier) \(DebuggingIdentifiers.succeeded) deleted glucose")
-            } catch {
-                debugPrint(
-                    "Data Table State: \(CoreDataStack.identifier) \(DebuggingIdentifiers.failed) failed to delete glucose"
-                )
-            }
-
-            // Deletes Manual Glucose
-            if (glucose.glucose.type ?? "") == GlucoseType.manual.rawValue {
-                provider.deleteManualGlucose(date: glucose.glucose.dateString)
-            }
-        }
-
+        
         func addManualGlucose() {
             let glucose = units == .mmolL ? manualGlucose.asMgdL : manualGlucose
             let glucoseAsInt = Int(glucose)
@@ -237,7 +205,7 @@ extension DataTable {
                 type: GlucoseType.manual.rawValue
             )
 
-            //TODO: -do we need this?
+            // TODO: -do we need this?
             // Save to Health
             var saveToHealth = [BloodGlucose]()
             saveToHealth.append(saveToJSON)

FreeAPS/Sources/Modules/DataTable/View/DataTableRootView.swift

@@ -441,64 +441,6 @@ extension DataTable {
             }
         }
 
-//        @ViewBuilder private func glucoseView(_ item: Glucose, isManual: BloodGlucose) -> some View {
-//            HStack {
-//                Text(item.glucose.glucose.map {
-//                    (
-//                        isManual.type == GlucoseType.manual.rawValue ?
-//                            manualGlucoseFormatter :
-//                            glucoseFormatter
-//                    )
-//                    .string(from: Double(
-//                        state.units == .mmolL ? $0.asMmolL : Decimal($0)
-//                    ) as NSNumber)!
-//                } ?? "--")
-//                if isManual.type == GlucoseType.manual.rawValue {
-//                    Image(systemName: "drop.fill").symbolRenderingMode(.monochrome).foregroundStyle(.red)
-//                } else {
-//                    Text(item.glucose.direction?.symbol ?? "--")
-//                }
-//                Spacer()
-//
-//                Text(dateFormatter.string(from: item.glucose.dateString))
-//            }
-//            .swipeActions {
-//                Button(
-//                    "Delete",
-//                    systemImage: "trash.fill",
-//                    role: .none,
-//                    action: {
-//                        alertGlucoseToDelete = item
-//                        let valueText = (
-//                            isManual.type == GlucoseType.manual.rawValue ?
-//                                manualGlucoseFormatter :
-//                                glucoseFormatter
-//                        ).string(from: Double(
-//                            state.units == .mmolL ? Double(item.glucose.value.asMmolL) : item.glucose.value
-//                        ) as NSNumber)! + " " + state.units.rawValue
-//                        alertTitle = "Delete Glucose?"
-//                        alertMessage = dateFormatter.string(from: item.glucose.dateString) + ", " + valueText
-//                        isRemoveHistoryItemAlertPresented = true
-//                    }
-//                ).tint(.red)
-//            }
-//            .alert(
-//                Text(NSLocalizedString(alertTitle, comment: "")),
-//                isPresented: $isRemoveHistoryItemAlertPresented
-//            ) {
-//                Button("Cancel", role: .cancel) {}
-//                Button("Delete", role: .destructive) {
-//                    guard let glucoseToDelete = alertGlucoseToDelete else {
-//                        print("Cannot unwrap alertTreatmentToDelete!")
-//                        return
-//                    }
-//                    state.deleteGlucose(glucoseToDelete)
-//                }
-//            } message: {
-//                Text("\n" + NSLocalizedString(alertMessage, comment: ""))
-//            }
-//        }
-
         // MARK: - Format glucose
 
         private func formatGlucose(_ value: Int16, isManual: Bool) -> String {