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

ledger/views/corporation/corporation_ledger.py

@@ -1,15 +1,16 @@
 """PvE Views"""
 
 # Standard Library
-import json
 from http import HTTPStatus
 
 # 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.http import FileResponse, Http404, JsonResponse
+from django.http import JsonResponse
 from django.shortcuts import redirect, render
+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
 
@@ -17,200 +18,20 @@ from django.views.decorators.http import require_POST
 from allianceauth.authentication.models import CharacterOwnership
 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, tasks
-from ledger.api.helpers import (
-    get_corporation,
+from ledger import __title__, forms
+from ledger.api.helpers.core import (
+    get_corporationowner_or_none,
     get_manage_corporation,
 )
-from ledger.helpers import data_exporter
-from ledger.helpers.core import add_info_to_context
-from ledger.helpers.corporation import CorporationData, LedgerEntity
 from ledger.models.corporationaudit import (
-    CorporationAudit,
+    CorporationOwner,
 )
+from ledger.providers import AppLogger
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
-
-
-@login_required
-@permission_required("ledger.advanced_access")
-def corporation_ledger_index(request):
-    """Corporation Ledger Index View"""
-    context = {}
-    context = add_info_to_context(request, context)
-    return redirect(
-        "ledger:corporation_ledger", request.user.profile.main_character.corporation_id
-    )
-
-
-@login_required
-@permission_required("ledger.basic_access")
-def corporation_data_export(request, corporation_id: int):
-    """Data Export View"""
-    perms = get_corporation(request, corporation_id)[0]
-
-    corporation_exporter = data_exporter.LedgerCSVExporter.create_exporter(
-        "corporation", corporation_id
-    )
-    files = corporation_exporter.gather_export_files()
-
-    context = {
-        "title": "Data Export",
-        "corporation_id": corporation_id,
-        "files": files,
-        "is_exportable": corporation_exporter.has_data,
-    }
-
-    if perms is False:
-        msg = _("Permission Denied")
-        messages.error(request, msg)
-        return render(request, "ledger/data-export.html", context=context)
-
-    if perms is None:
-        msg = _("Corporation not found")
-        messages.info(request, msg)
-        return render(request, "ledger/data-export.html", context=context)
-
-    context.update(
-        {
-            "forms": {
-                "generate_data_export": forms.GenerateDataExportForm(
-                    corporation_id=corporation_id
-                ),
-            },
-        }
-    )
-
-    context = add_info_to_context(request, context)
-    return render(request, "ledger/data-export.html", context)
-
-
-@login_required
-@permission_required("ledger.manage_access")
-# pylint: disable=unused-argument
-def corporation_download_export_file(
-    request,
-    hash_code: str,
-) -> FileResponse:
-    """Render file view for downloading an export file."""
-    entity_id, division_id, year, month = data_exporter.LedgerCSVExporter.decoder(
-        hash_code
-    )
-    exporter = data_exporter.LedgerCSVExporter.create_exporter(
-        "corporation", entity_id, division_id=division_id, year=year, month=month
-    )
-    destination = data_exporter.default_destination()
-    zip_file = destination / exporter.output_basename.with_suffix(".zip")
-    if not zip_file.exists():
-        raise Http404(f"Could not find export file for corporation {entity_id}")
-    logger.info("Returning file %s for download of topic %s", zip_file, "corporation")
-    return FileResponse(zip_file.open("rb"))
-
-
-@login_required
-@permission_required("ledger.manage_access")
-@require_POST
-def corporation_data_export_generate(request, corporation_id: int):
-    """Handle POST form to generate a data export for a corporation."""
-    perms = get_corporation(request, corporation_id)[0]
-    if perms is False:
-        msg = _("Permission Denied")
-        messages.error(request, msg)
-        return redirect("ledger:corporation_data_export", corporation_id=corporation_id)
-
-    if perms is None:
-        msg = _("Corporation not found")
-        messages.info(request, msg)
-        return redirect("ledger:corporation_data_export", corporation_id=corporation_id)
-
-    form = forms.GenerateDataExportForm(
-        request.POST,
-        corporation_id=corporation_id,
-    )
-
-    if not form.is_valid():
-        msg = _("Invalid form submission.")
-        messages.error(request, msg)
-        return redirect("ledger:corporation_data_export", corporation_id=corporation_id)
-
-    # Read optional form values
-    year_val = form.cleaned_data.get("year")
-    month_val = form.cleaned_data.get("month") or None
-
-    division_obj = form.cleaned_data.get("division")
-    division_val = division_obj.division_id if division_obj is not None else None
-
-    logger.debug("Generating data export for year=%s, month=%s", year_val, month_val)
-    tasks.export_data_ledger.apply_async(
-        kwargs={
-            "user_pk": request.user.pk,
-            "ledger_type": "corporation",
-            "entity_id": corporation_id,
-            "division_id": division_val,
-            "year": year_val,
-            "month": month_val,
-        },
-        priority=7,
-    )
-    msg = _(
-        f"Data export for {corporation_id} has been started. This can take a couple of minutes. You will get a notification once it is completed."
-    )
-    messages.info(request, msg)
-    return redirect("ledger:corporation_data_export", corporation_id=corporation_id)
-
-
-@login_required
-@permission_required("ledger.manage_access")
-def corporation_data_export_run_update(
-    request,
-    hash_code: str,
-):
-    """Render view for running data export update."""
-    entity_id, division_id, year, month = data_exporter.LedgerCSVExporter.decoder(
-        hash_code
-    )
-
-    logger.debug(
-        "Running data export update for entity_id=%s, division_id=%s, year=%s, month=%s",
-        entity_id,
-        division_id,
-        year,
-        month,
-    )
-    perms = get_corporation(request, entity_id)[0]
-    if perms is False:
-        msg = _("Permission Denied")
-        messages.error(request, msg)
-        return redirect("ledger:corporation_data_export", corporation_id=entity_id)
-
-    if perms is None:
-        msg = _("Corporation not found")
-        messages.info(request, msg)
-        return redirect("ledger:corporation_data_export", corporation_id=entity_id)
+logger = AppLogger(get_extension_logger(__name__), __title__)
 
-    tasks.export_data_ledger.apply_async(
-        kwargs={
-            "user_pk": request.user.pk,
-            "ledger_type": "corporation",
-            "entity_id": entity_id,
-            "division_id": division_id,
-            "year": year,
-            "month": month,
-        },
-        priority=7,
-    )
-    msg = _(
-        f"Data export for {entity_id} has been started. This can take a couple of minutes. You will get a notification once it is completed."
-    )
-    messages.info(request, msg)
-    return redirect("ledger:corporation_data_export", corporation_id=entity_id)
 
-
-# pylint: disable=too-many-positional-arguments
 @login_required
 @permission_required("ledger.advanced_access")
 def corporation_ledger(
@@ -224,141 +45,61 @@ def corporation_ledger(
     """
     Corporation Ledger
     """
-    perms, corporation = get_corporation(request, corporation_id)
+    perms = get_corporationowner_or_none(request, corporation_id)[0]
 
-    context = {
-        "title": "Corporation Ledger",
+    kwargs = {
         "corporation_id": corporation_id,
-        "disabled": True,
     }
 
-    # pylint: disable=duplicate-code
-    if perms is False:
-        msg = _("Permission Denied")
-        messages.error(request, msg)
-        return render(
-            request, "ledger/corpledger/corporation_ledger.html", context=context
-        )
-    # pylint: disable=duplicate-code
-    if perms is None:
-        msg = _("Corporation not found")
-        messages.info(request, msg)
-        return render(
-            request, "ledger/corpledger/corporation_ledger.html", context=context
-        )
-
-    corporation_data = CorporationData(
-        corporation=corporation,
-        division_id=division_id,
-        year=year,
-        month=month,
-        day=day,
-    )
-    # Create the Corporation ledger data
-    ledger = corporation_data.generate_ledger_data()
-
-    context = {
-        "title": f"Corporation Ledger - {corporation.corporation.corporation_name}",
-        "corporation_id": corporation_id,
-        "division_id": division_id,
-        "billboard": json.dumps(corporation_data.billboard.dict.asdict()),
-        "ledger": ledger,
-        "divisions": corporation_data.divisions,
-        "years": corporation_data.activity_years,
-        "totals": corporation_data.calculate_totals(ledger),
-        "view": corporation_data.create_view_data(
-            viewname="corporation_details",
-            corporation_id=corporation_id,
-            entity_id=corporation_id,
-            division_id=division_id,
-            section="summary",
-        ),
-    }
-    # Add additional information to the context
-    context = add_info_to_context(request, context)
-
-    return render(request, "ledger/corpledger/corporation_ledger.html", context=context)
-
-
-# pylint: disable=too-many-positional-arguments, too-many-arguments
-@login_required
-@permission_required("ledger.advanced_access")
-def corporation_details(
-    request: WSGIRequest,
-    corporation_id: int,
-    entity_id: int,
-    division_id: int = None,
-    year: int = None,
-    month: int = None,
-    day: int = None,
-    section: str = None,
-):
-    """
-    Corporation Details
-    """
-    perms, corporation = get_corporation(request, corporation_id)
+    if request.POST:
+        division_id = request.POST.get("division") or None
+        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 division_id is not None:
+        kwargs["division_id"] = division_id
+    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:corporation_ledger", **kwargs)
+
+    ledger_url = reverse("ledger:api:get_corporation_ledger", kwargs=kwargs)
 
     context = {
         "title": "Corporation Ledger",
         "corporation_id": corporation_id,
+        "ledger_url": ledger_url,
+        "forms": {
+            "corporation_dropdown": forms.CorporationDropdownForm(
+                corporation_id=corporation_id,
+                division_id=division_id,
+                year=year,
+                month=month,
+                day=day,
+            ),
+        },
     }
 
-    # pylint: disable=duplicate-code
-    if perms is False:
-        msg = _("Permission Denied")
-        return render(
-            request,
-            "ledger/partials/information/view_character_content.html",
-            {
-                "error": msg,
-                "corporation_id": corporation_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,
-                "corporation_id": corporation_id,
-            },
-        )
-
-    corporation_data = CorporationData(
-        corporation=corporation,
-        division_id=division_id,
-        year=year,
-        month=month,
-        day=day,
-        section=section,
-    )
-
-    # Create the Entity for the ledger
-    entity = LedgerEntity(
-        entity_id=entity_id,
-    )
-
-    journal = corporation_data.filter_entity_journal(entity=entity)
-    amounts = corporation_data._create_corporation_details(
-        journal=journal, entity=entity
-    )
-    details = corporation_data._add_average_details(request, amounts, day)
+        messages.info(request, msg)
+        return redirect("ledger:corporation_overview")
 
-    context = {
-        "title": f"Corporation Details - {corporation.corporation_name}",
-        "type": "corporation",
-        "character": details,
-        "information": f"Corporation Details - {corporation_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:corporation_overview")
+    return render(request, "ledger/view-corporation-ledger.html", context=context)
 
 
 @login_required
@@ -367,11 +108,12 @@ def corporation_overview(request):
     """
     Corporation Overview
     """
-    context = {"title": "Corporation Overview"}
-    context = add_info_to_context(request, context)
-    return render(
-        request, "ledger/corpledger/admin/corporation_overview.html", context=context
-    )
+    context = {
+        "title": "Corporation Overview",
+        "year": timezone.now().year,
+        "month": timezone.now().month,
+    }
+    return render(request, "ledger/view-corporation-overview.html", context=context)
 
 
 @login_required
@@ -385,33 +127,29 @@ def corporation_administration(request, corporation_id):
     if perm is False:
         msg = _("Permission Denied")
         messages.error(request, msg)
-        return redirect("ledger:corporation_ledger_index")
+        return redirect("ledger:corporation_overview")
 
     if perm is None:
         msg = _("Corporation not found")
         messages.info(request, msg)
-        return redirect("ledger:corporation_ledger_index")
+        return redirect("ledger:corporation_overview")
 
     # TODO Get Missing Characters from esi-corporations.read_corporation_membership.v1 ?
     corp_characters = CharacterOwnership.objects.filter(
-        character__corporation_id=corporation.corporation.corporation_id
+        character__corporation_id=corporation.eve_corporation.corporation_id
     ).order_by("character__character_name")
-    corporation_dataexporter = data_exporter.LedgerCSVExporter.create_exporter(
-        "corporation", corporation_id
-    )
 
     context = {
         "corporation_id": corporation_id,
         "title": "Corporation Administration",
+        "year": timezone.now().year,
+        "month": timezone.now().month,
         "corporation": corporation,
         "characters": corp_characters,
-        "is_exportable": corporation_dataexporter.has_data,
     }
-    context = add_info_to_context(request, context)
-
     return render(
         request,
-        "ledger/corpledger/admin/corporation_administration.html",
+        "ledger/view-corporation-administration.html",
         context=context,
     )
 
@@ -436,10 +174,10 @@ def corporation_delete(request, corporation_id):
             {"success": False, "message": msg}, status=HTTPStatus.NOT_FOUND, safe=False
         )
 
-    audit = CorporationAudit.objects.get(corporation__corporation_id=corporation_id)
+    audit = CorporationOwner.objects.get(eve_corporation__corporation_id=corporation_id)
     audit.delete()
 
-    msg = _(f"{audit.corporation.corporation_name} successfully deleted")
+    msg = _(f"{audit.eve_corporation.corporation_name} successfully deleted")
     return JsonResponse(
         {"success": True, "message": msg}, status=HTTPStatus.OK, safe=False
     )

ledger/views/index.py

@@ -3,61 +3,123 @@
 # 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.utils.translation import gettext as _
+from django.utils import timezone
+from django.utils.text import format_lazy
+from django.utils.translation import gettext_lazy as _
 
 # 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__
+from ledger import __title__, tasks
 
 # Ledger
-from ledger.helpers.core import add_info_to_context
-from ledger.tasks import clear_all_etags, update_all_characters, update_all_corporations
+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__)
 
 
 @login_required
 @permission_required("ledger.basic_access")
 def index(request):
     """Index View"""
-    context = {
-        "title": "Ledger",
-    }
-    context = add_info_to_context(request, context)
     return redirect(
         "ledger:character_ledger",
         character_id=request.user.profile.main_character.character_id,
+        year=timezone.now().year,
+        month=timezone.now().month,
     )
 
 
 @login_required
 @permission_required("ledger.basic_access")
-def admin(request):
+def admin(request: WSGIRequest):
+    # Check Permissions
     if not request.user.is_superuser:
         messages.error(request, _("You do not have permission to access this page."))
         return redirect("ledger:index")
 
+    # Handle Character
+    def _handle_character_updates(force_refresh):
+        character_id = request.POST.get("character_id")
+        if character_id:
+            try:
+                character = CharacterOwner.objects.get(
+                    eve_character__character_id=int(character_id)
+                )
+                msg = format_lazy(
+                    _("Queued Update for Character: {character_name}"),
+                    character_name=character.character_name,
+                )
+                messages.info(request, msg)
+                tasks.update_character.apply_async(
+                    kwargs={
+                        "character_pk": character.pk,
+                        "force_refresh": force_refresh,
+                    },
+                    priority=7,
+                )
+            except (ValueError, CharacterOwner.DoesNotExist):
+                msg = format_lazy(
+                    _("Character with ID {character_id} not found"),
+                    character_id=character_id,
+                )
+                messages.error(request, msg)
+            return
+
+        tasks.update_all_characters.apply_async(
+            kwargs={"force_refresh": force_refresh}, priority=7
+        )
+        messages.info(request, _("Queued Update All Characters"))
+        return
+
+    # Handle Corporation
+    def _handle_corporation_updates(force_refresh):
+        corporation_id = request.POST.get("corporation_id")
+        if corporation_id:
+            try:
+                corporation = CorporationOwner.objects.get(
+                    eve_corporation__corporation_id=int(corporation_id)
+                )
+                msg = format_lazy(
+                    _("Queued Update for Corporation: {corporation_name}"),
+                    corporation_name=corporation.corporation_name,
+                )
+                messages.info(request, msg)
+                tasks.update_corporation.apply_async(
+                    args=[corporation.pk],
+                    kwargs={"force_refresh": force_refresh},
+                    priority=7,
+                )
+            except (ValueError, CorporationOwner.DoesNotExist):
+                msg = format_lazy(
+                    _("Corporation with ID {corporation_id} not found"),
+                    corporation_id=corporation_id,
+                )
+                messages.error(request, msg)
+            return
+
+        tasks.update_all_corporations.apply_async(
+            kwargs={"force_refresh": force_refresh}, priority=7
+        )
+        messages.info(request, _("Queued Update All Corporations"))
+        return
+
+    # Handle POST Requests
     if request.method == "POST":
-        force_refresh = False
-        if request.POST.get("force_refresh", False):
-            force_refresh = True
-        if request.POST.get("run_clear_etag"):
-            messages.info(request, _("Queued Clear All ETags"))
-            clear_all_etags.apply_async(priority=1)
-        if request.POST.get("run_char_updates"):
-            messages.info(request, _("Queued Update All Characters"))
-            update_all_characters.apply_async(
-                kwargs={"force_refresh": force_refresh}, priority=7
-            )
-        if request.POST.get("run_corp_updates"):
-            messages.info(request, _("Queued Update All Corporations"))
-            update_all_corporations.apply_async(
-                kwargs={"force_refresh": force_refresh}, priority=7
-            )
-    return render(request, "ledger/admin.html")
+        force_refresh = bool(request.POST.get("force_refresh", False))
+
+        # General Tasks
+        if request.POST.get("run_clear_cache"):
+            messages.info(request, _("Queued Clear All Cache"))
+            tasks.clear_all_cache.apply_async(priority=1)
+        # Specific Tasks
+        if request.POST.get("run_character_updates"):
+            _handle_character_updates(force_refresh)
+        if request.POST.get("run_corporation_updates"):
+            _handle_corporation_updates(force_refresh)
+    return render(request, "ledger/view-administration.html")