Self hosted FLOSS fitness/workout, nutrition and weight tracker
feat(measurements): migrate WeightEntry to Measurement (feature/health-sync)(wger#2328)
pankaj-basnetbcd29597496a
diff --git a/wger/measurements/migrations/0007_category_is_official.py b/wger/measurements/migrations/0007_category_is_official.pynew file mode 100644index 000000000..706301334--- /dev/null+++ b/wger/measurements/migrations/0007_category_is_official.py@@ -0,0 +1,26 @@+from django.db import migrations, models+++class Migration(migrations.Migration):+ dependencies = [+ (+ 'measurements',+ '0006_category_externally_synced_category_metric_type_and_more',+ ),+ ]++ operations = [+ migrations.AddField(+ model_name='category',+ name='is_official',+ field=models.BooleanField(default=False, verbose_name='Official category'),+ ),+ migrations.AddConstraint(+ model_name='category',+ constraint=models.UniqueConstraint(+ condition=models.Q(('is_official', True)),+ fields=('user', 'metric_type'),+ name='unique_official_category_per_metric_type',+ ),+ ),+ ]diff --git a/wger/measurements/migrations/0008_backfill_weight_into_measurements.py b/wger/measurements/migrations/0008_backfill_weight_into_measurements.pynew file mode 100644index 000000000..9815cc809--- /dev/null+++ b/wger/measurements/migrations/0008_backfill_weight_into_measurements.py@@ -0,0 +1,46 @@+from django.db import migrations+++def migrate_weight_to_measurements(apps, schema_editor):+ """+ For every existing WeightEntry, ensure the owning user has an official+ 'body_weight' Category and create a matching Measurement row.+ """+ WeightEntry = apps.get_model('weight', 'WeightEntry')+ Category = apps.get_model('measurements', 'Category')+ Measurement = apps.get_model('measurements', 'Measurement')++ official_category_by_user = {}++ for entry in WeightEntry.objects.all().iterator():+ category = official_category_by_user.get(entry.user_id)+ if category is None:+ category, _ = Category.objects.get_or_create(+ user_id=entry.user_id,+ metric_type='body_weight',+ is_official=True,+ defaults={'name': 'Body weight', 'unit': 'kg'},+ )+ official_category_by_user[entry.user_id] = category++ Measurement.objects.create(+ category=category,+ date=entry.date,+ value=entry.weight,+ source='user',+ )+++def noop_reverse(apps, schema_editor):+ pass+++class Migration(migrations.Migration):+ dependencies = [+ ('measurements', '0007_category_is_official'),+ ('weight', '0005_add_uuid'),+ ]++ operations = [+ migrations.RunPython(migrate_weight_to_measurements, noop_reverse),+ ]diff --git a/wger/measurements/models/category.py b/wger/measurements/models/category.pyindex 497f61a3f..d2046a875 100644--- a/wger/measurements/models/category.py+++ b/wger/measurements/models/category.py@@ -43,6 +43,15 @@ class Category(models.Model):ordering = ['-name',]+ constraints = [+ # official category per (user, metric_type) where is_official=True+ # user-created categories are unaffected+ models.UniqueConstraint(+ fields=['user', 'metric_type'],+ condition=models.Q(is_official=True),+ name='unique_official_category_per_metric_type',+ )+ ]id = models.UUIDField(default=uuid7,@@ -77,8 +86,27 @@ class Category(models.Model):default=False,)+ is_official = models.BooleanField(+ verbose_name='Official category',+ default=False,+ )+def get_owner_object(self):"""Returns the object that has owner information"""return self++ @classmethod+ def get_or_create_official(cls, user, metric_type, *, name, unit):+ """+ Returns the user's official category for `metric_type`. Used also by+ the legacy weight endpoint+ """+ category, _ = cls.objects.get_or_create(+ user=user,+ metric_type=metric_type,+ is_official=True,+ defaults={'name': name, 'unit': unit},+ )+ return categorydiff --git a/wger/weight/api/filtersets.py b/wger/weight/api/filtersets.pyindex 831b9808f..dc09732c7 100644--- a/wger/weight/api/filtersets.py+++ b/wger/weight/api/filtersets.py@@ -17,14 +17,17 @@from django_filters import rest_framework as filters# wger-from wger.weight.models import WeightEntry+from wger.measurements.models import Measurementclass WeightEntryFilterSet(filters.FilterSet):+ weight = filters.NumberFilter(field_name='value', lookup_expr='exact')+ weight__gte = filters.NumberFilter(field_name='value', lookup_expr='gte')+ weight__lte = filters.NumberFilter(field_name='value', lookup_expr='lte')+class Meta:- model = WeightEntry+ model = Measurementfields = {'id': ['exact', 'in'],- 'weight': ['exact', 'gt', 'gte', 'lt', 'lte'],'date': ['exact', 'gt', 'gte', 'lt', 'lte'],}diff --git a/wger/weight/api/serializers.py b/wger/weight/api/serializers.pyindex 42e58ca22..0363451e1 100644--- a/wger/weight/api/serializers.py+++ b/wger/weight/api/serializers.py@@ -15,11 +15,14 @@# You should have received a copy of the GNU Affero General Public License# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.+# Standard Library+from decimal import Decimal+# Third Partyfrom rest_framework import serializers# wger-from wger.weight.models import WeightEntry+from wger.measurements.models import Measurementclass WeightEntrySerializer(serializers.ModelSerializer):@@ -27,10 +30,18 @@ class WeightEntrySerializer(serializers.ModelSerializer):Weight serializer"""- user = serializers.PrimaryKeyRelatedField(read_only=True)+ user = serializers.PrimaryKeyRelatedField(source='category.user', read_only=True)+ weight = serializers.DecimalField(+ source='value',+ max_digits=6,+ decimal_places=2,+ min_value=Decimal(0.0),+ max_value=Decimal(5000.0),+ coerce_to_string=False,+ )class Meta:- model = WeightEntry+ model = Measurementfields = ('id','date',diff --git a/wger/weight/api/views.py b/wger/weight/api/views.pyindex 70c0f05d9..acc4bc729 100644--- a/wger/weight/api/views.py+++ b/wger/weight/api/views.py@@ -19,14 +19,20 @@from rest_framework import viewsets# wger+from wger.measurements.models import (+ Category,+ Measurement,+)+from wger.measurements.models.category import MetricTypefrom wger.weight.api.filtersets import WeightEntryFilterSetfrom wger.weight.api.serializers import WeightEntrySerializer-from wger.weight.models import WeightEntryclass WeightEntryViewSet(viewsets.ModelViewSet):"""API endpoint for nutrition plan objects++ CHANGED (wger#2328): reads/writes measurements.Measurement rows"""serializer_class = WeightEntrySerializer@@ -41,12 +47,19 @@ class WeightEntryViewSet(viewsets.ModelViewSet):"""# REST API generationif getattr(self, 'swagger_fake_view', False):- return WeightEntry.objects.none()+ return Measurement.objects.none()- return WeightEntry.objects.filter(user=self.request.user)+ return Measurement.objects.filter(+ category__user=self.request.user,+ category__metric_type=MetricType.BODY_WEIGHT,+ category__is_official=True,+ )def perform_create(self, serializer):"""- Set the owner+ Route the new entry into the user's official body-weight category"""- serializer.save(user=self.request.user)+ category = Category.get_or_create_official(+ self.request.user, MetricType.BODY_WEIGHT, name='Body weight', unit='kg'+ )+ serializer.save(category=category)diff --git a/wger/weight/models.py b/wger/weight/models.pyindex efb312d49..759957547 100644--- a/wger/weight/models.py+++ b/wger/weight/models.py@@ -32,6 +32,9 @@ from wger.utils.uuid import uuid7class WeightEntry(models.Model):"""Model for a weight point++ DEPRECATED (wger#2328): new weight data is written to+ measurements.Measurement under the user's official 'body_weight'"""uuid = models.UUIDField(