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

ledger/thirdparty/charlink_hook.py

@@ -4,18 +4,15 @@ from charlink.app_imports.utils import AppImport, LoginImport
 # Django
 from django.contrib.auth.models import Permission, User
 from django.db.models import Exists, OuterRef
-from django.utils.translation import gettext_lazy as trans
+from django.utils.translation import gettext_lazy as _
 
 # Alliance Auth
 from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo
 
-# Alliance Auth (External Libs)
-from app_utils.allianceauth import users_with_permission
-
 # AA Ledger
 from ledger.app_settings import LEDGER_APP_NAME
-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.tasks import update_character, update_corporation
 
 _corp_perms = [
@@ -25,7 +22,7 @@ _corp_perms = [
 
 # pylint: disable=unused-argument, duplicate-code
 def _add_character_charaudit(request, token):
-    character = CharacterAudit.objects.update_or_create(
+    character = CharacterOwner.objects.update_or_create(
         eve_character=EveCharacter.objects.get_character_by_id(token.character_id),
         defaults={
             "character_name": token.character_name,
@@ -47,7 +44,7 @@ def _add_character_corp(request, token):
             "corporation_name": char.corporation_name,
         },
     )
-    corp = CorporationAudit.objects.update_or_create(
+    corp = CorporationOwner.objects.update_or_create(
         corporation=eve_corp,
         defaults={
             "corporation_name": eve_corp.corporation_name,
@@ -63,38 +60,70 @@ def _check_perms_corp(user: User):
 
 
 def _is_character_added_charaudit(character: EveCharacter):
-    return CharacterAudit.objects.filter(character=character).exists()
+    return CharacterOwner.objects.filter(character=character).exists()
 
 
 def _is_character_added_corp(character: EveCharacter):
-    return CorporationAudit.objects.filter(
-        corporation__corporation_id=character.corporation_id
+    return CorporationOwner.objects.filter(
+        eve_corporation__corporation_id=character.corporation_id
     ).exists()
 
 
 def _users_with_perms_charaudit():
-    return users_with_permission(
-        Permission.objects.get(
-            content_type__app_label="ledger", codename="basic_access"
+    permission = Permission.objects.get(
+        content_type__app_label="ledger", codename="basic_access"
+    )
+
+    users_qs = (
+        permission.user_set.all()
+        | User.objects.filter(
+            groups__in=list(permission.group_set.values_list("pk", flat=True))
+        )
+        | User.objects.select_related("profile").filter(
+            profile__state__in=list(permission.state_set.values_list("pk", flat=True))
         )
+        | User.objects.filter(is_superuser=True)
     )
+    return users_qs.distinct()
 
 
 def _users_with_perms_corp():
-    users = users_with_permission(
-        Permission.objects.get(
-            content_type__app_label=_corp_perms[0].split(".", maxsplit=1)[0],
-            codename=_corp_perms[0].split(".", maxsplit=1)[1],
+    permission = Permission.objects.get(
+        content_type__app_label=_corp_perms[0].split(".", maxsplit=1)[0],
+        codename=_corp_perms[0].split(".", maxsplit=1)[1],
+    )
+
+    users_qs = (
+        permission.user_set.all()
+        | User.objects.filter(
+            groups__in=list(permission.group_set.values_list("pk", flat=True))
+        )
+        | User.objects.select_related("profile").filter(
+            profile__state__in=list(permission.state_set.values_list("pk", flat=True))
         )
+        | User.objects.filter(is_superuser=True)
     )
+    users = users_qs.distinct()
+
     for perm_str in _corp_perms[1:]:
-        users |= users_with_permission(
-            Permission.objects.get(
-                content_type__app_label=perm_str.split(".", maxsplit=1)[0],
-                codename=perm_str.split(".", maxsplit=1)[1],
-            )
+        permission = Permission.objects.get(
+            content_type__app_label=perm_str.split(".", maxsplit=1)[0],
+            codename=perm_str.split(".", maxsplit=1)[1],
         )
 
+        users_qs = (
+            permission.user_set.all()
+            | User.objects.filter(
+                groups__in=list(permission.group_set.values_list("pk", flat=True))
+            )
+            | User.objects.select_related("profile").filter(
+                profile__state__in=list(
+                    permission.state_set.values_list("pk", flat=True)
+                )
+            )
+            | User.objects.filter(is_superuser=True)
+        )
+        users |= users_qs.distinct()
     return users
 
 
@@ -104,30 +133,31 @@ app_import = AppImport(
         LoginImport(
             app_label="ledger",
             unique_id="default",
-            field_label=LEDGER_APP_NAME + " - " + trans("Character") + " Login",
+            field_label=_("Character") + " " + LEDGER_APP_NAME,
             add_character=_add_character_charaudit,
-            scopes=CharacterAudit.get_esi_scopes(),
+            scopes=CharacterOwner.get_esi_scopes(),
             check_permissions=lambda user: user.has_perm("ledger.basic_access"),
             is_character_added=_is_character_added_charaudit,
             is_character_added_annotation=Exists(
-                CharacterAudit.objects.filter(eve_character_id=OuterRef("pk"))
+                CharacterOwner.objects.filter(eve_character_id=OuterRef("pk"))
             ),
             get_users_with_perms=_users_with_perms_charaudit,
         ),
         LoginImport(
             app_label="ledger",
             unique_id="corpaudit",
-            field_label=LEDGER_APP_NAME + " - " + trans("Corporation") + " Login",
+            field_label=_("Corporation") + " " + LEDGER_APP_NAME,
             add_character=_add_character_corp,
-            scopes=CorporationAudit.get_esi_scopes(),
+            scopes=CorporationOwner.get_esi_scopes(),
             check_permissions=_check_perms_corp,
             is_character_added=_is_character_added_corp,
             is_character_added_annotation=Exists(
-                CorporationAudit.objects.filter(
-                    corporation__corporation_id=OuterRef("corporation_id")
+                CorporationOwner.objects.filter(
+                    eve_corporation__corporation_id=OuterRef("corporation_id")
                 )
             ),
             get_users_with_perms=_users_with_perms_corp,
+            default_initial_selection=False,
         ),
     ],
 )

ledger/urls.py

@@ -35,11 +35,6 @@ urlpatterns = [
         name="delete_corp",
     ),
     # -- -- Alliance Ledger
-    path(
-        "alliance/",
-        alliance_ledger.alliance_ledger_index,
-        name="alliance_ledger_index",
-    ),
     path(
         "alliance/<int:alliance_id>/",
         alliance_ledger.alliance_ledger,
@@ -60,32 +55,6 @@ urlpatterns = [
         alliance_ledger.alliance_ledger,
         name="alliance_ledger",
     ),
-    # -- -- Alliance Details
-    path(
-        "alliance/<int:alliance_id>/view/details/<int:entity_id>/section/<str:section>/",
-        alliance_ledger.alliance_details,
-        name="alliance_details",
-    ),
-    path(
-        "alliance/<int:alliance_id>/<int:year>/view/details/<int:entity_id>/section/<str:section>/",
-        alliance_ledger.alliance_details,
-        name="alliance_details",
-    ),
-    path(
-        "alliance/<int:alliance_id>/<int:year>/<int:month>/view/details/<int:entity_id>/section/<str:section>/",
-        alliance_ledger.alliance_details,
-        name="alliance_details",
-    ),
-    path(
-        "alliance/<int:alliance_id>/<int:year>/<int:month>/<int:day>/view/details/<int:entity_id>/section/<str:section>/",
-        alliance_ledger.alliance_details,
-        name="alliance_details",
-    ),
-    path(
-        "alliance/<int:alliance_id>/<int:year>/<int:month>/<int:day>/view/details/<int:entity_id>/section/<str:section>/",
-        alliance_ledger.alliance_details,
-        name="alliance_details",
-    ),
     path(
         "alliance/<int:alliance_id>/view/administration/",
         alliance_ledger.alliance_administration,
@@ -98,11 +67,6 @@ urlpatterns = [
     ),
     path("alliance/add/", add_ally, name="add_ally"),
     # -- -- Corporation Ledger
-    path(
-        "corporation/",
-        corporation_ledger.corporation_ledger_index,
-        name="corporation_ledger_index",
-    ),
     path(
         "corporation/<int:corporation_id>/",
         corporation_ledger.corporation_ledger,
@@ -143,74 +107,6 @@ urlpatterns = [
         corporation_ledger.corporation_ledger,
         name="corporation_ledger",
     ),
-    # -- -- Data Export
-    path(
-        "corporation/<int:corporation_id>/data-export/",
-        corporation_ledger.corporation_data_export,
-        name="corporation_data_export",
-    ),
-    path(
-        "corporation/<int:corporation_id>/data-export/generate/",
-        corporation_ledger.corporation_data_export_generate,
-        name="corporation_data_export_generate",
-    ),
-    path(
-        "corporation/<str:hash_code>/data-export/download/",
-        corporation_ledger.corporation_download_export_file,
-        name="corporation_download_export_file",
-    ),
-    path(
-        "corporation/<str:hash_code>/data-export/update/",
-        corporation_ledger.corporation_data_export_run_update,
-        name="corporation_data_export_run_update",
-    ),
-    # -- -- Corporation Details
-    path(
-        "corporation/<int:corporation_id>/view/details/<int:entity_id>/section/<str:section>/",
-        corporation_ledger.corporation_details,
-        name="corporation_details",
-    ),
-    path(
-        "corporation/<int:corporation_id>/<int:year>/view/details/<int:entity_id>/section/<str:section>/",
-        corporation_ledger.corporation_details,
-        name="corporation_details",
-    ),
-    path(
-        "corporation/<int:corporation_id>/<int:year>/<int:month>/view/details/<int:entity_id>/section/<str:section>/",
-        corporation_ledger.corporation_details,
-        name="corporation_details",
-    ),
-    path(
-        "corporation/<int:corporation_id>/<int:year>/<int:month>/<int:day>/view/details/<int:entity_id>/section/<str:section>/",
-        corporation_ledger.corporation_details,
-        name="corporation_details",
-    ),
-    # -- -- Division Details
-    path(
-        "corporation/<int:corporation_id>/division/<int:division_id>/view/details/<int:entity_id>/section/<str:section>/",
-        corporation_ledger.corporation_details,
-        name="corporation_details",
-    ),
-    path(
-        "corporation/<int:corporation_id>/division/<int:division_id>/<int:year>/view/details/<int:entity_id>/section/<str:section>/",
-        corporation_ledger.corporation_details,
-        name="corporation_details",
-    ),
-    path(
-        "corporation/<int:corporation_id>/division/<int:division_id>/<int:year>/<int:month>/view/details/<int:entity_id>/section/<str:section>/",
-        corporation_ledger.corporation_details,
-        name="corporation_details",
-    ),
-    path(
-        "corporation/<int:corporation_id>/division/<int:division_id>/<int:year>/<int:month>/<int:day>/view/details/<int:entity_id>/section/<str:section>/",
-        corporation_ledger.corporation_details,
-        name="corporation_details",
-    ),
-    path(
-        "corporation/<int:corporation_id>/division/<int:division_id>/view/details/<int:entity_id>/section/<str:section>/",
-        corporation_ledger.corporation_details,
-        name="corporation_details",
-    ),
     path(
         "corporation/<int:corporation_id>/view/administration/",
         corporation_ledger.corporation_administration,
@@ -262,32 +158,6 @@ urlpatterns = [
         character_ledger.character_ledger,
         name="character_ledger",
     ),
-    # -- -- Character Details
-    path(
-        "character/<int:character_id>/view/details/section/<str:section>/",
-        character_ledger.character_details,
-        name="character_details",
-    ),
-    path(
-        "character/<int:character_id>/<int:year>/view/details/section/<str:section>/",
-        character_ledger.character_details,
-        name="character_details",
-    ),
-    path(
-        "character/<int:character_id>/<int:year>/<int:month>/view/details/section/<str:section>/",
-        character_ledger.character_details,
-        name="character_details",
-    ),
-    path(
-        "character/<int:character_id>/<int:year>/<int:month>/<int:day>/view/details/section/<str:section>/",
-        character_ledger.character_details,
-        name="character_details",
-    ),
-    path(
-        "character/<int:character_id>/<int:year>/<int:month>/<int:day>/view/details/section/<str:section>/",
-        character_ledger.character_details,
-        name="character_details",
-    ),
     # -- -- Character Administration
     path(
         "character/<int:character_id>/view/administration/",
@@ -310,11 +180,6 @@ urlpatterns = [
         planetary.planetary_ledger,
         name="planetary_ledger",
     ),
-    path(
-        "character/switch_alarm/",
-        planetary.switch_alarm,
-        name="switch_alarm",
-    ),
     path(
         "character/view/planetary/overview/",
         planetary.planetary_overview,

ledger/views/alliance/add_ally.py

@@ -15,14 +15,12 @@ from allianceauth.eveonline.providers import ObjectNotFound, provider
 from allianceauth.services.hooks import get_extension_logger
 from esi.decorators import token_required
 
-# Alliance Auth (External Libs)
-from app_utils.logging import LoggerAddTag
-
 # AA Ledger
 from ledger import __title__
 from ledger.models.general import EveEntity
+from ledger.providers import AppLogger
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
 
 @login_required

ledger/views/alliance/alliance_ledger.py

@@ -1,52 +1,38 @@
 """PvE Views"""
 
-# Standard Library
-import json
-
 # Django
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.handlers.wsgi import WSGIRequest
 from django.shortcuts import redirect, render
+from django.urls import reverse
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 # Alliance Auth
 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.helpers import get_all_corporations_from_alliance, get_alliance
-from ledger.helpers.alliance import AllianceData
-from ledger.helpers.core import LedgerEntity, add_info_to_context
-from ledger.models.corporationaudit import CorporationWalletJournalEntry
-
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
-
-
-@login_required
-@permission_required("ledger.advanced_access")
-def alliance_ledger_index(request):
-    """Alliance Ledger Index View"""
-    context = {}
-    context = add_info_to_context(request, context)
-    alliance_id = request.user.profile.main_character.alliance_id
-    if not alliance_id:
-        alliance_id = 0
+from ledger import __title__, forms
+from ledger.api.helpers.core import (
+    get_all_corporations_from_alliance,
+    get_alliance_or_none,
+)
+from ledger.providers import AppLogger
 
-    return redirect("ledger:alliance_ledger", alliance_id=alliance_id)
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
 
 @login_required
 @permission_required("ledger.advanced_access")
-def alliance_ledger(request, alliance_id, year=None, month=None, day=None):
+def alliance_ledger(
+    request: WSGIRequest, alliance_id: int, year=None, month=None, day=None
+):
     """
     Alliance Ledger
     """
-    perms, alliance = get_alliance(request, alliance_id)
+    perms = get_alliance_or_none(request, alliance_id)[0]
 
     context = {
         "title": "Alliance Ledger",
@@ -54,125 +40,56 @@ def alliance_ledger(request, alliance_id, year=None, month=None, day=None):
         "disabled": True,
     }
 
-    # pylint: disable=duplicate-code
-    if perms is False:
-        msg = _("Permission Denied")
-        messages.error(request, msg)
-        return render(
-            request, "ledger/allyledger/alliance_ledger.html", context=context
-        )
-    # pylint: disable=duplicate-code
-    if perms is None:
-        msg = _("Alliance not found.")
-        messages.info(request, msg)
-        return render(
-            request, "ledger/allyledger/alliance_ledger.html", context=context
-        )
-
-    alliance_data = AllianceData(
-        request=request, alliance=alliance, year=year, month=month, day=day
-    )
+    kwargs = {
+        "alliance_id": alliance_id,
+    }
 
-    # Create the Alliance ledger data
-    ledger = alliance_data.generate_ledger_data()
+    # pylint: disable=duplicate-code
+    if request.POST:
+        year = request.POST.get("year") or None
+        month = request.POST.get("month") or None
+        day = request.POST.get("day") or None
+        # Ensure that if only day is provided, month is also provided
+        if day is not None and month is None:
+            month = timezone.now().month
+
+    if year is not None:
+        kwargs["year"] = year
+    if month is not None:
+        kwargs["month"] = month
+    if day is not None:
+        kwargs["day"] = day
+
+    # Redirect to the same view with updated parameters
+    if request.POST:
+        return redirect("ledger:alliance_ledger", **kwargs)
+
+    ledger_url = reverse("ledger:api:get_alliance_ledger", kwargs=kwargs)
 
     context = {
-        "title": f"Alliance Ledger - {alliance.alliance_name}",
+        "title": "Alliance Ledger",
         "alliance_id": alliance_id,
-        "billboard": json.dumps(alliance_data.billboard.dict.asdict()),
-        "ledger": ledger,
-        "years": CorporationWalletJournalEntry.objects.filter(
-            division__corporation__corporation__corporation_id__in=alliance_data.corporations
-        )
-        .values_list("date__year", flat=True)
-        .distinct()
-        .order_by("-date__year"),
-        "totals": alliance_data.calculate_totals(ledger),
-        "view": alliance_data.create_view_data(
-            viewname="alliance_details",
-            alliance_id=alliance_id,
-            entity_id=alliance_id,
-            section="summary",
-        ),
+        "ledger_url": ledger_url,
+        "forms": {
+            "alliance_dropdown": forms.AllianceDropdownForm(
+                alliance_id=alliance_id,
+                year=year,
+                month=month,
+                day=day,
+            ),
+        },
     }
-    # Add additional information to the context
-    context = add_info_to_context(request, context)
-
-    return render(request, "ledger/allyledger/alliance_ledger.html", context=context)
-
-
-# pylint: disable=too-many-positional-arguments
-@login_required
-@permission_required("ledger.advanced_access")
-def alliance_details(
-    request: WSGIRequest,
-    alliance_id=None,
-    entity_id=None,
-    year=None,
-    month=None,
-    day=None,
-    section=None,
-):
-    """
-    Alliance Details
-    """
-    perms, alliance = get_alliance(request, alliance_id=alliance_id)
 
-    # pylint: disable=duplicate-code
-    if perms is False:
-        msg = _("Permission Denied")
-        return render(
-            request,
-            "ledger/partials/information/view_character_content.html",
-            {
-                "error": msg,
-                "alliance_id": alliance_id,
-            },
-        )
-    # pylint: disable=duplicate-code
     if perms is None:
         msg = _("Alliance not found.")
-        return render(
-            request,
-            "ledger/partials/information/view_character_content.html",
-            {
-                "error": msg,
-                "alliance_id": alliance_id,
-            },
-        )
-
-    alliance_data = AllianceData(
-        request=request,
-        alliance=alliance,
-        year=year,
-        month=month,
-        day=day,
-        section=section,
-    )
-
-    # Create the Entity for the ledger
-    entity = LedgerEntity(
-        entity_id=entity_id,
-        alliance_obj=alliance if entity_id == alliance.alliance_id else None,
-    )
-
-    journal = alliance_data.filter_entity_journal(entity=entity)
-    amounts = alliance_data._create_corporation_details(journal=journal, entity=entity)
-    details = alliance_data._add_average_details(request, amounts, day)
+        messages.info(request, msg)
+        return redirect("ledger:alliance_overview")
 
-    context = {
-        "title": f"Alliance Details - {alliance.alliance_name}",
-        "type": "alliance",
-        "character": details,
-        "information": f"Alliance Details - {alliance_data.get_details_title}",
-    }
-    context = add_info_to_context(request, context)
-    # pylint: disable=duplicate-code
-    return render(
-        request,
-        "ledger/partials/information/view_character_content.html",
-        context=context,
-    )
+    if perms is False:
+        msg = _("Permission Denied")
+        messages.error(request, msg)
+        return redirect("ledger:alliance_overview")
+    return render(request, "ledger/view-alliance-ledger.html", context=context)
 
 
 @login_required
@@ -183,11 +100,10 @@ def alliance_overview(request):
     """
     context = {
         "title": "Alliance Overview",
+        "year": timezone.now().year,
+        "month": timezone.now().month,
     }
-    context = add_info_to_context(request, context)
-    return render(
-        request, "ledger/allyledger/admin/alliance_overview.html", context=context
-    )
+    return render(request, "ledger/view-alliance-overview.html", context=context)
 
 
 @login_required
@@ -196,23 +112,25 @@ def alliance_administration(request, alliance_id):
     """
     Alliance Administration
     """
-    perm, alliance = get_alliance(request, alliance_id)
+    perm, alliance = get_alliance_or_none(request, alliance_id)
 
     if perm is False:
         msg = _("Permission Denied")
         messages.error(request, msg)
-        return redirect("ledger:alliance_ledger_index")
+        return redirect("ledger:alliance_overview")
     if perm is None:
         msg = _("Alliance not found.")
         messages.info(request, msg)
-        return redirect("ledger:alliance_ledger_index")
+        return redirect("ledger:alliance_overview")
 
     corporations = get_all_corporations_from_alliance(request, alliance.alliance_id)[1]
     all_corporations = EveCorporationInfo.objects.filter(
         alliance__alliance_id=alliance_id
     ).order_by("corporation_name")
 
-    corp_audit_ids = corporations.values_list("corporation__corporation_id", flat=True)
+    corp_audit_ids = corporations.values_list(
+        "eve_corporation__corporation_id", flat=True
+    )
     missing_corporations = all_corporations.exclude(
         corporation_id__in=corp_audit_ids
     ).order_by("corporation_name")
@@ -224,9 +142,8 @@ def alliance_administration(request, alliance_id):
         "corporations": corporations,
         "missing_corporations": missing_corporations,
     }
-    context = add_info_to_context(request, context)
     return render(
         request,
-        "ledger/allyledger/admin/alliance_administration.html",
+        "ledger/view-alliance-administration.html",
         context=context,
     )