minor: resolve #1690 conversations

TencentBlueKing · May 8, 2024 · e8ad8ca · e8ad8ca
1 parent 6a29a0e
commit e8ad8ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...ant/migrations/0004_auto_20240507_1457.py → ...ant/migrations/0004_auto_20240508_0952.py b/...ant/migrations/0004_auto_20240507_1457.py → ...ant/migrations/0004_auto_20240508_0952.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.20 on 2024-05-07 06:57
+# Generated by Django 3.2.20 on 2024-05-08 01:52
 
 import bkuser.apps.tenant.constants
 from django.db import migrations, models
@@ -39,7 +39,7 @@ class Migration(migrations.Migration):
                 ('target_tenant', models.ForeignKey(db_constraint=False, on_delete=django.db.models.deletion.DO_NOTHING, related_name='target_tenant', to='tenant.tenant')),
             ],
             options={
-                'unique_together': {('source_tenant', 'target_tenant')},
+                'unique_together': {('source_tenant', 'target_tenant'), ('name', 'source_tenant')},
             },
         ),
     ]
diff --git a/src/bk-user/bkuser/apps/tenant/models.py b/src/bk-user/bkuser/apps/tenant/models.py
@@ -237,5 +237,6 @@ class CollaborationStrategy(AuditedModel):
 
     class Meta:
         unique_together = [
+            ("name", "source_tenant"),
             ("source_tenant", "target_tenant"),
         ]