Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add UUIDs to some of the nutrition models
Roland Geiderf700637e329a
diff --git a/manage.py b/manage.pyold mode 100644new mode 100755diff --git a/wger/nutrition/migrations/0025_add_uuids.py b/wger/nutrition/migrations/0025_add_uuids.pynew file mode 100644index 000000000..695c0c314--- /dev/null+++ b/wger/nutrition/migrations/0025_add_uuids.py@@ -0,0 +1,122 @@+# Generated by Django 4.2.16 on 2024-10-19 21:04++from django.db import migrations, models+import uuid+++def gen_uuids(apps, schema_editor):+ NutritionPlan = apps.get_model('nutrition', 'NutritionPlan')+ Meal = apps.get_model('nutrition', 'Meal')+ MealItem = apps.get_model('nutrition', 'MealItem')+ LogItem = apps.get_model('nutrition', 'LogItem')++ for item in LogItem.objects.all():+ item.uuid = uuid.uuid4()+ item.save(update_fields=['uuid'])++ for item in MealItem.objects.all():+ item.uuid = uuid.uuid4()+ item.save(update_fields=['uuid'])++ for meal in Meal.objects.all():+ meal.uuid = uuid.uuid4()+ meal.save(update_fields=['uuid'])++ for plan in NutritionPlan.objects.all():+ plan.uuid = uuid.uuid4()+ plan.save(update_fields=['uuid'])+++class Migration(migrations.Migration):+ dependencies = [+ ('nutrition', '0024_remove_ingredient_status'),+ ]++ operations = [+ migrations.AddField(+ model_name='nutritionplan',+ name='uuid',+ field=models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=True,+ unique=False,+ ),+ ),+ migrations.AddField(+ model_name='meal',+ name='uuid',+ field=models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=True,+ unique=False,+ ),+ ),+ migrations.AddField(+ model_name='mealitem',+ name='uuid',+ field=models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=True,+ unique=False,+ ),+ ),+ migrations.AddField(+ model_name='logitem',+ name='uuid',+ field=models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=True,+ unique=False,+ ),+ ),+ # Generate UUIDs+ migrations.RunPython(+ gen_uuids,+ reverse_code=migrations.RunPython.noop,+ ),+ # Set uuid fields to non-nullable+ migrations.AlterField(+ model_name='nutritionplan',+ name='uuid',+ field=models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=False,+ unique=True,+ ),+ ),+ migrations.AlterField(+ model_name='meal',+ name='uuid',+ field=models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=False,+ unique=True,+ ),+ ),+ migrations.AlterField(+ model_name='mealitem',+ name='uuid',+ field=models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=False,+ unique=True,+ ),+ ),+ migrations.AlterField(+ model_name='logitem',+ name='uuid',+ field=models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=False,+ unique=True,+ ),+ ),+ ]diff --git a/wger/nutrition/migrations/0025_create_ivm_entries.py b/wger/nutrition/migrations/0025_create_ivm_entries.pydeleted file mode 100644index b1d2d290a..000000000--- a/wger/nutrition/migrations/0025_create_ivm_entries.py+++ /dev/null@@ -1,69 +0,0 @@-from django.db import migrations--from wger.utils.db import postgres_only---@postgres_only-def add_ivm_views(apps, schema_editor):- """- Note: the select statements are written a bit weirdly because of this issue- https://github.com/sraoss/pg_ivm/issues/85-- When this is resolved, we can remove the subqueries and write e.g.-- SELECT m.*, p.user_id- FROM nutrition_meal AS m- JOIN nutrition_nutritionplan AS p ON m.plan_id = p.id;- """-- schema_editor.execute(- """- SELECT create_immv(- 'ivm_nutrition_meal',- 'SELECT m.*, p.user_id- FROM (SELECT * FROM nutrition_meal) AS m- JOIN (SELECT id, user_id FROM nutrition_nutritionplan) AS p ON m.plan_id = p.id;'- );- """- )-- schema_editor.execute(- """- SELECT create_immv(- 'ivm_nutrition_mealitem',- 'SELECT mi.*, p.user_id- FROM (SELECT * FROM nutrition_mealitem) AS mi- JOIN (SELECT id, plan_id FROM nutrition_meal) AS m ON mi.meal_id = m.id- JOIN (SELECT id, user_id FROM nutrition_nutritionplan) AS p ON m.plan_id = p.id;'- );- """- )-- schema_editor.execute(- """- SELECT create_immv(- 'ivm_nutrition_logitem',- 'SELECT li.*, p.user_id- FROM (SELECT * FROM nutrition_logitem) AS li- JOIN (SELECT id, user_id FROM nutrition_nutritionplan) AS p ON li.plan_id = p.id;'- );- """- )---@postgres_only-def remove_ivm_views(apps, schema_editor):- schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_mealitem;')- schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_meal;')- schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_logitem;')---class Migration(migrations.Migration):- dependencies = [- ('nutrition', '0024_remove_ingredient_status'),- ('core', '0018_create_publication_add_ivm_extension'),- ]-- operations = [- migrations.RunPython(add_ivm_views, reverse_code=remove_ivm_views),- ]diff --git a/wger/nutrition/migrations/0026_create_ivm_entries.py b/wger/nutrition/migrations/0026_create_ivm_entries.pynew file mode 100644index 000000000..c4087ce97--- /dev/null+++ b/wger/nutrition/migrations/0026_create_ivm_entries.py@@ -0,0 +1,117 @@+from django.db import migrations++from wger.utils.db import postgres_only+++@postgres_only+def add_ivm_views(apps, schema_editor):+ """+ Note: the select statements are written a bit weirdly because of this issue+ https://github.com/sraoss/pg_ivm/issues/85++ When this is resolved, we can remove the subqueries and write e.g.++ SELECT m.*, p.user_id+ FROM nutrition_meal AS m+ JOIN nutrition_nutritionplan AS p ON m.plan_id = p.id;+ """++ schema_editor.execute(+ """+ SELECT create_immv(+ 'ivm_nutrition_nutritionplan',+ 'SELECT+ p.uuid AS id,+ p.id AS remote_id,+ creation_date,+ description,+ has_goal_calories,+ user_id,+ only_logging,+ goal_carbohydrates,+ goal_energy,+ goal_fat,+ goal_protein,+ goal_fiber+ FROM nutrition_nutritionplan AS p;'+ );+ """+ )++ schema_editor.execute(+ """+ SELECT create_immv(+ 'ivm_nutrition_meal',+ 'SELECT+ m.uuid AS id,+ m.id AS remote_id,+ "order",+ time,+ plan_id,+ name,+ p.user_id+ FROM (SELECT * FROM nutrition_meal) AS m+ JOIN (SELECT id, user_id FROM nutrition_nutritionplan) AS p ON m.plan_id = p.id;'+ );+ """+ )++ schema_editor.execute(+ """+ SELECT create_immv(+ 'ivm_nutrition_mealitem',+ 'SELECT+ mi.uuid AS id,+ mi.id AS remote_id,+ "order",+ amount,+ ingredient_id,+ meal_id,+ weight_unit_id,+ p.user_id+ FROM (SELECT * FROM nutrition_mealitem) AS mi+ JOIN (SELECT id, plan_id FROM nutrition_meal) AS m ON mi.meal_id = m.id+ JOIN (SELECT id, user_id FROM nutrition_nutritionplan) AS p ON m.plan_id = p.id;'+ );+ """+ )++ schema_editor.execute(+ """+ SELECT create_immv(+ 'ivm_nutrition_logitem',+ 'SELECT+ li.uuid as id,+ li.id AS remote_id,+ datetime,+ comment,+ amount,+ ingredient_id,+ plan_id,+ weight_unit_id,+ meal_id,+ p.user_id+ FROM (SELECT * FROM nutrition_logitem) AS li+ JOIN (SELECT id, user_id FROM nutrition_nutritionplan) AS p ON li.plan_id = p.id;'+ );+ """+ )+++@postgres_only+def remove_ivm_views(apps, schema_editor):+ schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_nutritionplan;')+ schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_meal;')+ schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_mealitem;')+ schema_editor.execute('DROP TABLE IF EXISTS ivm_nutrition_logitem;')+++class Migration(migrations.Migration):+ dependencies = [+ ('nutrition', '0025_add_uuids'),+ ('core', '0018_create_publication_add_ivm_extension'),+ ]++ operations = [+ migrations.RunPython(add_ivm_views, reverse_code=remove_ivm_views),+ ]diff --git a/wger/nutrition/models/log.py b/wger/nutrition/models/log.pyindex 0f51d3905..4ba14c475 100644--- a/wger/nutrition/models/log.py+++ b/wger/nutrition/models/log.py@@ -15,6 +15,7 @@# along with this program. If not, see <http://www.gnu.org/licenses/>.# Standard Library+import uuidfrom decimal import Decimal# Django@@ -47,6 +48,13 @@ class LogItem(BaseMealItem, models.Model):'-datetime',]+ uuid = models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=False,+ unique=True,+ )+plan = models.ForeignKey(NutritionPlan,verbose_name=_('Nutrition plan'),diff --git a/wger/nutrition/models/meal.py b/wger/nutrition/models/meal.pyindex b32185c73..0a6dfd11a 100644--- a/wger/nutrition/models/meal.py+++ b/wger/nutrition/models/meal.py@@ -16,6 +16,7 @@# Standard Libraryimport logging+import uuid# Djangofrom django.db import models@@ -43,6 +44,13 @@ class Meal(models.Model):'time',]+ uuid = models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=False,+ unique=True,+ )+plan = models.ForeignKey(NutritionPlan,verbose_name=_('Nutrition plan'),diff --git a/wger/nutrition/models/meal_item.py b/wger/nutrition/models/meal_item.pyindex a2b64147b..0e266f4fe 100644--- a/wger/nutrition/models/meal_item.py+++ b/wger/nutrition/models/meal_item.py@@ -16,6 +16,7 @@# Standard Libraryimport logging+import uuidfrom decimal import Decimal# Django@@ -43,6 +44,13 @@ class MealItem(BaseMealItem, models.Model):An item (component) of a meal"""+ uuid = models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=False,+ unique=True,+ )+meal = models.ForeignKey(Meal,verbose_name=_('Nutrition plan'),diff --git a/wger/nutrition/models/plan.py b/wger/nutrition/models/plan.pyindex 8cea374fb..949b4d0af 100644--- a/wger/nutrition/models/plan.py+++ b/wger/nutrition/models/plan.py@@ -17,7 +17,7 @@# Standard Libraryimport datetimeimport logging-from decimal import Decimal+import uuid# Djangofrom django.contrib.auth.models import User@@ -30,7 +30,6 @@ from django.utils.translation import gettext_lazy as _from wger.nutrition.consts import ENERGY_FACTORfrom wger.nutrition.helpers import NutritionalValuesfrom wger.utils.cache import cache_mapper-from wger.utils.constants import TWOPLACESfrom wger.weight.models import WeightEntry@@ -49,6 +48,13 @@ class NutritionPlan(models.Model):'-creation_date',]+ uuid = models.UUIDField(+ default=uuid.uuid4,+ editable=False,+ null=False,+ unique=True,+ )+user = models.ForeignKey(User,verbose_name=_('User'),