diff --git a/cookbook/migrations/0159_add_shoppinglistentry_fields.py b/cookbook/migrations/0159_add_shoppinglistentry_fields.py index 9246c9b0a..ca7ead353 100644 --- a/cookbook/migrations/0159_add_shoppinglistentry_fields.py +++ b/cookbook/migrations/0159_add_shoppinglistentry_fields.py @@ -6,11 +6,12 @@ from django.conf import settings from django.db import migrations, models from django_scopes import scopes_disabled -from cookbook.models import PermissionModelMixin, ShoppingListEntry +from cookbook.models import PermissionModelMixin def copy_values_to_sle(apps, schema_editor): with scopes_disabled(): + ShoppingListEntry = apps.get_model('cookbook', 'ShoppingListEntry') entries = ShoppingListEntry.objects.all() for entry in entries: if entry.shoppinglist_set.first(): diff --git a/cookbook/migrations/0160_delete_shoppinglist_orphans.py b/cookbook/migrations/0160_delete_shoppinglist_orphans.py index 26e086564..6966eae66 100644 --- a/cookbook/migrations/0160_delete_shoppinglist_orphans.py +++ b/cookbook/migrations/0160_delete_shoppinglist_orphans.py @@ -1,25 +1,22 @@ # Generated by Django 3.2.7 on 2021-10-01 22:34 -import datetime from datetime import timedelta -import django.db.models.deletion from django.conf import settings -from django.db import migrations, models +from django.db import migrations from django.utils import timezone -from django.utils.timezone import utc from django_scopes import scopes_disabled -from cookbook.models import FoodInheritField, ShoppingListEntry - def delete_orphaned_sle(apps, schema_editor): + ShoppingListEntry = apps.get_model('cookbook', 'ShoppingListEntry') with scopes_disabled(): # shopping list entry is orphaned - delete it ShoppingListEntry.objects.filter(shoppinglist=None).delete() def create_inheritfields(apps, schema_editor): + FoodInheritField = apps.get_model('cookbook', 'FoodInheritField') FoodInheritField.objects.create(name='Supermarket Category', field='supermarket_category') FoodInheritField.objects.create(name='On Hand', field='food_onhand') FoodInheritField.objects.create(name='Diet', field='diet') @@ -29,6 +26,7 @@ def create_inheritfields(apps, schema_editor): def set_completed_at(apps, schema_editor): + ShoppingListEntry = apps.get_model('cookbook', 'ShoppingListEntry') today_start = timezone.now().replace(hour=0, minute=0, second=0) # arbitrary - keeping all of the closed shopping list items out of the 'recent' view month_ago = today_start - timedelta(days=30)