Merge branch 'develop' into HomeAssistantConnector

cookbook/migrations/0204_propertytype_fdc_id.py

@@ -4,11 +4,6 @@ from django.db import migrations, models
 from django_scopes import scopes_disabled
 
 
-def fix_fdc_ids(apps, schema_editor):
-    with scopes_disabled():
-        # in case any food had a non digit fdc ID before this migration, remove it
-        Food = apps.get_model('cookbook', 'Food')
-        Food.objects.exclude(fdc_id__regex=r'^\d+$').exclude(fdc_id=None).update(fdc_id=None)
 
 
 class Migration(migrations.Migration):
@@ -17,7 +12,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(fix_fdc_ids),
         migrations.AddField(
             model_name='propertytype',
             name='fdc_id',

cookbook/migrations/0205_alter_food_fdc_id_alter_propertytype_fdc_id.py

@@ -1,15 +1,23 @@
 # Generated by Django 4.2.7 on 2023-11-29 19:44
 
 from django.db import migrations, models
+from django_scopes import scopes_disabled
+
+
+def fix_fdc_ids(apps, schema_editor):
+    with scopes_disabled():
+        # in case any food had a non digit fdc ID before this migration, remove it
+        Food = apps.get_model('cookbook', 'Food')
+        Food.objects.exclude(fdc_id__regex=r'^\d+$').exclude(fdc_id=None).update(fdc_id=None)
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('cookbook', '0204_propertytype_fdc_id'),
     ]
 
     operations = [
+        migrations.RunPython(fix_fdc_ids),
         migrations.AlterField(
             model_name='food',
             name='fdc_id',

cookbook/migrations/0209_remove_space_use_plural.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2024-01-28 07:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0208_space_app_name_userpreference_max_owned_spaces'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='space',
+            name='use_plural',
+        ),
+    ]