Browse Source

better workspace_menber schema

Guénaël Muller 6 years ago
parent
commit
55ce338840
2 changed files with 8 additions and 1 deletions
  1. 4 0
      tracim/tests/functional/test_workspaces.py
  2. 4 1
      tracim/views/core_api/schemas.py

+ 4 - 0
tracim/tests/functional/test_workspaces.py View File

@@ -159,7 +159,11 @@ class TestWorkspaceMembersEndpoint(FunctionalTest):
159 159
         assert user_role['role'] == 'workspace-manager'
160 160
         assert user_role['user_id'] == 1
161 161
         assert user_role['workspace_id'] == 1
162
+        assert user_role['workspace']['workspace_id'] == 1
163
+        assert user_role['workspace']['label'] == 'Business'
164
+        assert user_role['workspace']['slug'] == 'business'
162 165
         assert user_role['user']['public_name'] == 'Global manager'
166
+        assert user_role['user']['user_id'] == 1
163 167
         # TODO - G.M - 24-05-2018 - [Avatar] Replace
164 168
         # by correct value when avatar feature will be enabled
165 169
         assert user_role['user']['avatar_url'] is None

+ 4 - 1
tracim/views/core_api/schemas.py View File

@@ -231,7 +231,10 @@ class WorkspaceMemberSchema(marshmallow.Schema):
231 231
     user_id = marshmallow.fields.Int(example=3)
232 232
     workspace_id = marshmallow.fields.Int(example=4)
233 233
     user = marshmallow.fields.Nested(
234
-        UserSchema(only=('public_name', 'avatar_url'))
234
+        UserDigestSchema()
235
+    )
236
+    workspace = marshmallow.fields.Nested(
237
+        WorkspaceDigestSchema(exclude=('sidebar_entries',))
235 238
     )
236 239
 
237 240
     class Meta: