aa-ledger 1.0.4__py3-none-any.whl → 2.0.0__py3-none-any.whl

ledger/managers/character_audit_manager.py

@@ -1,3 +1,6 @@
+# Standard Library
+from typing import TYPE_CHECKING
+
 # Django
 from django.db import models
 from django.db.models import Case, Count, Q, Value, When
@@ -6,16 +9,19 @@ from django.db.models import Case, Count, Q, Value, When
 from allianceauth.eveonline.models import EveCharacter
 from allianceauth.services.hooks import get_extension_logger
 
-# Alliance Auth (External Libs)
-from app_utils.logging import LoggerAddTag
-
 # AA Ledger
 from ledger import __title__
+from ledger.models.helpers.update_manager import CharacterUpdateSection, UpdateStatus
+from ledger.providers import AppLogger
+
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+if TYPE_CHECKING:
+    # AA Ledger
+    from ledger.models.characteraudit import CharacterOwner as CharacterAuditContext
 
 
-class CharacterAuditQuerySet(models.QuerySet):
+class CharacterAuditQuerySet(models.QuerySet["CharacterAuditContext"]):
     # pylint: disable=duplicate-code
     def visible_to(self, user):
         # superusers get all visible
@@ -60,11 +66,7 @@ class CharacterAuditQuerySet(models.QuerySet):
 
     def annotate_total_update_status(self):
         """Get the total update status."""
-        # pylint: disable=import-outside-toplevel
-        # AA Ledger
-        from ledger.models.characteraudit import CharacterAudit
-
-        sections = CharacterAudit.UpdateSection.get_sections()
+        sections = CharacterUpdateSection.get_sections()
         num_sections_total = len(sections)
         qs = (
             self.annotate(
@@ -105,25 +107,25 @@ class CharacterAuditQuerySet(models.QuerySet):
                 total_update_status=Case(
                     When(
                         active=False,
-                        then=Value(CharacterAudit.UpdateStatus.DISABLED),
+                        then=Value(UpdateStatus.DISABLED),
                     ),
                     When(
                         num_sections_token_error=1,
-                        then=Value(CharacterAudit.UpdateStatus.TOKEN_ERROR),
+                        then=Value(UpdateStatus.TOKEN_ERROR),
                     ),
                     When(
                         num_sections_failed__gt=0,
-                        then=Value(CharacterAudit.UpdateStatus.ERROR),
+                        then=Value(UpdateStatus.ERROR),
                     ),
                     When(
                         num_sections_ok=num_sections_total,
-                        then=Value(CharacterAudit.UpdateStatus.OK),
+                        then=Value(UpdateStatus.OK),
                     ),
                     When(
                         num_sections_total__lt=num_sections_total,
-                        then=Value(CharacterAudit.UpdateStatus.INCOMPLETE),
+                        then=Value(UpdateStatus.INCOMPLETE),
                     ),
-                    default=Value(CharacterAudit.UpdateStatus.IN_PROGRESS),
+                    default=Value(UpdateStatus.IN_PROGRESS),
                 )
             )
         )
@@ -151,10 +153,19 @@ class CharacterAuditQuerySet(models.QuerySet):
         return 0
 
 
-class CharacterAuditManagerBase(models.Manager):
+class CharacterAuditManager(models.Manager["CharacterAuditContext"]):
     def get_queryset(self):
         return CharacterAuditQuerySet(self.model, using=self._db)
 
+    def annotate_total_update_status(self):
+        return self.get_queryset().annotate_total_update_status()
+
+    def annotate_total_update_status_user(self, user):
+        return self.get_queryset().annotate_total_update_status_user(user)
+
+    def disable_characters_with_no_owner(self) -> int:
+        return self.get_queryset().disable_characters_with_no_owner()
+
     @staticmethod
     def visible_eve_characters(user):
         qs = EveCharacter.objects.get_queryset()
@@ -188,6 +199,3 @@ class CharacterAuditManagerBase(models.Manager):
 
     def visible_to(self, user):
         return self.get_queryset().visible_to(user)
-
-
-CharacterAuditManager = CharacterAuditManagerBase.from_queryset(CharacterAuditQuerySet)