simplify profile info in user schema

tracim/models/context_models.py

@@ -112,7 +112,7 @@ class UserInContext(object):
 
     @property
     def profile(self) -> Profile:
-        return self.user.profile
+        return self.user.profile.name
 
     # Context related
 

tracim/tests/functional/test_session.py

@@ -50,7 +50,7 @@ class TestLoginEndpoint(FunctionalTest):
         assert res.json_body['created']
         assert res.json_body['is_active']
         assert res.json_body['profile']
-        assert res.json_body['profile']['slug'] == 'administrators'
+        assert res.json_body['profile'] == 'administrators'
         assert res.json_body['caldav_url'] is None
         assert res.json_body['avatar_url'] is None
 
@@ -108,7 +108,7 @@ class TestWhoamiEndpoint(FunctionalTest):
         assert res.json_body['created']
         assert res.json_body['is_active']
         assert res.json_body['profile']
-        assert res.json_body['profile']['slug'] == 'administrators'
+        assert res.json_body['profile'] == 'administrators'
         assert res.json_body['caldav_url'] is None
         assert res.json_body['avatar_url'] is None
 

tracim/tests/library/test_user_api.py

@@ -131,7 +131,7 @@ class TestUserApi(DefaultTest):
         new_user = api.get_user_with_context(user)
         assert isinstance(new_user, UserInContext)
         assert new_user.user == user
-        assert new_user.profile.name == 'nobody'
+        assert new_user.profile == 'nobody'
         assert new_user.user_id == user.user_id
         assert new_user.email == 'admin@tracim.tracim'
         assert new_user.display_name == 'Admin'

tracim/views/core_api/schemas.py

@@ -16,17 +16,6 @@ from tracim.models.context_models import LoginCredentials
 from tracim.models.data import UserRoleInWorkspace
 
 
-class ProfileSchema(marshmallow.Schema):
-    slug = marshmallow.fields.String(
-        attribute='name',
-        validate=OneOf(Profile._NAME),
-        example='managers',
-    )
-
-    class Meta:
-        description = 'User Profile, give user right on whole Tracim instance.'
-
-
 class UserSchema(marshmallow.Schema):
 
     user_id = marshmallow.fields.Int(dump_only=True, example=3)
@@ -64,9 +53,10 @@ class UserSchema(marshmallow.Schema):
                     "If no avatar, then set it to null "
                     "(and frontend will interpret this with a default avatar)",
     )
-    profile = marshmallow.fields.Nested(
-        ProfileSchema,
-        many=False,
+    profile = marshmallow.fields.String(
+        attribute='profile',
+        validate=OneOf(Profile._NAME),
+        example='managers',
     )
 
     class Meta: