Context-related-model interface for user

tracim/models/auth.py

@@ -159,7 +159,7 @@ class User(DeclarativeBase):
             profile_id = max(group.group_id for group in self.groups)
         return Profile(profile_id)
 
-    # TODO - G-M - 27-03-2018 - [Calendar] Check about calendar code
+    # TODO - G-M - 20-04-2018 - [Calendar] Replace this in context model object
     # @property
     # def calendar_url(self) -> str:
     #     # TODO - 20160531 - Bastien: Cyclic import if import in top of file

tracim/models/context_models.py

@@ -0,0 +1,66 @@
+# coding=utf-8
+import typing
+from datetime import datetime
+
+from sqlalchemy.orm import Session
+from tracim import CFG
+from tracim.models import User
+from tracim.models.auth import Profile
+
+
+class UserInContext(object):
+    """
+    Interface to get User data and User data related to context.
+    """
+
+    def __init__(self, user: User, dbsession: Session, config: CFG):
+        self.user = user
+        self.dbsession = dbsession
+        self.config = config
+
+    # Default
+
+    @property
+    def email(self) -> str:
+        return self.user.email
+
+    @property
+    def user_id(self) -> int:
+        return self.user.user_id
+
+    @property
+    def display_name(self) -> str:
+        return self.user.display_name
+
+    @property
+    def created(self) -> datetime:
+        return self.user.created
+
+    @property
+    def is_active(self) -> bool:
+        return self.user.is_active
+
+    @property
+    def timezone(self) -> str:
+        return self.user.timezone
+
+    @property
+    def profile(self) -> Profile:
+        return self.user.profile
+
+    # Context related
+
+    @property
+    def calendar_url(self) -> typing.Optional[str]:
+        # TODO - G-M - 20-04-2018 - [Calendar] Replace calendar code to get
+        # url calendar url.
+        #
+        # from tracim.lib.calendar import CalendarManager
+        # calendar_manager = CalendarManager(None)
+        # return calendar_manager.get_workspace_calendar_url(self.workspace_id)
+        return None
+
+    @property
+    def avatar_url(self) -> typing.Optional[str]:
+        # TODO - G-M - 20-04-2018 - [Avatar] Add user avatar feature
+        return None

tracim/models/data.py

@@ -74,7 +74,7 @@ class Workspace(DeclarativeBase):
 
         return contents
 
-    # TODO - G-M - 27-03-2018 - [Calendar] Check about calendar code
+    # TODO - G-M - 27-03-2018 - [Calendar] Replace this in context model object
     # @property
     # def calendar_url(self) -> str:
     #     # TODO - 20160531 - Bastien: Cyclic import if import in top of file

tracim/tests/functional/test_session.py

@@ -67,6 +67,8 @@ class TestWhoamiEndpoint(FunctionalTest):
         assert res.json_body['profile']
         assert isinstance(res.json_body['profile']['id'], int)
         assert res.json_body['profile']['slug'] == 'administrators'
+        assert res.json_body['caldav_url'] is None
+        assert res.json_body['avatar_url'] is None
 
     def test_unauthenticated(self):
         self.testapp.authorization = (

tracim/views/core_api/schemas.py

@@ -18,11 +18,10 @@ class UserSchema(marshmallow.Schema):
     # TODO - G.M - 17-04-2018 - check this, relative url allowed ?
     caldav_url = marshmallow.fields.Url(
         allow_none=True,
-        default=None,
         relative=True,
         attribute='calendar_url'
     )
-    avatar_url = marshmallow.fields.Url(allow_none=True, default=None)
+    avatar_url = marshmallow.fields.Url(allow_none=True)
     profile = marshmallow.fields.Nested(
         ProfileSchema,
         many=False,

tracim/views/core_api/session_controller.py

@@ -9,6 +9,7 @@ from sqlalchemy.orm.exc import NoResultFound
 from tracim import TracimRequest
 from tracim.extensions import hapic
 from tracim.lib.core.user import UserApi
+from tracim.models.context_models import UserInContext
 from tracim.views.controllers import Controller
 from pyramid.config import Configurator
 
@@ -85,7 +86,12 @@ class SessionController(Controller):
         """
         Return current logged in user or 401
         """
-        return request.current_user
+        app_config = request.registry.settings['CFG']
+        return UserInContext(
+            user=request.current_user,
+            dbsession=request.dbsession,
+            config=app_config,
+        )
 
     def bind(self, configurator: Configurator):