accrete 0.0.124__tar.gz → 0.0.126__tar.gz

{accrete-0.0.124 → accrete-0.0.126}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accrete
-Version: 0.0.124
+Version: 0.0.126
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek

{accrete-0.0.124 → accrete-0.0.126}/accrete/admin.py

@@ -9,12 +9,12 @@ class MemberInLine(admin.TabularInline):
 
 class TenantAccessGroupInLine(admin.TabularInline):
 
-    model = models.TenantAccessGroup
+    model = models.TenantAccessGroupRel
 
 
 class AccessGroupMemberInLine(admin.TabularInline):
 
-    model = models.AccessGroupMember
+    model = models.MemberAccessGroupRel
 
 
 class TenantAdmin(admin.ModelAdmin):
@@ -46,4 +46,5 @@ class AccessGroupAdmin(admin.ModelAdmin):
 admin.site.register(models.Tenant, TenantAdmin)
 admin.site.register(models.Member, MemberAdmin)
 admin.site.register(models.AccessGroup, AccessGroupAdmin)
-admin.site.register(models.AccessGroupMember)
+admin.site.register(models.MemberAccessGroupRel)
+admin.site.register(models.TenantAccessGroupRel)

{accrete-0.0.124 → accrete-0.0.126}/accrete/config.py

@@ -8,6 +8,11 @@ ACCRETE_TENANT_NOT_SET_URL = getattr(
     False
 )
 
+ACCRETE_GROUP_NOT_SET_URL = getattr(
+    settings, 'ACCRETE_GROUP_NOT_SET_URL',
+    False
+)
+
 if not ACCRETE_TENANT_NOT_SET_URL:
     _logger.warning(
         'Setting ACCRETE_TENANT_NOT_SET_URL missing.'

{accrete-0.0.124 → accrete-0.0.126}/accrete/contrib/log/helper.py

@@ -46,7 +46,7 @@ def log_state_to_dict(logs: RawQuerySet) -> tuple[dict, dict]:
     return state, info
 
 
-def log_value_to_instance_value(log: Log):
+def log_value_to_instance_value(log: Log) -> bool | int | None:
     if log.new_value_type == 'bool':
         return bool(log.new_value == 'True')
 

{accrete-0.0.124 → accrete-0.0.126}/accrete/contrib/system_mail/forms.py

@@ -23,7 +23,8 @@ class SystemMailCreateForm(forms.ModelForm):
     def clean_to_addr(self):
         emails = self.cleaned_data['to_addr']
         for email in emails.split(','):
-            validate_email(email)
+            if email:
+                validate_email(email)
         return emails
 
     def save(self, commit=True):

{accrete-0.0.124 → accrete-0.0.126}/accrete/contrib/user/models.py

@@ -35,6 +35,7 @@ class UserManager(BaseUserManager):
     def create_user(self, email, password=None, username=None, **extra_fields):
         extra_fields.setdefault('is_staff', False)
         extra_fields.setdefault('is_superuser', False)
+        extra_fields.setdefault('is_active', False)
         return self._create_user(email, password, username, **extra_fields)
 
     def create_superuser(self, email, password, username=None, **extra_fields):

accrete-0.0.126/accrete/migrations/0004_rename_accessgroupmember_memberaccessgrouprel_and_more.py

@@ -0,0 +1,42 @@
+# Generated by Django 5.1.4 on 2025-02-24 17:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accrete', '0003_remove_member_name'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='AccessGroupMember',
+            new_name='MemberAccessGroupRel',
+        ),
+        migrations.RenameModel(
+            old_name='TenantAccessGroup',
+            new_name='TenantAccessGroupRel',
+        ),
+        migrations.AlterModelOptions(
+            name='memberaccessgrouprel',
+            options={'ordering': ['member'], 'verbose_name': 'Member Access Group Relation', 'verbose_name_plural': 'Member Access Group Relations'},
+        ),
+        migrations.AlterModelOptions(
+            name='tenantaccessgrouprel',
+            options={'ordering': ['tenant'], 'verbose_name': 'Tenant Access Group Relation', 'verbose_name_plural': 'Tenant Access Groups Relations'},
+        ),
+        migrations.RemoveField(
+            model_name='accessgroup',
+            name='is_public',
+        ),
+        migrations.AlterField(
+            model_name='accessgroup',
+            name='code',
+            field=models.CharField(max_length=100, verbose_name='Code'),
+        ),
+        migrations.AlterModelTable(
+            name='memberaccessgrouprel',
+            table='accrete_member_access_group_rel',
+        ),
+    ]

{accrete-0.0.124 → accrete-0.0.126}/accrete/models.py

@@ -1,7 +1,6 @@
 from django.db import models
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
-from django.contrib.auth.validators import UnicodeUsernameValidator
 from accrete.tenant import get_tenant
 from accrete.managers import TenantManager, MemberManager
 
@@ -70,7 +69,7 @@ class Tenant(models.Model):
 
     access_groups = models.ManyToManyField(
         to='accrete.AccessGroup',
-        through='accrete.TenantAccessGroup',
+        through='accrete.TenantAccessGroupRel',
         through_fields=('tenant', 'access_group')
     )
 
@@ -105,7 +104,7 @@ class Member(models.Model):
 
     access_groups = models.ManyToManyField(
         to='accrete.AccessGroup',
-        through='accrete.AccessGroupMember',
+        through='accrete.MemberAccessGroupRel',
         through_fields=('member', 'access_group')
     )
 
@@ -136,28 +135,20 @@ class AccessGroup(models.Model):
 
     code = models.CharField(
         verbose_name=_('Code'),
-        max_length=50
-    )
-
-    is_public = models.BooleanField(
-        verbose_name=_('Is Public'),
-        default=True,
-        help_text=_(
-            'If set, members from all tenants can be assigned to this group.'
-        )
+        max_length=100
     )
 
     def __str__(self):
         return self.name
 
 
-class AccessGroupMember(models.Model):
+class MemberAccessGroupRel(models.Model):
 
     class Meta:
-        verbose_name = _('Access Group Member')
-        verbose_name_plural = _('Access Group Members')
+        verbose_name = _('Member Access Group Relation')
+        verbose_name_plural = _('Member Access Group Relations')
         ordering = ['member']
-        db_table = 'accrete_access_group_member_rel'
+        db_table = 'accrete_member_access_group_rel'
         constraints = [
             models.UniqueConstraint(
                 name='unique_member_per_group',
@@ -179,11 +170,11 @@ class AccessGroupMember(models.Model):
         return f'{self.member} - {self.access_group}'
 
 
-class TenantAccessGroup(models.Model):
+class TenantAccessGroupRel(models.Model):
 
     class Meta:
-        verbose_name = _('Tenant Access Group')
-        verbose_name_plural = _('Tenant Access Groups')
+        verbose_name = _('Tenant Access Group Relation')
+        verbose_name_plural = _('Tenant Access Groups Relations')
         ordering = ['tenant']
         db_table = 'accrete_tenant_access_group_rel'
         constraints = [

{accrete-0.0.124 → accrete-0.0.126}/accrete/tenant.py

@@ -73,3 +73,16 @@ def per_tenant(include: Q = None, exclude: Q = None):
         return wrapper
     return decorator
 
+
+def tenant_has_group(access_group_code: str) -> bool:
+    tenant = get_tenant()
+    if not tenant:
+        return False
+    return tenant.access_groups.filter(code__in=[access_group_code]).exists()
+
+
+def member_has_group(access_group_code: str) -> bool:
+    member = get_member()
+    if not member:
+        return False
+    return member.access_groups.filter(code__in=[access_group_code]).exists()

{accrete-0.0.124 → accrete-0.0.126}/accrete/utils/forms.py

@@ -9,13 +9,16 @@ _logger = logging.getLogger(__name__)
 
 
 def save_form(form: [Form|ModelForm], commit=True, reraise=False) -> [Form|ModelForm]:
+    if not hasattr(form, 'save'):
+        raise AttributeError('Form must have method "save" implemented.')
     form.is_saved = False
     form.save_error = None
     form.save_error_id = None
+    form.res = None
     try:
         if form.is_valid():
             with transaction.atomic():
-                form.save(commit=commit)
+                form.res = form.save(commit=commit)
             form.is_saved = True
     except Exception as e:
         form.save_error = repr(e)
@@ -35,9 +38,13 @@ def save_forms(form, inline_formsets: list = None, commit=True, reraise: bool =
         _logger.exception(f'{error_id}: {error}')
         form.save_error_id = error_id
 
+    if not hasattr(form, 'save'):
+        raise AttributeError('Form must have method "save" implemented.')
+
     form.is_saved = False
     form.save_error = None
     form.save_error_id = None
+    form.res = None
     form.inline_forms = inline_formsets
 
     try:
@@ -56,7 +63,7 @@ def save_forms(form, inline_formsets: list = None, commit=True, reraise: bool =
 
     try:
         with transaction.atomic():
-            form.save(commit=commit)
+            form.res = form.save(commit=commit)
             for inline_formset in inline_formsets:
                 inline_formset.save(commit=commit)
     except Exception as e:

{accrete-0.0.124 → accrete-0.0.126}/accrete/views.py

@@ -1,4 +1,5 @@
 import os
+from enum import Enum
 from functools import wraps
 from django.http import HttpResponse, HttpResponseNotFound
 from django.contrib.auth.mixins import LoginRequiredMixin
@@ -7,24 +8,43 @@ from django.core.exceptions import ImproperlyConfigured
 from django.shortcuts import redirect, get_object_or_404
 from django.conf import settings
 from accrete.models import Tenant, Member
-from accrete.tenant import get_tenant
+from accrete.tenant import get_tenant, tenant_has_group, member_has_group
 from . import config
 
 
+class GroupType(Enum):
+
+    TENANT: str = 'tenant'
+    MEMBER: str = 'member'
+
+
 class TenantRequiredMixin(LoginRequiredMixin):
 
     TENANT_NOT_SET_URL = None
+    GROUP_NOT_SET_URL = None
+    TENANT_GROUPS = []
+    MEMBER_GROUPS = []
 
     def dispatch(self, request, *args, **kwargs):
         res = super().dispatch(request, *args, **kwargs)
         tenant = self.get_tenant()
         if not tenant:
             return self.handle_tenant_not_set()
+        if not self.check_tenant_group():
+            return self.handle_tenant_group_not_set()
+        if not self.check_member_group():
+            return self.handle_member_group_not_set()
         return res
 
     def handle_tenant_not_set(self):
         return redirect(self.get_tenant_not_set_url())
 
+    def handle_tenant_group_not_set(self):
+        return redirect(self.get_group_not_set_url(GroupType.TENANT))
+
+    def handle_member_group_not_set(self):
+        return redirect(self.get_group_not_set_url(GroupType.MEMBER))
+
     def get_tenant_not_set_url(self):
         tenant_not_set_url = (
                 self.TENANT_NOT_SET_URL
@@ -40,12 +60,45 @@ class TenantRequiredMixin(LoginRequiredMixin):
             )
         return tenant_not_set_url
 
+    def get_group_not_set_url(self, group_type: GroupType):
+        group_not_set_url = (
+                self.GROUP_NOT_SET_URL
+                or settings.ACCRETE_GROUP_NOT_SET_URL
+        )
+        if not group_not_set_url:
+            cls_name = self.__class__.__name__
+            raise ImproperlyConfigured(
+                f"{cls_name} is missing the group_not_set_url attribute. "
+                f"Define {cls_name}.GROUP_NOT_SET_URL, "
+                f"settings.ACCRETE_GROUP_NOT_SET_URL, or override "
+                f"{cls_name}.get_group_not_set_url()."
+            )
+        return group_not_set_url
+
+    def check_tenant_group(self) -> bool:
+        if not self.TENANT_GROUPS:
+            return True
+        for group in self.TENANT_GROUPS:
+            if tenant_has_group(group):
+                return True
+        return False
+
+    def check_member_group(self) -> bool:
+        if not self.MEMBER_GROUPS:
+            return True
+        for group in self.MEMBER_GROUPS:
+            if member_has_group(group):
+                return True
+        return False
+
     @staticmethod
     def get_tenant():
         return get_tenant()
 
 
 def tenant_required(
+        tenant_groups: list[str] = None,
+        member_groups: list[str] = None,
         redirect_field_name: str = None,
         login_url: str = None
 ):
@@ -59,6 +112,12 @@ def tenant_required(
             tenant = request.tenant
             if not tenant:
                 return redirect(config.ACCRETE_TENANT_NOT_SET_URL)
+            for tenant_group in (tenant_groups or []):
+                if not any([tenant_has_group(tenant_group)]):
+                    return redirect(config.ACCRETE_GROUP_NOT_SET_URL)
+            for member_group in (member_groups or []):
+                if not any([member_has_group(member_group)]):
+                    return redirect(config.ACCRETE_GROUP_NOT_SET_URL)
             return f(request, *args, **kwargs)
         return _wrapped_view
     return decorator

{accrete-0.0.124 → accrete-0.0.126}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.124'
+version = '0.0.126'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]