feat: multi tenancy support

This commit is contained in:
Herculino Trotta
2025-03-08 12:03:17 -03:00
parent c7d70a1748
commit 020dd74f80
79 changed files with 2401 additions and 399 deletions

View File

@@ -8,6 +8,12 @@ from apps.common.widgets.crispy.submit import NoClassSubmit
class ExportForm(forms.Form):
users = forms.BooleanField(
required=False,
widget=forms.CheckboxInput(),
label=_("Users"),
initial=True,
)
accounts = forms.BooleanField(
required=False,
widget=forms.CheckboxInput(),
@@ -94,6 +100,7 @@ class ExportForm(forms.Form):
self.helper.form_tag = False
self.helper.form_method = "post"
self.helper.layout = Layout(
"users",
"accounts",
"currencies",
"transactions",
@@ -121,6 +128,7 @@ class RestoreForm(forms.Form):
help_text=_("Import a ZIP file exported from WYGIWYH"),
label=_("ZIP File"),
)
users = forms.FileField(required=False, label=_("Users"))
accounts = forms.FileField(required=False, label=_("Accounts"))
currencies = forms.FileField(required=False, label=_("Currencies"))
transactions_categories = forms.FileField(required=False, label=_("Categories"))
@@ -155,6 +163,7 @@ class RestoreForm(forms.Form):
self.helper.layout = Layout(
"zip_file",
HTML("<hr />"),
"users",
"accounts",
"currencies",
"transactions",

View File

@@ -24,3 +24,6 @@ class AccountResource(resources.ModelResource):
class Meta:
model = Account
def get_queryset(self):
return Account.all_objects.all()

View File

@@ -55,23 +55,32 @@ class TransactionResource(resources.ModelResource):
model = Transaction
def get_queryset(self):
return Transaction.all_objects.all()
return Transaction.userless_all_objects.all()
class TransactionTagResource(resources.ModelResource):
class Meta:
model = TransactionTag
def get_queryset(self):
return TransactionTag.all_objects.all()
class TransactionEntityResource(resources.ModelResource):
class Meta:
model = TransactionEntity
def get_queryset(self):
return TransactionEntity.all_objects.all()
class TransactionCategoyResource(resources.ModelResource):
class Meta:
model = TransactionCategory
def get_queryset(self):
return TransactionCategory.all_objects.all()
class RecurringTransactionResource(resources.ModelResource):
account = fields.Field(
@@ -107,6 +116,9 @@ class RecurringTransactionResource(resources.ModelResource):
class Meta:
model = RecurringTransaction
def get_queryset(self):
return RecurringTransaction.all_objects.all()
class InstallmentPlanResource(resources.ModelResource):
account = fields.Field(
@@ -141,3 +153,6 @@ class InstallmentPlanResource(resources.ModelResource):
class Meta:
model = InstallmentPlan
def get_queryset(self):
return InstallmentPlan.all_objects.all()

View File

@@ -0,0 +1,161 @@
from import_export import resources, fields
from django.contrib.auth import get_user_model
from django.conf import settings
from apps.users.models import UserSettings
User = get_user_model()
class UserResource(resources.ModelResource):
# User fields
email = fields.Field(attribute="email", column_name="Email")
# UserSettings fields - for export only
hide_amounts = fields.Field(
attribute="settings__hide_amounts", column_name="Hide Amounts", readonly=True
)
mute_sounds = fields.Field(
attribute="settings__mute_sounds", column_name="Mute Sounds", readonly=True
)
date_format = fields.Field(
attribute="settings__date_format", column_name="Date Format", readonly=True
)
datetime_format = fields.Field(
attribute="settings__datetime_format",
column_name="Datetime Format",
readonly=True,
)
number_format = fields.Field(
attribute="settings__number_format", column_name="Number Format", readonly=True
)
language = fields.Field(
attribute="settings__language", column_name="Language", readonly=True
)
timezone = fields.Field(
attribute="settings__timezone", column_name="Timezone", readonly=True
)
start_page = fields.Field(
attribute="settings__start_page", column_name="Start Page", readonly=True
)
# Human-readable fields for choice values
start_page_display = fields.Field(column_name="Start Page Display", readonly=True)
language_display = fields.Field(column_name="Language Display", readonly=True)
timezone_display = fields.Field(column_name="Timezone Display", readonly=True)
@staticmethod
def dehydrate_start_page_display(user):
if hasattr(user, "settings"):
return dict(UserSettings.StartPage.choices).get(
user.settings.start_page, ""
)
return ""
@staticmethod
def dehydrate_language_display(user):
if hasattr(user, "settings"):
languages = dict([("auto", "Auto")] + list(settings.LANGUAGES))
return languages.get(user.settings.language, user.settings.language)
return ""
@staticmethod
def dehydrate_timezone_display(user):
if hasattr(user, "settings"):
if user.settings.timezone == "auto":
return "Auto"
return user.settings.timezone
return ""
def after_init_instance(self, instance, new, row, **kwargs):
"""
Store settings data on the instance to be used after save
"""
# Process boolean fields properly
hide_amounts = row.get("Hide Amounts", "").lower() == "true"
mute_sounds = row.get("Mute Sounds", "").lower() == "true"
# Store settings data on the instance for later use
instance._settings_data = {
"hide_amounts": hide_amounts,
"mute_sounds": mute_sounds,
"date_format": row.get("Date Format", "SHORT_DATE_FORMAT"),
"datetime_format": row.get("Datetime Format", "SHORT_DATETIME_FORMAT"),
"number_format": row.get("Number Format", "AA"),
"language": row.get("Language", "auto"),
"timezone": row.get("Timezone", "auto"),
"start_page": row.get("Start Page", UserSettings.StartPage.MONTHLY),
}
return instance
def after_save_instance(self, instance, row, **kwargs):
"""
Create or update UserSettings after User is saved
"""
if not hasattr(instance, "_settings_data"):
return
settings_data = instance._settings_data
# Create or update UserSettings
try:
user_settings = UserSettings.objects.get(user=instance)
# Update existing settings
for key, value in settings_data.items():
setattr(user_settings, key, value)
user_settings.save()
except UserSettings.DoesNotExist:
# Create new settings
UserSettings.objects.create(user=instance, **settings_data)
def get_queryset(self):
"""
Ensure settings are prefetched when exporting users
"""
return super().get_queryset().select_related("settings")
class Meta:
model = User
import_id_fields = ["id"]
fields = (
"id",
"email",
"first_name",
"last_name",
"is_active",
"date_joined",
"password",
"hide_amounts",
"mute_sounds",
"date_format",
"datetime_format",
"number_format",
"language",
"language_display",
"timezone",
"timezone_display",
"start_page",
"start_page_display",
)
export_order = (
"id",
"email",
"first_name",
"last_name",
"is_active",
"date_joined",
"password",
"hide_amounts",
"mute_sounds",
"date_format",
"datetime_format",
"number_format",
"language",
"language_display",
"timezone",
"timezone_display",
"start_page",
"start_page_display",
)

View File

@@ -1,9 +1,9 @@
import logging
import zipfile
from io import BytesIO, TextIOWrapper
from io import BytesIO
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.contrib.auth.decorators import login_required, user_passes_test
from django.db import transaction
from django.http import HttpResponse
from django.shortcuts import render
@@ -12,26 +12,14 @@ from django.utils.translation import gettext_lazy as _
from django.views.decorators.http import require_http_methods
from tablib import Dataset
from apps.common.decorators.htmx import only_htmx
from apps.export_app.forms import ExportForm, RestoreForm
from apps.export_app.resources.accounts import AccountResource
from apps.export_app.resources.transactions import (
TransactionResource,
TransactionTagResource,
TransactionEntityResource,
TransactionCategoyResource,
InstallmentPlanResource,
RecurringTransactionResource,
)
from apps.export_app.resources.currencies import (
CurrencyResource,
ExchangeRateResource,
ExchangeRateServiceResource,
)
from apps.export_app.resources.rules import (
TransactionRuleResource,
TransactionRuleActionResource,
UpdateOrCreateTransactionRuleResource,
)
from apps.export_app.resources.dca import (
DCAStrategyResource,
DCAEntryResource,
@@ -39,18 +27,33 @@ from apps.export_app.resources.dca import (
from apps.export_app.resources.import_app import (
ImportProfileResource,
)
from apps.common.decorators.htmx import only_htmx
from apps.export_app.resources.rules import (
TransactionRuleResource,
TransactionRuleActionResource,
UpdateOrCreateTransactionRuleResource,
)
from apps.export_app.resources.transactions import (
TransactionResource,
TransactionTagResource,
TransactionEntityResource,
TransactionCategoyResource,
InstallmentPlanResource,
RecurringTransactionResource,
)
from apps.export_app.resources.users import UserResource
logger = logging.getLogger()
@login_required
@user_passes_test(lambda u: u.is_superuser)
@require_http_methods(["GET"])
def export_index(request):
return render(request, "export_app/pages/index.html")
@login_required
@user_passes_test(lambda u: u.is_superuser)
@require_http_methods(["GET", "POST"])
def export_form(request):
timestamp = timezone.localtime(timezone.now()).strftime("%Y-%m-%dT%H-%M-%S")
@@ -60,6 +63,7 @@ def export_form(request):
if form.is_valid():
zip_buffer = BytesIO()
export_users = form.cleaned_data.get("users", False)
export_accounts = form.cleaned_data.get("accounts", False)
export_currencies = form.cleaned_data.get("currencies", False)
export_transactions = form.cleaned_data.get("transactions", False)
@@ -80,6 +84,8 @@ def export_form(request):
export_import_profiles = form.cleaned_data.get("import_profiles", False)
exports = []
if export_users:
exports.append((UserResource().export(), "users"))
if export_accounts:
exports.append((AccountResource().export(), "accounts"))
if export_currencies:
@@ -176,6 +182,7 @@ def export_form(request):
@only_htmx
@login_required
@user_passes_test(lambda u: u.is_superuser)
@require_http_methods(["GET", "POST"])
def import_form(request):
if request.method == "POST":
@@ -209,6 +216,7 @@ def import_form(request):
def process_imports(request, cleaned_data):
# Define import order to handle dependencies
import_order = [
("users", UserResource),
("currencies", CurrencyResource),
(
"currencies",