Close #88

backend/backend/settings.py

@@ -164,8 +164,8 @@
             'level': 'DEBUG',
             'handlers': ['console'],
         },
-        # 'django.db.backends': {
-        #     'level': 'DEBUG',
-        # },
+        'django.db.backends': {
+            'level': 'DEBUG',
+        },
     }
 }

backend/spellbook/admin/card_admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from ..models import Card
+from spellbook.models import Card
 
 
 @admin.register(Card)

backend/spellbook/admin/combo_admin.py

@@ -1,11 +1,11 @@
-from django.contrib import admin, messages
+from django.db.models import Prefetch, Case, When
 from django.forms import ModelForm
-from ..models import Combo, CardInCombo, TemplateInCombo, Variant, CardInVariant, TemplateInVariant, Card, Template, Feature
-from ..variants.combo_graph import MAX_CARDS_IN_COMBO
-from ..variants.variant_data import RestoreData
-from ..variants.variants_generator import restore_variant
+from django.contrib import admin, messages
+from spellbook.models import Card, Template, Feature, Combo, CardInCombo, TemplateInCombo, Variant, CardInVariant, TemplateInVariant
+from spellbook.variants.combo_graph import MAX_CARDS_IN_COMBO
+from spellbook.variants.variant_data import RestoreData
+from spellbook.variants.variants_generator import restore_variant
 from .utils import SearchMultipleRelatedMixin
-from django.db.models import Prefetch
 
 
 class ComboForm(ModelForm):
@@ -76,6 +76,13 @@ def display_name(self, obj):
             + ' ➡ ' + ' + '.join([feature.name for feature in obj.prefetched_produces[:3]]) \
             + ('...' if len(obj.prefetched_produces) > 3 else '')
 
+    def variants_for_editors(self, obj):
+        return obj.variants.order_by(Case(
+            When(status=Variant.Status.DRAFT, then=0),
+            When(status=Variant.Status.NEW, then=1),
+            default=2
+        ), '-updated')
+
     def save_related(self, request, form, formsets, change):
         super().save_related(request, form, formsets, change)
         if change:

backend/spellbook/admin/feature_admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from ..models import Feature
+from spellbook.models import Feature
 
 
 class CardInFeatureAdminInline(admin.StackedInline):

backend/spellbook/admin/job_admin.py

@@ -1,8 +1,6 @@
-from django.contrib import admin
-from django.utils.html import format_html
-from django.utils.formats import localize
-from ..models import Job
 from django.db.models import Count
+from django.contrib import admin
+from spellbook.models.job import Job
 from .utils import datetime_to_html
 
 

backend/spellbook/admin/log_admin.py

@@ -1,6 +1,6 @@
+from django.utils.html import format_html
 from django.contrib import admin
 from django.contrib.admin.models import LogEntry, DELETION
-from django.utils.html import format_html
 
 
 @admin.register(LogEntry)

backend/spellbook/admin/template_admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from ..models import Template
+from spellbook.models.template import Template
 
 
 @admin.register(Template)

backend/spellbook/admin/variant_admin.py

@@ -1,14 +1,14 @@
-from django.contrib import admin, messages
 from django.utils.html import format_html
 from django.urls import reverse, path
-from django.db.models import Count, Prefetch, OuterRef, Exists
+from django.db.models import Count, Prefetch
 from django.forms import ModelForm
 from django.http import HttpRequest
 from django.shortcuts import redirect
 from django.utils import timezone
-from ..models import Variant, CardInVariant, TemplateInVariant, Card, Template, Feature
-from ..variants.combo_graph import MAX_CARDS_IN_COMBO
-from ..utils import launch_job_command
+from django.contrib import admin, messages
+from spellbook.models import Card, Template, Feature, Variant, CardInVariant, TemplateInVariant
+from spellbook.variants.combo_graph import MAX_CARDS_IN_COMBO
+from spellbook.utils import launch_job_command
 from .utils import SearchMultipleRelatedMixin
 
 

backend/spellbook/hybridrouter.py

@@ -1,5 +1,4 @@
 from collections import OrderedDict
-
 from django.urls import NoReverseMatch
 from rest_framework import routers, views, reverse, response
 

backend/spellbook/management/commands/export_variants.py

@@ -4,11 +4,11 @@
 from pathlib import Path
 from django.utils import timezone
 from django.core.management.base import BaseCommand, CommandError
-from spellbook.models import Variant, Job
-from spellbook.serializers import VariantSerializer
 from django.contrib.admin.models import LogEntry, CHANGE
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
+from spellbook.models import Variant, Job
+from spellbook.serializers import VariantSerializer
 
 
 def prepare_variant(variant: Variant):

backend/spellbook/management/commands/generate_variants.py

@@ -1,10 +1,10 @@
 import traceback
 from django.core.management.base import BaseCommand, CommandError
-from spellbook.models import Job, Variant
-from spellbook.variants.variants_generator import generate_variants
 from django.utils import timezone
 from django.contrib.admin.models import LogEntry, CHANGE
 from django.contrib.contenttypes.models import ContentType
+from spellbook.models import Job, Variant
+from spellbook.variants.variants_generator import generate_variants
 
 
 class Command(BaseCommand):

backend/spellbook/management/commands/import_combos.py

@@ -2,11 +2,11 @@
 from urllib.parse import urlencode
 from urllib.request import Request, urlopen
 from django.core.management.base import BaseCommand
+from django.utils import timezone
+from django.db.models import Count, Q
 from spellbook.variants.variants_generator import id_from_cards_and_templates_ids, VariantBulkSaveItem, perform_bulk_saves
 from spellbook.variants.list_utils import merge_identities
 from spellbook.models import Feature, Card, Job, Variant
-from django.utils import timezone
-from django.db.models import Count, Q
 from ..scryfall import scryfall
 
 

backend/spellbook/management/commands/update_cards.py

@@ -1,10 +1,10 @@
 import traceback
-from ..scryfall import scryfall
+import datetime
 from django.core.management.base import BaseCommand
+from django.utils import timezone
 from spellbook.models import Job, Card
 from spellbook.variants.list_utils import merge_identities
-from django.utils import timezone
-import datetime
+from ..scryfall import scryfall
 
 
 class Command(BaseCommand):

backend/spellbook/migrations/0014_delete_variants_squashed_0015_cardinvariant_templateinvariant_variant_and_more.py

@@ -78,7 +78,7 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'variants',
                 'ordering': ['-status', '-created'],
             },
-            bases=(models.Model, spellbook.models.ScryfallLinkMixin),
+            bases=(models.Model, spellbook.models.mixins.ScryfallLinkMixin),
         ),
         migrations.AddField(
             model_name='templateinvariant',