Parcourir la source

better workspace_menber schema

Guénaël Muller il y a 6 ans
Parent
révision
55ce338840

+ 4 - 0
tracim/tests/functional/test_workspaces.py Voir le fichier

159
         assert user_role['role'] == 'workspace-manager'
159
         assert user_role['role'] == 'workspace-manager'
160
         assert user_role['user_id'] == 1
160
         assert user_role['user_id'] == 1
161
         assert user_role['workspace_id'] == 1
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
         assert user_role['user']['public_name'] == 'Global manager'
165
         assert user_role['user']['public_name'] == 'Global manager'
166
+        assert user_role['user']['user_id'] == 1
163
         # TODO - G.M - 24-05-2018 - [Avatar] Replace
167
         # TODO - G.M - 24-05-2018 - [Avatar] Replace
164
         # by correct value when avatar feature will be enabled
168
         # by correct value when avatar feature will be enabled
165
         assert user_role['user']['avatar_url'] is None
169
         assert user_role['user']['avatar_url'] is None

+ 4 - 1
tracim/views/core_api/schemas.py Voir le fichier

231
     user_id = marshmallow.fields.Int(example=3)
231
     user_id = marshmallow.fields.Int(example=3)
232
     workspace_id = marshmallow.fields.Int(example=4)
232
     workspace_id = marshmallow.fields.Int(example=4)
233
     user = marshmallow.fields.Nested(
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
     class Meta:
240
     class Meta: