Skip to content

Commit fc6b087

Browse files
authored
fix: User delete resource delete policy (#3376)
1 parent 1bbc693 commit fc6b087

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

apps/application/migrations/0002_alter_application_user_alter_chat_id.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated by Django 5.2.1 on 2025-06-24 09:53
22

33
import django.db.models.deletion
4-
import uuid
4+
import uuid_utils.compat
55
from django.db import migrations, models
66

77

@@ -21,6 +21,6 @@ class Migration(migrations.Migration):
2121
migrations.AlterField(
2222
model_name='chat',
2323
name='id',
24-
field=models.UUIDField(default=uuid.UUID('0197a15b-1024-7930-b06c-75dfaf6cba43'), editable=False, primary_key=True, serialize=False, verbose_name='主键id'),
24+
field=models.UUIDField(default=uuid_utils.compat.uuid7, editable=False, primary_key=True, serialize=False, verbose_name='主键id'),
2525
),
2626
]

apps/application/models/application_chat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ChatUserType(models.TextChoices):
2525

2626

2727
class Chat(AppModelMixin):
28-
id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid7(), editable=False, verbose_name="主键id")
28+
id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid7, editable=False, verbose_name="主键id")
2929
application = models.ForeignKey(Application, on_delete=models.CASCADE)
3030
abstract = models.CharField(max_length=1024, verbose_name="摘要")
3131
chat_user_id = models.UUIDField(verbose_name="客户端id", default=None, null=True)
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Generated by Django 5.2.1 on 2025-06-24 10:02
2+
3+
import django.db.models.deletion
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('system_manage', '0001_initial'),
11+
('users', '0001_initial'),
12+
]
13+
14+
operations = [
15+
migrations.AlterField(
16+
model_name='workspaceuserresourcepermission',
17+
name='user',
18+
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.user', verbose_name='工作空间下的用户'),
19+
),
20+
]

apps/system_manage/models/workspace_user_permission.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class WorkspaceUserResourcePermission(models.Model):
3131

3232
workspace_id = models.CharField(max_length=128, verbose_name="工作空间id", default="default")
3333

34-
user = models.ForeignKey(User, on_delete=models.DO_NOTHING, verbose_name="工作空间下的用户")
34+
user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name="工作空间下的用户")
3535

3636
auth_target_type = models.CharField(verbose_name='授权目标', max_length=128, choices=AuthTargetType.choices,
3737
default=AuthTargetType.KNOWLEDGE)

0 commit comments

Comments
 (0)