Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rename unit to category and remove user foreign key

Roland Geider3a2629640a36
diff --git a/wger/measurements/api/serializers.py b/wger/measurements/api/serializers.py
index 23fb2e203..47290cd6a 100644
--- a/wger/measurements/api/serializers.py
+++ b/wger/measurements/api/serializers.py
@@ -31,7 +31,7 @@ class MeasurementSerializer(serializers.ModelSerializer):
model = Measurement
fields = [
'id',
- 'unit',
+ 'category',
'date',
'value',
'notes',
diff --git a/wger/measurements/api/views.py b/wger/measurements/api/views.py
index e0efc11b3..cc916c7aa 100644
--- a/wger/measurements/api/views.py
+++ b/wger/measurements/api/views.py
@@ -74,7 +74,7 @@ class MeasurementViewSet(viewsets.ModelViewSet):
ordering_fields = '__all__'
filterset_fields = [
'id',
- 'unit',
+ 'category',
'date',
'value',
]
@@ -83,10 +83,4 @@ class MeasurementViewSet(viewsets.ModelViewSet):
"""
Only allow access to appropriate objects
"""
- return Measurement.objects.filter(user=self.request.user)
-
- def perform_create(self, serializer):
- """
- Set the owner
- """
- serializer.save(user=self.request.user)
+ return Measurement.objects.filter(category__user=self.request.user)
diff --git a/wger/measurements/fixtures/test-measurements.json b/wger/measurements/fixtures/test-measurements.json
index 6ec62ed2c..04b828e2a 100644
--- a/wger/measurements/fixtures/test-measurements.json
+++ b/wger/measurements/fixtures/test-measurements.json
@@ -3,8 +3,7 @@
"pk": 1,
"model": "measurements.measurement",
"fields": {
- "user": 2,
- "unit": 1,
+ "category": 1,
"date": "2021-07-01",
"value": 20
}
@@ -13,8 +12,7 @@
"pk": 2,
"model": "measurements.measurement",
"fields": {
- "user": 2,
- "unit": 2,
+ "category": 2,
"date": "2021-07-01",
"value": 100.5
}
@@ -23,8 +21,7 @@
"pk": 3,
"model": "measurements.measurement",
"fields": {
- "user": 2,
- "unit": 1,
+ "category": 1,
"date": "2021-07-10",
"value": 21,
"notes": "some extra information"
diff --git a/wger/measurements/models/measurement.py b/wger/measurements/models/measurement.py
index 9dc2cc53d..c9723c81c 100644
--- a/wger/measurements/models/measurement.py
+++ b/wger/measurements/models/measurement.py
@@ -53,13 +53,7 @@ class Measurement(models.Model):
"-date",
]
- user = models.ForeignKey(
- User,
- verbose_name=_('User'),
- on_delete=models.CASCADE,
- )
-
- unit = models.ForeignKey(
+ category = models.ForeignKey(
Category,
verbose_name=_('User'),
on_delete=models.CASCADE,
@@ -90,4 +84,4 @@ class Measurement(models.Model):
"""
Returns the object that has owner information
"""
- return self
+ return self.category
diff --git a/wger/measurements/tests/test_measurements.py b/wger/measurements/tests/test_measurements.py
index 245fd773d..64234109c 100644
--- a/wger/measurements/tests/test_measurements.py
+++ b/wger/measurements/tests/test_measurements.py
@@ -27,4 +27,8 @@ class MeasurementsApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 1
resource = Measurement
private_resource = True
- data = {"unit": 2, "date": "2021-08-12", "value": 99.99}
+ data = {
+ 'category': 2,
+ 'date': '2021-08-12',
+ 'value': 99.99,
+ }