feat: show currency exchange rate where needed

2026-03-17 23:13:57 +01:00 · 2024-11-09 02:57:05 -03:00
parent ff30bcdf4c
commit 05fc4bca7f
7 changed files with 246 additions and 101 deletions
--- a/app/apps/net_worth/utils/calculate_net_worth.py
+++ b/app/apps/net_worth/utils/calculate_net_worth.py
@@ -108,22 +108,39 @@ def calculate_currency_net_worth():
        .values("balance")
    )

-    # Main query to fetch all currency data
+    # Fetch all currencies with their balances in a single query
    currencies_data = Currency.objects.annotate(
        balance=Coalesce(Subquery(balance_subquery), Decimal("0"))
-    )
+    ).select_related(
+        "exchange_currency"
+    )  # Optimize by pre-fetching exchange_currency

    net_worth = {}
-    for item in currencies_data:
-        currency_name = item.name
-        net_worth[currency_name] = {
-            "amount": net_worth.get(currency_name, {}).get("amount", Decimal("0"))
-            + item.balance,
-            "code": item.code,
-            "name": currency_name,
-            "prefix": item.prefix,
-            "suffix": item.suffix,
-            "decimal_places": item.decimal_places,
+    for currency in currencies_data:
+        # Skip conversion if no exchange currency is set
+        exchanged_value = None
+        if currency.exchange_currency:
+            exchanged_amount, ex_prefix, ex_suffix, ex_decimal_places = convert(
+                amount=currency.balance,
+                from_currency=currency,
+                to_currency=currency.exchange_currency,
+            )
+            exchanged_value = {
+                "amount": exchanged_amount,
+                "name": currency.exchange_currency.name,
+                "prefix": ex_prefix,
+                "suffix": ex_suffix,
+                "decimal_places": ex_decimal_places,
+            }
+
+        net_worth[currency.name] = {
+            "amount": currency.balance,
+            "code": currency.code,
+            "name": currency.name,
+            "prefix": currency.prefix,
+            "suffix": currency.suffix,
+            "decimal_places": currency.decimal_places,
+            "exchanged": exchanged_value,
        }

    return net_worth
--- a/app/apps/yearly_overview/views.py
+++ b/app/apps/yearly_overview/views.py
@@ -73,14 +73,13 @@ def yearly_overview_by_currency(request, year: int):
    if currency:
        filter_params["account__currency_id"] = int(currency)

-    transactions = Transaction.objects.filter(**filter_params).exclude(
-        Q(category__mute=True) & ~Q(category=None)
+    transactions = (
+        Transaction.objects.filter(**filter_params)
+        .exclude(Q(category__mute=True) & ~Q(category=None))
+        .select_related("account__currency")  # Optimize by pre-fetching currency data
    )

-    if month:
-        date_trunc = TruncMonth("reference_date")
-    else:
-        date_trunc = TruncYear("reference_date")
+    date_trunc = TruncMonth("reference_date") if month else TruncYear("reference_date")

    monthly_data = (
        transactions.annotate(month=date_trunc)
@@ -90,6 +89,8 @@ def yearly_overview_by_currency(request, year: int):
            "account__currency__prefix",
            "account__currency__suffix",
            "account__currency__decimal_places",
+            "account__currency_id",
+            "account__currency__exchange_currency_id",
        )
        .annotate(
            income_paid=Coalesce(
@@ -103,7 +104,6 @@ def yearly_overview_by_currency(request, year: int):
                    )
                ),
                Value(Decimal("0")),
-                output_field=DecimalField(),
            ),
            expense_paid=Coalesce(
                Sum(
@@ -118,7 +118,6 @@ def yearly_overview_by_currency(request, year: int):
                    )
                ),
                Value(Decimal("0")),
-                output_field=DecimalField(),
            ),
            income_unpaid=Coalesce(
                Sum(
@@ -133,7 +132,6 @@ def yearly_overview_by_currency(request, year: int):
                    )
                ),
                Value(Decimal("0")),
-                output_field=DecimalField(),
            ),
            expense_unpaid=Coalesce(
                Sum(
@@ -148,7 +146,6 @@ def yearly_overview_by_currency(request, year: int):
                    )
                ),
                Value(Decimal("0")),
-                output_field=DecimalField(),
            ),
        )
        .annotate(
@@ -162,7 +159,12 @@ def yearly_overview_by_currency(request, year: int):
        .order_by("month", "account__currency__code")
    )

-    # Create a dictionary to store the final result
+    # Fetch all currencies and their exchange currencies in a single query
+    currencies = {
+        currency.id: currency
+        for currency in Currency.objects.select_related("exchange_currency").all()
+    }
+
    result = {
        "income_paid": [],
        "expense_paid": [],
@@ -173,32 +175,53 @@ def yearly_overview_by_currency(request, year: int):
        "balance_total": [],
    }

-    # Fill in the data
    for entry in monthly_data:
+        if all(entry[field] == 0 for field in result.keys()):
+            continue  # Skip entries where all values are 0
+
        currency_code = entry["account__currency__code"]
        prefix = entry["account__currency__prefix"]
        suffix = entry["account__currency__suffix"]
        decimal_places = entry["account__currency__decimal_places"]

-        for field in [
-            "income_paid",
-            "expense_paid",
-            "income_unpaid",
-            "expense_unpaid",
-            "balance_unpaid",
-            "balance_paid",
-            "balance_total",
-        ]:
-            if entry[field] != 0:
-                result[field].append(
-                    {
-                        "code": currency_code,
-                        "prefix": prefix,
-                        "suffix": suffix,
-                        "decimal_places": decimal_places,
-                        "amount": entry[field],
-                    }
+        # Get the currency objects for conversion
+        from_currency = currencies.get(entry["account__currency_id"])
+        to_currency = (
+            None
+            if not from_currency
+            else currencies.get(from_currency.exchange_currency_id)
+        )
+
+        for field in result.keys():
+            amount = entry[field]
+            if amount == 0:
+                continue
+
+            item = {
+                "code": currency_code,
+                "prefix": prefix,
+                "suffix": suffix,
+                "decimal_places": decimal_places,
+                "amount": amount,
+                "exchanged": None,
+            }
+
+            # Add exchange calculation if possible
+            if from_currency and to_currency:
+                exchanged_amount, ex_prefix, ex_suffix, ex_decimal_places = convert(
+                    amount=amount,
+                    from_currency=from_currency,
+                    to_currency=to_currency,
                )
+                item["exchanged"] = {
+                    "amount": exchanged_amount,
+                    "code": to_currency.code,
+                    "prefix": ex_prefix,
+                    "suffix": ex_suffix,
+                    "decimal_places": ex_decimal_places,
+                }
+
+            result[field].append(item)

    return render(
        request,
--- a/app/templates/cotton/amount/display.html
+++ b/app/templates/cotton/amount/display.html
@@ -1,7 +1,7 @@
 {% load currency_display %}

 <div class="{% if text_end %}text-end{% elif text_start %}text-start{% endif %}">
-  <div class="amount{% if color == 'grey' %} tw-text-gray-500{% elif color == 'green' %} tw-text-green-400{% elif color == 'red' %} tw-text-red-400{% endif %}"
+  <div class="amount{% if color == 'grey' or color == "gray" %} tw-text-gray-500{% elif color == 'green' %} tw-text-green-400{% elif color == 'red' %} tw-text-red-400{% endif %}"
       data-original-value="{% currency_display amount=amount prefix=prefix suffix=suffix decimal_places=decimal_places %}" data-amount="{{ amount|floatformat:"-40u" }}">
  </div>
 </div>
--- a/app/templates/monthly_overview/fragments/monthly_summary.html
+++ b/app/templates/monthly_overview/fragments/monthly_summary.html
@@ -20,7 +20,8 @@
                          :amount="entry.amount"
                          :prefix="entry.prefix"
                          :suffix="entry.suffix"
-                          :decimal_places="entry.decimal_places"></c-amount.display>
+                          :decimal_places="entry.decimal_places"
+                          color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
            {% empty %}
              <div>-</div>
            {% endfor %}
@@ -48,7 +49,8 @@
                          :amount="entry.amount"
                          :prefix="entry.prefix"
                          :suffix="entry.suffix"
-                          :decimal_places="entry.decimal_places"></c-amount.display>
+                          :decimal_places="entry.decimal_places"
+                          color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
            {% empty %}
              <div>-</div>
            {% endfor %}
@@ -65,7 +67,8 @@
                          :amount="entry.amount"
                          :prefix="entry.prefix"
                          :suffix="entry.suffix"
-                          :decimal_places="entry.decimal_places"></c-amount.display>
+                          :decimal_places="entry.decimal_places"
+                          color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
            {% empty %}
              <div>-</div>
            {% endfor %}
@@ -93,7 +96,8 @@
                          :amount="entry.amount"
                          :prefix="entry.prefix"
                          :suffix="entry.suffix"
-                          :decimal_places="entry.decimal_places"></c-amount.display>
+                          :decimal_places="entry.decimal_places"
+                          color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
            {% empty %}
              <div>-</div>
            {% endfor %}
@@ -110,7 +114,8 @@
                          :amount="entry.amount"
                          :prefix="entry.prefix"
                          :suffix="entry.suffix"
-                          :decimal_places="entry.decimal_places"></c-amount.display>
+                          :decimal_places="entry.decimal_places"
+                          color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
            {% empty %}
              <div>-</div>
            {% endfor %}
@@ -138,7 +143,8 @@
                          :amount="entry.amount"
                          :prefix="entry.prefix"
                          :suffix="entry.suffix"
-                          :decimal_places="entry.decimal_places"></c-amount.display>
+                          :decimal_places="entry.decimal_places"
+                          color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
            {% empty %}
              <div>-</div>
            {% endfor %}
@@ -154,7 +160,8 @@
                          :amount="entry.amount"
                          :prefix="entry.prefix"
                          :suffix="entry.suffix"
-                          :decimal_places="entry.decimal_places"></c-amount.display>
+                          :decimal_places="entry.decimal_places"
+                          color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
            {% empty %}
              <div>-</div>
            {% endfor %}
@@ -168,7 +175,8 @@
                          :amount="entry.amount"
                          :prefix="entry.prefix"
                          :suffix="entry.suffix"
-                          :decimal_places="entry.decimal_places"></c-amount.display>
+                          :decimal_places="entry.decimal_places"
+                          color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
            {% empty %}
              <div>-</div>
            {% endfor %}
--- a/app/templates/net_worth/net_worth.html
+++ b/app/templates/net_worth/net_worth.html
@@ -26,16 +26,28 @@
                  <div class="d-flex align-items-baseline w-100">
                      <div class="currency-name text-start font-monospace tw-text-gray-300">{{ currency.name }}</div>
                      <div class="dotted-line flex-grow-1"></div>
-                      <div class="{% if currency.amount > 0 %}tw-text-green-400{% elif currency.amount < 0 %}tw-text-red-400{% endif %}">
+                      <div>
                        <c-amount.display
                              :amount="currency.amount"
                              :prefix="currency.prefix"
                              :suffix="currency.suffix"
                              :decimal_places="currency.decimal_places"
+                              color="{% if currency.amount > 0 %}green{% elif currency.amount < 0 %}red{% endif %}"
                              text-end></c-amount.display>
                      </div>
                  </div>
              </div>
+              {% if currency.exchanged %}
+              <div>
+                <c-amount.display
+                          :amount="currency.exchanged.amount"
+                          :prefix="currency.exchanged.prefix"
+                          :suffix="currency.exchanged.suffix"
+                          :decimal_places="currency.exchanged.decimal_places"
+                          text-end
+                          color="grey"></c-amount.display>
+              </div>
+              {% endif %}
              {% endfor %}
            </div>
          </div>
@@ -62,12 +74,13 @@
                        <div class="text-start font-monospace tw-text-gray-300">
                          <span class="hierarchy-line-icon"></span>{{ account_data.name }}</div>
                        <div class="dotted-line flex-grow-1"></div>
-                        <div class="{% if account_data.balance > 0 %}tw-text-green-400{% elif account_data.balance < 0 %}tw-text-red-400{% endif %}">
+                        <div class="">
                          <c-amount.display
                            :amount="account_data.balance"
                            :prefix="account_data.currency.prefix"
                            :suffix="account_data.currency.suffix"
-                            :decimal_places="account_data.currency.decimal_places"></c-amount.display>
+                            :decimal_places="account_data.currency.decimal_places"
+                            color="{% if account_data.balance > 0 %}green{% elif account_data.balance < 0 %}red{% endif %}"></c-amount.display>
                        </div>
                    </div>
                  </div>
@@ -87,12 +100,13 @@
                    <div class="d-flex align-items-baseline w-100">
                        <div class="currency-name text-start font-monospace tw-text-gray-300">{{ account_data.name }}</div>
                        <div class="dotted-line flex-grow-1"></div>
-                        <div class="{% if account_data.balance > 0 %}tw-text-green-400{% elif account_data.balance < 0 %}tw-text-red-400{% endif %}">
+                        <div>
                          <c-amount.display
                            :amount="account_data.balance"
                            :prefix="account_data.currency.prefix"
                            :suffix="account_data.currency.suffix"
-                            :decimal_places="account_data.currency.decimal_places"></c-amount.display>
+                            :decimal_places="account_data.currency.decimal_places"
+                            color="{% if account_data.balance > 0 %}green{% elif account_data.balance < 0 %}red{% endif %}"></c-amount.display>
                        </div>
                    </div>
                </div>
--- a/app/templates/yearly_overview/fragments/account_data.html
+++ b/app/templates/yearly_overview/fragments/account_data.html
@@ -61,12 +61,13 @@
          </div>
          <div class="dotted-line flex-grow-1"></div>
          <div
-              class="text-end font-monospace {% if account.balance_unpaid > 0 %}tw-text-green-400{% elif account.balance_unpaid < 0 %}tw-text-red-400{% endif %}">
+              class="text-end font-monospace">
            <c-amount.display
                :amount="account.balance_unpaid"
                :prefix="account.currency.prefix"
                :suffix="account.currency.suffix"
-                :decimal_places="account.currency.decimal_places"></c-amount.display>
+                :decimal_places="account.currency.decimal_places"
+                color="{% if account.balance_unpaid > 0 %}green{% elif account.balance_unpaid < 0 %}red{% endif %}"></c-amount.display>
          </div>
        </div>
        {% if account.exchange_currency and account.exchange_balance_unpaid %}
@@ -129,12 +130,13 @@
          </div>
          <div class="dotted-line flex-grow-1"></div>
          <div
-              class="text-end font-monospace {% if account.balance_paid > 0 %}tw-text-green-400{% elif account.balance_paid < 0 %}tw-text-red-400{% endif %}">
+              class="text-end font-monospace">
            <c-amount.display
                :amount="account.balance_paid"
                :prefix="account.currency.prefix"
                :suffix="account.currency.suffix"
-                :decimal_places="account.currency.decimal_places"></c-amount.display>
+                :decimal_places="account.currency.decimal_places"
+                color="{% if account.balance_paid > 0 %}green{% elif account.balance_paid < 0 %}red{% endif %}"></c-amount.display>
          </div>
        </div>
        {% if account.exchange_currency and account.exchange_balance_paid %}
@@ -153,13 +155,13 @@
              <div class="tw-text-gray-400">{% translate 'final total' %}</div>
            </div>
            <div class="dotted-line flex-grow-1"></div>
-            <div
-                class="text-end font-monospace {% if account.balance_total > 0 %}tw-text-green-400{% elif account.balance_total < 0 %}tw-text-red-400{% endif %}">
+            <div class="text-end font-monospace">
              <c-amount.display
                  :amount="account.balance_total"
                  :prefix="account.currency.prefix"
                  :suffix="account.currency.suffix"
-                  :decimal_places="account.currency.decimal_places"></c-amount.display>
+                  :decimal_places="account.currency.decimal_places"
+                  color="{% if account.balance_paid > 0 %}green{% elif account.balance_paid < 0 %}red{% endif %}"></c-amount.display>
            </div>
          </div>
          {% if account.exchange_currency and account.exchange_balance_total %}
--- a/app/templates/yearly_overview/fragments/currency_data.html
+++ b/app/templates/yearly_overview/fragments/currency_data.html
@@ -8,11 +8,23 @@
    <div class="dotted-line flex-grow-1"></div>
    <div class="text-end font-monospace">
      {% for entry in totals.income_unpaid %}
-        <c-amount.display
-                    :amount="entry.amount"
-                    :prefix="entry.prefix"
-                    :suffix="entry.suffix"
-                    :decimal_places="entry.decimal_places"></c-amount.display>
+        <div>
+          <c-amount.display
+              :amount="entry.amount"
+              :prefix="entry.prefix"
+              :suffix="entry.suffix"
+              :decimal_places="entry.decimal_places"></c-amount.display>
+        </div>
+        {% if entry.exchanged %}
+        <div>
+          <c-amount.display
+            :amount="entry.exchanged.amount"
+            :prefix="entry.exchanged.prefix"
+            :suffix="entry.exchanged.suffix"
+            :decimal_places="entry.exchanged.decimal_places"
+            color="gray"></c-amount.display>
+        </div>
+        {% endif %}
      {% empty %}
        <div>-</div>
      {% endfor %}
@@ -25,11 +37,23 @@
    <div class="dotted-line flex-grow-1"></div>
    <div class="text-end font-monospace">
      {% for entry in totals.expense_unpaid %}
-        <c-amount.display
-                    :amount="entry.amount"
-                    :prefix="entry.prefix"
-                    :suffix="entry.suffix"
-                    :decimal_places="entry.decimal_places"></c-amount.display>
+        <div>
+          <c-amount.display
+              :amount="entry.amount"
+              :prefix="entry.prefix"
+              :suffix="entry.suffix"
+              :decimal_places="entry.decimal_places"></c-amount.display>
+        </div>
+        {% if entry.exchanged %}
+        <div>
+          <c-amount.display
+            :amount="entry.exchanged.amount"
+            :prefix="entry.exchanged.prefix"
+            :suffix="entry.exchanged.suffix"
+            :decimal_places="entry.exchanged.decimal_places"
+            color="gray"></c-amount.display>
+        </div>
+        {% endif %}
      {% empty %}
        <div>-</div>
      {% endfor %}
@@ -42,13 +66,24 @@
    <div class="dotted-line flex-grow-1"></div>
    <div class="text-end font-monospace">
      {% for entry in totals.balance_unpaid %}
-        <div class="{% if entry.amount > 0 %}tw-text-green-400{% elif entry.amount < 0 %}tw-text-red-400{% endif %}">
-        <c-amount.display
-                    :amount="entry.amount"
-                    :prefix="entry.prefix"
-                    :suffix="entry.suffix"
-                    :decimal_places="entry.decimal_places"></c-amount.display>
+        <div>
+          <c-amount.display
+              :amount="entry.amount"
+              :prefix="entry.prefix"
+              :suffix="entry.suffix"
+              :decimal_places="entry.decimal_places"
+              color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
        </div>
+        {% if entry.exchanged %}
+        <div>
+          <c-amount.display
+            :amount="entry.exchanged.amount"
+            :prefix="entry.exchanged.prefix"
+            :suffix="entry.exchanged.suffix"
+            :decimal_places="entry.exchanged.decimal_places"
+            color="gray"></c-amount.display>
+        </div>
+        {% endif %}
      {% empty %}
        <div>-</div>
      {% endfor %}
@@ -62,11 +97,23 @@
    <div class="dotted-line flex-grow-1"></div>
    <div class="text-end font-monospace">
      {% for entry in totals.income_paid %}
+        <div>
        <c-amount.display
-                    :amount="entry.amount"
-                    :prefix="entry.prefix"
-                    :suffix="entry.suffix"
-                    :decimal_places="entry.decimal_places"></c-amount.display>
+            :amount="entry.amount"
+            :prefix="entry.prefix"
+            :suffix="entry.suffix"
+            :decimal_places="entry.decimal_places"></c-amount.display>
+        </div>
+        {% if entry.exchanged %}
+        <div>
+          <c-amount.display
+            :amount="entry.exchanged.amount"
+            :prefix="entry.exchanged.prefix"
+            :suffix="entry.exchanged.suffix"
+            :decimal_places="entry.exchanged.decimal_places"
+            color="gray"></c-amount.display>
+        </div>
+        {% endif %}
      {% empty %}
        <div>-</div>
      {% endfor %}
@@ -79,11 +126,23 @@
    <div class="dotted-line flex-grow-1"></div>
    <div class="text-end font-monospace">
      {% for entry in totals.expense_paid %}
-        <c-amount.display
-                    :amount="entry.amount"
-                    :prefix="entry.prefix"
-                    :suffix="entry.suffix"
-                    :decimal_places="entry.decimal_places"></c-amount.display>
+        <div>
+          <c-amount.display
+              :amount="entry.amount"
+              :prefix="entry.prefix"
+              :suffix="entry.suffix"
+              :decimal_places="entry.decimal_places"></c-amount.display>
+        </div>
+        {% if entry.exchanged %}
+        <div>
+          <c-amount.display
+            :amount="entry.exchanged.amount"
+            :prefix="entry.exchanged.prefix"
+            :suffix="entry.exchanged.suffix"
+            :decimal_places="entry.exchanged.decimal_places"
+            color="gray"></c-amount.display>
+        </div>
+        {% endif %}
      {% empty %}
        <div>-</div>
      {% endfor %}
@@ -96,13 +155,24 @@
    <div class="dotted-line flex-grow-1"></div>
    <div class="text-end font-monospace tw-text-yellow-400">
      {% for entry in totals.balance_paid %}
-        <div class="{% if entry.amount > 0 %}tw-text-green-400{% elif entry.amount < 0 %}tw-text-red-400{% endif %}">
-        <c-amount.display
-                    :amount="entry.amount"
-                    :prefix="entry.prefix"
-                    :suffix="entry.suffix"
-                    :decimal_places="entry.decimal_places"></c-amount.display>
+        <div>
+          <c-amount.display
+              :amount="entry.amount"
+              :prefix="entry.prefix"
+              :suffix="entry.suffix"
+              :decimal_places="entry.decimal_places"
+              color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
        </div>
+        {% if entry.exchanged %}
+        <div>
+          <c-amount.display
+            :amount="entry.exchanged.amount"
+            :prefix="entry.exchanged.prefix"
+            :suffix="entry.exchanged.suffix"
+            :decimal_places="entry.exchanged.decimal_places"
+            color="gray"></c-amount.display>
+        </div>
+        {% endif %}
      {% empty %}
        <div>-</div>
      {% endfor %}
@@ -116,16 +186,27 @@
    <div class="dotted-line flex-grow-1"></div>
    <div class="text-end font-monospace">
      {% for entry in totals.balance_total %}
-        <div class="{% if entry.amount > 0 %}tw-text-green-400{% elif entry.amount < 0 %}tw-text-red-400{% endif %}">
-        <c-amount.display
-                    :amount="entry.amount"
-                    :prefix="entry.prefix"
-                    :suffix="entry.suffix"
-                    :decimal_places="entry.decimal_places"></c-amount.display>
+        <div>
+          <c-amount.display
+              :amount="entry.amount"
+              :prefix="entry.prefix"
+              :suffix="entry.suffix"
+              :decimal_places="entry.decimal_places"
+              color="{% if entry.amount > 0 %}green{% elif entry.amount < 0 %}red{% endif %}"></c-amount.display>
        </div>
+        {% if entry.exchanged %}
+        <div>
+          <c-amount.display
+            :amount="entry.exchanged.amount"
+            :prefix="entry.exchanged.prefix"
+            :suffix="entry.exchanged.suffix"
+            :decimal_places="entry.exchanged.decimal_places"
+            color="gray"></c-amount.display>
+        </div>
+        {% endif %}
      {% empty %}
        <div>-</div>
      {% endfor %}
    </div>
  </div>
-  </div>
+</div>