aa-ledger 1.0.4__tar.gz → 2.0.0__tar.gz

{aa_ledger-1.0.4 → aa_ledger-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-ledger
-Version: 1.0.4
+Version: 2.0.0
 Summary: Character and Corporation statistics, including detailed information on ESS, Ratting, Trading, Mining, and other activities.
 Project-URL: Changelog, https://github.com/Geuthur/aa-ledger/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/Geuthur/aa-ledger/blob/master/README.md
@@ -700,11 +700,10 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.10
-Requires-Dist: allianceauth-app-utils>=1.3
-Requires-Dist: allianceauth<5,>=4.10
+Requires-Dist: allianceauth<5,>=4.12
 Requires-Dist: django-esi<9,>=8
-Requires-Dist: django-eveuniverse>=1.6
-Requires-Dist: django-ninja
+Requires-Dist: django-eveuniverse<2,>=1.6
+Requires-Dist: django-ninja<2,>=1.5
 Provides-Extra: tests-allianceauth-latest
 Requires-Dist: aa-discordnotify; extra == 'tests-allianceauth-latest'
 Requires-Dist: allianceauth-discordbot; extra == 'tests-allianceauth-latest'
@@ -787,7 +786,7 @@ ______________________________________________________________________
 ## Installation<a name="installation"></a>
 
 > [!NOTE]
-> AA Ledger needs at least Alliance Auth v4.6.0
+> AA Ledger needs at least Alliance Auth v4.12.0
 > Please make sure to update your Alliance Auth before you install this APP
 
 ### Step 0 - Check dependencies are installed<a name="step0"></a>

{aa_ledger-1.0.4 → aa_ledger-2.0.0}/README.md

@@ -72,7 +72,7 @@ ______________________________________________________________________
 ## Installation<a name="installation"></a>
 
 > [!NOTE]
-> AA Ledger needs at least Alliance Auth v4.6.0
+> AA Ledger needs at least Alliance Auth v4.12.0
 > Please make sure to update your Alliance Auth before you install this APP
 
 ### Step 0 - Check dependencies are installed<a name="step0"></a>

{aa_ledger-1.0.4 → aa_ledger-2.0.0}/ledger/__init__.py

@@ -1,11 +1,11 @@
 """Initialize the app"""
 
-__version__ = "1.0.4"
+__version__ = "2.0.0"
 __title__ = "Ledger"
 
 __package_name__ = "aa-ledger"
 __app_name__ = "ledger"
-__esi_compatibility_date__ = "2025-11-06"
+__esi_compatibility_date__ = "2025-12-16"
 __app_name_useragent__ = "AA-Ledger"
 
 __github_url__ = f"https://github.com/Geuthur/{__package_name__}"

{aa_ledger-1.0.4 → aa_ledger-2.0.0}/ledger/admin.py

@@ -13,8 +13,8 @@ from django.utils.translation import gettext_lazy as _
 from allianceauth.eveonline.evelinks import eveimageserver
 
 # AA Ledger
-from ledger.models.characteraudit import CharacterAudit, CharacterUpdateStatus
-from ledger.models.corporationaudit import CorporationAudit, CorporationUpdateStatus
+from ledger.models.characteraudit import CharacterOwner, CharacterUpdateStatus
+from ledger.models.corporationaudit import CorporationOwner, CorporationUpdateStatus
 from ledger.tasks import update_character, update_corporation
 
 
@@ -84,7 +84,7 @@ class CorporationUpdateStatusAdminInline(admin.TabularInline):
         return timesince(started_at, finished_at)
 
 
-@admin.register(CorporationAudit)
+@admin.register(CorporationOwner)
 class CorporationAuditAdmin(admin.ModelAdmin):
     list_display = (
         "_entity_pic",
@@ -97,11 +97,14 @@ class CorporationAuditAdmin(admin.ModelAdmin):
         "_corporation__corporation_id",
     )
 
-    list_select_related = ("corporation",)
+    list_select_related = ("eve_corporation",)
 
-    ordering = ["corporation__corporation_name"]
+    ordering = ["eve_corporation__corporation_name"]
 
-    search_fields = ["corporation__corporation_name", "corporation__corporation_id"]
+    search_fields = [
+        "eve_corporation__corporation_name",
+        "eve_corporation__corporation_id",
+    ]
 
     actions = [
         "delete_objects",
@@ -120,19 +123,21 @@ class CorporationAuditAdmin(admin.ModelAdmin):
         )
 
     @admin.display(description="")
-    def _entity_pic(self, obj: CorporationAudit):
-        eve_id = obj.corporation.corporation_id
+    def _entity_pic(self, obj: CorporationOwner):
+        eve_id = obj.eve_corporation.corporation_id
         return format_html(
             '<img src="{}" class="img-circle">',
             eveimageserver._eve_entity_image_url("corporation", eve_id, 32),
         )
 
-    @admin.display(description="Corporation ID", ordering="corporation__corporation_id")
-    def _corporation__corporation_id(self, obj: CorporationAudit):
-        return obj.corporation.corporation_id
+    @admin.display(
+        description="Corporation ID", ordering="eve_corporation__corporation_id"
+    )
+    def _corporation__corporation_id(self, obj: CorporationOwner):
+        return obj.eve_corporation.corporation_id
 
     @admin.display(ordering="last_update_at", description=_("last update run"))
-    def _last_update_at(self, obj: CorporationAudit):
+    def _last_update_at(self, obj: CorporationOwner):
         return naturaltime(obj.last_update_at) if obj.last_update_at else "-"
 
     # pylint: disable=unused-argument
@@ -169,9 +174,9 @@ class CharacterUpdateStatusAdminInline(admin.TabularInline):
         "_is_success",
         "_is_token_ok",
         "error_message",
-        "run_finished_at",
+        "last_run_finished_at",
         "_run_duration",
-        "update_finished_at",
+        "last_update_finished_at",
         "_update_duration",
     )
     readonly_fields = (
@@ -226,7 +231,7 @@ class CharacterUpdateStatusAdminInline(admin.TabularInline):
         return timesince(started_at, finished_at)
 
 
-@admin.register(CharacterAudit)
+@admin.register(CharacterOwner)
 class CharacterAuditAdmin(admin.ModelAdmin):
     list_display = (
         "_entity_pic",
@@ -262,7 +267,7 @@ class CharacterAuditAdmin(admin.ModelAdmin):
         )
 
     @admin.display(description="")
-    def _entity_pic(self, obj: CharacterAudit):
+    def _entity_pic(self, obj: CharacterOwner):
         eve_id = obj.eve_character.character_id
         return format_html(
             '<img src="{}" class="img-circle">',
@@ -272,11 +277,11 @@ class CharacterAuditAdmin(admin.ModelAdmin):
     @admin.display(
         description="Character Name", ordering="eve_character__character_name"
     )
-    def _eve_character__character_name(self, obj: CharacterAudit):
+    def _eve_character__character_name(self, obj: CharacterOwner):
         return obj.eve_character.character_name
 
     @admin.display(ordering="last_update_at", description=_("last update run"))
-    def _last_update_at(self, obj: CharacterAudit):
+    def _last_update_at(self, obj: CharacterOwner):
         return naturaltime(obj.last_update_at) if obj.last_update_at else "-"
 
     # pylint: disable=unused-argument

aa_ledger-2.0.0/ledger/api/__init__.py

@@ -0,0 +1,46 @@
+# Third Party
+from ninja import NinjaAPI
+from ninja.security import django_auth
+
+# Django
+from django.conf import settings
+
+# Alliance Auth
+from allianceauth.services.hooks import get_extension_logger
+
+# AA Ledger
+from ledger import __title__
+from ledger.api import admin, alliance, character, corporation, planetary
+from ledger.providers import AppLogger
+
+logger = AppLogger(get_extension_logger(__name__), __title__)
+
+
+api = NinjaAPI(
+    title="Geuthur API",
+    version="0.5.0",
+    urls_namespace="ledger:api",
+    auth=django_auth,
+    openapi_url=settings.DEBUG and "/openapi.json" or "",
+)
+
+
+def setup(ninja_api):
+    admin.AdminApiEndpoints(ninja_api)
+
+    # Character Endpoints
+    character.CharacterApiEndpoints(ninja_api)
+    character.CharacterDetailsApiEndpoints(ninja_api)
+    planetary.PlanetaryApiEndpoints(ninja_api)
+
+    # Corporation Endpoints
+    corporation.CorporationApiEndpoints(ninja_api)
+    corporation.CorporationDetailsApiEndpoints(ninja_api)
+
+    # Alliance Endpoints
+    alliance.AllianceApiEndpoints(ninja_api)
+    alliance.AllianceDetailsApiEndpoints(ninja_api)
+
+
+# Initialize API endpoints
+setup(api)

{aa_ledger-1.0.4/ledger/api/ledger → aa_ledger-2.0.0/ledger/api}/admin.py

@@ -12,24 +12,22 @@ from allianceauth.authentication.models import CharacterOwnership, UserProfile
 from allianceauth.eveonline.models import EveCorporationInfo
 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.api import schema
-from ledger.api.helpers import (
+from ledger.api.helpers.core import (
     get_all_corporations_from_alliance,
-    get_character_or_none,
-    get_corporation,
+    get_characterowner_or_none,
+    get_corporationowner_or_none,
 )
-from ledger.models.characteraudit import CharacterAudit
-from ledger.models.corporationaudit import CorporationAudit
+from ledger.models.characteraudit import CharacterOwner
+from ledger.models.corporationaudit import CorporationOwner
+from ledger.providers import AppLogger
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
 
-class LedgerAdminApiEndpoints:
+class AdminApiEndpoints:
     tags = ["LedgerAdmin"]
 
     # pylint: disable=too-many-statements
@@ -40,7 +38,7 @@ class LedgerAdminApiEndpoints:
             tags=self.tags,
         )
         def get_character_overview(request):
-            chars_visible = CharacterAudit.objects.visible_to(request.user)
+            chars_visible = CharacterOwner.objects.visible_to(request.user)
 
             if chars_visible is None:
                 return 403, "Permission Denied"
@@ -78,7 +76,7 @@ class LedgerAdminApiEndpoints:
             tags=self.tags,
         )
         def get_planetary_overview(request):
-            chars_ids = CharacterAudit.objects.visible_eve_characters(
+            chars_ids = CharacterOwner.objects.visible_eve_characters(
                 request.user
             ).values_list("character_id", flat=True)
 
@@ -114,7 +112,7 @@ class LedgerAdminApiEndpoints:
             tags=self.tags,
         )
         def get_corporation_overview(request):
-            corporations = CorporationAudit.objects.visible_to(request.user)
+            corporations = CorporationOwner.objects.visible_to(request.user)
 
             if corporations is None:
                 return 403, "Permission Denied"
@@ -124,9 +122,9 @@ class LedgerAdminApiEndpoints:
             for corporation in corporations:
                 # pylint: disable=broad-exception-caught
                 try:
-                    corporation_dict[corporation.corporation.corporation_id] = {
-                        "corporation_id": corporation.corporation.corporation_id,
-                        "corporation_name": corporation.corporation.corporation_name,
+                    corporation_dict[corporation.eve_corporation.corporation_id] = {
+                        "corporation_id": corporation.eve_corporation.corporation_id,
+                        "corporation_name": corporation.eve_corporation.corporation_name,
                     }
                 except Exception:
                     continue
@@ -142,7 +140,7 @@ class LedgerAdminApiEndpoints:
             tags=self.tags,
         )
         def get_alliance_overview(request):
-            corporations = CorporationAudit.objects.visible_to(request.user)
+            corporations = CorporationOwner.objects.visible_to(request.user)
 
             if corporations is None:
                 return 403, "Permission Denied"
@@ -152,9 +150,9 @@ class LedgerAdminApiEndpoints:
             for corporation in corporations:
                 # pylint: disable=broad-exception-caught
                 try:
-                    alliance_dict[corporation.corporation.alliance.alliance_id] = {
-                        "alliance_id": corporation.corporation.alliance.alliance_id,
-                        "alliance_name": corporation.corporation.alliance.alliance_name,
+                    alliance_dict[corporation.eve_corporation.alliance.alliance_id] = {
+                        "alliance_id": corporation.eve_corporation.alliance.alliance_id,
+                        "alliance_name": corporation.eve_corporation.alliance.alliance_name,
                     }
                 except Exception:
                     continue
@@ -169,22 +167,18 @@ class LedgerAdminApiEndpoints:
             tags=self.tags,
         )
         def get_character_dashboard(request, character_id: int):
-            perm, character = get_character_or_none(request, character_id)
+            perm, character = get_characterowner_or_none(request, character_id)
 
             if not perm:
                 return 403, "Permission Denied"
             if perm is None:
                 return 403, "Character not found"
 
-            linked_characters_ids = character.alts.values_list(
-                "character_id", flat=True
-            )
-
-            characters = CharacterAudit.objects.filter(
-                eve_character__character_id__in=linked_characters_ids
+            characters = CharacterOwner.objects.filter(
+                eve_character__character_id__in=character.alt_ids
             )
 
-            auth_characters = len(linked_characters_ids)
+            auth_characters = len(character.alt_ids)
             active_characters = characters.filter(active=True).count()
             inactive_characters = characters.filter(active=False).count()
             missing_characters = (
@@ -221,7 +215,7 @@ class LedgerAdminApiEndpoints:
             tags=self.tags,
         )
         def get_corporation_dashboard(request, corporation_id: int):
-            perm, corporation = get_corporation(request, corporation_id)
+            perm, corporation = get_corporationowner_or_none(request, corporation_id)
 
             if not perm:
                 return 403, "Permission Denied"
@@ -229,7 +223,7 @@ class LedgerAdminApiEndpoints:
                 return 403, "Corporation not found"
 
             auth_corp = EveCorporationInfo.objects.get(
-                corporation_id=corporation.corporation.corporation_id
+                corporation_id=corporation.eve_corporation.corporation_id
             )
 
             corp_characters = CharacterOwnership.objects.filter(
@@ -270,7 +264,7 @@ class LedgerAdminApiEndpoints:
                 alliance__alliance_id=alliance_id
             )
             corp_audit_ids = corporations.values_list(
-                "corporation__corporation_id", flat=True
+                "eve_corporation__corporation_id", flat=True
             )
             missing_corporations = all_corporations.exclude(
                 corporation_id__in=corp_audit_ids