accrete 0.0.123__py3-none-any.whl → 0.0.125__py3-none-any.whl

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/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/contrib/country/migrations/0003_alter_country_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.4 on 2025-02-19 18:25
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('country', '0002_auto_20250219_1759'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='country',
+            options={'ordering': ['-order_priority', 'name'], 'verbose_name': 'Country', 'verbose_name_plural': 'Countries'},
+        ),
+    ]

accrete/contrib/country/models.py

@@ -1,5 +1,4 @@
 from django.db import models
-from django.db.models.functions import Lower
 from django.utils.translation import gettext_lazy as _
 from accrete.fields import TranslatedCharField
 
@@ -10,7 +9,7 @@ class Country(models.Model):
         verbose_name = _('Country')
         verbose_name_plural = _('Countries')
         db_table = 'accrete_country'
-        ordering = ['-order_priority', Lower('name')]
+        ordering = ['-order_priority', 'name']
 
     name = TranslatedCharField(
         verbose_name=_('Name')

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/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/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/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.123.dist-info → accrete-0.0.125.dist-info}/METADATA

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

{accrete-0.0.123.dist-info → accrete-0.0.125.dist-info}/RECORD

@@ -1,24 +1,25 @@
 accrete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/admin.py,sha256=MUYUmCFlGYPowiXTbwl4_Q6Cq0-neiL53WW4P76JCLs,1174
+accrete/admin.py,sha256=6NiX8_3pYIhnru5hNzvnW4xfzWsbf7gZj8Z2p38xIOk,1232
 accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
-accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
+accrete/config.py,sha256=1Yubvz5PVdCsX0tA7HvazhtnvCvgCoEl33_dR8SHpb8,392
 accrete/fields.py,sha256=9SlltB5AJvDfiAbYGWZemrqpjqDl1XNgNrhyTGoBJ2A,4693
 accrete/forms.py,sha256=H2hPQemslRLvTVV0Wl1TfUmTc5wU3Z98nQTMiLMliqo,1288
 accrete/managers.py,sha256=DevRVm7cStvlfz6TriitSINr40POCi4HNaHX48VkrMA,1620
 accrete/middleware.py,sha256=YN73WloNkN01oel9Dcj3xyhurcWoB6zMV0NT3hY8DGw,2264
-accrete/models.py,sha256=k6BLNeQY4H_-WiODLpMoNJp_g3Dm4sTfeNj5n68oJ88,5109
+accrete/models.py,sha256=01UPWHmkWg3CcgPjImaSvS7OPh1Xx7lQ1nsJxZNN53k,4879
 accrete/storage.py,sha256=Jp3oE_uPMqgarjS_G49KDFrR2eSe4XuIJK9oAF_QBxk,1288
-accrete/tenant.py,sha256=-__rFtYrc5SbxFX2-Dvw6Wc1XzSAD6DeIBRuOVQlbWQ,1908
+accrete/tenant.py,sha256=GGKEhKLsC6JAkNGrMvp4l8ScsyfrDMocwJL5LBPe2Go,2307
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
 accrete/urls.py,sha256=goDFR-yhOlLLy7AMi9pmh2aBkxdtZtwXNg6mwI2zPhU,227
-accrete/views.py,sha256=dwgXLkIjqjG16vlG4C6QeS191HoDnT7bZtkLahJB6wQ,2582
+accrete/views.py,sha256=NEDX3yrEGjLe_dP47-B3Y537FvJCwEOBqcPrGS3lfuY,4752
 accrete/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/country/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/country/admin.py,sha256=0dAcFPfC8c80fhKKOL26-5Wl1uWXBYrkUJEjo2sEkk4,329
 accrete/contrib/country/apps.py,sha256=95KSUCEezHIvXmxGXCST7Ag1xvpREHQGy2mIJWWx9R0,162
-accrete/contrib/country/models.py,sha256=waflXa6oCVowzFQmhySQohzRmcjB10mv25EehCqDR-U,983
+accrete/contrib/country/models.py,sha256=yEAr-hiqEYcx9nfQRKNl5L-u00Dcm0HtJOiTBAyZbO4,931
 accrete/contrib/country/migrations/0001_initial.py,sha256=M-wKIa9gFtkZHatg-m-LRvrUrEZcKnenRtxLu7NMLbQ,1261
 accrete/contrib/country/migrations/0002_auto_20250219_1759.py,sha256=hSP0WEErHHJWCYTYvJSI00JWzH1iEcobNLR_4n8Ygq8,24841
+accrete/contrib/country/migrations/0003_alter_country_options.py,sha256=0reOOdHuApMA5pw4ga6BW63TCG2U1i8T8oSug7EjUXw,428
 accrete/contrib/country/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/log/admin.py,sha256=xeuLk1GdU_M0rZR8SQUzcMeWvV9ud0hz_LJmaut5eJE,1211
@@ -250,6 +251,7 @@ accrete/contrib/user_registration/templates/user_registration/mail_templates/con
 accrete/migrations/0001_initial.py,sha256=azThbc8otEhxJwo8BIgOt5eC30mxXhKJLBAazZFe3BA,4166
 accrete/migrations/0002_initial.py,sha256=dFOM7kdHlx7pVAh8cTDlZMtciN4O9Z547HAzEKnygZE,1628
 accrete/migrations/0003_remove_member_name.py,sha256=bnZrzOIXcqsoGfbqgohTN5OHm2IldnLlBz1HNJDeqKc,315
+accrete/migrations/0004_rename_accessgroupmember_memberaccessgrouprel_and_more.py,sha256=NXEKuRyIjLFXqycWB1jIZFQ0ppevMwz1I6rAr9qKrk4,1404
 accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/utils/__init__.py,sha256=saw9zi2XItJOPbv4fjTXOpl7StNtC803jHhapFcGx08,312
 accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
@@ -257,7 +259,7 @@ accrete/utils/forms.py,sha256=IvxbXNpSd4a-JBgsTJhs2GHe-DCRWX-xnVPRcoiCzbI,3104
 accrete/utils/log.py,sha256=BH0MBDweAjx30wGBO4F3sFhbgkSoEs7T1lLLjlYZNnA,407
 accrete/utils/models.py,sha256=2xTacvcpmDK_Bp4rAK7JdVLf8HU009LYNJ6eSpMgYZI,1014
 accrete/utils/views.py,sha256=AutijWetWGgjdO1PNc4gxCblT-i1fAfldNDFRbO9Sac,5012
-accrete-0.0.123.dist-info/METADATA,sha256=wUGZk9TrXWGL3Hnzb4GofGgl-cM2DQ4g1leMMPOsQhM,4953
-accrete-0.0.123.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-accrete-0.0.123.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.123.dist-info/RECORD,,
+accrete-0.0.125.dist-info/METADATA,sha256=ydqTjC-yrBSis0uMo7-3fD1ua8earnP0149gN6iZrlA,4953
+accrete-0.0.125.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+accrete-0.0.125.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.125.dist-info/RECORD,,