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

ledger/views/character/add_char.py

@@ -6,39 +6,37 @@ Character Audit
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required
 from django.shortcuts import redirect
-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
 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__, tasks
-from ledger.models.characteraudit import CharacterAudit
+from ledger.models.characteraudit import CharacterOwner
+from ledger.providers import AppLogger
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
 
 @login_required
-@token_required(scopes=CharacterAudit.get_esi_scopes())
+@token_required(scopes=CharacterOwner.get_esi_scopes())
 @permission_required("ledger.basic_access")
 def add_char(request, token):
-    char, _ = CharacterAudit.objects.update_or_create(
+    char = CharacterOwner.objects.update_or_create(
         eve_character=EveCharacter.objects.get_character_by_id(token.character_id),
         defaults={
             "active": True,
             "character_name": token.character_name,
         },
-    )
+    )[0]
     tasks.update_character.apply_async(
         args=[char.pk], kwargs={"force_refresh": True}, priority=6
     )
 
-    msg = trans("{character_name} successfully added/updated to Ledger").format(
+    msg = _("{character_name} successfully added/updated to Ledger").format(
         character_name=char.eve_character.character_name,
     )
     messages.info(request, msg)

ledger/views/character/character_ledger.py

@@ -1,7 +1,6 @@
 """PvE Views"""
 
 # Standard Library
-import json
 from http import HTTPStatus
 
 # Django
@@ -10,146 +9,83 @@ from django.contrib.auth.decorators import login_required, permission_required
 from django.core.handlers.wsgi import WSGIRequest
 from django.http import JsonResponse
 from django.shortcuts import redirect, render
-from django.utils.translation import gettext as _
+from django.urls import reverse
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.http import require_POST
 
 # Alliance Auth
 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.api.helpers import get_character_or_none
-from ledger.helpers.character import CharacterData
-from ledger.helpers.core import add_info_to_context
-from ledger.models.characteraudit import CharacterAudit, CharacterWalletJournalEntry
+from ledger import __title__, forms
+from ledger.api.helpers.core import get_characterowner_or_none
+from ledger.models.characteraudit import CharacterOwner
+from ledger.providers import AppLogger
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
 
 @login_required
 @permission_required("ledger.basic_access")
-# pylint: disable=too-many-positional-arguments
 def character_ledger(
     request: WSGIRequest,
     character_id: int,
     year=None,
     month=None,
     day=None,
-    section=None,
 ):
     """
     Character Ledger
     """
-    perms, character = get_character_or_none(request, character_id)
-
-    if not perms:
-        msg = _("Permission Denied")
-        messages.error(request, msg)
-        context = {
-            "error": msg,
-            "character_id": character_id,
-            "disabled": True,
-        }
-        context = add_info_to_context(request, context)
-        return render(
-            request, "ledger/charledger/character_ledger.html", context=context
-        )
-
-    character_data = CharacterData(
-        request=request,
-        character=character,
-        year=year,
-        month=month,
-        day=day,
-        section=section,
-    )
+    perms = get_characterowner_or_none(request, character_id)[0]
 
-    # Create the ledger data
-    ledger = character_data.generate_ledger_data()
-
-    context = {
-        "title": f"Character Ledger - {character.eve_character.character_name}",
+    kwargs = {
         "character_id": character_id,
-        "billboard": json.dumps(character_data.billboard.dict.asdict()),
-        "ledger": ledger,
-        "years": CharacterWalletJournalEntry.objects.filter(
-            character__in=character_data.characters
-        )
-        .exclude(date__year__isnull=True)
-        .values_list("date__year", flat=True)
-        .order_by("-date__year")
-        .distinct(),
-        "totals": character_data.calculate_totals(ledger),
-        "view": character_data.create_view_data(
-            viewname="character_details",
-            character_id=character_id,
-            section="summary",
-        ),
-        "is_old_ess": character_data.is_old_ess,
     }
-    # Add additional information to the context
-    context = add_info_to_context(request, context)
-
-    return render(request, "ledger/charledger/character_ledger.html", context=context)
-
-
-@login_required
-@permission_required("ledger.basic_access")
-# pylint: disable=too-many-positional-arguments
-def character_details(
-    request, character_id, year=None, month=None, day=None, section=None
-):
-    """
-    Character Details
-    """
-    perms, character = get_character_or_none(request, character_id)
 
     # pylint: disable=duplicate-code
-    if perms is False:
-        msg = _("Permission Denied")
-        return render(
-            request,
-            "ledger/partials/information/view_character_content.html",
-            {
-                "error": msg,
-                "character_id": character_id,
-            },
-        )
-    # pylint: disable=duplicate-code
-    if perms is None:
-        msg = _("Corporation not found")
-        return render(
-            request,
-            "ledger/partials/information/view_character_content.html",
-            {
-                "error": msg,
-                "character_id": character_id,
-            },
-        )
-
-    character_data = CharacterData(request, character, year, month, day, section)
-
-    journal, mining = character_data.filter_character_journal(character)
-    amounts = character_data._create_character_details(journal, mining)
-    details = character_data._add_average_details(request, amounts, day)
+    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:character_ledger", **kwargs)
+
+    ledger_url = reverse("ledger:api:get_character_ledger", kwargs=kwargs)
 
     context = {
-        "title": f"Character Details - {character.eve_character.character_name}",
-        "type": "character",
-        "character": details,
-        "information": f"Character Details - {character_data.get_details_title}",
+        "title": "Character Ledger",
+        "character_id": character_id,
+        "ledger_url": ledger_url,
+        "forms": {
+            "character_dropdown": forms.CharacterDropdownForm(
+                character_id=character_id,
+                year=year,
+                month=month,
+                day=day,
+            ),
+        },
     }
-    context = add_info_to_context(request, context)
 
-    return render(
-        request,
-        "ledger/partials/information/view_character_content.html",
-        context=context,
-    )
+    if not perms:
+        msg = _("Permission Denied")
+        messages.error(request, msg)
+        return render(request, "ledger/view-character-ledger.html", context=context)
+    return render(request, "ledger/view-character-ledger.html", context=context)
 
 
 @login_required
@@ -161,11 +97,10 @@ def character_overview(request):
 
     context = {
         "title": "Character Overview",
+        "year": timezone.now().year,
+        "month": timezone.now().month,
     }
-    context = add_info_to_context(request, context)
-    return render(
-        request, "ledger/charledger/admin/character_overview.html", context=context
-    )
+    return render(request, "ledger/view-character-overview.html", context=context)
 
 
 @login_required
@@ -177,36 +112,35 @@ def character_administration(request, character_id=None):
     if character_id is None:
         character_id = request.user.profile.main_character.character_id
 
-    perms, character = get_character_or_none(request, character_id)
+    perms, character = get_characterowner_or_none(request, character_id)
 
     if not perms:
         msg = _("Permission Denied")
         messages.error(request, msg)
         return redirect("ledger:index")
 
-    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
     ).order_by("eve_character__character_name")
     characters_ids = characters.values_list("eve_character__character_id", flat=True)
 
     missing_characters = (
-        EveCharacter.objects.filter(character_id__in=linked_characters_ids)
+        EveCharacter.objects.filter(character_id__in=character.alt_ids)
         .exclude(character_id__in=characters_ids)
         .order_by("character_name")
     )
 
     context = {
-        "character_id": character_id,
         "title": "Character Administration",
+        "character_id": character_id,
+        "year": timezone.now().year,
+        "month": timezone.now().month,
         "characters": characters,
         "missing_characters": missing_characters,
     }
-    context = add_info_to_context(request, context)
     return render(
         request,
-        "ledger/charledger/admin/character_administration.html",
+        "ledger/view-character-administration.html",
         context=context,
     )
 
@@ -218,7 +152,7 @@ def character_delete(request, character_id):
     """
     Character Delete
     """
-    perms = get_character_or_none(request, character_id)[0]
+    perms = get_characterowner_or_none(request, character_id)[0]
     if not perms:
         msg = _("Permission Denied")
         return JsonResponse(
@@ -226,8 +160,8 @@ def character_delete(request, character_id):
         )
 
     try:
-        audit = CharacterAudit.objects.get(eve_character__character_id=character_id)
-    except CharacterAudit.DoesNotExist:
+        audit = CharacterOwner.objects.get(eve_character__character_id=character_id)
+    except CharacterOwner.DoesNotExist:
         msg = _("Character not found")
         return JsonResponse(
             {"success": False, "message": msg}, status=HTTPStatus.NOT_FOUND, safe=False

ledger/views/character/planetary.py

@@ -2,38 +2,25 @@
 Planetary Audit
 """
 
-# Standard Library
-from http import HTTPStatus
-
 # Django
 from django.contrib.auth.decorators import login_required, permission_required
-from django.db.models import Q
-from django.http import JsonResponse
 from django.shortcuts import redirect, render
 from django.utils.translation import gettext_lazy as _
-from django.views.decorators.http import require_POST
 
 # Alliance Auth
 from allianceauth.services.hooks import get_extension_logger
 
-# Alliance Auth (External Libs)
-from app_utils.logging import LoggerAddTag
-
 # AA Ledger
-from ledger import __title__, forms
-from ledger.api.helpers import get_character_or_none
-from ledger.helpers.core import add_info_to_context
-from ledger.models.planetary import CharacterPlanetDetails
+from ledger import __title__
+from ledger.providers import AppLogger
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
 
 @login_required
 @permission_required("ledger.basic_access")
 def planetary_ledger_index(request):
     """Character Ledger Index View"""
-    context = {}
-    context = add_info_to_context(request, context)
     return redirect(
         "ledger:planetary_ledger", request.user.profile.main_character.character_id
     )
@@ -48,14 +35,8 @@ def planetary_ledger(request, character_id=None):
     context = {
         "title": "Planetary Ledger",
         "character_id": character_id,
-        "forms": {
-            "confirm": forms.ConfirmForm(),
-        },
     }
-    context = add_info_to_context(request, context)
-    return render(
-        request, "ledger/charledger/planetary/planetary_ledger.html", context=context
-    )
+    return render(request, "ledger/view-character-planetary.html", context=context)
 
 
 @login_required
@@ -68,82 +49,8 @@ def planetary_overview(request):
     context = {
         "title": "Planetary Overview",
     }
-    context = add_info_to_context(request, context)
-
     return render(
         request,
-        "ledger/charledger/planetary/admin/planetary_overview.html",
+        "ledger/view-character-planetary-overview.html",
         context=context,
     )
-
-
-@login_required
-@permission_required("ledger.basic_access")
-@require_POST
-def switch_alarm(request):
-    # Check Permission
-    form = forms.ConfirmForm(request.POST)
-
-    if form.is_valid():
-        is_all = False
-        character_id = int(form.cleaned_data["character_id"])
-        planet_id = int(form.cleaned_data["planet_id"])
-
-        if character_id == 0:  # pylint: disable=duplicate-code
-            character_id = request.user.profile.main_character.character_id
-            is_all = True
-
-        perm, character = get_character_or_none(
-            request, character_id
-        )  # pylint: disable=duplicate-code
-
-        if not perm:
-            msg = _("Permission Denied")
-            return JsonResponse(
-                {"success": True, "message": msg},
-                status=HTTPStatus.FORBIDDEN,
-                safe=False,
-            )
-
-        if is_all:
-            characters = character.alts.values_list("character_id", flat=True)
-        else:
-            characters = [character_id]
-
-        filters = Q(planet__character__eve_character__character_id__in=characters)
-        if planet_id != 0:
-            filters &= Q(planet__planet__id=planet_id)
-        try:
-            planets = CharacterPlanetDetails.objects.filter(filters)
-
-            if planets.exists():
-                # Determine the majority state
-                on_count = planets.filter(notification=True).count()
-                off_count = planets.filter(notification=False).count()
-                majority_state = on_count > off_count
-
-                # Set all to the opposite of the majority state
-                for p in planets:
-                    p.notification = not majority_state
-                    p.save()
-
-                msg = _("All alarms successfully switched")
-            else:
-                raise CharacterPlanetDetails.DoesNotExist
-
-        except CharacterPlanetDetails.DoesNotExist:
-            msg = _("Planet/s not found")
-            return JsonResponse(
-                {"success": True, "message": msg},
-                status=HTTPStatus.NOT_FOUND,
-                safe=False,
-            )
-
-        return JsonResponse(
-            {"success": True, "message": msg}, status=HTTPStatus.OK, safe=False
-        )
-
-    msg = "Invalid Form"
-    return JsonResponse(
-        {"success": False, "message": msg}, status=HTTPStatus.BAD_REQUEST, safe=False
-    )

ledger/views/corporation/add_corp.py

@@ -7,39 +7,37 @@ from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404, redirect
-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
 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__, tasks
-from ledger.models.corporationaudit import CorporationAudit
+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__)
 
 
 @login_required
-@token_required(scopes=CorporationAudit.get_esi_scopes())
+@token_required(scopes=CorporationOwner.get_esi_scopes())
 @permission_required(["ledger.manage_access"])
 def add_corp(request, token) -> HttpResponse:
     char = get_object_or_404(EveCharacter, character_id=token.character_id)
-    eve_corp, _ = EveCorporationInfo.objects.get_or_create(
+    eve_corp = EveCorporationInfo.objects.get_or_create(
         corporation_id=char.corporation_id,
         defaults={
             "member_count": 0,
             "corporation_ticker": char.corporation_ticker,
             "corporation_name": char.corporation_name,
         },
-    )
+    )[0]
 
-    corp = CorporationAudit.objects.update_or_create(
-        corporation=eve_corp,
+    corp = CorporationOwner.objects.update_or_create(
+        eve_corporation=eve_corp,
         defaults={
             "corporation_name": eve_corp.corporation_name,
         },
@@ -48,7 +46,7 @@ def add_corp(request, token) -> HttpResponse:
     tasks.update_corporation.apply_async(
         args=[corp.pk], kwargs={"force_refresh": True}, priority=6
     )
-    msg = trans("{corporation_name} successfully added/updated to Ledger").format(
+    msg = _("{corporation_name} successfully added/updated to Ledger").format(
         corporation_name=corp.corporation_name,
     )
     messages.info(request, msg)