From 3010070a6c6007a0446166115151bec04d534f80 Mon Sep 17 00:00:00 2001
From: ldeluigi <44567586+ldeluigi@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:11:04 +0100
Subject: [PATCH] Fix bug

---
 .../management/commands/import_combos.py      | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/backend/spellbook/management/commands/import_combos.py b/backend/spellbook/management/commands/import_combos.py
index 924252e4..d9320eec 100644
--- a/backend/spellbook/management/commands/import_combos.py
+++ b/backend/spellbook/management/commands/import_combos.py
@@ -56,7 +56,7 @@ def update_and_load_cards(self, job, x) -> dict[str, Card]:
         oracle_cards_in_database = {str(c.oracle_id): c for c in spellbook_cards}
         name_cards_in_database = {c.name: c for c in spellbook_cards}
         combo_card_name_to_card = dict[str, Card]()
-        for i, card in enumerate(cards_from_combos):
+        for i, card in enumerate(sorted(cards_from_combos)):
             self.stdout.write(f'{i+1}/{len(cards_from_combos)} {card}')
             if card in scryfall_db:
                 data = scryfall_db[card]
@@ -77,20 +77,25 @@ def update_and_load_cards(self, job, x) -> dict[str, Card]:
                 save_card = True
             else:
                 c = Card.objects.create(name=data['name'], oracle_id=data['oracle_id'])
+                oracle_cards_in_database[str(c.oracle_id)] = c
+                name_cards_in_database[c.name] = c
+                save_card = True
+            updated_cards = update_cards(
+                [c],
+                scryfall_db,
+                lambda x: self.log_job(job, x),
+                lambda x: self.log_job(job, x, self.style.WARNING),
+                lambda x: self.log_job(job, x, self.style.ERROR),
+            )
+            if len(updated_cards) > 0:
+                c = updated_cards[0]
                 save_card = True
             if save_card:
-                updated_cards = update_cards(
-                    [c],
-                    scryfall_db,
-                    lambda x: self.log_job(job, x),
-                    lambda x: self.log_job(job, x, self.style.WARNING),
-                    lambda x: self.log_job(job, x, self.style.ERROR),
-                )
-                if len(updated_cards) > 0:
-                    self.log_job(job, f'Updating card {c.name}...')
-                    c = updated_cards[0]
-                    c.save()
-                    self.log_job(job, f'Updating card {c.name}...done')
+                self.stdout.write(f'Updating card {c.name}...')
+                c.save()
+                oracle_cards_in_database[str(c.oracle_id)] = c
+                name_cards_in_database[c.name] = c
+                self.stdout.write(f'Updating card {c.name}...done')
             combo_card_name_to_card[card] = c
         self.log_job(job, 'Done fetching cards')
         return combo_card_name_to_card
@@ -128,7 +133,8 @@ def handle(self, *args, **options):
                     frozen=True,
                     status=Variant.Status.OK,
                     id=id,
-                    identity=merge_identities([c.identity for c in cards_from_combo]))
+                    identity=merge_identities([c.identity for c in cards_from_combo]),
+                    generated_by=job)
                 feature_names = {p.strip().title() for p in produced}
                 for feature_name in feature_names:
                     if feature_name not in spellbook_features: