zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update check_depth function to include workspace_id for folder hierarchy validation

Browse Source
This commit is contained in:
CaptainB 2025-06-11 14:54:44 +08:00
parent 238821e96b
commit b63bd8bbea
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/folders/serializers/folder.py
View File

@ -53,17 +53,17 @@ def get_folder_tree_serializer(source):
FOLDER_DEPTH = 2 # Folder 不能超过3层 FOLDER_DEPTH = 2 # Folder 不能超过3层
def check_depth(source, parent_id, current_depth=0): def check_depth(source, parent_id, workspace_id, current_depth=0):
# Folder 不能超过3层 # Folder 不能超过3层
Folder = get_folder_type(source) # noqa Folder = get_folder_type(source) # noqa
if parent_id != 'root': if parent_id != workspace_id:
# 计算当前层级 # 计算当前层级
depth = 1 # 当前要创建的节点算一层 depth = 1 # 当前要创建的节点算一层
current_parent_id = parent_id current_parent_id = parent_id
# 向上追溯父节点 # 向上追溯父节点
while current_parent_id != 'root': while current_parent_id != workspace_id:
depth += 1 depth += 1
parent_node = QuerySet(Folder).filter(id=current_parent_id).first() parent_node = QuerySet(Folder).filter(id=current_parent_id).first()
if parent_node is None: if parent_node is None:
@ -115,14 +115,14 @@ class FolderSerializer(serializers.Serializer):
workspace_id = 'default' workspace_id = 'default'
parent_id = instance.get('parent_id') parent_id = instance.get('parent_id')
if not parent_id: if not parent_id:
parent_id = 'root' parent_id = workspace_id
name = instance.get('name') name = instance.get('name')
Folder = get_folder_type(self.data.get('source')) # noqa Folder = get_folder_type(self.data.get('source')) # noqa
if QuerySet(Folder).filter(name=name, workspace_id=workspace_id, parent_id=parent_id).exists(): if QuerySet(Folder).filter(name=name, workspace_id=workspace_id, parent_id=parent_id).exists():
raise serializers.ValidationError(_('Folder name already exists')) raise serializers.ValidationError(_('Folder name already exists'))
# Folder 不能超过3层 # Folder 不能超过3层
check_depth(self.data.get('source'), parent_id) check_depth(self.data.get('source'), parent_id, workspace_id)
folder = Folder( folder = Folder(
id=uuid.uuid7(), id=uuid.uuid7(),
@ -157,10 +157,10 @@ class FolderSerializer(serializers.Serializer):
# 模块间的移动 # 模块间的移动
parent_id = instance.get('parent_id') parent_id = instance.get('parent_id')
if parent_id is not None and current_id != 'root': if parent_id is not None and current_id != current_node.workspace_id:
# Folder 不能超过3层 # Folder 不能超过3层
current_depth = get_max_depth(current_node) current_depth = get_max_depth(current_node)
check_depth(self.data.get('source'), parent_id, current_depth) check_depth(self.data.get('source'), parent_id, current_node.workspace_id, current_depth)
parent = Folder.objects.get(id=parent_id) parent = Folder.objects.get(id=parent_id)
current_node.move_to(parent) current_node.move_to(parent)
@ -175,10 +175,13 @@ class FolderSerializer(serializers.Serializer):
@transaction.atomic @transaction.atomic
def delete(self): def delete(self):
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)
if self.data.get('id') == 'root':
raise serializers.ValidationError(_('Cannot delete root folder'))
Folder = get_folder_type(self.data.get('source')) # noqa Folder = get_folder_type(self.data.get('source')) # noqa
Source = get_source_type(self.data.get('source')) # noqa Source = get_source_type(self.data.get('source')) # noqa
folder = Folder.objects.filter(id=self.data.get('id')).first()
if not folder:
raise serializers.ValidationError(_('Folder does not exist'))
if folder.id != folder.workspace_id:
raise serializers.ValidationError(_('Cannot delete root folder'))
nodes = Folder.objects.filter(id=self.data.get('id')).get_descendants(include_self=True) nodes = Folder.objects.filter(id=self.data.get('id')).get_descendants(include_self=True)
for node in nodes: for node in nodes:
# print(node) # print(node)