Self hosted FLOSS fitness/workout, nutrition and weight tracker
Look up the dynamic categories of a write in one query
Roland Geider0beca36b831a
diff --git a/wger/measurements/signals.py b/wger/measurements/signals.pyindex 536c855f5..0d55bf92a 100644--- a/wger/measurements/signals.py+++ b/wger/measurements/signals.py@@ -56,6 +56,9 @@ def _dispatch_source_change(sender, instance):if isinstance(instance, Measurement) and instance.source == MeasurementSource.CALCULATED:return+ # One category query per owner instead of one per type: almost every+ # write belongs to a user without any calculated category+ wanted: dict[int, set[str]] = {}for calc in all_types():for dep in calc.depends_on:if dep.model is not sender:@@ -69,13 +72,15 @@ def _dispatch_source_change(sender, instance):continueif user_id is None:continue-- categories = Category.objects.filter(- user_id=user_id,- dynamic_type=calc.slug,- ).values_list('pk', flat=True)- for category_id in categories:- schedule_reconcile(category_id)+ wanted.setdefault(user_id, set()).add(calc.slug)++ for user_id, slugs in wanted.items():+ categories = Category.objects.filter(+ user_id=user_id,+ dynamic_type__in=slugs,+ ).values_list('pk', flat=True)+ for category_id in categories:+ schedule_reconcile(category_id)@disable_for_loaddatadiff --git a/wger/measurements/tests/test_dynamic.py b/wger/measurements/tests/test_dynamic.pyindex 182084765..6e7666b9d 100644--- a/wger/measurements/tests/test_dynamic.py+++ b/wger/measurements/tests/test_dynamic.py@@ -37,6 +37,7 @@ from wger.measurements.models import ()from wger.measurements.models.measurement import MeasurementSourcefrom wger.measurements.powersync import MeasurementHandler+from wger.measurements.signals import _dispatch_source_changefrom wger.measurements.tasks import reconcile_all_dynamic_categories_task@@ -1211,6 +1212,35 @@ class OneRmTotalTestCase(DynamicMeasurementTestCase):self.assertEqual(rows.count(), 1)self.assertEqual(rows[0].value, Decimal('197.22'))+ def test_one_log_write_feeds_both_one_rm_types(self):+ """+ A single set updates every calculated category that depends on it+ """+ total = self.enable_total()+ with self.captureOnCommitCallbacks(execute=True):+ single = Category.objects.create(+ user=self.user,+ name='1RM',+ unit='kg',+ dynamic_type=Category.DynamicType.ONE_REP_MAX,+ dynamic_params={'exercise_id': 1},+ )++ self.make_log('100', 5, exercise_id=1)+ self.make_log('80', 3, exercise_id=2)++ self.assertEqual(self.calculated_rows(single).count(), 1)+ self.assertEqual(self.calculated_rows(total).count(), 1)++ def test_the_dispatch_costs_one_query_per_write(self):+ """+ The categories of every type are looked up together, not one by one+ """+ log = self.make_log('100', 5)++ with self.assertNumQueries(1):+ _dispatch_source_change(WorkoutLog, log)+def test_window_max_beats_todays_set(self):"""The best set of the window counts, not the most recent one