0002-a2_rbac-migrate-existing-operations-to-new-model-699.patch

Valentin Deniaud, 12 octobre 2022 16:14

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/2] a2_rbac: migrate existing operations to new model
 (#69902)

 .../migrations/0031_new_operation_model.py    | 45 ++++++++++++++++
 .../migrations/0032_copy_operations_data.py   | 43 +++++++++++++++
 .../0033_remove_old_operation_fk.py           | 30 +++++++++++
 src/authentic2/a2_rbac/models.py              | 34 +++++++++++-
 src/authentic2/data_transfer.py               | 10 +++-
 src/authentic2/manager/forms.py               |  3 +-
 .../migrations/0010_delete_operation.py       | 17 ++++++
 src/django_rbac/models.py                     | 33 ------------
 src/django_rbac/utils.py                      |  2 +-
 tests/test_a2_rbac.py                         | 53 ++++++++++++++++++-
 tests/test_commands.py                        |  2 +-
 tests/test_rbac.py                            |  3 +-
 12 files changed, 231 insertions(+), 44 deletions(-)
 create mode 100644 src/authentic2/a2_rbac/migrations/0031_new_operation_model.py
 create mode 100644 src/authentic2/a2_rbac/migrations/0032_copy_operations_data.py
 create mode 100644 src/authentic2/a2_rbac/migrations/0033_remove_old_operation_fk.py
 create mode 100644 src/django_rbac/migrations/0010_delete_operation.py
 delete mode 100644 src/django_rbac/models.py

     # Generated by Django 2.2.26 on 2022-10-11 14:14
     import django.db.models.deletion
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('a2_rbac', '0030_organizationalunit_min_password_strength'),
+        ]
         operations = [
             migrations.CreateModel(
                 name='Operation',
                 fields=[
+                    (
                         'id',
                         models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
                     ),
                     ('slug', models.CharField(max_length=32, unique=True, verbose_name='slug')),
                 ],
             ),
             migrations.AddField(
                 model_name='permission',
                 name='operation_new',
                 field=models.ForeignKey(
                     null=True,
                     on_delete=django.db.models.deletion.CASCADE,
                     to='a2_rbac.Operation',
                     verbose_name='operation',
                 ),
                 preserve_default=False,
             ),
             migrations.AlterField(
                 model_name='permission',
                 name='operation',
                 field=models.ForeignKey(
                     on_delete=django.db.models.deletion.CASCADE,
                     to='django_rbac.Operation',
                     verbose_name='operation',
                     null=True,
                 ),
             ),
+        ]

     # Generated by Django 2.2.26 on 2022-10-11 13:36
     from django.db import migrations
     def copy_operations_data(apps, schema_editor):
         OldOperation = apps.get_model('django_rbac', 'Operation')
         NewOperation = apps.get_model('a2_rbac', 'Operation')
         Permission = apps.get_model('a2_rbac', 'Permission')
         operation_map = {}
         for operation in OldOperation.objects.all():
             operation_map[operation.pk] = NewOperation.objects.create(slug=operation.slug)
         for permission in Permission.objects.all():
             permission.operation_new = operation_map[permission.operation_id]
             permission.save()
     def reverse_copy_operations_data(apps, schema_editor):
         OldOperation = apps.get_model('django_rbac', 'Operation')
         NewOperation = apps.get_model('a2_rbac', 'Operation')
         Permission = apps.get_model('a2_rbac', 'Permission')
         operation_map = {}
         for operation in NewOperation.objects.all():
             operation_map[operation.pk] = OldOperation.objects.create(slug=operation.slug)
         for permission in Permission.objects.all():
             permission.operation = operation_map[permission.operation_new_id]
             permission.save()
     class Migration(migrations.Migration):
         dependencies = [
             ('a2_rbac', '0031_new_operation_model'),
             ('django_rbac', '0009_auto_20221004_1343'),
+        ]
         operations = [
             migrations.RunPython(copy_operations_data, reverse_code=reverse_copy_operations_data),
+        ]

     # Generated by Django 2.2.26 on 2022-10-11 14:35
     import django
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('a2_rbac', '0032_copy_operations_data'),
+        ]
         operations = [
             migrations.RemoveField(
                 model_name='permission',
                 name='operation',
             ),
             migrations.RenameField(
                 model_name='permission',
                 old_name='operation_new',
                 new_name='operation',
             ),
             migrations.AlterField(
                 model_name='permission',
                 name='operation',
                 field=models.ForeignKey(
                     on_delete=django.db.models.deletion.CASCADE, to='a2_rbac.Operation', verbose_name='operation'
                 ),
             ),
+        ]

     from authentic2.validators import HexaColourValidator
     from django_rbac import managers as rbac_managers
     from django_rbac import utils as rbac_utils
     from django_rbac.models import Operation
     from . import app_settings, fields, managers
-...
     class Permission(models.Model):
         operation = models.ForeignKey(to=Operation, verbose_name=_('operation'), on_delete=models.CASCADE)
         operation = models.ForeignKey(
             to='a2_rbac.Operation', verbose_name=_('operation'), on_delete=models.CASCADE
+        )
         ou = models.ForeignKey(
             to=rbac_utils.get_ou_model_name(),
             verbose_name=_('organizational unit'),
-...
             return {'name': self.name, 'kind': self.kind, 'value': self.value}
     class Operation(models.Model):
         slug = models.CharField(max_length=32, verbose_name=_('slug'), unique=True)
         def natural_key(self):
             return [self.slug]
         def __str__(self):
             return str(self._registry.get(self.slug, self.slug))
         def export_json(self):
             return {'slug': self.slug}
         @property
         def name(self):
             return str(self)
         @classmethod
         def register(cls, name, slug):
             cls._registry[slug] = name
             return cls(slug=slug)
         _registry = {}
         objects = rbac_managers.OperationManager()
     Operation._meta.natural_key = ['slug']
     GenericRelation(Permission, content_type_field='target_ct', object_id_field='target_id').contribute_to_class(
         ContentType, 'admin_perms'
+    )

     from django.utils.text import format_lazy
     from django.utils.translation import gettext_lazy as _
     from authentic2.a2_rbac.models import OrganizationalUnit, Permission, Role, RoleAttribute, RoleParenting
     from authentic2.a2_rbac.models import (
         Operation,
         OrganizationalUnit,
         Permission,
         Role,
         RoleAttribute,
         RoleParenting,
+    )
     from authentic2.a2_rbac.utils import get_default_ou
     from authentic2.decorators import errorcollector
     from authentic2.utils.lazy import lazy_join
     from django_rbac.models import Operation
     def update_model(obj, d):

     from django.utils.translation import pgettext
     from django_select2.forms import HeavySelect2Widget
     from authentic2.a2_rbac.models import OrganizationalUnit, Permission, Role, RoleAttribute
     from authentic2.a2_rbac.models import Operation, OrganizationalUnit, Permission, Role, RoleAttribute
     from authentic2.a2_rbac.utils import generate_slug, get_default_ou
     from authentic2.custom_user.backends import DjangoRBACBackend
     from authentic2.forms.fields import (
-...
     from authentic2.passwords import generate_password, get_min_password_strength
     from authentic2.utils.misc import send_email_change_email, send_password_reset_mail, send_templated_mail
     from authentic2.validators import EmailValidator
     from django_rbac.models import Operation
     from . import app_settings, fields, utils

     # Generated by Django 2.2.26 on 2022-10-11 14:43
     from django.db import migrations
     class Migration(migrations.Migration):
         dependencies = [
             ('django_rbac', '0009_auto_20221004_1343'),
             ('a2_rbac', '0033_remove_old_operation_fk'),
+        ]
         operations = [
             migrations.DeleteModel(
                 name='Operation',
             ),
+        ]

     from django.db import models
     from django.utils.translation import gettext_lazy as _
     from . import managers
     class Operation(models.Model):
         slug = models.CharField(max_length=32, verbose_name=_('slug'), unique=True)
         def natural_key(self):
             return [self.slug]
         def __str__(self):
             return str(self._registry.get(self.slug, self.slug))
         def export_json(self):
             return {'slug': self.slug}
         @property
         def name(self):
             return str(self)
         @classmethod
         def register(cls, name, slug):
             cls._registry[slug] = name
             return cls(slug=slug)
         _registry = {}
         objects = managers.OperationManager()
     Operation._meta.natural_key = ['slug']

     def get_operation(operation_tpl):
         from . import models
         from authentic2.a2_rbac import models
         operation, dummy = models.Operation.objects.get_or_create(slug=operation_tpl.slug)
         return operation

     from django.core.exceptions import ValidationError
     from django.core.management import call_command
     from authentic2.a2_rbac.models import CHANGE_OP, MANAGE_MEMBERS_OP
     from authentic2.a2_rbac.models import CHANGE_OP, MANAGE_MEMBERS_OP, Operation
     from authentic2.a2_rbac.models import OrganizationalUnit as OU
     from authentic2.a2_rbac.models import Permission, Role, RoleAttribute
     from authentic2.a2_rbac.utils import get_default_ou
     from authentic2.custom_user.models import User
     from authentic2.models import Service
     from authentic2.utils.misc import get_hex_uuid
     from django_rbac.models import Operation
     from tests.utils import login, request_select2, scoped_db_fixture
-...
             def test_direct(self, db, fixture):
                 assert set(fixture.role.children(direct=True)) == {fixture.role, fixture.child}
                 assert fixture.role.children(include_self=False, direct=True).get() == fixture.child
     def test_a2_rbac_operation_migration(migration, settings):
         migrate_from = [
             ('a2_rbac', '0030_organizationalunit_min_password_strength'),
             ('django_rbac', '0009_auto_20221004_1343'),
+        ]
         migrate_to = [('a2_rbac', '0033_remove_old_operation_fk')]
         old_apps = migration.before(migrate_from)
         ContentType = old_apps.get_model('contenttypes', 'ContentType')
         Operation = old_apps.get_model('django_rbac', 'Operation')
         Permission = old_apps.get_model('a2_rbac', 'Permission')
         # check objects created by signal handlers
         base_operation = Operation.objects.get(slug='view')
         base_permission = Permission.objects.filter(operation=base_operation).first()
         # check other objects
         new_operation = Operation.objects.create(slug='test')
         Permission.objects.create(
             operation=new_operation,
             target_ct=ContentType.objects.get_for_model(ContentType),
             target_id=ContentType.objects.get_for_model(User).pk,
+        )
         new_apps = migration.apply(migrate_to)
         ContentType = new_apps.get_model('contenttypes', 'ContentType')
         Operation = new_apps.get_model('a2_rbac', 'Operation')
         Permission = new_apps.get_model('a2_rbac', 'Permission')
         base_operation = Operation.objects.get(slug='view')
         assert (
             Permission.objects.filter(
                 operation_id=base_operation,
                 target_ct_id=base_permission.target_ct.pk,
                 target_id=base_permission.target_id,
             ).count()
             == 1
+        )
         new_operation = Operation.objects.get(slug=new_operation.slug)
         assert (
             Permission.objects.filter(
                 operation=new_operation,
                 target_ct=ContentType.objects.get_for_model(ContentType),
                 target_id=ContentType.objects.get_for_model(User).pk,
             ).count()
             == 1
+        )

         ADMIN_OP,
         MANAGE_MEMBERS_OP,
         VIEW_OP,
         Operation,
         OrganizationalUnit,
         Permission,
         Role,
-...
     from authentic2.custom_user.models import DeletedUser
     from authentic2.models import UserExternalId
     from authentic2_auth_oidc.models import OIDCAccount, OIDCProvider
     from django_rbac.models import Operation
     from django_rbac.utils import get_operation
     from .utils import call_command, login

     from django.db.models import Q
     from django.test.utils import CaptureQueriesContext
     from authentic2.a2_rbac import models
     from authentic2.custom_user import backends
     from django_rbac import models, utils
     from django_rbac import utils
     OU = OrganizationalUnit = utils.get_ou_model()
     Permission = utils.get_permission_model()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0002-a2_rbac-migrate-existing-operations-to-new-model-699.patch