Merge pull request #373 from open5e/v1_import_export_adjust

V1 import export adjust
open5e · Nov 5, 2023 · 87253af · 87253af
2 parents 1cee789 + 9485ef4
commit 87253af
Show file tree

Hide file tree

Showing 135 changed files with 200,146 additions and 222,110 deletions.
diff --git a/api/management/commands/importer.py b/api/management/commands/importer.py
diff --git a/api/management/commands/populatedb.py b/api/management/commands/populatedb.py
diff --git a/api/management/commands/quickload.py b/api/management/commands/quickload.py
diff --git a/api/management/commands/quicksetup.py b/api/management/commands/quicksetup.py
@@ -4,8 +4,6 @@
 from django.core.management import call_command
 from django.core.management.base import BaseCommand
 
-from api.management.commands import quickload
-
 class Command(BaseCommand):
     """Implementation for the `manage.py quicksetup` subcommand."""
 
@@ -28,7 +26,7 @@ def handle(self, *args, **options):
         collect_static()
 
         self.stdout.write('Populating the v1 database...')
-        quickload.populate_db()
+        import_v1()
 
         self.stdout.write('Populating the v2 database...')
         import_v2()
@@ -41,6 +39,10 @@ def handle(self, *args, **options):
 
         self.stdout.write(self.style.SUCCESS('API setup complete.'))
 
+def import_v1() -> None:
+    """Import the v1 apps' database models."""
+    call_command('import', '--dir', 'data/v1')
+
 
 def import_v2() -> None:
     """Import the v2 apps' database models."""