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

ledger/managers/corporation_audit_manager.py

@@ -1,21 +1,30 @@
+# Standard Library
+from typing import TYPE_CHECKING
+
 # Django
 from django.db import models
 from django.db.models import Case, Count, Q, Value, When
 
 # Alliance Auth
+from allianceauth.authentication.models import User
 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 CorporationUpdateSection, UpdateStatus
+from ledger.providers import AppLogger
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
+if TYPE_CHECKING:
+    # AA Ledger
+    from ledger.models.corporationaudit import (
+        CorporationOwner as CorporationAuditContext,
+    )
 
-class CorporationAuditQuerySet(models.QuerySet):
-    def visible_to(self, user):
+
+class CorporationAuditQuerySet(models.QuerySet["CorporationAuditContext"]):
+    def visible_to(self, user: User):
         """Returns a queryset of all corps visible to the user."""
         if user.is_superuser:
             logger.debug(
@@ -38,7 +47,7 @@ class CorporationAuditQuerySet(models.QuerySet):
                 corp_ids = char.character_ownership.user.character_ownerships.all().values_list(
                     "character__corporation_id", flat=True
                 )
-                queries.append(models.Q(corporation__corporation_id__in=corp_ids))
+                queries.append(models.Q(eve_corporation__corporation_id__in=corp_ids))
 
             logger.debug("%s queries for User %s.", len(queries), user)
 
@@ -53,7 +62,7 @@ class CorporationAuditQuerySet(models.QuerySet):
             logger.debug("User %s has no main character. Nothing visible.", user)
             return self.none()
 
-    def manage_to(self, user):
+    def manage_to(self, user: User):
         """Return all corps that the user can manage."""
         if user.is_superuser:
             logger.debug(
@@ -76,7 +85,7 @@ class CorporationAuditQuerySet(models.QuerySet):
                 corp_ids = char.character_ownership.user.character_ownerships.all().values_list(
                     "character__corporation_id", flat=True
                 )
-                queries.append(models.Q(corporation__corporation_id__in=corp_ids))
+                queries.append(models.Q(eve_corporation__corporation_id__in=corp_ids))
 
             logger.debug("%s queries for User %s.", len(queries), user)
 
@@ -91,18 +100,14 @@ class CorporationAuditQuerySet(models.QuerySet):
             logger.debug("User %s has no main character. Nothing visible.", user)
             return self.none()
 
-    def annotate_total_update_status_user(self, user):
+    def annotate_total_update_status_user(self, user: User):
         """Get the total update status for the given user."""
         # TODO: implement this method if needed
         return user
 
     def annotate_total_update_status(self):
         """Get the total update status."""
-        # pylint: disable=import-outside-toplevel
-        # AA Ledger
-        from ledger.models.corporationaudit import CorporationAudit
-
-        sections = CorporationAudit.UpdateSection.get_sections()
+        sections = CorporationUpdateSection.get_sections()
         num_sections_total = len(sections)
         qs = (
             self.annotate(
@@ -143,25 +148,25 @@ class CorporationAuditQuerySet(models.QuerySet):
                 total_update_status=Case(
                     When(
                         active=False,
-                        then=Value(CorporationAudit.UpdateStatus.DISABLED),
+                        then=Value(UpdateStatus.DISABLED),
                     ),
                     When(
                         num_sections_token_error=1,
-                        then=Value(CorporationAudit.UpdateStatus.TOKEN_ERROR),
+                        then=Value(UpdateStatus.TOKEN_ERROR),
                     ),
                     When(
                         num_sections_failed__gt=0,
-                        then=Value(CorporationAudit.UpdateStatus.ERROR),
+                        then=Value(UpdateStatus.ERROR),
                     ),
                     When(
                         num_sections_ok=num_sections_total,
-                        then=Value(CorporationAudit.UpdateStatus.OK),
+                        then=Value(UpdateStatus.OK),
                     ),
                     When(
                         num_sections_total__lt=num_sections_total,
-                        then=Value(CorporationAudit.UpdateStatus.INCOMPLETE),
+                        then=Value(UpdateStatus.INCOMPLETE),
                     ),
-                    default=Value(CorporationAudit.UpdateStatus.IN_PROGRESS),
+                    default=Value(UpdateStatus.IN_PROGRESS),
                 )
             )
         )
@@ -169,14 +174,18 @@ class CorporationAuditQuerySet(models.QuerySet):
         return qs
 
 
-class CorporationAuditManagerBase(models.Manager):
+class CorporationAuditManager(models.Manager["CorporationAuditContext"]):
+    def get_queryset(self) -> CorporationAuditQuerySet:
+        return CorporationAuditQuerySet(self.model, using=self._db)
+
+    def annotate_total_update_status_user(self, user: User):
+        return self.get_queryset().annotate_total_update_status_user(user)
+
+    def annotate_total_update_status(self):
+        return self.get_queryset().annotate_total_update_status()
+
     def visible_to(self, user):
         return self.get_queryset().visible_to(user)
 
     def manage_to(self, user):
         return self.get_queryset().manage_to(user)
-
-
-CorporationAuditManager = CorporationAuditManagerBase.from_queryset(
-    CorporationAuditQuerySet
-)

ledger/managers/corporation_journal_manager.py

@@ -11,9 +11,6 @@ from django.utils.translation import gettext_lazy as _
 from allianceauth.services.hooks import get_extension_logger
 from esi.exceptions import HTTPNotModified
 
-# Alliance Auth (External Libs)
-from app_utils.logging import LoggerAddTag
-
 # AA Ledger
 from ledger import __title__
 from ledger.app_settings import LEDGER_BULK_BATCH_SIZE
@@ -21,22 +18,24 @@ from ledger.decorators import log_timing
 from ledger.errors import DatabaseError
 from ledger.helpers.ref_type import RefTypeManager
 from ledger.models.general import EveEntity
-from ledger.providers import esi
+from ledger.models.helpers.update_manager import CorporationUpdateSection
+from ledger.providers import AppLogger, esi
 
 if TYPE_CHECKING:
     # Alliance Auth
-    from esi.stubs import CorporationsCorporationIdDivisionsGet as DivisionItem
+    from esi.stubs import CorporationsCorporationIdDivisionsGet as DivisionsContext
     from esi.stubs import (
-        CorporationsCorporationIdWalletsDivisionJournalGetItem as JournalItem,
+        CorporationsCorporationIdWalletsDivisionJournalGetItem as DivisionJournalContext,
     )
+    from esi.stubs import CorporationsCorporationIdWalletsGetItem as WalletsGetContext
 
     # AA Ledger
     from ledger.models.corporationaudit import (
-        CorporationAudit,
+        CorporationOwner,
         CorporationWalletDivision,
     )
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
 
 class CorporationWalletQuerySet(models.QuerySet):
@@ -73,7 +72,9 @@ class CorporationWalletQuerySet(models.QuerySet):
             miscellaneous=Coalesce(
                 Sum(
                     "amount",
-                    filter=Q(ref_type__in=RefTypeManager.all_ref_types(), amount__gt=0),
+                    filter=Q(
+                        ref_type__in=RefTypeManager.ledger_ref_types(), amount__gt=0
+                    ),
                 ),
                 Value(0),
                 output_field=DecimalField(),
@@ -85,7 +86,9 @@ class CorporationWalletQuerySet(models.QuerySet):
             costs=Coalesce(
                 Sum(
                     "amount",
-                    filter=Q(ref_type__in=RefTypeManager.all_ref_types(), amount__lt=0),
+                    filter=Q(
+                        ref_type__in=RefTypeManager.ledger_ref_types(), amount__lt=0
+                    ),
                 ),
                 Value(0),
                 output_field=DecimalField(),
@@ -107,7 +110,7 @@ class CorporationWalletQuerySet(models.QuerySet):
     def aggregate_miscellaneous(self) -> dict:
         """Aggregate miscellaneous income (nur positive Beträge)."""
         return self.filter(
-            ref_type__in=RefTypeManager.all_ref_types(), amount__gt=0
+            ref_type__in=RefTypeManager.ledger_ref_types(), amount__gt=0
         ).aggregate(
             total_misc=Coalesce(Sum("amount"), Value(0), output_field=DecimalField())
         )[
@@ -117,7 +120,7 @@ class CorporationWalletQuerySet(models.QuerySet):
     def aggregate_costs(self) -> dict:
         """Aggregate costs."""
         return self.filter(
-            ref_type__in=RefTypeManager.all_ref_types(), amount__lt=0
+            ref_type__in=RefTypeManager.ledger_ref_types(), amount__lt=0
         ).aggregate(
             total_costs=Coalesce(Sum("amount"), Value(0), output_field=DecimalField())
         )[
@@ -160,20 +163,67 @@ class CorporationWalletQuerySet(models.QuerySet):
         )["total"]
 
 
-class CorporationWalletManagerBase(models.Manager):
+class CorporationWalletManager(models.Manager):
+    def get_queryset(self) -> CorporationWalletQuerySet:
+        return CorporationWalletQuerySet(self.model, using=self._db)
+
+    def annotate_bounty_income(
+        self,
+    ) -> CorporationWalletQuerySet:
+        return self.get_queryset().annotate_bounty_income()
+
+    def annotate_ess_income(self) -> CorporationWalletQuerySet:
+        return self.get_queryset().annotate_ess_income()
+
+    def annotate_miscellaneous(self) -> CorporationWalletQuerySet:
+        return self.get_queryset().annotate_miscellaneous()
+
+    def annotate_costs(self) -> CorporationWalletQuerySet:
+        return self.get_queryset().annotate_costs()
+
+    def aggregate_bounty(self) -> dict:
+        """Aggregate bounty income."""
+        return self.get_queryset().aggregate_bounty()
+
+    def aggregate_ess(self) -> dict:
+        """Aggregate ESS income."""
+        return self.get_queryset().aggregate_ess()
+
+    def aggregate_miscellaneous(self) -> dict:
+        """Aggregate miscellaneous income (nur positive Beträge)."""
+        return self.get_queryset().aggregate_miscellaneous()
+
+    def aggregate_costs(self) -> dict:
+        """Aggregate costs."""
+        return self.get_queryset().aggregate_costs()
+
+    # pylint: disable=too-many-positional-arguments
+    def aggregate_ref_type(
+        self,
+        ref_type: list,
+        first_party=None,
+        second_party=None,
+        exclude=None,
+        income: bool = False,
+    ) -> dict:
+        """Aggregate income by ref_type."""
+        return self.get_queryset().aggregate_ref_type(
+            ref_type, first_party, second_party, exclude, income
+        )
+
     @log_timing(logger)
     def update_or_create_esi(
-        self, corporation: "CorporationAudit", force_refresh: bool = False
+        self, owner: "CorporationOwner", force_refresh: bool = False
     ) -> None:
         """Update or Create a wallet journal entry from ESI data."""
-        return corporation.update_section_if_changed(
-            section=corporation.UpdateSection.WALLET_JOURNAL,
+        return owner.update_manager.update_section_if_changed(
+            section=CorporationUpdateSection.WALLET_JOURNAL,
             fetch_func=self._fetch_esi_data,
             force_refresh=force_refresh,
         )
 
     def _fetch_esi_data(
-        self, audit: "CorporationAudit", force_refresh: bool = False
+        self, owner: "CorporationOwner", force_refresh: bool = False
     ) -> None:
         """Fetch wallet journal entries from ESI data."""
         # AA Ledger
@@ -186,16 +236,16 @@ class CorporationWalletManagerBase(models.Manager):
         ]
         req_roles = ["CEO", "Director", "Accountant", "Junior_Accountant"]
 
-        token = audit.get_token(scopes=req_scopes, req_roles=req_roles)
+        token = owner.get_token(scopes=req_scopes, req_roles=req_roles)
 
-        divisions = CorporationWalletDivision.objects.filter(corporation=audit)
+        divisions = CorporationWalletDivision.objects.filter(corporation=owner)
         is_updated = False
 
         for division in divisions:
             # Make the ESI request
             operation = (
                 esi.client.Wallet.GetCorporationsCorporationIdWalletsDivisionJournal(
-                    corporation_id=audit.corporation.corporation_id,
+                    corporation_id=owner.eve_corporation.corporation_id,
                     division=division.division_id,
                     token=token,
                 )
@@ -217,7 +267,7 @@ class CorporationWalletManagerBase(models.Manager):
     def _update_or_create_objs(
         self,
         division: "CorporationWalletDivision",
-        objs: list["JournalItem"],
+        objs: list["DivisionJournalContext"],
     ) -> None:
         """Update or Create wallet journal entries from objs data."""
         _new_names = []
@@ -276,29 +326,20 @@ class CorporationWalletManagerBase(models.Manager):
         )
 
 
-CorporationWalletManager = CorporationWalletManagerBase.from_queryset(
-    CorporationWalletQuerySet
-)
-
-
-class CorporationDivisionQuerySet(models.QuerySet):
-    pass
-
-
-class CorporationDivisionManagerBase(models.Manager):
+class CorporationDivisionManager(models.Manager):
     @log_timing(logger)
     def update_or_create_esi(
-        self, corporation: "CorporationAudit", force_refresh: bool = False
+        self, owner: "CorporationOwner", force_refresh: bool = False
     ) -> None:
         """Update or Create a division entry from ESI data."""
-        return corporation.update_section_if_changed(
-            section=corporation.UpdateSection.WALLET_DIVISION,
+        return owner.update_manager.update_section_if_changed(
+            section=CorporationUpdateSection.WALLET_DIVISION,
             fetch_func=self._fetch_esi_data,
             force_refresh=force_refresh,
         )
 
     def _fetch_esi_data(
-        self, audit: "CorporationAudit", force_refresh: bool = False
+        self, owner: "CorporationOwner", force_refresh: bool = False
     ) -> None:
         """Fetch division entries from ESI data."""
         req_scopes = [
@@ -307,52 +348,52 @@ class CorporationDivisionManagerBase(models.Manager):
             "esi-corporations.read_divisions.v1",
         ]
         req_roles = ["CEO", "Director", "Accountant", "Junior_Accountant"]
-        token = audit.get_token(scopes=req_scopes, req_roles=req_roles)
+        token = owner.get_token(scopes=req_scopes, req_roles=req_roles)
 
         # Make the ESI request
         operation = esi.client.Wallet.GetCorporationsCorporationIdWallets(
-            corporation_id=audit.corporation.corporation_id,
+            corporation_id=owner.eve_corporation.corporation_id,
             token=token,
         )
         division_items = operation.results(force_refresh=force_refresh)
 
-        self._update_or_create_objs(corporation=audit, objs=division_items)
+        self._update_or_create_objs(owner=owner, objs=division_items)
 
     @log_timing(logger)
     def update_or_create_esi_names(
-        self, corporation: "CorporationAudit", force_refresh: bool = False
+        self, owner: "CorporationOwner", force_refresh: bool = False
     ) -> None:
         """Update or Create a division entry from ESI data."""
-        return corporation.update_section_if_changed(
-            section=corporation.UpdateSection.WALLET_DIVISION_NAMES,
+        return owner.update_manager.update_section_if_changed(
+            section=CorporationUpdateSection.WALLET_DIVISION_NAMES,
             fetch_func=self._fetch_esi_data_names,
             force_refresh=force_refresh,
         )
 
     def _fetch_esi_data_names(
-        self, audit: "CorporationAudit", force_refresh: bool = False
+        self, owner: "CorporationOwner", force_refresh: bool = False
     ) -> None:
         """Fetch division entries from ESI data."""
         req_scopes = [
             "esi-corporations.read_divisions.v1",
         ]
         req_roles = ["CEO", "Director"]
-        token = audit.get_token(scopes=req_scopes, req_roles=req_roles)
+        token = owner.get_token(scopes=req_scopes, req_roles=req_roles)
 
         # Make the ESI request
         operation = esi.client.Corporation.GetCorporationsCorporationIdDivisions(
-            corporation_id=audit.corporation.corporation_id,
+            corporation_id=owner.eve_corporation.corporation_id,
             token=token,
         )
         division_items = operation.results(force_refresh=force_refresh)
 
-        self._update_or_create_objs_division(corporation=audit, objs=division_items)
+        self._update_or_create_objs_division(owner=owner, objs=division_items)
 
     @transaction.atomic()
     def _update_or_create_objs_division(
         self,
-        corporation: "CorporationAudit",
-        objs: list["DivisionItem"],
+        owner: "CorporationOwner",
+        objs: list["DivisionsContext"],
     ) -> None:
         """Update or Create division entries from objs data."""
         for division in objs:  # list (hanger, wallet)
@@ -363,7 +404,7 @@ class CorporationDivisionManagerBase(models.Manager):
                     name = getattr(wallet, "name", _("Unknown"))
 
                 obj, created = self.get_or_create(
-                    corporation=corporation,
+                    corporation=owner,
                     division_id=wallet.division,
                     defaults={"balance": 0, "name": name},
                 )
@@ -374,13 +415,13 @@ class CorporationDivisionManagerBase(models.Manager):
     @transaction.atomic()
     def _update_or_create_objs(
         self,
-        corporation: "CorporationAudit",
-        objs: list,
+        owner: "CorporationOwner",
+        objs: list["WalletsGetContext"],
     ) -> None:
         """Update or Create division entries from objs data."""
         for division in objs:
             obj, created = self.get_or_create(
-                corporation=corporation,
+                corporation=owner,
                 division_id=division.division,
                 defaults={
                     "balance": division.balance,
@@ -391,8 +432,3 @@ class CorporationDivisionManagerBase(models.Manager):
             if not created:
                 obj.balance = division.balance
                 obj.save()
-
-
-CorporationDivisionManager = CorporationDivisionManagerBase.from_queryset(
-    CorporationDivisionQuerySet
-)

ledger/managers/general_manager.py

@@ -1,5 +1,5 @@
 # Standard Library
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 # Django
 from django.db import models
@@ -8,18 +8,19 @@ from django.db import models
 from allianceauth.eveonline.providers import ObjectNotFound
 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.app_settings import LEDGER_BULK_BATCH_SIZE
-from ledger.providers import esi
+from ledger.providers import AppLogger, esi
+
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+if TYPE_CHECKING:
+    # AA Ledger
+    from ledger.models.general import EveEntity as EveEntityContext
 
 
-class EveEntityManager(models.Manager):
+class EveEntityManager(models.Manager["EveEntityContext"]):
     def get_or_create_esi(self, *, eve_id: int) -> tuple[Any, bool]:
         """gets or creates entity object with data fetched from ESI"""
         # pylint: disable=import-outside-toplevel

ledger/migrations/0018_remove_characterplanet_ledger_char_planet__58a5b6_idx_and_more.py

@@ -0,0 +1,44 @@
+# Generated by Django 4.2.26 on 2025-12-25 14:42
+
+# Django
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ledger", "0017_alter_eveentity_category_alter_eveentity_eve_id_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name="characterplanet",
+            name="ledger_char_planet__58a5b6_idx",
+        ),
+        migrations.RenameField(
+            model_name="characterplanet",
+            old_name="planet",
+            new_name="eve_planet",
+        ),
+        migrations.RenameField(
+            model_name="characterplanet",
+            old_name="planet_name",
+            new_name="name",
+        ),
+        migrations.RenameField(
+            model_name="corporationaudit",
+            old_name="corporation",
+            new_name="eve_corporation",
+        ),
+        migrations.AddIndex(
+            model_name="characterplanet",
+            index=models.Index(
+                fields=["eve_planet"], name="ledger_char_eve_pla_d4379e_idx"
+            ),
+        ),
+        migrations.RenameField(
+            model_name="characterplanetdetails",
+            old_name="facilitys",
+            new_name="factories",
+        ),
+    ]

ledger/migrations/0019_rename_characteraudit_characterowner_and_more.py

@@ -0,0 +1,48 @@
+# Generated by Django 4.2.26 on 2025-12-26 19:44
+
+# Django
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("eveonline", "0017_alliance_and_corp_names_are_not_unique"),
+        (
+            "ledger",
+            "0018_remove_characterplanet_ledger_char_planet__58a5b6_idx_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="CharacterAudit",
+            new_name="CharacterOwner",
+        ),
+        migrations.RenameModel(
+            old_name="CorporationAudit",
+            new_name="CorporationOwner",
+        ),
+        migrations.RenameField(
+            model_name="characterupdatestatus",
+            old_name="character",
+            new_name="owner",
+        ),
+        migrations.RenameField(
+            model_name="corporationupdatestatus",
+            old_name="corporation",
+            new_name="owner",
+        ),
+        migrations.AddIndex(
+            model_name="characterwalletjournalentry",
+            index=models.Index(
+                fields=["character"], name="ledger_char_charact_fa27b8_idx"
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="corporationwalletjournalentry",
+            index=models.Index(
+                fields=["division"], name="ledger_corp_divisio_6ef4ce_idx"
+            ),
+        ),
+    ]

ledger/models/__init__.py

@@ -1,11 +1,5 @@
-from .characteraudit import (
-    CharacterAudit,
-    CharacterMiningLedger,
-    CharacterWalletJournalEntry,
-)
-from .corporationaudit import (
-    CorporationAudit,
-    CorporationWalletDivision,
-    CorporationWalletJournalEntry,
-)
-from .general import EveEntity, General
+# flake8: noqa
+from .characteraudit import *
+from .corporationaudit import *
+from .general import *
+from .planetary import *