django-pfx 1.4.dev66__tar.gz → 1.4.dev70__tar.gz

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/.gitlab-ci.yml

@@ -33,19 +33,22 @@ quality check:
     - isort . -c
     - ./make_messages
     - git diff --exit-code  # exit if messages changed
-    - python manage.py makemigrations --check --dry-run --setting='pfx.settings.dev'
+    - python manage.py makemigrations --check --dry-run
+    - python manage.py makemigrations tests_base_user --check --dry-run
+    - python manage.py makemigrations tests_custom_user --check --dry-run
 
 test:
   variables:
     POSTGRES_DB: ci
     POSTGRES_USER: postgres
     POSTGRES_PASSWORD: postgres
-    DJANGO_SETTINGS_MODULE: 'tests.settings.ci'
   script:
     - apt-get update
     - apt-get install -y gettext
     - python manage.py compilemessages -i venv
-    - coverage run --source='.' manage.py test
+    - coverage run -a --source='.' manage.py test
+    - coverage run -a --source='.' manage.py test tests_base_user
+    - coverage run -a --source='.' manage.py test tests_custom_user
     - coverage report
     - coverage xml
     - coverage html

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/.pre-commit-config.yaml

@@ -20,3 +20,10 @@ repos:
         entry: isort
         language: system
         types: [python]
+-   repo: local
+    hooks:
+      - id: make-messages
+        name: make messages
+        entry: ./make_messages
+        language: system
+        types: [python]

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev66
+Version: 1.4.dev70
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev66
+Version: 1.4.dev70
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/django_pfx.egg-info/SOURCES.txt

@@ -114,6 +114,8 @@ tests/models.py
 tests/urls.py
 tests/views.py
 tests/locale/fr/LC_MESSAGES/django.po
+tests/migrations/0001_initial.py
+tests/migrations/__init__.py
 tests/settings/__init__.py
 tests/settings/ci.py
 tests/settings/common.py
@@ -133,6 +135,7 @@ tests/tests/test_fields.py
 tests/tests/test_filters.py
 tests/tests/test_locale_api.py
 tests/tests/test_perm_tests.py
+tests/tests/test_permissions.py
 tests/tests/test_perms_api.py
 tests/tests/test_profiling_middleware.py
 tests/tests/test_settings.py
@@ -141,4 +144,33 @@ tests/tests/test_timezone_middleware.py
 tests/tests/test_tools.py
 tests/tests/test_user_queryset.py
 tests/tests/test_view_decorators.py
-tests/tests/test_view_fields.py
+tests/tests/test_view_fields.py
+tests_base_user/__init__.py
+tests_base_user/urls.py
+tests_base_user/views.py
+tests_base_user/migrations/0001_initial.py
+tests_base_user/migrations/__init__.py
+tests_base_user/settings/__init__.py
+tests_base_user/settings/ci.py
+tests_base_user/settings/common.py
+tests_base_user/settings/dev.py
+tests_base_user/settings/dev_custom_example.py
+tests_base_user/settings/dev_default.py
+tests_base_user/tests/__init__.py
+tests_base_user/tests/test_api.py
+tests_base_user/tests/test_auth_api.py
+tests_custom_user/__init__.py
+tests_custom_user/models.py
+tests_custom_user/urls.py
+tests_custom_user/views.py
+tests_custom_user/migrations/0001_initial.py
+tests_custom_user/migrations/__init__.py
+tests_custom_user/settings/__init__.py
+tests_custom_user/settings/ci.py
+tests_custom_user/settings/common.py
+tests_custom_user/settings/dev.py
+tests_custom_user/settings/dev_custom_example.py
+tests_custom_user/settings/dev_default.py
+tests_custom_user/tests/__init__.py
+tests_custom_user/tests/test_api.py
+tests_custom_user/tests/test_auth_api.py

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/manage.py

@@ -18,10 +18,20 @@ writer.MIGRATION_HEADER_TEMPLATE = """\
 
 def main():
     """Run administrative tasks."""
-    cmd = len(sys.argv) > 1 and sys.argv[1]
-    os.environ.setdefault(
-        "DJANGO_SETTINGS_MODULE",
-        cmd == 'test' and "tests.settings.dev" or "pfx.settings.dev")
+    mode = os.environ.get('CI', '').lower() == 'true' and 'ci' or 'dev'
+    argv = [a for a in sys.argv if not a.startswith('--')]
+    options = [a for a in sys.argv if a.startswith('--')]
+    settings = f"pfx.settings.dev"
+    cmd = len(argv) > 1 and argv[1]
+    if cmd == 'test':
+        app = len(argv) > 2 and argv[2] or 'tests'
+        if len(argv) <= 2:
+            argv.append('tests')
+        settings = f"{app.split('.')[0]}.settings.{mode}"
+    elif cmd == 'makemigrations':
+        app = len(argv) > 2 and argv[2] or 'pfx'
+        settings = f"{app}.settings.{app == 'pfx' and 'dev' or 'common'}"
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", settings)
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
@@ -30,7 +40,7 @@ def main():
             "available on your PYTHONPATH environment variable? Did you "
             "forget to activate a virtual environment?"
         ) from exc
-    execute_from_command_line(sys.argv)
+    execute_from_command_line([*argv, *options])
 
 
 if __name__ == '__main__':

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-11 12:51+0100\n"
+"POT-Creation-Date: 2025-01-21 18:35+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -59,6 +59,14 @@ msgstr ""
 "Format non valide, il peut s’agir d’un nombre en heures, « 1:05 », « :05 », "
 "« 1h 5m », « 1.5h » ou « 30m »."
 
+#: models/abstract_pfx_base_user.py:35
+msgid "user"
+msgstr ""
+
+#: models/abstract_pfx_base_user.py:36
+msgid "users"
+msgstr ""
+
 #: models/login_ban.py:45
 msgid "Username"
 msgstr "Nom d’utilisateur"
@@ -95,7 +103,7 @@ msgstr "Compte HOTP"
 msgid "HOTP expiry"
 msgstr "Expiration HOTP"
 
-#: models/otp_user_mixin.py:29 views/authentication_views.py:496
+#: models/otp_user_mixin.py:29 views/authentication_views.py:491
 msgid "OTP enabled"
 msgstr "OTP activé"
 
@@ -209,7 +217,7 @@ msgstr ""
 msgid "Successful login"
 msgstr "Connexion réussie"
 
-#: views/authentication_views.py:243 views/authentication_views.py:413
+#: views/authentication_views.py:243 views/authentication_views.py:408
 msgid "password updated successfully"
 msgstr "le mot de passe a été mis à jour avec succès"
 
@@ -217,31 +225,31 @@ msgstr "le mot de passe a été mis à jour avec succès"
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: views/authentication_views.py:251 views/authentication_views.py:422
+#: views/authentication_views.py:251 views/authentication_views.py:417
 msgid "Empty password is not allowed"
 msgstr "Un mot de passe vide n’est pas autorisé"
 
-#: views/authentication_views.py:347
+#: views/authentication_views.py:342
 msgid "User and token are valid"
 msgstr "L'utilisateur et le token sont valides"
 
-#: views/authentication_views.py:349
+#: views/authentication_views.py:344
 msgid "User or token is invalid"
 msgstr "L'utilisateur ou le token est invalide"
 
-#: views/authentication_views.py:456
+#: views/authentication_views.py:451
 msgid "OTP is already enabled"
 msgstr "OTP est déjà activé"
 
-#: views/authentication_views.py:497 views/authentication_views.py:533
+#: views/authentication_views.py:492 views/authentication_views.py:528
 msgid "Invalid code"
 msgstr "Code invalide"
 
-#: views/authentication_views.py:532
+#: views/authentication_views.py:527
 msgid "OTP disabled"
 msgstr "OTP désactivé"
 
-#: views/authentication_views.py:792
+#: views/authentication_views.py:787
 msgid ""
 "If the email address you entered is correct, you will receive an email from "
 "us with instructions to reset your password."
@@ -250,7 +258,7 @@ msgstr ""
 "un courrier électronique de notre part contenant des instructions pour "
 "réinitialiser votre mot de passe."
 
-#: views/authentication_views.py:866
+#: views/authentication_views.py:861
 msgid "A new authentication code has been sent by email."
 msgstr "Un nouveau code d'authentification a été envoyé par e-mail."
 
@@ -259,27 +267,27 @@ msgstr "Un nouveau code d'authentification a été envoyé par e-mail."
 msgid "Invalid value for {filter} filter"
 msgstr "Valeur invalide pour le filtre {filter}"
 
-#: views/rest_views.py:235
+#: views/rest_views.py:242
 #, python-brace-format
 msgid "{obj} cannot be deleted because it is referenced by other objects."
 msgstr ""
 "{obj} ne peut pas être supprimé car il est référencé par d’autres objets."
 
-#: views/rest_views.py:329
+#: views/rest_views.py:342
 #, python-brace-format
 msgid "{model} {obj} created."
 msgstr "{model} {obj} créé."
 
-#: views/rest_views.py:330
+#: views/rest_views.py:343
 #, python-brace-format
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1093
+#: views/rest_views.py:1141
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."
 
-#: views/rest_views.py:1185 views/rest_views.py:1225
+#: views/rest_views.py:1240 views/rest_views.py:1280
 msgid "Unexpected storage error"
 msgstr "Erreur de stockage inattendue"

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/pfx/pfxcore/models/abstract_pfx_base_user.py

@@ -1,4 +1,5 @@
 from django.contrib.auth.models import AbstractBaseUser, AbstractUser
+from django.utils.translation import gettext_lazy as _
 
 from .pfx_models import PFXModelMixin
 
@@ -9,6 +10,13 @@ class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
     class Meta:
         abstract = True
 
+    def auth_json_repr(self):
+        return self.json_repr()
+
+    @classmethod
+    def auth_json_repr_schema(cls):
+        return cls.json_repr_schema()
+
     def get_user_jwt_signature_key(self):
         """
         Return a user secret to sign JWT token.
@@ -24,4 +32,6 @@ class AbstractPFXUser(AbstractUser, AbstractPFXBaseUser):
     """The base abstract user for PFX with permissions mixin."""
 
     class Meta:
+        verbose_name = _("user")
+        verbose_name_plural = _("users")
         abstract = True

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/pfx/pfxcore/models/pfx_user.py

@@ -1,4 +1,4 @@
-from django.contrib.auth.models import AbstractUser
+# from django.contrib.auth.models import AbstractUser
 
 from .abstract_pfx_base_user import AbstractPFXUser
 
@@ -7,5 +7,5 @@ class PFXUser(AbstractPFXUser):
     """The Django User with PFX mixins.
     """
 
-    class Meta(AbstractUser.Meta):
+    class Meta(AbstractPFXUser.Meta):
         swappable = "AUTH_USER_MODEL"

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/pfx/pfxcore/shortcuts.py

@@ -121,3 +121,18 @@ def register_views(*views):
 
 def class_key(cls, *args):
     return f"{cls.__module__}.{cls.__name__}{''.join(f'.{a}' for a in args)}"
+
+
+def permissions(*perms):
+    from django.contrib.auth.models import Permission
+    pks = set()
+    for perm in perms:
+        app_label, codename = perm.split('.')
+        pks.add(Permission.objects.get(
+            codename=codename, content_type__app_label=app_label).pk)
+    return Permission.objects.filter(pk__in=pks)
+
+
+def model_permissions(model, *actions):
+    meta = model._meta
+    return {f"{meta.app_label}.{a}_{meta.model_name}" for a in actions}

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/pfx/pfxcore/views/__init__.py

@@ -15,13 +15,16 @@ from .rest_views import (
     DeleteRestViewMixin,
     DetailRestViewMixin,
     ListRestViewMixin,
+    MediaPermsRestViewMixin,
     MediaRestViewMixin,
     ModelBodyMixin,
     ModelMixin,
     ModelResponseMixin,
+    PermsRestView,
     RestView,
     SecuredRestViewMixin,
     SlugDetailRestViewMixin,
+    SlugPermsDetailRestViewMixin,
     UpdateRestViewMixin,
     resource_not_found,
 )

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/pfx/pfxcore/views/authentication_views.py

@@ -20,7 +20,7 @@ from django.views.decorators.debug import sensitive_post_parameters
 
 import jwt
 
-from pfx.pfxcore.apidoc import ModelSchema, Schema, Tag
+from pfx.pfxcore.apidoc import Schema, Tag
 from pfx.pfxcore.decorator import rest_api, rest_doc, rest_view
 from pfx.pfxcore.exceptions import (
     AuthenticationError,
@@ -286,12 +286,7 @@ class AuthenticationView(
         Can be overridden to customize result.
 
         :param user: The user"""
-        info = {
-            'username': user.get_username(),
-            'first_name': user.first_name,
-            'last_name': user.last_name,
-            'email': user.email
-        }
+        info = user.auth_json_repr()
         if isinstance(user, OtpUserMixin):
             info.update(is_otp=user.is_otp)
         return info
@@ -301,8 +296,8 @@ class AuthenticationView(
         """Get user representation schema.
 
         Can be overridden to customize result."""
-        return ModelSchema(UserModel, cls._process_fields([
-            'username', 'first_name', 'last_name', 'email']))
+        return Schema(
+            'auth_user', "User", **UserModel.auth_json_repr_schema())
 
     @method_decorator(sensitive_post_parameters())
     @method_decorator(never_cache)

{django_pfx-1.4.dev66 → django_pfx-1.4.dev70}/pfx/pfxcore/views/rest_views.py

@@ -34,7 +34,14 @@ from pfx.pfxcore.exceptions import (
 from pfx.pfxcore.fields import MediaField
 from pfx.pfxcore.http import JsonResponse
 from pfx.pfxcore.models import JSONReprMixin, UserFilteredQuerySetMixin
-from pfx.pfxcore.shortcuts import class_key, f, get_bool, get_int, get_object
+from pfx.pfxcore.shortcuts import (
+    class_key,
+    f,
+    get_bool,
+    get_int,
+    get_object,
+    model_permissions,
+)
 from pfx.pfxcore.storage.s3_storage import StorageException
 
 from . import parameters
@@ -242,6 +249,12 @@ class ModelMixin():
         return cls.tags or [
             Tag(str(cls.model._meta.verbose_name))]
 
+    @classmethod
+    def get_model_perms(cls, actions):
+        """Get the model permission name for the action.
+        """
+        return model_permissions(cls.model, actions)
+
 
 class ModelResponseMixin(ModelMixin):
     """Extension of :class:`ModelMixin` to manage object responses."""
@@ -894,6 +907,13 @@ class ListRestViewMixin(ModelResponseMixin):
             cls.meta_list_schema, cls.model_list_schema]
 
 
+class ListPermsRestViewMixin(ListRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def get_list_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('view'))
+
+
 class DetailRestViewMixin(ModelResponseMixin):
     """Extension mixin to add a get detail route."""
 
@@ -917,6 +937,13 @@ class DetailRestViewMixin(ModelResponseMixin):
         return self.response(obj)
 
 
+class DetailPermsRestViewMixin(DetailRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def get_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('view'))
+
+
 class SlugDetailRestViewMixin(ModelResponseMixin):
     """Extension mixin to add a get detail by slug route."""
 
@@ -944,6 +971,13 @@ class SlugDetailRestViewMixin(ModelResponseMixin):
         return self.response(obj)
 
 
+class SlugPermsDetailRestViewMixin(SlugDetailRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def get_by_slug_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('view'))
+
+
 class CreateRestViewMixin(ModelBodyMixin, ModelResponseMixin):
     """Extension mixin to add create route."""
 
@@ -1013,6 +1047,13 @@ class CreateRestViewMixin(ModelBodyMixin, ModelResponseMixin):
         return self._post(*args, **kwargs)
 
 
+class CreatePermsRestViewMixin(CreateRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def post_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('add'))
+
+
 class UpdateRestViewMixin(ModelBodyMixin, ModelResponseMixin):
     """Extension mixin to add create route."""
 
@@ -1068,6 +1109,13 @@ class UpdateRestViewMixin(ModelBodyMixin, ModelResponseMixin):
         return self._put(id, *args, **kwargs)
 
 
+class UpdatePermsRestViewMixin(UpdateRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def put_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('change'))
+
+
 class DeleteRestViewMixin(ModelMixin):
     """Extension mixin to add delete route."""
 
@@ -1111,6 +1159,13 @@ class DeleteRestViewMixin(ModelMixin):
         return self._delete(id, *args, **kwargs)
 
 
+class DeletePermsRestViewMixin(DeleteRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def delete_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('delete'))
+
+
 class MediaRestViewMixin(ModelMixin):
     """Extension mixin to manage media fields."""
 
@@ -1228,6 +1283,16 @@ class MediaRestViewMixin(ModelMixin):
         return JsonResponse(dict(url=url))
 
 
+class MediaPermsRestViewMixin(MediaRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def field_media_upload_url_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('change'))
+
+    def field_media_get_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('view'))
+
+
 class SecuredRestViewMixin(View):
     """A view mixin to manage service permissions.
 
@@ -1409,3 +1474,13 @@ class RestView(
         DeleteRestViewMixin,
         BaseRestView):
     pass
+
+
+class PermsRestView(
+        ListPermsRestViewMixin,
+        DetailPermsRestViewMixin,
+        CreatePermsRestViewMixin,
+        UpdatePermsRestViewMixin,
+        DeletePermsRestViewMixin,
+        BaseRestView):
+    pass

django_pfx-1.4.dev70/tests/migrations/0001_initial.py

@@ -0,0 +1,119 @@
+# Generated by Django 4.2.17 on 2025-01-21 08:32
+# flake8: noqa
+
+import django.contrib.auth.models
+import django.contrib.auth.validators
+import django.db.models.deletion
+import django.utils.timezone
+from django.db import migrations, models
+
+import pfx.pfxcore.fields
+import pfx.pfxcore.models.cache_mixins
+import pfx.pfxcore.models.not_null_fields
+import pfx.pfxcore.models.pfx_models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Author',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('first_name', models.CharField(max_length=30, verbose_name='First Name')),
+                ('last_name', models.CharField(max_length=30, verbose_name='Last Name')),
+                ('slug', models.SlugField(unique=True, verbose_name='Slug')),
+                ('gender', models.CharField(choices=[('male', 'Male'), ('female', 'Female')], default='male', max_length=10, verbose_name='Gender')),
+                ('science_fiction', models.BooleanField(default=False, verbose_name='Science Fiction')),
+                ('created_at', models.DateField(auto_now_add=True, verbose_name='Created at')),
+                ('create_comment', pfx.pfxcore.models.not_null_fields.NotNullCharField(blank=True, max_length=255, verbose_name='Create comment')),
+                ('update_comment', pfx.pfxcore.models.not_null_fields.NotNullCharField(blank=True, max_length=255, verbose_name='Update comment')),
+                ('website', pfx.pfxcore.models.not_null_fields.NotNullURLField(blank=True, max_length=255, verbose_name='Website')),
+            ],
+            options={
+                'verbose_name': 'Author',
+                'verbose_name_plural': 'Authors',
+                'ordering': ['last_name', 'first_name', 'pk'],
+            },
+            bases=(pfx.pfxcore.models.cache_mixins.CacheableMixin, pfx.pfxcore.models.pfx_models.JSONReprMixin, models.Model),
+        ),
+        migrations.CreateModel(
+            name='BookType',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=30, verbose_name='Name')),
+                ('slug', models.SlugField(verbose_name='Slug')),
+            ],
+            options={
+                'verbose_name': 'Book Type',
+                'verbose_name_plural': 'Book Types',
+            },
+            bases=(pfx.pfxcore.models.cache_mixins.CacheDependsMixin, pfx.pfxcore.models.pfx_models.PFXModelMixin, models.Model),
+        ),
+        migrations.CreateModel(
+            name='Book',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100, verbose_name='Name')),
+                ('pub_date', models.DateField(verbose_name='Pub Date')),
+                ('created_at', models.DateField(auto_now_add=True, verbose_name='Created at')),
+                ('pages', models.IntegerField(blank=True, null=True, verbose_name='Pages')),
+                ('rating', models.FloatField(blank=True, null=True, verbose_name='Rating')),
+                ('reference', models.CharField(blank=True, max_length=30, null=True, verbose_name='Reference')),
+                ('cover', pfx.pfxcore.fields.MediaField(blank=True, default=dict, max_length=255, verbose_name='Cover')),
+                ('read_time', pfx.pfxcore.fields.MinutesDurationField(blank=True, null=True, verbose_name='Read Time')),
+                ('author', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='books', to='tests.author', verbose_name='Author')),
+                ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='books', to='tests.booktype', verbose_name='Book Type')),
+            ],
+            options={
+                'verbose_name': 'Book',
+                'verbose_name_plural': 'Books',
+            },
+            bases=(pfx.pfxcore.models.cache_mixins.CacheDependsMixin, pfx.pfxcore.models.pfx_models.PFXModelMixin, models.Model),
+        ),
+        migrations.AddField(
+            model_name='author',
+            name='types',
+            field=models.ManyToManyField(related_name='authors', to='tests.booktype', verbose_name='Types'),
+        ),
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
+                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                ('otp_secret_token', models.CharField(blank=True, max_length=32, null=True, unique=True, verbose_name='OTP secret token')),
+                ('otp_secret_token_tmp', models.CharField(blank=True, max_length=32, null=True, verbose_name='Temporary OTP secret token')),
+                ('hotp_count', models.IntegerField(default=0, verbose_name='HOTP count')),
+                ('hotp_expiry', models.DateTimeField(default=django.utils.timezone.now, verbose_name='HOTP expiry')),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
+            ],
+            options={
+                'verbose_name': 'user',
+                'verbose_name_plural': 'users',
+            },
+            bases=(pfx.pfxcore.models.cache_mixins.CacheableMixin, pfx.pfxcore.models.pfx_models.PFXModelMixin, models.Model),
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name='book',
+            constraint=pfx.pfxcore.models.pfx_models.UniqueConstraint(fields=('author', 'name'), message='%(name)s already exists for %(author)s', name='book_unique_author_and_name'),
+        ),
+    ]