[#606] fix last_modifier and author should not be the same.

tracim/fixtures/content.py

@@ -117,7 +117,7 @@ class Content(Fixture):
             content_type=ContentType.Page,
             workspace=recipe_workspace,
             parent=dessert_folder,
-            label='Tiramisu Recipe',
+            label='Tiramisu Recipes !!!',
             do_save=True,
             do_notify=False,
         )
@@ -128,8 +128,8 @@ class Content(Fixture):
         ):
             content_api.update_content(
                 item=tiramisu_page,
-                new_content='<p>To cook a great Tiramisu, you need many ingredients.</p>',  # nopep8
-                new_label='Tiramisu Recipe',
+                new_content='<p>To cook a greet Tiramisu, you need many ingredients.</p>',  # nopep8
+                new_label='Tiramisu Recipes !!!',
             )
             content_api.save(tiramisu_page)
 
@@ -137,11 +137,11 @@ class Content(Fixture):
             content_type=ContentType.Thread,
             workspace=recipe_workspace,
             parent=dessert_folder,
-            label='Best Cakes ?',
+            label='Best Cake',
             do_save=False,
             do_notify=False,
         )
-        best_cake_thread.description = 'What is the best cake ?'
+        best_cake_thread.description = 'Which is the best cake ?'
         self._session.add(best_cake_thread)
         apple_pie_recipe = content_api.create(
             content_type=ContentType.File,
@@ -278,4 +278,27 @@ class Content(Fixture):
             content='<p>You are right, but Kouign-amann are clearly better.</p>',
             do_save=True,
         )
+        with new_revision(
+                session=self._session,
+                tm=transaction.manager,
+                content=best_cake_thread,
+        ):
+            bob_content_api.update_content(
+                item=best_cake_thread,
+                new_content='What is the best cake ?',
+                new_label='Best Cakes ?',
+            )
+            bob_content_api.save(best_cake_thread)
+
+        with new_revision(
+                session=self._session,
+                tm=transaction.manager,
+                content=tiramisu_page,
+        ):
+            bob_content_api.update_content(
+                item=tiramisu_page,
+                new_content='<p>To cook a great Tiramisu, you need many ingredients.</p>',  # nopep8
+                new_label='Tiramisu Recipe',
+            )
+            bob_content_api.save(tiramisu_page)
         self._session.flush()

tracim/models/context_models.py

@@ -392,7 +392,7 @@ class ContentInContext(object):
         return UserInContext(
             dbsession=self.dbsession,
             config=self.config,
-            user=self.content.owner
+            user=self.content.first_revision.owner
         )
 
     @property
@@ -413,8 +413,12 @@ class ContentInContext(object):
 
     @property
     def last_modifier(self):
-        # TODO - G.M - 2018-06-173 - Repair owner/last modifier
-        return self.author
+        return UserInContext(
+            dbsession=self.dbsession,
+            config=self.config,
+            user=self.content.last_revision.owner
+        )
+
     # Context-related
     @property
     def show_in_ui(self):
@@ -514,11 +518,6 @@ class RevisionInContext(object):
         return self.revision.updated
 
     @property
-    def last_modifier(self):
-        # TODO - G.M - 2018-06-173 - Repair owner/last modifier
-        return self.author
-    
-    @property
     def comments_ids(self):
         # TODO - G.M - 2018-06-173 - Return comments related to this revision
         return []

tracim/models/data.py

@@ -598,6 +598,7 @@ class ContentRevisionRO(DeclarativeBase):
 
     revision_id = Column(Integer, primary_key=True)
     content_id = Column(Integer, ForeignKey('content.id'), nullable=False)
+    # TODO - G.M - 2018-06-177 - [author] Owner should be renamed "author"
     owner_id = Column(Integer, ForeignKey('users.user_id'), nullable=True)
 
     label = Column(Unicode(1024), unique=False, nullable=False)
@@ -631,6 +632,7 @@ class ContentRevisionRO(DeclarativeBase):
     parent = relationship("Content", foreign_keys=[parent_id], back_populates="children_revisions")
 
     node = relationship("Content", foreign_keys=[content_id], back_populates="revisions")
+    # TODO - G.M - 2018-06-177 - [author] Owner should be renamed "author"
     owner = relationship('User', remote_side=[User.user_id])
 
     """ List of column copied when make a new revision from another """
@@ -788,7 +790,7 @@ class ContentRevisionRO(DeclarativeBase):
             file_extension,
         )
 
-
+# TODO - G.M - 2018-06-177 - [author] Owner should be renamed "author"
 Index('idx__content_revisions__owner_id', ContentRevisionRO.owner_id)
 Index('idx__content_revisions__parent_id', ContentRevisionRO.parent_id)
 
@@ -867,6 +869,8 @@ class Content(DeclarativeBase):
     def revision_id(cls) -> InstrumentedAttribute:
         return ContentRevisionRO.revision_id
 
+    # TODO - G.M - 2018-06-177 - [author] Owner should be renamed "author"
+    # and should be author of first revision.
     @hybrid_property
     def owner_id(self) -> int:
         return self.revision.owner_id
@@ -1113,6 +1117,8 @@ class Content(DeclarativeBase):
     def node(cls) -> InstrumentedAttribute:
         return ContentRevisionRO.node
 
+    # TODO - G.M - 2018-06-177 - [author] Owner should be renamed "author"
+    # and should be author of first revision.
     @hybrid_property
     def owner(self) -> User:
         return self.revision.owner

tracim/tests/functional/test_contents.py

@@ -54,7 +54,7 @@ class TestHtmlDocuments(FunctionalTest):
         assert content['slug'] == 'tiramisu-recipe'
         assert content['status'] == 'open'
         assert content['workspace_id'] == 2
-        assert content['current_revision_id'] == 7
+        assert content['current_revision_id'] == 27
         # TODO - G.M - 2018-06-173 - check date format
         assert content['created']
         assert content['author']
@@ -63,7 +63,10 @@ class TestHtmlDocuments(FunctionalTest):
         assert content['author']['public_name'] == 'Global manager'
         # TODO - G.M - 2018-06-173 - check date format
         assert content['modified']
-        assert content['last_modifier'] == content['author']
+        assert content['last_modifier'] != content['author']
+        assert content['last_modifier']['user_id'] == 3
+        assert content['last_modifier']['public_name'] == 'Bob i.'
+        assert content['last_modifier']['avatar_url'] is None
         assert content['raw_content'] == '<p>To cook a great Tiramisu, you need many ingredients.</p>'  # nopep8
 
     def test_api__update_html_document__ok_200__nominal_case(self) -> None:
@@ -97,7 +100,7 @@ class TestHtmlDocuments(FunctionalTest):
         assert content['slug'] == 'my-new-label'
         assert content['status'] == 'open'
         assert content['workspace_id'] == 2
-        assert content['current_revision_id'] == 26
+        assert content['current_revision_id'] == 28
         # TODO - G.M - 2018-06-173 - check date format
         assert content['created']
         assert content['author']
@@ -124,7 +127,7 @@ class TestHtmlDocuments(FunctionalTest):
         assert content['slug'] == 'my-new-label'
         assert content['status'] == 'open'
         assert content['workspace_id'] == 2
-        assert content['current_revision_id'] == 26
+        assert content['current_revision_id'] == 28
         # TODO - G.M - 2018-06-173 - check date format
         assert content['created']
         assert content['author']
@@ -154,16 +157,16 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         revisions = res.json_body
-        assert len(revisions) == 2
+        assert len(revisions) == 3
         revision = revisions[0]
         assert revision['content_type'] == 'page'
         assert revision['content_id'] == 6
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
-        assert revision['label'] == 'Tiramisu Recipe'
+        assert revision['label'] == 'Tiramisu Recipes !!!'
         assert revision['parent_id'] == 3
         assert revision['show_in_ui'] is True
-        assert revision['slug'] == 'tiramisu-recipe'
+        assert revision['slug'] == 'tiramisu-recipes'
         assert revision['status'] == 'open'
         assert revision['workspace_id'] == 2
         assert revision['revision_id'] == 6
@@ -176,6 +179,48 @@ class TestHtmlDocuments(FunctionalTest):
         assert revision['author']['user_id'] == 1
         assert revision['author']['avatar_url'] is None
         assert revision['author']['public_name'] == 'Global manager'
+        revision = revisions[1]
+        assert revision['content_type'] == 'page'
+        assert revision['content_id'] == 6
+        assert revision['is_archived'] is False
+        assert revision['is_deleted'] is False
+        assert revision['label'] == 'Tiramisu Recipes !!!'
+        assert revision['parent_id'] == 3
+        assert revision['show_in_ui'] is True
+        assert revision['slug'] == 'tiramisu-recipes'
+        assert revision['status'] == 'open'
+        assert revision['workspace_id'] == 2
+        assert revision['revision_id'] == 7
+        assert revision['sub_content_types']
+        # TODO - G.M - 2018-06-173 - Test with real comments
+        assert revision['comments_ids'] == []
+        # TODO - G.M - 2018-06-173 - check date format
+        assert revision['created']
+        assert revision['author']
+        assert revision['author']['user_id'] == 1
+        assert revision['author']['avatar_url'] is None
+        assert revision['author']['public_name'] == 'Global manager'
+        revision = revisions[2]
+        assert revision['content_type'] == 'page'
+        assert revision['content_id'] == 6
+        assert revision['is_archived'] is False
+        assert revision['is_deleted'] is False
+        assert revision['label'] == 'Tiramisu Recipe'
+        assert revision['parent_id'] == 3
+        assert revision['show_in_ui'] is True
+        assert revision['slug'] == 'tiramisu-recipe'
+        assert revision['status'] == 'open'
+        assert revision['workspace_id'] == 2
+        assert revision['revision_id'] == 27
+        assert revision['sub_content_types']
+        # TODO - G.M - 2018-06-173 - Test with real comments
+        assert revision['comments_ids'] == []
+        # TODO - G.M - 2018-06-173 - check date format
+        assert revision['created']
+        assert revision['author']
+        assert revision['author']['user_id'] == 3
+        assert revision['author']['avatar_url'] is None
+        assert revision['author']['public_name'] == 'Bob i.'
 
     def test_api__set_html_document_status__ok_200__nominal_case(self) -> None:
         """
@@ -270,7 +315,7 @@ class TestThreads(FunctionalTest):
         assert content['slug'] == 'best-cakes'
         assert content['status'] == 'open'
         assert content['workspace_id'] == 2
-        assert content['current_revision_id'] == 8
+        assert content['current_revision_id'] == 26
         # TODO - G.M - 2018-06-173 - check date format
         assert content['created']
         assert content['author']
@@ -279,7 +324,10 @@ class TestThreads(FunctionalTest):
         assert content['author']['public_name'] == 'Global manager'
         # TODO - G.M - 2018-06-173 - check date format
         assert content['modified']
-        assert content['last_modifier'] == content['author']
+        assert content['last_modifier'] != content['author']
+        assert content['last_modifier']['user_id'] == 3
+        assert content['last_modifier']['public_name'] == 'Bob i.'
+        assert content['last_modifier']['avatar_url'] is None
         assert content['raw_content'] == 'What is the best cake ?'  # nopep8
 
     def test_api__update_thread__ok_200__nominal_case(self) -> None:
@@ -313,7 +361,7 @@ class TestThreads(FunctionalTest):
         assert content['slug'] == 'my-new-label'
         assert content['status'] == 'open'
         assert content['workspace_id'] == 2
-        assert content['current_revision_id'] == 26
+        assert content['current_revision_id'] == 28
         # TODO - G.M - 2018-06-173 - check date format
         assert content['created']
         assert content['author']
@@ -340,7 +388,7 @@ class TestThreads(FunctionalTest):
         assert content['slug'] == 'my-new-label'
         assert content['status'] == 'open'
         assert content['workspace_id'] == 2
-        assert content['current_revision_id'] == 26
+        assert content['current_revision_id'] == 28
         # TODO - G.M - 2018-06-173 - check date format
         assert content['created']
         assert content['author']
@@ -370,16 +418,16 @@ class TestThreads(FunctionalTest):
             status=200
         )
         revisions = res.json_body
-        assert len(revisions) == 1
+        assert len(revisions) == 2
         revision = revisions[0]
         assert revision['content_type'] == 'thread'
         assert revision['content_id'] == 7
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
-        assert revision['label'] == 'Best Cakes ?'
+        assert revision['label'] == 'Best Cake'
         assert revision['parent_id'] == 3
         assert revision['show_in_ui'] is True
-        assert revision['slug'] == 'best-cakes'
+        assert revision['slug'] == 'best-cake'
         assert revision['status'] == 'open'
         assert revision['workspace_id'] == 2
         assert revision['revision_id'] == 8
@@ -392,6 +440,27 @@ class TestThreads(FunctionalTest):
         assert revision['author']['user_id'] == 1
         assert revision['author']['avatar_url'] is None
         assert revision['author']['public_name'] == 'Global manager'
+        revision = revisions[1]
+        assert revision['content_type'] == 'thread'
+        assert revision['content_id'] == 7
+        assert revision['is_archived'] is False
+        assert revision['is_deleted'] is False
+        assert revision['label'] == 'Best Cakes ?'
+        assert revision['parent_id'] == 3
+        assert revision['show_in_ui'] is True
+        assert revision['slug'] == 'best-cakes'
+        assert revision['status'] == 'open'
+        assert revision['workspace_id'] == 2
+        assert revision['revision_id'] == 26
+        assert revision['sub_content_types']
+        # TODO - G.M - 2018-06-173 - Test with real comments
+        assert revision['comments_ids'] == []
+        # TODO - G.M - 2018-06-173 - check date format
+        assert revision['created']
+        assert revision['author']
+        assert revision['author']['user_id'] == 3
+        assert revision['author']['avatar_url'] is None
+        assert revision['author']['public_name'] == 'Bob i.'
 
     def test_api__set_thread_status__ok_200__nominal_case(self) -> None:
         """