refactor(organization): clean up inline dependencies and improve code style

Author: whlongg

judge/management/commands/backfill_problem_data_size.py

@@ -1,3 +1,6 @@
+import os
+
+from django.conf import settings
 from django.core.management.base import BaseCommand
 
 from judge.models import ProblemData
@@ -19,9 +22,6 @@ def handle(self, *args, **options):
         if dry_run:
             self.stdout.write(self.style.WARNING('DRY RUN MODE - No changes will be saved'))
 
-        from django.conf import settings
-        import os
-
         problem_data_list = ProblemData.objects.all().iterator(chunk_size=5000)
         total_count = ProblemData.objects.count()
         updated_count = 0

judge/models/profile.py

@@ -161,11 +161,11 @@ def get_max_storage(self):
         return settings.VNOJ_ORGANIZATION_DEFAULT_MAX_STORAGE
 
     def get_current_problem_count(self):
-        from judge.models import Problem
-        return Problem.objects.filter(organization=self).count()
+        return self.problem_set.count()
 
     def get_current_storage(self):
-        from judge.models import ProblemData
+        from django.apps import apps
+        ProblemData = apps.get_model('judge', 'ProblemData')
         result = ProblemData.objects.filter(
             problem__organization=self,
         ).aggregate(total=Sum('zipfile_size'))