Update MeasurementCrudUseCases.kt to ensure the newly generated measurement ID is passed to the sync triggers during insertion and remove unused filtering and aggregation methods from MeasurementFacade.kt.

Author: oliexdev

android_app/app/src/main/java/com/health/openscale/core/facade/MeasurementFacade.kt

@@ -113,22 +113,6 @@ class MeasurementFacade @Inject constructor(
         }
     }
 
-    // -------------------------------------------------------------------------
-    // Time-filtered enriched flow (no aggregation, used internally)
-    // -------------------------------------------------------------------------
-
-    fun timeFilteredEnrichedFlow(
-        userId: Int,
-        measurementTypesFlow: Flow<List<MeasurementType>>,
-        startTimeMillis: Long?,
-        endTimeMillis: Long?,
-    ): Flow<List<EnrichedMeasurement>> =
-        filter.getTimeFiltered(
-            enrichedFlowForUser(userId, measurementTypesFlow),
-            startTimeMillis,
-            endTimeMillis,
-        )
-
     // -------------------------------------------------------------------------
     // Full pipeline: query → enrich → filter → smooth → aggregate
     // -------------------------------------------------------------------------
@@ -188,15 +172,6 @@ class MeasurementFacade @Inject constructor(
         )
     }
 
-    // -------------------------------------------------------------------------
-    // Convenience wrapper (used by callers that already have a list)
-    // -------------------------------------------------------------------------
-
-    fun aggregateList(
-        measurements: List<EnrichedMeasurement>,
-        level: AggregationLevel,
-    ): List<AggregatedMeasurement> = aggregation.aggregate(measurements, level)
-
     // -------------------------------------------------------------------------
     // BLE
     // -------------------------------------------------------------------------
@@ -278,9 +253,4 @@ class MeasurementFacade @Inject constructor(
         selectedTimestamp: Long,
         items: List<MeasurementWithValues>,
     ) = query.findClosestMeasurement(selectedTimestamp, items)
-
-    fun filterByTypes(
-        measurements: List<EnrichedMeasurement>,
-        selectedTypeIds: Set<Int>,
-    ): List<EnrichedMeasurement> = filter.filterByTypes(measurements, selectedTypeIds)
 }

android_app/app/src/main/java/com/health/openscale/core/usecase/MeasurementCrudUseCases.kt

@@ -74,14 +74,15 @@ class MeasurementCrudUseCases @Inject constructor(
         if (measurement.id == 0) {
             // Insert path
             val newId = databaseRepository.insertMeasurement(measurement).toInt()
+            val measurementWithId = measurement.copy(id = newId)
 
             finalValues.forEach { v ->
                 databaseRepository.insertMeasurementValue(v.copy(measurementId = newId))
             }
 
-            sync.triggerSyncInsert(measurement, finalValues,"com.health.openscale.sync")
-            sync.triggerSyncInsert(measurement, finalValues,"com.health.openscale.sync.oss")
-            sync.triggerSyncInsert(measurement, finalValues,"com.health.openscale.sync.debug")
+            sync.triggerSyncInsert(measurementWithId, finalValues,"com.health.openscale.sync")
+            sync.triggerSyncInsert(measurementWithId, finalValues,"com.health.openscale.sync.oss")
+            sync.triggerSyncInsert(measurementWithId, finalValues,"com.health.openscale.sync.debug")
 
             MeasurementWidget.refreshAll(appContext)