Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Index the measurements by category and date

Roland Geiderbf3a81f3ec66
diff --git a/wger/measurements/api/filtersets.py b/wger/measurements/api/filtersets.py
index 2f9df2eab..0b54cf3fe 100644
--- a/wger/measurements/api/filtersets.py
+++ b/wger/measurements/api/filtersets.py
@@ -31,5 +31,4 @@ class MeasurementEntryFilterSet(filters.FilterSet):
],
'date': ['exact', 'gt', 'gte', 'lt', 'lte'],
'source': ['exact'],
- 'external_id': ['exact'],
}
diff --git a/wger/measurements/migrations/0006_category_externally_synced_category_metric_type_and_more.py b/wger/measurements/migrations/0006_category_externally_synced_category_metric_type_and_more.py
index 7a4f3c78b..452beaa8c 100644
--- a/wger/measurements/migrations/0006_category_externally_synced_category_metric_type_and_more.py
+++ b/wger/measurements/migrations/0006_category_externally_synced_category_metric_type_and_more.py
@@ -86,4 +86,15 @@ class Migration(migrations.Migration):
name='unique_external_measurement',
),
),
+ migrations.AlterModelOptions(
+ name='measurement',
+ options={'ordering': ['-date', '-id']},
+ ),
+ migrations.AddIndex(
+ model_name='measurement',
+ index=models.Index(
+ fields=['category', '-date', '-id'],
+ name='measurement_category_date',
+ ),
+ ),
]
diff --git a/wger/measurements/models/measurement.py b/wger/measurements/models/measurement.py
index 59b32d290..0963606bf 100644
--- a/wger/measurements/models/measurement.py
+++ b/wger/measurements/models/measurement.py
@@ -41,8 +41,23 @@ class MeasurementSource(models.TextChoices):
class Measurement(models.Model):
class Meta:
+ # The id breaks ties on the date: entries written by the health sync
+ # share a timestamp (a day aggregate sits on midnight, the components
+ # of a reading on its exact time), and clients page through the entries
+ # of a category with limit/offset, which needs a total order to not
+ # skip or repeat rows
ordering = [
'-date',
+ '-id',
+ ]
+ indexes = [
+ # Entries are always read per category and in date order (listing,
+ # charts, date filters, latest entry). Without this the category is
+ # scanned in full and sorted for every page
+ models.Index(
+ fields=['category', '-date', '-id'],
+ name='measurement_category_date',
+ ),
]
constraints = [
models.UniqueConstraint(
diff --git a/wger/weight/api/views.py b/wger/weight/api/views.py
index de87f92c1..daf78a55c 100644
--- a/wger/weight/api/views.py
+++ b/wger/weight/api/views.py
@@ -47,8 +47,9 @@ class WeightEntryViewSet(viewsets.ModelViewSet):
if getattr(self, 'swagger_fake_view', False):
return Measurement.objects.none()
- # Measurement orders by -date, the historic weight endpoint by date
- return Measurement.body_weight_for(self.request.user).order_by('date')
+ # Measurement orders by -date, the historic weight endpoint by date.
+ # The id breaks ties so that paging through the entries is stable
+ return Measurement.body_weight_for(self.request.user).order_by('date', 'id')
def perform_create(self, serializer):
"""