Fix type annotations, remove test mock calls, fix template URL, update comments, remove duplicate import

Co-authored-by: nijel <[email protected]>

Author: Copilot

weblate_web/crm/templates/crm/income.html

@@ -108,7 +108,7 @@ <h3>{% translate "Category Distribution" %}</h3>
                 <td>{{ current_year }}/{{ month }}</td>
                 <td class="align-right nowrap">€{{ amount|floatformat:0 }}</td>
                 <td>
-                  <a href="{% url 'crm:income-month' current_year month %}">{% translate "View details" %}</a>
+                  <a href="{% url 'crm:income-month' current_year month|add:0 %}">{% translate "View details" %}</a>
                 </td>
               </tr>
             {% endfor %}

weblate_web/crm/tests.py

@@ -254,11 +254,6 @@ def test_income_yearly_view(self):
         cnb_mock_rates()
         current_year = timezone.now().year
 
-        # Mock rates for test dates
-        self.mock_exchange_rates_for_date(f"{current_year}-01-15")
-        self.mock_exchange_rates_for_date(f"{current_year}-02-15")
-        self.mock_exchange_rates_for_date(f"{current_year}-03-15")
-
         # Create test invoices
         self.create_test_invoice(
             current_year, 1, InvoiceCategory.HOSTING, Decimal(1000)
@@ -281,9 +276,6 @@ def test_income_monthly_view(self):
         cnb_mock_rates()
         current_year = timezone.now().year
 
-        # Mock rates for test date
-        self.mock_exchange_rates_for_date(f"{current_year}-03-15")
-
         # Create test invoices for different categories
         self.create_test_invoice(
             current_year, 3, InvoiceCategory.HOSTING, Decimal(1000)
@@ -308,9 +300,6 @@ def test_income_filters_only_invoices(self):
         cnb_mock_rates()
         current_year = timezone.now().year
 
-        # Mock rates for test date
-        self.mock_exchange_rates_for_date(f"{current_year}-01-15")
-
         # Create invoice
         invoice = Invoice.objects.create(
             kind=InvoiceKind.INVOICE,
@@ -364,9 +353,6 @@ def test_income_svg_chart_generation(self):
         cnb_mock_rates()
         current_year = timezone.now().year
 
-        # Mock rates for test date
-        self.mock_exchange_rates_for_date(f"{current_year}-01-15")
-
         self.create_test_invoice(
             current_year, 1, InvoiceCategory.HOSTING, Decimal(1000)
         )
@@ -384,12 +370,6 @@ def test_income_category_breakdown(self):
         cnb_mock_rates()
         current_year = timezone.now().year
 
-        # Mock rates for test dates
-        self.mock_exchange_rates_for_date(f"{current_year}-01-15")
-        self.mock_exchange_rates_for_date(f"{current_year}-02-15")
-        self.mock_exchange_rates_for_date(f"{current_year}-03-15")
-        self.mock_exchange_rates_for_date(f"{current_year}-04-15")
-
         # Create invoices in different categories
         self.create_test_invoice(
             current_year, 1, InvoiceCategory.HOSTING, Decimal(1000)

weblate_web/crm/views.py

@@ -2,6 +2,7 @@
 
 import calendar
 import math
+from collections.abc import Callable
 from decimal import Decimal
 from operator import attrgetter
 from typing import TYPE_CHECKING, cast
@@ -26,8 +27,6 @@
 from .models import Interaction
 
 if TYPE_CHECKING:
-    from collections.abc import Callable
-
     from django.http import HttpRequest
 
     from weblate_web.payments.models import CustomerQuerySet
@@ -344,15 +343,14 @@ class IncomeView(CRMMixin, TemplateView):  # type: ignore[misc]
     CHART_PADDING = 60
     MIN_CHART_VALUE = Decimal(1)
 
-    # Category colors shared across all charts (keyed by category value)
+    # Category colors shared across all charts (keyed by category enum)
     CATEGORY_COLORS = {
         InvoiceCategory.HOSTING: "#417690",
         InvoiceCategory.SUPPORT: "#79aec8",
         InvoiceCategory.DEVEL: "#5b80b2",
         InvoiceCategory.DONATE: "#9fc5e8",
     }
 
-    # Cached label-to-enum mapping (built once on first access)
     def get_year(self) -> int:
         """Get the year from URL kwargs or default to current year."""
         return self.kwargs.get("year", timezone.now().year)
@@ -466,7 +464,11 @@ def generate_svg_pie_chart(self, data: dict[InvoiceCategory, Decimal]) -> str:
         return "".join(svg_parts)
 
     def generate_svg_stacked_bar_chart(  # noqa: PLR0914
-        self, monthly_data: dict, invoices: list, year: int, month: int | None = None
+        self,
+        monthly_data: dict[str, Decimal],
+        invoices: list[Invoice],
+        year: int,
+        month: int | None = None,
     ) -> str:
         """
         Generate a stacked bar chart showing totals by category.
@@ -572,7 +574,7 @@ def filter_by_month(inv, idx):
 
     def _get_invoices_and_totals(
         self, year: int, month: int | None = None
-    ) -> tuple[list, dict]:
+    ) -> tuple[list[Invoice], dict[int, Decimal]]:
         """Fetch invoices and pre-calculate totals (shared helper)."""
         query = Invoice.objects.filter(kind=InvoiceKind.INVOICE, issue_date__year=year)
         if month:
@@ -587,9 +589,9 @@ def _aggregate_income_by_period(
         self,
         year: int,
         month: int | None,
-        filter_func: Callable[[object, str], bool],
+        filter_func: Callable[[Invoice, str], bool],
         period_keys: list[str],
-    ) -> tuple[dict[str, Decimal], list]:
+    ) -> tuple[dict[str, Decimal], list[Invoice]]:
         """
         Aggregate income data filtered by a custom function.
 
@@ -637,21 +639,23 @@ def get_income_data(
 
         return category_data
 
-    def get_monthly_data(self, year: int) -> tuple[dict[str, Decimal], list]:
+    def get_monthly_data(self, year: int) -> tuple[dict[str, Decimal], list[Invoice]]:
         """Get monthly income data for the year."""
 
-        def filter_by_month(inv: object, key: str) -> bool:
+        def filter_by_month(inv: Invoice, key: str) -> bool:
             return inv.issue_date.month == int(key)
 
         monthly_keys = [f"{month:02d}" for month in range(1, 13)]
         return self._aggregate_income_by_period(
             year, None, filter_by_month, monthly_keys
         )
 
-    def get_daily_data(self, year: int, month: int) -> tuple[dict[str, Decimal], list]:
+    def get_daily_data(
+        self, year: int, month: int
+    ) -> tuple[dict[str, Decimal], list[Invoice]]:
         """Get daily income data for a specific month."""
 
-        def filter_by_day(inv: object, key: str) -> bool:
+        def filter_by_day(inv: Invoice, key: str) -> bool:
             return inv.issue_date.day == int(key)
 
         num_days = calendar.monthrange(year, month)[1]
@@ -660,7 +664,7 @@ def filter_by_day(inv: object, key: str) -> bool:
 
     def get_monthly_category_data(
         self, year: int
-    ) -> tuple[dict[str, dict[str, Decimal]], list]:
+    ) -> tuple[dict[str, dict[str, Decimal]], list[Invoice]]:
         """Get monthly income data split by category for stacked chart."""
         invoices = list(
             Invoice.objects.filter(