fix(accounts): unable to update accounts

due to wrong currency queryset

.env.example

@@ -31,3 +31,10 @@ ENABLE_SOFT_DELETE=false
 KEEP_DELETED_TRANSACTIONS_FOR=365
 
 TASK_WORKERS=1 # This only work if you're using the single container option. Increase to have more open queues via procrastinate, you probably don't need to increase this.
+
+# OIDC Configuration. Uncomment the lines below if you want to add OIDC login to your instance
+#OIDC_CLIENT_NAME=""
+#OIDC_CLIENT_ID=""
+#OIDC_CLIENT_SECRET=""
+#OIDC_SERVER_URL=""
+#OIDC_ALLOW_SIGNUP=true

README.md

@@ -29,15 +29,15 @@ Managing money can feel unnecessarily complex, but it doesn’t have to be. WYGI
 
 By sticking to this straightforward approach, you avoid dipping into your savings while still keeping tabs on where your money goes.
 
-While this philosophy is simple, finding tools to make it work wasn’t. I initially used a spreadsheet, which served me well for years—until it became unwieldy as I started managing multiple currencies, accounts, and investments. I tried various financial management apps, but none met my key requirements:
+While this philosophy is simple, finding tools to make it work wasn’t. I initially used a spreadsheet, which served me well for years, until it became unwieldy as I started managing multiple currencies, accounts, and investments. I tried various financial management apps, but none met my key requirements:
 
 1. **Multi-currency support** to track income and expenses in different currencies.
-2. **Not a budgeting app** — as I dislike budgeting constraints.
+2. **Not a budgeting app** as I dislike budgeting constraints.
 3. **Web app usability** (ideally with mobile support, though optional).
 4. **Automation-ready API** to integrate with other tools and services.
 5. **Custom transaction rules** for credit card billing cycles or similar quirks.
 
-Frustrated by the lack of comprehensive options, I set out to build **WYGIWYH** — an opinionated yet powerful tool that I believe will resonate with like-minded users.
+Frustrated by the lack of comprehensive options, I set out to build **WYGIWYH**, an opinionated yet powerful tool that I believe will resonate with like-minded users.
 
 # Key Features
 
@@ -140,9 +140,35 @@ To create the first user, open the container's console using Unraid's UI, by cli
 | ENABLE_SOFT_DELETE            | true\|false | false                             | Whether to enable transactions soft delete, if enabled, deleted transactions will remain in the database. Useful for imports and avoiding duplicate entries.                                                                             |
 | KEEP_DELETED_TRANSACTIONS_FOR | int         | 365                               | Time in days to keep soft deleted transactions for. If 0, will keep all transactions indefinitely. Only works if ENABLE_SOFT_DELETE is true.                                                                                             |
 | TASK_WORKERS                  | int         | 1                                 | How many workers to have for async tasks. One should be enough for most use cases                                                                                                                                                        |
-| DEMO                          | true\|false         | false                             | If demo mode is enabled.                                                                                                                                                                                                                 |
-| ADMIN_EMAIL                   | string         | None                              | Automatically creates an admin account with this email. Must have `ADMIN_PASSWORD` also set.                                                                                                                                             |
-| ADMIN_PASSWORD                | string         | None                              | Automatically creates an admin account with this password. Must have `ADMIN_EMAIL` also set.                                                                                                                                             |
+| DEMO                          | true\|false | false                             | If demo mode is enabled.                                                                                                                                                                                                                 |
+| ADMIN_EMAIL                   | string      | None                              | Automatically creates an admin account with this email. Must have `ADMIN_PASSWORD` also set.                                                                                                                                             |
+| ADMIN_PASSWORD                | string      | None                              | Automatically creates an admin account with this password. Must have `ADMIN_EMAIL` also set.                                                                                                                                             |
+| CHECK_FOR_UPDATES             | bool        | true                              | Check and notify users about new versions. The check is done by doing a single query to Github's API every 12 hours.                                                                                  |
+
+## OIDC Configuration
+
+WYGIWYH supports login via OpenID Connect (OIDC) through `django-allauth`. This allows users to authenticate using an external OIDC provider.
+
+> [!NOTE]
+> Currently only OpenID Connect is supported as a provider, open an issue if you need something else.
+
+To configure OIDC, you need to set the following environment variables:
+
+| Variable             | Description                                                                                                                                                                                                                                            |
+|----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `OIDC_CLIENT_NAME`   | The name of the provider. will be displayed in the login page. Defaults to `OpenID Connect`                                                                                                                                                            |
+| `OIDC_CLIENT_ID`     | The Client ID provided by your OIDC provider.                                                                                                                                                                                                          |
+| `OIDC_CLIENT_SECRET` | The Client Secret provided by your OIDC provider.                                                                                                                                                                                                      |
+| `OIDC_SERVER_URL`    | The base URL of your OIDC provider's discovery document or authorization server (e.g., `https://your-provider.com/auth/realms/your-realm`). `django-allauth` will use this to discover the necessary endpoints (authorization, token, userinfo, etc.). |
+| `OIDC_ALLOW_SIGNUP`  | Allow the automatic creation of inexistent accounts on a successfull authentication. Defaults to `true`.                                                                                                                                               |
+
+**Callback URL (Redirect URI):**
+
+When configuring your OIDC provider, you will need to provide a callback URL (also known as a Redirect URI). For WYGIWYH, the default callback URL is:
+
+`https://your.wygiwyh.domain/auth/oidc/<OIDC_CLIENT_NAME>/login/callback/`
+
+Replace `https://your.wygiwyh.domain` with the actual URL where your WYGIWYH instance is accessible. And `<OIDC_CLIENT_NAME>` with the slugfied value set in OIDC_CLIENT_NAME or the default `openid-connect` if you haven't set this variable.
 
 # How it works
 

app/WYGIWYH/settings.py

@@ -14,6 +14,7 @@ import os
 import sys
 from pathlib import Path
 
+from django.utils.text import slugify
 
 SITE_TITLE = "WYGIWYH"
 TITLE_SEPARATOR = "::"
@@ -42,6 +43,7 @@ INSTALLED_APPS = [
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
+    "django.contrib.sites",
     "whitenoise.runserver_nostatic",
     "django.contrib.staticfiles",
     "webpack_boilerplate",
@@ -61,7 +63,6 @@ INSTALLED_APPS = [
     "apps.transactions.apps.TransactionsConfig",
     "apps.currencies.apps.CurrenciesConfig",
     "apps.accounts.apps.AccountsConfig",
-    "apps.common.apps.CommonConfig",
     "apps.net_worth.apps.NetWorthConfig",
     "apps.import_app.apps.ImportConfig",
     "apps.export_app.apps.ExportConfig",
@@ -74,8 +75,15 @@ INSTALLED_APPS = [
     "apps.calendar_view.apps.CalendarViewConfig",
     "apps.dca.apps.DcaConfig",
     "pwa",
+    "allauth",
+    "allauth.account",
+    "allauth.socialaccount",
+    "allauth.socialaccount.providers.openid_connect",
+    "apps.common.apps.CommonConfig",
 ]
 
+SITE_ID = 1
+
 MIDDLEWARE = [
     "django_browser_reload.middleware.BrowserReloadMiddleware",
     "apps.common.middleware.thread_local.ThreadLocalMiddleware",
@@ -91,6 +99,7 @@ MIDDLEWARE = [
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "hijack.middleware.HijackUserMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
 ]
 
 ROOT_URLCONF = "WYGIWYH.urls"
@@ -307,6 +316,42 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 LOGIN_REDIRECT_URL = "/"
 LOGIN_URL = "/login/"
+LOGOUT_REDIRECT_URL = "/login/"
+
+# Allauth settings
+AUTHENTICATION_BACKENDS = [
+    "django.contrib.auth.backends.ModelBackend",  # Keep default
+    "allauth.account.auth_backends.AuthenticationBackend",
+]
+
+SOCIALACCOUNT_PROVIDERS = {"openid_connect": {"APPS": []}}
+
+if (
+    os.getenv("OIDC_CLIENT_ID")
+    and os.getenv("OIDC_CLIENT_SECRET")
+    and os.getenv("OIDC_SERVER_URL")
+):
+    SOCIALACCOUNT_PROVIDERS["openid_connect"]["APPS"].append(
+        {
+            "provider_id": slugify(os.getenv("OIDC_CLIENT_NAME", "OpenID Connect")),
+            "name": os.getenv("OIDC_CLIENT_NAME", "OpenID Connect"),
+            "client_id": os.getenv("OIDC_CLIENT_ID"),
+            "secret": os.getenv("OIDC_CLIENT_SECRET"),
+            "settings": {
+                "server_url": os.getenv("OIDC_SERVER_URL"),
+            },
+        }
+    )
+
+ACCOUNT_LOGIN_METHODS = {"email"}
+ACCOUNT_SIGNUP_FIELDS = ["email*", "password1*", "password2*"]
+ACCOUNT_USER_MODEL_USERNAME_FIELD = None
+ACCOUNT_EMAIL_VERIFICATION = "none"
+SOCIALACCOUNT_LOGIN_ON_GET = True
+SOCIALACCOUNT_ONLY = True
+SOCIALACCOUNT_AUTO_SIGNUP = os.getenv("OIDC_ALLOW_SIGNUP", "true").lower() == "true"
+ACCOUNT_ADAPTER = "allauth.account.adapter.DefaultAccountAdapter"
+SOCIALACCOUNT_ADAPTER = "allauth.socialaccount.adapter.DefaultSocialAccountAdapter"
 
 # CRISPY FORMS
 CRISPY_ALLOWED_TEMPLATE_PACKS = ["bootstrap5", "crispy_forms/pure_text"]
@@ -334,7 +379,7 @@ DEBUG_TOOLBAR_PANELS = [
     "debug_toolbar.panels.signals.SignalsPanel",
     "debug_toolbar.panels.redirects.RedirectsPanel",
     "debug_toolbar.panels.profiling.ProfilingPanel",
-    "cachalot.panels.CachalotPanel",
+    # "cachalot.panels.CachalotPanel",
 ]
 INTERNAL_IPS = [
     "127.0.0.1",
@@ -442,6 +487,8 @@ else:
 
 CACHALOT_UNCACHABLE_TABLES = ("django_migrations", "procrastinate_jobs")
 
+# Procrastinate
+PROCRASTINATE_ON_APP_READY = "apps.common.procrastinate.on_app_ready"
 
 # PWA
 PWA_APP_NAME = SITE_TITLE
@@ -490,6 +537,7 @@ PWA_APP_SCREENSHOTS = [
 PWA_SERVICE_WORKER_PATH = BASE_DIR / "templates" / "pwa" / "serviceworker.js"
 
 ENABLE_SOFT_DELETE = os.getenv("ENABLE_SOFT_DELETE", "false").lower() == "true"
+CHECK_FOR_UPDATES = os.getenv("CHECK_FOR_UPDATES", "true").lower() == "true"
 KEEP_DELETED_TRANSACTIONS_FOR = int(os.getenv("KEEP_DELETED_ENTRIES_FOR", "365"))
 APP_VERSION = os.getenv("APP_VERSION", "unknown")
 DEMO = os.getenv("DEMO", "false").lower() == "true"

app/WYGIWYH/urls.py

@@ -21,6 +21,8 @@ from drf_spectacular.views import (
     SpectacularAPIView,
     SpectacularSwaggerView,
 )
+from allauth.socialaccount.providers.openid_connect.views import login, callback
+
 
 urlpatterns = [
     path("admin/", admin.site.urls),
@@ -36,6 +38,13 @@ urlpatterns = [
         SpectacularSwaggerView.as_view(url_name="schema"),
         name="swagger-ui",
     ),
+    path("auth/", include("allauth.urls")),  # allauth urls
+    # path("auth/oidc/<str:provider_id>/login/", login, name="openid_connect_login"),
+    # path(
+    #     "auth/oidc/<str:provider_id>/login/callback/",
+    #     callback,
+    #     name="openid_connect_callback",
+    # ),
     path("", include("apps.transactions.urls")),
     path("", include("apps.common.urls")),
     path("", include("apps.users.urls")),

app/apps/accounts/forms.py

@@ -3,6 +3,7 @@ from crispy_forms.bootstrap import FormActions
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Field, Column, Row
 from django import forms
+from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
 from apps.accounts.models import Account
@@ -15,6 +16,7 @@ from apps.common.widgets.crispy.submit import NoClassSubmit
 from apps.common.widgets.tom_select import TomSelect
 from apps.transactions.models import TransactionCategory, TransactionTag
 from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
+from apps.currencies.models import Currency
 
 
 class AccountGroupForm(forms.ModelForm):
@@ -79,6 +81,18 @@ class AccountForm(forms.ModelForm):
 
         self.fields["group"].queryset = AccountGroup.objects.all()
 
+        if self.instance.id:
+            qs = Currency.objects.filter(
+                Q(is_archived=False) | Q(accounts=self.instance.id)
+            ).distinct()
+            self.fields["currency"].queryset = qs
+            self.fields["exchange_currency"].queryset = qs
+
+        else:
+            qs = Currency.objects.filter(Q(is_archived=False))
+            self.fields["currency"].queryset = qs
+            self.fields["exchange_currency"].queryset = qs
+
         self.helper = FormHelper()
         self.helper.form_tag = False
         self.helper.form_method = "post"

app/apps/accounts/migrations/0015_alter_account_owner_alter_account_shared_with_and_more.py

@@ -0,0 +1,46 @@
+# Generated by Django 5.2.4 on 2025-07-28 02:15
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0014_alter_account_options_alter_accountgroup_options'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='account',
+            name='owner',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_owned', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AlterField(
+            model_name='account',
+            name='shared_with',
+            field=models.ManyToManyField(blank=True, related_name='%(class)s_shared', to=settings.AUTH_USER_MODEL, verbose_name='Shared with users'),
+        ),
+        migrations.AlterField(
+            model_name='account',
+            name='visibility',
+            field=models.CharField(choices=[('private', 'Private'), ('public', 'Public')], default='private', max_length=10, verbose_name='Visibility'),
+        ),
+        migrations.AlterField(
+            model_name='accountgroup',
+            name='owner',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_owned', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AlterField(
+            model_name='accountgroup',
+            name='shared_with',
+            field=models.ManyToManyField(blank=True, related_name='%(class)s_shared', to=settings.AUTH_USER_MODEL, verbose_name='Shared with users'),
+        ),
+        migrations.AlterField(
+            model_name='accountgroup',
+            name='visibility',
+            field=models.CharField(choices=[('private', 'Private'), ('public', 'Public')], default='private', max_length=10, verbose_name='Visibility'),
+        ),
+    ]

app/apps/accounts/migrations/0016_account_untracked_by.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.2.4 on 2025-08-09 05:52
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0015_alter_account_owner_alter_account_shared_with_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='account',
+            name='untracked_by',
+            field=models.ManyToManyField(blank=True, related_name='untracked_accounts', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

app/apps/accounts/models.py

@@ -1,11 +1,11 @@
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
-from apps.transactions.models import Transaction
+from apps.common.middleware.thread_local import get_current_user
 from apps.common.models import SharedObject, SharedObjectManager
+from apps.transactions.models import Transaction
 
 
 class AccountGroup(SharedObject):
@@ -62,6 +62,11 @@ class Account(SharedObject):
         verbose_name=_("Archived"),
         help_text=_("Archived accounts don't show up nor count towards your net worth"),
     )
+    untracked_by = models.ManyToManyField(
+        settings.AUTH_USER_MODEL,
+        blank=True,
+        related_name="untracked_accounts",
+    )
 
     objects = SharedObjectManager()
     all_objects = models.Manager()  # Unfiltered manager
@@ -75,6 +80,10 @@ class Account(SharedObject):
     def __str__(self):
         return self.name
 
+    def is_untracked_by(self):
+        user = get_current_user()
+        return self.untracked_by.filter(pk=user.pk).exists()
+
     def clean(self):
         super().clean()
         if self.exchange_currency == self.currency:

app/apps/accounts/tests.py

@@ -1,33 +1,19 @@
-from django.test import TestCase, Client
-from django.core.exceptions import ValidationError
-from django.contrib.auth.models import User
-from django.db import IntegrityError, models
-from django.utils import timezone
-from django.urls import reverse
-from decimal import Decimal
+from django.test import TestCase
 
 from apps.accounts.models import Account, AccountGroup
 from apps.currencies.models import Currency
-from apps.accounts.forms import AccountForm
-from apps.transactions.models import Transaction, TransactionCategory
 
 
 class AccountTests(TestCase):
     def setUp(self):
         """Set up test data"""
-        self.owner1 = User.objects.create_user(username='testowner', password='password123')
-        self.client = Client()
-        self.client.login(username='testowner', password='password123')
-
         self.currency = Currency.objects.create(
             code="USD", name="US Dollar", decimal_places=2, prefix="$ "
         )
-        self.eur = Currency.objects.create(
+        self.exchange_currency = Currency.objects.create(
             code="EUR", name="Euro", decimal_places=2, prefix="€ "
         )
-        self.account_group = AccountGroup.objects.create(name="Test Group", owner=self.owner1)
-        self.reconciliation_category = TransactionCategory.objects.create(name='Reconciliation', owner=self.owner1, type='INFO')
-
+        self.account_group = AccountGroup.objects.create(name="Test Group")
 
     def test_account_creation(self):
         """Test basic account creation"""
@@ -49,262 +35,7 @@ class AccountTests(TestCase):
         """Test account creation with exchange currency"""
         account = Account.objects.create(
             name="Exchange Account",
-            owner=self.owner1, # Added owner
-            group=self.account_group, # Added group
             currency=self.currency,
-            exchange_currency=self.eur, # Changed to self.eur
+            exchange_currency=self.exchange_currency,
         )
-        self.assertEqual(account.exchange_currency, self.eur) # Changed to self.eur
-
-    def test_account_archiving(self):
-        """Test archiving and unarchiving an account"""
-        account = Account.objects.create(
-            name="Archivable Account",
-            owner=self.owner1, # Added owner
-            group=self.account_group,
-            currency=self.currency,
-            is_asset=True, # Assuming default, can be anything for this test
-            is_archived=False,
-        )
-        self.assertFalse(account.is_archived, "Account should initially be unarchived")
-
-        # Archive the account
-        account.is_archived = True
-        account.save()
-
-        archived_account = Account.objects.get(pk=account.pk)
-        self.assertTrue(archived_account.is_archived, "Account should be archived")
-
-        # Unarchive the account
-        archived_account.is_archived = False
-        archived_account.save()
-
-        unarchived_account = Account.objects.get(pk=account.pk)
-        self.assertFalse(unarchived_account.is_archived, "Account should be unarchived")
-
-    def test_account_exchange_currency_cannot_be_same_as_currency(self):
-        """Test that exchange_currency cannot be the same as currency."""
-        with self.assertRaises(ValidationError) as cm:
-            account = Account(
-                name="Same Currency Account",
-                owner=self.owner1, # Added owner
-                group=self.account_group,
-                currency=self.currency,
-                exchange_currency=self.currency,  # Same as currency
-            )
-            account.full_clean()
-        self.assertIn('exchange_currency', cm.exception.error_dict)
-        # To check for a specific message (optional, might make test brittle):
-        # self.assertTrue(any("cannot be the same as the main currency" in e.message
-        #                     for e in cm.exception.error_dict['exchange_currency']))
-
-    def test_account_name_unique_per_owner(self):
-        """Test that account name is unique per owner."""
-        owner1 = User.objects.create_user(username='owner1', password='password123')
-        owner2 = User.objects.create_user(username='owner2', password='password123')
-
-        # Initial account for self.owner1 (owner1 from setUp)
-        Account.objects.create(
-            name="Unique Name Test",
-            owner=self.owner1, # Changed to self.owner1
-            group=self.account_group,
-            currency=self.currency,
-        )
-
-        # Attempt to create another account with the same name and self.owner1 - should fail
-        with self.assertRaises(IntegrityError):
-            Account.objects.create(
-                name="Unique Name Test",
-                owner=self.owner1, # Changed to self.owner1
-                group=self.account_group,
-                currency=self.currency,
-            )
-
-        # Create account with the same name but for owner2 - should succeed
-        try:
-            Account.objects.create(
-                name="Unique Name Test",
-                owner=owner2, # owner2 is locally defined here, that's fine for this test
-                group=self.account_group,
-                currency=self.currency,
-            )
-        except IntegrityError:
-            self.fail("Creating account with same name but different owner failed unexpectedly.")
-
-        # Create account with a different name for self.owner1 - should succeed
-        try:
-            Account.objects.create(
-                name="Another Name Test",
-                owner=self.owner1, # Changed to self.owner1
-                group=self.account_group,
-                currency=self.currency,
-            )
-        except IntegrityError:
-            self.fail("Creating account with different name for the same owner failed unexpectedly.")
-
-    def test_account_form_valid_data(self):
-        """Test AccountForm with valid data."""
-        form_data = {
-            'name': 'Form Test Account',
-            'group': self.account_group.pk,
-            'currency': self.currency.pk,
-            'exchange_currency': self.eur.pk,
-            'is_asset': True,
-            'is_archived': False,
-            'description': 'A valid test account from form.'
-        }
-        form = AccountForm(data=form_data)
-        self.assertTrue(form.is_valid(), form.errors.as_text())
-
-        account = form.save(commit=False)
-        account.owner = self.owner1
-        account.save()
-
-        self.assertEqual(account.name, 'Form Test Account')
-        self.assertEqual(account.owner, self.owner1)
-        self.assertEqual(account.group, self.account_group)
-        self.assertEqual(account.currency, self.currency)
-        self.assertEqual(account.exchange_currency, self.eur)
-        self.assertTrue(account.is_asset)
-        self.assertFalse(account.is_archived)
-
-    def test_account_form_missing_name(self):
-        """Test AccountForm with missing name."""
-        form_data = {
-            'group': self.account_group.pk,
-            'currency': self.currency.pk,
-        }
-        form = AccountForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn('name', form.errors)
-
-    def test_account_form_exchange_currency_same_as_currency(self):
-        """Test AccountForm where exchange_currency is the same as currency."""
-        form_data = {
-            'name': 'Same Currency Form Account',
-            'group': self.account_group.pk,
-            'currency': self.currency.pk,
-            'exchange_currency': self.currency.pk,  # Same as currency
-        }
-        form = AccountForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn('exchange_currency', form.errors)
-
-
-class AccountGroupTests(TestCase):
-    def setUp(self):
-        """Set up test data for AccountGroup tests."""
-        self.owner1 = User.objects.create_user(username='groupowner1', password='password123')
-        self.owner2 = User.objects.create_user(username='groupowner2', password='password123')
-
-    def test_account_group_creation(self):
-        """Test basic AccountGroup creation."""
-        group = AccountGroup.objects.create(name="Test Group", owner=self.owner1)
-        self.assertEqual(group.name, "Test Group")
-        self.assertEqual(group.owner, self.owner1)
-        self.assertEqual(str(group), "Test Group") # Assuming __str__ returns the name
-
-    def test_account_group_name_unique_per_owner(self):
-        """Test that AccountGroup name is unique per owner."""
-        # Initial group for owner1
-        AccountGroup.objects.create(name="Unique Group Name", owner=self.owner1)
-
-        # Attempt to create another group with the same name and owner1 - should fail
-        with self.assertRaises(IntegrityError):
-            AccountGroup.objects.create(name="Unique Group Name", owner=self.owner1)
-
-        # Create group with the same name but for owner2 - should succeed
-        try:
-            AccountGroup.objects.create(name="Unique Group Name", owner=self.owner2)
-        except IntegrityError:
-            self.fail("Creating group with same name but different owner failed unexpectedly.")
-
-        # Create group with a different name for owner1 - should succeed
-        try:
-            AccountGroup.objects.create(name="Another Group Name", owner=self.owner1)
-        except IntegrityError:
-            self.fail("Creating group with different name for the same owner failed unexpectedly.")
-
-    def test_account_reconciliation_creates_transaction(self):
-        """Test that account_reconciliation view creates a transaction for the difference."""
-
-        # Helper function to get balance
-        def get_balance(account):
-            balance = account.transactions.filter(is_paid=True).aggregate(
-                total_income=models.Sum('amount', filter=models.Q(type=Transaction.Type.INCOME)),
-                total_expense=models.Sum('amount', filter=models.Q(type=Transaction.Type.EXPENSE)),
-                total_transfer_in=models.Sum('amount', filter=models.Q(type=Transaction.Type.TRANSFER, transfer_to_account=account)),
-                total_transfer_out=models.Sum('amount', filter=models.Q(type=Transaction.Type.TRANSFER, account=account))
-            )['total_income'] or Decimal('0.00')
-            balance -= account.transactions.filter(is_paid=True).aggregate(
-                total_expense=models.Sum('amount', filter=models.Q(type=Transaction.Type.EXPENSE))
-            )['total_expense'] or Decimal('0.00')
-            # For transfers, a more complete logic might be needed if transfers are involved in reconciliation scope
-            return balance
-
-        account_usd = Account.objects.create(
-            name="USD Account for Recon",
-            owner=self.owner1,
-            currency=self.currency,
-            group=self.account_group
-        )
-        account_eur = Account.objects.create(
-            name="EUR Account for Recon",
-            owner=self.owner1,
-            currency=self.eur,
-            group=self.account_group
-        )
-
-        # Initial transactions
-        Transaction.objects.create(account=account_usd, type=Transaction.Type.INCOME, amount=Decimal('100.00'), date=timezone.localdate(timezone.now()), description='Initial USD', category=self.reconciliation_category, owner=self.owner1, is_paid=True)
-        Transaction.objects.create(account=account_eur, type=Transaction.Type.INCOME, amount=Decimal('200.00'), date=timezone.localdate(timezone.now()), description='Initial EUR', category=self.reconciliation_category, owner=self.owner1, is_paid=True)
-        Transaction.objects.create(account=account_eur, type=Transaction.Type.EXPENSE, amount=Decimal('50.00'), date=timezone.localdate(timezone.now()), description='EUR Expense', category=self.reconciliation_category, owner=self.owner1, is_paid=True)
-
-        initial_usd_balance = get_balance(account_usd) # Should be 100.00
-        initial_eur_balance = get_balance(account_eur) # Should be 150.00
-        self.assertEqual(initial_usd_balance, Decimal('100.00'))
-        self.assertEqual(initial_eur_balance, Decimal('150.00'))
-
-        initial_transaction_count = Transaction.objects.filter(owner=self.owner1).count() # Should be 3
-
-        formset_data = {
-            'form-TOTAL_FORMS': '2',
-            'form-INITIAL_FORMS': '2', # Based on view logic, it builds initial data for all accounts
-            'form-MAX_NUM_FORMS': '', # Can be empty or a number >= TOTAL_FORMS
-            'form-0-account_id': account_usd.id,
-            'form-0-new_balance': '120.00', # New balance for USD account (implies +20 adjustment)
-            'form-0-category': self.reconciliation_category.id,
-            'form-1-account_id': account_eur.id,
-            'form-1-new_balance': '150.00', # Same as current balance for EUR account (no adjustment)
-            'form-1-category': self.reconciliation_category.id,
-        }
-
-        response = self.client.post(
-            reverse('accounts:account_reconciliation'),
-            data=formset_data,
-            HTTP_HX_REQUEST='true' # Required if view uses @only_htmx
-        )
-
-        self.assertEqual(response.status_code, 204, response.content.decode()) # 204 No Content for successful HTMX POST
-
-        # Check that only one new transaction was created
-        self.assertEqual(Transaction.objects.filter(owner=self.owner1).count(), initial_transaction_count + 1)
-
-        # Get the newly created transaction
-        new_transaction = Transaction.objects.filter(
-            account=account_usd,
-            description="Balance reconciliation"
-        ).first()
-
-        self.assertIsNotNone(new_transaction)
-        self.assertEqual(new_transaction.type, Transaction.Type.INCOME)
-        self.assertEqual(new_transaction.amount, Decimal('20.00'))
-        self.assertEqual(new_transaction.category, self.reconciliation_category)
-        self.assertEqual(new_transaction.owner, self.owner1)
-        self.assertTrue(new_transaction.is_paid)
-        self.assertEqual(new_transaction.date, timezone.localdate(timezone.now()))
-
-
-        # Verify final balances
-        self.assertEqual(get_balance(account_usd), Decimal('120.00'))
-        self.assertEqual(get_balance(account_eur), Decimal('150.00'))
+        self.assertEqual(account.exchange_currency, self.exchange_currency)

app/apps/accounts/urls.py

@@ -31,6 +31,11 @@ urlpatterns = [
         views.account_take_ownership,
         name="account_take_ownership",
     ),
+    path(
+        "account/<int:pk>/toggle-untracked/",
+        views.account_toggle_untracked,
+        name="account_toggle_untracked",
+    ),
     path("account-groups/", views.account_groups_index, name="account_groups_index"),
     path("account-groups/list/", views.account_groups_list, name="account_groups_list"),
     path("account-groups/add/", views.account_group_add, name="account_group_add"),

app/apps/accounts/views/accounts.py

@@ -155,6 +155,26 @@ def account_delete(request, pk):
     )
 
 
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def account_toggle_untracked(request, pk):
+    account = get_object_or_404(Account, id=pk)
+    if account.is_untracked_by():
+        account.untracked_by.remove(request.user)
+        messages.success(request, _("Account is now tracked"))
+    else:
+        account.untracked_by.add(request.user)
+        messages.success(request, _("Account is now untracked"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated",
+        },
+    )
+
+
 @only_htmx
 @login_required
 @require_http_methods(["GET"])

app/apps/api/serializers/transactions.py

@@ -138,6 +138,7 @@ class RecurringTransactionSerializer(serializers.ModelSerializer):
     def update(self, instance, validated_data):
         instance = super().update(instance, validated_data)
         instance.update_unpaid_transactions()
+        instance.generate_upcoming_transactions()
         return instance
 
 

app/apps/api/tests.py

@@ -1,124 +0,0 @@
-from django.test import TestCase
-from django.contrib.auth.models import User
-from rest_framework.test import APIClient
-from django.urls import reverse
-from datetime import date
-from decimal import Decimal
-from unittest.mock import patch
-
-from apps.accounts.models import Account, AccountGroup # Added AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, Transaction
-from apps.rules.signals import transaction_created # Assuming this is the correct path
-
-# Default page size for pagination, adjust if your project's default is different
-DEFAULT_PAGE_SIZE = 10
-
-class APITestCase(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='testuser', email='test@example.com', password='testpassword')
-        self.client = APIClient()
-        self.client.force_authenticate(user=self.user)
-
-        self.currency = Currency.objects.create(code="USD", name="US Dollar Test API", decimal_places=2)
-        # Account model requires an AccountGroup
-        self.account_group = AccountGroup.objects.create(name="API Test Group", owner=self.user)
-        self.account = Account.objects.create(
-            name="Test API Account",
-            currency=self.currency,
-            owner=self.user,
-            group=self.account_group
-        )
-        self.category = TransactionCategory.objects.create(
-            name="Test API Category",
-            owner=self.user,
-            type=TransactionCategory.TransactionType.EXPENSE # Default type, can be adjusted
-        )
-        # Remove the example test if it's no longer needed or update it
-        # self.assertEqual(1 + 1, 2) # from test_example
-
-    def test_transactions_endpoint_authenticated_user(self):
-        # User and client are now set up in self.setUp
-        url = reverse('api:transaction-list') # Using 'api:' namespace
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    @patch('apps.rules.signals.transaction_created.send')
-    def test_create_transaction_api_success(self, mock_signal_send):
-        url = reverse('api:transaction-list')
-        data = {
-            'account': self.account.pk, # Changed from account_id to account to match typical DRF serializer field names
-            'type': Transaction.Type.EXPENSE.value, # Use enum value
-            'date': date(2023, 1, 15).isoformat(),
-            'amount': '123.45',
-            'description': 'API Test Expense',
-            'category': self.category.pk,
-            'tags': [],
-            'entities': []
-        }
-
-        initial_transaction_count = Transaction.objects.count()
-        response = self.client.post(url, data, format='json')
-
-        self.assertEqual(response.status_code, 201, response.data) # Print response.data on failure
-        self.assertEqual(Transaction.objects.count(), initial_transaction_count + 1)
-
-        created_transaction = Transaction.objects.latest('id') # Get the latest transaction
-
-        self.assertEqual(created_transaction.description, 'API Test Expense')
-        self.assertEqual(created_transaction.amount, Decimal('123.45'))
-        self.assertEqual(created_transaction.owner, self.user)
-        self.assertEqual(created_transaction.account, self.account)
-        self.assertEqual(created_transaction.category, self.category)
-
-        mock_signal_send.assert_called_once()
-        # Check sender argument of the signal call
-        self.assertEqual(mock_signal_send.call_args.kwargs['sender'], Transaction)
-        self.assertEqual(mock_signal_send.call_args.kwargs['instance'], created_transaction)
-
-
-    def test_create_transaction_api_invalid_data(self):
-        url = reverse('api:transaction-list')
-        data = {
-            'account': self.account.pk,
-            'type': 'INVALID_TYPE', # Invalid type
-            'date': date(2023, 1, 15).isoformat(),
-            'amount': 'not_a_number', # Invalid amount
-            'description': 'API Test Invalid Data',
-            'category': self.category.pk
-        }
-        response = self.client.post(url, data, format='json')
-
-        self.assertEqual(response.status_code, 400)
-        self.assertIn('type', response.data)
-        self.assertIn('amount', response.data)
-
-    def test_transaction_list_pagination(self):
-        # Create more transactions than page size (e.g., DEFAULT_PAGE_SIZE + 5)
-        num_to_create = DEFAULT_PAGE_SIZE + 5
-        for i in range(num_to_create):
-            Transaction.objects.create(
-                account=self.account,
-                type=Transaction.Type.EXPENSE,
-                date=date(2023, 1, 1) + timedelta(days=i),
-                amount=Decimal(f"{10 + i}.00"),
-                description=f"Pag Test Transaction {i+1}",
-                owner=self.user,
-                category=self.category
-            )
-
-        url = reverse('api:transaction-list')
-        response = self.client.get(url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('count', response.data)
-        self.assertEqual(response.data['count'], num_to_create)
-
-        self.assertIn('next', response.data)
-        self.assertIsNotNone(response.data['next']) # Assuming count > page size
-
-        self.assertIn('previous', response.data) # Will be None for the first page
-        # self.assertIsNone(response.data['previous']) # For the first page
-
-        self.assertIn('results', response.data)
-        self.assertEqual(len(response.data['results']), DEFAULT_PAGE_SIZE)

app/apps/api/views/transactions.py

@@ -1,3 +1,5 @@
+from copy import deepcopy
+
 from rest_framework import viewsets
 
 from apps.api.custom.pagination import CustomPageNumberPagination
@@ -30,8 +32,9 @@ class TransactionViewSet(viewsets.ModelViewSet):
         transaction_created.send(sender=instance)
 
     def perform_update(self, serializer):
+        old_data = deepcopy(Transaction.objects.get(pk=serializer.data["pk"]))
         instance = serializer.save()
-        transaction_updated.send(sender=instance)
+        transaction_updated.send(sender=instance, old_data=old_data)
 
     def partial_update(self, request, *args, **kwargs):
         kwargs["partial"] = True

app/apps/calendar_view/tests.py

@@ -1,100 +0,0 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-from django.utils import timezone # Though specific dates are used, good for general test setup
-from decimal import Decimal
-from datetime import date
-
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, Transaction
-# from apps.calendar_view.utils.calendar import get_transactions_by_day # Not directly testing this util here
-
-class CalendarViewTests(TestCase): # Renamed from CalendarViewTestCase to CalendarViewTests
-    def setUp(self):
-        self.user = User.objects.create_user(username='testcalendaruser', password='password')
-        self.client = Client()
-        self.client.login(username='testcalendaruser', password='password')
-
-        self.currency_usd = Currency.objects.create(name="CV USD", code="CVUSD", decimal_places=2, prefix="$CV ")
-        self.account_group = AccountGroup.objects.create(name="CV Group", owner=self.user)
-        self.account_usd1 = Account.objects.create(
-            name="CV Account USD 1",
-            currency=self.currency_usd,
-            owner=self.user,
-            group=self.account_group
-        )
-        self.category_cv = TransactionCategory.objects.create(
-            name="CV Cat",
-            owner=self.user,
-            type=TransactionCategory.TransactionType.INFO # Using INFO as a generic type
-        )
-
-        # Transactions for specific dates
-        self.t1 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_cv,
-            date=date(2023, 3, 5), amount=Decimal("10.00"),
-            type=Transaction.Type.EXPENSE, is_paid=True, description="March 5th Tx"
-        )
-        self.t2 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_cv,
-            date=date(2023, 3, 10), amount=Decimal("20.00"),
-            type=Transaction.Type.EXPENSE, is_paid=True, description="March 10th Tx"
-        )
-        self.t3 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_cv,
-            date=date(2023, 4, 5), amount=Decimal("30.00"),
-            type=Transaction.Type.EXPENSE, is_paid=True, description="April 5th Tx"
-        )
-
-    def test_calendar_list_view_context_data(self):
-        # Assumes 'calendar_view:calendar_list' is the correct URL name for the main calendar view
-        # The previous test used 'calendar_view:calendar'. I'll assume 'calendar_list' is the new/correct one.
-        # If the view that shows the grid is named 'calendar', this should be adjusted.
-        # Based on subtask, this is for calendar_list view.
-        url = reverse('calendar_view:calendar_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('dates', response.context)
-
-        dates_context = response.context['dates']
-
-        entry_mar5 = next((d for d in dates_context if d['date'] == date(2023, 3, 5)), None)
-        self.assertIsNotNone(entry_mar5, "Date March 5th not found in context.")
-        self.assertIn(self.t1, entry_mar5['transactions'], "Transaction t1 not in March 5th transactions.")
-
-        entry_mar10 = next((d for d in dates_context if d['date'] == date(2023, 3, 10)), None)
-        self.assertIsNotNone(entry_mar10, "Date March 10th not found in context.")
-        self.assertIn(self.t2, entry_mar10['transactions'], "Transaction t2 not in March 10th transactions.")
-
-        for day_data in dates_context:
-            self.assertNotIn(self.t3, day_data['transactions'], f"Transaction t3 (April 5th) found in March {day_data['date']} transactions.")
-
-    def test_calendar_transactions_list_view_specific_day(self):
-        url = reverse('calendar_view:calendar_transactions_list', kwargs={'day': 5, 'month': 3, 'year': 2023})
-        response = self.client.get(url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('transactions', response.context)
-
-        transactions_context = response.context['transactions']
-
-        self.assertIn(self.t1, transactions_context, "Transaction t1 (March 5th) not found in context for specific day view.")
-        self.assertNotIn(self.t2, transactions_context, "Transaction t2 (March 10th) found in context for March 5th.")
-        self.assertNotIn(self.t3, transactions_context, "Transaction t3 (April 5th) found in context for March 5th.")
-        self.assertEqual(len(transactions_context), 1)
-
-    def test_calendar_view_authenticated_user_generic_month(self):
-        # This is similar to the old test_calendar_view_authenticated_user.
-        # It tests general access to the main calendar view (which might be 'calendar_list' or 'calendar')
-        # Let's use the 'calendar' name as it was in the old test, assuming it's the main monthly view.
-        # If 'calendar_list' is the actual main monthly view, this might be slightly redundant
-        # with the setup of test_calendar_list_view_context_data but still good for general access check.
-        url = reverse('calendar_view:calendar', args=[2023, 1]) # e.g. Jan 2023
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        # Further context checks could be added here if this view has a different structure than 'calendar_list'
-        self.assertIn('dates', response.context) # Assuming it also provides 'dates'
-        self.assertIn('current_month_date', response.context)
-        self.assertEqual(response.context['current_month_date'], date(2023,1,1))

app/apps/common/admin.py

@@ -1,7 +1,26 @@
 from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
+
+
+@admin.action(description=_("Make public"))
+def make_public(modeladmin, request, queryset):
+    queryset.update(visibility="public")
+
+
+@admin.action(description=_("Make private"))
+def make_private(modeladmin, request, queryset):
+    queryset.update(visibility="private")
 
 
 class SharedObjectModelAdmin(admin.ModelAdmin):
+    actions = [make_public, make_private]
+
+    list_display = ("__str__", "visibility", "owner", "get_shared_with")
+
+    @admin.display(description=_("Shared with users"))
+    def get_shared_with(self, obj):
+        return ", ".join([p.email for p in obj.shared_with.all()])
+
     def get_queryset(self, request):
         # Use the all_objects manager to show all transactions, including deleted ones
         return self.model.all_objects.all()

app/apps/common/apps.py

@@ -1,6 +1,25 @@
 from django.apps import AppConfig
+from django.core.cache import cache
 
 
 class CommonConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "apps.common"
+
+    def ready(self):
+        from django.contrib import admin
+        from django.contrib.sites.models import Site
+        from allauth.socialaccount.models import (
+            SocialAccount,
+            SocialApp,
+            SocialToken,
+        )
+
+        admin.site.unregister(Site)
+        admin.site.unregister(SocialAccount)
+        admin.site.unregister(SocialApp)
+        admin.site.unregister(SocialToken)
+
+        # Delete the cache for update checks to prevent false-positives when the app is restarted
+        # this will be recreated by the check_for_updates task
+        cache.delete("update_check")

app/apps/common/fields/forms/dynamic_select.py

@@ -139,7 +139,6 @@ class DynamicModelMultipleChoiceField(forms.ModelMultipleChoiceField):
                     instance.save()
                     return instance
         except Exception as e:
-            print(e)
             raise ValidationError(_("Error creating new instance"))
 
     def clean(self, value):

app/apps/common/functions/decimals.py

@@ -9,5 +9,8 @@ def truncate_decimal(value, decimal_places):
     :param decimal_places: The number of decimal places to keep
     :return: Truncated Decimal value
     """
+    if isinstance(value, (int, float)):
+        value = Decimal(str(value))
+
     multiplier = Decimal(10**decimal_places)
     return (value * multiplier).to_integral_value(rounding=ROUND_DOWN) / multiplier

app/apps/common/functions/format.py

@@ -5,7 +5,12 @@ from django.utils.formats import get_format as original_get_format
 def get_format(format_type=None, lang=None, use_l10n=None):
     user = get_current_user()
 
-    if user and user.is_authenticated and hasattr(user, "settings"):
+    if (
+        user
+        and user.is_authenticated
+        and hasattr(user, "settings")
+        and use_l10n is not False
+    ):
         user_settings = user.settings
         if format_type == "THOUSAND_SEPARATOR":
             number_format = getattr(user_settings, "number_format", None)
@@ -13,11 +18,13 @@ def get_format(format_type=None, lang=None, use_l10n=None):
                 return "."
             elif number_format == "CD":
                 return ","
+            elif number_format == "SD" or number_format == "SC":
+                return " "
         elif format_type == "DECIMAL_SEPARATOR":
             number_format = getattr(user_settings, "number_format", None)
-            if number_format == "DC":
+            if number_format == "DC" or number_format == "SC":
                 return ","
-            elif number_format == "CD":
+            elif number_format == "CD" or number_format == "SD":
                 return "."
         elif format_type == "SHORT_DATE_FORMAT":
             date_format = getattr(user_settings, "date_format", None)

app/apps/common/models.py

@@ -36,12 +36,19 @@ class SharedObject(models.Model):
         related_name="%(class)s_owned",
         null=True,
         blank=True,
+        verbose_name=_("Owner"),
     )
     visibility = models.CharField(
-        max_length=10, choices=Visibility.choices, default=Visibility.private
+        max_length=10,
+        choices=Visibility.choices,
+        default=Visibility.private,
+        verbose_name=_("Visibility"),
     )
     shared_with = models.ManyToManyField(
-        settings.AUTH_USER_MODEL, related_name="%(class)s_shared", blank=True
+        settings.AUTH_USER_MODEL,
+        related_name="%(class)s_shared",
+        blank=True,
+        verbose_name=_("Shared with users"),
     )
 
     # Use as abstract base class
@@ -65,6 +72,18 @@ class SharedObject(models.Model):
         super().save(*args, **kwargs)
 
 
+class OwnedObjectManager(models.Manager):
+    def get_queryset(self):
+        """Return only objects the user can access"""
+        user = get_current_user()
+        base_qs = super().get_queryset()
+
+        if user and user.is_authenticated:
+            return base_qs.filter(Q(owner=user) | Q(owner=None)).distinct()
+
+        return base_qs
+
+
 class OwnedObject(models.Model):
     owner = models.ForeignKey(
         settings.AUTH_USER_MODEL,

app/apps/common/procrastinate.py

@@ -0,0 +1,6 @@
+import procrastinate
+
+
+def on_app_ready(app: procrastinate.App):
+    """This function is ran upon procrastinate initialization."""
+    ...

app/apps/common/tasks.py

@@ -1,13 +1,17 @@
 import logging
+from packaging.version import parse as parse_version, InvalidVersion
 
 from asgiref.sync import sync_to_async
 from django.conf import settings
 from django.core import management
 from django.db import DEFAULT_DB_ALIAS
+from django.core.cache import cache
 
 from procrastinate import builtin_tasks
 from procrastinate.contrib.django import app
 
+import requests
+
 
 logger = logging.getLogger(__name__)
 
@@ -19,7 +23,7 @@ async def remove_old_jobs(context, timestamp):
         return await builtin_tasks.remove_old_jobs(
             context,
             max_hours=744,
-            remove_error=True,
+            remove_failed=True,
             remove_cancelled=True,
             remove_aborted=True,
         )
@@ -79,3 +83,49 @@ def reset_demo_data(timestamp=None):
     except Exception as e:
         logger.exception(f"Error during daily demo data reset: {e}")
         raise
+
+
+@app.periodic(cron="0 */12 * * *")  # Every 12 hours
+@app.task(
+    name="check_for_updates",
+)
+def check_for_updates(timestamp=None):
+    if not settings.CHECK_FOR_UPDATES:
+        return "CHECK_FOR_UPDATES is disabled"
+
+    url = "https://api.github.com/repos/eitchtee/WYGIWYH/releases/latest"
+
+    try:
+        response = requests.get(url, timeout=60)
+        response.raise_for_status()  # Raise an exception for bad status codes (4xx or 5xx)
+
+        data = response.json()
+        latest_version = data.get("tag_name")
+
+        if latest_version:
+            try:
+                current_v = parse_version(settings.APP_VERSION)
+            except InvalidVersion:
+                current_v = parse_version("0.0.0")
+            try:
+                latest_v = parse_version(latest_version)
+            except InvalidVersion:
+                latest_v = parse_version("0.0.0")
+
+            update_info = {
+                "update_available": False,
+                "current_version": str(current_v),
+                "latest_version": str(latest_v),
+            }
+
+            if latest_v > current_v:
+                update_info["update_available"] = True
+
+            # Cache the entire dictionary
+            cache.set("update_check", update_info, 60 * 60 * 25)
+            logger.info(f"Update check complete. Result: {update_info}")
+        else:
+            logger.warning("Could not find 'tag_name' in GitHub API response.")
+
+    except requests.exceptions.RequestException as e:
+        logger.error(f"Failed to fetch updates from GitHub: {e}")

app/apps/common/templatetags/cache_access.py

@@ -0,0 +1,17 @@
+# core/templatetags/update_tags.py
+from django import template
+from django.core.cache import cache
+
+register = template.Library()
+
+
+@register.simple_tag
+def get_update_check():
+    """
+    Retrieves the update status dictionary from the cache.
+    Returns a default dictionary if nothing is found.
+    """
+    return cache.get("update_check") or {
+        "update_available": False,
+        "latest_version": "N/A",
+    }

app/apps/common/tests.py

@@ -1,183 +0,0 @@
-from django.test import TestCase, RequestFactory
-from django.template import Template, Context
-from django.urls import reverse, resolve, NoReverseMatch
-from django.contrib.auth.models import User
-from decimal import Decimal # Keep existing imports if they are from other tests
-from app.apps.common.functions.decimals import truncate_decimal # Keep existing imports
-
-# Helper to create a dummy request with resolver_match
-def setup_request_for_view(factory, view_name_or_url, user=None, namespace=None, view_name_for_resolver=None):
-    try:
-        url = reverse(view_name_or_url)
-    except NoReverseMatch:
-        url = view_name_or_url # Assume it's already a URL path
-
-    request = factory.get(url)
-    if user:
-        request.user = user
-
-    try:
-        # For resolver_match, we need to simulate how Django does it.
-        # It needs specific view_name and namespace if applicable.
-        # If view_name_for_resolver is provided, use that for resolving,
-        # otherwise, assume view_name_or_url is the view name for resolver_match.
-        resolver_match_source = view_name_for_resolver if view_name_for_resolver else view_name_or_url
-
-        # If it's a namespaced view name like 'app:view', resolve might handle it directly.
-        # If namespace is separately provided, it means the view_name itself is not namespaced.
-        resolved_match = resolve(url) # Resolve the URL to get func, args, kwargs, etc.
-
-        # Ensure resolver_match has the correct attributes, especially 'view_name' and 'namespace'
-        if hasattr(resolved_match, 'view_name'):
-            if ':' in resolved_match.view_name and not namespace: # e.g. 'app_name:view_name'
-                request.resolver_match = resolved_match
-            elif namespace and resolved_match.namespace == namespace and resolved_match.url_name == resolver_match_source.split(':')[-1]:
-                request.resolver_match = resolved_match
-            elif not namespace and resolved_match.url_name == resolver_match_source:
-                 request.resolver_match = resolved_match
-            else: # Fallback or if specific view_name/namespace parts are needed for resolver_match
-                # This part is tricky without knowing the exact structure of resolver_match expected by the tag
-                # Forcing the view_name and namespace if they are explicitly passed.
-                if namespace:
-                    resolved_match.namespace = namespace
-                if view_name_for_resolver: # This should be the non-namespaced view name part
-                     resolved_match.view_name = f"{namespace}:{view_name_for_resolver.split(':')[-1]}" if namespace else view_name_for_resolver.split(':')[-1]
-                     resolved_match.url_name = view_name_for_resolver.split(':')[-1]
-
-                request.resolver_match = resolved_match
-
-        else: # Fallback if resolve() doesn't directly give a full resolver_match object as expected
-            request.resolver_match = None
-
-
-    except Exception as e:
-        print(f"Warning: Could not resolve URL or set resolver_match for '{view_name_or_url}' (or '{view_name_for_resolver}') for test setup: {e}")
-        request.resolver_match = None
-    return request
-
-class CommonTestCase(TestCase): # Keep existing test class if other tests depend on it
-    def test_example(self): # Example of an old test
-        self.assertEqual(1 + 1, 2)
-
-    def test_truncate_decimal_function(self): # Example of an old test from problem description
-        test_cases = [
-            (Decimal('123.456'), 0, Decimal('123')),
-            (Decimal('123.456'), 1, Decimal('123.4')),
-            (Decimal('123.456'), 2, Decimal('123.45')),
-        ]
-        for value, places, expected in test_cases:
-            with self.subTest(value=value, places=places, expected=expected):
-                self.assertEqual(truncate_decimal(value, places), expected)
-
-
-class CommonTemplateTagsTests(TestCase):
-    def setUp(self):
-        self.factory = RequestFactory()
-        self.user = User.objects.create_user('testuser', 'password123')
-
-        # Using view names that should exist in a typical Django project with auth
-        # Ensure these URLs are part of your project's urlpatterns for tests to pass.
-        self.view_name_login = 'login' # Typically 'login' or 'account_login'
-        self.namespace_login = None # Often no namespace for basic auth views, or 'account'
-
-        self.view_name_admin = 'admin:index' # Admin index
-        self.namespace_admin = 'admin'
-
-        # Check if these can be reversed, skip tests if not.
-        try:
-            reverse(self.view_name_login)
-        except NoReverseMatch:
-            self.view_name_login = None # Mark as unusable
-            print(f"Warning: Could not reverse '{self.view_name_login}'. Some active_link tests might be skipped.")
-        try:
-            reverse(self.view_name_admin)
-        except NoReverseMatch:
-            self.view_name_admin = None # Mark as unusable
-            print(f"Warning: Could not reverse '{self.view_name_admin}'. Some active_link tests might be skipped.")
-
-    def test_active_link_view_match(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible.")
-        request = setup_request_for_view(self.factory, self.view_name_login, self.user,
-                                         namespace=self.namespace_login, view_name_for_resolver=self.view_name_login)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_login}.")
-
-        template_str = "{% load active_link %} {% active_link views='" + self.view_name_login + "' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "active")
-
-    def test_active_link_view_no_match(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible.")
-        request = setup_request_for_view(self.factory, self.view_name_login, self.user,
-                                         namespace=self.namespace_login, view_name_for_resolver=self.view_name_login)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_login}.")
-
-        template_str = "{% load active_link %} {% active_link views='non_existent_view_name' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "")
-
-    def test_active_link_view_match_custom_class(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible.")
-        request = setup_request_for_view(self.factory, self.view_name_login, self.user,
-                                         namespace=self.namespace_login, view_name_for_resolver=self.view_name_login)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_login}.")
-
-        template_str = "{% load active_link %} {% active_link views='" + self.view_name_login + "' css_class='custom-active' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "custom-active")
-
-    def test_active_link_view_no_match_inactive_class(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible.")
-        request = setup_request_for_view(self.factory, self.view_name_login, self.user,
-                                         namespace=self.namespace_login, view_name_for_resolver=self.view_name_login)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_login}.")
-
-        template_str = "{% load active_link %} {% active_link views='non_existent_view_name' inactive_class='custom-inactive' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "custom-inactive")
-
-    def test_active_link_namespace_match(self):
-        if not self.view_name_admin: self.skipTest("Admin URL not reversible.")
-        # The view_name_admin is already namespaced 'admin:index'
-        request = setup_request_for_view(self.factory, self.view_name_admin, self.user,
-                                         namespace=self.namespace_admin, view_name_for_resolver=self.view_name_admin)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_admin}.")
-        # Ensure the resolver_match has the namespace set correctly by setup_request_for_view
-        self.assertEqual(request.resolver_match.namespace, self.namespace_admin, "Namespace not correctly set in resolver_match for test.")
-
-        template_str = "{% load active_link %} {% active_link namespaces='" + self.namespace_admin + "' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "active")
-
-    def test_active_link_multiple_views_one_match(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible.")
-        request = setup_request_for_view(self.factory, self.view_name_login, self.user,
-                                         namespace=self.namespace_login, view_name_for_resolver=self.view_name_login)
-        if not request.resolver_match: self.skipTest(f"Could not set resolver_match for {self.view_name_login}.")
-
-        template_str = "{% load active_link %} {% active_link views='other_app:other_view||" + self.view_name_login + "' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "active")
-
-    def test_active_link_no_request_in_context(self):
-        if not self.view_name_login: self.skipTest("Login URL not reversible for placeholder view name.")
-        template_str = "{% load active_link %} {% active_link views='" + self.view_name_login + "' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({})) # Empty context, no 'request'
-        self.assertEqual(rendered.strip(), "")
-
-    def test_active_link_request_without_resolver_match(self):
-        request = self.factory.get('/some_unresolved_url/') # This URL won't resolve
-        request.user = self.user
-        request.resolver_match = None # Explicitly set to None, as resolve() would fail
-
-        if not self.view_name_login: self.skipTest("Login URL not reversible for placeholder view name.")
-        template_str = "{% load active_link %} {% active_link views='" + self.view_name_login + "' %}"
-        template = Template(template_str)
-        rendered = template.render(Context({'request': request}))
-        self.assertEqual(rendered.strip(), "")

app/apps/common/views.py

@@ -91,6 +91,12 @@ def month_year_picker(request):
         for date in all_months
     ]
 
+    today_url = (
+        reverse(url, kwargs={"month": current_date.month, "year": current_date.year})
+        if url
+        else ""
+    )
+
     return render(
         request,
         "common/fragments/month_year_picker.html",
@@ -98,6 +104,7 @@ def month_year_picker(request):
             "month_year_data": result,
             "current_month": current_month,
             "current_year": current_year,
+            "today_url": today_url,
         },
     )
 

app/apps/common/widgets/datepicker.py

@@ -37,7 +37,9 @@ class AirDatePickerInput(widgets.DateInput):
     def _get_current_language():
         """Get current language code in format compatible with AirDatepicker"""
         lang_code = translation.get_language()
-        # AirDatepicker uses simple language codes
+        # AirDatepicker uses simple language codes, except for pt-br
+        if lang_code.lower() == "pt-br":
+            return "pt-BR"
         return lang_code.split("-")[0]
 
     def _get_format(self):

app/apps/common/widgets/decimal.py

@@ -35,8 +35,8 @@ class ArbitraryDecimalDisplayNumberInput(forms.TextInput):
         self.attrs.update(
             {
                 "x-data": "",
-                "x-mask:dynamic": f"$money($input, '{get_format('DECIMAL_SEPARATOR')}', "
-                f"'{get_format('THOUSAND_SEPARATOR')}', '30')",
+                "x-mask:dynamic": f"$money($input, '{get_format('DECIMAL_SEPARATOR')}', '{get_format('THOUSAND_SEPARATOR')}', '30')",
+                "x-on:keyup": "$el.dispatchEvent(new Event('input'))",
             }
         )
 

app/apps/currencies/exchange_rates/fetcher.py

@@ -4,13 +4,7 @@ from datetime import timedelta
 from django.db.models import QuerySet
 from django.utils import timezone
 
-from apps.currencies.exchange_rates.providers import (
-    SynthFinanceProvider,
-    SynthFinanceStockProvider,
-    CoinGeckoFreeProvider,
-    CoinGeckoProProvider,
-    TransitiveRateProvider,
-)
+import apps.currencies.exchange_rates.providers as providers
 from apps.currencies.models import ExchangeRateService, ExchangeRate, Currency
 
 logger = logging.getLogger(__name__)
@@ -18,11 +12,12 @@ logger = logging.getLogger(__name__)
 
 # Map service types to provider classes
 PROVIDER_MAPPING = {
-    "synth_finance": SynthFinanceProvider,
-    "synth_finance_stock": SynthFinanceStockProvider,
-    "coingecko_free": CoinGeckoFreeProvider,
-    "coingecko_pro": CoinGeckoProProvider,
-    "transitive": TransitiveRateProvider,
+    "coingecko_free": providers.CoinGeckoFreeProvider,
+    "coingecko_pro": providers.CoinGeckoProProvider,
+    "transitive": providers.TransitiveRateProvider,
+    "frankfurter": providers.FrankfurterProvider,
+    "twelvedata": providers.TwelveDataProvider,
+    "twelvedatamarkets": providers.TwelveDataMarketsProvider,
 }
 
 
@@ -203,21 +198,63 @@ class ExchangeRateFetcher:
 
                 if provider.rates_inverted:
                     # If rates are inverted, we need to swap currencies
-                    ExchangeRate.objects.create(
-                        from_currency=to_currency,
-                        to_currency=from_currency,
-                        rate=rate,
-                        date=timezone.now(),
-                    )
+                    if service.singleton:
+                        # Try to get the last automatically created exchange rate
+                        exchange_rate = (
+                            ExchangeRate.objects.filter(
+                                automatic=True,
+                                from_currency=to_currency,
+                                to_currency=from_currency,
+                            )
+                            .order_by("-date")
+                            .first()
+                        )
+                    else:
+                        exchange_rate = None
+
+                    if not exchange_rate:
+                        ExchangeRate.objects.create(
+                            automatic=True,
+                            from_currency=to_currency,
+                            to_currency=from_currency,
+                            rate=rate,
+                            date=timezone.now(),
+                        )
+                    else:
+                        exchange_rate.rate = rate
+                        exchange_rate.date = timezone.now()
+                        exchange_rate.save()
+
                     processed_pairs.add((to_currency.id, from_currency.id))
                 else:
                     # If rates are not inverted, we can use them as is
-                    ExchangeRate.objects.create(
-                        from_currency=from_currency,
-                        to_currency=to_currency,
-                        rate=rate,
-                        date=timezone.now(),
-                    )
+                    if service.singleton:
+                        # Try to get the last automatically created exchange rate
+                        exchange_rate = (
+                            ExchangeRate.objects.filter(
+                                automatic=True,
+                                from_currency=from_currency,
+                                to_currency=to_currency,
+                            )
+                            .order_by("-date")
+                            .first()
+                        )
+                    else:
+                        exchange_rate = None
+
+                    if not exchange_rate:
+                        ExchangeRate.objects.create(
+                            automatic=True,
+                            from_currency=from_currency,
+                            to_currency=to_currency,
+                            rate=rate,
+                            date=timezone.now(),
+                        )
+                    else:
+                        exchange_rate.rate = rate
+                        exchange_rate.date = timezone.now()
+                        exchange_rate.save()
+
                     processed_pairs.add((from_currency.id, to_currency.id))
 
             service.last_fetch = timezone.now()

app/apps/currencies/exchange_rates/providers.py

@@ -13,70 +13,6 @@ from apps.currencies.exchange_rates.base import ExchangeRateProvider
 logger = logging.getLogger(__name__)
 
 
-class SynthFinanceProvider(ExchangeRateProvider):
-    """Implementation for Synth Finance API (synthfinance.com)"""
-
-    BASE_URL = "https://api.synthfinance.com/rates/live"
-    rates_inverted = False  # SynthFinance returns non-inverted rates
-
-    def __init__(self, api_key: str = None):
-        super().__init__(api_key)
-        self.session = requests.Session()
-        self.session.headers.update({"Authorization": f"Bearer {self.api_key}"})
-
-    def get_rates(
-        self, target_currencies: QuerySet, exchange_currencies: set
-    ) -> List[Tuple[Currency, Currency, Decimal]]:
-        results = []
-        currency_groups = {}
-        for currency in target_currencies:
-            if currency.exchange_currency in exchange_currencies:
-                group = currency_groups.setdefault(currency.exchange_currency.code, [])
-                group.append(currency)
-
-        for base_currency, currencies in currency_groups.items():
-            try:
-                to_currencies = ",".join(
-                    currency.code
-                    for currency in currencies
-                    if currency.code != base_currency
-                )
-                response = self.session.get(
-                    f"{self.BASE_URL}",
-                    params={"from": base_currency, "to": to_currencies},
-                )
-                response.raise_for_status()
-                data = response.json()
-                rates = data["data"]["rates"]
-
-                for currency in currencies:
-                    if currency.code == base_currency:
-                        rate = Decimal("1")
-                    else:
-                        rate = Decimal(str(rates[currency.code]))
-                    # Return the rate as is, without inversion
-                    results.append((currency.exchange_currency, currency, rate))
-
-                credits_used = data["meta"]["credits_used"]
-                credits_remaining = data["meta"]["credits_remaining"]
-                logger.info(
-                    f"Synth Finance API call: {credits_used} credits used, {credits_remaining} remaining"
-                )
-            except requests.RequestException as e:
-                logger.error(
-                    f"Error fetching rates from Synth Finance API for base {base_currency}: {e}"
-                )
-            except KeyError as e:
-                logger.error(
-                    f"Unexpected response structure from Synth Finance API for base {base_currency}: {e}"
-                )
-            except Exception as e:
-                logger.error(
-                    f"Unexpected error processing Synth Finance data for base {base_currency}: {e}"
-                )
-        return results
-
-
 class CoinGeckoFreeProvider(ExchangeRateProvider):
     """Implementation for CoinGecko Free API"""
 
@@ -152,71 +88,6 @@ class CoinGeckoProProvider(CoinGeckoFreeProvider):
         self.session.headers.update({"x-cg-pro-api-key": api_key})
 
 
-class SynthFinanceStockProvider(ExchangeRateProvider):
-    """Implementation for Synth Finance API Real-Time Prices endpoint (synthfinance.com)"""
-
-    BASE_URL = "https://api.synthfinance.com/tickers"
-    rates_inverted = True
-
-    def __init__(self, api_key: str = None):
-        super().__init__(api_key)
-        self.session = requests.Session()
-        self.session.headers.update(
-            {"Authorization": f"Bearer {self.api_key}", "accept": "application/json"}
-        )
-
-    def get_rates(
-        self, target_currencies: QuerySet, exchange_currencies: set
-    ) -> List[Tuple[Currency, Currency, Decimal]]:
-        results = []
-
-        for currency in target_currencies:
-            if currency.exchange_currency not in exchange_currencies:
-                continue
-
-            try:
-                # Same currency has rate of 1
-                if currency.code == currency.exchange_currency.code:
-                    rate = Decimal("1")
-                    results.append((currency.exchange_currency, currency, rate))
-                    continue
-
-                # Fetch real-time price for this ticker
-                response = self.session.get(
-                    f"{self.BASE_URL}/{currency.code}/real-time"
-                )
-                response.raise_for_status()
-                data = response.json()
-
-                # Use fair market value as the rate
-                rate = Decimal(data["data"]["fair_market_value"])
-                results.append((currency.exchange_currency, currency, rate))
-
-                # Log API usage
-                credits_used = data["meta"]["credits_used"]
-                credits_remaining = data["meta"]["credits_remaining"]
-                logger.info(
-                    f"Synth Finance API call for {currency.code}: {credits_used} credits used, {credits_remaining} remaining"
-                )
-            except requests.RequestException as e:
-                logger.error(
-                    f"Error fetching rate from Synth Finance API for ticker {currency.code}: {e}",
-                    exc_info=True,
-                )
-            except KeyError as e:
-                logger.error(
-                    f"Unexpected response structure from Synth Finance API for ticker {currency.code}: {e}",
-                    exc_info=True,
-                )
-            except Exception as e:
-                logger.error(
-                    f"Unexpected error processing Synth Finance data for ticker {currency.code}: {e}",
-                    exc_info=True,
-                )
-
-        return results
-
-
 class TransitiveRateProvider(ExchangeRateProvider):
     """Calculates exchange rates through paths of existing rates"""
 
@@ -306,3 +177,329 @@ class TransitiveRateProvider(ExchangeRateProvider):
                     queue.append((neighbor, path + [neighbor], current_rate * rate))
 
         return None, None
+
+
+class FrankfurterProvider(ExchangeRateProvider):
+    """Implementation for the Frankfurter API (frankfurter.dev)"""
+
+    BASE_URL = "https://api.frankfurter.dev/v1/latest"
+    rates_inverted = (
+        False  # Frankfurter returns non-inverted rates (e.g., 1 EUR = 1.1 USD)
+    )
+
+    def __init__(self, api_key: str = None):
+        """
+        Initializes the provider. The Frankfurter API does not require an API key,
+        so the api_key parameter is ignored.
+        """
+        super().__init__(api_key)
+        self.session = requests.Session()
+
+    @classmethod
+    def requires_api_key(cls) -> bool:
+        return False
+
+    def get_rates(
+        self, target_currencies: QuerySet, exchange_currencies: set
+    ) -> List[Tuple[Currency, Currency, Decimal]]:
+        results = []
+        currency_groups = {}
+        # Group target currencies by their exchange (base) currency to minimize API calls
+        for currency in target_currencies:
+            if currency.exchange_currency in exchange_currencies:
+                group = currency_groups.setdefault(currency.exchange_currency.code, [])
+                group.append(currency)
+
+        # Make one API call for each base currency
+        for base_currency, currencies in currency_groups.items():
+            try:
+                # Create a comma-separated list of target currency codes
+                to_currencies = ",".join(
+                    currency.code
+                    for currency in currencies
+                    if currency.code != base_currency
+                )
+
+                # If there are no target currencies other than the base, skip the API call
+                if not to_currencies:
+                    # Handle the case where the only request is for the base rate (e.g., USD to USD)
+                    for currency in currencies:
+                        if currency.code == base_currency:
+                            results.append(
+                                (currency.exchange_currency, currency, Decimal("1"))
+                            )
+                    continue
+
+                response = self.session.get(
+                    self.BASE_URL,
+                    params={"base": base_currency, "symbols": to_currencies},
+                )
+                response.raise_for_status()
+                data = response.json()
+                rates = data["rates"]
+
+                # Process the returned rates
+                for currency in currencies:
+                    if currency.code == base_currency:
+                        # The rate for the base currency to itself is always 1
+                        rate = Decimal("1")
+                    else:
+                        rate = Decimal(str(rates[currency.code]))
+
+                    results.append((currency.exchange_currency, currency, rate))
+
+            except requests.RequestException as e:
+                logger.error(
+                    f"Error fetching rates from Frankfurter API for base {base_currency}: {e}"
+                )
+            except KeyError as e:
+                logger.error(
+                    f"Unexpected response structure from Frankfurter API for base {base_currency}: {e}"
+                )
+            except Exception as e:
+                logger.error(
+                    f"Unexpected error processing Frankfurter data for base {base_currency}: {e}"
+                )
+        return results
+
+
+class TwelveDataProvider(ExchangeRateProvider):
+    """Implementation for the Twelve Data API (twelvedata.com)"""
+
+    BASE_URL = "https://api.twelvedata.com/exchange_rate"
+    rates_inverted = (
+        False  # The API returns direct rates, e.g., for EUR/USD it's 1 EUR = X USD
+    )
+
+    def __init__(self, api_key: str):
+        """
+        Initializes the provider with an API key and a requests session.
+        """
+        super().__init__(api_key)
+        self.session = requests.Session()
+
+    @classmethod
+    def requires_api_key(cls) -> bool:
+        """This provider requires an API key."""
+        return True
+
+    def get_rates(
+        self, target_currencies: QuerySet, exchange_currencies: set
+    ) -> List[Tuple[Currency, Currency, Decimal]]:
+        """
+        Fetches exchange rates from the Twelve Data API for the given currency pairs.
+
+        This provider makes one API call for each requested currency pair.
+        """
+        results = []
+
+        for target_currency in target_currencies:
+            # Ensure the target currency's exchange currency is one we're interested in
+            if target_currency.exchange_currency not in exchange_currencies:
+                continue
+
+            base_currency = target_currency.exchange_currency
+
+            # The exchange rate for the same currency is always 1
+            if base_currency.code == target_currency.code:
+                rate = Decimal("1")
+                results.append((base_currency, target_currency, rate))
+                continue
+
+            # Construct the symbol in the format "BASE/TARGET", e.g., "EUR/USD"
+            symbol = f"{base_currency.code}/{target_currency.code}"
+
+            try:
+                params = {
+                    "symbol": symbol,
+                    "apikey": self.api_key,
+                }
+
+                response = self.session.get(self.BASE_URL, params=params)
+                response.raise_for_status()  # Raise an HTTPError for bad responses (4xx or 5xx)
+
+                data = response.json()
+
+                # The API may return an error message in a JSON object
+                if "rate" not in data:
+                    error_message = data.get("message", "Rate not found in response.")
+                    logger.error(
+                        f"Could not fetch rate for {symbol} from Twelve Data: {error_message}"
+                    )
+                    continue
+
+                # Convert the rate to a Decimal for precision
+                rate = Decimal(str(data["rate"]))
+                results.append((base_currency, target_currency, rate))
+
+                logger.info(f"Successfully fetched rate for {symbol} from Twelve Data.")
+
+                time.sleep(
+                    60
+                )  # We sleep every pair as to not step over TwelveData's minute limit
+
+            except requests.RequestException as e:
+                logger.error(
+                    f"Error fetching rate from Twelve Data API for symbol {symbol}: {e}"
+                )
+            except KeyError as e:
+                logger.error(
+                    f"Unexpected response structure from Twelve Data API for symbol {symbol}: Missing key {e}"
+                )
+            except Exception as e:
+                logger.error(
+                    f"An unexpected error occurred while processing Twelve Data for {symbol}: {e}"
+                )
+
+        return results
+
+
+class TwelveDataMarketsProvider(ExchangeRateProvider):
+    """
+    Provides prices for market instruments (stocks, ETFs, etc.) using the Twelve Data API.
+
+    This provider performs a multi-step process:
+    1. Parses instrument codes which can be symbols, FIGI, CUSIP, or ISIN.
+    2. For CUSIPs, it defaults the currency to USD. For all others, it searches
+       for the instrument to determine its native trading currency.
+    3. Fetches the latest price for the instrument in its native currency.
+    4. Converts the price to the requested target exchange currency.
+    """
+
+    SYMBOL_SEARCH_URL = "https://api.twelvedata.com/symbol_search"
+    PRICE_URL = "https://api.twelvedata.com/price"
+    EXCHANGE_RATE_URL = "https://api.twelvedata.com/exchange_rate"
+
+    rates_inverted = True
+
+    def __init__(self, api_key: str):
+        super().__init__(api_key)
+        self.session = requests.Session()
+
+    @classmethod
+    def requires_api_key(cls) -> bool:
+        return True
+
+    def _parse_code(self, raw_code: str) -> Tuple[str, str]:
+        """Parses the raw code to determine its type and value."""
+        if raw_code.startswith("figi:"):
+            return "figi", raw_code.removeprefix("figi:")
+        if raw_code.startswith("cusip:"):
+            return "cusip", raw_code.removeprefix("cusip:")
+        if raw_code.startswith("isin:"):
+            return "isin", raw_code.removeprefix("isin:")
+        return "symbol", raw_code
+
+    def get_rates(
+        self, target_currencies: QuerySet, exchange_currencies: set
+    ) -> List[Tuple[Currency, Currency, Decimal]]:
+        results = []
+
+        for asset in target_currencies:
+            if asset.exchange_currency not in exchange_currencies:
+                continue
+
+            code_type, code_value = self._parse_code(asset.code)
+            original_currency_code = None
+
+            try:
+                # Determine the instrument's native currency
+                if code_type == "cusip":
+                    # CUSIP codes always default to USD
+                    original_currency_code = "USD"
+                    logger.info(f"Defaulting CUSIP {code_value} to USD currency.")
+                else:
+                    # For all other types, find currency via symbol search
+                    search_params = {"symbol": code_value, "apikey": "demo"}
+                    search_res = self.session.get(
+                        self.SYMBOL_SEARCH_URL, params=search_params
+                    )
+                    search_res.raise_for_status()
+                    search_data = search_res.json()
+
+                    if not search_data.get("data"):
+                        logger.warning(
+                            f"TwelveDataMarkets: Symbol search for '{code_value}' returned no results."
+                        )
+                        continue
+
+                    instrument_data = search_data["data"][0]
+                    original_currency_code = instrument_data.get("currency")
+
+                if not original_currency_code:
+                    logger.error(
+                        f"TwelveDataMarkets: Could not determine original currency for '{code_value}'."
+                    )
+                    continue
+
+                # Get the instrument's price in its native currency
+                price_params = {code_type: code_value, "apikey": self.api_key}
+                price_res = self.session.get(self.PRICE_URL, params=price_params)
+                price_res.raise_for_status()
+                price_data = price_res.json()
+
+                if "price" not in price_data:
+                    error_message = price_data.get(
+                        "message", "Price key not found in response"
+                    )
+                    logger.error(
+                        f"TwelveDataMarkets: Could not get price for {code_type} '{code_value}': {error_message}"
+                    )
+                    continue
+
+                price_in_original_currency = Decimal(price_data["price"])
+
+                # Convert price to the target exchange currency
+                target_exchange_currency = asset.exchange_currency
+
+                if (
+                    original_currency_code.upper()
+                    == target_exchange_currency.code.upper()
+                ):
+                    final_price = price_in_original_currency
+                else:
+                    rate_symbol = (
+                        f"{original_currency_code}/{target_exchange_currency.code}"
+                    )
+                    rate_params = {"symbol": rate_symbol, "apikey": self.api_key}
+                    rate_res = self.session.get(
+                        self.EXCHANGE_RATE_URL, params=rate_params
+                    )
+                    rate_res.raise_for_status()
+                    rate_data = rate_res.json()
+
+                    if "rate" not in rate_data:
+                        error_message = rate_data.get(
+                            "message", "Rate key not found in response"
+                        )
+                        logger.error(
+                            f"TwelveDataMarkets: Could not get conversion rate for '{rate_symbol}': {error_message}"
+                        )
+                        continue
+
+                    conversion_rate = Decimal(str(rate_data["rate"]))
+                    final_price = price_in_original_currency * conversion_rate
+
+                results.append((target_exchange_currency, asset, final_price))
+                logger.info(
+                    f"Successfully processed price for {asset.code} as {final_price} {target_exchange_currency.code}"
+                )
+
+                time.sleep(
+                    60
+                )  # We sleep every pair as to not step over TwelveData's minute limit
+
+            except requests.RequestException as e:
+                logger.error(
+                    f"TwelveDataMarkets: API request failed for {code_value}: {e}"
+                )
+            except (KeyError, IndexError) as e:
+                logger.error(
+                    f"TwelveDataMarkets: Error processing API response for {code_value}: {e}"
+                )
+            except Exception as e:
+                logger.error(
+                    f"TwelveDataMarkets: An unexpected error occurred for {code_value}: {e}"
+                )
+
+        return results

app/apps/currencies/forms.py

@@ -26,6 +26,7 @@ class CurrencyForm(forms.ModelForm):
             "suffix",
             "code",
             "exchange_currency",
+            "is_archived",
         ]
         widgets = {
             "exchange_currency": TomSelect(),
@@ -40,6 +41,7 @@ class CurrencyForm(forms.ModelForm):
         self.helper.layout = Layout(
             "code",
             "name",
+            Switch("is_archived"),
             "decimal_places",
             "prefix",
             "suffix",
@@ -114,6 +116,7 @@ class ExchangeRateServiceForm(forms.ModelForm):
             "fetch_interval",
             "target_currencies",
             "target_accounts",
+            "singleton",
         ]
 
     def __init__(self, *args, **kwargs):
@@ -126,6 +129,7 @@ class ExchangeRateServiceForm(forms.ModelForm):
             "name",
             "service_type",
             Switch("is_active"),
+            Switch("singleton"),
             "api_key",
             Row(
                 Column("interval_type", css_class="form-group col-md-6"),

app/apps/currencies/migrations/0015_exchangerate_automatic_exchangerateservice_singleton.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.4 on 2025-08-08 02:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('currencies', '0014_alter_currency_options'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='exchangerate',
+            name='automatic',
+            field=models.BooleanField(default=False, verbose_name='Automatic'),
+        ),
+        migrations.AddField(
+            model_name='exchangerateservice',
+            name='singleton',
+            field=models.BooleanField(default=False, help_text='Create one exchange rate and keep updating it. Avoids database clutter.', verbose_name='Single exchange rate'),
+        ),
+    ]

app/apps/currencies/migrations/0016_alter_exchangerate_automatic.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.4 on 2025-08-08 02:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('currencies', '0015_exchangerate_automatic_exchangerateservice_singleton'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exchangerate',
+            name='automatic',
+            field=models.BooleanField(default=False, verbose_name='Auto'),
+        ),
+    ]

app/apps/currencies/migrations/0017_alter_exchangerateservice_service_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-08-16 22:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('currencies', '0016_alter_exchangerate_automatic'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exchangerateservice',
+            name='service_type',
+            field=models.CharField(choices=[('synth_finance', 'Synth Finance'), ('synth_finance_stock', 'Synth Finance Stock'), ('coingecko_free', 'CoinGecko (Demo/Free)'), ('coingecko_pro', 'CoinGecko (Pro)'), ('transitive', 'Transitive (Calculated from Existing Rates)'), ('frankfurter', 'Frankfurter')], max_length=255, verbose_name='Service Type'),
+        ),
+    ]

app/apps/currencies/migrations/0018_alter_exchangerateservice_service_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-08-17 03:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('currencies', '0017_alter_exchangerateservice_service_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exchangerateservice',
+            name='service_type',
+            field=models.CharField(choices=[('synth_finance', 'Synth Finance'), ('synth_finance_stock', 'Synth Finance Stock'), ('coingecko_free', 'CoinGecko (Demo/Free)'), ('coingecko_pro', 'CoinGecko (Pro)'), ('transitive', 'Transitive (Calculated from Existing Rates)'), ('frankfurter', 'Frankfurter'), ('twelvedata', 'TwelveData')], max_length=255, verbose_name='Service Type'),
+        ),
+    ]

app/apps/currencies/migrations/0019_alter_exchangerateservice_service_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-08-17 06:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('currencies', '0018_alter_exchangerateservice_service_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exchangerateservice',
+            name='service_type',
+            field=models.CharField(choices=[('synth_finance', 'Synth Finance'), ('synth_finance_stock', 'Synth Finance Stock'), ('coingecko_free', 'CoinGecko (Demo/Free)'), ('coingecko_pro', 'CoinGecko (Pro)'), ('transitive', 'Transitive (Calculated from Existing Rates)'), ('frankfurter', 'Frankfurter'), ('twelvedata', 'TwelveData'), ('twelvedatamarkets', 'TwelveData Markets')], max_length=255, verbose_name='Service Type'),
+        ),
+    ]

app/apps/currencies/migrations/0020_migrate_synth_finance_services.py

@@ -0,0 +1,51 @@
+# Generated by Django 5.2.5 on 2025-08-17 06:25
+
+from django.db import migrations
+
+# The new value we are migrating to
+NEW_SERVICE_TYPE = "frankfurter"
+# The old values we are deprecating
+OLD_SERVICE_TYPE_TO_UPDATE = "synth_finance"
+OLD_SERVICE_TYPE_TO_DELETE = "synth_finance_stock"
+
+
+def forwards_func(apps, schema_editor):
+    """
+    Forward migration:
+    - Deletes all ExchangeRateService instances with service_type 'synth_finance_stock'.
+    - Updates all ExchangeRateService instances with service_type 'synth_finance' to 'frankfurter'.
+    """
+    ExchangeRateService = apps.get_model("currencies", "ExchangeRateService")
+    db_alias = schema_editor.connection.alias
+
+    # 1. Delete the SYNTH_FINANCE_STOCK entries
+    ExchangeRateService.objects.using(db_alias).filter(
+        service_type=OLD_SERVICE_TYPE_TO_DELETE
+    ).delete()
+
+    # 2. Update the SYNTH_FINANCE entries to FRANKFURTER
+    ExchangeRateService.objects.using(db_alias).filter(
+        service_type=OLD_SERVICE_TYPE_TO_UPDATE
+    ).update(service_type=NEW_SERVICE_TYPE, api_key=None)
+
+
+def backwards_func(apps, schema_editor):
+    """
+    Backward migration: This operation is not safely reversible.
+    - We cannot know which 'frankfurter' services were originally 'synth_finance'.
+    - The deleted 'synth_finance_stock' services cannot be recovered.
+    We will leave this function empty to allow migrating backwards without doing anything.
+    """
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        # Add the previous migration file here
+        ("currencies", "0019_alter_exchangerateservice_service_type"),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_code=backwards_func),
+    ]

app/apps/currencies/migrations/0021_alter_exchangerateservice_service_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-08-17 06:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('currencies', '0020_migrate_synth_finance_services'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exchangerateservice',
+            name='service_type',
+            field=models.CharField(choices=[('coingecko_free', 'CoinGecko (Demo/Free)'), ('coingecko_pro', 'CoinGecko (Pro)'), ('transitive', 'Transitive (Calculated from Existing Rates)'), ('frankfurter', 'Frankfurter'), ('twelvedata', 'TwelveData'), ('twelvedatamarkets', 'TwelveData Markets')], max_length=255, verbose_name='Service Type'),
+        ),
+    ]

app/apps/currencies/migrations/0022_currency_is_archived.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-08-30 00:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('currencies', '0021_alter_exchangerateservice_service_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='currency',
+            name='is_archived',
+            field=models.BooleanField(default=False, verbose_name='Archived'),
+        ),
+    ]

app/apps/currencies/models.py

@@ -32,6 +32,11 @@ class Currency(models.Model):
         help_text=_("Default currency for exchange calculations"),
     )
 
+    is_archived = models.BooleanField(
+        default=False,
+        verbose_name=_("Archived"),
+    )
+
     def __str__(self):
         return self.name
 
@@ -70,6 +75,8 @@ class ExchangeRate(models.Model):
     )
     date = models.DateTimeField(verbose_name=_("Date and Time"))
 
+    automatic = models.BooleanField(verbose_name=_("Auto"), default=False)
+
     class Meta:
         verbose_name = _("Exchange Rate")
         verbose_name_plural = _("Exchange Rates")
@@ -92,11 +99,12 @@ class ExchangeRateService(models.Model):
     """Configuration for exchange rate services"""
 
     class ServiceType(models.TextChoices):
-        SYNTH_FINANCE = "synth_finance", "Synth Finance"
-        SYNTH_FINANCE_STOCK = "synth_finance_stock", "Synth Finance Stock"
         COINGECKO_FREE = "coingecko_free", "CoinGecko (Demo/Free)"
         COINGECKO_PRO = "coingecko_pro", "CoinGecko (Pro)"
         TRANSITIVE = "transitive", "Transitive (Calculated from Existing Rates)"
+        FRANKFURTER = "frankfurter", "Frankfurter"
+        TWELVEDATA = "twelvedata", "TwelveData"
+        TWELVEDATA_MARKETS = "twelvedatamarkets", "TwelveData Markets"
 
     class IntervalType(models.TextChoices):
         ON = "on", _("On")
@@ -148,6 +156,14 @@ class ExchangeRateService(models.Model):
         blank=True,
     )
 
+    singleton = models.BooleanField(
+        verbose_name=_("Single exchange rate"),
+        default=False,
+        help_text=_(
+            "Create one exchange rate and keep updating it. Avoids database clutter."
+        ),
+    )
+
     class Meta:
         verbose_name = _("Exchange Rate Service")
         verbose_name_plural = _("Exchange Rate Services")

app/apps/currencies/tests.py

@@ -4,12 +4,8 @@ from django.core.exceptions import ValidationError
 from django.db import IntegrityError
 from django.test import TestCase
 from django.utils import timezone
-from django.contrib.auth.models import User # Added for ERS owner
-from datetime import date # Added for CurrencyConversionUtilsTests
-from apps.currencies.utils.convert import get_exchange_rate, convert # Added convert
-from unittest.mock import patch # Added patch
 
-from apps.currencies.models import Currency, ExchangeRate, ExchangeRateService
+from apps.currencies.models import Currency, ExchangeRate
 
 
 class CurrencyTests(TestCase):
@@ -44,175 +40,12 @@ class CurrencyTests(TestCase):
         with self.assertRaises(ValidationError):
             currency.full_clean()
 
-    def test_currency_unique_code(self):
-        """Test that currency codes must be unique"""
-        Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
-        with self.assertRaises(IntegrityError):
-            Currency.objects.create(code="USD", name="Another Dollar", decimal_places=2)
-
     def test_currency_unique_name(self):
         """Test that currency names must be unique"""
         Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
         with self.assertRaises(IntegrityError):
             Currency.objects.create(code="USD2", name="US Dollar", decimal_places=2)
 
-    def test_currency_exchange_currency_cannot_be_self(self):
-        """Test that a currency's exchange_currency cannot be itself."""
-        currency = Currency.objects.create(
-            code="XYZ", name="Test XYZ", decimal_places=2
-        )
-        currency.exchange_currency = currency  # Set exchange_currency to self
-
-        with self.assertRaises(ValidationError) as cm:
-            currency.full_clean()
-
-        self.assertIn('exchange_currency', cm.exception.error_dict)
-        # Optionally, check for a specific error message if known:
-        # self.assertTrue(any("cannot be the same as the currency itself" in e.message
-        #                     for e in cm.exception.error_dict['exchange_currency']))
-
-
-class ExchangeRateServiceTests(TestCase):
-    def setUp(self):
-        self.owner = User.objects.create_user(username='ers_owner', password='password123')
-        self.base_currency = Currency.objects.create(code="BSC", name="Base Service Coin", decimal_places=2)
-        self.default_ers_params = {
-            'name': "Test ERS",
-            'owner': self.owner,
-            'base_currency': self.base_currency,
-            'provider_class': "dummy.provider.ClassName", # Placeholder
-        }
-
-    def _create_ers_instance(self, interval_type, fetch_interval, **kwargs):
-        params = {**self.default_ers_params, 'interval_type': interval_type, 'fetch_interval': fetch_interval, **kwargs}
-        return ExchangeRateService(**params)
-
-    # Tests for IntervalType.EVERY
-    def test_ers_interval_every_valid_integer(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.EVERY, "12")
-        try:
-            ers.full_clean()
-        except ValidationError:
-            self.fail("ValidationError raised unexpectedly for valid 'EVERY' interval '12'.")
-
-    def test_ers_interval_every_invalid_not_integer(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.EVERY, "abc")
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_every_invalid_too_low(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.EVERY, "0")
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_every_invalid_too_high(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.EVERY, "25") # Max is 24 for 'EVERY'
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    # Tests for IntervalType.ON (and by extension NOT_ON, as validation logic is shared)
-    def test_ers_interval_on_not_on_valid_single_hour(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "5")
-        try:
-            ers.full_clean() # Should normalize to "5" if not already
-        except ValidationError:
-            self.fail("ValidationError raised unexpectedly for valid 'ON' interval '5'.")
-        self.assertEqual(ers.fetch_interval, "5")
-
-
-    def test_ers_interval_on_not_on_valid_multiple_hours(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "1,8,22")
-        try:
-            ers.full_clean()
-        except ValidationError:
-            self.fail("ValidationError raised unexpectedly for valid 'ON' interval '1,8,22'.")
-        self.assertEqual(ers.fetch_interval, "1,8,22")
-
-
-    def test_ers_interval_on_not_on_valid_range(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "0-4")
-        ers.full_clean() # Should not raise ValidationError
-        self.assertEqual(ers.fetch_interval, "0,1,2,3,4")
-
-    def test_ers_interval_on_not_on_valid_mixed(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "1-3,8,10-12")
-        ers.full_clean() # Should not raise ValidationError
-        self.assertEqual(ers.fetch_interval, "1,2,3,8,10,11,12")
-
-    def test_ers_interval_on_not_on_invalid_char(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "1-3,a")
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_on_not_on_invalid_hour_too_high(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "24") # Max is 23 for 'ON' type hours
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_on_not_on_invalid_range_format(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "5-1")
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_on_not_on_invalid_range_value_too_high(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "20-24") # 24 is invalid hour
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    def test_ers_interval_on_not_on_empty_interval(self):
-        ers = self._create_ers_instance(ExchangeRateService.IntervalType.ON, "")
-        with self.assertRaises(ValidationError) as cm:
-            ers.full_clean()
-        self.assertIn('fetch_interval', cm.exception.error_dict)
-
-    @patch('apps.currencies.exchange_rates.fetcher.PROVIDER_MAPPING')
-    def test_get_provider_valid_service_type(self, mock_provider_mapping):
-        """Test get_provider returns a configured provider instance for a valid service_type."""
-
-        class MockSynthFinanceProvider:
-            def __init__(self, key):
-                self.key = key
-
-        # Configure the mock PROVIDER_MAPPING
-        mock_provider_mapping.get.return_value = MockSynthFinanceProvider
-
-        service_instance = self._create_ers_instance(
-            interval_type=ExchangeRateService.IntervalType.EVERY, # Needs some valid interval type
-            fetch_interval="1", # Needs some valid fetch interval
-            service_type=ExchangeRateService.ServiceType.SYNTH_FINANCE,
-            api_key="test_key"
-        )
-        # Ensure the service_type is correctly passed to the mock
-        # The actual get_provider method uses PROVIDER_MAPPING[self.service_type]
-        # So, we should make the mock_provider_mapping behave like a dict for the specific key
-        mock_provider_mapping = {ExchangeRateService.ServiceType.SYNTH_FINANCE: MockSynthFinanceProvider}
-
-        with patch('apps.currencies.exchange_rates.fetcher.PROVIDER_MAPPING', mock_provider_mapping):
-            provider = service_instance.get_provider()
-
-        self.assertIsInstance(provider, MockSynthFinanceProvider)
-        self.assertEqual(provider.key, "test_key")
-
-    @patch('apps.currencies.exchange_rates.fetcher.PROVIDER_MAPPING', {}) # Empty mapping
-    def test_get_provider_invalid_service_type(self, mock_provider_mapping_empty):
-        """Test get_provider raises KeyError for an invalid or unmapped service_type."""
-        service_instance = self._create_ers_instance(
-            interval_type=ExchangeRateService.IntervalType.EVERY,
-            fetch_interval="1",
-            service_type="UNMAPPED_SERVICE_TYPE", # A type not in the (mocked) mapping
-            api_key="any_key"
-        )
-
-        with self.assertRaises(KeyError):
-            service_instance.get_provider()
-
 
 class ExchangeRateTests(TestCase):
     def setUp(self):
@@ -244,169 +77,10 @@ class ExchangeRateTests(TestCase):
             rate=Decimal("0.85"),
             date=date,
         )
-        with self.assertRaises(IntegrityError):
+        with self.assertRaises(Exception):  # Could be IntegrityError
             ExchangeRate.objects.create(
                 from_currency=self.usd,
                 to_currency=self.eur,
                 rate=Decimal("0.86"),
                 date=date,
             )
-
-    def test_from_and_to_currency_cannot_be_same(self):
-        """Test that from_currency and to_currency cannot be the same."""
-        with self.assertRaises(ValidationError) as cm:
-            rate = ExchangeRate(
-                from_currency=self.usd,
-                to_currency=self.usd,  # Same as from_currency
-                rate=Decimal("1.00"),
-                date=timezone.now().date(),
-            )
-            rate.full_clean()
-
-        # Check if the error message is as expected or if the error is associated with a specific field.
-        # The exact key ('to_currency' or '__all__') depends on how the model's clean() method is implemented.
-        # Assuming the validation error is raised with a message like "From and to currency cannot be the same."
-        # and is a non-field error or specifically tied to 'to_currency'.
-        self.assertTrue(
-            '__all__' in cm.exception.error_dict or 'to_currency' in cm.exception.error_dict,
-            "ValidationError should be for '__all__' or 'to_currency'"
-        )
-        # Optionally, check for a specific message if it's consistent:
-        # found_message = False
-        # if '__all__' in cm.exception.error_dict:
-        #     found_message = any("cannot be the same" in e.message for e in cm.exception.error_dict['__all__'])
-        # if not found_message and 'to_currency' in cm.exception.error_dict:
-        #     found_message = any("cannot be the same" in e.message for e in cm.exception.error_dict['to_currency'])
-        # self.assertTrue(found_message, "Error message about currencies being the same not found.")
-
-
-class CurrencyConversionUtilsTests(TestCase):
-    def setUp(self):
-        self.usd = Currency.objects.create(code="USD", name="US Dollar", decimal_places=2, prefix="$", suffix="")
-        self.eur = Currency.objects.create(code="EUR", name="Euro", decimal_places=2, prefix="€", suffix="")
-        self.gbp = Currency.objects.create(code="GBP", name="British Pound", decimal_places=2, prefix="£", suffix="")
-
-        # Rates for USD <-> EUR
-        self.usd_eur_rate_10th = ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.90"), date=date(2023, 1, 10))
-        self.usd_eur_rate_15th = ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.92"), date=date(2023, 1, 15))
-        ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.88"), date=date(2023, 1, 5))
-
-        # Rate for GBP <-> USD (for inverse lookup)
-        self.gbp_usd_rate_10th = ExchangeRate.objects.create(from_currency=self.gbp, to_currency=self.usd, rate=Decimal("1.25"), date=date(2023, 1, 10))
-
-    def test_get_direct_rate_closest_date(self):
-        """Test fetching a direct rate, ensuring the closest date is chosen."""
-        result = get_exchange_rate(self.usd, self.eur, date(2023, 1, 16))
-        self.assertIsNotNone(result)
-        self.assertEqual(result.effective_rate, Decimal("0.92"))
-        self.assertEqual(result.original_from_currency, self.usd)
-        self.assertEqual(result.original_to_currency, self.eur)
-
-    def test_get_inverse_rate_closest_date(self):
-        """Test fetching an inverse rate, ensuring the closest date and correct calculation."""
-        # We are looking for USD to GBP. We have GBP to USD on 2023-01-10.
-        # Target date is 2023-01-12.
-        result = get_exchange_rate(self.usd, self.gbp, date(2023, 1, 12))
-        self.assertIsNotNone(result)
-        self.assertEqual(result.effective_rate, Decimal("1") / self.gbp_usd_rate_10th.rate)
-        self.assertEqual(result.original_from_currency, self.gbp) # original_from_currency should be GBP
-        self.assertEqual(result.original_to_currency, self.usd)   # original_to_currency should be USD
-
-    def test_get_rate_exact_date_preference(self):
-        """Test that an exact date match is preferred over a closer one."""
-        # Existing rate is on 2023-01-15 (0.92)
-        # Add an exact match for the query date
-        exact_date_rate = ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.91"), date=date(2023, 1, 16))
-
-        result = get_exchange_rate(self.usd, self.eur, date(2023, 1, 16))
-        self.assertIsNotNone(result)
-        self.assertEqual(result.effective_rate, Decimal("0.91"))
-        self.assertEqual(result.original_from_currency, self.usd)
-        self.assertEqual(result.original_to_currency, self.eur)
-
-    def test_get_rate_no_matching_pair(self):
-        """Test that None is returned if no direct or inverse rate exists between the pair."""
-        # No rates exist for EUR <-> GBP in the setUp
-        result = get_exchange_rate(self.eur, self.gbp, date(2023, 1, 10))
-        self.assertIsNone(result)
-
-    def test_get_rate_prefer_direct_over_inverse_same_diff(self):
-        """Test that a direct rate is preferred over an inverse if date differences are equal."""
-        # We have GBP-USD on 2023-01-10 (self.gbp_usd_rate_10th)
-        # This means an inverse USD-GBP rate is available for 2023-01-10.
-        # Add a direct USD-GBP rate for the same date.
-        direct_usd_gbp_rate = ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.gbp, rate=Decimal("0.80"), date=date(2023, 1, 10))
-
-        result = get_exchange_rate(self.usd, self.gbp, date(2023, 1, 10))
-        self.assertIsNotNone(result)
-        self.assertEqual(result.effective_rate, Decimal("0.80"))
-        self.assertEqual(result.original_from_currency, self.usd)
-        self.assertEqual(result.original_to_currency, self.gbp)
-
-        # Now test the EUR to USD case from the problem description
-        # Add EUR to USD, rate 1.1, date 2023-01-10
-        eur_usd_direct_rate = ExchangeRate.objects.create(from_currency=self.eur, to_currency=self.usd, rate=Decimal("1.1"), date=date(2023, 1, 10))
-        # We also have USD to EUR on 2023-01-10 (rate 0.90), which would be an inverse match for EUR to USD.
-
-        result_eur_usd = get_exchange_rate(self.eur, self.usd, date(2023, 1, 10))
-        self.assertIsNotNone(result_eur_usd)
-        self.assertEqual(result_eur_usd.effective_rate, Decimal("1.1"))
-        self.assertEqual(result_eur_usd.original_from_currency, self.eur)
-        self.assertEqual(result_eur_usd.original_to_currency, self.usd)
-
-    def test_convert_successful_direct(self):
-        """Test successful conversion using a direct rate."""
-        # Uses self.usd_eur_rate_15th (0.92) as it's closest to 2023-01-16
-        converted_amount, prefix, suffix, dp = convert(Decimal('100'), self.usd, self.eur, date(2023, 1, 16))
-        self.assertEqual(converted_amount, Decimal('92.00'))
-        self.assertEqual(prefix, self.eur.prefix)
-        self.assertEqual(suffix, self.eur.suffix)
-        self.assertEqual(dp, self.eur.decimal_places)
-
-    def test_convert_successful_inverse(self):
-        """Test successful conversion using an inverse rate."""
-        # Uses self.gbp_usd_rate_10th (GBP to USD @ 1.25), so USD to GBP is 1/1.25 = 0.8
-        # Target date 2023-01-12, closest is 2023-01-10
-        converted_amount, prefix, suffix, dp = convert(Decimal('100'), self.usd, self.gbp, date(2023, 1, 12))
-        expected_amount = Decimal('100') * (Decimal('1') / self.gbp_usd_rate_10th.rate)
-        self.assertEqual(converted_amount, expected_amount.quantize(Decimal('0.01')))
-        self.assertEqual(prefix, self.gbp.prefix)
-        self.assertEqual(suffix, self.gbp.suffix)
-        self.assertEqual(dp, self.gbp.decimal_places)
-
-    def test_convert_no_rate_found(self):
-        """Test conversion when no exchange rate is found."""
-        result_tuple = convert(Decimal('100'), self.eur, self.gbp, date(2023, 1, 10))
-        self.assertEqual(result_tuple, (None, None, None, None))
-
-    def test_convert_same_currency(self):
-        """Test conversion when from_currency and to_currency are the same."""
-        result_tuple = convert(Decimal('100'), self.usd, self.usd, date(2023, 1, 10))
-        self.assertEqual(result_tuple, (None, None, None, None))
-
-    def test_convert_zero_amount(self):
-        """Test conversion when the amount is zero."""
-        result_tuple = convert(Decimal('0'), self.usd, self.eur, date(2023, 1, 10))
-        self.assertEqual(result_tuple, (None, None, None, None))
-
-    @patch('apps.currencies.utils.convert.timezone')
-    def test_convert_no_date_uses_today(self, mock_timezone):
-        """Test conversion uses today's date when no date is provided."""
-        # Mock timezone.now().date() to return a specific date
-        mock_today = date(2023, 1, 16)
-        mock_timezone.now.return_value.date.return_value = mock_today
-
-        # This should use self.usd_eur_rate_15th (0.92) as it's closest to mocked "today" (2023-01-16)
-        converted_amount, prefix, suffix, dp = convert(Decimal('100'), self.usd, self.eur)
-
-        self.assertEqual(converted_amount, Decimal('92.00'))
-        self.assertEqual(prefix, self.eur.prefix)
-        self.assertEqual(suffix, self.eur.suffix)
-        self.assertEqual(dp, self.eur.decimal_places)
-
-        # Verify that timezone.now().date() was called (indirectly, by get_exchange_rate)
-        # This specific assertion for get_exchange_rate being called with a specific date
-        # would require patching get_exchange_rate itself, which is more complex.
-        # For now, we rely on the correct outcome given the mocked date.
-        # A more direct way to test date passing is if convert took get_exchange_rate as a dependency.
-        mock_timezone.now.return_value.date.assert_called_once()

app/apps/dca/migrations/0004_alter_dcastrategy_owner_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.2.4 on 2025-07-28 02:15
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dca', '0003_dcastrategy_owner_dcastrategy_shared_with_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dcastrategy',
+            name='owner',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_owned', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AlterField(
+            model_name='dcastrategy',
+            name='shared_with',
+            field=models.ManyToManyField(blank=True, related_name='%(class)s_shared', to=settings.AUTH_USER_MODEL, verbose_name='Shared with users'),
+        ),
+        migrations.AlterField(
+            model_name='dcastrategy',
+            name='visibility',
+            field=models.CharField(choices=[('private', 'Private'), ('public', 'Public')], default='private', max_length=10, verbose_name='Visibility'),
+        ),
+    ]

app/apps/dca/tests.py

@@ -1,344 +1,3 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-from django.forms import NON_FIELD_ERRORS
-from apps.currencies.models import Currency
-from apps.dca.models import DCAStrategy, DCAEntry
-from apps.dca.forms import DCAStrategyForm, DCAEntryForm # Added DCAEntryForm
-from apps.accounts.models import Account, AccountGroup # Added Account models
-from apps.transactions.models import TransactionCategory, Transaction # Added Transaction models
-from decimal import Decimal
-from datetime import date
-from unittest.mock import patch
+from django.test import TestCase
 
-class DCATests(TestCase):
-    def setUp(self):
-        self.owner = User.objects.create_user(username='testowner', password='password123')
-        self.client = Client()
-        self.client.login(username='testowner', password='password123')
-
-        self.payment_curr = Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
-        self.target_curr = Currency.objects.create(code="BTC", name="Bitcoin", decimal_places=8)
-
-        # AccountGroup for accounts
-        self.account_group = AccountGroup.objects.create(name="DCA Test Group", owner=self.owner)
-
-        # Accounts for transactions
-        self.account1 = Account.objects.create(
-            name="Payment Account USD",
-            owner=self.owner,
-            currency=self.payment_curr,
-            group=self.account_group
-        )
-        self.account2 = Account.objects.create(
-            name="Target Account BTC",
-            owner=self.owner,
-            currency=self.target_curr,
-            group=self.account_group
-        )
-
-        # TransactionCategory for transactions
-        # Using INFO type as it's generic. TRANSFER might imply specific paired transaction logic not relevant here.
-        self.category1 = TransactionCategory.objects.create(
-            name="DCA Category",
-            owner=self.owner,
-            type=TransactionCategory.TransactionType.INFO
-        )
-
-
-        self.strategy1 = DCAStrategy.objects.create(
-            name="Test Strategy 1",
-            owner=self.owner,
-            payment_currency=self.payment_curr,
-            target_currency=self.target_curr
-        )
-
-        self.entries1 = [
-            DCAEntry.objects.create(
-                strategy=self.strategy1,
-                date=date(2023, 1, 1),
-                amount_paid=Decimal('100.00'),
-                amount_received=Decimal('0.010')
-            ),
-            DCAEntry.objects.create(
-                strategy=self.strategy1,
-                date=date(2023, 2, 1),
-                amount_paid=Decimal('150.00'),
-                amount_received=Decimal('0.012')
-            ),
-            DCAEntry.objects.create(
-                strategy=self.strategy1,
-                date=date(2023, 3, 1),
-                amount_paid=Decimal('120.00'),
-                amount_received=Decimal('0.008')
-            )
-        ]
-
-    def test_strategy_index_view_authenticated_user(self):
-        # Uses self.client and self.owner from setUp
-        response = self.client.get(reverse('dca:dca_strategy_index'))
-        self.assertEqual(response.status_code, 200)
-
-    def test_strategy_totals_and_average_price(self):
-        self.assertEqual(self.strategy1.total_entries(), 3)
-        self.assertEqual(self.strategy1.total_invested(), Decimal('370.00')) # 100 + 150 + 120
-        self.assertEqual(self.strategy1.total_received(), Decimal('0.030'))  # 0.01 + 0.012 + 0.008
-
-        expected_avg_price = Decimal('370.00') / Decimal('0.030')
-        # Match precision of the model method if it's specific, e.g. quantize
-        # For now, direct comparison. The model might return a Decimal that needs specific quantizing.
-        self.assertEqual(self.strategy1.average_entry_price(), expected_avg_price)
-
-    def test_strategy_average_price_no_received(self):
-        strategy2 = DCAStrategy.objects.create(
-            name="Test Strategy 2",
-            owner=self.owner,
-            payment_currency=self.payment_curr,
-            target_currency=self.target_curr
-        )
-        DCAEntry.objects.create(
-            strategy=strategy2,
-            date=date(2023, 4, 1),
-            amount_paid=Decimal('100.00'),
-            amount_received=Decimal('0') # Total received is zero
-        )
-        self.assertEqual(strategy2.total_received(), Decimal('0'))
-        self.assertEqual(strategy2.average_entry_price(), Decimal('0'))
-
-    @patch('apps.dca.models.convert')
-    def test_dca_entry_value_and_pl(self, mock_convert):
-        entry = self.entries1[0] # amount_paid=100, amount_received=0.010
-
-        # Simulate current price: 1 target_curr = 20,000 payment_curr
-        # So, 0.010 target_curr should be 0.010 * 20000 = 200 payment_curr
-        simulated_converted_value = entry.amount_received * Decimal('20000')
-        mock_convert.return_value = (
-            simulated_converted_value,
-            self.payment_curr.prefix,
-            self.payment_curr.suffix,
-            self.payment_curr.decimal_places
-        )
-
-        current_val = entry.current_value()
-        self.assertEqual(current_val, Decimal('200.00'))
-
-        # Profit/Loss = current_value - amount_paid = 200 - 100 = 100
-        self.assertEqual(entry.profit_loss(), Decimal('100.00'))
-
-        # P/L % = (profit_loss / amount_paid) * 100 = (100 / 100) * 100 = 100
-        self.assertEqual(entry.profit_loss_percentage(), Decimal('100.00'))
-
-        # Check that convert was called correctly by current_value()
-        # current_value calls convert(self.amount_received, self.strategy.target_currency, self.strategy.payment_currency)
-        # The date argument defaults to None if not passed, which is the case here.
-        mock_convert.assert_called_once_with(
-            entry.amount_received,
-            self.strategy1.target_currency,
-            self.strategy1.payment_currency,
-            None # Date argument is optional and defaults to None
-        )
-
-    @patch('apps.dca.models.convert')
-    def test_dca_strategy_value_and_pl(self, mock_convert):
-
-        def side_effect_func(amount_to_convert, from_currency, to_currency, date=None):
-            if from_currency == self.target_curr and to_currency == self.payment_curr:
-                # Simulate current price: 1 target_curr = 20,000 payment_curr
-                converted_value = amount_to_convert * Decimal('20000')
-                return (converted_value, self.payment_curr.prefix, self.payment_curr.suffix, self.payment_curr.decimal_places)
-            # Fallback for any other unexpected calls, though not expected in this test
-            return (Decimal('0'), '', '', 2)
-
-        mock_convert.side_effect = side_effect_func
-
-        # strategy1 entries:
-        # 1: paid 100, received 0.010. Current value = 0.010 * 20000 = 200
-        # 2: paid 150, received 0.012. Current value = 0.012 * 20000 = 240
-        # 3: paid 120, received 0.008. Current value = 0.008 * 20000 = 160
-        # Total current value = 200 + 240 + 160 = 600
-        self.assertEqual(self.strategy1.current_total_value(), Decimal('600.00'))
-
-        # Total invested = 100 + 150 + 120 = 370
-        # Total profit/loss = current_total_value - total_invested = 600 - 370 = 230
-        self.assertEqual(self.strategy1.total_profit_loss(), Decimal('230.00'))
-
-        # Total P/L % = (total_profit_loss / total_invested) * 100
-        # (230 / 370) * 100 = 62.162162...
-        expected_pl_percentage = (Decimal('230.00') / Decimal('370.00')) * Decimal('100')
-        self.assertAlmostEqual(self.strategy1.total_profit_loss_percentage(), expected_pl_percentage, places=2)
-
-    def test_dca_strategy_form_valid_data(self):
-        form_data = {
-            'name': 'Form Test Strategy',
-            'target_currency': self.target_curr.pk,
-            'payment_currency': self.payment_curr.pk
-        }
-        form = DCAStrategyForm(data=form_data)
-        self.assertTrue(form.is_valid(), form.errors.as_text())
-
-        strategy = form.save(commit=False)
-        strategy.owner = self.owner
-        strategy.save()
-
-        self.assertEqual(strategy.name, 'Form Test Strategy')
-        self.assertEqual(strategy.owner, self.owner)
-        self.assertEqual(strategy.target_currency, self.target_curr)
-        self.assertEqual(strategy.payment_currency, self.payment_curr)
-
-    def test_dca_strategy_form_missing_name(self):
-        form_data = {
-            'target_currency': self.target_curr.pk,
-            'payment_currency': self.payment_curr.pk
-        }
-        form = DCAStrategyForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn('name', form.errors)
-
-    def test_dca_strategy_form_missing_target_currency(self):
-        form_data = {
-            'name': 'Form Test Missing Target',
-            'payment_currency': self.payment_curr.pk
-        }
-        form = DCAStrategyForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn('target_currency', form.errors)
-
-    # Tests for DCAEntryForm clean method
-    def test_dca_entry_form_clean_create_transaction_missing_accounts(self):
-        data = {
-            'date': date(2023, 1, 1),
-            'amount_paid': Decimal('100.00'),
-            'amount_received': Decimal('0.01'),
-            'create_transaction': True,
-            # from_account and to_account are missing
-        }
-        form = DCAEntryForm(data=data, strategy=self.strategy1, owner=self.owner)
-        self.assertFalse(form.is_valid())
-        self.assertIn('from_account', form.errors)
-        self.assertIn('to_account', form.errors)
-
-    def test_dca_entry_form_clean_create_transaction_same_accounts(self):
-        data = {
-            'date': date(2023, 1, 1),
-            'amount_paid': Decimal('100.00'),
-            'amount_received': Decimal('0.01'),
-            'create_transaction': True,
-            'from_account': self.account1.pk,
-            'to_account': self.account1.pk, # Same as from_account
-            'from_category': self.category1.pk,
-            'to_category': self.category1.pk,
-        }
-        form = DCAEntryForm(data=data, strategy=self.strategy1, owner=self.owner)
-        self.assertFalse(form.is_valid())
-        # Check for non-field error or specific field error based on form implementation
-        self.assertTrue(NON_FIELD_ERRORS in form.errors or 'to_account' in form.errors)
-        if NON_FIELD_ERRORS in form.errors:
-             self.assertTrue(any("From and To accounts must be different" in error for error in form.errors[NON_FIELD_ERRORS]))
-
-
-    # Tests for DCAEntryForm save method
-    def test_dca_entry_form_save_create_transactions(self):
-        data = {
-            'date': date(2023, 5, 1),
-            'amount_paid': Decimal('200.00'),
-            'amount_received': Decimal('0.025'),
-            'create_transaction': True,
-            'from_account': self.account1.pk,
-            'to_account': self.account2.pk,
-            'from_category': self.category1.pk,
-            'to_category': self.category1.pk,
-            'description': 'Test DCA entry transaction creation'
-        }
-        form = DCAEntryForm(data=data, strategy=self.strategy1, owner=self.owner)
-
-        if not form.is_valid():
-            print(form.errors.as_json()) # Print errors if form is invalid
-        self.assertTrue(form.is_valid())
-
-        entry = form.save()
-
-        self.assertIsNotNone(entry.pk)
-        self.assertEqual(entry.strategy, self.strategy1)
-        self.assertIsNotNone(entry.expense_transaction)
-        self.assertIsNotNone(entry.income_transaction)
-
-        # Check expense transaction
-        expense_tx = entry.expense_transaction
-        self.assertEqual(expense_tx.account, self.account1)
-        self.assertEqual(expense_tx.type, Transaction.Type.EXPENSE)
-        self.assertEqual(expense_tx.amount, data['amount_paid'])
-        self.assertEqual(expense_tx.category, self.category1)
-        self.assertEqual(expense_tx.owner, self.owner)
-        self.assertEqual(expense_tx.date, data['date'])
-        self.assertIn(str(entry.id)[:8], expense_tx.description) # Check if part of entry ID is in description
-
-        # Check income transaction
-        income_tx = entry.income_transaction
-        self.assertEqual(income_tx.account, self.account2)
-        self.assertEqual(income_tx.type, Transaction.Type.INCOME)
-        self.assertEqual(income_tx.amount, data['amount_received'])
-        self.assertEqual(income_tx.category, self.category1)
-        self.assertEqual(income_tx.owner, self.owner)
-        self.assertEqual(income_tx.date, data['date'])
-        self.assertIn(str(entry.id)[:8], income_tx.description)
-
-
-    def test_dca_entry_form_save_update_linked_transactions(self):
-        # 1. Create an initial DCAEntry with linked transactions
-        initial_data = {
-            'date': date(2023, 6, 1),
-            'amount_paid': Decimal('50.00'),
-            'amount_received': Decimal('0.005'),
-            'create_transaction': True,
-            'from_account': self.account1.pk,
-            'to_account': self.account2.pk,
-            'from_category': self.category1.pk,
-            'to_category': self.category1.pk,
-        }
-        initial_form = DCAEntryForm(data=initial_data, strategy=self.strategy1, owner=self.owner)
-        self.assertTrue(initial_form.is_valid(), initial_form.errors.as_json())
-        initial_entry = initial_form.save()
-
-        self.assertIsNotNone(initial_entry.expense_transaction)
-        self.assertIsNotNone(initial_entry.income_transaction)
-
-        # 2. Data for updating the form
-        update_data = {
-            'date': initial_entry.date, # Keep date same or change, as needed
-            'amount_paid': Decimal('55.00'), # New value
-            'amount_received': Decimal('0.006'), # New value
-            # 'create_transaction': False, # Or not present, form should not create new if instance has linked tx
-            'from_account': initial_entry.expense_transaction.account.pk, # Keep same accounts
-            'to_account': initial_entry.income_transaction.account.pk,
-            'from_category': initial_entry.expense_transaction.category.pk,
-            'to_category': initial_entry.income_transaction.category.pk,
-        }
-
-        # When create_transaction is not checked (or False), it means we are not creating *new* transactions,
-        # but if the instance already has linked transactions, they *should* be updated.
-        # The form's save method should handle this.
-
-        update_form = DCAEntryForm(data=update_data, instance=initial_entry, strategy=initial_entry.strategy, owner=self.owner)
-
-        if not update_form.is_valid():
-            print(update_form.errors.as_json()) # Print errors if form is invalid
-        self.assertTrue(update_form.is_valid())
-
-        updated_entry = update_form.save()
-
-        # Refresh from DB to ensure changes are saved and reflected
-        updated_entry.refresh_from_db()
-        if updated_entry.expense_transaction: # Check if it exists before trying to refresh
-            updated_entry.expense_transaction.refresh_from_db()
-        if updated_entry.income_transaction: # Check if it exists before trying to refresh
-            updated_entry.income_transaction.refresh_from_db()
-
-
-        self.assertEqual(updated_entry.amount_paid, Decimal('55.00'))
-        self.assertEqual(updated_entry.amount_received, Decimal('0.006'))
-
-        self.assertIsNotNone(updated_entry.expense_transaction, "Expense transaction should still be linked.")
-        self.assertEqual(updated_entry.expense_transaction.amount, Decimal('55.00'))
-
-        self.assertIsNotNone(updated_entry.income_transaction, "Income transaction should still be linked.")
-        self.assertEqual(updated_entry.income_transaction.amount, Decimal('0.006'))
+# Create your tests here.

app/apps/export_app/tests.py

@@ -1,164 +1,3 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
-from unittest.mock import patch, MagicMock
-from io import BytesIO
-import zipfile # Added for zip file creation
-from django.core.files.uploadedfile import InMemoryUploadedFile # Added for file upload testing
+from django.test import TestCase
 
-# Dataset from tablib is not directly imported, its behavior will be mocked.
-# Resource classes are also mocked by path string.
-
-from apps.export_app.forms import ExportForm, RestoreForm # Added RestoreForm
-
-
-class ExportAppTests(TestCase):
-    def setUp(self):
-        self.superuser = User.objects.create_superuser(
-            username='super',
-            email='super@example.com',
-            password='password'
-        )
-        self.client = Client()
-        self.client.login(username='super', password='password')
-
-    @patch('apps.export_app.views.UserResource')
-    def test_export_form_single_selection_csv_response(self, mock_UserResource):
-        # Configure the mock UserResource
-        mock_user_resource_instance = mock_UserResource.return_value
-
-        # Mock the export() method's return value (which is a Dataset object)
-        # Then, mock the 'csv' attribute of this Dataset object
-        mock_dataset = MagicMock() # Using MagicMock for the dataset
-        mock_dataset.csv = "user_id,username\n1,testuser"
-        mock_user_resource_instance.export.return_value = mock_dataset
-
-        post_data = {'users': True} # Other fields default to False or their initial values
-
-        response = self.client.post(reverse('export_app:export_form'), data=post_data)
-
-        mock_user_resource_instance.export.assert_called_once()
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response['Content-Type'], 'text/csv')
-        self.assertIn("attachment; filename=", response['Content-Disposition'])
-        self.assertIn(".csv", response['Content-Disposition'])
-        # Check if the filename contains 'users'
-        self.assertIn("users_export_", response['Content-Disposition'].lower())
-        self.assertEqual(response.content.decode(), "user_id,username\n1,testuser")
-
-    @patch('apps.export_app.views.AccountResource') # Mock AccountResource first
-    @patch('apps.export_app.views.UserResource')   # Then UserResource
-    def test_export_form_multiple_selections_zip_response(self, mock_UserResource, mock_AccountResource):
-        # Configure UserResource mock
-        mock_user_instance = mock_UserResource.return_value
-        mock_user_dataset = MagicMock()
-        mock_user_dataset.csv = "user_data_here"
-        mock_user_instance.export.return_value = mock_user_dataset
-
-        # Configure AccountResource mock
-        mock_account_instance = mock_AccountResource.return_value
-        mock_account_dataset = MagicMock()
-        mock_account_dataset.csv = "account_data_here"
-        mock_account_instance.export.return_value = mock_account_dataset
-
-        post_data = {
-            'users': True,
-            'accounts': True
-            # other fields default to False or their initial values
-        }
-
-        response = self.client.post(reverse('export_app:export_form'), data=post_data)
-
-        mock_user_instance.export.assert_called_once()
-        mock_account_instance.export.assert_called_once()
-
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response['Content-Type'], 'application/zip')
-        self.assertIn("attachment; filename=", response['Content-Disposition'])
-        self.assertIn(".zip", response['Content-Disposition'])
-        # Add zip file content check if possible and required later
-
-    def test_export_form_no_selection(self):
-        # Get all field names from ExportForm and set them to False
-        # This ensures that if new export options are added, this test still tries to unselect them.
-        form_fields = ExportForm.base_fields.keys()
-        post_data = {field: False for field in form_fields}
-
-        response = self.client.post(reverse('export_app:export_form'), data=post_data)
-
-        self.assertEqual(response.status_code, 200)
-        # The expected message is "You have to select at least one export"
-        # This message is translatable, so using _() for comparison if the view returns translated string.
-        # The view returns HttpResponse(_("You have to select at least one export"))
-        self.assertEqual(response.content.decode('utf-8'), _("You have to select at least one export"))
-
-    # Placeholder for zip content check, if to be implemented
-    # import zipfile
-    # def test_zip_contents(self):
-    #     # ... (setup response with zip data) ...
-    #     with zipfile.ZipFile(BytesIO(response.content), 'r') as zipf:
-    #         self.assertIn('users.csv', zipf.namelist())
-    #         self.assertIn('accounts.csv', zipf.namelist())
-    #         user_csv_content = zipf.read('users.csv').decode()
-    #         self.assertEqual(user_csv_content, "user_data_here")
-    #         account_csv_content = zipf.read('accounts.csv').decode()
-    #         self.assertEqual(account_csv_content, "account_data_here")
-
-    @patch('apps.export_app.views.process_imports')
-    def test_import_form_valid_zip_calls_process_imports(self, mock_process_imports):
-        # Create a mock ZIP file content
-        zip_content_buffer = BytesIO()
-        with zipfile.ZipFile(zip_content_buffer, 'w') as zf:
-            zf.writestr('dummy.csv', 'some,data')
-        zip_content_buffer.seek(0)
-
-        # Create an InMemoryUploadedFile instance
-        mock_zip_file = InMemoryUploadedFile(
-            zip_content_buffer,
-            'zip_file',  # field_name
-            'test_export.zip',  # file_name
-            'application/zip',  # content_type
-            zip_content_buffer.getbuffer().nbytes,  # size
-            None  # charset
-        )
-
-        post_data = {'zip_file': mock_zip_file}
-        url = reverse('export_app:restore_form')
-
-        response = self.client.post(url, data=post_data, format='multipart')
-
-        mock_process_imports.assert_called_once()
-        # Check the second argument passed to process_imports (the form's cleaned_data['zip_file'])
-        # The first argument (args[0]) is the request object.
-        # The second argument (args[1]) is the form instance.
-        # We need to check the 'zip_file' attribute of the cleaned_data of the form instance.
-        # However, it's simpler to check the UploadedFile object directly if that's what process_imports receives.
-        # Based on the task: "The second argument to process_imports is form.cleaned_data['zip_file']"
-        # This means that process_imports is called as process_imports(request, form.cleaned_data['zip_file'], ...)
-        # Let's assume process_imports signature is process_imports(request, file_obj, ...)
-        # So, call_args[0][1] would be the file_obj.
-
-        # Actually, the view calls process_imports(request, form)
-        # So, we check form.cleaned_data['zip_file'] on the passed form instance
-        called_form_instance = mock_process_imports.call_args[0][1] # The form instance
-        self.assertEqual(called_form_instance.cleaned_data['zip_file'], mock_zip_file)
-
-        self.assertEqual(response.status_code, 204)
-        # The HX-Trigger header might have multiple values, ensure both are present
-        self.assertIn("hide_offcanvas", response.headers['HX-Trigger'])
-        self.assertIn("updated", response.headers['HX-Trigger'])
-
-
-    def test_import_form_no_file_selected(self):
-        post_data = {} # No file selected
-        url = reverse('export_app:restore_form')
-
-        response = self.client.post(url, data=post_data)
-
-        self.assertEqual(response.status_code, 200) # Form re-rendered with errors
-        # Check that the specific error message from RestoreForm.clean() is present
-        expected_error_message = _("Please upload either a ZIP file or at least one CSV file")
-        self.assertContains(response, expected_error_message)
-        # Also check for the HX-Trigger which is always set
-        self.assertIn("updated", response.headers['HX-Trigger'])
+# Create your tests here.

app/apps/import_app/tests.py

@@ -1,424 +1,3 @@
 from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
-import yaml
-from decimal import Decimal
-from datetime import date
 
-from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
-
-from apps.import_app.models import ImportProfile, ImportRun
-from apps.import_app.forms import ImportProfileForm
-from apps.import_app.services.v1 import ImportService
-from apps.import_app.schemas import version_1
-from apps.transactions.models import Transaction # For Transaction.Type
-from unittest.mock import patch
-import tempfile
-import os
-
-
-class ImportProfileTests(TestCase):
-
-    def test_import_profile_valid_yaml_v1(self):
-        valid_yaml_config = """
-settings:
-  file_type: csv
-  delimiter: ','
-  encoding: utf-8
-  skip_lines: 0
-  trigger_transaction_rules: true
-  importing: transactions
-mapping:
-  date:
-    target: date
-    source: Transaction Date
-    format: '%Y-%m-%d'
-  amount:
-    target: amount
-    source: Amount
-  description:
-    target: description
-    source: Narrative
-  account:
-    target: account
-    source: Account Name
-    type: name
-  type:
-    target: type
-    source: Credit Debit
-    detection_method: sign # Assumes positive is income, negative is expense
-  is_paid:
-    target: is_paid
-    detection_method: always_paid
-deduplication: []
-        """
-        profile = ImportProfile(
-            name="Test Valid Profile V1",
-            yaml_config=valid_yaml_config,
-            version=ImportProfile.Versions.VERSION_1
-        )
-        try:
-            profile.full_clean()
-        except ValidationError as e:
-            self.fail(f"Valid YAML config raised ValidationError: {e.error_dict}")
-
-        # Optional: Save and retrieve
-        profile.save()
-        retrieved_profile = ImportProfile.objects.get(pk=profile.pk)
-        self.assertIsNotNone(retrieved_profile)
-        self.assertEqual(retrieved_profile.name, "Test Valid Profile V1")
-
-    def test_import_profile_invalid_yaml_syntax_v1(self):
-        invalid_yaml = "settings: { file_type: csv, delimiter: ','" # Malformed YAML
-        profile = ImportProfile(
-            name="Test Invalid Syntax V1",
-            yaml_config=invalid_yaml,
-            version=ImportProfile.Versions.VERSION_1
-        )
-        with self.assertRaises(ValidationError) as cm:
-            profile.full_clean()
-
-        self.assertIn('yaml_config', cm.exception.error_dict)
-        self.assertTrue(any("YAML" in error.message.lower() or "syntax" in error.message.lower() for error in cm.exception.error_dict['yaml_config']))
-
-    def test_import_profile_schema_validation_error_v1(self):
-        schema_error_yaml = """
-settings:
-  file_type: csv
-  importing: transactions
-mapping:
-  date: # Missing 'format' which is required for TransactionDateMapping
-    target: date
-    source: Transaction Date
-        """
-        profile = ImportProfile(
-            name="Test Schema Error V1",
-            yaml_config=schema_error_yaml,
-            version=ImportProfile.Versions.VERSION_1
-        )
-        with self.assertRaises(ValidationError) as cm:
-            profile.full_clean()
-
-        self.assertIn('yaml_config', cm.exception.error_dict)
-        # Pydantic errors usually mention the field and "field required" or similar
-        self.assertTrue(any("format" in error.message.lower() and "field required" in error.message.lower()
-                            for error in cm.exception.error_dict['yaml_config']),
-                        f"Error messages: {[e.message for e in cm.exception.error_dict['yaml_config']]}")
-
-
-    def test_import_profile_custom_validate_mappings_error_v1(self):
-        custom_validate_yaml = """
-settings:
-  file_type: csv
-  importing: transactions # Importing transactions
-mapping:
-  account_name: # This is an AccountNameMapping, not suitable for 'transactions' importing setting
-    target: account_name
-    source: AccName
-        """
-        profile = ImportProfile(
-            name="Test Custom Validate Error V1",
-            yaml_config=custom_validate_yaml,
-            version=ImportProfile.Versions.VERSION_1
-        )
-        with self.assertRaises(ValidationError) as cm:
-            profile.full_clean()
-
-        self.assertIn('yaml_config', cm.exception.error_dict)
-        # Check for the specific message raised by custom_validate_mappings
-        # The message is "Mapping type AccountNameMapping not allowed for importing 'transactions'."
-        self.assertTrue(any("mapping type accountnamemapping not allowed for importing 'transactions'" in error.message.lower()
-                            for error in cm.exception.error_dict['yaml_config']),
-                        f"Error messages: {[e.message for e in cm.exception.error_dict['yaml_config']]}")
-
-
-    def test_import_profile_name_unique(self):
-        valid_yaml_config = """
-settings:
-  file_type: csv
-  importing: transactions
-mapping:
-  date:
-    target: date
-    source: Date
-    format: '%Y-%m-%d'
-        """ # Minimal valid YAML for this test
-
-        ImportProfile.objects.create(
-            name="Unique Name Test",
-            yaml_config=valid_yaml_config,
-            version=ImportProfile.Versions.VERSION_1
-        )
-
-        profile2 = ImportProfile(
-            name="Unique Name Test", # Same name
-            yaml_config=valid_yaml_config,
-            version=ImportProfile.Versions.VERSION_1
-        )
-
-        # full_clean should catch this because of the unique constraint on the model field.
-        # Django's Model.full_clean() calls Model.validate_unique().
-        with self.assertRaises(ValidationError) as cm:
-            profile2.full_clean()
-
-        self.assertIn('name', cm.exception.error_dict)
-        self.assertTrue(any("already exists" in error.message.lower() for error in cm.exception.error_dict['name']))
-
-        # As a fallback, or for more direct DB constraint testing, also test IntegrityError on save if full_clean didn't catch it.
-        # This will only be reached if the full_clean() above somehow passes.
-        # try:
-        #     profile2.save()
-        # except IntegrityError:
-        #     pass # Expected if full_clean didn't catch it
-        # else:
-        #     if 'name' not in cm.exception.error_dict: # If full_clean passed and save also passed
-        #         self.fail("IntegrityError not raised for duplicate name on save(), and full_clean() didn't catch it.")
-
-    def test_import_profile_form_valid_data(self):
-        valid_yaml_config = """
-settings:
-  file_type: csv
-  delimiter: ','
-  encoding: utf-8
-  skip_lines: 0
-  trigger_transaction_rules: true
-  importing: transactions
-mapping:
-  date:
-    target: date
-    source: Transaction Date
-    format: '%Y-%m-%d'
-  amount:
-    target: amount
-    source: Amount
-  description:
-    target: description
-    source: Narrative
-  account:
-    target: account
-    source: Account Name
-    type: name
-  type:
-    target: type
-    source: Credit Debit
-    detection_method: sign
-  is_paid:
-    target: is_paid
-    detection_method: always_paid
-deduplication: []
-        """
-        form_data = {
-            'name': 'Form Test Valid',
-            'yaml_config': valid_yaml_config,
-            'version': ImportProfile.Versions.VERSION_1
-        }
-        form = ImportProfileForm(data=form_data)
-        self.assertTrue(form.is_valid(), f"Form errors: {form.errors.as_json()}")
-
-        profile = form.save()
-        self.assertIsNotNone(profile.pk)
-        self.assertEqual(profile.name, 'Form Test Valid')
-        # YAMLField might re-serialize the YAML, so direct string comparison might be brittle
-        # if spacing/ordering changes. However, for now, let's assume it's stored as provided or close enough.
-        # A more robust check would be to load both YAMLs and compare the resulting dicts.
-        self.assertEqual(profile.yaml_config.strip(), valid_yaml_config.strip())
-        self.assertEqual(profile.version, ImportProfile.Versions.VERSION_1)
-
-    def test_import_profile_form_invalid_yaml(self):
-        # Using a YAML that causes a schema validation error (missing 'format' for date mapping)
-        invalid_yaml_for_form = """
-settings:
-  file_type: csv
-  importing: transactions
-mapping:
-  date:
-    target: date
-    source: Transaction Date
-        """
-        form_data = {
-            'name': 'Form Test Invalid',
-            'yaml_config': invalid_yaml_for_form,
-            'version': ImportProfile.Versions.VERSION_1
-        }
-        form = ImportProfileForm(data=form_data)
-        self.assertFalse(form.is_valid())
-        self.assertIn('yaml_config', form.errors)
-        # Check for a message indicating schema validation failure
-        self.assertTrue(any("field required" in error.lower() for error in form.errors['yaml_config']))
-
-
-class ImportServiceTests(TestCase):
-    # ... (existing setUp and other test methods from previous task) ...
-    def setUp(self):
-        minimal_yaml_config = """
-settings:
-  file_type: csv
-  importing: transactions
-mapping:
-  description:
-    target: description
-    source: Desc
-        """
-        self.profile = ImportProfile.objects.create(
-            name="Test Service Profile",
-            yaml_config=minimal_yaml_config,
-            version=ImportProfile.Versions.VERSION_1
-        )
-        self.import_run = ImportRun.objects.create(
-            profile=self.profile,
-            status=ImportRun.Status.PENDING
-        )
-        # self.service is initialized in each test to allow specific mapping_config
-        # or to re-initialize if service state changes (though it shouldn't for these private methods)
-
-    # Tests for _transform_value
-    def test_transform_value_replace(self):
-        service = ImportService(self.import_run)
-        mapping_config = version_1.ColumnMapping(target="description", source="Desc") # Basic mapping
-        mapping_config.transformations = [
-            version_1.ReplaceTransformationRule(type="replace", pattern="old", replacement="new")
-        ]
-        transformed_value = service._transform_value("this is old text", mapping_config)
-        self.assertEqual(transformed_value, "this is new text")
-
-    def test_transform_value_date_format(self):
-        service = ImportService(self.import_run)
-        # DateFormatTransformationRule is typically part of a DateMapping, but testing transform directly
-        mapping_config = version_1.TransactionDateMapping(target="date", source="Date", format="%d/%m/%Y") # format is for final coercion
-        mapping_config.transformations = [
-            version_1.DateFormatTransformationRule(type="date_format", original_format="%Y-%m-%d", new_format="%d/%m/%Y")
-        ]
-        transformed_value = service._transform_value("2023-01-15", mapping_config)
-        self.assertEqual(transformed_value, "15/01/2023")
-
-    def test_transform_value_regex_replace(self):
-        service = ImportService(self.import_run)
-        mapping_config = version_1.ColumnMapping(target="description", source="Desc")
-        mapping_config.transformations = [
-            version_1.ReplaceTransformationRule(type="regex", pattern=r"\\d+", replacement="NUM")
-        ]
-        transformed_value = service._transform_value("abc123xyz456", mapping_config)
-        self.assertEqual(transformed_value, "abcNUMxyzNUM")
-
-    # Tests for _coerce_type
-    def test_coerce_type_string_to_decimal(self):
-        service = ImportService(self.import_run)
-        # TransactionAmountMapping has coerce_to="positive_decimal" by default
-        mapping_config = version_1.TransactionAmountMapping(target="amount", source="Amt")
-
-        coerced = service._coerce_type("123.45", mapping_config)
-        self.assertEqual(coerced, Decimal("123.45"))
-
-        coerced_neg = service._coerce_type("-123.45", mapping_config)
-        self.assertEqual(coerced_neg, Decimal("123.45")) # positive_decimal behavior
-
-        # Test with coerce_to="decimal"
-        mapping_config_decimal = version_1.TransactionAmountMapping(target="amount", source="Amt", coerce_to="decimal")
-        coerced_neg_decimal = service._coerce_type("-123.45", mapping_config_decimal)
-        self.assertEqual(coerced_neg_decimal, Decimal("-123.45"))
-
-
-    def test_coerce_type_string_to_date(self):
-        service = ImportService(self.import_run)
-        mapping_config = version_1.TransactionDateMapping(target="date", source="Dt", format="%Y-%m-%d")
-        coerced = service._coerce_type("2023-01-15", mapping_config)
-        self.assertEqual(coerced, date(2023, 1, 15))
-
-    def test_coerce_type_string_to_transaction_type_sign(self):
-        service = ImportService(self.import_run)
-        mapping_config = version_1.TransactionTypeMapping(target="type", source="TType", detection_method="sign")
-
-        self.assertEqual(service._coerce_type("100.00", mapping_config), Transaction.Type.INCOME)
-        self.assertEqual(service._coerce_type("-100.00", mapping_config), Transaction.Type.EXPENSE)
-        self.assertEqual(service._coerce_type("0.00", mapping_config), Transaction.Type.EXPENSE) # Sign detection treats 0 as expense
-        self.assertEqual(service._coerce_type("+200", mapping_config), Transaction.Type.INCOME)
-
-    def test_coerce_type_string_to_transaction_type_keywords(self):
-        service = ImportService(self.import_run)
-        mapping_config = version_1.TransactionTypeMapping(
-            target="type",
-            source="TType",
-            detection_method="keywords",
-            income_keywords=["credit", "dep"],
-            expense_keywords=["debit", "wdrl"]
-        )
-        self.assertEqual(service._coerce_type("Monthly Credit", mapping_config), Transaction.Type.INCOME)
-        self.assertEqual(service._coerce_type("ATM WDRL", mapping_config), Transaction.Type.EXPENSE)
-        self.assertIsNone(service._coerce_type("Unknown Type", mapping_config)) # No keyword match
-
-    @patch('apps.import_app.services.v1.os.remove')
-    def test_process_file_simple_csv_transactions(self, mock_os_remove):
-        simple_transactions_yaml = """
-settings:
-  file_type: csv
-  importing: transactions
-  delimiter: ','
-  skip_lines: 0
-mapping:
-  date: {target: date, source: Date, format: '%Y-%m-%d'}
-  amount: {target: amount, source: Amount}
-  description: {target: description, source: Description}
-  type: {target: type, source: Type, detection_method: always_income}
-  account: {target: account, source: AccountName, type: name}
-"""
-        self.profile.yaml_config = simple_transactions_yaml
-        self.profile.save()
-        self.import_run.refresh_from_db() # Ensure import_run has the latest profile reference if needed
-
-        csv_content = "Date,Amount,Description,Type,AccountName\n2023-01-01,100.00,Test Deposit,INCOME,TestAcc"
-
-        temp_file_path = None
-        try:
-            # Ensure TEMP_DIR exists if ImportService relies on it being pre-existing
-            # For NamedTemporaryFile, dir just needs to be a valid directory path.
-            # If ImportService.TEMP_DIR is a class variable pointing to a specific path,
-            # it should be created or mocked if it doesn't exist by default.
-            # For simplicity, let's assume it exists or tempfile handles it gracefully.
-            # If ImportService.TEMP_DIR is not guaranteed, use default temp dir.
-            temp_dir = getattr(ImportService, 'TEMP_DIR', None)
-            if temp_dir and not os.path.exists(temp_dir):
-                os.makedirs(temp_dir, exist_ok=True)
-
-            with tempfile.NamedTemporaryFile(mode='w+', delete=False, dir=temp_dir, suffix='.csv', encoding='utf-8') as tmp_file:
-                tmp_file.write(csv_content)
-                temp_file_path = tmp_file.name
-
-            self.addCleanup(lambda: os.remove(temp_file_path) if temp_file_path and os.path.exists(temp_file_path) else None)
-
-            service = ImportService(self.import_run)
-
-            with patch.object(service, '_create_transaction') as mock_create_transaction:
-                service.process_file(temp_file_path)
-
-                self.import_run.refresh_from_db() # Refresh to get updated status and counts
-                self.assertEqual(self.import_run.status, ImportRun.Status.FINISHED)
-                self.assertEqual(self.import_run.total_rows, 1)
-                self.assertEqual(self.import_run.successful_rows, 1)
-
-                mock_create_transaction.assert_called_once()
-
-                # The first argument to _create_transaction is the row_data dictionary
-                args_dict = mock_create_transaction.call_args[0][0]
-
-                self.assertEqual(args_dict['date'], date(2023, 1, 1))
-                self.assertEqual(args_dict['amount'], Decimal('100.00'))
-                self.assertEqual(args_dict['description'], "Test Deposit")
-                self.assertEqual(args_dict['type'], Transaction.Type.INCOME)
-
-                # Account 'TestAcc' does not exist, so _map_row should resolve 'account' to None.
-                # This assumes the default behavior of AccountMapping(type='name') when an account is not found
-                # and creation of new accounts from mapping is not enabled/implemented in _map_row for this test.
-                self.assertIsNone(args_dict.get('account'),
-                                  "Account should be None as 'TestAcc' is not created in this test setup.")
-
-            mock_os_remove.assert_called_once_with(temp_file_path)
-
-        finally:
-            # This cleanup is now handled by self.addCleanup, but kept for safety if addCleanup fails early.
-            if temp_file_path and os.path.exists(temp_file_path) and not mock_os_remove.called:
-                 # If mock_os_remove was not called (e.g., an error before service.process_file finished),
-                 # we might need to manually clean up if addCleanup didn't register or run.
-                 # However, addCleanup is generally robust.
-                 pass
+# Create your tests here.

app/apps/insights/tests.py

@@ -1,303 +1,3 @@
 from django.test import TestCase
-from django.contrib.auth.models import User
-from django.utils.translation import gettext_lazy as _
-from decimal import Decimal
-from datetime import date, timedelta
 
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, Transaction
-from apps.insights.utils.category_explorer import get_category_sums_by_account, get_category_sums_by_currency
-from apps.insights.utils.sankey import generate_sankey_data_by_account
-
-class InsightsUtilsTests(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='testinsightsuser', password='password')
-
-        self.currency_usd = Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
-        self.currency_eur = Currency.objects.create(code="EUR", name="Euro", decimal_places=2)
-
-        # It's good practice to have an AccountGroup for accounts
-        self.account_group = AccountGroup.objects.create(name="Test Group", owner=self.user)
-
-        self.category_food = TransactionCategory.objects.create(name="Food", owner=self.user, type=TransactionCategory.TransactionType.EXPENSE)
-        self.category_salary = TransactionCategory.objects.create(name="Salary", owner=self.user, type=TransactionCategory.TransactionType.INCOME)
-
-        self.account_usd_1 = Account.objects.create(name="USD Account 1", owner=self.user, currency=self.currency_usd, group=self.account_group)
-        self.account_usd_2 = Account.objects.create(name="USD Account 2", owner=self.user, currency=self.currency_usd, group=self.account_group)
-        self.account_eur_1 = Account.objects.create(name="EUR Account 1", owner=self.user, currency=self.currency_eur, group=self.account_group)
-
-        today = date.today()
-
-        # T1: Acc USD1, Food, Expense 50 (paid)
-        Transaction.objects.create(
-            description="Groceries USD1 Food Paid", account=self.account_usd_1, category=self.category_food,
-            type=Transaction.Type.EXPENSE, amount=Decimal('50.00'), date=today, is_paid=True, owner=self.user
-        )
-        # T2: Acc USD1, Food, Expense 20 (unpaid/projected)
-        Transaction.objects.create(
-            description="Restaurant USD1 Food Unpaid", account=self.account_usd_1, category=self.category_food,
-            type=Transaction.Type.EXPENSE, amount=Decimal('20.00'), date=today, is_paid=False, owner=self.user
-        )
-        # T3: Acc USD2, Food, Expense 30 (paid)
-        Transaction.objects.create(
-            description="Snacks USD2 Food Paid", account=self.account_usd_2, category=self.category_food,
-            type=Transaction.Type.EXPENSE, amount=Decimal('30.00'), date=today, is_paid=True, owner=self.user
-        )
-        # T4: Acc USD1, Salary, Income 1000 (paid)
-        Transaction.objects.create(
-            description="Salary USD1 Paid", account=self.account_usd_1, category=self.category_salary,
-            type=Transaction.Type.INCOME, amount=Decimal('1000.00'), date=today, is_paid=True, owner=self.user
-        )
-        # T5: Acc EUR1, Food, Expense 40 (paid, different currency)
-        Transaction.objects.create(
-            description="Groceries EUR1 Food Paid", account=self.account_eur_1, category=self.category_food,
-            type=Transaction.Type.EXPENSE, amount=Decimal('40.00'), date=today, is_paid=True, owner=self.user
-        )
-        # T6: Acc USD2, Salary, Income 200 (unpaid/projected)
-        Transaction.objects.create(
-            description="Bonus USD2 Salary Unpaid", account=self.account_usd_2, category=self.category_salary,
-            type=Transaction.Type.INCOME, amount=Decimal('200.00'), date=today, is_paid=False, owner=self.user
-        )
-
-    def test_get_category_sums_by_account_for_food(self):
-        qs = Transaction.objects.filter(owner=self.user) # Filter by user for safety in shared DB environments
-        result = get_category_sums_by_account(qs, category=self.category_food)
-
-        expected_labels = sorted([self.account_eur_1.name, self.account_usd_1.name, self.account_usd_2.name])
-        self.assertEqual(result['labels'], expected_labels)
-
-        # Expected data structure: {account_name: {'current_income': D('0'), ...}, ...}
-        # Then the util function transforms this.
-        # Let's map labels to their expected index for easier assertion
-        label_to_idx = {name: i for i, name in enumerate(expected_labels)}
-
-        # Initialize expected data arrays based on sorted labels length
-        num_labels = len(expected_labels)
-        expected_current_income = [Decimal('0.00')] * num_labels
-        expected_current_expenses = [Decimal('0.00')] * num_labels
-        expected_projected_income = [Decimal('0.00')] * num_labels
-        expected_projected_expenses = [Decimal('0.00')] * num_labels
-
-        # Populate expected data based on transactions for FOOD category
-        # T1: Acc USD1, Food, Expense 50 (paid) -> account_usd_1, current_expenses = -50
-        expected_current_expenses[label_to_idx[self.account_usd_1.name]] = Decimal('-50.00')
-        # T2: Acc USD1, Food, Expense 20 (unpaid/projected) -> account_usd_1, projected_expenses = -20
-        expected_projected_expenses[label_to_idx[self.account_usd_1.name]] = Decimal('-20.00')
-        # T3: Acc USD2, Food, Expense 30 (paid) -> account_usd_2, current_expenses = -30
-        expected_current_expenses[label_to_idx[self.account_usd_2.name]] = Decimal('-30.00')
-        # T5: Acc EUR1, Food, Expense 40 (paid) -> account_eur_1, current_expenses = -40
-        expected_current_expenses[label_to_idx[self.account_eur_1.name]] = Decimal('-40.00')
-
-        self.assertEqual(result['datasets'][0]['data'], [float(x) for x in expected_current_income]) # Current Income
-        self.assertEqual(result['datasets'][1]['data'], [float(x) for x in expected_current_expenses]) # Current Expenses
-        self.assertEqual(result['datasets'][2]['data'], [float(x) for x in expected_projected_income]) # Projected Income
-        self.assertEqual(result['datasets'][3]['data'], [float(x) for x in expected_projected_expenses]) # Projected Expenses
-
-        self.assertEqual(result['datasets'][0]['label'], "Current Income")
-        self.assertEqual(result['datasets'][1]['label'], "Current Expenses")
-        self.assertEqual(result['datasets'][2]['label'], "Projected Income")
-        self.assertEqual(result['datasets'][3]['label'], "Projected Expenses")
-
-    def test_generate_sankey_data_by_account(self):
-        qs = Transaction.objects.filter(owner=self.user)
-        result = generate_sankey_data_by_account(qs)
-
-        nodes = result['nodes']
-        flows = result['flows']
-
-        # Helper to find a node by a unique part of its ID
-        def find_node_by_id_part(id_part):
-            found_nodes = [n for n in nodes if id_part in n['id']]
-            self.assertEqual(len(found_nodes), 1, f"Node with ID part '{id_part}' not found or not unique. Found: {found_nodes}")
-            return found_nodes[0]
-
-        # Helper to find a flow by unique parts of its source and target node IDs
-        def find_flow_by_node_id_parts(from_id_part, to_id_part):
-            found_flows = [
-                f for f in flows
-                if from_id_part in f['from_node'] and to_id_part in f['to_node']
-            ]
-            self.assertEqual(len(found_flows), 1, f"Flow from '{from_id_part}' to '{to_id_part}' not found or not unique. Found: {found_flows}")
-            return found_flows[0]
-
-        # Calculate total volumes by currency (sum of absolute amounts of ALL transactions)
-        total_volume_usd = sum(abs(t.amount) for t in qs if t.account.currency == self.currency_usd) # 50+20+30+1000+200 = 1300
-        total_volume_eur = sum(abs(t.amount) for t in qs if t.account.currency == self.currency_eur) # 40
-
-        self.assertEqual(total_volume_usd, Decimal('1300.00'))
-        self.assertEqual(total_volume_eur, Decimal('40.00'))
-
-        # --- Assertions for Account USD 1 ---
-        acc_usd_1_id_part = f"_{self.account_usd_1.id}"
-
-        node_income_salary_usd1 = find_node_by_id_part(f"income_{self.category_salary.name.lower()}{acc_usd_1_id_part}")
-        self.assertEqual(node_income_salary_usd1['name'], self.category_salary.name)
-
-        node_account_usd1 = find_node_by_id_part(f"account_{self.account_usd_1.name.lower().replace(' ', '_')}{acc_usd_1_id_part}")
-        self.assertEqual(node_account_usd1['name'], self.account_usd_1.name)
-
-        node_expense_food_usd1 = find_node_by_id_part(f"expense_{self.category_food.name.lower()}{acc_usd_1_id_part}")
-        self.assertEqual(node_expense_food_usd1['name'], self.category_food.name)
-
-        node_saved_usd1 = find_node_by_id_part(f"savings_saved{acc_usd_1_id_part}")
-        self.assertEqual(node_saved_usd1['name'], _("Saved"))
-
-        # Flow 1: Salary (T4) to account_usd_1
-        flow_salary_to_usd1 = find_flow_by_node_id_parts(node_income_salary_usd1['id'], node_account_usd1['id'])
-        self.assertEqual(flow_salary_to_usd1['original_amount'], 1000.0)
-        self.assertEqual(flow_salary_to_usd1['currency']['code'], self.currency_usd.code)
-        self.assertAlmostEqual(flow_salary_to_usd1['percentage'], (1000.0 / float(total_volume_usd)) * 100, places=2)
-        self.assertAlmostEqual(flow_salary_to_usd1['flow'], (1000.0 / float(total_volume_usd)), places=4)
-
-        # Flow 2: account_usd_1 to Food (T1)
-        flow_usd1_to_food = find_flow_by_node_id_parts(node_account_usd1['id'], node_expense_food_usd1['id'])
-        self.assertEqual(flow_usd1_to_food['original_amount'], 50.0) # T1 is 50
-        self.assertEqual(flow_usd1_to_food['currency']['code'], self.currency_usd.code)
-        self.assertAlmostEqual(flow_usd1_to_food['percentage'], (50.0 / float(total_volume_usd)) * 100, places=2)
-
-        # Flow 3: account_usd_1 to Saved
-        # Net paid for account_usd_1: 1000 (T4 income) - 50 (T1 expense) = 950
-        flow_usd1_to_saved = find_flow_by_node_id_parts(node_account_usd1['id'], node_saved_usd1['id'])
-        self.assertEqual(flow_usd1_to_saved['original_amount'], 950.0)
-        self.assertEqual(flow_usd1_to_saved['currency']['code'], self.currency_usd.code)
-        self.assertAlmostEqual(flow_usd1_to_saved['percentage'], (950.0 / float(total_volume_usd)) * 100, places=2)
-
-        # --- Assertions for Account USD 2 ---
-        acc_usd_2_id_part = f"_{self.account_usd_2.id}"
-        node_account_usd2 = find_node_by_id_part(f"account_{self.account_usd_2.name.lower().replace(' ', '_')}{acc_usd_2_id_part}")
-        node_expense_food_usd2 = find_node_by_id_part(f"expense_{self.category_food.name.lower()}{acc_usd_2_id_part}")
-        # T6 (Salary for USD2) is unpaid, so no income node/flow for it.
-        # Net paid for account_usd_2 is -30 (T3 expense). So no "Saved" node.
-
-        # Flow: account_usd_2 to Food (T3)
-        flow_usd2_to_food = find_flow_by_node_id_parts(node_account_usd2['id'], node_expense_food_usd2['id'])
-        self.assertEqual(flow_usd2_to_food['original_amount'], 30.0) # T3 is 30
-        self.assertEqual(flow_usd2_to_food['currency']['code'], self.currency_usd.code)
-        self.assertAlmostEqual(flow_usd2_to_food['percentage'], (30.0 / float(total_volume_usd)) * 100, places=2)
-
-        # Check no "Saved" node for account_usd_2
-        saved_nodes_usd2 = [n for n in nodes if f"savings_saved{acc_usd_2_id_part}" in n['id']]
-        self.assertEqual(len(saved_nodes_usd2), 0, "Should be no 'Saved' node for account_usd_2 as net is negative.")
-
-        # --- Assertions for Account EUR 1 ---
-        acc_eur_1_id_part = f"_{self.account_eur_1.id}"
-        node_account_eur1 = find_node_by_id_part(f"account_{self.account_eur_1.name.lower().replace(' ', '_')}{acc_eur_1_id_part}")
-        node_expense_food_eur1 = find_node_by_id_part(f"expense_{self.category_food.name.lower()}{acc_eur_1_id_part}")
-        # Net paid for account_eur_1 is -40 (T5 expense). No "Saved" node.
-
-        # Flow: account_eur_1 to Food (T5)
-        flow_eur1_to_food = find_flow_by_node_id_parts(node_account_eur1['id'], node_expense_food_eur1['id'])
-        self.assertEqual(flow_eur1_to_food['original_amount'], 40.0) # T5 is 40
-        self.assertEqual(flow_eur1_to_food['currency']['code'], self.currency_eur.code)
-        self.assertAlmostEqual(flow_eur1_to_food['percentage'], (40.0 / float(total_volume_eur)) * 100, places=2) # (40/40)*100 = 100%
-
-        # Check no "Saved" node for account_eur_1
-        saved_nodes_eur1 = [n for n in nodes if f"savings_saved{acc_eur_1_id_part}" in n['id']]
-        self.assertEqual(len(saved_nodes_eur1), 0, "Should be no 'Saved' node for account_eur_1 as net is negative.")
-
-    def test_get_category_sums_by_currency_for_food(self):
-        qs = Transaction.objects.filter(owner=self.user)
-        result = get_category_sums_by_currency(qs, category=self.category_food)
-
-        expected_labels = sorted([self.currency_eur.name, self.currency_usd.name])
-        self.assertEqual(result['labels'], expected_labels)
-
-        label_to_idx = {name: i for i, name in enumerate(expected_labels)}
-        num_labels = len(expected_labels)
-
-        expected_current_income = [Decimal('0.00')] * num_labels
-        expected_current_expenses = [Decimal('0.00')] * num_labels
-        expected_projected_income = [Decimal('0.00')] * num_labels
-        expected_projected_expenses = [Decimal('0.00')] * num_labels
-
-        # Food Transactions:
-        # T1: USD Account 1, Food, Expense 50 (paid)
-        # T2: USD Account 1, Food, Expense 20 (unpaid/projected)
-        # T3: USD Account 2, Food, Expense 30 (paid)
-        # T5: EUR Account 1, Food, Expense 40 (paid)
-
-        # Current Expenses:
-        expected_current_expenses[label_to_idx[self.currency_eur.name]] = Decimal('-40.00') # T5
-        expected_current_expenses[label_to_idx[self.currency_usd.name]] = Decimal('-50.00') + Decimal('-30.00') # T1 + T3
-
-        # Projected Expenses:
-        expected_projected_expenses[label_to_idx[self.currency_usd.name]] = Decimal('-20.00') # T2
-
-        self.assertEqual(result['datasets'][0]['data'], [float(x) for x in expected_current_income])
-        self.assertEqual(result['datasets'][1]['data'], [float(x) for x in expected_current_expenses])
-        self.assertEqual(result['datasets'][2]['data'], [float(x) for x in expected_projected_income])
-        self.assertEqual(result['datasets'][3]['data'], [float(x) for x in expected_projected_expenses])
-
-        self.assertEqual(result['datasets'][0]['label'], "Current Income")
-        self.assertEqual(result['datasets'][1]['label'], "Current Expenses")
-        self.assertEqual(result['datasets'][2]['label'], "Projected Income")
-        self.assertEqual(result['datasets'][3]['label'], "Projected Expenses")
-
-    def test_get_category_sums_by_currency_for_salary(self):
-        qs = Transaction.objects.filter(owner=self.user)
-        result = get_category_sums_by_currency(qs, category=self.category_salary)
-
-        # Salary Transactions:
-        # T4: USD Account 1, Salary, Income 1000 (paid)
-        # T6: USD Account 2, Salary, Income 200 (unpaid/projected)
-        # All are USD
-        expected_labels = [self.currency_usd.name] # Only USD has salary transactions
-        self.assertEqual(result['labels'], expected_labels)
-
-        label_to_idx = {name: i for i, name in enumerate(expected_labels)}
-        num_labels = len(expected_labels)
-
-        expected_current_income = [Decimal('0.00')] * num_labels
-        expected_current_expenses = [Decimal('0.00')] * num_labels
-        expected_projected_income = [Decimal('0.00')] * num_labels
-        expected_projected_expenses = [Decimal('0.00')] * num_labels
-
-        # Current Income:
-        expected_current_income[label_to_idx[self.currency_usd.name]] = Decimal('1000.00') # T4
-
-        # Projected Income:
-        expected_projected_income[label_to_idx[self.currency_usd.name]] = Decimal('200.00') # T6
-
-        self.assertEqual(result['datasets'][0]['data'], [float(x) for x in expected_current_income])
-        self.assertEqual(result['datasets'][1]['data'], [float(x) for x in expected_current_expenses])
-        self.assertEqual(result['datasets'][2]['data'], [float(x) for x in expected_projected_income])
-        self.assertEqual(result['datasets'][3]['data'], [float(x) for x in expected_projected_expenses])
-
-        self.assertEqual(result['datasets'][0]['label'], "Current Income")
-        self.assertEqual(result['datasets'][1]['label'], "Current Expenses")
-        self.assertEqual(result['datasets'][2]['label'], "Projected Income")
-        self.assertEqual(result['datasets'][3]['label'], "Projected Expenses")
-
-
-    def test_get_category_sums_by_account_for_salary(self):
-        qs = Transaction.objects.filter(owner=self.user)
-        result = get_category_sums_by_account(qs, category=self.category_salary)
-
-        # Only accounts with salary transactions should appear
-        expected_labels = sorted([self.account_usd_1.name, self.account_usd_2.name])
-        self.assertEqual(result['labels'], expected_labels)
-
-        label_to_idx = {name: i for i, name in enumerate(expected_labels)}
-        num_labels = len(expected_labels)
-
-        expected_current_income = [Decimal('0.00')] * num_labels
-        expected_current_expenses = [Decimal('0.00')] * num_labels
-        expected_projected_income = [Decimal('0.00')] * num_labels
-        expected_projected_expenses = [Decimal('0.00')] * num_labels
-
-        # Populate expected data based on transactions for SALARY category
-        # T4: Acc USD1, Salary, Income 1000 (paid) -> account_usd_1, current_income = 1000
-        expected_current_income[label_to_idx[self.account_usd_1.name]] = Decimal('1000.00')
-        # T6: Acc USD2, Salary, Income 200 (unpaid/projected) -> account_usd_2, projected_income = 200
-        expected_projected_income[label_to_idx[self.account_usd_2.name]] = Decimal('200.00')
-
-        self.assertEqual(result['datasets'][0]['data'], [float(x) for x in expected_current_income])
-        self.assertEqual(result['datasets'][1]['data'], [float(x) for x in expected_current_expenses])
-        self.assertEqual(result['datasets'][2]['data'], [float(x) for x in expected_projected_income])
-        self.assertEqual(result['datasets'][3]['data'], [float(x) for x in expected_projected_expenses])
-
-        self.assertEqual(result['datasets'][0]['label'], "Current Income")
-        self.assertEqual(result['datasets'][1]['label'], "Current Expenses")
-        self.assertEqual(result['datasets'][2]['label'], "Projected Income")
-        self.assertEqual(result['datasets'][3]['label'], "Projected Expenses")
+# Create your tests here.

app/apps/insights/utils/category_overview.py

@@ -9,8 +9,13 @@ from apps.currencies.models import Currency
 from apps.currencies.utils.convert import convert
 
 
-def get_categories_totals(transactions_queryset, ignore_empty=False):
-    # First get the category totals as before
+def get_categories_totals(
+    transactions_queryset, ignore_empty=False, show_entities=False
+):
+    # Step 1: Aggregate transaction data by category and currency.
+    # This query calculates the total current and projected income/expense for each
+    # category by grouping transactions and summing up their amounts based on their
+    # type (income/expense) and payment status (paid/unpaid).
     category_currency_metrics = (
         transactions_queryset.values(
             "category",
@@ -74,7 +79,10 @@ def get_categories_totals(transactions_queryset, ignore_empty=False):
         .order_by("category__name")
     )
 
-    # Get tag totals within each category with currency details
+    # Step 2: Aggregate transaction data by tag, category, and currency.
+    # This is similar to the category metrics but adds tags to the grouping,
+    # allowing for a breakdown of totals by tag within each category. It also
+    # handles untagged transactions, where the 'tags' field is None.
     tag_metrics = transactions_queryset.values(
         "category",
         "tags",
@@ -129,10 +137,12 @@ def get_categories_totals(transactions_queryset, ignore_empty=False):
         ),
     )
 
-    # Process the results to structure by category
+    # Step 3: Initialize the main dictionary to structure the final results.
+    # The data will be organized hierarchically: category -> currency -> tags -> entities.
     result = {}
 
-    # Process category totals first
+    # Step 4: Process the aggregated category metrics to build the initial result structure.
+    # This loop iterates through each category's metrics and populates the `result` dict.
     for metric in category_currency_metrics:
         # Skip empty categories if ignore_empty is True
         if ignore_empty and all(
@@ -183,7 +193,7 @@ def get_categories_totals(transactions_queryset, ignore_empty=False):
             "total_final": total_final,
         }
 
-        # Add exchanged values if exchange_currency exists
+        # Step 4a: Handle currency conversion for category totals if an exchange currency is defined.
         if metric["account__currency__exchange_currency"]:
             from_currency = Currency.objects.get(id=currency_id)
             exchange_currency = Currency.objects.get(
@@ -222,7 +232,7 @@ def get_categories_totals(transactions_queryset, ignore_empty=False):
 
         result[category_id]["currencies"][currency_id] = currency_data
 
-    # Process tag totals and add them to the result, including untagged
+    # Step 5: Process the aggregated tag metrics and integrate them into the result structure.
     for tag_metric in tag_metrics:
         category_id = tag_metric["category"]
         tag_id = tag_metric["tags"]  # Will be None for untagged transactions
@@ -240,6 +250,7 @@ def get_categories_totals(transactions_queryset, ignore_empty=False):
                 result[category_id]["tags"][tag_key] = {
                     "name": tag_name,
                     "currencies": {},
+                    "entities": {},
                 }
 
             currency_id = tag_metric["account__currency"]
@@ -278,7 +289,7 @@ def get_categories_totals(transactions_queryset, ignore_empty=False):
                 "total_final": tag_total_final,
             }
 
-            # Add exchange currency support for tags
+            # Step 5a: Handle currency conversion for tag totals.
             if tag_metric["account__currency__exchange_currency"]:
                 from_currency = Currency.objects.get(id=currency_id)
                 exchange_currency = Currency.objects.get(
@@ -319,4 +330,175 @@ def get_categories_totals(transactions_queryset, ignore_empty=False):
                 currency_id
             ] = tag_currency_data
 
+    # Step 6: If requested, aggregate and process entity-level data.
+    if show_entities:
+        entity_metrics = transactions_queryset.values(
+            "category",
+            "tags",
+            "entities",
+            "entities__name",
+            "account__currency",
+            "account__currency__code",
+            "account__currency__name",
+            "account__currency__decimal_places",
+            "account__currency__prefix",
+            "account__currency__suffix",
+            "account__currency__exchange_currency",
+        ).annotate(
+            expense_current=Coalesce(
+                Sum(
+                    Case(
+                        When(
+                            type=Transaction.Type.EXPENSE, is_paid=True, then="amount"
+                        ),
+                        default=Value(0),
+                        output_field=models.DecimalField(),
+                    )
+                ),
+                Decimal("0"),
+            ),
+            expense_projected=Coalesce(
+                Sum(
+                    Case(
+                        When(
+                            type=Transaction.Type.EXPENSE, is_paid=False, then="amount"
+                        ),
+                        default=Value(0),
+                        output_field=models.DecimalField(),
+                    )
+                ),
+                Decimal("0"),
+            ),
+            income_current=Coalesce(
+                Sum(
+                    Case(
+                        When(type=Transaction.Type.INCOME, is_paid=True, then="amount"),
+                        default=Value(0),
+                        output_field=models.DecimalField(),
+                    )
+                ),
+                Decimal("0"),
+            ),
+            income_projected=Coalesce(
+                Sum(
+                    Case(
+                        When(
+                            type=Transaction.Type.INCOME, is_paid=False, then="amount"
+                        ),
+                        default=Value(0),
+                        output_field=models.DecimalField(),
+                    )
+                ),
+                Decimal("0"),
+            ),
+        )
+
+        for entity_metric in entity_metrics:
+            category_id = entity_metric["category"]
+            tag_id = entity_metric["tags"]
+            entity_id = entity_metric["entities"]
+
+            if category_id in result:
+                tag_key = tag_id if tag_id is not None else "untagged"
+                if tag_key in result[category_id]["tags"]:
+                    entity_key = entity_id if entity_id is not None else "no_entity"
+                    entity_name = (
+                        entity_metric["entities__name"]
+                        if entity_id is not None
+                        else None
+                    )
+
+                    if "entities" not in result[category_id]["tags"][tag_key]:
+                        result[category_id]["tags"][tag_key]["entities"] = {}
+
+                    if (
+                        entity_key
+                        not in result[category_id]["tags"][tag_key]["entities"]
+                    ):
+                        result[category_id]["tags"][tag_key]["entities"][entity_key] = {
+                            "name": entity_name,
+                            "currencies": {},
+                        }
+
+                    currency_id = entity_metric["account__currency"]
+
+                    entity_total_current = (
+                        entity_metric["income_current"]
+                        - entity_metric["expense_current"]
+                    )
+                    entity_total_projected = (
+                        entity_metric["income_projected"]
+                        - entity_metric["expense_projected"]
+                    )
+                    entity_total_income = (
+                        entity_metric["income_current"]
+                        + entity_metric["income_projected"]
+                    )
+                    entity_total_expense = (
+                        entity_metric["expense_current"]
+                        + entity_metric["expense_projected"]
+                    )
+                    entity_total_final = entity_total_current + entity_total_projected
+
+                    entity_currency_data = {
+                        "currency": {
+                            "code": entity_metric["account__currency__code"],
+                            "name": entity_metric["account__currency__name"],
+                            "decimal_places": entity_metric[
+                                "account__currency__decimal_places"
+                            ],
+                            "prefix": entity_metric["account__currency__prefix"],
+                            "suffix": entity_metric["account__currency__suffix"],
+                        },
+                        "expense_current": entity_metric["expense_current"],
+                        "expense_projected": entity_metric["expense_projected"],
+                        "total_expense": entity_total_expense,
+                        "income_current": entity_metric["income_current"],
+                        "income_projected": entity_metric["income_projected"],
+                        "total_income": entity_total_income,
+                        "total_current": entity_total_current,
+                        "total_projected": entity_total_projected,
+                        "total_final": entity_total_final,
+                    }
+
+                    if entity_metric["account__currency__exchange_currency"]:
+                        from_currency = Currency.objects.get(id=currency_id)
+                        exchange_currency = Currency.objects.get(
+                            id=entity_metric["account__currency__exchange_currency"]
+                        )
+
+                        exchanged = {}
+                        for field in [
+                            "expense_current",
+                            "expense_projected",
+                            "income_current",
+                            "income_projected",
+                            "total_income",
+                            "total_expense",
+                            "total_current",
+                            "total_projected",
+                            "total_final",
+                        ]:
+                            amount, prefix, suffix, decimal_places = convert(
+                                amount=entity_currency_data[field],
+                                from_currency=from_currency,
+                                to_currency=exchange_currency,
+                            )
+                            if amount is not None:
+                                exchanged[field] = amount
+                                if "currency" not in exchanged:
+                                    exchanged["currency"] = {
+                                        "prefix": prefix,
+                                        "suffix": suffix,
+                                        "decimal_places": decimal_places,
+                                        "code": exchange_currency.code,
+                                        "name": exchange_currency.name,
+                                    }
+                        if exchanged:
+                            entity_currency_data["exchanged"] = exchanged
+
+                    result[category_id]["tags"][tag_key]["entities"][entity_key][
+                        "currencies"
+                    ][currency_id] = entity_currency_data
+
     return result

app/apps/insights/utils/transactions.py

@@ -13,7 +13,9 @@ from apps.insights.forms import (
 )
 
 
-def get_transactions(request, include_unpaid=True, include_silent=False):
+def get_transactions(
+    request, include_unpaid=True, include_silent=False, include_untracked_accounts=False
+):
     transactions = Transaction.objects.all()
 
     filter_type = request.GET.get("type", None)
@@ -91,6 +93,15 @@ def get_transactions(request, include_unpaid=True, include_silent=False):
         transactions = transactions.filter(is_paid=True)
 
     if not include_silent:
-        transactions = transactions.exclude(Q(category__mute=True) & ~Q(category=None))
+        transactions = transactions.exclude(
+            Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True)
+        )
+
+    if not include_untracked_accounts:
+        transactions = transactions.exclude(
+            account__in=request.user.untracked_accounts.all()
+        )
+
+    transactions = transactions.exclude(account__currency__is_archived=True)
 
     return transactions

app/apps/insights/views.py

@@ -74,7 +74,7 @@ def index(request):
 def sankey_by_account(request):
     # Get filtered transactions
 
-    transactions = get_transactions(request)
+    transactions = get_transactions(request, include_untracked_accounts=True)
 
     # Generate Sankey data
     sankey_data = generate_sankey_data_by_account(transactions)
@@ -180,6 +180,14 @@ def category_overview(request):
     else:
         show_tags = request.session.get("insights_category_explorer_show_tags", True)
 
+    if "show_entities" in request.GET:
+        show_entities = request.GET["show_entities"] == "on"
+        request.session["insights_category_explorer_show_entities"] = show_entities
+    else:
+        show_entities = request.session.get(
+            "insights_category_explorer_show_entities", False
+        )
+
     if "showing" in request.GET:
         showing = request.GET["showing"]
         request.session["insights_category_explorer_showing"] = showing
@@ -190,7 +198,9 @@ def category_overview(request):
     transactions = get_transactions(request, include_silent=True)
 
     total_table = get_categories_totals(
-        transactions_queryset=transactions, ignore_empty=False
+        transactions_queryset=transactions,
+        ignore_empty=False,
+        show_entities=show_entities,
     )
 
     return render(
@@ -200,6 +210,7 @@ def category_overview(request):
             "total_table": total_table,
             "view_type": view_type,
             "show_tags": show_tags,
+            "show_entities": show_entities,
             "showing": showing,
         },
     )
@@ -239,10 +250,14 @@ def late_transactions(request):
 @login_required
 @require_http_methods(["GET"])
 def emergency_fund(request):
-    transactions_currency_queryset = Transaction.objects.filter(
-        is_paid=True, account__is_archived=False, account__is_asset=False
-    ).order_by(
-        "account__currency__name",
+    transactions_currency_queryset = (
+        Transaction.objects.filter(
+            is_paid=True, account__is_archived=False, account__is_asset=False
+        )
+        .exclude(account__in=request.user.untracked_accounts.all())
+        .order_by(
+            "account__currency__name",
+        )
     )
     currency_net_worth = calculate_currency_totals(
         transactions_queryset=transactions_currency_queryset, ignore_empty=False
@@ -260,7 +275,9 @@ def emergency_fund(request):
             reference_date__gte=start_date,
             reference_date__lte=end_date,
             category__mute=False,
+            mute=False,
         )
+        .exclude(account__in=request.user.untracked_accounts.all())
         .values("reference_date", "account__currency")
         .annotate(monthly_total=Sum("amount"))
     )

app/apps/mini_tools/tests.py

@@ -1,165 +1,3 @@
 from django.test import TestCase
-from django.contrib.auth.models import User
-from django.utils import timezone
-from unittest.mock import patch
-from decimal import Decimal
-from datetime import date
-from django.test import Client # Added
-from django.urls import reverse # Added
 
-from apps.currencies.models import Currency, ExchangeRate
-from apps.mini_tools.utils.exchange_rate_map import get_currency_exchange_map
-
-class MiniToolsUtilsTests(TestCase):
-    def setUp(self):
-        # User is not strictly necessary for this utility but good practice for test setup
-        self.user = User.objects.create_user(username='testuser', password='password')
-
-        self.usd = Currency.objects.create(name="US Dollar", code="USD", decimal_places=2, prefix="$")
-        self.eur = Currency.objects.create(name="Euro", code="EUR", decimal_places=2, prefix="€")
-        self.gbp = Currency.objects.create(name="British Pound", code="GBP", decimal_places=2, prefix="£")
-
-        # USD -> EUR rates
-        # Rate for 2023-01-10 (will be processed last for USD->EUR due to ordering)
-        ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.90"), date=date(2023, 1, 10))
-        # Rate for 2023-01-15 (closer to target_date 2023-01-16, processed first for USD->EUR)
-        ExchangeRate.objects.create(from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.92"), date=date(2023, 1, 15))
-
-        # GBP -> USD rate
-        self.gbp_usd_rate = ExchangeRate.objects.create(from_currency=self.gbp, to_currency=self.usd, rate=Decimal("1.25"), date=date(2023, 1, 12))
-
-    def test_get_currency_exchange_map_structure_and_rates(self):
-        target_date = date(2023, 1, 16)
-        rate_map = get_currency_exchange_map(date=target_date)
-
-        # Assert USD in map
-        self.assertIn("US Dollar", rate_map)
-        usd_data = rate_map["US Dollar"]
-        self.assertEqual(usd_data["decimal_places"], 2)
-        self.assertEqual(usd_data["prefix"], "$")
-        self.assertIn("rates", usd_data)
-
-        # USD -> EUR: Expecting rate from 2023-01-10 (0.90)
-        # Query order: (USD,EUR,2023-01-15), (USD,EUR,2023-01-10)
-        # Loop overwrite means the last one processed (0.90) sticks.
-        self.assertIn("Euro", usd_data["rates"])
-        self.assertEqual(usd_data["rates"]["Euro"]["rate"], Decimal("0.90"))
-
-        # USD -> GBP: Inverse of GBP->USD rate from 2023-01-12 (1.25)
-        # Query for GBP->USD, date 2023-01-12, diff 4 days.
-        self.assertIn("British Pound", usd_data["rates"])
-        self.assertEqual(usd_data["rates"]["British Pound"]["rate"], Decimal("1") / self.gbp_usd_rate.rate)
-
-        # Assert EUR in map
-        self.assertIn("Euro", rate_map)
-        eur_data = rate_map["Euro"]
-        self.assertEqual(eur_data["decimal_places"], 2)
-        self.assertEqual(eur_data["prefix"], "€")
-        self.assertIn("rates", eur_data)
-
-        # EUR -> USD: Inverse of USD->EUR rate from 2023-01-10 (0.90)
-        self.assertIn("US Dollar", eur_data["rates"])
-        self.assertEqual(eur_data["rates"]["US Dollar"]["rate"], Decimal("1") / Decimal("0.90"))
-
-        # Assert GBP in map
-        self.assertIn("British Pound", rate_map)
-        gbp_data = rate_map["British Pound"]
-        self.assertEqual(gbp_data["decimal_places"], 2)
-        self.assertEqual(gbp_data["prefix"], "£")
-        self.assertIn("rates", gbp_data)
-
-        # GBP -> USD: Direct rate from 2023-01-12 (1.25)
-        self.assertIn("US Dollar", gbp_data["rates"])
-        self.assertEqual(gbp_data["rates"]["US Dollar"]["rate"], self.gbp_usd_rate.rate)
-
-    @patch('apps.mini_tools.utils.exchange_rate_map.timezone')
-    def test_get_currency_exchange_map_uses_today_if_no_date(self, mock_django_timezone):
-        # Mock timezone.localtime().date() to return a specific date
-        mock_today = date(2023, 1, 16)
-        mock_django_timezone.localtime.return_value.date.return_value = mock_today
-
-        rate_map = get_currency_exchange_map() # No date argument, should use mocked "today"
-
-        # Re-assert one key rate to confirm the mocked date was used.
-        # Based on test_get_currency_exchange_map_structure_and_rates, with target_date 2023-01-16,
-        # USD -> EUR should be 0.90.
-        self.assertIn("US Dollar", rate_map)
-        self.assertIn("Euro", rate_map["US Dollar"]["rates"])
-        self.assertEqual(rate_map["US Dollar"]["rates"]["Euro"]["rate"], Decimal("0.90"))
-
-        # Verify that timezone.localtime().date() was called
-        mock_django_timezone.localtime.return_value.date.assert_called_once()
-
-
-class MiniToolsViewTests(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='viewtestuser', password='password')
-        self.client = Client()
-        self.client.login(username='viewtestuser', password='password')
-
-        self.usd = Currency.objects.create(name="US Dollar Test", code="USDTEST", decimal_places=2, prefix="$T ")
-        self.eur = Currency.objects.create(name="Euro Test", code="EURTEST", decimal_places=2, prefix="€T ")
-
-    @patch('apps.mini_tools.views.convert')
-    def test_currency_converter_convert_view_successful(self, mock_convert):
-        mock_convert.return_value = (Decimal("85.00"), "€T ", "", 2) # prefix, suffix, dp
-
-        get_params = {
-            'from_value': "100",
-            'from_currency': self.usd.id,
-            'to_currency': self.eur.id
-        }
-        response = self.client.get(reverse('mini_tools:currency_converter_convert'), data=get_params)
-
-        self.assertEqual(response.status_code, 200)
-
-        mock_convert.assert_called_once()
-        args, kwargs = mock_convert.call_args
-
-        # The view calls: convert(amount=amount_decimal, from_currency=from_currency_obj, to_currency=to_currency_obj)
-        # So, these are keyword arguments.
-        self.assertEqual(kwargs['amount'], Decimal('100'))
-        self.assertEqual(kwargs['from_currency'], self.usd)
-        self.assertEqual(kwargs['to_currency'], self.eur)
-
-        self.assertEqual(response.context['converted_amount'], Decimal("85.00"))
-        self.assertEqual(response.context['prefix'], "€T ")
-        self.assertEqual(response.context['suffix'], "")
-        self.assertEqual(response.context['decimal_places'], 2)
-        self.assertEqual(response.context['from_value'], "100") # Check original value passed through
-        self.assertEqual(response.context['from_currency_selected'], str(self.usd.id))
-        self.assertEqual(response.context['to_currency_selected'], str(self.eur.id))
-
-
-    @patch('apps.mini_tools.views.convert')
-    def test_currency_converter_convert_view_missing_params(self, mock_convert):
-        get_params = {
-            'from_value': "100",
-            'from_currency': self.usd.id
-            # 'to_currency' is missing
-        }
-        response = self.client.get(reverse('mini_tools:currency_converter_convert'), data=get_params)
-
-        self.assertEqual(response.status_code, 200)
-        mock_convert.assert_not_called()
-        self.assertIsNone(response.context.get('converted_amount')) # Use .get() for safety if key might be absent
-        self.assertEqual(response.context['from_value'], "100")
-        self.assertEqual(response.context['from_currency_selected'], str(self.usd.id))
-        self.assertIsNone(response.context.get('to_currency_selected'))
-
-
-    @patch('apps.mini_tools.views.convert')
-    def test_currency_converter_convert_view_invalid_currency_id(self, mock_convert):
-        get_params = {
-            'from_value': "100",
-            'from_currency': self.usd.id,
-            'to_currency': 999 # Non-existent currency ID
-        }
-        response = self.client.get(reverse('mini_tools:currency_converter_convert'), data=get_params)
-
-        self.assertEqual(response.status_code, 200)
-        mock_convert.assert_not_called()
-        self.assertIsNone(response.context.get('converted_amount'))
-        self.assertEqual(response.context['from_value'], "100")
-        self.assertEqual(response.context['from_currency_selected'], str(self.usd.id))
-        self.assertEqual(response.context['to_currency_selected'], '999') # View passes invalid ID to context
+# Create your tests here.

app/apps/monthly_overview/tests.py

@@ -1,131 +0,0 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-from django.utils import timezone # Though specific dates are used, good for general test setup
-from decimal import Decimal
-from datetime import date
-
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, TransactionTag, Transaction
-
-class MonthlyOverviewViewTests(TestCase): # Renamed from MonthlyOverviewTestCase
-    def setUp(self):
-        self.user = User.objects.create_user(username='testmonthlyuser', password='password')
-        self.client = Client()
-        self.client.login(username='testmonthlyuser', password='password')
-
-        self.currency_usd = Currency.objects.create(name="MO USD", code="MOUSD", decimal_places=2, prefix="$MO ")
-        self.account_group = AccountGroup.objects.create(name="MO Group", owner=self.user)
-        self.account_usd1 = Account.objects.create(
-            name="MO Account USD 1",
-            currency=self.currency_usd,
-            owner=self.user,
-            group=self.account_group
-        )
-        self.category_food = TransactionCategory.objects.create(
-            name="MO Food",
-            owner=self.user,
-            type=TransactionCategory.TransactionType.EXPENSE
-        )
-        self.category_salary = TransactionCategory.objects.create(
-            name="MO Salary",
-            owner=self.user,
-            type=TransactionCategory.TransactionType.INCOME
-        )
-        self.tag_urgent = TransactionTag.objects.create(name="Urgent", owner=self.user)
-
-        # Transactions for March 2023
-        self.t_food1 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_food,
-            date=date(2023, 3, 5), amount=Decimal("50.00"),
-            type=Transaction.Type.EXPENSE, description="Groceries March", is_paid=True
-        )
-        self.t_food1.tags.add(self.tag_urgent)
-
-        self.t_food2 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_food,
-            date=date(2023, 3, 10), amount=Decimal("25.00"),
-            type=Transaction.Type.EXPENSE, description="Lunch March", is_paid=True
-        )
-        self.t_salary1 = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_salary,
-            date=date(2023, 3, 1), amount=Decimal("1000.00"),
-            type=Transaction.Type.INCOME, description="March Salary", is_paid=True
-        )
-        # Transaction for April 2023
-        self.t_april_food = Transaction.objects.create(
-            owner=self.user, account=self.account_usd1, category=self.category_food,
-            date=date(2023, 4, 5), amount=Decimal("30.00"),
-            type=Transaction.Type.EXPENSE, description="April Groceries", is_paid=True
-        )
-        # URL for the main overview page for March 2023, used in the adapted test
-        self.url_main_overview_march = reverse('monthly_overview:monthly_overview', kwargs={'month': 3, 'year': 2023})
-
-
-    def test_transactions_list_no_filters(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url, HTTP_HX_REQUEST='true')
-        self.assertEqual(response.status_code, 200)
-        context_txns = response.context['transactions']
-        self.assertIn(self.t_food1, context_txns)
-        self.assertIn(self.t_food2, context_txns)
-        self.assertIn(self.t_salary1, context_txns)
-        self.assertNotIn(self.t_april_food, context_txns)
-        self.assertEqual(len(context_txns), 3)
-
-    def test_transactions_list_filter_by_description(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url + "?description=Groceries", HTTP_HX_REQUEST='true') # Filter for "Groceries March"
-        self.assertEqual(response.status_code, 200)
-        context_txns = response.context['transactions']
-        self.assertIn(self.t_food1, context_txns)
-        self.assertNotIn(self.t_food2, context_txns)
-        self.assertNotIn(self.t_salary1, context_txns)
-        self.assertEqual(len(context_txns), 1)
-
-    def test_transactions_list_filter_by_type_income(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url + "?type=IN", HTTP_HX_REQUEST='true')
-        self.assertEqual(response.status_code, 200)
-        context_txns = response.context['transactions']
-        self.assertIn(self.t_salary1, context_txns)
-        self.assertEqual(len(context_txns), 1)
-
-    def test_transactions_list_filter_by_tag(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url + f"?tags={self.tag_urgent.name}", HTTP_HX_REQUEST='true')
-        self.assertEqual(response.status_code, 200)
-        context_txns = response.context['transactions']
-        self.assertIn(self.t_food1, context_txns)
-        self.assertEqual(len(context_txns), 1)
-
-    def test_transactions_list_filter_by_category(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url + f"?category={self.category_food.name}", HTTP_HX_REQUEST='true')
-        self.assertEqual(response.status_code, 200)
-        context_txns = response.context['transactions']
-        self.assertIn(self.t_food1, context_txns)
-        self.assertIn(self.t_food2, context_txns)
-        self.assertEqual(len(context_txns), 2)
-
-    def test_transactions_list_ordering_amount_desc(self):
-        url = reverse('monthly_overview:monthly_transactions_list', kwargs={'month': 3, 'year': 2023})
-        response = self.client.get(url + "?order=-amount", HTTP_HX_REQUEST='true')
-        self.assertEqual(response.status_code, 200)
-        context_txns = list(response.context['transactions'])
-        self.assertEqual(context_txns[0], self.t_salary1) # Amount 1000 (INCOME)
-        self.assertEqual(context_txns[1], self.t_food1)   # Amount 50 (EXPENSE)
-        self.assertEqual(context_txns[2], self.t_food2)   # Amount 25 (EXPENSE)
-
-    def test_monthly_overview_main_view_authenticated_user(self):
-        # This test checks general access and basic context for the main monthly overview page.
-        response = self.client.get(self.url_main_overview_march)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('current_month_date', response.context)
-        self.assertEqual(response.context['current_month_date'], date(2023,3,1))
-        # Check for other expected context variables if necessary for this main view.
-        # For example, if it also lists transactions or summaries directly in its initial context.
-        self.assertIn('transactions_by_day', response.context) # Assuming this is part of the main view context as well
-        self.assertIn('total_income_current_month', response.context)
-        self.assertIn('total_expenses_current_month', response.context)

app/apps/monthly_overview/views.py

@@ -107,9 +107,15 @@ def transactions_list(request, month: int, year: int):
 @require_http_methods(["GET"])
 def monthly_summary(request, month: int, year: int):
     # Base queryset with all required filters
-    base_queryset = Transaction.objects.filter(
-        reference_date__year=year, reference_date__month=month, account__is_asset=False
-    ).exclude(Q(category__mute=True) & ~Q(category=None))
+    base_queryset = (
+        Transaction.objects.filter(
+            reference_date__year=year,
+            reference_date__month=month,
+            account__is_asset=False,
+        )
+        .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
+        .exclude(account__in=request.user.untracked_accounts.all())
+    )
 
     data = calculate_currency_totals(base_queryset, ignore_empty=True)
     percentages = calculate_percentage_distribution(data)
@@ -143,7 +149,7 @@ def monthly_account_summary(request, month: int, year: int):
     base_queryset = Transaction.objects.filter(
         reference_date__year=year,
         reference_date__month=month,
-    ).exclude(Q(category__mute=True) & ~Q(category=None))
+    ).exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
 
     account_data = calculate_account_totals(transactions_queryset=base_queryset.all())
     account_percentages = calculate_percentage_distribution(account_data)
@@ -165,10 +171,14 @@ def monthly_account_summary(request, month: int, year: int):
 @require_http_methods(["GET"])
 def monthly_currency_summary(request, month: int, year: int):
     # Base queryset with all required filters
-    base_queryset = Transaction.objects.filter(
-        reference_date__year=year,
-        reference_date__month=month,
-    ).exclude(Q(category__mute=True) & ~Q(category=None))
+    base_queryset = (
+        Transaction.objects.filter(
+            reference_date__year=year,
+            reference_date__month=month,
+        )
+        .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
+        .exclude(account__in=request.user.untracked_accounts.all())
+    )
 
     currency_data = calculate_currency_totals(base_queryset.all(), ignore_empty=True)
     currency_percentages = calculate_percentage_distribution(currency_data)

app/apps/net_worth/tests.py

@@ -1,153 +1,3 @@
 from django.test import TestCase
-from django.contrib.auth.models import User
-from django.utils import timezone
-from decimal import Decimal
-from datetime import date
-from collections import OrderedDict
 
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, Transaction
-from apps.net_worth.utils.calculate_net_worth import calculate_historical_currency_net_worth, calculate_historical_account_balance
-from apps.common.middleware.thread_local import set_current_user, get_current_user
-
-class NetWorthUtilsTests(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='testnetworthuser', password='password')
-
-        # Clean up current_user after each test
-        self.addCleanup(set_current_user, None)
-
-        self.usd = Currency.objects.create(name="US Dollar", code="USD", decimal_places=2, prefix="$")
-        self.eur = Currency.objects.create(name="Euro", code="EUR", decimal_places=2, prefix="€")
-
-        self.category = TransactionCategory.objects.create(name="Test Cat", owner=self.user, type=TransactionCategory.TransactionType.INFO)
-        self.account_group = AccountGroup.objects.create(name="NetWorth Test Group", owner=self.user)
-
-        self.account_usd1 = Account.objects.create(name="USD Account 1", currency=self.usd, owner=self.user, group=self.account_group)
-        self.account_eur1 = Account.objects.create(name="EUR Account 1", currency=self.eur, owner=self.user, group=self.account_group)
-
-        # --- Transactions for Jan 2023 ---
-        # USD1: +1000 (Income)
-        Transaction.objects.create(
-            description="Jan Salary USD1", account=self.account_usd1, category=self.category,
-            type=Transaction.Type.INCOME, amount=Decimal('1000.00'), date=date(2023, 1, 10), is_paid=True, owner=self.user
-        )
-        # USD1: -50 (Expense)
-        Transaction.objects.create(
-            description="Jan Food USD1", account=self.account_usd1, category=self.category,
-            type=Transaction.Type.EXPENSE, amount=Decimal('50.00'), date=date(2023, 1, 15), is_paid=True, owner=self.user
-        )
-        # EUR1: +500 (Income)
-        Transaction.objects.create(
-            description="Jan Bonus EUR1", account=self.account_eur1, category=self.category,
-            type=Transaction.Type.INCOME, amount=Decimal('500.00'), date=date(2023, 1, 20), is_paid=True, owner=self.user
-        )
-
-        # --- Transactions for Feb 2023 ---
-        # USD1: +200 (Income)
-        Transaction.objects.create(
-            description="Feb Salary USD1", account=self.account_usd1, category=self.category,
-            type=Transaction.Type.INCOME, amount=Decimal('200.00'), date=date(2023, 2, 5), is_paid=True, owner=self.user
-        )
-        # EUR1: -100 (Expense)
-        Transaction.objects.create(
-            description="Feb Rent EUR1", account=self.account_eur1, category=self.category,
-            type=Transaction.Type.EXPENSE, amount=Decimal('100.00'), date=date(2023, 2, 12), is_paid=True, owner=self.user
-        )
-        # EUR1: +50 (Income)
-        Transaction.objects.create(
-            description="Feb Side Gig EUR1", account=self.account_eur1, category=self.category,
-            type=Transaction.Type.INCOME, amount=Decimal('50.00'), date=date(2023, 2, 18), is_paid=True, owner=self.user
-        )
-        # No transactions in Mar 2023 for this setup
-
-    def test_calculate_historical_currency_net_worth(self):
-        # Set current user for the utility function to access
-        set_current_user(self.user)
-
-        qs = Transaction.objects.filter(owner=self.user).order_by('date') # Ensure order for consistent processing
-
-        # The function determines start_date from the earliest transaction (Jan 2023)
-        # and end_date from the latest transaction (Feb 2023), then extends end_date by one month (Mar 2023).
-        result = calculate_historical_currency_net_worth(qs)
-
-        self.assertIsInstance(result, OrderedDict)
-
-        # Expected months: Jan 2023, Feb 2023, Mar 2023
-        # The function formats keys as "YYYY-MM-DD" (first day of month)
-
-        expected_keys = [
-            date(2023, 1, 1).strftime('%Y-%m-%d'),
-            date(2023, 2, 1).strftime('%Y-%m-%d'),
-            date(2023, 3, 1).strftime('%Y-%m-%d') # Extended by one month
-        ]
-        self.assertEqual(list(result.keys()), expected_keys)
-
-        # --- Jan 2023 ---
-        # USD1: +1000 - 50 = 950
-        # EUR1: +500
-        jan_data = result[expected_keys[0]]
-        self.assertEqual(jan_data[self.usd.name], Decimal('950.00'))
-        self.assertEqual(jan_data[self.eur.name], Decimal('500.00'))
-
-        # --- Feb 2023 ---
-        # USD1: 950 (prev) + 200 = 1150
-        # EUR1: 500 (prev) - 100 + 50 = 450
-        feb_data = result[expected_keys[1]]
-        self.assertEqual(feb_data[self.usd.name], Decimal('1150.00'))
-        self.assertEqual(feb_data[self.eur.name], Decimal('450.00'))
-
-        # --- Mar 2023 (Carries over from Feb) ---
-        # USD1: 1150
-        # EUR1: 450
-        mar_data = result[expected_keys[2]]
-        self.assertEqual(mar_data[self.usd.name], Decimal('1150.00'))
-        self.assertEqual(mar_data[self.eur.name], Decimal('450.00'))
-
-        # Ensure no other currencies are present
-        for month_data in result.values():
-            self.assertEqual(len(month_data), 2) # Only USD and EUR should be present
-            self.assertIn(self.usd.name, month_data)
-            self.assertIn(self.eur.name, month_data)
-
-    def test_calculate_historical_account_balance(self):
-        set_current_user(self.user)
-
-        qs = Transaction.objects.filter(owner=self.user).order_by('date')
-        result = calculate_historical_account_balance(qs)
-
-        self.assertIsInstance(result, OrderedDict)
-
-        expected_keys = [
-            date(2023, 1, 1).strftime('%Y-%m-%d'),
-            date(2023, 2, 1).strftime('%Y-%m-%d'),
-            date(2023, 3, 1).strftime('%Y-%m-%d')
-        ]
-        self.assertEqual(list(result.keys()), expected_keys)
-
-        # Jan 2023 data
-        jan_data = result[expected_keys[0]]
-        self.assertEqual(jan_data.get(self.account_usd1.name), Decimal('950.00'))
-        self.assertEqual(jan_data.get(self.account_eur1.name), Decimal('500.00'))
-        # Ensure only these two accounts are present, as per setUp
-        self.assertEqual(len(jan_data), 2)
-        self.assertIn(self.account_usd1.name, jan_data)
-        self.assertIn(self.account_eur1.name, jan_data)
-
-
-        # Feb 2023 data
-        feb_data = result[expected_keys[1]]
-        self.assertEqual(feb_data.get(self.account_usd1.name), Decimal('1150.00'))
-        self.assertEqual(feb_data.get(self.account_eur1.name), Decimal('450.00'))
-        self.assertEqual(len(feb_data), 2)
-        self.assertIn(self.account_usd1.name, feb_data)
-        self.assertIn(self.account_eur1.name, feb_data)
-
-        # Mar 2023 data (carried over)
-        mar_data = result[expected_keys[2]]
-        self.assertEqual(mar_data.get(self.account_usd1.name), Decimal('1150.00'))
-        self.assertEqual(mar_data.get(self.account_eur1.name), Decimal('450.00'))
-        self.assertEqual(len(mar_data), 2)
-        self.assertIn(self.account_usd1.name, mar_data)
-        self.assertIn(self.account_eur1.name, mar_data)
+# Create your tests here.

app/apps/net_worth/urls.py

@@ -5,4 +5,5 @@ from . import views
 urlpatterns = [
     path("net-worth/current/", views.net_worth_current, name="net_worth_current"),
     path("net-worth/projected/", views.net_worth_projected, name="net_worth_projected"),
+    path("net-worth/", views.net_worth, name="net_worth"),
 ]

app/apps/net_worth/utils/calculate_net_worth.py

@@ -30,6 +30,7 @@ def calculate_historical_currency_net_worth(queryset):
             | Q(accounts__visibility="private", accounts__owner=None),
             accounts__is_archived=False,
             accounts__isnull=False,
+            is_archived=False,
         )
         .values_list("name", flat=True)
         .distinct()

app/apps/net_worth/views.py

@@ -2,7 +2,7 @@ import json
 
 from django.contrib.auth.decorators import login_required
 from django.core.serializers.json import DjangoJSONEncoder
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 from django.views.decorators.http import require_http_methods
 
 from apps.net_worth.utils.calculate_net_worth import (
@@ -18,18 +18,41 @@ from apps.transactions.utils.calculations import (
 
 @login_required
 @require_http_methods(["GET"])
-def net_worth_current(request):
-    transactions_currency_queryset = Transaction.objects.filter(
-        is_paid=True, account__is_archived=False
-    ).order_by(
-        "account__currency__name",
-    )
-    transactions_account_queryset = Transaction.objects.filter(
-        is_paid=True, account__is_archived=False
-    ).order_by(
-        "account__group__name",
-        "account__name",
-    )
+def net_worth(request):
+    if "view_type" in request.GET:
+        view_type = request.GET["view_type"]
+        request.session["networth_view_type"] = view_type
+    else:
+        view_type = request.session.get("networth_view_type", "current")
+
+    if view_type == "current":
+        transactions_currency_queryset = (
+            Transaction.objects.filter(is_paid=True, account__is_archived=False)
+            .order_by(
+                "account__currency__name",
+            )
+            .exclude(account__in=request.user.untracked_accounts.all())
+        )
+        transactions_account_queryset = Transaction.objects.filter(
+            is_paid=True, account__is_archived=False
+        ).order_by(
+            "account__group__name",
+            "account__name",
+        )
+    else:
+        transactions_currency_queryset = (
+            Transaction.objects.filter(account__is_archived=False)
+            .order_by(
+                "account__currency__name",
+            )
+            .exclude(account__in=request.user.untracked_accounts.all())
+        )
+        transactions_account_queryset = Transaction.objects.filter(
+            account__is_archived=False
+        ).order_by(
+            "account__group__name",
+            "account__name",
+        )
 
     currency_net_worth = calculate_currency_totals(
         transactions_queryset=transactions_currency_queryset, deep_search=True
@@ -116,111 +139,22 @@ def net_worth_current(request):
             "currencies": currencies,
             "chart_data_accounts_json": chart_data_accounts_json,
             "accounts": accounts,
-            "type": "current",
+            "type": view_type,
         },
     )
 
 
+@login_required
+@require_http_methods(["GET"])
+def net_worth_current(request):
+    request.session["networth_view_type"] = "current"
+
+    return redirect("net_worth")
+
+
 @login_required
 @require_http_methods(["GET"])
 def net_worth_projected(request):
-    transactions_currency_queryset = Transaction.objects.filter(
-        account__is_archived=False
-    ).order_by(
-        "account__currency__name",
-    )
-    transactions_account_queryset = Transaction.objects.filter(
-        account__is_archived=False
-    ).order_by(
-        "account__group__name",
-        "account__name",
-    )
+    request.session["networth_view_type"] = "projected"
 
-    currency_net_worth = calculate_currency_totals(
-        transactions_queryset=transactions_currency_queryset, deep_search=True
-    )
-    account_net_worth = calculate_account_totals(
-        transactions_queryset=transactions_account_queryset
-    )
-
-    historical_currency_net_worth = calculate_historical_currency_net_worth(
-        queryset=transactions_currency_queryset
-    )
-
-    labels = (
-        list(historical_currency_net_worth.keys())
-        if historical_currency_net_worth
-        else []
-    )
-    currencies = (
-        list(historical_currency_net_worth[labels[0]].keys())
-        if historical_currency_net_worth
-        else []
-    )
-
-    datasets = []
-    for i, currency in enumerate(currencies):
-        data = [
-            float(month_data[currency])
-            for month_data in historical_currency_net_worth.values()
-        ]
-        datasets.append(
-            {
-                "label": currency,
-                "data": data,
-                "yAxisID": f"y{i}",
-                "fill": False,
-                "tension": 0.1,
-            }
-        )
-
-    chart_data_currency = {"labels": labels, "datasets": datasets}
-
-    chart_data_currency_json = json.dumps(chart_data_currency, cls=DjangoJSONEncoder)
-
-    historical_account_balance = calculate_historical_account_balance(
-        queryset=transactions_account_queryset
-    )
-
-    labels = (
-        list(historical_account_balance.keys()) if historical_account_balance else []
-    )
-    accounts = (
-        list(historical_account_balance[labels[0]].keys())
-        if historical_account_balance
-        else []
-    )
-
-    datasets = []
-    for i, account in enumerate(accounts):
-        data = [
-            float(month_data[account])
-            for month_data in historical_account_balance.values()
-        ]
-        datasets.append(
-            {
-                "label": account,
-                "data": data,
-                "fill": False,
-                "tension": 0.1,
-                "yAxisID": f"y-axis-{i}",  # Assign each dataset to its own Y-axis
-            }
-        )
-
-    chart_data_accounts = {"labels": labels, "datasets": datasets}
-
-    chart_data_accounts_json = json.dumps(chart_data_accounts, cls=DjangoJSONEncoder)
-
-    return render(
-        request,
-        "net_worth/net_worth.html",
-        {
-            "currency_net_worth": currency_net_worth,
-            "account_net_worth": account_net_worth,
-            "chart_data_currency_json": chart_data_currency_json,
-            "currencies": currencies,
-            "chart_data_accounts_json": chart_data_accounts_json,
-            "accounts": accounts,
-            "type": "projected",
-        },
-    )
+    return redirect("net_worth")

app/apps/rules/forms.py

@@ -1,15 +1,19 @@
 from crispy_bootstrap5.bootstrap5 import Switch, BS5Accordion
 from crispy_forms.bootstrap import FormActions, AccordionGroup
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Field, Row, Column
+from crispy_forms.layout import Layout, Field, Row, Column, HTML
 from django import forms
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
 from apps.common.widgets.crispy.submit import NoClassSubmit
-from apps.common.widgets.tom_select import TomSelect
+from apps.common.widgets.crispy.submit import NoClassSubmit
+from apps.common.widgets.tom_select import TomSelect, TransactionSelect
 from apps.rules.models import TransactionRule, UpdateOrCreateTransactionRuleAction
 from apps.rules.models import TransactionRuleAction
+from apps.common.fields.forms.dynamic_select import DynamicModelChoiceField
+from apps.transactions.forms import BulkEditTransactionForm
+from apps.transactions.models import Transaction
 
 
 class TransactionRuleForm(forms.ModelForm):
@@ -40,6 +44,8 @@ class TransactionRuleForm(forms.ModelForm):
                 Column(Switch("on_create")),
                 Column(Switch("on_delete")),
             ),
+            "order",
+            Switch("sequenced"),
             "description",
             "trigger",
         )
@@ -65,10 +71,11 @@ class TransactionRuleForm(forms.ModelForm):
 class TransactionRuleActionForm(forms.ModelForm):
     class Meta:
         model = TransactionRuleAction
-        fields = ("value", "field")
+        fields = ("value", "field", "order")
         labels = {
             "field": _("Set field"),
             "value": _("To"),
+            "order": _("Order"),
         }
         widgets = {"field": TomSelect(clear_button=False)}
 
@@ -82,6 +89,7 @@ class TransactionRuleActionForm(forms.ModelForm):
         self.helper.form_method = "post"
         # TO-DO: Add helper with available commands
         self.helper.layout = Layout(
+            "order",
             "field",
             "value",
         )
@@ -147,9 +155,11 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
             "search_category_operator": TomSelect(clear_button=False),
             "search_internal_note_operator": TomSelect(clear_button=False),
             "search_internal_id_operator": TomSelect(clear_button=False),
+            "search_mute_operator": TomSelect(clear_button=False),
         }
 
         labels = {
+            "order": _("Order"),
             "search_account_operator": _("Operator"),
             "search_type_operator": _("Operator"),
             "search_is_paid_operator": _("Operator"),
@@ -163,6 +173,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
             "search_internal_id_operator": _("Operator"),
             "search_tags_operator": _("Operator"),
             "search_entities_operator": _("Operator"),
+            "search_mute_operator": _("Operator"),
             "search_account": _("Account"),
             "search_type": _("Type"),
             "search_is_paid": _("Paid"),
@@ -176,6 +187,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
             "search_internal_id": _("Internal ID"),
             "search_tags": _("Tags"),
             "search_entities": _("Entities"),
+            "search_mute": _("Mute"),
             "set_account": _("Account"),
             "set_type": _("Type"),
             "set_is_paid": _("Paid"),
@@ -189,6 +201,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
             "set_category": _("Category"),
             "set_internal_note": _("Internal Note"),
             "set_internal_id": _("Internal ID"),
+            "set_mute": _("Mute"),
         }
 
     def __init__(self, *args, **kwargs):
@@ -200,6 +213,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
         self.helper.form_method = "post"
 
         self.helper.layout = Layout(
+            "order",
             BS5Accordion(
                 AccordionGroup(
                     _("Search Criteria"),
@@ -224,6 +238,16 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
                             css_class="form-group col-md-8",
                         ),
                     ),
+                    Row(
+                        Column(
+                            Field("search_mute_operator"),
+                            css_class="form-group col-md-4",
+                        ),
+                        Column(
+                            Field("search_mute", rows=1),
+                            css_class="form-group col-md-8",
+                        ),
+                    ),
                     Row(
                         Column(
                             Field("search_account_operator"),
@@ -340,6 +364,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
                     _("Set Values"),
                     Field("set_type", rows=1),
                     Field("set_is_paid", rows=1),
+                    Field("set_mute", rows=1),
                     Field("set_account", rows=1),
                     Field("set_entities", rows=1),
                     Field("set_date", rows=1),
@@ -381,3 +406,112 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
         if commit:
             instance.save()
         return instance
+
+
+class DryRunCreatedTransacion(forms.Form):
+    transaction = DynamicModelChoiceField(
+        model=Transaction,
+        to_field_name="id",
+        label=_("Transaction"),
+        required=True,
+        queryset=Transaction.objects.none(),
+        widget=TransactionSelect(clear_button=False, income=True, expense=True),
+        help_text=_("Type to search for a transaction"),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.layout = Layout(
+            "transaction",
+            FormActions(
+                NoClassSubmit(
+                    "submit", _("Test"), css_class="btn btn-outline-primary w-100"
+                ),
+            ),
+        )
+
+        if self.data.get("transaction"):
+            try:
+                transaction = Transaction.objects.get(id=self.data.get("transaction"))
+            except Transaction.DoesNotExist:
+                transaction = None
+
+            if transaction:
+                self.fields["transaction"].queryset = Transaction.objects.filter(
+                    id=transaction.id
+                )
+
+
+class DryRunDeletedTransacion(forms.Form):
+    transaction = DynamicModelChoiceField(
+        model=Transaction,
+        to_field_name="id",
+        label=_("Transaction"),
+        required=True,
+        queryset=Transaction.objects.none(),
+        widget=TransactionSelect(clear_button=False, income=True, expense=True),
+        help_text=_("Type to search for a transaction"),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.layout = Layout(
+            "transaction",
+            FormActions(
+                NoClassSubmit(
+                    "submit", _("Test"), css_class="btn btn-outline-primary w-100"
+                ),
+            ),
+        )
+
+        if self.data.get("transaction"):
+            try:
+                transaction = Transaction.objects.get(id=self.data.get("transaction"))
+            except Transaction.DoesNotExist:
+                transaction = None
+
+            if transaction:
+                self.fields["transaction"].queryset = Transaction.objects.filter(
+                    id=transaction.id
+                )
+
+
+class DryRunUpdatedTransactionForm(BulkEditTransactionForm):
+    transaction = DynamicModelChoiceField(
+        model=Transaction,
+        to_field_name="id",
+        label=_("Transaction"),
+        required=True,
+        queryset=Transaction.objects.none(),
+        widget=TransactionSelect(clear_button=False, income=True, expense=True),
+        help_text=_("Type to search for a transaction"),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.helper.layout.insert(0, "transaction")
+        self.helper.layout.insert(1, HTML("<hr/>"))
+
+        # Change submit button
+        self.helper.layout[-1] = FormActions(
+            NoClassSubmit(
+                "submit", _("Test"), css_class="btn btn-outline-primary w-100"
+            )
+        )
+
+        if self.data.get("transaction"):
+            try:
+                transaction = Transaction.objects.get(id=self.data.get("transaction"))
+            except Transaction.DoesNotExist:
+                transaction = None
+
+            if transaction:
+                self.fields["transaction"].queryset = Transaction.objects.filter(
+                    id=transaction.id
+                )

app/apps/rules/migrations/0014_alter_transactionrule_owner_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.2.4 on 2025-07-28 02:15
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rules', '0013_transactionrule_on_delete'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='transactionrule',
+            name='owner',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_owned', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AlterField(
+            model_name='transactionrule',
+            name='shared_with',
+            field=models.ManyToManyField(blank=True, related_name='%(class)s_shared', to=settings.AUTH_USER_MODEL, verbose_name='Shared with users'),
+        ),
+        migrations.AlterField(
+            model_name='transactionrule',
+            name='visibility',
+            field=models.CharField(choices=[('private', 'Private'), ('public', 'Public')], default='private', max_length=10, verbose_name='Visibility'),
+        ),
+    ]

app/apps/rules/migrations/0015_alter_transactionruleaction_options_and_more.py

@@ -0,0 +1,39 @@
+# Generated by Django 5.2 on 2025-08-30 18:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("rules", "0014_alter_transactionrule_owner_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="transactionruleaction",
+            options={
+                "ordering": ["order"],
+                "verbose_name": "Edit transaction action",
+                "verbose_name_plural": "Edit transaction actions",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="updateorcreatetransactionruleaction",
+            options={
+                "ordering": ["order"],
+                "verbose_name": "Update or create transaction action",
+                "verbose_name_plural": "Update or create transaction actions",
+            },
+        ),
+        migrations.AddField(
+            model_name="transactionruleaction",
+            name="order",
+            field=models.PositiveIntegerField(default=0, verbose_name="Order"),
+        ),
+        migrations.AddField(
+            model_name="updateorcreatetransactionruleaction",
+            name="order",
+            field=models.PositiveIntegerField(default=0, verbose_name="Order"),
+        ),
+    ]

app/apps/rules/migrations/0016_transactionrule_sequenced.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-08-31 18:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rules', '0015_alter_transactionruleaction_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transactionrule',
+            name='sequenced',
+            field=models.BooleanField(default=False, verbose_name='Sequenced'),
+        ),
+    ]

app/apps/rules/migrations/0017_updateorcreatetransactionruleaction_search_mute_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.2.5 on 2025-08-31 19:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rules', '0016_transactionrule_sequenced'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_mute',
+            field=models.TextField(blank=True, verbose_name='Search Mute'),
+        ),
+        migrations.AddField(
+            model_name='updateorcreatetransactionruleaction',
+            name='search_mute_operator',
+            field=models.CharField(choices=[('exact', 'is exactly'), ('contains', 'contains'), ('startswith', 'starts with'), ('endswith', 'ends with'), ('eq', 'equals'), ('gt', 'greater than'), ('lt', 'less than'), ('gte', 'greater than or equal'), ('lte', 'less than or equal')], default='exact', max_length=10, verbose_name='Mute Operator'),
+        ),
+        migrations.AddField(
+            model_name='updateorcreatetransactionruleaction',
+            name='set_mute',
+            field=models.TextField(blank=True, verbose_name='Mute'),
+        ),
+        migrations.AlterField(
+            model_name='transactionruleaction',
+            name='field',
+            field=models.CharField(choices=[('account', 'Account'), ('type', 'Type'), ('is_paid', 'Paid'), ('date', 'Date'), ('reference_date', 'Reference Date'), ('mute', 'Mute'), ('amount', 'Amount'), ('description', 'Description'), ('notes', 'Notes'), ('category', 'Category'), ('tags', 'Tags'), ('entities', 'Entities'), ('internal_nome', 'Internal Note'), ('internal_id', 'Internal ID')], max_length=50, verbose_name='Field'),
+        ),
+    ]

app/apps/rules/migrations/0018_transactionrule_order.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-09-02 14:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rules', '0017_updateorcreatetransactionruleaction_search_mute_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transactionrule',
+            name='order',
+            field=models.PositiveIntegerField(default=0, verbose_name='Order'),
+        ),
+    ]

app/apps/rules/models.py

@@ -13,6 +13,11 @@ class TransactionRule(SharedObject):
     name = models.CharField(max_length=100, verbose_name=_("Name"))
     description = models.TextField(blank=True, null=True, verbose_name=_("Description"))
     trigger = models.TextField(verbose_name=_("Trigger"))
+    sequenced = models.BooleanField(
+        verbose_name=_("Sequenced"),
+        default=False,
+    )
+    order = models.PositiveIntegerField(default=0, verbose_name=_("Order"))
 
     objects = SharedObjectManager()
     all_objects = models.Manager()  # Unfiltered manager
@@ -32,12 +37,15 @@ class TransactionRuleAction(models.Model):
         is_paid = "is_paid", _("Paid")
         date = "date", _("Date")
         reference_date = "reference_date", _("Reference Date")
+        mute = "mute", _("Mute")
         amount = "amount", _("Amount")
         description = "description", _("Description")
         notes = "notes", _("Notes")
         category = "category", _("Category")
         tags = "tags", _("Tags")
         entities = "entities", _("Entities")
+        internal_note = "internal_nome", _("Internal Note")
+        internal_id = "internal_id", _("Internal ID")
 
     rule = models.ForeignKey(
         TransactionRule,
@@ -51,6 +59,7 @@ class TransactionRuleAction(models.Model):
         verbose_name=_("Field"),
     )
     value = models.TextField(verbose_name=_("Value"))
+    order = models.PositiveIntegerField(default=0, verbose_name=_("Order"))
 
     def __str__(self):
         return f"{self.rule} - {self.field} - {self.value}"
@@ -59,6 +68,11 @@ class TransactionRuleAction(models.Model):
         verbose_name = _("Edit transaction action")
         verbose_name_plural = _("Edit transaction actions")
         unique_together = (("rule", "field"),)
+        ordering = ["order"]
+
+    @property
+    def action_type(self):
+        return "edit_transaction"
 
 
 class UpdateOrCreateTransactionRuleAction(models.Model):
@@ -237,6 +251,17 @@ class UpdateOrCreateTransactionRuleAction(models.Model):
         verbose_name="Internal ID Operator",
     )
 
+    search_mute = models.TextField(
+        verbose_name="Search Mute",
+        blank=True,
+    )
+    search_mute_operator = models.CharField(
+        max_length=10,
+        choices=SearchOperator.choices,
+        default=SearchOperator.EXACT,
+        verbose_name="Mute Operator",
+    )
+
     # Set fields
     set_account = models.TextField(
         verbose_name=_("Account"),
@@ -290,10 +315,21 @@ class UpdateOrCreateTransactionRuleAction(models.Model):
         verbose_name=_("Tags"),
         blank=True,
     )
+    set_mute = models.TextField(
+        verbose_name=_("Mute"),
+        blank=True,
+    )
+
+    order = models.PositiveIntegerField(default=0, verbose_name=_("Order"))
 
     class Meta:
         verbose_name = _("Update or create transaction action")
         verbose_name_plural = _("Update or create transaction actions")
+        ordering = ["order"]
+
+    @property
+    def action_type(self):
+        return "update_or_create_transaction"
 
     def __str__(self):
         return f"Update or create transaction action for {self.rule}"
@@ -325,6 +361,10 @@ class UpdateOrCreateTransactionRuleAction(models.Model):
             value = simple.eval(self.search_is_paid)
             search_query &= add_to_query("is_paid", value, self.search_is_paid_operator)
 
+        if self.search_mute:
+            value = simple.eval(self.search_mute)
+            search_query &= add_to_query("mute", value, self.search_mute_operator)
+
         if self.search_date:
             value = simple.eval(self.search_date)
             search_query &= add_to_query("date", value, self.search_date_operator)

app/apps/rules/signals.py

@@ -9,40 +9,17 @@ from apps.transactions.models import (
 )
 from apps.rules.tasks import check_for_transaction_rules
 from apps.common.middleware.thread_local import get_current_user
+from apps.rules.utils.transactions import serialize_transaction
 
 
 @receiver(transaction_created)
 @receiver(transaction_updated)
 @receiver(transaction_deleted)
 def transaction_changed_receiver(sender: Transaction, signal, **kwargs):
+    old_data = kwargs.get("old_data")
     if signal is transaction_deleted:
         # Serialize transaction data for processing
-        transaction_data = {
-            "id": sender.id,
-            "account": (sender.account.id, sender.account.name),
-            "account_group": (
-                sender.account.group.id if sender.account.group else None,
-                sender.account.group.name if sender.account.group else None,
-            ),
-            "type": str(sender.type),
-            "is_paid": sender.is_paid,
-            "is_asset": sender.account.is_asset,
-            "is_archived": sender.account.is_archived,
-            "category": (
-                sender.category.id if sender.category else None,
-                sender.category.name if sender.category else None,
-            ),
-            "date": sender.date.isoformat(),
-            "reference_date": sender.reference_date.isoformat(),
-            "amount": str(sender.amount),
-            "description": sender.description,
-            "notes": sender.notes,
-            "tags": list(sender.tags.values_list("id", "name")),
-            "entities": list(sender.entities.values_list("id", "name")),
-            "deleted": True,
-            "internal_note": sender.internal_note,
-            "internal_id": sender.internal_id,
-        }
+        transaction_data = serialize_transaction(sender, deleted=True)
 
         check_for_transaction_rules.defer(
             transaction_data=transaction_data,
@@ -59,6 +36,9 @@ def transaction_changed_receiver(sender: Transaction, signal, **kwargs):
         dca_entry.amount_received = sender.amount
         dca_entry.save()
 
+    if signal is transaction_updated and old_data:
+        old_data = serialize_transaction(old_data, deleted=False)
+
     check_for_transaction_rules.defer(
         instance_id=sender.id,
         user_id=get_current_user().id,
@@ -67,4 +47,5 @@ def transaction_changed_receiver(sender: Transaction, signal, **kwargs):
             if signal is transaction_created
             else "transaction_updated"
         ),
+        old_data=old_data,
     )

app/apps/rules/tests.py

@@ -1,200 +0,0 @@
-from django.test import TestCase
-from django.contrib.auth.models import User
-from decimal import Decimal
-from datetime import date
-
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import TransactionCategory, TransactionTag, Transaction, TransactionEntity # Added TransactionEntity just in case, though not used in these specific tests
-from apps.rules.models import TransactionRule, TransactionRuleAction, UpdateOrCreateTransactionRuleAction
-from apps.rules.tasks import check_for_transaction_rules
-from apps.common.middleware.thread_local import set_current_user, delete_current_user
-from django.db.models import Q
-from unittest.mock import MagicMock
-
-
-class RulesTasksTests(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='rulestestuser', email='rules@example.com', password='password')
-
-        set_current_user(self.user)
-        self.addCleanup(delete_current_user)
-
-        self.currency = Currency.objects.create(code="RTUSD", name="Rules Test USD", decimal_places=2)
-        self.account_group = AccountGroup.objects.create(name="Rules Group", owner=self.user)
-        self.account = Account.objects.create(
-            name="Rules Account",
-            currency=self.currency,
-            owner=self.user,
-            group=self.account_group
-        )
-        self.initial_category = TransactionCategory.objects.create(name="Groceries", owner=self.user, type=TransactionCategory.TransactionType.EXPENSE)
-        self.new_category = TransactionCategory.objects.create(name="Entertainment", owner=self.user, type=TransactionCategory.TransactionType.EXPENSE)
-
-        self.tag_fun = TransactionTag.objects.create(name="Fun", owner=self.user)
-        self.tag_work = TransactionTag.objects.create(name="Work", owner=self.user) # Created but not used in these tests
-
-    def test_rule_changes_category_and_adds_tag_on_create(self):
-        rule1 = TransactionRule.objects.create(
-            name="Categorize Coffee",
-            owner=self.user,
-            active=True,
-            on_create=True,
-            on_update=False,
-            trigger="instance.description == 'Coffee Shop'"
-        )
-        TransactionRuleAction.objects.create(
-            rule=rule1,
-            field=TransactionRuleAction.Field.CATEGORY,
-            value=str(self.new_category.pk) # Use PK for category
-        )
-        TransactionRuleAction.objects.create(
-            rule=rule1,
-            field=TransactionRuleAction.Field.TAGS,
-            value=f"['{self.tag_fun.name}']" # List of tag names as a string representation of a list
-        )
-
-        transaction = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023,1,1),
-            amount=Decimal("5.00"),
-            description="Coffee Shop",
-            category=self.initial_category
-        )
-
-        self.assertEqual(transaction.category, self.initial_category)
-        self.assertNotIn(self.tag_fun, transaction.tags.all())
-
-        # Call the task directly, simulating the signal handler
-        check_for_transaction_rules(instance_id=transaction.id, user_id=self.user.id, signal_type="transaction_created")
-
-        transaction.refresh_from_db()
-        self.assertEqual(transaction.category, self.new_category)
-        self.assertIn(self.tag_fun, transaction.tags.all())
-        self.assertEqual(transaction.tags.count(), 1)
-
-    def test_rule_trigger_condition_not_met(self):
-        rule2 = TransactionRule.objects.create(
-            name="Irrelevant Rule",
-            owner=self.user,
-            active=True,
-            on_create=True,
-            trigger="instance.description == 'Specific NonMatch'"
-        )
-        TransactionRuleAction.objects.create(
-            rule=rule2,
-            field=TransactionRuleAction.Field.CATEGORY,
-            value=str(self.new_category.pk)
-        )
-
-        transaction = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023,1,2),
-            amount=Decimal("10.00"),
-            description="Other item",
-            category=self.initial_category
-        )
-
-        check_for_transaction_rules(instance_id=transaction.id, user_id=self.user.id, signal_type="transaction_created")
-
-        transaction.refresh_from_db()
-        self.assertEqual(transaction.category, self.initial_category)
-
-    def test_rule_on_update_not_on_create(self):
-        rule3 = TransactionRule.objects.create(
-            name="Update Only Rule",
-            owner=self.user,
-            active=True,
-            on_create=False,
-            on_update=True,
-            trigger="instance.description == 'Updated Item'"
-        )
-        TransactionRuleAction.objects.create(
-            rule=rule3,
-            field=TransactionRuleAction.Field.CATEGORY,
-            value=str(self.new_category.pk)
-        )
-
-        transaction = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023,1,3),
-            amount=Decimal("15.00"),
-            description="Updated Item",
-            category=self.initial_category
-        )
-
-        # Check on create signal
-        check_for_transaction_rules(instance_id=transaction.id, user_id=self.user.id, signal_type="transaction_created")
-        transaction.refresh_from_db()
-        self.assertEqual(transaction.category, self.initial_category, "Rule should not run on create signal.")
-
-        # Simulate an update by sending the update signal
-        check_for_transaction_rules(instance_id=transaction.id, user_id=self.user.id, signal_type="transaction_updated")
-        transaction.refresh_from_db()
-        self.assertEqual(transaction.category, self.new_category, "Rule should run on update signal.")
-
-    # Example of previous test class that might have been in the file
-    # Kept for context if needed, but the new tests are in RulesTasksTests
-    # class RulesTestCase(TestCase):
-    #     def test_example(self):
-    #         self.assertEqual(1 + 1, 2)
-
-    #     def test_rules_index_view_authenticated_user(self):
-    #         # ... (implementation from old file) ...
-    #         pass
-
-    def test_update_or_create_action_build_search_query(self):
-        rule = TransactionRule.objects.create(
-            name="Search Rule For Action Test",
-            owner=self.user,
-            trigger="True" # Simple trigger, not directly used by this action method
-        )
-        action = UpdateOrCreateTransactionRuleAction.objects.create(
-            rule=rule,
-            search_description="Coffee",
-            search_description_operator=UpdateOrCreateTransactionRuleAction.SearchOperator.CONTAINS,
-            search_amount="5", # This will be evaluated by simple_eval
-            search_amount_operator=UpdateOrCreateTransactionRuleAction.SearchOperator.EXACT
-            # Other search fields can be None or empty
-        )
-
-        mock_simple_eval = MagicMock()
-
-        def eval_side_effect(expression_string):
-            if expression_string == "Coffee":
-                return "Coffee"
-            if expression_string == "5": # The value stored in search_amount
-                return Decimal("5.00")
-            # Add more conditions if other search_ fields are being tested with expressions
-            return expression_string # Default pass-through for other potential expressions
-
-        mock_simple_eval.eval = MagicMock(side_effect=eval_side_effect)
-
-        q_object = action.build_search_query(simple_eval=mock_simple_eval)
-
-        self.assertIsInstance(q_object, Q)
-
-        # Convert Q object children to a set of tuples for easier unordered comparison
-        # Q objects can be nested. For this specific case, we expect a flat AND structure.
-        # (AND: ('description__contains', 'Coffee'), ('amount__exact', Decimal('5.00')))
-
-        children_set = set(q_object.children)
-
-        expected_children = {
-            ('description__contains', 'Coffee'),
-            ('amount__exact', Decimal('5.00'))
-        }
-
-        self.assertEqual(q_object.connector, Q.AND)
-        self.assertEqual(children_set, expected_children)
-
-        # Verify that simple_eval.eval was called for 'Coffee' and '5'
-        # Check calls to the mock_simple_eval.eval mock specifically
-        mock_simple_eval.eval.assert_any_call("Coffee")
-        mock_simple_eval.eval.assert_any_call("5")

app/apps/rules/urls.py

@@ -42,6 +42,21 @@ urlpatterns = [
         views.transaction_rule_take_ownership,
         name="transaction_rule_take_ownership",
     ),
+    path(
+        "rules/transaction/<int:pk>/dry-run/created/",
+        views.dry_run_rule_created,
+        name="transaction_rule_dry_run_created",
+    ),
+    path(
+        "rules/transaction/<int:pk>/dry-run/deleted/",
+        views.dry_run_rule_deleted,
+        name="transaction_rule_dry_run_deleted",
+    ),
+    path(
+        "rules/transaction/<int:pk>/dry-run/updated/",
+        views.dry_run_rule_updated,
+        name="transaction_rule_dry_run_updated",
+    ),
     path(
         "rules/transaction/<int:pk>/share/",
         views.transaction_rule_share,

app/apps/rules/utils/transactions.py

@@ -0,0 +1,93 @@
+import logging
+from decimal import Decimal
+
+from django.db.models import Sum, Value, DecimalField, Case, When, F
+from django.db.models.functions import Coalesce
+
+from apps.transactions.models import (
+    Transaction,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class TransactionsGetter:
+    def __init__(self, **filters):
+        self.__queryset = Transaction.objects.filter(**filters)
+
+    def exclude(self, **exclude_filters):
+        self.__queryset = self.__queryset.exclude(**exclude_filters)
+
+        return self
+
+    @property
+    def sum(self):
+        return self.__queryset.aggregate(
+            total=Coalesce(
+                Sum("amount"), Value(Decimal("0")), output_field=DecimalField()
+            )
+        )["total"]
+
+    @property
+    def balance(self):
+        return abs(
+            self.__queryset.aggregate(
+                balance=Coalesce(
+                    Sum(
+                        Case(
+                            When(type=Transaction.Type.EXPENSE, then=-F("amount")),
+                            default=F("amount"),
+                            output_field=DecimalField(),
+                        )
+                    ),
+                    Value(Decimal("0")),
+                    output_field=DecimalField(),
+                )
+            )["balance"]
+        )
+
+    @property
+    def raw_balance(self):
+        return self.__queryset.aggregate(
+            balance=Coalesce(
+                Sum(
+                    Case(
+                        When(type=Transaction.Type.EXPENSE, then=-F("amount")),
+                        default=F("amount"),
+                        output_field=DecimalField(),
+                    )
+                ),
+                Value(Decimal("0")),
+                output_field=DecimalField(),
+            )
+        )["balance"]
+
+
+def serialize_transaction(sender: Transaction, deleted: bool):
+    return {
+        "id": sender.id,
+        "account": (sender.account.id, sender.account.name),
+        "account_group": (
+            sender.account.group.id if sender.account.group else None,
+            sender.account.group.name if sender.account.group else None,
+        ),
+        "type": str(sender.type),
+        "is_paid": sender.is_paid,
+        "is_asset": sender.account.is_asset,
+        "is_archived": sender.account.is_archived,
+        "category": (
+            sender.category.id if sender.category else None,
+            sender.category.name if sender.category else None,
+        ),
+        "date": sender.date.isoformat(),
+        "reference_date": sender.reference_date.isoformat(),
+        "amount": str(sender.amount),
+        "description": sender.description,
+        "notes": sender.notes,
+        "tags": list(sender.tags.values_list("id", "name")),
+        "entities": list(sender.entities.values_list("id", "name")),
+        "deleted": deleted,
+        "internal_note": sender.internal_note,
+        "internal_id": sender.internal_id,
+        "mute": sender.mute,
+    }

app/apps/rules/views.py

@@ -1,5 +1,10 @@
+from itertools import chain
+
+from copy import deepcopy
+
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
+from django.db import transaction
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404, redirect
 from django.utils.translation import gettext_lazy as _
@@ -10,6 +15,9 @@ from apps.rules.forms import (
     TransactionRuleForm,
     TransactionRuleActionForm,
     UpdateOrCreateTransactionRuleActionForm,
+    DryRunCreatedTransacion,
+    DryRunDeletedTransacion,
+    DryRunUpdatedTransactionForm,
 )
 from apps.rules.models import (
     TransactionRule,
@@ -19,6 +27,11 @@ from apps.rules.models import (
 from apps.common.models import SharedObject
 from apps.common.forms import SharedObjectForm
 from apps.common.decorators.demo import disabled_on_demo
+from apps.rules.tasks import check_for_transaction_rules
+from apps.common.middleware.thread_local import get_current_user
+from apps.rules.signals import transaction_created, transaction_updated
+from apps.rules.utils.transactions import serialize_transaction
+from apps.transactions.models import Transaction
 
 
 @login_required
@@ -36,7 +49,7 @@ def rules_index(request):
 @disabled_on_demo
 @require_http_methods(["GET"])
 def rules_list(request):
-    transaction_rules = TransactionRule.objects.all().order_by("id")
+    transaction_rules = TransactionRule.objects.all().order_by("order", "id")
     return render(
         request,
         "rules/fragments/list.html",
@@ -140,10 +153,20 @@ def transaction_rule_edit(request, transaction_rule_id):
 def transaction_rule_view(request, transaction_rule_id):
     transaction_rule = get_object_or_404(TransactionRule, id=transaction_rule_id)
 
+    edit_actions = transaction_rule.transaction_actions.all()
+    update_or_create_actions = (
+        transaction_rule.update_or_create_transaction_actions.all()
+    )
+
+    all_actions = sorted(
+        chain(edit_actions, update_or_create_actions),
+        key=lambda a: a.order,
+    )
+
     return render(
         request,
         "rules/fragments/transaction_rule/view.html",
-        {"transaction_rule": transaction_rule},
+        {"transaction_rule": transaction_rule, "all_actions": all_actions},
     )
 
 
@@ -406,3 +429,156 @@ def update_or_create_transaction_rule_action_delete(request, pk):
             "HX-Trigger": "updated, hide_offcanvas",
         },
     )
+
+
+@only_htmx
+@login_required
+@disabled_on_demo
+@require_http_methods(["GET", "POST"])
+def dry_run_rule_created(request, pk):
+    rule = get_object_or_404(TransactionRule, id=pk)
+    logs = None
+    results = None
+
+    if request.method == "POST":
+        form = DryRunCreatedTransacion(request.POST)
+        if form.is_valid():
+            try:
+                with transaction.atomic():
+                    logs, results = check_for_transaction_rules(
+                        instance_id=form.cleaned_data["transaction"].id,
+                        signal="transaction_created",
+                        dry_run=True,
+                        rule_id=rule.id,
+                        user_id=get_current_user().id,
+                    )
+                    logs = "\n".join(logs)
+
+                    response = render(
+                        request,
+                        "rules/fragments/transaction_rule/dry_run/created.html",
+                        {"form": form, "rule": rule, "logs": logs, "results": results},
+                    )
+
+                    raise Exception("ROLLBACK")
+            except Exception:
+                pass
+
+            return response
+
+    else:
+        form = DryRunCreatedTransacion()
+
+    return render(
+        request,
+        "rules/fragments/transaction_rule/dry_run/created.html",
+        {"form": form, "rule": rule, "logs": logs, "results": results},
+    )
+
+
+@only_htmx
+@login_required
+@disabled_on_demo
+@require_http_methods(["GET", "POST"])
+def dry_run_rule_deleted(request, pk):
+    rule = get_object_or_404(TransactionRule, id=pk)
+    logs = None
+    results = None
+
+    if request.method == "POST":
+        form = DryRunDeletedTransacion(request.POST)
+        if form.is_valid():
+            try:
+                with transaction.atomic():
+                    logs, results = check_for_transaction_rules(
+                        instance_id=form.cleaned_data["transaction"].id,
+                        signal="transaction_deleted",
+                        dry_run=True,
+                        rule_id=rule.id,
+                        user_id=get_current_user().id,
+                    )
+                    logs = "\n".join(logs)
+
+                    response = render(
+                        request,
+                        "rules/fragments/transaction_rule/dry_run/created.html",
+                        {"form": form, "rule": rule, "logs": logs, "results": results},
+                    )
+
+                    raise Exception("ROLLBACK")
+            except Exception:
+                pass
+
+        return response
+
+    else:
+        form = DryRunDeletedTransacion()
+
+    return render(
+        request,
+        "rules/fragments/transaction_rule/dry_run/deleted.html",
+        {"form": form, "rule": rule, "logs": logs, "results": results},
+    )
+
+
+@only_htmx
+@login_required
+@disabled_on_demo
+@require_http_methods(["GET", "POST"])
+def dry_run_rule_updated(request, pk):
+    rule = get_object_or_404(TransactionRule, id=pk)
+    logs = None
+    results = None
+
+    if request.method == "POST":
+        form = DryRunUpdatedTransactionForm(request.POST)
+        if form.is_valid():
+            base_transaction = Transaction.objects.get(
+                id=request.POST.get("transaction")
+            )
+            old_data = deepcopy(base_transaction)
+            try:
+                with transaction.atomic():
+                    for field_name, value in form.cleaned_data.items():
+                        if value or isinstance(
+                            value, bool
+                        ):  # Only update fields that have been filled in the form
+                            if field_name == "tags":
+                                base_transaction.tags.set(value)
+                            elif field_name == "entities":
+                                base_transaction.entities.set(value)
+                            else:
+                                setattr(base_transaction, field_name, value)
+
+                    base_transaction.save()
+
+                    logs, results = check_for_transaction_rules(
+                        instance_id=base_transaction.id,
+                        signal="transaction_updated",
+                        dry_run=True,
+                        rule_id=rule.id,
+                        user_id=get_current_user().id,
+                        old_data=old_data,
+                    )
+                    logs = "\n".join(logs) if logs else ""
+
+                    response = render(
+                        request,
+                        "rules/fragments/transaction_rule/dry_run/created.html",
+                        {"form": form, "rule": rule, "logs": logs, "results": results},
+                    )
+
+                    # This will rollback the transaction
+                    raise Exception("ROLLBACK")
+            except Exception:
+                pass
+
+            return response
+    else:
+        form = DryRunUpdatedTransactionForm(initial={"is_paid": None, "type": None})
+
+    return render(
+        request,
+        "rules/fragments/transaction_rule/dry_run/updated.html",
+        {"form": form, "rule": rule, "logs": logs, "results": results},
+    )

app/apps/transactions/admin.py

@@ -7,6 +7,7 @@ from apps.transactions.models import (
     InstallmentPlan,
     RecurringTransaction,
     TransactionEntity,
+    QuickTransaction,
 )
 from apps.common.admin import SharedObjectModelAdmin
 
@@ -49,19 +50,22 @@ class TransactionInline(admin.TabularInline):
 
 
 @admin.register(InstallmentPlan)
-class InstallmentPlanAdmin(SharedObjectModelAdmin):
+class InstallmentPlanAdmin(admin.ModelAdmin):
     inlines = [
         TransactionInline,
     ]
 
 
 @admin.register(RecurringTransaction)
-class RecurringTransactionAdmin(SharedObjectModelAdmin):
+class RecurringTransactionAdmin(admin.ModelAdmin):
     inlines = [
         TransactionInline,
     ]
 
 
+admin.site.register(QuickTransaction)
+
+
 @admin.register(TransactionCategory)
 class TransactionCategoryModelAdmin(SharedObjectModelAdmin):
     pass

app/apps/transactions/filters.py

@@ -60,26 +60,20 @@ class TransactionsFilter(django_filters.FilterSet):
         label=_("Currencies"),
         widget=TomSelectMultiple(checkboxes=True, remove_button=True),
     )
-    category = django_filters.ModelMultipleChoiceFilter(
-        field_name="category__name",
-        queryset=TransactionCategory.objects.all(),
-        to_field_name="name",
+    category = django_filters.MultipleChoiceFilter(
         label=_("Categories"),
         widget=TomSelectMultiple(checkboxes=True, remove_button=True),
+        method="filter_category",
     )
-    tags = django_filters.ModelMultipleChoiceFilter(
-        field_name="tags__name",
-        queryset=TransactionTag.objects.all(),
-        to_field_name="name",
+    tags = django_filters.MultipleChoiceFilter(
         label=_("Tags"),
         widget=TomSelectMultiple(checkboxes=True, remove_button=True),
+        method="filter_tags",
     )
-    entities = django_filters.ModelMultipleChoiceFilter(
-        field_name="entities__name",
-        queryset=TransactionEntity.objects.all(),
-        to_field_name="name",
+    entities = django_filters.MultipleChoiceFilter(
         label=_("Entities"),
         widget=TomSelectMultiple(checkboxes=True, remove_button=True),
+        method="filter_entities",
     )
     is_paid = django_filters.MultipleChoiceFilter(
         choices=SITUACAO_CHOICES,
@@ -125,6 +119,7 @@ class TransactionsFilter(django_filters.FilterSet):
             "is_paid",
             "category",
             "tags",
+            "entities",
             "date_start",
             "date_end",
             "reference_date_start",
@@ -186,6 +181,93 @@ class TransactionsFilter(django_filters.FilterSet):
         self.form.fields["date_end"].widget = AirDatePickerInput()
 
         self.form.fields["account"].queryset = Account.objects.all()
-        self.form.fields["category"].queryset = TransactionCategory.objects.all()
-        self.form.fields["tags"].queryset = TransactionTag.objects.all()
-        self.form.fields["entities"].queryset = TransactionEntity.objects.all()
+        category_choices = list(
+            TransactionCategory.objects.values_list("name", "name").order_by("name")
+        )
+        custom_choices = [
+            ("any", _("Categorized")),
+            ("uncategorized", _("Uncategorized")),
+        ]
+        self.form.fields["category"].choices = custom_choices + category_choices
+        tag_choices = list(
+            TransactionTag.objects.values_list("name", "name").order_by("name")
+        )
+        custom_tag_choices = [("any", _("Tagged")), ("untagged", _("Untagged"))]
+        self.form.fields["tags"].choices = custom_tag_choices + tag_choices
+        entity_choices = list(
+            TransactionEntity.objects.values_list("name", "name").order_by("name")
+        )
+        custom_entity_choices = [
+            ("any", _("Any entity")),
+            ("no_entity", _("No entity")),
+        ]
+        self.form.fields["entities"].choices = custom_entity_choices + entity_choices
+
+    @staticmethod
+    def filter_category(queryset, name, value):
+        if not value:
+            return queryset
+
+        value = list(value)
+
+        if "any" in value:
+            return queryset.filter(category__isnull=False)
+
+        q = Q()
+        if "uncategorized" in value:
+            q |= Q(category__isnull=True)
+            value.remove("uncategorized")
+
+        if value:
+            q |= Q(category__name__in=value)
+
+        if q.children:
+            return queryset.filter(q)
+
+        return queryset
+
+    @staticmethod
+    def filter_tags(queryset, name, value):
+        if not value:
+            return queryset
+
+        value = list(value)
+
+        if "any" in value:
+            return queryset.filter(tags__isnull=False).distinct()
+
+        q = Q()
+        if "untagged" in value:
+            q |= Q(tags__isnull=True)
+            value.remove("untagged")
+
+        if value:
+            q |= Q(tags__name__in=value)
+
+        if q.children:
+            return queryset.filter(q).distinct()
+
+        return queryset
+
+    @staticmethod
+    def filter_entities(queryset, name, value):
+        if not value:
+            return queryset
+
+        value = list(value)
+
+        if "any" in value:
+            return queryset.filter(entities__isnull=False).distinct()
+
+        q = Q()
+        if "no_entity" in value:
+            q |= Q(entities__isnull=True)
+            value.remove("no_entity")
+
+        if value:
+            q |= Q(entities__name__in=value)
+
+        if q.children:
+            return queryset.filter(q).distinct()
+
+        return queryset

app/apps/transactions/forms.py

@@ -1,5 +1,7 @@
+from copy import deepcopy
+
 from crispy_bootstrap5.bootstrap5 import Switch, BS5Accordion
-from crispy_forms.bootstrap import FormActions, AccordionGroup
+from crispy_forms.bootstrap import FormActions, AccordionGroup, AppendedText
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
     Layout,
@@ -7,6 +9,7 @@ from crispy_forms.layout import (
     Column,
     Field,
     Div,
+    HTML,
 )
 from django import forms
 from django.db.models import Q
@@ -29,8 +32,8 @@ from apps.transactions.models import (
     InstallmentPlan,
     RecurringTransaction,
     TransactionEntity,
+    QuickTransaction,
 )
-from apps.common.middleware.thread_local import get_current_user
 
 
 class TransactionForm(forms.ModelForm):
@@ -238,44 +241,263 @@ class TransactionForm(forms.ModelForm):
     def save(self, **kwargs):
         is_new = not self.instance.id
 
+        if not is_new:
+            old_data = deepcopy(Transaction.objects.get(pk=self.instance.id))
+        else:
+            old_data = None
+
         instance = super().save(**kwargs)
         if is_new:
             transaction_created.send(sender=instance)
         else:
-            transaction_updated.send(sender=instance)
+            transaction_updated.send(sender=instance, old_data=old_data)
 
         return instance
 
 
-class BulkEditTransactionForm(TransactionForm):
-    is_paid = forms.NullBooleanField(required=False)
+class QuickTransactionForm(forms.ModelForm):
+    category = DynamicModelChoiceField(
+        create_field="name",
+        model=TransactionCategory,
+        required=False,
+        label=_("Category"),
+        queryset=TransactionCategory.objects.filter(active=True),
+    )
+    tags = DynamicModelMultipleChoiceField(
+        model=TransactionTag,
+        to_field_name="name",
+        create_field="name",
+        required=False,
+        label=_("Tags"),
+        queryset=TransactionTag.objects.filter(active=True),
+    )
+    entities = DynamicModelMultipleChoiceField(
+        model=TransactionEntity,
+        to_field_name="name",
+        create_field="name",
+        required=False,
+        label=_("Entities"),
+    )
+    account = forms.ModelChoiceField(
+        queryset=Account.objects.filter(is_archived=False),
+        label=_("Account"),
+        widget=TomSelect(clear_button=False, group_by="group"),
+    )
+
+    class Meta:
+        model = QuickTransaction
+        fields = [
+            "name",
+            "account",
+            "type",
+            "is_paid",
+            "amount",
+            "description",
+            "notes",
+            "category",
+            "tags",
+            "entities",
+            "mute",
+        ]
+        widgets = {
+            "notes": forms.Textarea(attrs={"rows": 3}),
+            "account": TomSelect(clear_button=False, group_by="group"),
+        }
+        help_texts = {
+            "mute": _("Muted transactions won't be displayed on monthly summaries")
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        # Make all fields optional
-        for field_name, field in self.fields.items():
-            field.required = False
 
-        del self.helper.layout[-1]  # Remove button
-        del self.helper.layout[0:2]  # Remove type, is_paid field
+        # if editing a transaction display non-archived items and it's own item even if it's archived
+        if self.instance.id:
+            self.fields["account"].queryset = Account.objects.filter(
+                Q(is_archived=False) | Q(transactions=self.instance.id),
+            )
 
-        self.helper.layout.insert(
-            0,
+            self.fields["category"].queryset = TransactionCategory.objects.filter(
+                Q(active=True) | Q(transaction=self.instance.id)
+            )
+
+            self.fields["tags"].queryset = TransactionTag.objects.filter(
+                Q(active=True) | Q(transaction=self.instance.id)
+            )
+
+            self.fields["entities"].queryset = TransactionEntity.objects.filter(
+                Q(active=True) | Q(transactions=self.instance.id)
+            )
+        else:
+            self.fields["account"].queryset = Account.objects.filter(
+                is_archived=False,
+            )
+
+            self.fields["category"].queryset = TransactionCategory.objects.filter(
+                active=True
+            )
+            self.fields["tags"].queryset = TransactionTag.objects.filter(active=True)
+            self.fields["entities"].queryset = TransactionEntity.objects.all()
+
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.form_method = "post"
+        self.helper.layout = Layout(
+            Field(
+                "type",
+                template="transactions/widgets/income_expense_toggle_buttons.html",
+            ),
+            Field("is_paid", template="transactions/widgets/paid_toggle_button.html"),
+            "name",
+            HTML("<hr />"),
+            Row(
+                Column("account", css_class="form-group col-md-6 mb-0"),
+                Column("entities", css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            "description",
+            Field("amount", inputmode="decimal"),
+            Row(
+                Column("category", css_class="form-group col-md-6 mb-0"),
+                Column("tags", css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            "notes",
+            Switch("mute"),
+        )
+
+        if self.instance and self.instance.pk:
+            decimal_places = self.instance.account.currency.decimal_places
+            self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput(
+                decimal_places=decimal_places
+            )
+            self.helper.layout.append(
+                FormActions(
+                    NoClassSubmit(
+                        "submit", _("Update"), css_class="btn btn-outline-primary w-100"
+                    ),
+                ),
+            )
+        else:
+            self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput()
+            self.helper.layout.append(
+                Div(
+                    NoClassSubmit(
+                        "submit", _("Add"), css_class="btn btn-outline-primary"
+                    ),
+                    css_class="d-grid gap-2",
+                ),
+            )
+
+
+class BulkEditTransactionForm(forms.Form):
+    type = forms.ChoiceField(
+        choices=(Transaction.Type.choices),
+        required=False,
+        label=_("Type"),
+    )
+    is_paid = forms.NullBooleanField(
+        required=False,
+        label=_("Paid"),
+    )
+    account = DynamicModelChoiceField(
+        model=Account,
+        required=False,
+        label=_("Account"),
+        queryset=Account.objects.filter(is_archived=False),
+        widget=TomSelect(clear_button=False, group_by="group"),
+    )
+    date = forms.DateField(
+        label=_("Date"),
+        required=False,
+        widget=AirDatePickerInput(clear_button=False),
+    )
+    reference_date = forms.DateField(
+        widget=AirMonthYearPickerInput(),
+        label=_("Reference Date"),
+        required=False,
+    )
+    amount = forms.DecimalField(
+        max_digits=42,
+        decimal_places=30,
+        required=False,
+        label=_("Amount"),
+        widget=ArbitraryDecimalDisplayNumberInput(),
+    )
+    description = forms.CharField(
+        max_length=500, required=False, label=_("Description")
+    )
+    notes = forms.CharField(
+        required=False,
+        widget=forms.Textarea(attrs={"rows": 3}),
+        label=_("Notes"),
+    )
+    category = DynamicModelChoiceField(
+        create_field="name",
+        model=TransactionCategory,
+        required=False,
+        label=_("Category"),
+        queryset=TransactionCategory.objects.filter(active=True),
+    )
+    tags = DynamicModelMultipleChoiceField(
+        model=TransactionTag,
+        to_field_name="name",
+        create_field="name",
+        required=False,
+        label=_("Tags"),
+        queryset=TransactionTag.objects.filter(active=True),
+    )
+    entities = DynamicModelMultipleChoiceField(
+        model=TransactionEntity,
+        to_field_name="name",
+        create_field="name",
+        required=False,
+        label=_("Entities"),
+        queryset=TransactionEntity.objects.all(),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.fields["account"].queryset = Account.objects.filter(
+            is_archived=False,
+        )
+
+        self.fields["category"].queryset = TransactionCategory.objects.filter(
+            active=True
+        )
+        self.fields["tags"].queryset = TransactionTag.objects.filter(active=True)
+        self.fields["entities"].queryset = TransactionEntity.objects.all()
+
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.form_method = "post"
+        self.helper.layout = Layout(
             Field(
                 "type",
                 template="transactions/widgets/unselectable_income_expense_toggle_buttons.html",
             ),
-        )
-
-        self.helper.layout.insert(
-            1,
             Field(
                 "is_paid",
                 template="transactions/widgets/unselectable_paid_toggle_button.html",
             ),
-        )
-
-        self.helper.layout.append(
+            Row(
+                Column("account", css_class="form-group col-md-6 mb-0"),
+                Column("entities", css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            Row(
+                Column(Field("date"), css_class="form-group col-md-6 mb-0"),
+                Column(Field("reference_date"), css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            "description",
+            Field("amount", inputmode="decimal"),
+            Row(
+                Column("category", css_class="form-group col-md-6 mb-0"),
+                Column("tags", css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            "notes",
             FormActions(
                 NoClassSubmit(
                     "submit", _("Update"), css_class="btn btn-outline-primary w-100"
@@ -283,6 +505,9 @@ class BulkEditTransactionForm(TransactionForm):
             ),
         )
 
+        self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput()
+        self.fields["date"].widget = AirDatePickerInput(clear_button=False)
+
 
 class TransferForm(forms.Form):
     from_account = forms.ModelChoiceField(
@@ -359,6 +584,13 @@ class TransferForm(forms.Form):
         label=_("Notes"),
     )
 
+    mute = forms.BooleanField(
+        label=_("Mute"),
+        initial=True,
+        required=False,
+        help_text=_("Muted transactions won't be displayed on monthly summaries"),
+    )
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -377,6 +609,7 @@ class TransferForm(forms.Form):
             ),
             Field("description"),
             Field("notes"),
+            Switch("mute"),
             Row(
                 Column(
                     Row(
@@ -459,6 +692,8 @@ class TransferForm(forms.Form):
         return cleaned_data
 
     def save(self):
+        mute = self.cleaned_data["mute"]
+
         from_account = self.cleaned_data["from_account"]
         to_account = self.cleaned_data["to_account"]
         from_amount = self.cleaned_data["from_amount"]
@@ -481,6 +716,7 @@ class TransferForm(forms.Form):
             description=description,
             category=from_category,
             notes=notes,
+            mute=mute,
         )
         from_transaction.tags.set(self.cleaned_data.get("from_tags", []))
 
@@ -495,6 +731,7 @@ class TransferForm(forms.Form):
             description=description,
             category=to_category,
             notes=notes,
+            mute=mute,
         )
         to_transaction.tags.set(self.cleaned_data.get("to_tags", []))
 
@@ -733,7 +970,7 @@ class TransactionCategoryForm(forms.ModelForm):
         fields = ["name", "mute", "active"]
         labels = {"name": _("Category name")}
         help_texts = {
-            "mute": _("Muted categories won't count towards your monthly total")
+            "mute": _("Muted categories won't be displayed on monthly summaries")
         }
 
     def __init__(self, *args, **kwargs):
@@ -811,6 +1048,7 @@ class RecurringTransactionForm(forms.ModelForm):
             "notes",
             "add_notes_to_transaction",
             "entities",
+            "keep_at_most",
         ]
         widgets = {
             "reference_date": AirMonthYearPickerInput(),
@@ -890,6 +1128,7 @@ class RecurringTransactionForm(forms.ModelForm):
                 Column("end_date", css_class="form-group col-md-4 mb-0"),
                 css_class="form-row",
             ),
+            AppendedText("keep_at_most", _("future transactions")),
         )
 
         self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput()
@@ -931,5 +1170,6 @@ class RecurringTransactionForm(forms.ModelForm):
             instance.create_upcoming_transactions()
         else:
             instance.update_unpaid_transactions()
+            instance.generate_upcoming_transactions()
 
         return instance

app/apps/transactions/migrations/0043_quicktransaction.py

@@ -0,0 +1,45 @@
+# Generated by Django 5.1.11 on 2025-06-20 03:57
+
+import apps.transactions.validators
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0014_alter_account_options_alter_accountgroup_options'),
+        ('transactions', '0042_alter_transactioncategory_options_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='QuickTransaction',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100, verbose_name='Name')),
+                ('type', models.CharField(choices=[('IN', 'Income'), ('EX', 'Expense')], default='EX', max_length=2, verbose_name='Type')),
+                ('is_paid', models.BooleanField(default=True, verbose_name='Paid')),
+                ('amount', models.DecimalField(decimal_places=30, max_digits=42, validators=[apps.transactions.validators.validate_non_negative, apps.transactions.validators.validate_decimal_places], verbose_name='Amount')),
+                ('description', models.CharField(blank=True, max_length=500, verbose_name='Description')),
+                ('notes', models.TextField(blank=True, verbose_name='Notes')),
+                ('internal_note', models.TextField(blank=True, verbose_name='Internal Note')),
+                ('internal_id', models.TextField(blank=True, null=True, unique=True, verbose_name='Internal ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('account', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='quick_transactions', to='accounts.account', verbose_name='Account')),
+                ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='transactions.transactioncategory', verbose_name='Category')),
+                ('entities', models.ManyToManyField(blank=True, related_name='quick_transactions', to='transactions.transactionentity', verbose_name='Entities')),
+                ('owner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_owned', to=settings.AUTH_USER_MODEL)),
+                ('tags', models.ManyToManyField(blank=True, to='transactions.transactiontag', verbose_name='Tags')),
+            ],
+            options={
+                'verbose_name': 'Quick Transaction',
+                'verbose_name_plural': 'Quick Transactions',
+                'db_table': 'quick_transactions',
+                'default_manager_name': 'objects',
+            },
+        ),
+    ]

app/apps/transactions/migrations/0044_alter_quicktransaction_unique_together.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.11 on 2025-06-20 04:02
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0043_quicktransaction'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='quicktransaction',
+            unique_together={('name', 'owner')},
+        ),
+    ]

app/apps/transactions/migrations/0045_transaction_mute.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.11 on 2025-07-19 18:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0044_alter_quicktransaction_unique_together'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transaction',
+            name='mute',
+            field=models.BooleanField(default=False, verbose_name='Mute'),
+        ),
+    ]

app/apps/transactions/migrations/0046_quicktransaction_mute.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.11 on 2025-07-19 18:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0045_transaction_mute'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='quicktransaction',
+            name='mute',
+            field=models.BooleanField(default=False, verbose_name='Mute'),
+        ),
+    ]

app/apps/transactions/migrations/0047_alter_transactioncategory_owner_and_more.py

@@ -0,0 +1,61 @@
+# Generated by Django 5.2.4 on 2025-07-28 02:15
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0046_quicktransaction_mute'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='transactioncategory',
+            name='owner',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_owned', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AlterField(
+            model_name='transactioncategory',
+            name='shared_with',
+            field=models.ManyToManyField(blank=True, related_name='%(class)s_shared', to=settings.AUTH_USER_MODEL, verbose_name='Shared with users'),
+        ),
+        migrations.AlterField(
+            model_name='transactioncategory',
+            name='visibility',
+            field=models.CharField(choices=[('private', 'Private'), ('public', 'Public')], default='private', max_length=10, verbose_name='Visibility'),
+        ),
+        migrations.AlterField(
+            model_name='transactionentity',
+            name='owner',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_owned', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AlterField(
+            model_name='transactionentity',
+            name='shared_with',
+            field=models.ManyToManyField(blank=True, related_name='%(class)s_shared', to=settings.AUTH_USER_MODEL, verbose_name='Shared with users'),
+        ),
+        migrations.AlterField(
+            model_name='transactionentity',
+            name='visibility',
+            field=models.CharField(choices=[('private', 'Private'), ('public', 'Public')], default='private', max_length=10, verbose_name='Visibility'),
+        ),
+        migrations.AlterField(
+            model_name='transactiontag',
+            name='owner',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_owned', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AlterField(
+            model_name='transactiontag',
+            name='shared_with',
+            field=models.ManyToManyField(blank=True, related_name='%(class)s_shared', to=settings.AUTH_USER_MODEL, verbose_name='Shared with users'),
+        ),
+        migrations.AlterField(
+            model_name='transactiontag',
+            name='visibility',
+            field=models.CharField(choices=[('private', 'Private'), ('public', 'Public')], default='private', max_length=10, verbose_name='Visibility'),
+        ),
+    ]

app/apps/transactions/migrations/0048_recurringtransaction_keep_at_most.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.4 on 2025-08-06 14:51
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0047_alter_transactioncategory_owner_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recurringtransaction',
+            name='keep_at_most',
+            field=models.PositiveIntegerField(default=6, validators=[django.core.validators.MinValueValidator(1)], verbose_name='Keep at most'),
+        ),
+    ]

app/apps/transactions/models.py

@@ -1,4 +1,5 @@
 import logging
+from copy import deepcopy
 
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
@@ -16,7 +17,12 @@ from apps.common.templatetags.decimal import localize_number, drop_trailing_zero
 from apps.currencies.utils.convert import convert
 from apps.transactions.validators import validate_decimal_places, validate_non_negative
 from apps.common.middleware.thread_local import get_current_user
-from apps.common.models import SharedObject, SharedObjectManager, OwnedObject
+from apps.common.models import (
+    SharedObject,
+    SharedObjectManager,
+    OwnedObject,
+    OwnedObjectManager,
+)
 
 logger = logging.getLogger()
 
@@ -28,13 +34,13 @@ transaction_deleted = Signal()
 
 class SoftDeleteQuerySet(models.QuerySet):
     @staticmethod
-    def _emit_signals(instances, created=False):
+    def _emit_signals(instances, created=False, old_data=None):
         """Helper to emit signals for multiple instances"""
-        for instance in instances:
+        for i, instance in enumerate(instances):
             if created:
                 transaction_created.send(sender=instance)
             else:
-                transaction_updated.send(sender=instance)
+                transaction_updated.send(sender=instance, old_data=old_data[i])
 
     def bulk_create(self, objs, emit_signal=True, **kwargs):
         instances = super().bulk_create(objs, **kwargs)
@@ -45,22 +51,25 @@ class SoftDeleteQuerySet(models.QuerySet):
         return instances
 
     def bulk_update(self, objs, fields, emit_signal=True, **kwargs):
+        old_data = deepcopy(objs)
         result = super().bulk_update(objs, fields, **kwargs)
 
         if emit_signal:
-            self._emit_signals(objs, created=False)
+            self._emit_signals(objs, created=False, old_data=old_data)
 
         return result
 
     def update(self, emit_signal=True, **kwargs):
         # Get instances before update
         instances = list(self)
+        old_data = deepcopy(instances)
+
         result = super().update(**kwargs)
 
         if emit_signal:
             # Refresh instances to get new values
             refreshed = self.model.objects.filter(pk__in=[obj.pk for obj in instances])
-            self._emit_signals(refreshed, created=False)
+            self._emit_signals(refreshed, created=False, old_data=old_data)
 
         return result
 
@@ -294,6 +303,7 @@ class Transaction(OwnedObject):
     is_paid = models.BooleanField(default=True, verbose_name=_("Paid"))
     date = models.DateField(verbose_name=_("Date"))
     reference_date = MonthYearModelField(verbose_name=_("Reference Date"))
+    mute = models.BooleanField(default=False, verbose_name=_("Mute"))
 
     amount = models.DecimalField(
         max_digits=42,
@@ -370,7 +380,7 @@ class Transaction(OwnedObject):
         db_table = "transactions"
         default_manager_name = "objects"
 
-    def save(self, *args, **kwargs):
+    def clean_fields(self, *args, **kwargs):
         self.amount = truncate_decimal(
             value=self.amount, decimal_places=self.account.currency.decimal_places
         )
@@ -380,6 +390,11 @@ class Transaction(OwnedObject):
         elif not self.reference_date and self.date:
             self.reference_date = self.date.replace(day=1)
 
+        super().clean_fields(*args, **kwargs)
+
+    def save(self, *args, **kwargs):
+        # This is not recommended as it will run twice on some cases like form and API saves.
+        # We only do this here because we forgot to independently call it on multiple places.
         self.full_clean()
         super().save(*args, **kwargs)
 
@@ -437,12 +452,58 @@ class Transaction(OwnedObject):
         type_display = self.get_type_display()
         frmt_date = date(self.date, "SHORT_DATE_FORMAT")
         account = self.account
-        tags = ", ".join([x.name for x in self.tags.all()]) or _("No tags")
+        tags = (
+            ", ".join([x.name for x in self.tags.all()])
+            if self.id
+            else None or _("No tags")
+        )
         category = self.category or _("No category")
         amount = localize_number(drop_trailing_zeros(self.amount))
         description = self.description or _("No description")
         return f"[{frmt_date}][{type_display}][{account}] {description} • {category} • {tags} • {amount}"
 
+    def deepcopy(self, memo=None):
+        """
+        Creates a deep copy of the transaction instance.
+
+        This method returns a new, unsaved Transaction instance with the same
+        values as the original, including its many-to-many relationships.
+        The primary key and any other unique fields are reset to avoid
+        database integrity errors upon saving.
+        """
+        if memo is None:
+            memo = {}
+
+        # Create a new instance of the class
+        new_obj = self.__class__()
+        memo[id(self)] = new_obj
+
+        # Copy all concrete fields from the original to the new object
+        for field in self._meta.concrete_fields:
+            # Skip the primary key to allow the database to generate a new one
+            if field.primary_key:
+                continue
+
+            # Reset any unique fields to None to avoid constraint violations
+            if field.unique and field.name == "internal_id":
+                setattr(new_obj, field.name, None)
+                continue
+
+            # Copy the value of the field
+            setattr(new_obj, field.name, getattr(self, field.name))
+
+        # Save the new object to the database to get a primary key
+        new_obj.save()
+
+        # Copy the many-to-many relationships
+        for field in self._meta.many_to_many:
+            source_manager = getattr(self, field.name)
+            destination_manager = getattr(new_obj, field.name)
+            # Set the M2M relationships for the new object
+            destination_manager.set(source_manager.all())
+
+        return new_obj
+
 
 class InstallmentPlan(models.Model):
     class Recurrence(models.TextChoices):
@@ -716,6 +777,9 @@ class RecurringTransaction(models.Model):
     recurrence_interval = models.PositiveIntegerField(
         verbose_name=_("Recurrence Interval"),
     )
+    keep_at_most = models.PositiveIntegerField(
+        verbose_name=_("Keep at most"), default=6, validators=[MinValueValidator(1)]
+    )
 
     last_generated_date = models.DateField(
         verbose_name=_("Last Generated Date"), null=True, blank=True
@@ -753,8 +817,10 @@ class RecurringTransaction(models.Model):
         current_date = self.start_date
         reference_date = self.reference_date
         end_date = min(
-            self.end_date or timezone.now().date() + (self.get_recurrence_delta() * 5),
-            timezone.now().date() + (self.get_recurrence_delta() * 5),
+            self.end_date
+            or timezone.now().date()
+            + (self.get_recurrence_delta() * self.keep_at_most),
+            timezone.now().date() + (self.get_recurrence_delta() * self.keep_at_most),
         )
 
         while current_date <= end_date:
@@ -831,8 +897,16 @@ class RecurringTransaction(models.Model):
             current_date = start_date
             end_date = min(
                 recurring_transaction.end_date
-                or today + (recurring_transaction.get_recurrence_delta() * 6),
-                today + (recurring_transaction.get_recurrence_delta() * 6),
+                or today
+                + (
+                    recurring_transaction.get_recurrence_delta()
+                    * recurring_transaction.keep_at_most
+                ),
+                today
+                + (
+                    recurring_transaction.get_recurrence_delta()
+                    * recurring_transaction.keep_at_most
+                ),
             )
 
             logger.info(f"End date: {end_date}")
@@ -886,3 +960,90 @@ class RecurringTransaction(models.Model):
         """
         today = timezone.localdate(timezone.now())
         self.transactions.filter(is_paid=False, date__gt=today).delete()
+
+
+class QuickTransaction(OwnedObject):
+    class Type(models.TextChoices):
+        INCOME = "IN", _("Income")
+        EXPENSE = "EX", _("Expense")
+
+    name = models.CharField(
+        max_length=100,
+        null=False,
+        blank=False,
+        verbose_name=_("Name"),
+    )
+
+    account = models.ForeignKey(
+        "accounts.Account",
+        on_delete=models.CASCADE,
+        verbose_name=_("Account"),
+        related_name="quick_transactions",
+    )
+    type = models.CharField(
+        max_length=2,
+        choices=Type,
+        default=Type.EXPENSE,
+        verbose_name=_("Type"),
+    )
+    is_paid = models.BooleanField(default=True, verbose_name=_("Paid"))
+    mute = models.BooleanField(default=False, verbose_name=_("Mute"))
+
+    amount = models.DecimalField(
+        max_digits=42,
+        decimal_places=30,
+        verbose_name=_("Amount"),
+        validators=[validate_non_negative, validate_decimal_places],
+    )
+
+    description = models.CharField(
+        max_length=500, verbose_name=_("Description"), blank=True
+    )
+    notes = models.TextField(blank=True, verbose_name=_("Notes"))
+    category = models.ForeignKey(
+        TransactionCategory,
+        on_delete=models.SET_NULL,
+        verbose_name=_("Category"),
+        blank=True,
+        null=True,
+    )
+    tags = models.ManyToManyField(
+        TransactionTag,
+        verbose_name=_("Tags"),
+        blank=True,
+    )
+    entities = models.ManyToManyField(
+        TransactionEntity,
+        verbose_name=_("Entities"),
+        blank=True,
+        related_name="quick_transactions",
+    )
+
+    internal_note = models.TextField(blank=True, verbose_name=_("Internal Note"))
+    internal_id = models.TextField(
+        blank=True, null=True, unique=True, verbose_name=_("Internal ID")
+    )
+
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    objects = OwnedObjectManager()
+    all_objects = models.Manager()  # Unfiltered manager
+
+    class Meta:
+        verbose_name = _("Quick Transaction")
+        verbose_name_plural = _("Quick Transactions")
+        unique_together = ("name", "owner")
+        db_table = "quick_transactions"
+        default_manager_name = "objects"
+
+    def save(self, *args, **kwargs):
+        self.amount = truncate_decimal(
+            value=self.amount, decimal_places=self.account.currency.decimal_places
+        )
+
+        self.full_clean()
+        super().save(*args, **kwargs)
+
+    def __str__(self):
+        return self.name

app/apps/transactions/tasks.py

@@ -28,23 +28,18 @@ def generate_recurring_transactions(timestamp=None):
 @app.periodic(cron="10 1 * * *")
 @app.task(name="cleanup_deleted_transactions")
 def cleanup_deleted_transactions(timestamp=None):
-    with cachalot_disabled():
-        if settings.ENABLE_SOFT_DELETE and settings.KEEP_DELETED_TRANSACTIONS_FOR == 0:
-            return "KEEP_DELETED_TRANSACTIONS_FOR is 0, no cleanup performed."
+    if settings.ENABLE_SOFT_DELETE and settings.KEEP_DELETED_TRANSACTIONS_FOR == 0:
+        return "KEEP_DELETED_TRANSACTIONS_FOR is 0, no cleanup performed."
 
-        if not settings.ENABLE_SOFT_DELETE:
-            # Hard delete all soft-deleted transactions
-            deleted_count, _ = Transaction.userless_deleted_objects.all().hard_delete()
-            return (
-                f"Hard deleted {deleted_count} transactions (soft deletion disabled)."
-            )
+    if not settings.ENABLE_SOFT_DELETE:
+        # Hard delete all soft-deleted transactions
+        deleted_count, _ = Transaction.userless_deleted_objects.all().hard_delete()
+        return f"Hard deleted {deleted_count} transactions (soft deletion disabled)."
 
-        # Calculate the cutoff date
-        cutoff_date = timezone.now() - timedelta(
-            days=settings.KEEP_DELETED_TRANSACTIONS_FOR
-        )
-
-    invalidate()
+    # Calculate the cutoff date
+    cutoff_date = timezone.now() - timedelta(
+        days=settings.KEEP_DELETED_TRANSACTIONS_FOR
+    )
 
     # Hard delete soft-deleted transactions older than the cutoff date
     old_transactions = Transaction.userless_deleted_objects.filter(

app/apps/transactions/tests.py

@@ -2,23 +2,13 @@ import datetime
 from decimal import Decimal
 from datetime import date, timedelta
 
-import datetime
-from decimal import Decimal
-from datetime import date, timedelta
-from unittest.mock import patch # Added
-
-from django.test import TestCase, override_settings
+from django.test import TestCase
 from django.core.exceptions import ValidationError
 from django.utils import timezone
-from django.contrib.auth.models import User
-from django.db import IntegrityError
-from django.conf import settings # Added
-from apps.transactions.signals import transaction_deleted # Added
 
 from apps.transactions.models import (
     TransactionCategory,
     TransactionTag,
-    TransactionEntity,
     Transaction,
     InstallmentPlan,
     RecurringTransaction,
@@ -28,111 +18,31 @@ from apps.currencies.models import Currency, ExchangeRate
 
 
 class TransactionCategoryTests(TestCase):
-    def setUp(self):
-        self.owner1 = User.objects.create_user(username='owner1', password='password1')
-        self.owner2 = User.objects.create_user(username='owner2', password='password2')
-
     def test_category_creation(self):
         """Test basic category creation"""
-        category = TransactionCategory.objects.create(name="Groceries", owner=self.owner1)
+        category = TransactionCategory.objects.create(name="Groceries")
         self.assertEqual(str(category), "Groceries")
         self.assertFalse(category.mute)
-        self.assertEqual(category.owner, self.owner1)
-
-    def test_category_name_unique_per_owner(self):
-        """Test that category names must be unique per owner."""
-        TransactionCategory.objects.create(name="Groceries", owner=self.owner1)
-
-        with self.assertRaises(ValidationError) as cm: # Should be caught by full_clean due to unique_together
-            category_dup = TransactionCategory(name="Groceries", owner=self.owner1)
-            category_dup.full_clean()
-        # Check the error dict
-        self.assertIn('__all__', cm.exception.error_dict) # unique_together errors are non-field errors
-        self.assertTrue(any("already exists" in e.message for e in cm.exception.error_dict['__all__']))
-
-        # Test with IntegrityError on save if full_clean isn't strict enough or bypassed
-        with self.assertRaises(IntegrityError):
-            TransactionCategory.objects.create(name="Groceries", owner=self.owner1)
-
-        # Should succeed for a different owner
-        try:
-            TransactionCategory.objects.create(name="Groceries", owner=self.owner2)
-        except (IntegrityError, ValidationError):
-            self.fail("Creating category with same name but different owner failed unexpectedly.")
 
 
 class TransactionTagTests(TestCase):
-    def setUp(self):
-        self.owner1 = User.objects.create_user(username='tagowner1', password='password1')
-        self.owner2 = User.objects.create_user(username='tagowner2', password='password2')
-
     def test_tag_creation(self):
         """Test basic tag creation"""
-        tag = TransactionTag.objects.create(name="Essential", owner=self.owner1)
+        tag = TransactionTag.objects.create(name="Essential")
         self.assertEqual(str(tag), "Essential")
-        self.assertEqual(tag.owner, self.owner1)
-
-    def test_tag_name_unique_per_owner(self):
-        """Test that tag names must be unique per owner."""
-        TransactionTag.objects.create(name="Essential", owner=self.owner1)
-
-        with self.assertRaises(ValidationError):
-            tag_dup = TransactionTag(name="Essential", owner=self.owner1)
-            tag_dup.full_clean()
-
-        with self.assertRaises(IntegrityError):
-            TransactionTag.objects.create(name="Essential", owner=self.owner1)
-
-        try:
-            TransactionTag.objects.create(name="Essential", owner=self.owner2)
-        except (IntegrityError, ValidationError):
-            self.fail("Creating tag with same name but different owner failed unexpectedly.")
-
-
-class TransactionEntityTests(TestCase):
-    def setUp(self):
-        self.owner1 = User.objects.create_user(username='entityowner1', password='password1')
-        self.owner2 = User.objects.create_user(username='entityowner2', password='password2')
-
-    def test_entity_creation(self):
-        """Test basic entity creation"""
-        entity = TransactionEntity.objects.create(name="Supermarket X", owner=self.owner1)
-        self.assertEqual(str(entity), "Supermarket X")
-        self.assertEqual(entity.owner, self.owner1)
-
-    def test_entity_name_unique_per_owner(self):
-        """Test that entity names must be unique per owner."""
-        TransactionEntity.objects.create(name="Supermarket X", owner=self.owner1)
-
-        with self.assertRaises(ValidationError):
-            entity_dup = TransactionEntity(name="Supermarket X", owner=self.owner1)
-            entity_dup.full_clean()
-
-        with self.assertRaises(IntegrityError):
-            TransactionEntity.objects.create(name="Supermarket X", owner=self.owner1)
-
-        try:
-            TransactionEntity.objects.create(name="Supermarket X", owner=self.owner2)
-        except (IntegrityError, ValidationError):
-            self.fail("Creating entity with same name but different owner failed unexpectedly.")
 
 
 class TransactionTests(TestCase):
     def setUp(self):
         """Set up test data"""
-        self.owner = User.objects.create_user(username='transowner', password='password')
-
-        self.usd = Currency.objects.create( # Renamed self.currency to self.usd for clarity
+        self.currency = Currency.objects.create(
             code="USD", name="US Dollar", decimal_places=2, prefix="$ "
         )
-        self.eur = Currency.objects.create( # Added EUR for exchange tests
-            code="EUR", name="Euro", decimal_places=2, prefix="€ "
-        )
-        self.account_group = AccountGroup.objects.create(name="Test Group", owner=self.owner) # Added owner
+        self.account_group = AccountGroup.objects.create(name="Test Group")
         self.account = Account.objects.create(
-            name="Test Account", group=self.account_group, currency=self.usd, owner=self.owner # Added owner
+            name="Test Account", group=self.account_group, currency=self.currency
         )
-        self.category = TransactionCategory.objects.create(name="Test Category", owner=self.owner) # Added owner
+        self.category = TransactionCategory.objects.create(name="Test Category")
 
     def test_transaction_creation(self):
         """Test basic transaction creation with required fields"""
@@ -149,16 +59,18 @@ class TransactionTests(TestCase):
 
     def test_transaction_with_exchange_currency(self):
         """Test transaction with exchange currency"""
-        # This test is now superseded by more specific exchanged_amount tests with mocks.
-        # Keeping it for now as it tests actual rate lookup if needed, but can be removed if redundant.
-        self.account.exchange_currency = self.eur
+        eur = Currency.objects.create(
+            code="EUR", name="Euro", decimal_places=2, prefix="€"
+        )
+        self.account.exchange_currency = eur
         self.account.save()
 
+        # Create exchange rate
         ExchangeRate.objects.create(
-            from_currency=self.usd, # Use self.usd
-            to_currency=self.eur,
+            from_currency=self.currency,
+            to_currency=eur,
             rate=Decimal("0.85"),
-            date=timezone.now().date(), # Ensure date matches for lookup
+            date=timezone.now(),
         )
 
         transaction = Transaction.objects.create(
@@ -167,13 +79,11 @@ class TransactionTests(TestCase):
             date=timezone.now().date(),
             amount=Decimal("100.00"),
             description="Test transaction",
-            owner=self.owner # Added owner
         )
 
         exchanged = transaction.exchanged_amount()
         self.assertIsNotNone(exchanged)
-        self.assertEqual(exchanged["amount"], Decimal("85.00")) # 100 * 0.85
-        self.assertEqual(exchanged["prefix"], "€ ") # Check prefix from self.eur
+        self.assertEqual(exchanged["prefix"], "€")
 
     def test_truncating_amount(self):
         """Test amount truncating based on account.currency decimal places"""
@@ -183,17 +93,10 @@ class TransactionTests(TestCase):
             date=timezone.now().date(),
             amount=Decimal(
                 "100.0100001"
-            ),
+            ),  # account currency has two decimal places, the last 1 should be removed
             description="Test transaction",
-            owner=self.owner # Added owner
         )
-        # The model's save() method truncates based on currency's decimal_places.
-        # If USD has 2 decimal_places, 100.0100001 becomes 100.01.
-        # The original test asserted 100.0100000, which means the field might store more,
-        # but the *value* used for calculations should be truncated.
-        # Let's assume the save method correctly truncates to currency precision.
-        self.assertEqual(transaction.amount, Decimal("100.01"))
-
+        self.assertEqual(transaction.amount, Decimal("100.0100000"))
 
     def test_automatic_reference_date(self):
         """Test reference_date from date"""
@@ -203,7 +106,6 @@ class TransactionTests(TestCase):
             date=datetime.datetime(day=20, month=1, year=2000).date(),
             amount=Decimal("100"),
             description="Test transaction",
-            owner=self.owner # Added owner
         )
         self.assertEqual(
             transaction.reference_date,
@@ -212,8 +114,6 @@ class TransactionTests(TestCase):
 
     def test_reference_date_is_always_on_first_day(self):
         """Test reference_date is always on the first day"""
-        # This test is essentially the same as test_transaction_save_reference_date_adjusts_to_first_of_month
-        # It verifies that the save() method correctly adjusts an explicitly set reference_date.
         transaction = Transaction.objects.create(
             account=self.account,
             type=Transaction.Type.EXPENSE,
@@ -221,177 +121,27 @@ class TransactionTests(TestCase):
             reference_date=datetime.datetime(day=20, month=2, year=2000).date(),
             amount=Decimal("100"),
             description="Test transaction",
-            owner=self.owner # Added owner
         )
         self.assertEqual(
             transaction.reference_date,
             datetime.datetime(day=1, month=2, year=2000).date(),
         )
 
-    # New tests for exchanged_amount with mocks
-    @patch('apps.transactions.models.convert')
-    def test_exchanged_amount_with_account_exchange_currency(self, mock_convert):
-        self.account.exchange_currency = self.eur
-        self.account.save()
-        mock_convert.return_value = (Decimal("85.00"), "€T ", "", 2) # amount, prefix, suffix, dp
-
-        transaction = Transaction.objects.create(
-            account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,1),
-            amount=Decimal("100.00"), description="Test", owner=self.owner
-        )
-        exchanged = transaction.exchanged_amount()
-
-        mock_convert.assert_called_once_with(
-            amount=Decimal("100.00"),
-            from_currency=self.usd,
-            to_currency=self.eur,
-            date=date(2023,1,1)
-        )
-        self.assertIsNotNone(exchanged)
-        self.assertEqual(exchanged['amount'], Decimal("85.00"))
-        self.assertEqual(exchanged['prefix'], "€T ")
-
-    @patch('apps.transactions.models.convert')
-    def test_exchanged_amount_with_currency_exchange_currency(self, mock_convert):
-        self.account.exchange_currency = None # Ensure account has no direct exchange currency
-        self.account.save()
-        self.usd.exchange_currency = self.eur # Set exchange currency on the Transaction's currency
-        self.usd.save()
-        mock_convert.return_value = (Decimal("88.00"), "€T ", "", 2)
-
-        transaction = Transaction.objects.create(
-            account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,1),
-            amount=Decimal("100.00"), description="Test", owner=self.owner
-        )
-        exchanged = transaction.exchanged_amount()
-
-        mock_convert.assert_called_once_with(
-            amount=Decimal("100.00"),
-            from_currency=self.usd,
-            to_currency=self.eur,
-            date=date(2023,1,1)
-        )
-        self.assertIsNotNone(exchanged)
-        self.assertEqual(exchanged['amount'], Decimal("88.00"))
-        self.assertEqual(exchanged['prefix'], "€T ")
-
-        # Cleanup
-        self.usd.exchange_currency = None
-        self.usd.save()
-
-
-    @patch('apps.transactions.models.convert')
-    def test_exchanged_amount_no_exchange_currency_defined(self, mock_convert):
-        self.account.exchange_currency = None
-        self.account.save()
-        self.usd.exchange_currency = None # Ensure currency also has no exchange currency
-        self.usd.save()
-
-        transaction = Transaction.objects.create(
-            account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,1),
-            amount=Decimal("100.00"), description="Test", owner=self.owner
-        )
-        exchanged = transaction.exchanged_amount()
-
-        mock_convert.assert_not_called()
-        self.assertIsNone(exchanged)
-
-    # Soft Delete Tests (assuming default or explicit settings.ENABLE_SOFT_DELETE = True)
-    # These tests were added in the previous step and are assumed to be correct.
-    # Skipping their diff for brevity unless specifically asked to review them.
-    # ... (soft delete tests from previous step, confirmed as already present) ...
-    # For brevity, not repeating the soft delete tests in this diff.
-    # Ensure they are maintained from the previous step's output.
-
-    # @patch.object(transaction_deleted, 'send') # This decorator was duplicated
-    # def test_transaction_soft_delete_first_call(self, mock_transaction_deleted_send): # This test is already defined above.
-    # ...
-        with self.settings(ENABLE_SOFT_DELETE=True):
-            t1 = Transaction.objects.create(
-                account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,10),
-                amount=Decimal("10.00"), description="Soft Delete Test 1", owner=self.owner
-            )
-
-            t1.delete()
-
-            # Refresh from all_objects manager
-            t1_refreshed = Transaction.all_objects.get(pk=t1.pk)
-
-            self.assertTrue(t1_refreshed.deleted)
-            self.assertIsNotNone(t1_refreshed.deleted_at)
-
-            self.assertNotIn(t1_refreshed, Transaction.objects.all())
-            self.assertIn(t1_refreshed, Transaction.all_objects.all())
-
-            mock_transaction_deleted_send.assert_called_once_with(sender=Transaction, instance=t1_refreshed, soft_delete=True)
-
-    def test_transaction_soft_delete_second_call_hard_deletes(self):
-        with self.settings(ENABLE_SOFT_DELETE=True):
-            t2 = Transaction.objects.create(
-                account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,11),
-                amount=Decimal("20.00"), description="Soft Delete Test 2", owner=self.owner
-            )
-
-            t2.delete() # First call: soft delete
-            t2.delete() # Second call: hard delete
-
-            self.assertNotIn(t2, Transaction.all_objects.all())
-            with self.assertRaises(Transaction.DoesNotExist):
-                Transaction.all_objects.get(pk=t2.pk)
-
-    def test_transaction_manager_deleted_objects(self):
-        with self.settings(ENABLE_SOFT_DELETE=True):
-            t3 = Transaction.objects.create(
-                account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,12),
-                amount=Decimal("30.00"), description="Soft Delete Test 3", owner=self.owner
-            )
-            t3.delete() # Soft delete
-
-            t4 = Transaction.objects.create(
-                account=self.account, type=Transaction.Type.INCOME, date=date(2023,1,13),
-                amount=Decimal("40.00"), description="Soft Delete Test 4", owner=self.owner
-            )
-
-            self.assertIn(t3, Transaction.deleted_objects.all())
-            self.assertNotIn(t4, Transaction.deleted_objects.all())
-
-    # Hard Delete Test
-    def test_transaction_hard_delete_when_soft_delete_disabled(self):
-        with self.settings(ENABLE_SOFT_DELETE=False):
-            t5 = Transaction.objects.create(
-                account=self.account, type=Transaction.Type.EXPENSE, date=date(2023,1,14),
-                amount=Decimal("50.00"), description="Hard Delete Test 5", owner=self.owner
-            )
-
-            t5.delete() # Should hard delete directly
-
-            self.assertNotIn(t5, Transaction.all_objects.all())
-            with self.assertRaises(Transaction.DoesNotExist):
-                Transaction.all_objects.get(pk=t5.pk)
-
-
-from dateutil.relativedelta import relativedelta # Added
 
 class InstallmentPlanTests(TestCase):
     def setUp(self):
         """Set up test data"""
-        self.owner = User.objects.create_user(username='installowner', password='password')
         self.currency = Currency.objects.create(
             code="USD", name="US Dollar", decimal_places=2, prefix="$ "
         )
-        self.account_group = AccountGroup.objects.create(name="Installment Group", owner=self.owner)
         self.account = Account.objects.create(
-            name="Test Account", currency=self.currency, owner=self.owner, group=self.account_group
+            name="Test Account", currency=self.currency
         )
-        self.category = TransactionCategory.objects.create(name="Installments", owner=self.owner, type=TransactionCategory.TransactionType.EXPENSE)
-
 
     def test_installment_plan_creation(self):
         """Test basic installment plan creation"""
         plan = InstallmentPlan.objects.create(
             account=self.account,
-            owner=self.owner,
-            category=self.category,
             type=Transaction.Type.EXPENSE,
             description="Test Plan",
             number_of_installments=12,
@@ -400,212 +150,24 @@ class InstallmentPlanTests(TestCase):
             recurrence=InstallmentPlan.Recurrence.MONTHLY,
         )
         self.assertEqual(plan.number_of_installments, 12)
-        self.assertEqual(plan.installment_start, 1) # Default
-        self.assertEqual(plan.account.currency.code, "USD")
-        self.assertEqual(plan.owner, self.owner)
-        self.assertIsNotNone(plan.end_date) # end_date should be calculated on save
-
-    # Tests for save() - end_date calculation
-    def test_installment_plan_save_calculates_end_date_monthly(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Monthly Plan", number_of_installments=3, start_date=date(2023,1,15), installment_amount=Decimal("100"), recurrence=InstallmentPlan.Recurrence.MONTHLY)
-        plan.save()
-        self.assertEqual(plan.end_date, date(2023,3,15))
-
-    def test_installment_plan_save_calculates_end_date_yearly(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Yearly Plan", number_of_installments=3, start_date=date(2023,1,15), installment_amount=Decimal("100"), recurrence=InstallmentPlan.Recurrence.YEARLY)
-        plan.save()
-        self.assertEqual(plan.end_date, date(2025,1,15))
-
-    def test_installment_plan_save_calculates_end_date_weekly(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Weekly Plan", number_of_installments=3, start_date=date(2023,1,1), installment_amount=Decimal("100"), recurrence=InstallmentPlan.Recurrence.WEEKLY)
-        plan.save()
-        self.assertEqual(plan.end_date, date(2023,1,1) + relativedelta(weeks=2)) # date(2023,1,15)
-
-    def test_installment_plan_save_calculates_end_date_daily(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Daily Plan", number_of_installments=3, start_date=date(2023,1,1), installment_amount=Decimal("100"), recurrence=InstallmentPlan.Recurrence.DAILY)
-        plan.save()
-        self.assertEqual(plan.end_date, date(2023,1,1) + relativedelta(days=2)) # date(2023,1,3)
-
-    def test_installment_plan_save_calculates_installment_total_number(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Total Num Plan", number_of_installments=12, installment_start=3, start_date=date(2023,1,1), installment_amount=Decimal("100"))
-        plan.save()
-        self.assertEqual(plan.installment_total_number, 14)
-
-    def test_installment_plan_save_default_reference_date_and_start(self):
-        plan = InstallmentPlan(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, description="Default Ref Plan", number_of_installments=12, start_date=date(2023,1,15), installment_amount=Decimal("100"), reference_date=None, installment_start=None)
-        plan.save()
-        self.assertEqual(plan.reference_date, date(2023,1,15))
         self.assertEqual(plan.installment_start, 1)
-
-    # Tests for create_transactions()
-    def test_installment_plan_create_transactions_monthly(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Create Monthly", number_of_installments=3, start_date=date(2023,1,10), installment_amount=Decimal("50"), recurrence=InstallmentPlan.Recurrence.MONTHLY, category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 3)
-        transactions = list(plan.transactions.order_by('installment_id'))
-        self.assertEqual(transactions[0].date, date(2023,1,10))
-        self.assertEqual(transactions[0].reference_date, date(2023,1,1))
-        self.assertEqual(transactions[0].installment_id, 1)
-        self.assertEqual(transactions[1].date, date(2023,2,10))
-        self.assertEqual(transactions[1].reference_date, date(2023,2,1))
-        self.assertEqual(transactions[1].installment_id, 2)
-        self.assertEqual(transactions[2].date, date(2023,3,10))
-        self.assertEqual(transactions[2].reference_date, date(2023,3,1))
-        self.assertEqual(transactions[2].installment_id, 3)
-        for t in transactions:
-            self.assertEqual(t.amount, Decimal("50"))
-            self.assertFalse(t.is_paid)
-            self.assertEqual(t.owner, self.owner)
-            self.assertEqual(t.category, self.category)
-
-    def test_installment_plan_create_transactions_yearly(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Create Yearly", number_of_installments=2, start_date=date(2023,1,10), installment_amount=Decimal("500"), recurrence=InstallmentPlan.Recurrence.YEARLY, category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 2)
-        transactions = list(plan.transactions.order_by('installment_id'))
-        self.assertEqual(transactions[0].date, date(2023,1,10))
-        self.assertEqual(transactions[1].date, date(2024,1,10))
-
-    def test_installment_plan_create_transactions_weekly(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Create Weekly", number_of_installments=3, start_date=date(2023,1,1), installment_amount=Decimal("20"), recurrence=InstallmentPlan.Recurrence.WEEKLY, category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 3)
-        transactions = list(plan.transactions.order_by('installment_id'))
-        self.assertEqual(transactions[0].date, date(2023,1,1))
-        self.assertEqual(transactions[1].date, date(2023,1,8))
-        self.assertEqual(transactions[2].date, date(2023,1,15))
-
-    def test_installment_plan_create_transactions_daily(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Create Daily", number_of_installments=4, start_date=date(2023,1,1), installment_amount=Decimal("10"), recurrence=InstallmentPlan.Recurrence.DAILY, category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 4)
-        transactions = list(plan.transactions.order_by('installment_id'))
-        self.assertEqual(transactions[0].date, date(2023,1,1))
-        self.assertEqual(transactions[1].date, date(2023,1,2))
-        self.assertEqual(transactions[2].date, date(2023,1,3))
-        self.assertEqual(transactions[3].date, date(2023,1,4))
-
-    def test_create_transactions_with_installment_start_offset(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Offset Start", number_of_installments=2, start_date=date(2023,1,10), installment_start=3, installment_amount=Decimal("50"), category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 2)
-        transactions = list(plan.transactions.order_by('installment_id'))
-        self.assertEqual(transactions[0].installment_id, 3)
-        self.assertEqual(transactions[0].date, date(2023,1,10)) # First transaction is on start_date
-        self.assertEqual(transactions[1].installment_id, 4)
-        self.assertEqual(transactions[1].date, date(2023,2,10)) # Assuming monthly for this offset test
-
-    def test_create_transactions_deletes_existing_linked_transactions(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Delete Existing Test", number_of_installments=2, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions() # Creates 2 transactions
-
-        # Manually create an extra transaction linked to this plan
-        extra_tx = Transaction.objects.create(account=self.account, owner=self.owner, category=self.category, type=Transaction.Type.EXPENSE, amount=Decimal("999"), date=date(2023,1,1), installment_plan=plan, installment_id=99)
-        self.assertEqual(plan.transactions.count(), 3)
-
-        plan.create_transactions() # Should delete all 3 and recreate 2
-        self.assertEqual(plan.transactions.count(), 2)
-        with self.assertRaises(Transaction.DoesNotExist):
-            Transaction.objects.get(pk=extra_tx.pk)
-
-    # Test for delete()
-    def test_installment_plan_delete_cascades_to_transactions(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Cascade Delete Test", number_of_installments=2, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions()
-
-        transaction_count = plan.transactions.count()
-        self.assertTrue(transaction_count > 0)
-
-        plan_pk = plan.pk
-        plan.delete()
-
-        self.assertFalse(InstallmentPlan.objects.filter(pk=plan_pk).exists())
-        self.assertEqual(Transaction.objects.filter(installment_plan_id=plan_pk).count(), 0)
-
-    # Tests for update_transactions()
-    def test_update_transactions_amount_change(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Update Amount", number_of_installments=2, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions()
-        t1 = plan.transactions.first()
-
-        plan.installment_amount = Decimal("120.00")
-        plan.save() # Save plan first
-        plan.update_transactions()
-
-        t1.refresh_from_db()
-        self.assertEqual(t1.amount, Decimal("120.00"))
-        self.assertFalse(t1.is_paid) # Should remain unpaid
-
-    def test_update_transactions_change_num_installments_increase(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Increase Installments", number_of_installments=2, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 2)
-
-        plan.number_of_installments = 3
-        plan.save() # This should update end_date and installment_total_number
-        plan.update_transactions()
-
-        self.assertEqual(plan.transactions.count(), 3)
-        # Check the new transaction
-        last_tx = plan.transactions.order_by('installment_id').last()
-        self.assertEqual(last_tx.installment_id, 3)
-        self.assertEqual(last_tx.date, date(2023,1,1) + relativedelta(months=2)) # Assuming monthly
-
-    def test_update_transactions_change_num_installments_decrease_unpaid_deleted(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Decrease Installments", number_of_installments=3, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 3)
-
-        plan.number_of_installments = 2
-        plan.save()
-        plan.update_transactions()
-
-        self.assertEqual(plan.transactions.count(), 2)
-        # Check that the third transaction (installment_id=3) is deleted
-        self.assertFalse(Transaction.objects.filter(installment_plan=plan, installment_id=3).exists())
-
-    def test_update_transactions_paid_transaction_amount_not_changed(self):
-        plan = InstallmentPlan.objects.create(account=self.account, owner=self.owner, type=Transaction.Type.EXPENSE, description="Paid No Change", number_of_installments=2, start_date=date(2023,1,1), installment_amount=Decimal("100"), category=self.category)
-        plan.create_transactions()
-
-        t1 = plan.transactions.order_by('installment_id').first()
-        t1.is_paid = True
-        t1.save()
-
-        original_amount_t1 = t1.amount # Should be 100
-
-        plan.installment_amount = Decimal("150.00")
-        plan.save()
-        plan.update_transactions()
-
-        t1.refresh_from_db()
-        self.assertEqual(t1.amount, original_amount_t1, "Paid transaction amount should not change.")
-
-        # Check that unpaid transactions are updated
-        t2 = plan.transactions.order_by('installment_id').last()
-        self.assertEqual(t2.amount, Decimal("150.00"), "Unpaid transaction amount should update.")
+        self.assertEqual(plan.account.currency.code, "USD")
 
 
 class RecurringTransactionTests(TestCase):
     def setUp(self):
         """Set up test data"""
-        self.owner = User.objects.create_user(username='rtowner', password='password')
         self.currency = Currency.objects.create(
             code="USD", name="US Dollar", decimal_places=2, prefix="$ "
         )
-        self.account_group = AccountGroup.objects.create(name="RT Group", owner=self.owner)
         self.account = Account.objects.create(
-            name="Test Account", currency=self.currency, owner=self.owner, group=self.account_group
-        )
-        self.category = TransactionCategory.objects.create(
-            name="Recurring Cat", owner=self.owner, type=TransactionCategory.TransactionType.INFO
+            name="Test Account", currency=self.currency
         )
 
     def test_recurring_transaction_creation(self):
         """Test basic recurring transaction creation"""
-        rt = RecurringTransaction.objects.create(
+        recurring = RecurringTransaction.objects.create(
             account=self.account,
-            category=self.category, # Added category
             type=Transaction.Type.EXPENSE,
             amount=Decimal("100.00"),
             description="Monthly Payment",
@@ -613,157 +175,6 @@ class RecurringTransactionTests(TestCase):
             recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
             recurrence_interval=1,
         )
-        self.assertFalse(rt.paused)
-        self.assertEqual(rt.recurrence_interval, 1)
-        self.assertEqual(rt.account.currency.code, "USD")
-        self.assertEqual(rt.account.owner, self.owner) # Check owner via account
-
-    def test_get_recurrence_delta(self):
-        """Test get_recurrence_delta for various recurrence types."""
-        rt = RecurringTransaction() # Minimal instance
-
-        rt.recurrence_type = RecurringTransaction.RecurrenceType.DAY
-        rt.recurrence_interval = 5
-        self.assertEqual(rt.get_recurrence_delta(), relativedelta(days=5))
-
-        rt.recurrence_type = RecurringTransaction.RecurrenceType.WEEK
-        rt.recurrence_interval = 2
-        self.assertEqual(rt.get_recurrence_delta(), relativedelta(weeks=2))
-
-        rt.recurrence_type = RecurringTransaction.RecurrenceType.MONTH
-        rt.recurrence_interval = 3
-        self.assertEqual(rt.get_recurrence_delta(), relativedelta(months=3))
-
-        rt.recurrence_type = RecurringTransaction.RecurrenceType.YEAR
-        rt.recurrence_interval = 1
-        self.assertEqual(rt.get_recurrence_delta(), relativedelta(years=1))
-
-    def test_get_next_date(self):
-        """Test get_next_date calculation."""
-        rt = RecurringTransaction(recurrence_type=RecurringTransaction.RecurrenceType.MONTH, recurrence_interval=1)
-        current_date = date(2023, 1, 15)
-        expected_next_date = date(2023, 2, 15)
-        self.assertEqual(rt.get_next_date(current_date), expected_next_date)
-
-        rt.recurrence_type = RecurringTransaction.RecurrenceType.YEAR
-        rt.recurrence_interval = 2
-        current_date_yearly = date(2023, 3, 1)
-        expected_next_date_yearly = date(2025, 3, 1)
-        self.assertEqual(rt.get_next_date(current_date_yearly), expected_next_date_yearly)
-
-    def test_create_transaction_instance_method(self):
-        """Test the create_transaction instance method of RecurringTransaction."""
-        rt = RecurringTransaction.objects.create(
-            account=self.account,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("50.00"),
-            description="Test RT Description",
-            start_date=date(2023,1,1),
-            recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
-            recurrence_interval=1,
-            category=self.category,
-            # owner is implicitly through account
-        )
-
-        transaction_date = date(2023, 2, 10) # Specific date for the new transaction
-        reference_date_for_tx = date(2023, 2, 10) # Date to base reference_date on
-
-        created_tx = rt.create_transaction(transaction_date, reference_date_for_tx)
-
-        self.assertIsInstance(created_tx, Transaction)
-        self.assertEqual(created_tx.account, rt.account)
-        self.assertEqual(created_tx.type, rt.type)
-        self.assertEqual(created_tx.amount, rt.amount)
-        self.assertEqual(created_tx.description, rt.description)
-        self.assertEqual(created_tx.category, rt.category)
-        self.assertEqual(created_tx.date, transaction_date)
-        self.assertEqual(created_tx.reference_date, reference_date_for_tx.replace(day=1))
-        self.assertFalse(created_tx.is_paid) # Default for created transactions
-        self.assertEqual(created_tx.recurring_transaction, rt)
-        self.assertEqual(created_tx.owner, rt.account.owner)
-
-    # Tests for update_unpaid_transactions()
-    def test_update_unpaid_transactions_updates_details(self):
-        category1 = TransactionCategory.objects.create(name="Old Category", owner=self.owner, type=TransactionCategory.TransactionType.INFO)
-        category2 = TransactionCategory.objects.create(name="New Category", owner=self.owner, type=TransactionCategory.TransactionType.INFO)
-
-        rt = RecurringTransaction.objects.create(
-            account=self.account,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("100.00"),
-            description="Old Desc",
-            start_date=date(2023,1,1),
-            recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
-            recurrence_interval=1,
-            category=category1, # Initial category
-        )
-        # Create some transactions linked to this RT
-        t1_date = date(2023,1,1)
-        t1_ref_date = date(2023,1,1)
-        t1 = rt.create_transaction(t1_date, t1_ref_date)
-        t1.is_paid = True
-        t1.save()
-
-        t2_date = date(2023,2,1)
-        t2_ref_date = date(2023,2,1)
-        t2 = rt.create_transaction(t2_date, t2_ref_date) # Unpaid
-
-        # Update RecurringTransaction
-        rt.amount = Decimal("120.00")
-        rt.description = "New Desc"
-        rt.category = category2
-        rt.save()
-
-        rt.update_unpaid_transactions()
-
-        t1.refresh_from_db()
-        t2.refresh_from_db()
-
-        # Paid transaction should not change
-        self.assertEqual(t1.amount, Decimal("100.00"))
-        self.assertEqual(t1.description, "Old Desc") # Description on RT is for future, not existing
-        self.assertEqual(t1.category, category1)
-
-        # Unpaid transaction should be updated
-        self.assertEqual(t2.amount, Decimal("120.00"))
-        self.assertEqual(t2.description, "New Desc") # Description should update
-        self.assertEqual(t2.category, category2)
-
-
-    # Tests for delete_unpaid_transactions()
-    @patch('apps.transactions.models.timezone.now')
-    def test_delete_unpaid_transactions_leaves_paid_and_past(self, mock_now):
-        mock_now.return_value.date.return_value = date(2023, 2, 15) # "today"
-
-        rt = RecurringTransaction.objects.create(
-            account=self.account,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("50.00"),
-            description="Test Deletion RT",
-            start_date=date(2023,1,1),
-            recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
-            recurrence_interval=1,
-            category=self.category,
-        )
-
-        # Create transactions
-        t_past_paid = rt.create_transaction(date(2023, 1, 1), date(2023,1,1))
-        t_past_paid.is_paid = True
-        t_past_paid.save()
-
-        t_past_unpaid = rt.create_transaction(date(2023, 2, 1), date(2023,2,1)) # Unpaid, before "today"
-
-        t_future_unpaid1 = rt.create_transaction(date(2023, 3, 1), date(2023,3,1)) # Unpaid, after "today"
-        t_future_unpaid2 = rt.create_transaction(date(2023, 4, 1), date(2023,4,1)) # Unpaid, after "today"
-
-        initial_count = rt.transactions.count()
-        self.assertEqual(initial_count, 4)
-
-        rt.delete_unpaid_transactions()
-
-        self.assertTrue(Transaction.objects.filter(pk=t_past_paid.pk).exists())
-        self.assertTrue(Transaction.objects.filter(pk=t_past_unpaid.pk).exists())
-        self.assertFalse(Transaction.objects.filter(pk=t_future_unpaid1.pk).exists())
-        self.assertFalse(Transaction.objects.filter(pk=t_future_unpaid2.pk).exists())
-
-        self.assertEqual(rt.transactions.count(), 2)
+        self.assertFalse(recurring.is_paused)
+        self.assertEqual(recurring.recurrence_interval, 1)
+        self.assertEqual(recurring.account.currency.code, "USD")

app/apps/transactions/urls.py

@@ -66,6 +66,21 @@ urlpatterns = [
         views.transaction_pay,
         name="transaction_pay",
     ),
+    path(
+        "transaction/<int:transaction_id>/mute/",
+        views.transaction_mute,
+        name="transaction_mute",
+    ),
+    path(
+        "transaction/<int:transaction_id>/change-month/<str:change_type>/",
+        views.transaction_change_month,
+        name="transaction_change_month",
+    ),
+    path(
+        "transaction/<int:transaction_id>/move-to-today/",
+        views.transaction_move_to_today,
+        name="transaction_move_to_today",
+    ),
     path(
         "transaction/<int:transaction_id>/delete/",
         views.transaction_delete,
@@ -307,4 +322,44 @@ urlpatterns = [
         views.recurring_transaction_finish,
         name="recurring_transaction_finish",
     ),
+    path(
+        "quick-transactions/",
+        views.quick_transactions_index,
+        name="quick_transactions_index",
+    ),
+    path(
+        "quick-transactions/list/",
+        views.quick_transactions_list,
+        name="quick_transactions_list",
+    ),
+    path(
+        "quick-transactions/add/",
+        views.quick_transaction_add,
+        name="quick_transaction_add",
+    ),
+    path(
+        "quick-transactions/<int:quick_transaction_id>/edit/",
+        views.quick_transaction_edit,
+        name="quick_transaction_edit",
+    ),
+    path(
+        "quick-transactions/<int:quick_transaction_id>/delete/",
+        views.quick_transaction_delete,
+        name="quick_transaction_delete",
+    ),
+    path(
+        "quick-transactions/create-menu/",
+        views.quick_transactions_create_menu,
+        name="quick_transactions_create_menu",
+    ),
+    path(
+        "quick-transactions/<int:quick_transaction_id>/create/",
+        views.quick_transaction_add_as_transaction,
+        name="quick_transaction_add_as_transaction",
+    ),
+    path(
+        "transactions/<int:transaction_id>/add-as-quick-transaction/",
+        views.quick_transaction_add_as_quick_transaction,
+        name="quick_transaction_add_as_quick_transaction",
+    ),
 ]

app/apps/transactions/views/__init__.py

@@ -5,3 +5,4 @@ from .categories import *
 from .actions import *
 from .installment_plans import *
 from .recurring_transactions import *
+from .quick_transactions import *

app/apps/transactions/views/actions.py

@@ -62,7 +62,7 @@ def bulk_unpay_transactions(request):
 @login_required
 def bulk_delete_transactions(request):
     selected_transactions = request.GET.getlist("transactions", [])
-    transactions = Transaction.all_objects.filter(id__in=selected_transactions)
+    transactions = Transaction.objects.filter(id__in=selected_transactions)
     count = transactions.count()
     transactions.delete()
 

app/apps/transactions/views/quick_transactions.py

@@ -0,0 +1,229 @@
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.forms import model_to_dict
+from django.http import HttpResponse
+from django.shortcuts import render, get_object_or_404
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+from django.views.decorators.http import require_http_methods
+
+from apps.common.decorators.htmx import only_htmx
+from apps.transactions.forms import QuickTransactionForm
+from apps.transactions.models import QuickTransaction, transaction_created
+from apps.transactions.models import Transaction
+
+
+@login_required
+@require_http_methods(["GET"])
+def quick_transactions_index(request):
+    return render(
+        request,
+        "quick_transactions/pages/index.html",
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def quick_transactions_list(request):
+    quick_transactions = QuickTransaction.objects.all().order_by("name")
+    return render(
+        request,
+        "quick_transactions/fragments/list.html",
+        context={"quick_transactions": quick_transactions},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def quick_transaction_add(request):
+    if request.method == "POST":
+        form = QuickTransactionForm(request.POST)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Item added successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = QuickTransactionForm()
+
+    return render(
+        request,
+        "quick_transactions/fragments/add.html",
+        {"form": form},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def quick_transaction_edit(request, quick_transaction_id):
+    quick_transaction = get_object_or_404(QuickTransaction, id=quick_transaction_id)
+
+    if request.method == "POST":
+        form = QuickTransactionForm(request.POST, instance=quick_transaction)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Item updated successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = QuickTransactionForm(instance=quick_transaction)
+
+    return render(
+        request,
+        "quick_transactions/fragments/edit.html",
+        {"form": form, "quick_transaction": quick_transaction},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["DELETE"])
+def quick_transaction_delete(request, quick_transaction_id):
+    quick_transaction = get_object_or_404(QuickTransaction, id=quick_transaction_id)
+
+    quick_transaction.delete()
+
+    messages.success(request, _("Item deleted successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated, hide_offcanvas",
+        },
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def quick_transactions_create_menu(request):
+    quick_transactions = QuickTransaction.objects.all().order_by("name")
+    return render(
+        request,
+        "quick_transactions/fragments/create_menu.html",
+        context={"quick_transactions": quick_transactions},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def quick_transaction_add_as_transaction(request, quick_transaction_id):
+    quick_transaction: QuickTransaction = get_object_or_404(
+        QuickTransaction, id=quick_transaction_id
+    )
+    today = timezone.localdate(timezone.now())
+
+    quick_transaction_data = model_to_dict(
+        quick_transaction,
+        exclude=[
+            "id",
+            "name",
+            "owner",
+            "account",
+            "category",
+            "tags",
+            "entities",
+        ],
+    )
+
+    new_transaction = Transaction(**quick_transaction_data)
+    new_transaction.account = quick_transaction.account
+    new_transaction.category = quick_transaction.category
+
+    new_transaction.date = today
+    new_transaction.reference_date = today.replace(day=1)
+    new_transaction.save()
+    new_transaction.tags.set(quick_transaction.tags.all())
+    new_transaction.entities.set(quick_transaction.entities.all())
+
+    transaction_created.send(sender=new_transaction)
+
+    messages.success(request, _("Transaction added successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated, hide_offcanvas",
+        },
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def quick_transaction_add_as_quick_transaction(request, transaction_id):
+    transaction: Transaction = get_object_or_404(Transaction, pk=transaction_id)
+
+    if (
+        transaction.description
+        and QuickTransaction.objects.filter(
+            name__startswith=transaction.description
+        ).exists()
+    ) or QuickTransaction.objects.filter(
+        name__startswith=_("Quick Transaction")
+    ).exists():
+        if transaction.description:
+            count = QuickTransaction.objects.filter(
+                name__startswith=transaction.description
+            ).count()
+            qt_name = transaction.description + f" ({count + 1})"
+        else:
+            count = QuickTransaction.objects.filter(
+                name__startswith=_("Quick Transaction")
+            ).count()
+            qt_name = _("Quick Transaction") + f" ({count + 1})"
+    else:
+        qt_name = transaction.description or _("Quick Transaction")
+
+    transaction_data = model_to_dict(
+        transaction,
+        exclude=[
+            "id",
+            "name",
+            "owner",
+            "account",
+            "category",
+            "tags",
+            "entities",
+            "date",
+            "reference_date",
+            "installment_plan",
+            "installment_id",
+            "recurring_transaction",
+            "deleted",
+            "deleted_at",
+        ],
+    )
+
+    new_quick_transaction = QuickTransaction(**transaction_data)
+    new_quick_transaction.account = transaction.account
+    new_quick_transaction.category = transaction.category
+
+    new_quick_transaction.name = qt_name
+
+    new_quick_transaction.save()
+    new_quick_transaction.tags.set(transaction.tags.all())
+    new_quick_transaction.entities.set(transaction.entities.all())
+
+    messages.success(request, _("Item added successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "toasts",
+        },
+    )

app/apps/transactions/views/transactions.py

@@ -1,10 +1,11 @@
 import datetime
 from copy import deepcopy
 
+from dateutil.relativedelta import relativedelta
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
-from django.db.models import Q
+from django.db.models import Q, When, Case, Value, IntegerField
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import render, get_object_or_404
 from django.utils import timezone
@@ -212,6 +213,7 @@ def transactions_bulk_edit(request):
         if form.is_valid():
             # Apply changes from the form to all selected transactions
             for transaction in transactions:
+                old_data = deepcopy(transaction)
                 for field_name, value in form.cleaned_data.items():
                     if value or isinstance(
                         value, bool
@@ -224,7 +226,7 @@ def transactions_bulk_edit(request):
                             setattr(transaction, field_name, value)
 
                 transaction.save()
-                transaction_updated.send(sender=transaction)
+                transaction_updated.send(sender=transaction, old_data=old_data)
 
             messages.success(
                 request,
@@ -372,10 +374,13 @@ def transactions_transfer(request):
 @require_http_methods(["GET"])
 def transaction_pay(request, transaction_id):
     transaction = get_object_or_404(Transaction, pk=transaction_id)
+    old_data = deepcopy(transaction)
+
     new_is_paid = False if transaction.is_paid else True
     transaction.is_paid = new_is_paid
     transaction.save()
-    transaction_updated.send(sender=transaction)
+
+    transaction_updated.send(sender=transaction, old_data=old_data)
 
     response = render(
         request,
@@ -388,6 +393,71 @@ def transaction_pay(request, transaction_id):
     return response
 
 
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def transaction_mute(request, transaction_id):
+    transaction = get_object_or_404(Transaction, pk=transaction_id)
+    old_data = deepcopy(transaction)
+
+    new_mute = False if transaction.mute else True
+    transaction.mute = new_mute
+    transaction.save()
+    transaction_updated.send(sender=transaction, old_data=old_data)
+
+    response = render(
+        request,
+        "transactions/fragments/item.html",
+        context={"transaction": transaction, **request.GET},
+    )
+    response.headers["HX-Trigger"] = "selective_update"
+    return response
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def transaction_change_month(request, transaction_id, change_type):
+    transaction: Transaction = get_object_or_404(Transaction, pk=transaction_id)
+    old_data = deepcopy(transaction)
+
+    if change_type == "next":
+        transaction.reference_date = transaction.reference_date + relativedelta(
+            months=1
+        )
+        transaction.save()
+        transaction_updated.send(sender=transaction, old_data=old_data)
+    elif change_type == "previous":
+        transaction.reference_date = transaction.reference_date - relativedelta(
+            months=1
+        )
+        transaction.save()
+        transaction_updated.send(sender=transaction, old_data=old_data)
+
+    return HttpResponse(
+        status=204,
+        headers={"HX-Trigger": "updated"},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def transaction_move_to_today(request, transaction_id):
+    transaction: Transaction = get_object_or_404(Transaction, pk=transaction_id)
+
+    old_data = deepcopy(transaction)
+
+    transaction.date = timezone.localdate(timezone.now())
+    transaction.save()
+    transaction_updated.send(sender=transaction, old_data=old_data)
+
+    return HttpResponse(
+        status=204,
+        headers={"HX-Trigger": "updated"},
+    )
+
+
 @login_required
 @require_http_methods(["GET"])
 def transaction_all_index(request):
@@ -527,7 +597,10 @@ def transaction_all_currency_summary(request):
 
     f = TransactionsFilter(request.GET, queryset=transactions)
 
-    currency_data = calculate_currency_totals(f.qs.all(), ignore_empty=True)
+    currency_data = calculate_currency_totals(
+        f.qs.exclude(account__in=request.user.untracked_accounts.all()),
+        ignore_empty=True,
+    )
     currency_percentages = calculate_percentage_distribution(currency_data)
 
     context = {
@@ -586,11 +659,26 @@ def get_recent_transactions(request, filter_type=None):
     # Get search term from query params
     search_term = request.GET.get("q", "").strip()
 
+    today = timezone.localdate(timezone.now())
+    yesterday = today - timezone.timedelta(days=1)
+    tomorrow = today + timezone.timedelta(days=1)
+
     # Base queryset with selected fields
     queryset = (
         Transaction.objects.filter(deleted=False)
+        .annotate(
+            date_order=Case(
+                When(date=today, then=Value(0)),
+                When(date=tomorrow, then=Value(1)),
+                When(date=yesterday, then=Value(2)),
+                When(date__gt=tomorrow, then=Value(3)),
+                When(date__lt=yesterday, then=Value(4)),
+                default=Value(5),
+                output_field=IntegerField(),
+            )
+        )
         .select_related("account", "category")
-        .order_by("-created_at")
+        .order_by("date_order", "date", "id")
     )
 
     if filter_type:

app/apps/users/forms.py

@@ -2,7 +2,7 @@ from crispy_forms.bootstrap import (
     FormActions,
 )
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Submit, Row, Column, Field, Div
+from crispy_forms.layout import Layout, Submit, Row, Column, Field, Div, HTML
 from django import forms
 from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import (
@@ -45,7 +45,7 @@ class LoginForm(AuthenticationForm):
         self.helper.layout = Layout(
             "username",
             "password",
-            Submit("Submit", "Login"),
+            Submit("Submit", "Login", css_class="btn btn-primary w-100"),
         )
 
 
@@ -89,6 +89,8 @@ class UserSettingsForm(forms.ModelForm):
         ("AA", _("Default")),
         ("DC", "1.234,50"),
         ("CD", "1,234.50"),
+        ("SD", "1 234.50"),
+        ("SC", "1 234,50"),
     ]
 
     date_format = forms.ChoiceField(
@@ -115,6 +117,7 @@ class UserSettingsForm(forms.ModelForm):
             "date_format",
             "datetime_format",
             "number_format",
+            "volume",
         ]
 
     def __init__(self, *args, **kwargs):
@@ -126,10 +129,14 @@ class UserSettingsForm(forms.ModelForm):
         self.helper.layout = Layout(
             "language",
             "timezone",
+            HTML("<hr />"),
             "date_format",
             "datetime_format",
             "number_format",
+            HTML("<hr />"),
             "start_page",
+            HTML("<hr />"),
+            "volume",
             FormActions(
                 NoClassSubmit(
                     "submit", _("Save"), css_class="btn btn-outline-primary w-100"

app/apps/users/migrations/0022_usersettings_volume_alter_usersettings_timezone.py

@@ -0,0 +1,479 @@
+# Generated by Django 5.1.1 on 2025-06-29 00:48
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0021_alter_usersettings_timezone"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="usersettings",
+            name="volume",
+            field=models.PositiveIntegerField(
+                default=10,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(10),
+                ],
+                verbose_name="Volume",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="usersettings",
+            name="timezone",
+            field=models.CharField(
+                choices=[
+                    ("auto", "Auto"),
+                    ("Africa/Abidjan", "Africa/Abidjan"),
+                    ("Africa/Accra", "Africa/Accra"),
+                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
+                    ("Africa/Algiers", "Africa/Algiers"),
+                    ("Africa/Asmara", "Africa/Asmara"),
+                    ("Africa/Bamako", "Africa/Bamako"),
+                    ("Africa/Bangui", "Africa/Bangui"),
+                    ("Africa/Banjul", "Africa/Banjul"),
+                    ("Africa/Bissau", "Africa/Bissau"),
+                    ("Africa/Blantyre", "Africa/Blantyre"),
+                    ("Africa/Brazzaville", "Africa/Brazzaville"),
+                    ("Africa/Bujumbura", "Africa/Bujumbura"),
+                    ("Africa/Cairo", "Africa/Cairo"),
+                    ("Africa/Casablanca", "Africa/Casablanca"),
+                    ("Africa/Ceuta", "Africa/Ceuta"),
+                    ("Africa/Conakry", "Africa/Conakry"),
+                    ("Africa/Dakar", "Africa/Dakar"),
+                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
+                    ("Africa/Djibouti", "Africa/Djibouti"),
+                    ("Africa/Douala", "Africa/Douala"),
+                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
+                    ("Africa/Freetown", "Africa/Freetown"),
+                    ("Africa/Gaborone", "Africa/Gaborone"),
+                    ("Africa/Harare", "Africa/Harare"),
+                    ("Africa/Johannesburg", "Africa/Johannesburg"),
+                    ("Africa/Juba", "Africa/Juba"),
+                    ("Africa/Kampala", "Africa/Kampala"),
+                    ("Africa/Khartoum", "Africa/Khartoum"),
+                    ("Africa/Kigali", "Africa/Kigali"),
+                    ("Africa/Kinshasa", "Africa/Kinshasa"),
+                    ("Africa/Lagos", "Africa/Lagos"),
+                    ("Africa/Libreville", "Africa/Libreville"),
+                    ("Africa/Lome", "Africa/Lome"),
+                    ("Africa/Luanda", "Africa/Luanda"),
+                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
+                    ("Africa/Lusaka", "Africa/Lusaka"),
+                    ("Africa/Malabo", "Africa/Malabo"),
+                    ("Africa/Maputo", "Africa/Maputo"),
+                    ("Africa/Maseru", "Africa/Maseru"),
+                    ("Africa/Mbabane", "Africa/Mbabane"),
+                    ("Africa/Mogadishu", "Africa/Mogadishu"),
+                    ("Africa/Monrovia", "Africa/Monrovia"),
+                    ("Africa/Nairobi", "Africa/Nairobi"),
+                    ("Africa/Ndjamena", "Africa/Ndjamena"),
+                    ("Africa/Niamey", "Africa/Niamey"),
+                    ("Africa/Nouakchott", "Africa/Nouakchott"),
+                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
+                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
+                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
+                    ("Africa/Tripoli", "Africa/Tripoli"),
+                    ("Africa/Tunis", "Africa/Tunis"),
+                    ("Africa/Windhoek", "Africa/Windhoek"),
+                    ("America/Adak", "America/Adak"),
+                    ("America/Anchorage", "America/Anchorage"),
+                    ("America/Anguilla", "America/Anguilla"),
+                    ("America/Antigua", "America/Antigua"),
+                    ("America/Araguaina", "America/Araguaina"),
+                    (
+                        "America/Argentina/Buenos_Aires",
+                        "America/Argentina/Buenos_Aires",
+                    ),
+                    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
+                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
+                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
+                    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
+                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
+                    (
+                        "America/Argentina/Rio_Gallegos",
+                        "America/Argentina/Rio_Gallegos",
+                    ),
+                    ("America/Argentina/Salta", "America/Argentina/Salta"),
+                    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
+                    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
+                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
+                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
+                    ("America/Aruba", "America/Aruba"),
+                    ("America/Asuncion", "America/Asuncion"),
+                    ("America/Atikokan", "America/Atikokan"),
+                    ("America/Bahia", "America/Bahia"),
+                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
+                    ("America/Barbados", "America/Barbados"),
+                    ("America/Belem", "America/Belem"),
+                    ("America/Belize", "America/Belize"),
+                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
+                    ("America/Boa_Vista", "America/Boa_Vista"),
+                    ("America/Bogota", "America/Bogota"),
+                    ("America/Boise", "America/Boise"),
+                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
+                    ("America/Campo_Grande", "America/Campo_Grande"),
+                    ("America/Cancun", "America/Cancun"),
+                    ("America/Caracas", "America/Caracas"),
+                    ("America/Cayenne", "America/Cayenne"),
+                    ("America/Cayman", "America/Cayman"),
+                    ("America/Chicago", "America/Chicago"),
+                    ("America/Chihuahua", "America/Chihuahua"),
+                    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
+                    ("America/Costa_Rica", "America/Costa_Rica"),
+                    ("America/Creston", "America/Creston"),
+                    ("America/Cuiaba", "America/Cuiaba"),
+                    ("America/Curacao", "America/Curacao"),
+                    ("America/Danmarkshavn", "America/Danmarkshavn"),
+                    ("America/Dawson", "America/Dawson"),
+                    ("America/Dawson_Creek", "America/Dawson_Creek"),
+                    ("America/Denver", "America/Denver"),
+                    ("America/Detroit", "America/Detroit"),
+                    ("America/Dominica", "America/Dominica"),
+                    ("America/Edmonton", "America/Edmonton"),
+                    ("America/Eirunepe", "America/Eirunepe"),
+                    ("America/El_Salvador", "America/El_Salvador"),
+                    ("America/Fort_Nelson", "America/Fort_Nelson"),
+                    ("America/Fortaleza", "America/Fortaleza"),
+                    ("America/Glace_Bay", "America/Glace_Bay"),
+                    ("America/Goose_Bay", "America/Goose_Bay"),
+                    ("America/Grand_Turk", "America/Grand_Turk"),
+                    ("America/Grenada", "America/Grenada"),
+                    ("America/Guadeloupe", "America/Guadeloupe"),
+                    ("America/Guatemala", "America/Guatemala"),
+                    ("America/Guayaquil", "America/Guayaquil"),
+                    ("America/Guyana", "America/Guyana"),
+                    ("America/Halifax", "America/Halifax"),
+                    ("America/Havana", "America/Havana"),
+                    ("America/Hermosillo", "America/Hermosillo"),
+                    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
+                    ("America/Indiana/Knox", "America/Indiana/Knox"),
+                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
+                    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
+                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
+                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
+                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
+                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
+                    ("America/Inuvik", "America/Inuvik"),
+                    ("America/Iqaluit", "America/Iqaluit"),
+                    ("America/Jamaica", "America/Jamaica"),
+                    ("America/Juneau", "America/Juneau"),
+                    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
+                    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
+                    ("America/Kralendijk", "America/Kralendijk"),
+                    ("America/La_Paz", "America/La_Paz"),
+                    ("America/Lima", "America/Lima"),
+                    ("America/Los_Angeles", "America/Los_Angeles"),
+                    ("America/Lower_Princes", "America/Lower_Princes"),
+                    ("America/Maceio", "America/Maceio"),
+                    ("America/Managua", "America/Managua"),
+                    ("America/Manaus", "America/Manaus"),
+                    ("America/Marigot", "America/Marigot"),
+                    ("America/Martinique", "America/Martinique"),
+                    ("America/Matamoros", "America/Matamoros"),
+                    ("America/Mazatlan", "America/Mazatlan"),
+                    ("America/Menominee", "America/Menominee"),
+                    ("America/Merida", "America/Merida"),
+                    ("America/Metlakatla", "America/Metlakatla"),
+                    ("America/Mexico_City", "America/Mexico_City"),
+                    ("America/Miquelon", "America/Miquelon"),
+                    ("America/Moncton", "America/Moncton"),
+                    ("America/Monterrey", "America/Monterrey"),
+                    ("America/Montevideo", "America/Montevideo"),
+                    ("America/Montserrat", "America/Montserrat"),
+                    ("America/Nassau", "America/Nassau"),
+                    ("America/New_York", "America/New_York"),
+                    ("America/Nome", "America/Nome"),
+                    ("America/Noronha", "America/Noronha"),
+                    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
+                    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
+                    (
+                        "America/North_Dakota/New_Salem",
+                        "America/North_Dakota/New_Salem",
+                    ),
+                    ("America/Nuuk", "America/Nuuk"),
+                    ("America/Ojinaga", "America/Ojinaga"),
+                    ("America/Panama", "America/Panama"),
+                    ("America/Paramaribo", "America/Paramaribo"),
+                    ("America/Phoenix", "America/Phoenix"),
+                    ("America/Port-au-Prince", "America/Port-au-Prince"),
+                    ("America/Port_of_Spain", "America/Port_of_Spain"),
+                    ("America/Porto_Velho", "America/Porto_Velho"),
+                    ("America/Puerto_Rico", "America/Puerto_Rico"),
+                    ("America/Punta_Arenas", "America/Punta_Arenas"),
+                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
+                    ("America/Recife", "America/Recife"),
+                    ("America/Regina", "America/Regina"),
+                    ("America/Resolute", "America/Resolute"),
+                    ("America/Rio_Branco", "America/Rio_Branco"),
+                    ("America/Santarem", "America/Santarem"),
+                    ("America/Santiago", "America/Santiago"),
+                    ("America/Santo_Domingo", "America/Santo_Domingo"),
+                    ("America/Sao_Paulo", "America/Sao_Paulo"),
+                    ("America/Scoresbysund", "America/Scoresbysund"),
+                    ("America/Sitka", "America/Sitka"),
+                    ("America/St_Barthelemy", "America/St_Barthelemy"),
+                    ("America/St_Johns", "America/St_Johns"),
+                    ("America/St_Kitts", "America/St_Kitts"),
+                    ("America/St_Lucia", "America/St_Lucia"),
+                    ("America/St_Thomas", "America/St_Thomas"),
+                    ("America/St_Vincent", "America/St_Vincent"),
+                    ("America/Swift_Current", "America/Swift_Current"),
+                    ("America/Tegucigalpa", "America/Tegucigalpa"),
+                    ("America/Thule", "America/Thule"),
+                    ("America/Tijuana", "America/Tijuana"),
+                    ("America/Toronto", "America/Toronto"),
+                    ("America/Tortola", "America/Tortola"),
+                    ("America/Vancouver", "America/Vancouver"),
+                    ("America/Whitehorse", "America/Whitehorse"),
+                    ("America/Winnipeg", "America/Winnipeg"),
+                    ("America/Yakutat", "America/Yakutat"),
+                    ("Antarctica/Casey", "Antarctica/Casey"),
+                    ("Antarctica/Davis", "Antarctica/Davis"),
+                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
+                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
+                    ("Antarctica/Mawson", "Antarctica/Mawson"),
+                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
+                    ("Antarctica/Palmer", "Antarctica/Palmer"),
+                    ("Antarctica/Rothera", "Antarctica/Rothera"),
+                    ("Antarctica/Syowa", "Antarctica/Syowa"),
+                    ("Antarctica/Troll", "Antarctica/Troll"),
+                    ("Antarctica/Vostok", "Antarctica/Vostok"),
+                    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
+                    ("Asia/Aden", "Asia/Aden"),
+                    ("Asia/Almaty", "Asia/Almaty"),
+                    ("Asia/Amman", "Asia/Amman"),
+                    ("Asia/Anadyr", "Asia/Anadyr"),
+                    ("Asia/Aqtau", "Asia/Aqtau"),
+                    ("Asia/Aqtobe", "Asia/Aqtobe"),
+                    ("Asia/Ashgabat", "Asia/Ashgabat"),
+                    ("Asia/Atyrau", "Asia/Atyrau"),
+                    ("Asia/Baghdad", "Asia/Baghdad"),
+                    ("Asia/Bahrain", "Asia/Bahrain"),
+                    ("Asia/Baku", "Asia/Baku"),
+                    ("Asia/Bangkok", "Asia/Bangkok"),
+                    ("Asia/Barnaul", "Asia/Barnaul"),
+                    ("Asia/Beirut", "Asia/Beirut"),
+                    ("Asia/Bishkek", "Asia/Bishkek"),
+                    ("Asia/Brunei", "Asia/Brunei"),
+                    ("Asia/Chita", "Asia/Chita"),
+                    ("Asia/Colombo", "Asia/Colombo"),
+                    ("Asia/Damascus", "Asia/Damascus"),
+                    ("Asia/Dhaka", "Asia/Dhaka"),
+                    ("Asia/Dili", "Asia/Dili"),
+                    ("Asia/Dubai", "Asia/Dubai"),
+                    ("Asia/Dushanbe", "Asia/Dushanbe"),
+                    ("Asia/Famagusta", "Asia/Famagusta"),
+                    ("Asia/Gaza", "Asia/Gaza"),
+                    ("Asia/Hebron", "Asia/Hebron"),
+                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
+                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
+                    ("Asia/Hovd", "Asia/Hovd"),
+                    ("Asia/Irkutsk", "Asia/Irkutsk"),
+                    ("Asia/Jakarta", "Asia/Jakarta"),
+                    ("Asia/Jayapura", "Asia/Jayapura"),
+                    ("Asia/Jerusalem", "Asia/Jerusalem"),
+                    ("Asia/Kabul", "Asia/Kabul"),
+                    ("Asia/Kamchatka", "Asia/Kamchatka"),
+                    ("Asia/Karachi", "Asia/Karachi"),
+                    ("Asia/Kathmandu", "Asia/Kathmandu"),
+                    ("Asia/Khandyga", "Asia/Khandyga"),
+                    ("Asia/Kolkata", "Asia/Kolkata"),
+                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
+                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
+                    ("Asia/Kuching", "Asia/Kuching"),
+                    ("Asia/Kuwait", "Asia/Kuwait"),
+                    ("Asia/Macau", "Asia/Macau"),
+                    ("Asia/Magadan", "Asia/Magadan"),
+                    ("Asia/Makassar", "Asia/Makassar"),
+                    ("Asia/Manila", "Asia/Manila"),
+                    ("Asia/Muscat", "Asia/Muscat"),
+                    ("Asia/Nicosia", "Asia/Nicosia"),
+                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
+                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
+                    ("Asia/Omsk", "Asia/Omsk"),
+                    ("Asia/Oral", "Asia/Oral"),
+                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
+                    ("Asia/Pontianak", "Asia/Pontianak"),
+                    ("Asia/Pyongyang", "Asia/Pyongyang"),
+                    ("Asia/Qatar", "Asia/Qatar"),
+                    ("Asia/Qostanay", "Asia/Qostanay"),
+                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
+                    ("Asia/Riyadh", "Asia/Riyadh"),
+                    ("Asia/Sakhalin", "Asia/Sakhalin"),
+                    ("Asia/Samarkand", "Asia/Samarkand"),
+                    ("Asia/Seoul", "Asia/Seoul"),
+                    ("Asia/Shanghai", "Asia/Shanghai"),
+                    ("Asia/Singapore", "Asia/Singapore"),
+                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
+                    ("Asia/Taipei", "Asia/Taipei"),
+                    ("Asia/Tashkent", "Asia/Tashkent"),
+                    ("Asia/Tbilisi", "Asia/Tbilisi"),
+                    ("Asia/Tehran", "Asia/Tehran"),
+                    ("Asia/Thimphu", "Asia/Thimphu"),
+                    ("Asia/Tokyo", "Asia/Tokyo"),
+                    ("Asia/Tomsk", "Asia/Tomsk"),
+                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
+                    ("Asia/Urumqi", "Asia/Urumqi"),
+                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
+                    ("Asia/Vientiane", "Asia/Vientiane"),
+                    ("Asia/Vladivostok", "Asia/Vladivostok"),
+                    ("Asia/Yakutsk", "Asia/Yakutsk"),
+                    ("Asia/Yangon", "Asia/Yangon"),
+                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
+                    ("Asia/Yerevan", "Asia/Yerevan"),
+                    ("Atlantic/Azores", "Atlantic/Azores"),
+                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
+                    ("Atlantic/Canary", "Atlantic/Canary"),
+                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
+                    ("Atlantic/Faroe", "Atlantic/Faroe"),
+                    ("Atlantic/Madeira", "Atlantic/Madeira"),
+                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
+                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
+                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
+                    ("Atlantic/Stanley", "Atlantic/Stanley"),
+                    ("Australia/Adelaide", "Australia/Adelaide"),
+                    ("Australia/Brisbane", "Australia/Brisbane"),
+                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
+                    ("Australia/Darwin", "Australia/Darwin"),
+                    ("Australia/Eucla", "Australia/Eucla"),
+                    ("Australia/Hobart", "Australia/Hobart"),
+                    ("Australia/Lindeman", "Australia/Lindeman"),
+                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
+                    ("Australia/Melbourne", "Australia/Melbourne"),
+                    ("Australia/Perth", "Australia/Perth"),
+                    ("Australia/Sydney", "Australia/Sydney"),
+                    ("Canada/Atlantic", "Canada/Atlantic"),
+                    ("Canada/Central", "Canada/Central"),
+                    ("Canada/Eastern", "Canada/Eastern"),
+                    ("Canada/Mountain", "Canada/Mountain"),
+                    ("Canada/Newfoundland", "Canada/Newfoundland"),
+                    ("Canada/Pacific", "Canada/Pacific"),
+                    ("Europe/Amsterdam", "Europe/Amsterdam"),
+                    ("Europe/Andorra", "Europe/Andorra"),
+                    ("Europe/Astrakhan", "Europe/Astrakhan"),
+                    ("Europe/Athens", "Europe/Athens"),
+                    ("Europe/Belgrade", "Europe/Belgrade"),
+                    ("Europe/Berlin", "Europe/Berlin"),
+                    ("Europe/Bratislava", "Europe/Bratislava"),
+                    ("Europe/Brussels", "Europe/Brussels"),
+                    ("Europe/Bucharest", "Europe/Bucharest"),
+                    ("Europe/Budapest", "Europe/Budapest"),
+                    ("Europe/Busingen", "Europe/Busingen"),
+                    ("Europe/Chisinau", "Europe/Chisinau"),
+                    ("Europe/Copenhagen", "Europe/Copenhagen"),
+                    ("Europe/Dublin", "Europe/Dublin"),
+                    ("Europe/Gibraltar", "Europe/Gibraltar"),
+                    ("Europe/Guernsey", "Europe/Guernsey"),
+                    ("Europe/Helsinki", "Europe/Helsinki"),
+                    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
+                    ("Europe/Istanbul", "Europe/Istanbul"),
+                    ("Europe/Jersey", "Europe/Jersey"),
+                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
+                    ("Europe/Kirov", "Europe/Kirov"),
+                    ("Europe/Kyiv", "Europe/Kyiv"),
+                    ("Europe/Lisbon", "Europe/Lisbon"),
+                    ("Europe/Ljubljana", "Europe/Ljubljana"),
+                    ("Europe/London", "Europe/London"),
+                    ("Europe/Luxembourg", "Europe/Luxembourg"),
+                    ("Europe/Madrid", "Europe/Madrid"),
+                    ("Europe/Malta", "Europe/Malta"),
+                    ("Europe/Mariehamn", "Europe/Mariehamn"),
+                    ("Europe/Minsk", "Europe/Minsk"),
+                    ("Europe/Monaco", "Europe/Monaco"),
+                    ("Europe/Moscow", "Europe/Moscow"),
+                    ("Europe/Oslo", "Europe/Oslo"),
+                    ("Europe/Paris", "Europe/Paris"),
+                    ("Europe/Podgorica", "Europe/Podgorica"),
+                    ("Europe/Prague", "Europe/Prague"),
+                    ("Europe/Riga", "Europe/Riga"),
+                    ("Europe/Rome", "Europe/Rome"),
+                    ("Europe/Samara", "Europe/Samara"),
+                    ("Europe/San_Marino", "Europe/San_Marino"),
+                    ("Europe/Sarajevo", "Europe/Sarajevo"),
+                    ("Europe/Saratov", "Europe/Saratov"),
+                    ("Europe/Simferopol", "Europe/Simferopol"),
+                    ("Europe/Skopje", "Europe/Skopje"),
+                    ("Europe/Sofia", "Europe/Sofia"),
+                    ("Europe/Stockholm", "Europe/Stockholm"),
+                    ("Europe/Tallinn", "Europe/Tallinn"),
+                    ("Europe/Tirane", "Europe/Tirane"),
+                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
+                    ("Europe/Vaduz", "Europe/Vaduz"),
+                    ("Europe/Vatican", "Europe/Vatican"),
+                    ("Europe/Vienna", "Europe/Vienna"),
+                    ("Europe/Vilnius", "Europe/Vilnius"),
+                    ("Europe/Volgograd", "Europe/Volgograd"),
+                    ("Europe/Warsaw", "Europe/Warsaw"),
+                    ("Europe/Zagreb", "Europe/Zagreb"),
+                    ("Europe/Zurich", "Europe/Zurich"),
+                    ("GMT", "GMT"),
+                    ("Indian/Antananarivo", "Indian/Antananarivo"),
+                    ("Indian/Chagos", "Indian/Chagos"),
+                    ("Indian/Christmas", "Indian/Christmas"),
+                    ("Indian/Cocos", "Indian/Cocos"),
+                    ("Indian/Comoro", "Indian/Comoro"),
+                    ("Indian/Kerguelen", "Indian/Kerguelen"),
+                    ("Indian/Mahe", "Indian/Mahe"),
+                    ("Indian/Maldives", "Indian/Maldives"),
+                    ("Indian/Mauritius", "Indian/Mauritius"),
+                    ("Indian/Mayotte", "Indian/Mayotte"),
+                    ("Indian/Reunion", "Indian/Reunion"),
+                    ("Pacific/Apia", "Pacific/Apia"),
+                    ("Pacific/Auckland", "Pacific/Auckland"),
+                    ("Pacific/Bougainville", "Pacific/Bougainville"),
+                    ("Pacific/Chatham", "Pacific/Chatham"),
+                    ("Pacific/Chuuk", "Pacific/Chuuk"),
+                    ("Pacific/Easter", "Pacific/Easter"),
+                    ("Pacific/Efate", "Pacific/Efate"),
+                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
+                    ("Pacific/Fiji", "Pacific/Fiji"),
+                    ("Pacific/Funafuti", "Pacific/Funafuti"),
+                    ("Pacific/Galapagos", "Pacific/Galapagos"),
+                    ("Pacific/Gambier", "Pacific/Gambier"),
+                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
+                    ("Pacific/Guam", "Pacific/Guam"),
+                    ("Pacific/Honolulu", "Pacific/Honolulu"),
+                    ("Pacific/Kanton", "Pacific/Kanton"),
+                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
+                    ("Pacific/Kosrae", "Pacific/Kosrae"),
+                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
+                    ("Pacific/Majuro", "Pacific/Majuro"),
+                    ("Pacific/Marquesas", "Pacific/Marquesas"),
+                    ("Pacific/Midway", "Pacific/Midway"),
+                    ("Pacific/Nauru", "Pacific/Nauru"),
+                    ("Pacific/Niue", "Pacific/Niue"),
+                    ("Pacific/Norfolk", "Pacific/Norfolk"),
+                    ("Pacific/Noumea", "Pacific/Noumea"),
+                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
+                    ("Pacific/Palau", "Pacific/Palau"),
+                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
+                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
+                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
+                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
+                    ("Pacific/Saipan", "Pacific/Saipan"),
+                    ("Pacific/Tahiti", "Pacific/Tahiti"),
+                    ("Pacific/Tarawa", "Pacific/Tarawa"),
+                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
+                    ("Pacific/Wake", "Pacific/Wake"),
+                    ("Pacific/Wallis", "Pacific/Wallis"),
+                    ("US/Alaska", "US/Alaska"),
+                    ("US/Arizona", "US/Arizona"),
+                    ("US/Central", "US/Central"),
+                    ("US/Eastern", "US/Eastern"),
+                    ("US/Hawaii", "US/Hawaii"),
+                    ("US/Mountain", "US/Mountain"),
+                    ("US/Pacific", "US/Pacific"),
+                    ("UTC", "UTC"),
+                ],
+                default="auto",
+                max_length=50,
+                verbose_name="Time Zone",
+            ),
+        ),
+    ]

app/apps/users/models.py

@@ -2,11 +2,449 @@ import pytz
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AbstractUser, Group
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 from apps.users.managers import UserManager
 
+timezones = [
+    ("auto", _("Auto")),
+    ("Africa/Abidjan", "Africa/Abidjan"),
+    ("Africa/Accra", "Africa/Accra"),
+    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
+    ("Africa/Algiers", "Africa/Algiers"),
+    ("Africa/Asmara", "Africa/Asmara"),
+    ("Africa/Bamako", "Africa/Bamako"),
+    ("Africa/Bangui", "Africa/Bangui"),
+    ("Africa/Banjul", "Africa/Banjul"),
+    ("Africa/Bissau", "Africa/Bissau"),
+    ("Africa/Blantyre", "Africa/Blantyre"),
+    ("Africa/Brazzaville", "Africa/Brazzaville"),
+    ("Africa/Bujumbura", "Africa/Bujumbura"),
+    ("Africa/Cairo", "Africa/Cairo"),
+    ("Africa/Casablanca", "Africa/Casablanca"),
+    ("Africa/Ceuta", "Africa/Ceuta"),
+    ("Africa/Conakry", "Africa/Conakry"),
+    ("Africa/Dakar", "Africa/Dakar"),
+    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
+    ("Africa/Djibouti", "Africa/Djibouti"),
+    ("Africa/Douala", "Africa/Douala"),
+    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
+    ("Africa/Freetown", "Africa/Freetown"),
+    ("Africa/Gaborone", "Africa/Gaborone"),
+    ("Africa/Harare", "Africa/Harare"),
+    ("Africa/Johannesburg", "Africa/Johannesburg"),
+    ("Africa/Juba", "Africa/Juba"),
+    ("Africa/Kampala", "Africa/Kampala"),
+    ("Africa/Khartoum", "Africa/Khartoum"),
+    ("Africa/Kigali", "Africa/Kigali"),
+    ("Africa/Kinshasa", "Africa/Kinshasa"),
+    ("Africa/Lagos", "Africa/Lagos"),
+    ("Africa/Libreville", "Africa/Libreville"),
+    ("Africa/Lome", "Africa/Lome"),
+    ("Africa/Luanda", "Africa/Luanda"),
+    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
+    ("Africa/Lusaka", "Africa/Lusaka"),
+    ("Africa/Malabo", "Africa/Malabo"),
+    ("Africa/Maputo", "Africa/Maputo"),
+    ("Africa/Maseru", "Africa/Maseru"),
+    ("Africa/Mbabane", "Africa/Mbabane"),
+    ("Africa/Mogadishu", "Africa/Mogadishu"),
+    ("Africa/Monrovia", "Africa/Monrovia"),
+    ("Africa/Nairobi", "Africa/Nairobi"),
+    ("Africa/Ndjamena", "Africa/Ndjamena"),
+    ("Africa/Niamey", "Africa/Niamey"),
+    ("Africa/Nouakchott", "Africa/Nouakchott"),
+    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
+    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
+    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
+    ("Africa/Tripoli", "Africa/Tripoli"),
+    ("Africa/Tunis", "Africa/Tunis"),
+    ("Africa/Windhoek", "Africa/Windhoek"),
+    ("America/Adak", "America/Adak"),
+    ("America/Anchorage", "America/Anchorage"),
+    ("America/Anguilla", "America/Anguilla"),
+    ("America/Antigua", "America/Antigua"),
+    ("America/Araguaina", "America/Araguaina"),
+    ("America/Argentina/Buenos_Aires", "America/Argentina/Buenos_Aires"),
+    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
+    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
+    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
+    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
+    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
+    ("America/Argentina/Rio_Gallegos", "America/Argentina/Rio_Gallegos"),
+    ("America/Argentina/Salta", "America/Argentina/Salta"),
+    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
+    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
+    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
+    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
+    ("America/Aruba", "America/Aruba"),
+    ("America/Asuncion", "America/Asuncion"),
+    ("America/Atikokan", "America/Atikokan"),
+    ("America/Bahia", "America/Bahia"),
+    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
+    ("America/Barbados", "America/Barbados"),
+    ("America/Belem", "America/Belem"),
+    ("America/Belize", "America/Belize"),
+    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
+    ("America/Boa_Vista", "America/Boa_Vista"),
+    ("America/Bogota", "America/Bogota"),
+    ("America/Boise", "America/Boise"),
+    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
+    ("America/Campo_Grande", "America/Campo_Grande"),
+    ("America/Cancun", "America/Cancun"),
+    ("America/Caracas", "America/Caracas"),
+    ("America/Cayenne", "America/Cayenne"),
+    ("America/Cayman", "America/Cayman"),
+    ("America/Chicago", "America/Chicago"),
+    ("America/Chihuahua", "America/Chihuahua"),
+    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
+    ("America/Costa_Rica", "America/Costa_Rica"),
+    ("America/Coyhaique", "America/Coyhaique"),
+    ("America/Creston", "America/Creston"),
+    ("America/Cuiaba", "America/Cuiaba"),
+    ("America/Curacao", "America/Curacao"),
+    ("America/Danmarkshavn", "America/Danmarkshavn"),
+    ("America/Dawson", "America/Dawson"),
+    ("America/Dawson_Creek", "America/Dawson_Creek"),
+    ("America/Denver", "America/Denver"),
+    ("America/Detroit", "America/Detroit"),
+    ("America/Dominica", "America/Dominica"),
+    ("America/Edmonton", "America/Edmonton"),
+    ("America/Eirunepe", "America/Eirunepe"),
+    ("America/El_Salvador", "America/El_Salvador"),
+    ("America/Fort_Nelson", "America/Fort_Nelson"),
+    ("America/Fortaleza", "America/Fortaleza"),
+    ("America/Glace_Bay", "America/Glace_Bay"),
+    ("America/Goose_Bay", "America/Goose_Bay"),
+    ("America/Grand_Turk", "America/Grand_Turk"),
+    ("America/Grenada", "America/Grenada"),
+    ("America/Guadeloupe", "America/Guadeloupe"),
+    ("America/Guatemala", "America/Guatemala"),
+    ("America/Guayaquil", "America/Guayaquil"),
+    ("America/Guyana", "America/Guyana"),
+    ("America/Halifax", "America/Halifax"),
+    ("America/Havana", "America/Havana"),
+    ("America/Hermosillo", "America/Hermosillo"),
+    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
+    ("America/Indiana/Knox", "America/Indiana/Knox"),
+    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
+    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
+    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
+    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
+    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
+    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
+    ("America/Inuvik", "America/Inuvik"),
+    ("America/Iqaluit", "America/Iqaluit"),
+    ("America/Jamaica", "America/Jamaica"),
+    ("America/Juneau", "America/Juneau"),
+    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
+    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
+    ("America/Kralendijk", "America/Kralendijk"),
+    ("America/La_Paz", "America/La_Paz"),
+    ("America/Lima", "America/Lima"),
+    ("America/Los_Angeles", "America/Los_Angeles"),
+    ("America/Lower_Princes", "America/Lower_Princes"),
+    ("America/Maceio", "America/Maceio"),
+    ("America/Managua", "America/Managua"),
+    ("America/Manaus", "America/Manaus"),
+    ("America/Marigot", "America/Marigot"),
+    ("America/Martinique", "America/Martinique"),
+    ("America/Matamoros", "America/Matamoros"),
+    ("America/Mazatlan", "America/Mazatlan"),
+    ("America/Menominee", "America/Menominee"),
+    ("America/Merida", "America/Merida"),
+    ("America/Metlakatla", "America/Metlakatla"),
+    ("America/Mexico_City", "America/Mexico_City"),
+    ("America/Miquelon", "America/Miquelon"),
+    ("America/Moncton", "America/Moncton"),
+    ("America/Monterrey", "America/Monterrey"),
+    ("America/Montevideo", "America/Montevideo"),
+    ("America/Montserrat", "America/Montserrat"),
+    ("America/Nassau", "America/Nassau"),
+    ("America/New_York", "America/New_York"),
+    ("America/Nome", "America/Nome"),
+    ("America/Noronha", "America/Noronha"),
+    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
+    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
+    ("America/North_Dakota/New_Salem", "America/North_Dakota/New_Salem"),
+    ("America/Nuuk", "America/Nuuk"),
+    ("America/Ojinaga", "America/Ojinaga"),
+    ("America/Panama", "America/Panama"),
+    ("America/Paramaribo", "America/Paramaribo"),
+    ("America/Phoenix", "America/Phoenix"),
+    ("America/Port-au-Prince", "America/Port-au-Prince"),
+    ("America/Port_of_Spain", "America/Port_of_Spain"),
+    ("America/Porto_Velho", "America/Porto_Velho"),
+    ("America/Puerto_Rico", "America/Puerto_Rico"),
+    ("America/Punta_Arenas", "America/Punta_Arenas"),
+    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
+    ("America/Recife", "America/Recife"),
+    ("America/Regina", "America/Regina"),
+    ("America/Resolute", "America/Resolute"),
+    ("America/Rio_Branco", "America/Rio_Branco"),
+    ("America/Santarem", "America/Santarem"),
+    ("America/Santiago", "America/Santiago"),
+    ("America/Santo_Domingo", "America/Santo_Domingo"),
+    ("America/Sao_Paulo", "America/Sao_Paulo"),
+    ("America/Scoresbysund", "America/Scoresbysund"),
+    ("America/Sitka", "America/Sitka"),
+    ("America/St_Barthelemy", "America/St_Barthelemy"),
+    ("America/St_Johns", "America/St_Johns"),
+    ("America/St_Kitts", "America/St_Kitts"),
+    ("America/St_Lucia", "America/St_Lucia"),
+    ("America/St_Thomas", "America/St_Thomas"),
+    ("America/St_Vincent", "America/St_Vincent"),
+    ("America/Swift_Current", "America/Swift_Current"),
+    ("America/Tegucigalpa", "America/Tegucigalpa"),
+    ("America/Thule", "America/Thule"),
+    ("America/Tijuana", "America/Tijuana"),
+    ("America/Toronto", "America/Toronto"),
+    ("America/Tortola", "America/Tortola"),
+    ("America/Vancouver", "America/Vancouver"),
+    ("America/Whitehorse", "America/Whitehorse"),
+    ("America/Winnipeg", "America/Winnipeg"),
+    ("America/Yakutat", "America/Yakutat"),
+    ("Antarctica/Casey", "Antarctica/Casey"),
+    ("Antarctica/Davis", "Antarctica/Davis"),
+    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
+    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
+    ("Antarctica/Mawson", "Antarctica/Mawson"),
+    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
+    ("Antarctica/Palmer", "Antarctica/Palmer"),
+    ("Antarctica/Rothera", "Antarctica/Rothera"),
+    ("Antarctica/Syowa", "Antarctica/Syowa"),
+    ("Antarctica/Troll", "Antarctica/Troll"),
+    ("Antarctica/Vostok", "Antarctica/Vostok"),
+    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
+    ("Asia/Aden", "Asia/Aden"),
+    ("Asia/Almaty", "Asia/Almaty"),
+    ("Asia/Amman", "Asia/Amman"),
+    ("Asia/Anadyr", "Asia/Anadyr"),
+    ("Asia/Aqtau", "Asia/Aqtau"),
+    ("Asia/Aqtobe", "Asia/Aqtobe"),
+    ("Asia/Ashgabat", "Asia/Ashgabat"),
+    ("Asia/Atyrau", "Asia/Atyrau"),
+    ("Asia/Baghdad", "Asia/Baghdad"),
+    ("Asia/Bahrain", "Asia/Bahrain"),
+    ("Asia/Baku", "Asia/Baku"),
+    ("Asia/Bangkok", "Asia/Bangkok"),
+    ("Asia/Barnaul", "Asia/Barnaul"),
+    ("Asia/Beirut", "Asia/Beirut"),
+    ("Asia/Bishkek", "Asia/Bishkek"),
+    ("Asia/Brunei", "Asia/Brunei"),
+    ("Asia/Chita", "Asia/Chita"),
+    ("Asia/Colombo", "Asia/Colombo"),
+    ("Asia/Damascus", "Asia/Damascus"),
+    ("Asia/Dhaka", "Asia/Dhaka"),
+    ("Asia/Dili", "Asia/Dili"),
+    ("Asia/Dubai", "Asia/Dubai"),
+    ("Asia/Dushanbe", "Asia/Dushanbe"),
+    ("Asia/Famagusta", "Asia/Famagusta"),
+    ("Asia/Gaza", "Asia/Gaza"),
+    ("Asia/Hebron", "Asia/Hebron"),
+    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
+    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
+    ("Asia/Hovd", "Asia/Hovd"),
+    ("Asia/Irkutsk", "Asia/Irkutsk"),
+    ("Asia/Jakarta", "Asia/Jakarta"),
+    ("Asia/Jayapura", "Asia/Jayapura"),
+    ("Asia/Jerusalem", "Asia/Jerusalem"),
+    ("Asia/Kabul", "Asia/Kabul"),
+    ("Asia/Kamchatka", "Asia/Kamchatka"),
+    ("Asia/Karachi", "Asia/Karachi"),
+    ("Asia/Kathmandu", "Asia/Kathmandu"),
+    ("Asia/Khandyga", "Asia/Khandyga"),
+    ("Asia/Kolkata", "Asia/Kolkata"),
+    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
+    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
+    ("Asia/Kuching", "Asia/Kuching"),
+    ("Asia/Kuwait", "Asia/Kuwait"),
+    ("Asia/Macau", "Asia/Macau"),
+    ("Asia/Magadan", "Asia/Magadan"),
+    ("Asia/Makassar", "Asia/Makassar"),
+    ("Asia/Manila", "Asia/Manila"),
+    ("Asia/Muscat", "Asia/Muscat"),
+    ("Asia/Nicosia", "Asia/Nicosia"),
+    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
+    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
+    ("Asia/Omsk", "Asia/Omsk"),
+    ("Asia/Oral", "Asia/Oral"),
+    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
+    ("Asia/Pontianak", "Asia/Pontianak"),
+    ("Asia/Pyongyang", "Asia/Pyongyang"),
+    ("Asia/Qatar", "Asia/Qatar"),
+    ("Asia/Qostanay", "Asia/Qostanay"),
+    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
+    ("Asia/Riyadh", "Asia/Riyadh"),
+    ("Asia/Sakhalin", "Asia/Sakhalin"),
+    ("Asia/Samarkand", "Asia/Samarkand"),
+    ("Asia/Seoul", "Asia/Seoul"),
+    ("Asia/Shanghai", "Asia/Shanghai"),
+    ("Asia/Singapore", "Asia/Singapore"),
+    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
+    ("Asia/Taipei", "Asia/Taipei"),
+    ("Asia/Tashkent", "Asia/Tashkent"),
+    ("Asia/Tbilisi", "Asia/Tbilisi"),
+    ("Asia/Tehran", "Asia/Tehran"),
+    ("Asia/Thimphu", "Asia/Thimphu"),
+    ("Asia/Tokyo", "Asia/Tokyo"),
+    ("Asia/Tomsk", "Asia/Tomsk"),
+    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
+    ("Asia/Urumqi", "Asia/Urumqi"),
+    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
+    ("Asia/Vientiane", "Asia/Vientiane"),
+    ("Asia/Vladivostok", "Asia/Vladivostok"),
+    ("Asia/Yakutsk", "Asia/Yakutsk"),
+    ("Asia/Yangon", "Asia/Yangon"),
+    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
+    ("Asia/Yerevan", "Asia/Yerevan"),
+    ("Atlantic/Azores", "Atlantic/Azores"),
+    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
+    ("Atlantic/Canary", "Atlantic/Canary"),
+    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
+    ("Atlantic/Faroe", "Atlantic/Faroe"),
+    ("Atlantic/Madeira", "Atlantic/Madeira"),
+    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
+    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
+    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
+    ("Atlantic/Stanley", "Atlantic/Stanley"),
+    ("Australia/Adelaide", "Australia/Adelaide"),
+    ("Australia/Brisbane", "Australia/Brisbane"),
+    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
+    ("Australia/Darwin", "Australia/Darwin"),
+    ("Australia/Eucla", "Australia/Eucla"),
+    ("Australia/Hobart", "Australia/Hobart"),
+    ("Australia/Lindeman", "Australia/Lindeman"),
+    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
+    ("Australia/Melbourne", "Australia/Melbourne"),
+    ("Australia/Perth", "Australia/Perth"),
+    ("Australia/Sydney", "Australia/Sydney"),
+    ("Canada/Atlantic", "Canada/Atlantic"),
+    ("Canada/Central", "Canada/Central"),
+    ("Canada/Eastern", "Canada/Eastern"),
+    ("Canada/Mountain", "Canada/Mountain"),
+    ("Canada/Newfoundland", "Canada/Newfoundland"),
+    ("Canada/Pacific", "Canada/Pacific"),
+    ("Europe/Amsterdam", "Europe/Amsterdam"),
+    ("Europe/Andorra", "Europe/Andorra"),
+    ("Europe/Astrakhan", "Europe/Astrakhan"),
+    ("Europe/Athens", "Europe/Athens"),
+    ("Europe/Belgrade", "Europe/Belgrade"),
+    ("Europe/Berlin", "Europe/Berlin"),
+    ("Europe/Bratislava", "Europe/Bratislava"),
+    ("Europe/Brussels", "Europe/Brussels"),
+    ("Europe/Bucharest", "Europe/Bucharest"),
+    ("Europe/Budapest", "Europe/Budapest"),
+    ("Europe/Busingen", "Europe/Busingen"),
+    ("Europe/Chisinau", "Europe/Chisinau"),
+    ("Europe/Copenhagen", "Europe/Copenhagen"),
+    ("Europe/Dublin", "Europe/Dublin"),
+    ("Europe/Gibraltar", "Europe/Gibraltar"),
+    ("Europe/Guernsey", "Europe/Guernsey"),
+    ("Europe/Helsinki", "Europe/Helsinki"),
+    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
+    ("Europe/Istanbul", "Europe/Istanbul"),
+    ("Europe/Jersey", "Europe/Jersey"),
+    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
+    ("Europe/Kirov", "Europe/Kirov"),
+    ("Europe/Kyiv", "Europe/Kyiv"),
+    ("Europe/Lisbon", "Europe/Lisbon"),
+    ("Europe/Ljubljana", "Europe/Ljubljana"),
+    ("Europe/London", "Europe/London"),
+    ("Europe/Luxembourg", "Europe/Luxembourg"),
+    ("Europe/Madrid", "Europe/Madrid"),
+    ("Europe/Malta", "Europe/Malta"),
+    ("Europe/Mariehamn", "Europe/Mariehamn"),
+    ("Europe/Minsk", "Europe/Minsk"),
+    ("Europe/Monaco", "Europe/Monaco"),
+    ("Europe/Moscow", "Europe/Moscow"),
+    ("Europe/Oslo", "Europe/Oslo"),
+    ("Europe/Paris", "Europe/Paris"),
+    ("Europe/Podgorica", "Europe/Podgorica"),
+    ("Europe/Prague", "Europe/Prague"),
+    ("Europe/Riga", "Europe/Riga"),
+    ("Europe/Rome", "Europe/Rome"),
+    ("Europe/Samara", "Europe/Samara"),
+    ("Europe/San_Marino", "Europe/San_Marino"),
+    ("Europe/Sarajevo", "Europe/Sarajevo"),
+    ("Europe/Saratov", "Europe/Saratov"),
+    ("Europe/Simferopol", "Europe/Simferopol"),
+    ("Europe/Skopje", "Europe/Skopje"),
+    ("Europe/Sofia", "Europe/Sofia"),
+    ("Europe/Stockholm", "Europe/Stockholm"),
+    ("Europe/Tallinn", "Europe/Tallinn"),
+    ("Europe/Tirane", "Europe/Tirane"),
+    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
+    ("Europe/Vaduz", "Europe/Vaduz"),
+    ("Europe/Vatican", "Europe/Vatican"),
+    ("Europe/Vienna", "Europe/Vienna"),
+    ("Europe/Vilnius", "Europe/Vilnius"),
+    ("Europe/Volgograd", "Europe/Volgograd"),
+    ("Europe/Warsaw", "Europe/Warsaw"),
+    ("Europe/Zagreb", "Europe/Zagreb"),
+    ("Europe/Zurich", "Europe/Zurich"),
+    ("GMT", "GMT"),
+    ("Indian/Antananarivo", "Indian/Antananarivo"),
+    ("Indian/Chagos", "Indian/Chagos"),
+    ("Indian/Christmas", "Indian/Christmas"),
+    ("Indian/Cocos", "Indian/Cocos"),
+    ("Indian/Comoro", "Indian/Comoro"),
+    ("Indian/Kerguelen", "Indian/Kerguelen"),
+    ("Indian/Mahe", "Indian/Mahe"),
+    ("Indian/Maldives", "Indian/Maldives"),
+    ("Indian/Mauritius", "Indian/Mauritius"),
+    ("Indian/Mayotte", "Indian/Mayotte"),
+    ("Indian/Reunion", "Indian/Reunion"),
+    ("Pacific/Apia", "Pacific/Apia"),
+    ("Pacific/Auckland", "Pacific/Auckland"),
+    ("Pacific/Bougainville", "Pacific/Bougainville"),
+    ("Pacific/Chatham", "Pacific/Chatham"),
+    ("Pacific/Chuuk", "Pacific/Chuuk"),
+    ("Pacific/Easter", "Pacific/Easter"),
+    ("Pacific/Efate", "Pacific/Efate"),
+    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
+    ("Pacific/Fiji", "Pacific/Fiji"),
+    ("Pacific/Funafuti", "Pacific/Funafuti"),
+    ("Pacific/Galapagos", "Pacific/Galapagos"),
+    ("Pacific/Gambier", "Pacific/Gambier"),
+    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
+    ("P2025-06-29T01:43:14.671389745Z acific/Guam", "Pacific/Guam"),
+    ("Pacific/Honolulu", "Pacific/Honolulu"),
+    ("Pacific/Kanton", "Pacific/Kanton"),
+    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
+    ("Pacific/Kosrae", "Pacific/Kosrae"),
+    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
+    ("Pacific/Majuro", "Pacific/Majuro"),
+    ("Pacific/Marquesas", "Pacific/Marquesas"),
+    ("Pacific/Midway", "Pacific/Midway"),
+    ("Pacific/Nauru", "Pacific/Nauru"),
+    ("Pacific/Niue", "Pacific/Niue"),
+    ("Pacific/Norfolk", "Pacific/Norfolk"),
+    ("Pacific/Noumea", "Pacific/Noumea"),
+    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
+    ("Pacific/Palau", "Pacific/Palau"),
+    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
+    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
+    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
+    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
+    ("Pacific/Saipan", "Pacific/Saipan"),
+    ("Pacific/Tahiti", "Pacific/Tahiti"),
+    ("Pacific/Tarawa", "Pacific/Tarawa"),
+    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
+    ("Pacific/Wake", "Pacific/Wake"),
+    ("Pacific/Wallis", "Pacific/Wallis"),
+    ("US/Alaska", "US/Alaska"),
+    ("US/Arizona", "US/Arizona"),
+    ("US/Central", "US/Central"),
+    ("US/Eastern", "US/Eastern"),
+    ("US/Hawaii", "US/Hawaii"),
+    ("US/Mountain", "US/Mountain"),
+    ("US/Pacific", "US/Pacific"),
+    ("UTC", "UTC"),
+]
+
 
 class User(AbstractUser):
     username = None
@@ -36,6 +474,11 @@ class UserSettings(models.Model):
     )
     hide_amounts = models.BooleanField(default=False)
     mute_sounds = models.BooleanField(default=False)
+    volume = models.PositiveIntegerField(
+        default=10,
+        validators=[MinValueValidator(1), MaxValueValidator(10)],
+        verbose_name=_("Volume"),
+    )
 
     date_format = models.CharField(
         max_length=100, default="SHORT_DATE_FORMAT", verbose_name=_("Date Format")
@@ -57,7 +500,7 @@ class UserSettings(models.Model):
     )
     timezone = models.CharField(
         max_length=50,
-        choices=[("auto", _("Auto"))] + [(tz, tz) for tz in pytz.common_timezones],
+        choices=timezones,
         default="auto",
         verbose_name=_("Time Zone"),
     )

app/apps/users/tests.py

@@ -1,29 +0,0 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-
-class UsersTestCase(TestCase):
-    def test_example(self):
-        self.assertEqual(1 + 1, 2)
-
-    def test_users_index_view_superuser(self):
-        # Create a superuser
-        superuser = User.objects.create_user(
-            username='superuser',
-            password='superpassword',
-            is_staff=True,
-            is_superuser=True
-        )
-
-        # Create a Client instance
-        client = Client()
-
-        # Log in the superuser
-        client.login(username='superuser', password='superpassword')
-
-        # Make a GET request to the users_index view
-        # Assuming your users_index view is named 'users_index' in the 'users' app namespace
-        response = client.get(reverse('users:users_index'))
-
-        # Assert that the response status code is 200
-        self.assertEqual(response.status_code, 200)

app/apps/users/urls.py

@@ -17,6 +17,11 @@ urlpatterns = [
         views.toggle_sound_playing,
         name="toggle_sound_playing",
     ),
+    path(
+        "user/toggle-sidebar/",
+        views.toggle_sidebar_status,
+        name="toggle_sidebar_status",
+    ),
     path(
         "user/settings/",
         views.update_settings,

app/apps/users/views.py

@@ -116,6 +116,24 @@ def update_settings(request):
     return render(request, "users/fragments/user_settings.html", {"form": form})
 
 
+@only_htmx
+@htmx_login_required
+def toggle_sidebar_status(request):
+    if not request.session.get("sidebar_status"):
+        request.session["sidebar_status"] = "floating"
+
+    if request.session["sidebar_status"] == "floating":
+        request.session["sidebar_status"] = "fixed"
+    elif request.session["sidebar_status"] == "fixed":
+        request.session["sidebar_status"] = "floating"
+    else:
+        request.session["sidebar_status"] = "fixed"
+
+    return HttpResponse(
+        status=204,
+    )
+
+
 @htmx_login_required
 @is_superuser
 @require_http_methods(["GET"])

app/apps/yearly_overview/tests.py

@@ -1,26 +0,0 @@
-from django.test import TestCase, Client
-from django.contrib.auth.models import User
-from django.urls import reverse
-
-class YearlyOverviewTestCase(TestCase):
-    def test_example(self):
-        self.assertEqual(1 + 1, 2)
-
-    def test_yearly_overview_by_currency_view_authenticated_user(self):
-        # Create a test user
-        user = User.objects.create_user(username='testuser', password='testpassword')
-
-        # Create a Client instance
-        client = Client()
-
-        # Log in the test user
-        client.login(username='testuser', password='testpassword')
-
-        # Make a GET request to the yearly_overview_currency view (e.g., for year 2023)
-        # Assuming your view is named 'yearly_overview_currency' in urls.py
-        # and takes year as an argument.
-        # Adjust the view name and arguments if necessary.
-        response = client.get(reverse('yearly_overview:yearly_overview_currency', args=[2023]))
-
-        # Assert that the response status code is 200
-        self.assertEqual(response.status_code, 200)

app/apps/yearly_overview/urls.py

@@ -3,6 +3,7 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
+    path("yearly/", views.index, name="yearly_index"),
     path("yearly/currency/", views.index_by_currency, name="yearly_index_currency"),
     path("yearly/account/", views.index_by_account, name="yearly_index_account"),
     path(

app/apps/yearly_overview/views.py

@@ -16,6 +16,22 @@ from apps.transactions.utils.calculations import (
 )
 
 
+@login_required
+def index(request):
+    if "view_type" in request.GET:
+        view_type = request.GET["view_type"]
+        request.session["yearly_view_type"] = view_type
+    else:
+        view_type = request.session.get("yearly_view_type", "currency")
+
+    now = timezone.localdate(timezone.now())
+
+    if view_type == "currency":
+        return redirect(to="yearly_overview_currency", year=now.year)
+    else:
+        return redirect(to="yearly_overview_account", year=now.year)
+
+
 @login_required
 def index_by_currency(request):
     now = timezone.localdate(timezone.now())
@@ -32,6 +48,8 @@ def index_by_account(request):
 
 @login_required
 def index_yearly_overview_by_currency(request, year: int):
+    request.session["yearly_view_type"] = "currency"
+
     next_year = year + 1
     previous_year = year - 1
 
@@ -49,6 +67,7 @@ def index_yearly_overview_by_currency(request, year: int):
             "previous_year": previous_year,
             "months": month_options,
             "currencies": currency_options,
+            "type": "currency",
         },
     )
 
@@ -60,7 +79,7 @@ def yearly_overview_by_currency(request, year: int):
     currency = request.GET.get("currency")
 
     # Base query filter
-    filter_params = {"reference_date__year": year, "account__is_archived": False}
+    filter_params = {"reference_date__year": year}
 
     # Add month filter if provided
     if month:
@@ -75,7 +94,8 @@ def yearly_overview_by_currency(request, year: int):
 
     transactions = (
         Transaction.objects.filter(**filter_params)
-        .exclude(Q(category__mute=True) & ~Q(category=None))
+        .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
+        .exclude(account__in=request.user.untracked_accounts.all())
         .order_by("account__currency__name")
     )
 
@@ -95,6 +115,7 @@ def yearly_overview_by_currency(request, year: int):
 
 @login_required
 def index_yearly_overview_by_account(request, year: int):
+    request.session["yearly_view_type"] = "account"
     next_year = year + 1
     previous_year = year - 1
 
@@ -115,6 +136,7 @@ def index_yearly_overview_by_account(request, year: int):
             "previous_year": previous_year,
             "months": month_options,
             "accounts": account_options,
+            "type": "account",
         },
     )
 
@@ -141,7 +163,7 @@ def yearly_overview_by_account(request, year: int):
 
     transactions = (
         Transaction.objects.filter(**filter_params)
-        .exclude(Q(category__mute=True) & ~Q(category=None))
+        .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
         .order_by(
             "account__group__name",
             "account__name",