[#293] squash migrations

maykinmedia · Dec 4, 2024 · 2711785 · 2711785
1 parent 47936cb
commit 2711785
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 51 deletions.
diff --git a/...nauth_identifier_alter_tokenauth_token.py → ...n/migrations/0002_identifier_migration.py b/...nauth_identifier_alter_tokenauth_token.py → ...n/migrations/0002_identifier_migration.py
@@ -1,11 +1,12 @@
-# Generated by Django 4.2.15 on 2024-11-28 13:01
+# Generated by Django 4.2.15 on 2024-12-04 14:38
 
 import logging
 
 from django.db import migrations, models
 from django.db.migrations.state import StateApps
 from django.db.models.aggregates import Count
 
+import openklant.components.token.validators
 from openklant.components.token.utils import get_token
 
 logger = logging.getLogger(__name__)
@@ -67,13 +68,15 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="tokenauth",
             name="identifier",
-            field=models.CharField(null=True, blank=True),
+            field=models.CharField(blank=True, null=True),
         ),
         migrations.RunPython(
-            _generate_unique_identifiers, reverse_code=migrations.RunPython.noop
+            code=_generate_unique_identifiers,
+            reverse_code=migrations.RunPython.noop,
         ),
         migrations.RunPython(
-            _generate_unique_tokens, reverse_code=migrations.RunPython.noop
+            code=_generate_unique_tokens,
+            reverse_code=migrations.RunPython.noop,
         ),
         migrations.AlterField(
             model_name="tokenauth",
@@ -85,4 +88,21 @@ class Migration(migrations.Migration):
             name="identifier",
             field=models.SlugField(unique=True),
         ),
+        migrations.AlterField(
+            model_name="tokenauth",
+            name="identifier",
+            field=models.SlugField(
+                help_text="A human-friendly label to refer to this token", unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="tokenauth",
+            name="token",
+            field=models.CharField(
+                max_length=40,
+                unique=True,
+                validators=[openklant.components.token.validators.validate_whitespace],
+                verbose_name="token",
+            ),
+        ),
     ]
diff --git a/src/openklant/components/token/migrations/0003_alter_tokenauth_identifier.py b/src/openklant/components/token/migrations/0003_alter_tokenauth_identifier.py
diff --git a/src/openklant/components/token/migrations/0004_alter_tokenauth_token.py b/src/openklant/components/token/migrations/0004_alter_tokenauth_token.py
diff --git a/src/openklant/components/token/tests/test_migrations.py b/src/openklant/components/token/tests/test_migrations.py
@@ -53,7 +53,7 @@ def tearDownClass(cls) -> None:
 class TestTokenAuthUniqueness(BaseMigrationTest):
     app = "token"
     migrate_from = "0001_initial"
-    migrate_to = "0002_tokenauth_identifier_alter_tokenauth_token"
+    migrate_to = "0002_identifier_migration"
 
     def test_migrate_tokens_to_unique_values(self):
         TokenAuth = self.old_app_state.get_model("token", "TokenAuth")