Skip to content

Commit 26f8433

Browse files
committed
feat: update folder serializer to remove allow_null and allow_blank from workspace_id and parent_id
1 parent 1641039 commit 26f8433

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

apps/folders/serializers/folder.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ class FolderSerializer(serializers.Serializer):
9898
name = serializers.CharField(required=True, label=_('folder name'))
9999
desc = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('folder description'))
100100
user_id = serializers.CharField(required=True, label=_('folder user id'))
101-
workspace_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('workspace id'))
102-
parent_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('parent id'))
101+
workspace_id = serializers.CharField(required=False, label=_('workspace id'))
102+
parent_id = serializers.CharField(required=False, label=_('parent id'))
103103

104104
class Create(serializers.Serializer):
105105
user_id = serializers.UUIDField(required=True, label=_('user id'))
@@ -110,8 +110,12 @@ def insert(self, instance, with_valid=True):
110110
self.is_valid(raise_exception=True)
111111
FolderCreateRequest(data=instance).is_valid(raise_exception=True)
112112

113-
workspace_id = self.data.get('workspace_id', 'default')
114-
parent_id = instance.get('parent_id', 'root')
113+
workspace_id = self.data.get('workspace_id')
114+
if not workspace_id:
115+
workspace_id = 'default'
116+
parent_id = instance.get('parent_id')
117+
if not parent_id:
118+
parent_id = 'root'
115119
name = instance.get('name')
116120

117121
Folder = get_folder_type(self.data.get('source')) # noqa

0 commit comments

Comments
 (0)