cleanup migrations, remove pint to speed up base conversion and calculate properties on converted ingredients

cookbook/migrations/0189_foodproperty_propertytype_recipeproperty_and_more.py

@@ -0,0 +1,181 @@
+# Generated by Django 4.1.7 on 2023-05-06 19:16
+
+import cookbook.models
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django_prometheus.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0188_space_no_sharing_limit'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='FoodProperty',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('food_amount', models.DecimalField(decimal_places=2, default=0, max_digits=32)),
+                ('property_amount', models.DecimalField(decimal_places=4, default=0, max_digits=32)),
+            ],
+            bases=(models.Model, cookbook.models.PermissionModelMixin),
+        ),
+        migrations.CreateModel(
+            name='PropertyType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128)),
+                ('unit', models.CharField(blank=True, max_length=64, null=True)),
+                ('icon', models.CharField(blank=True, max_length=16, null=True)),
+                ('description', models.CharField(blank=True, max_length=512, null=True)),
+                ('category', models.CharField(blank=True, choices=[('NUTRITION', 'Nutrition'), ('ALLERGEN', 'Allergen'), ('PRICE', 'Price'), ('GOAL', 'Goal'), ('OTHER', 'Other')], max_length=64, null=True)),
+                ('open_data_slug', models.CharField(blank=True, default=None, max_length=128, null=True)),
+            ],
+            bases=(models.Model, cookbook.models.PermissionModelMixin),
+        ),
+        migrations.CreateModel(
+            name='RecipeProperty',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('property_amount', models.DecimalField(decimal_places=4, default=0, max_digits=32)),
+            ],
+            bases=(models.Model, cookbook.models.PermissionModelMixin),
+        ),
+        migrations.CreateModel(
+            name='UnitConversion',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('base_amount', models.DecimalField(decimal_places=16, default=0, max_digits=32)),
+                ('converted_amount', models.DecimalField(decimal_places=16, default=0, max_digits=32)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('open_data_slug', models.CharField(blank=True, default=None, max_length=128, null=True)),
+            ],
+            bases=(django_prometheus.models.ExportModelOperationsMixin('unit_conversion'), models.Model, cookbook.models.PermissionModelMixin),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='fdc_id',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='open_data_slug',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='preferred_shopping_unit',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='preferred_shopping_unit', to='cookbook.unit'),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='preferred_unit',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='preferred_unit', to='cookbook.unit'),
+        ),
+        migrations.AddField(
+            model_name='supermarket',
+            name='open_data_slug',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='supermarketcategory',
+            name='open_data_slug',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='unit',
+            name='base_unit',
+            field=models.TextField(blank=True, default=None, max_length=256, null=True),
+        ),
+        migrations.AddField(
+            model_name='unit',
+            name='open_data_slug',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddConstraint(
+            model_name='supermarketcategoryrelation',
+            constraint=models.UniqueConstraint(fields=('supermarket', 'category'), name='unique_sm_category_relation'),
+        ),
+        migrations.AddField(
+            model_name='unitconversion',
+            name='base_unit',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unit_conversion_base_relation', to='cookbook.unit'),
+        ),
+        migrations.AddField(
+            model_name='unitconversion',
+            name='converted_unit',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unit_conversion_converted_relation', to='cookbook.unit'),
+        ),
+        migrations.AddField(
+            model_name='unitconversion',
+            name='created_by',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='unitconversion',
+            name='food',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.food'),
+        ),
+        migrations.AddField(
+            model_name='unitconversion',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AddField(
+            model_name='recipeproperty',
+            name='property_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.propertytype'),
+        ),
+        migrations.AddField(
+            model_name='recipeproperty',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AddField(
+            model_name='propertytype',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AddField(
+            model_name='foodproperty',
+            name='food',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.food'),
+        ),
+        migrations.AddField(
+            model_name='foodproperty',
+            name='food_unit',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.unit'),
+        ),
+        migrations.AddField(
+            model_name='foodproperty',
+            name='property_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.propertytype'),
+        ),
+        migrations.AddField(
+            model_name='foodproperty',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AddField(
+            model_name='recipe',
+            name='properties',
+            field=models.ManyToManyField(blank=True, to='cookbook.recipeproperty'),
+        ),
+        migrations.AddConstraint(
+            model_name='unitconversion',
+            constraint=models.UniqueConstraint(fields=('space', 'base_unit', 'converted_unit', 'food'), name='f_unique_conversion_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='propertytype',
+            constraint=models.UniqueConstraint(fields=('space', 'name'), name='property_type_unique_name_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='foodproperty',
+            constraint=models.UniqueConstraint(fields=('food', 'property_type', 'space'), name='food_property_unique_per_space'),
+        ),
+    ]

cookbook/migrations/0189_unit_base_unit_unitconversion_foodpropertytype_and_more.py

@@ -1,73 +0,0 @@
-# Generated by Django 4.1.7 on 2023-03-25 05:48
-
-import cookbook.models
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import django_prometheus.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('cookbook', '0188_space_no_sharing_limit'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='unit',
-            name='base_unit',
-            field=models.TextField(blank=True, default=None, max_length=256, null=True),
-        ),
-        migrations.CreateModel(
-            name='UnitConversion',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('base_amount', models.DecimalField(decimal_places=16, default=0, max_digits=32)),
-                ('converted_amount', models.DecimalField(decimal_places=16, default=0, max_digits=32)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('base_unit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unit_conversion_base_relation', to='cookbook.unit')),
-                ('converted_unit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unit_conversion_converted_relation', to='cookbook.unit')),
-                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
-                ('food', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.food')),
-                ('space', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space')),
-            ],
-            bases=(django_prometheus.models.ExportModelOperationsMixin('unit_conversion'), models.Model, cookbook.models.PermissionModelMixin),
-        ),
-        migrations.CreateModel(
-            name='FoodPropertyType',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=128)),
-                ('unit', models.CharField(blank=True, max_length=64, null=True)),
-                ('icon', models.CharField(blank=True, max_length=16, null=True)),
-                ('description', models.CharField(blank=True, max_length=512, null=True)),
-                ('category', models.CharField(choices=[('NUTRITION', 'Nutrition'), ('ALLERGEN', 'Allergen'), ('PRICE', 'PRICE')], max_length=64)),
-                ('space', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space')),
-            ],
-            bases=(models.Model, cookbook.models.PermissionModelMixin),
-        ),
-        migrations.CreateModel(
-            name='FoodProperty',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('food_amount', models.DecimalField(decimal_places=2, default=0, max_digits=32)),
-                ('nutrition_amount', models.DecimalField(decimal_places=4, default=0, max_digits=32)),
-                ('food', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.food')),
-                ('food_unit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.unit')),
-                ('nutrition_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.foodpropertytype')),
-                ('space', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space')),
-            ],
-            bases=(models.Model, cookbook.models.PermissionModelMixin),
-        ),
-        migrations.AddConstraint(
-            model_name='foodpropertytype',
-            constraint=models.UniqueConstraint(fields=('space', 'name'), name='nutrition_type_unique_name_per_space'),
-        ),
-        migrations.AddConstraint(
-            model_name='foodproperty',
-            constraint=models.UniqueConstraint(fields=('food', 'nutrition_type', 'space'), name='food_nutrition_unique_per_space'),
-        ),
-    ]

cookbook/migrations/0190_remove_foodproperty_food_nutrition_unique_per_space_and_more.py

@@ -1,44 +0,0 @@
-# Generated by Django 4.1.7 on 2023-03-25 06:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0189_unit_base_unit_unitconversion_foodpropertytype_and_more'),
-    ]
-
-    operations = [
-        migrations.RemoveConstraint(
-            model_name='foodproperty',
-            name='food_nutrition_unique_per_space',
-        ),
-        migrations.RemoveConstraint(
-            model_name='foodpropertytype',
-            name='nutrition_type_unique_name_per_space',
-        ),
-        migrations.RenameField(
-            model_name='foodproperty',
-            old_name='nutrition_amount',
-            new_name='property_amount',
-        ),
-        migrations.RenameField(
-            model_name='foodproperty',
-            old_name='nutrition_type',
-            new_name='property_type',
-        ),
-        migrations.AlterField(
-            model_name='foodpropertytype',
-            name='category',
-            field=models.CharField(blank=True, choices=[('NUTRITION', 'Nutrition'), ('ALLERGEN', 'Allergen'), ('PRICE', 'PRICE')], max_length=64, null=True),
-        ),
-        migrations.AddConstraint(
-            model_name='foodproperty',
-            constraint=models.UniqueConstraint(fields=('food', 'property_type', 'space'), name='food_property_unique_per_space'),
-        ),
-        migrations.AddConstraint(
-            model_name='foodpropertytype',
-            constraint=models.UniqueConstraint(fields=('space', 'name'), name='food_property_type_unique_name_per_space'),
-        ),
-    ]

cookbook/migrations/0191_food_open_data_slug_foodpropertytype_fdc_id_and_more.py

@@ -1,64 +0,0 @@
-# Generated by Django 4.1.7 on 2023-04-30 20:11
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0190_remove_foodproperty_food_nutrition_unique_per_space_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='food',
-            name='open_data_slug',
-            field=models.CharField(blank=True, default=None, max_length=128, null=True),
-        ),
-        migrations.AddField(
-            model_name='foodpropertytype',
-            name='fdc_id',
-            field=models.CharField(blank=True, default=None, max_length=128, null=True),
-        ),
-        migrations.AddField(
-            model_name='foodpropertytype',
-            name='open_data_slug',
-            field=models.CharField(blank=True, default=None, max_length=128, null=True),
-        ),
-        migrations.AddField(
-            model_name='foodpropertytype',
-            name='preferred_shopping_unit',
-            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='preferred_shopping_unit', to='cookbook.unit'),
-        ),
-        migrations.AddField(
-            model_name='foodpropertytype',
-            name='preferred_unit',
-            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='preferred_unit', to='cookbook.unit'),
-        ),
-        migrations.AddField(
-            model_name='supermarket',
-            name='open_data_slug',
-            field=models.CharField(blank=True, default=None, max_length=128, null=True),
-        ),
-        migrations.AddField(
-            model_name='supermarketcategory',
-            name='open_data_slug',
-            field=models.CharField(blank=True, default=None, max_length=128, null=True),
-        ),
-        migrations.AddField(
-            model_name='unit',
-            name='open_data_slug',
-            field=models.CharField(blank=True, default=None, max_length=128, null=True),
-        ),
-        migrations.AddField(
-            model_name='unitconversion',
-            name='open_data_slug',
-            field=models.CharField(blank=True, default=None, max_length=128, null=True),
-        ),
-        migrations.AlterField(
-            model_name='foodpropertytype',
-            name='category',
-            field=models.CharField(blank=True, choices=[('NUTRITION', 'Nutrition'), ('ALLERGEN', 'Allergen'), ('PRICE', 'Price'), ('GOAL', 'Goal'), ('OTHER', 'Other')], max_length=64, null=True),
-        ),
-    ]

cookbook/migrations/0192_remove_foodpropertytype_fdc_id_and_more.py

@@ -1,41 +0,0 @@
-# Generated by Django 4.1.7 on 2023-05-01 10:41
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0191_food_open_data_slug_foodpropertytype_fdc_id_and_more'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='foodpropertytype',
-            name='fdc_id',
-        ),
-        migrations.RemoveField(
-            model_name='foodpropertytype',
-            name='preferred_shopping_unit',
-        ),
-        migrations.RemoveField(
-            model_name='foodpropertytype',
-            name='preferred_unit',
-        ),
-        migrations.AddField(
-            model_name='food',
-            name='fdc_id',
-            field=models.CharField(blank=True, default=None, max_length=128, null=True),
-        ),
-        migrations.AddField(
-            model_name='food',
-            name='preferred_shopping_unit',
-            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='preferred_shopping_unit', to='cookbook.unit'),
-        ),
-        migrations.AddField(
-            model_name='food',
-            name='preferred_unit',
-            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='preferred_unit', to='cookbook.unit'),
-        ),
-    ]

cookbook/migrations/0193_unitconversion_f_unique_conversion_per_space.py

@@ -1,17 +0,0 @@
-# Generated by Django 4.1.7 on 2023-05-04 05:57
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0192_remove_foodpropertytype_fdc_id_and_more'),
-    ]
-
-    operations = [
-        migrations.AddConstraint(
-            model_name='unitconversion',
-            constraint=models.UniqueConstraint(fields=('space', 'base_unit', 'converted_unit', 'food'), name='f_unique_conversion_per_space'),
-        ),
-    ]

cookbook/migrations/0194_supermarketcategoryrelation_unique_sm_category_relation.py

@@ -1,17 +0,0 @@
-# Generated by Django 4.1.7 on 2023-05-04 13:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0193_unitconversion_f_unique_conversion_per_space'),
-    ]
-
-    operations = [
-        migrations.AddConstraint(
-            model_name='supermarketcategoryrelation',
-            constraint=models.UniqueConstraint(fields=('supermarket', 'category'), name='unique_sm_category_relation'),
-        ),
-    ]

cookbook/migrations/0195_rename_foodpropertytype_propertytype_recipeproperty_and_more.py

@@ -1,34 +0,0 @@
-# Generated by Django 4.1.7 on 2023-05-06 16:33
-
-import cookbook.models
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0194_supermarketcategoryrelation_unique_sm_category_relation'),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name='FoodPropertyType',
-            new_name='PropertyType',
-        ),
-        migrations.CreateModel(
-            name='RecipeProperty',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('property_amount', models.DecimalField(decimal_places=4, default=0, max_digits=32)),
-                ('property_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.propertytype')),
-                ('space', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space')),
-            ],
-            bases=(models.Model, cookbook.models.PermissionModelMixin),
-        ),
-        migrations.AddField(
-            model_name='recipe',
-            name='properties',
-            field=models.ManyToManyField(blank=True, to='cookbook.recipeproperty'),
-        ),
-    ]