Merge pull request #33 from buxx/dev/content

tracim/migration/versions/da12239d9da0_delete_content_view.py

@@ -0,0 +1,187 @@
+"""delete_content_view
+
+Revision ID: da12239d9da0
+Revises: b73e57760b36
+Create Date: 2016-03-04 15:59:05.828757
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'da12239d9da0'
+down_revision = 'b73e57760b36'
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+
+def set_field_where_null(field_name, value="''"):
+    op.execute("UPDATE content_revisions SET %s = %s WHERE %s IS NULL" % (field_name, value, field_name))
+
+
+def set_field_to_null_where_empty_string(field_name):
+    op.execute("UPDATE content_revisions SET %s = NULL WHERE %s = ''" % (field_name, field_name))
+
+fields_names_to_empty_string = ('file_mimetype', 'file_name', 'label', 'properties',
+                                'revision_type', 'status', 'description', 'label')
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+
+    # Drop triggers
+    op.execute("DROP TRIGGER trg__contents__on_insert__set_created ON content_revisions")
+    op.execute("DROP TRIGGER trg__contents__on_update__set_updated ON content_revisions")
+    op.execute("DROP TRIGGER trg__contents__on_update On contents")
+    op.execute("DROP TRIGGER trg__workspaces__on_insert__set_created ON workspaces")
+    op.execute("DROP TRIGGER trg__workspaces__on_update__set_updated ON workspaces")
+    op.execute("DROP VIEW contents")
+
+    # Set empty string on future non null fields
+    for field_name in fields_names_to_empty_string:
+        set_field_where_null(field_name)
+
+    op.create_table('content',
+                    sa.Column('id', sa.Integer(), nullable=False),
+                    sa.PrimaryKeyConstraint('id', name=op.f('pk__content'))
+                    )
+
+    # Create contents and reinit auto increment
+    op.execute("INSERT INTO content (id) SELECT DISTINCT(content_id) FROM content_revisions;")
+    op.execute("select setval('content_id_seq', (select max(id)+1 from content), false)")
+
+    op.alter_column('content_revisions', 'created',
+                    existing_type=postgresql.TIMESTAMP(),
+                    nullable=False,
+                    server_default=sa.func.now())
+    op.alter_column('content_revisions', 'file_mimetype',
+                    existing_type=sa.VARCHAR(length=255),
+                    nullable=False,
+                    server_default='')
+    op.alter_column('content_revisions', 'file_name',
+                    existing_type=sa.VARCHAR(length=255),
+                    nullable=False,
+                    server_default='')
+    op.alter_column('content_revisions', 'label',
+                    existing_type=sa.VARCHAR(length=1024),
+                    nullable=False,
+                    server_default='')
+    op.alter_column('content_revisions', 'properties',
+                    existing_type=sa.TEXT(),
+                    nullable=False,
+                    server_default='')
+    op.alter_column('content_revisions', 'revision_type',
+                    existing_type=sa.VARCHAR(length=32),
+                    nullable=False,
+                    server_default='')
+    op.alter_column('content_revisions', 'status',
+                    existing_type=sa.VARCHAR(length=32),
+                    nullable=False,
+                    existing_server_default=sa.text("'new'::character varying"),
+                    server_default='')
+    op.alter_column('content_revisions', 'updated',
+                    existing_type=postgresql.TIMESTAMP(),
+                    nullable=False,
+                    server_default=sa.func.now())
+    op.create_foreign_key(op.f('fk__content_revisions__content_id__content'), 'content_revisions', 'content',
+                          ['content_id'], ['id'])
+    op.create_foreign_key(op.f('fk__content_revisions__workspace_id__workspaces'), 'content_revisions', 'workspaces',
+                          ['workspace_id'], ['workspace_id'])
+    op.create_foreign_key(op.f('fk__content_revisions__parent_id__content'), 'content_revisions', 'content',
+                          ['parent_id'], ['id'])
+    op.alter_column('user_workspace', 'role',
+                    existing_type=sa.INTEGER(),
+                    nullable=False)
+    op.drop_constraint('fk__user_workspace__user_id', 'user_workspace', type_='foreignkey')
+    op.drop_constraint('fk__user_workspace__workspace_id', 'user_workspace', type_='foreignkey')
+    op.create_foreign_key(op.f('fk__user_workspace__user_id__users'), 'user_workspace', 'users', ['user_id'],
+                          ['user_id'])
+    op.create_foreign_key(op.f('fk__user_workspace__workspace_id__workspaces'), 'user_workspace', 'workspaces',
+                          ['workspace_id'], ['workspace_id'])
+    op.alter_column('workspaces', 'created',
+                    existing_type=postgresql.TIMESTAMP(),
+                    nullable=False,
+                    server_default=sa.func.now())
+    op.alter_column('workspaces', 'description',
+                    existing_type=sa.TEXT(),
+                    nullable=False,
+                    server_default='')
+    op.alter_column('workspaces', 'label',
+                    existing_type=sa.VARCHAR(length=1024),
+                    nullable=False,
+                    server_default='')
+    op.alter_column('workspaces', 'updated',
+                    existing_type=postgresql.TIMESTAMP(),
+                    nullable=False,
+                    server_default=sa.func.now())
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('workspaces', 'updated',
+                    existing_type=postgresql.TIMESTAMP(),
+                    nullable=True)
+    op.alter_column('workspaces', 'label',
+                    existing_type=sa.VARCHAR(length=1024),
+                    nullable=True)
+    op.alter_column('workspaces', 'description',
+                    existing_type=sa.TEXT(),
+                    nullable=True)
+    op.alter_column('workspaces', 'created',
+                    existing_type=postgresql.TIMESTAMP(),
+                    nullable=True)
+    op.drop_constraint(op.f('fk__user_workspace__workspace_id__workspaces'), 'user_workspace', type_='foreignkey')
+    op.drop_constraint(op.f('fk__user_workspace__user_id__users'), 'user_workspace', type_='foreignkey')
+    op.create_foreign_key('fk__user_workspace__workspace_id', 'user_workspace', 'workspaces', ['workspace_id'],
+                          ['workspace_id'], onupdate='CASCADE', ondelete='CASCADE')
+    op.create_foreign_key('fk__user_workspace__user_id', 'user_workspace', 'users', ['user_id'], ['user_id'],
+                          onupdate='CASCADE', ondelete='CASCADE')
+    op.alter_column('user_workspace', 'role',
+                    existing_type=sa.INTEGER(),
+                    nullable=True)
+    op.drop_constraint(op.f('fk__content_revisions__parent_id__content'), 'content_revisions', type_='foreignkey')
+    op.drop_constraint(op.f('fk__content_revisions__workspace_id__workspaces'), 'content_revisions', type_='foreignkey')
+    op.drop_constraint(op.f('fk__content_revisions__content_id__content'), 'content_revisions', type_='foreignkey')
+    op.alter_column('content_revisions', 'updated',
+                    existing_type=postgresql.TIMESTAMP(),
+                    nullable=True)
+    op.alter_column('content_revisions', 'status',
+                    existing_type=sa.VARCHAR(length=32),
+                    nullable=True,
+                    existing_server_default=sa.text("'new'::character varying"))
+    op.alter_column('content_revisions', 'revision_type',
+                    existing_type=sa.VARCHAR(length=32),
+                    nullable=True)
+    op.alter_column('content_revisions', 'properties',
+                    existing_type=sa.TEXT(),
+                    nullable=True)
+    op.alter_column('content_revisions', 'label',
+                    existing_type=sa.VARCHAR(length=1024),
+                    nullable=True)
+    op.alter_column('content_revisions', 'file_name',
+                    existing_type=sa.VARCHAR(length=255),
+                    nullable=True)
+    op.alter_column('content_revisions', 'file_mimetype',
+                    existing_type=sa.VARCHAR(length=255),
+                    nullable=True)
+    op.alter_column('content_revisions', 'created',
+                    existing_type=postgresql.TIMESTAMP(),
+                    nullable=True)
+    op.drop_table('content')
+
+    for field_name in fields_names_to_empty_string:
+        set_field_to_null_where_empty_string(field_name)
+
+    op.execute("""
+CREATE VIEW contents AS
+    SELECT DISTINCT ON (content_revisions.content_id) content_revisions.content_id, content_revisions.parent_id, content_revisions.type, content_revisions.created, content_revisions.updated, content_revisions.label, content_revisions.description, content_revisions.status, content_revisions.file_name, content_revisions.file_content, content_revisions.file_mimetype, content_revisions.owner_id, content_revisions.workspace_id, content_revisions.is_deleted, content_revisions.is_archived, content_revisions.properties, content_revisions.revision_type FROM content_revisions ORDER BY content_revisions.content_id, content_revisions.updated DESC, content_revisions.created DESC;
+
+
+CREATE TRIGGER trg__contents__on_insert__set_created BEFORE INSERT ON content_revisions FOR EACH ROW EXECUTE PROCEDURE set_created();
+CREATE TRIGGER trg__contents__on_update__set_updated BEFORE UPDATE ON content_revisions FOR EACH ROW EXECUTE PROCEDURE set_updated();
+CREATE TRIGGER trg__contents__on_update INSTEAD OF UPDATE ON contents FOR EACH ROW EXECUTE PROCEDURE update_node();
+CREATE TRIGGER trg__workspaces__on_insert__set_created BEFORE INSERT ON workspaces FOR EACH ROW EXECUTE PROCEDURE set_created();
+CREATE TRIGGER trg__workspaces__on_update__set_updated BEFORE UPDATE ON workspaces FOR EACH ROW EXECUTE PROCEDURE set_updated();
+""")
+    ### end Alembic commands ###

tracim/tracim/controllers/__init__.py

@@ -17,6 +17,7 @@ from tracim.lib.predicates import current_user_is_content_manager
 
 from tracim.model.auth import User
 from tracim.model.data import ActionDescription
+from tracim.model import new_revision
 from tracim.model.data import BreadcrumbItem
 from tracim.model.data import Content
 from tracim.model.data import ContentType
@@ -267,8 +268,9 @@ class TIMWorkspaceContentRestController(TIMRestControllerWithBreadcrumb):
         try:
             api = ContentApi(tmpl_context.current_user)
             item = api.get_one(int(item_id), self._item_type, workspace)
-            api.update_content(item, label, content)
-            api.save(item, ActionDescription.REVISION)
+            with new_revision(item):
+                api.update_content(item, label, content)
+                api.save(item, ActionDescription.REVISION)
 
             msg = _('{} updated').format(self._item_type_label)
             tg.flash(msg, CST.STATUS_OK)
@@ -292,8 +294,9 @@ class TIMWorkspaceContentRestController(TIMRestControllerWithBreadcrumb):
         content_api = ContentApi(tmpl_context.current_user)
         item = content_api.get_one(item_id, self._item_type, tmpl_context.workspace)
         try:
-            content_api.set_status(item, status)
-            content_api.save(item, ActionDescription.STATUS_UPDATE)
+            with new_revision(item):
+                content_api.set_status(item, status)
+                content_api.save(item, ActionDescription.STATUS_UPDATE)
             msg = _('{} status updated').format(self._item_type_label)
             tg.flash(msg, CST.STATUS_OK)
             tg.redirect(self._std_url.format(item.workspace_id, item.parent_id, item.content_id))
@@ -332,8 +335,9 @@ class TIMWorkspaceContentRestController(TIMRestControllerWithBreadcrumb):
             undo_url = self._std_url.format(item.workspace_id, item.parent_id, item.content_id)+'/put_archive_undo'
             msg = _('{} archived. <a class="alert-link" href="{}">Cancel action</a>').format(self._item_type_label, undo_url)
 
-            content_api.archive(item)
-            content_api.save(item, ActionDescription.ARCHIVING)
+            with new_revision(item):
+                content_api.archive(item)
+                content_api.save(item, ActionDescription.ARCHIVING)
 
             tg.flash(msg, CST.STATUS_OK, no_escape=True) # TODO allow to come back
             tg.redirect(next_url)
@@ -353,8 +357,9 @@ class TIMWorkspaceContentRestController(TIMRestControllerWithBreadcrumb):
         try:
             next_url = self._std_url.format(item.workspace_id, item.parent_id, item.content_id)
             msg = _('{} unarchived.').format(self._item_type_label)
-            content_api.unarchive(item)
-            content_api.save(item, ActionDescription.UNARCHIVING)
+            with new_revision(item):
+                content_api.unarchive(item)
+                content_api.save(item, ActionDescription.UNARCHIVING)
 
             tg.flash(msg, CST.STATUS_OK)
             tg.redirect(next_url )
@@ -379,8 +384,9 @@ class TIMWorkspaceContentRestController(TIMRestControllerWithBreadcrumb):
             next_url = self._parent_url.format(item.workspace_id, item.parent_id)
             undo_url = self._std_url.format(item.workspace_id, item.parent_id, item.content_id)+'/put_delete_undo'
             msg = _('{} deleted. <a class="alert-link" href="{}">Cancel action</a>').format(self._item_type_label, undo_url)
-            content_api.delete(item)
-            content_api.save(item, ActionDescription.DELETION)
+            with new_revision(item):
+                content_api.delete(item)
+                content_api.save(item, ActionDescription.DELETION)
 
             tg.flash(msg, CST.STATUS_OK, no_escape=True)
             tg.redirect(next_url)
@@ -403,8 +409,9 @@ class TIMWorkspaceContentRestController(TIMRestControllerWithBreadcrumb):
         try:
             next_url = self._std_url.format(item.workspace_id, item.parent_id, item.content_id)
             msg = _('{} undeleted.').format(self._item_type_label)
-            content_api.undelete(item)
-            content_api.save(item, ActionDescription.UNDELETION)
+            with new_revision(item):
+                content_api.undelete(item)
+                content_api.save(item, ActionDescription.UNDELETION)
 
             tg.flash(msg, CST.STATUS_OK)
             tg.redirect(next_url)

tracim/tracim/controllers/content.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import sys
+
 __author__ = 'damien'
 
 from cgi import FieldStorage
@@ -28,6 +30,7 @@ from tracim.lib.predicates import require_current_user_is_owner
 
 from tracim.model.serializers import Context, CTX, DictLikeClass
 from tracim.model.data import ActionDescription
+from tracim.model import new_revision
 from tracim.model.data import Content
 from tracim.model.data import ContentType
 from tracim.model.data import UserRoleInWorkspace
@@ -88,8 +91,9 @@ class UserWorkspaceFolderThreadCommentRestController(TIMRestController):
                                                                                                          item_id)
 
             msg = _('{} deleted. <a class="alert-link" href="{}">Cancel action</a>').format(self._item_type_label, undo_url)
-            content_api.delete(item)
-            content_api.save(item, ActionDescription.DELETION)
+            with new_revision(item):
+                content_api.delete(item)
+                content_api.save(item, ActionDescription.DELETION)
 
             tg.flash(msg, CST.STATUS_OK, no_escape=True)
             tg.redirect(next_url)
@@ -116,8 +120,9 @@ class UserWorkspaceFolderThreadCommentRestController(TIMRestController):
                                                                              tmpl_context.folder_id,
                                                                              tmpl_context.thread_id)
             msg = _('{} undeleted.').format(self._item_type_label)
-            content_api.undelete(item)
-            content_api.save(item, ActionDescription.UNDELETION)
+            with new_revision(item):
+                content_api.undelete(item)
+                content_api.save(item, ActionDescription.UNDELETION)
 
             tg.flash(msg, CST.STATUS_OK)
             tg.redirect(next_url)
@@ -277,38 +282,40 @@ class UserWorkspaceFolderFileRestController(TIMWorkspaceContentRestController):
             # TODO - D.A. - 2015-03-19
             # refactor this method in order to make code easier to understand
 
-            if comment and label:
-                updated_item = api.update_content(
-                    item, label if label else item.label,
-                    comment if comment else ''
-                )
-                api.save(updated_item, ActionDescription.EDITION)
-
-                # This case is the default "file title and description update"
-                # In this case the file itself is not revisionned
-
-            else:
-                # So, now we may have a comment and/or a file revision
-                if comment and ''==label:
-                    comment_item = api.create_comment(workspace,
-                                                      item, comment,
-                                                      do_save=False)
-
-                    if not isinstance(file_data, FieldStorage):
-                        api.save(comment_item, ActionDescription.COMMENT)
-                    else:
-                        # The notification is only sent
-                        # if the file is NOT updated
-                        #
-                        #  If the file is also updated,
-                        #  then a 'file revision' notification will be sent.
-                        api.save(comment_item,
-                                 ActionDescription.COMMENT,
-                                 do_notify=False)
-
-                if isinstance(file_data, FieldStorage):
-                    api.update_file_data(item, file_data.filename, file_data.type, file_data.file.read())
-                    api.save(item, ActionDescription.REVISION)
+            with new_revision(item):
+
+                if comment and label:
+                    updated_item = api.update_content(
+                        item, label if label else item.label,
+                        comment if comment else ''
+                    )
+                    api.save(updated_item, ActionDescription.EDITION)
+
+                    # This case is the default "file title and description update"
+                    # In this case the file itself is not revisionned
+
+                else:
+                    # So, now we may have a comment and/or a file revision
+                    if comment and ''==label:
+                        comment_item = api.create_comment(workspace,
+                                                          item, comment,
+                                                          do_save=False)
+
+                        if not isinstance(file_data, FieldStorage):
+                            api.save(comment_item, ActionDescription.COMMENT)
+                        else:
+                            # The notification is only sent
+                            # if the file is NOT updated
+                            #
+                            #  If the file is also updated,
+                            #  then a 'file revision' notification will be sent.
+                            api.save(comment_item,
+                                     ActionDescription.COMMENT,
+                                     do_notify=False)
+
+                    if isinstance(file_data, FieldStorage):
+                        api.update_file_data(item, file_data.filename, file_data.type, file_data.file.read())
+                        api.save(item, ActionDescription.REVISION)
 
             msg = _('{} updated').format(self._item_type_label)
             tg.flash(msg, CST.STATUS_OK)
@@ -424,8 +431,9 @@ class UserWorkspaceFolderPageRestController(TIMWorkspaceContentRestController):
         try:
             api = ContentApi(tmpl_context.current_user)
             item = api.get_one(int(item_id), self._item_type, workspace)
-            api.update_content(item, label, content)
-            api.save(item, ActionDescription.REVISION)
+            with new_revision(item):
+                api.update_content(item, label, content)
+                api.save(item, ActionDescription.REVISION)
 
             msg = _('{} updated').format(self._item_type_label)
             tg.flash(msg, CST.STATUS_OK)
@@ -604,7 +612,9 @@ class ItemLocationController(TIMWorkspaceContentRestController, BaseController):
 
             api = ContentApi(tmpl_context.current_user)
             item = api.get_one(item_id, ContentType.Any, workspace)
-            api.move_recursively(item, new_parent, new_workspace)
+
+            with new_revision(item):
+                api.move_recursively(item, new_parent, new_workspace)
 
             next_url = tg.url('/workspaces/{}/folders/{}'.format(
                 new_workspace.workspace_id, item_id))
@@ -622,7 +632,8 @@ class ItemLocationController(TIMWorkspaceContentRestController, BaseController):
             # Default move inside same workspace
             api = ContentApi(tmpl_context.current_user)
             item = api.get_one(item_id, ContentType.Any, workspace)
-            api.move(item, new_parent)
+            with new_revision(item):
+                api.move(item, new_parent)
             next_url = self.parent_controller.url(item_id)
             if new_parent:
                 tg.flash(_('Item moved to {}').format(new_parent.label), CST.STATUS_OK)
@@ -765,7 +776,8 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
             logger.error(self, 'An unexpected exception has been catched. Look at the traceback below.')
             traceback.print_exc()
 
-            tg.flash(_('Folder not created: {}').format(e.with_traceback()), CST.STATUS_ERROR)
+            tb = sys.exc_info()[2]
+            tg.flash(_('Folder not created: {}').format(e.with_traceback(tb)), CST.STATUS_ERROR)
             if parent_id:
                 redirect_url = redirect_url_tmpl.format(tmpl_context.workspace_id, parent_id)
             else:
@@ -796,11 +808,12 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
                 file = True if can_contain_files=='on' else False,
                 page = True if can_contain_pages=='on' else False
             )
-            if label != folder.label:
-                # TODO - D.A. - 2015-05-25 - Allow to set folder description
-                api.update_content(folder, label, folder.description)
-            api.set_allowed_content(folder, subcontent)
-            api.save(folder)
+            with new_revision(folder):
+                if label != folder.label:
+                    # TODO - D.A. - 2015-05-25 - Allow to set folder description
+                    api.update_content(folder, label, folder.description)
+                api.set_allowed_content(folder, subcontent)
+                api.save(folder)
 
             tg.flash(_('Folder updated'), CST.STATUS_OK)
 
@@ -842,8 +855,9 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
             undo_url = self._std_url.format(item.workspace_id, item.content_id)+'/put_archive_undo'
             msg = _('{} archived. <a class="alert-link" href="{}">Cancel action</a>').format(self._item_type_label, undo_url)
 
-            content_api.archive(item)
-            content_api.save(item, ActionDescription.ARCHIVING)
+            with new_revision(item):
+                content_api.archive(item)
+                content_api.save(item, ActionDescription.ARCHIVING)
 
             tg.flash(msg, CST.STATUS_OK, no_escape=True) # TODO allow to come back
             tg.redirect(next_url)
@@ -864,8 +878,9 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
         try:
             next_url = self._std_url.format(item.workspace_id, item.content_id)
             msg = _('{} unarchived.').format(self._item_type_label)
-            content_api.unarchive(item)
-            content_api.save(item, ActionDescription.UNARCHIVING)
+            with new_revision(item):
+                content_api.unarchive(item)
+                content_api.save(item, ActionDescription.UNARCHIVING)
 
             tg.flash(msg, CST.STATUS_OK)
             tg.redirect(next_url )
@@ -889,8 +904,9 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
             next_url = self._parent_url.format(item.workspace_id, item.parent_id)
             undo_url = self._std_url.format(item.workspace_id, item.content_id)+'/put_delete_undo'
             msg = _('{} deleted. <a class="alert-link" href="{}">Cancel action</a>').format(self._item_type_label, undo_url)
-            content_api.delete(item)
-            content_api.save(item, ActionDescription.DELETION)
+            with new_revision(item):
+                content_api.delete(item)
+                content_api.save(item, ActionDescription.DELETION)
 
             tg.flash(msg, CST.STATUS_OK, no_escape=True)
             tg.redirect(next_url)
@@ -913,8 +929,9 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
         try:
             next_url = self._std_url.format(item.workspace_id, item.content_id)
             msg = _('{} undeleted.').format(self._item_type_label)
-            content_api.undelete(item)
-            content_api.save(item, ActionDescription.UNDELETION)
+            with new_revision(item):
+                content_api.undelete(item)
+                content_api.save(item, ActionDescription.UNDELETION)
 
             tg.flash(msg, CST.STATUS_OK)
             tg.redirect(next_url)

tracim/tracim/lib/content.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 __author__ = 'damien'
 
 import datetime
@@ -14,12 +13,12 @@ from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.attributes import get_history
 from sqlalchemy import desc
 from sqlalchemy import distinct
-from sqlalchemy import not_
 from sqlalchemy import or_
+from sqlalchemy.sql.elements import and_
 from tracim.lib import cmp_to_key
 from tracim.lib.notifications import NotifierFactory
 from tracim.lib.utils import SameValueError
-from tracim.model import DBSession
+from tracim.model import DBSession, new_revision
 from tracim.model.auth import User
 from tracim.model.data import ActionDescription
 from tracim.model.data import BreadcrumbItem
@@ -76,6 +75,29 @@ class ContentApi(object):
         self._show_deleted = show_deleted
         self._show_all_type_of_contents_in_treeview = all_content_in_treeview
 
+    @classmethod
+    def get_revision_join(cls):
+        """
+        Return the Content/ContentRevision query join condition
+        :return: Content/ContentRevision query join condition
+        :rtype sqlalchemy.sql.elements.BooleanClauseList
+        """
+        return and_(Content.id == ContentRevisionRO.content_id,
+                    ContentRevisionRO.revision_id == DBSession.query(
+                        ContentRevisionRO.revision_id)
+                    .filter(ContentRevisionRO.content_id == Content.id)
+                    .order_by(ContentRevisionRO.revision_id.desc())
+                    .limit(1)
+                    .correlate(Content))
+
+    @classmethod
+    def get_canonical_query(cls):
+        """
+        Return the Content/ContentRevision base query who join these table on the last revision.
+        :return: Content/ContentRevision Query
+        :rtype sqlalchemy.orm.query.Query
+        """
+        return DBSession.query(Content).join(ContentRevisionRO, cls.get_revision_join())
 
     @classmethod
     def sort_tree_items(cls, content_list: [NodeTreeItem])-> [Content]:
@@ -134,7 +156,7 @@ class ContentApi(object):
         return breadcrumb
 
     def __real_base_query(self, workspace: Workspace=None):
-        result = DBSession.query(Content)
+        result = self.get_canonical_query()
 
         if workspace:
             result = result.filter(Content.workspace_id==workspace.workspace_id)
@@ -458,7 +480,8 @@ class ContentApi(object):
         self.save(item, do_notify=False)
 
         for child in item.children:
-            self.move_recursively(child, item, new_workspace)
+            with new_revision(child):
+                self.move_recursively(child, item, new_workspace)
         return
 
     def update_content(self, item: Content, new_label: str, new_content: str=None) -> Content:
@@ -488,7 +511,6 @@ class ContentApi(object):
         content.is_archived = False
         content.revision_type = ActionDescription.UNARCHIVING
 
-
     def delete(self, content: Content):
         content.owner = self._user
         content.is_deleted = True
@@ -576,7 +598,7 @@ class ContentApi(object):
 
         if not action_description:
             # See if the last action has been modified
-            if content.revision_type==None or len(get_history(content, 'revision_type'))<=0:
+            if content.revision_type==None or len(get_history(content.revision, 'revision_type'))<=0:
                 # The action has not been modified, so we set it to default edition
                 action_description = ActionDescription.EDITION
 
@@ -638,7 +660,7 @@ class ContentApi(object):
         filter_group_desc = list(Content.description.ilike('%{}%'.format(keyword)) for keyword in keywords)
         title_keyworded_items = self._hard_filtered_base_query().\
             filter(or_(*(filter_group_label+filter_group_desc))).\
-            options(joinedload('children')).\
+            options(joinedload('children_revisions')).\
             options(joinedload('parent'))
 
         return title_keyworded_items

tracim/tracim/lib/exception.py

@@ -5,6 +5,18 @@ class TracimError(Exception):
     pass
 
 
+class RunTimeError(TracimError):
+    pass
+
+
+class ContentRevisionUpdateError(RuntimeError):
+    pass
+
+
+class ContentRevisionDeleteError(ContentRevisionUpdateError):
+    pass
+
+
 class ConfigurationError(TracimError):
     pass
 

tracim/tracim/model/__init__.py

@@ -1,10 +1,41 @@
 # -*- coding: utf-8 -*-
 """The application's model objects"""
-
-from zope.sqlalchemy import ZopeTransactionExtension
-from sqlalchemy.orm import scoped_session, sessionmaker
-#from sqlalchemy import MetaData
+from decorator import contextmanager
+from sqlalchemy import event, inspect, MetaData
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import scoped_session, sessionmaker, Session
+from sqlalchemy.orm.unitofwork import UOWTransaction
+from zope.sqlalchemy import ZopeTransactionExtension
+
+from tracim.lib.exception import ContentRevisionUpdateError, ContentRevisionDeleteError
+
+
+class RevisionsIntegrity(object):
+    """
+    Simple static used class to manage a list with list of ContentRevisionRO who are allowed to be updated.
+
+    When modify an already existing (understood have an identity in databse) ContentRevisionRO, if it's not in
+    RevisionsIntegrity._updatable_revisions list, a ContentRevisionUpdateError thrown.
+
+    This class is used by tracim.model.new_revision context manager.
+    """
+    _updatable_revisions = []
+
+    @classmethod
+    def add_to_updatable(cls, revision: 'ContentRevisionRO') -> None:
+        if inspect(revision).has_identity:
+            raise ContentRevisionUpdateError("ContentRevision is not updatable. %s already have identity." % revision)
+
+        if revision not in cls._updatable_revisions:
+            cls._updatable_revisions.append(revision)
+
+    @classmethod
+    def remove_from_updatable(cls, revision: 'ContentRevisionRO') -> None:
+        cls._updatable_revisions.remove(revision)
+
+    @classmethod
+    def is_updatable(cls, revision: 'ContentRevisionRO') -> bool:
+        return revision in cls._updatable_revisions
 
 # Global session manager: DBSession() returns the Thread-local
 # session object appropriate for the current web request.
@@ -15,7 +46,16 @@ DBSession = scoped_session(maker)
 # Base class for all of our model classes: By default, the data model is
 # defined with SQLAlchemy's declarative extension, but if you need more
 # control, you can switch to the traditional method.
-DeclarativeBase = declarative_base()
+convention = {
+  "ix": 'ix__%(column_0_label)s',  # Indexes
+  "uq": "uq__%(table_name)s__%(column_0_name)s",  # Unique constrains
+  "ck": "ck__%(table_name)s__%(constraint_name)s",  # Other column constrains
+  "fk": "fk__%(table_name)s__%(column_0_name)s__%(referred_table_name)s",  # Foreign keys
+  "pk": "pk__%(table_name)s"  # Primary keys
+}
+
+metadata = MetaData(naming_convention=convention)
+DeclarativeBase = declarative_base(metadata=metadata)
 
 # There are two convenient ways for you to spare some typing.
 # You can have a query property on all your model classes by doing this:
@@ -38,6 +78,7 @@ metadata = DeclarativeBase.metadata
 #
 ######
 
+
 def init_model(engine):
     """Call me before using any of the tables or classes in the model."""
     DBSession.configure(bind=engine)
@@ -60,4 +101,31 @@ def init_model(engine):
 
 # Import your model modules here.
 from tracim.model.auth import User, Group, Permission
-from tracim.model.data import Content
+from tracim.model.data import Content, ContentRevisionRO
+
+
+@event.listens_for(DBSession, 'before_flush')
+def prevent_content_revision_delete(session: Session, flush_context: UOWTransaction,
+                                    instances: [DeclarativeBase]) -> None:
+    for instance in session.deleted:
+        if isinstance(instance, ContentRevisionRO) and instance.revision_id is not None:
+            raise ContentRevisionDeleteError("ContentRevision is not deletable. You must make a new revision with" +
+                                             "is_deleted set to True. Look at tracim.model.new_revision context " +
+                                             "manager to make a new revision")
+
+
+@contextmanager
+def new_revision(content: Content) -> Content:
+    """
+    Prepare context to update a Content. It will add a new updatable revision to the content.
+    :param content: Content instance to update
+    :return:
+    """
+    with DBSession.no_autoflush:
+        try:
+            if inspect(content.revision).has_identity:
+                content.new_revision()
+            RevisionsIntegrity.add_to_updatable(content.revision)
+            yield content
+        finally:
+            RevisionsIntegrity.remove_from_updatable(content.revision)

tracim/tracim/model/data.py

@@ -1,38 +1,36 @@
 # -*- coding: utf-8 -*-
 
-import tg
-from datetime import datetime
-from babel.dates import format_timedelta
-
-from bs4 import BeautifulSoup
 import datetime as datetime_root
 import json
+from datetime import datetime
 
-from sqlalchemy.ext.associationproxy import association_proxy
-from sqlalchemy import Column
-from sqlalchemy import func
+import tg
+from babel.dates import format_timedelta
+from bs4 import BeautifulSoup
+from sqlalchemy import Column, inspect, Index
 from sqlalchemy import ForeignKey
 from sqlalchemy import Sequence
-
+from sqlalchemy import func
+from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.hybrid import hybrid_property
-
 from sqlalchemy.orm import backref
-from sqlalchemy.orm import relationship
 from sqlalchemy.orm import deferred
+from sqlalchemy.orm import relationship
+from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.orm.collections import attribute_mapped_collection
-
 from sqlalchemy.types import Boolean
 from sqlalchemy.types import DateTime
 from sqlalchemy.types import Integer
 from sqlalchemy.types import LargeBinary
 from sqlalchemy.types import Text
 from sqlalchemy.types import Unicode
-
 from tg.i18n import lazy_ugettext as l_, ugettext as _
 
-from tracim.model import DeclarativeBase
+from tracim.lib.exception import ContentRevisionUpdateError
+from tracim.model import DeclarativeBase, RevisionsIntegrity
 from tracim.model.auth import User
 
+
 class BreadcrumbItem(object):
 
     def __init__(self, icon_string: str, label: str, url: str, is_active: bool = False):
@@ -54,11 +52,20 @@ class Workspace(DeclarativeBase):
     label   = Column(Unicode(1024), unique=False, nullable=False, default='')
     description = Column(Text(), unique=False, nullable=False, default='')
 
-    created = Column(DateTime, unique=False, nullable=False)
-    updated = Column(DateTime, unique=False, nullable=False)
+    #  Default value datetime.utcnow, see: http://stackoverflow.com/a/13370382/801924 (or http://pastebin.com/VLyWktUn)
+    created = Column(DateTime, unique=False, nullable=False, default=datetime.utcnow)
+    #  Default value datetime.utcnow, see: http://stackoverflow.com/a/13370382/801924 (or http://pastebin.com/VLyWktUn)
+    updated = Column(DateTime, unique=False, nullable=False, default=datetime.utcnow)
 
     is_deleted = Column(Boolean, unique=False, nullable=False, default=False)
 
+    revisions = relationship("ContentRevisionRO")
+
+    @hybrid_property
+    def contents(self):
+        # Return a list of unique revisions parent content
+        return list(set([revision.node for revision in self.revisions]))
+
     def get_user_role(self, user: User) -> int:
         for role in user.roles:
             if role.workspace.workspace_id==self.workspace_id:
@@ -435,58 +442,526 @@ class ContentType(object):
                     label=self.label,
                     priority=self.priority)
 
-class Content(DeclarativeBase):
 
-    __tablename__ = 'contents'
+class ContentChecker(object):
 
-    revision_to_serialize = -0  # This flag allow to serialize a given revision if required by the user
+    @classmethod
+    def check_properties(cls, item):
+        if item.type==ContentType.Folder:
+            properties = item.properties
+            if 'allowed_content' not in properties.keys():
+                return False
+            if 'folders' not in properties['allowed_content']:
+                return False
+            if 'files' not in properties['allowed_content']:
+                return False
+            if 'pages' not in properties['allowed_content']:
+                return False
+            if 'threads' not in properties['allowed_content']:
+                return False
 
-    content_id = Column(Integer, Sequence('seq__contents__content_id'), autoincrement=True, primary_key=True)
-    parent_id = Column(Integer, ForeignKey('contents.content_id'), nullable=True, default=None)
-    owner_id = Column(Integer, ForeignKey('users.user_id'), nullable=True, default=None)
+            return True
 
-    type = Column(Unicode(32), unique=False, nullable=False)
-    status = Column(Unicode(32), unique=False, nullable=False, default=ContentStatus.OPEN)
+        raise NotImplementedError
 
-    created = Column(DateTime, unique=False, nullable=False)
-    updated = Column(DateTime, unique=False, nullable=False)
+    @classmethod
+    def reset_properties(cls, item):
+        if item.type==ContentType.Folder:
+            item.properties = dict(
+                allowed_content = dict (
+                    folder = True,
+                    file = True,
+                    page = True,
+                    thread = True
+                )
+            )
+            return
 
-    workspace_id = Column(Integer, ForeignKey('workspaces.workspace_id'), unique=False, nullable=True)
+        raise NotImplementedError
 
-    workspace = relationship('Workspace', remote_side=[Workspace.workspace_id], backref='contents')
 
+class ContentRevisionRO(DeclarativeBase):
+    """
+    Revision of Content. It's immutable, update or delete an existing ContentRevisionRO will throw
+    ContentRevisionUpdateError errors.
+    """
 
-    is_deleted = Column(Boolean, unique=False, nullable=False, default=False)
-    is_archived = Column(Boolean, unique=False, nullable=False, default=False)
+    __tablename__ = 'content_revisions'
 
-    label = Column(Unicode(1024), unique=False, nullable=False, default='')
-    description = Column(Text(), unique=False, nullable=False, default='')
-    _properties = Column('properties', Text(), unique=False, nullable=False, default='')
+    revision_id = Column(Integer, primary_key=True)
+    content_id = Column(Integer, ForeignKey('content.id'), nullable=False)
+    owner_id = Column(Integer, ForeignKey('users.user_id'), nullable=True)
 
+    label = Column(Unicode(1024), unique=False, nullable=False)
+    description = Column(Text(), unique=False, nullable=False, default='')
     file_name = Column(Unicode(255),  unique=False, nullable=False, default='')
     file_mimetype = Column(Unicode(255),  unique=False, nullable=False, default='')
-    file_content = deferred(Column(LargeBinary(), unique=False, nullable=False, default=None))
+    file_content = deferred(Column(LargeBinary(), unique=False, nullable=True))
+    properties = Column('properties', Text(), unique=False, nullable=False, default='')
 
+    type = Column(Unicode(32), unique=False, nullable=False)
+    status = Column(Unicode(32), unique=False, nullable=False, default=ContentStatus.OPEN)
+    created = Column(DateTime, unique=False, nullable=False, default=datetime.utcnow)
+    updated = Column(DateTime, unique=False, nullable=False, default=datetime.utcnow)
+    is_deleted = Column(Boolean, unique=False, nullable=False, default=False)
+    is_archived = Column(Boolean, unique=False, nullable=False, default=False)
     revision_type = Column(Unicode(32), unique=False, nullable=False, default='')
 
-    parent = relationship('Content', remote_side=[content_id], backref='children')
+    workspace_id = Column(Integer, ForeignKey('workspaces.workspace_id'), unique=False, nullable=True)
+    workspace = relationship('Workspace', remote_side=[Workspace.workspace_id])
+
+    parent_id = Column(Integer, ForeignKey('content.id'), nullable=True, default=None)
+    parent = relationship("Content", foreign_keys=[parent_id], back_populates="children_revisions")
+
+    node = relationship("Content", foreign_keys=[content_id], back_populates="revisions")
     owner = relationship('User', remote_side=[User.user_id])
 
+    """ List of column copied when make a new revision from another """
+    _cloned_columns = (
+        'content_id', 'created', 'description', 'file_content', 'file_mimetype', 'file_name', 'is_archived',
+        'is_deleted', 'label', 'node', 'owner', 'owner_id', 'parent', 'parent_id', 'properties', 'revision_type',
+        'status', 'type', 'updated', 'workspace', 'workspace_id',
+    )
+
+    # Read by must be used like this:
+    # read_datetime = revision.ready_by[<User instance>]
+    # if user did not read the content, then a key error is raised
+    read_by = association_proxy(
+        'revision_read_statuses',  # name of the attribute
+        'view_datetime',  # attribute the value is taken from
+        creator=lambda k, v: \
+            RevisionReadStatus(user=k, view_datetime=v)
+    )
+
+    @classmethod
+    def new_from(cls, revision: 'ContentRevisionRO') -> 'ContentRevisionRO':
+        """
+
+        Return new instance of ContentRevisionRO where properties are copied from revision parameter.
+        Look at ContentRevisionRO._cloned_columns to see what columns are copieds.
+
+        :param revision: revision to copy
+        :type revision: ContentRevisionRO
+        :return: new revision from revision parameter
+        :rtype: ContentRevisionRO
+        """
+        new_rev = cls()
+
+        for column_name in cls._cloned_columns:
+            column_value = getattr(revision, column_name)
+            setattr(new_rev, column_name, column_value)
+
+        new_rev.updated = datetime.now()
+
+        return new_rev
+
+    def __setattr__(self, key: str, value: 'mixed'):
+        """
+        ContentRevisionUpdateError is raised if tried to update column and revision own identity
+        :param key: attribute name
+        :param value: attribute value
+        :return:
+        """
+        if key in ('_sa_instance_state', ):  # Prevent infinite loop from SQLAlchemy code and altered set
+            return super().__setattr__(key, value)
+
+        if inspect(self).has_identity \
+                and key in self._cloned_columns \
+                and not RevisionsIntegrity.is_updatable(self):
+                raise ContentRevisionUpdateError(
+                    "Can't modify revision. To work on new revision use tracim.model.new_revision " +
+                    "context manager.")
+
+        super().__setattr__(key, value)
+
+    def get_status(self) -> ContentStatus:
+        return ContentStatus(self.status)
+
+    def get_label(self) -> str:
+        return self.label if self.label else self.file_name if self.file_name else ''
+
+    def get_last_action(self) -> ActionDescription:
+        return ActionDescription(self.revision_type)
+
+    def has_new_information_for(self, user: User) -> bool:
+        """
+        :param user: the session current user
+        :return: bool, True if there is new information for given user else False
+                       False if the user is None
+        """
+        if not user:
+            return False
+
+        if user not in self.read_by.keys():
+            return True
+
+        return False
+
+Index('idx__content_revisions__owner_id', ContentRevisionRO.owner_id)
+Index('idx__content_revisions__parent_id', ContentRevisionRO.parent_id)
+
+
+class Content(DeclarativeBase):
+    """
+    Content is used as a virtual representation of ContentRevisionRO.
+    content.PROPERTY (except for content.id, content.revisions, content.children_revisions) will return
+    value of most recent revision of content.
+
+    # UPDATE A CONTENT
+
+    To update an existing Content, you must use tracim.model.new_revision context manager:
+    content = my_sontent_getter_method()
+    with new_revision(content):
+        content.description = 'foo bar baz'
+    DBSession.flush()
+
+    # QUERY CONTENTS
+
+    To query contents you will need to join your content query with ContentRevisionRO. Join
+    condition is available at tracim.lib.content.ContentApi#get_revision_join:
+
+    content = DBSession.query(Content).join(ContentRevisionRO, ContentApi.get_revision_join())
+                  .filter(Content.label == 'foo')
+                  .one()
+
+    ContentApi provide also prepared Content at tracim.lib.content.ContentApi#get_canonical_query:
+
+    content = ContentApi.get_canonical_query()
+              .filter(Content.label == 'foo')
+              .one()
+    """
+
+    __tablename__ = 'content'
+
+    revision_to_serialize = -0  # This flag allow to serialize a given revision if required by the user
+
+    id = Column(Integer, primary_key=True)
+    revisions = relationship("ContentRevisionRO",
+                             foreign_keys=[ContentRevisionRO.content_id],
+                             back_populates="node")
+    children_revisions = relationship("ContentRevisionRO",
+                                      foreign_keys=[ContentRevisionRO.parent_id],
+                                      back_populates="parent")
+
+    @hybrid_property
+    def content_id(self) -> int:
+        return self.revision.content_id
+
+    @content_id.setter
+    def content_id(self, value: int) -> None:
+        self.revision.content_id = value
+
+    @content_id.expression
+    def content_id(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.content_id
+
+    @hybrid_property
+    def revision_id(self) -> int:
+        return self.revision.revision_id
+
+    @revision_id.setter
+    def revision_id(self, value: int):
+        self.revision.revision_id = value
+
+    @revision_id.expression
+    def revision_id(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.revision_id
+
+    @hybrid_property
+    def owner_id(self) -> int:
+        return self.revision.owner_id
+
+    @owner_id.setter
+    def owner_id(self, value: int) -> None:
+        self.revision.owner_id = value
+
+    @owner_id.expression
+    def owner_id(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.owner_id
+
+    @hybrid_property
+    def label(self) -> str:
+        return self.revision.label
+
+    @label.setter
+    def label(self, value: str) -> None:
+        self.revision.label = value
+
+    @label.expression
+    def label(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.label
+
+    @hybrid_property
+    def description(self) -> str:
+        return self.revision.description
+
+    @description.setter
+    def description(self, value: str) -> None:
+        self.revision.description = value
+
+    @description.expression
+    def description(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.description
+
+    @hybrid_property
+    def file_name(self) -> str:
+        return self.revision.file_name
+
+    @file_name.setter
+    def file_name(self, value: str) -> None:
+        self.revision.file_name = value
+
+    @file_name.expression
+    def file_name(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.file_name
+
+    @hybrid_property
+    def file_mimetype(self) -> str:
+        return self.revision.file_mimetype
+
+    @file_mimetype.setter
+    def file_mimetype(self, value: str) -> None:
+        self.revision.file_mimetype = value
+
+    @file_mimetype.expression
+    def file_mimetype(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.file_mimetype
+
+    @hybrid_property
+    def file_content(self):
+        return self.revision.file_content
+
+    @file_content.setter
+    def file_content(self, value):
+        self.revision.file_content = value
+
+    @file_content.expression
+    def file_content(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.file_content
+
+    @hybrid_property
+    def _properties(self) -> str:
+        return self.revision.properties
+
+    @_properties.setter
+    def _properties(self, value: str) -> None:
+        self.revision.properties = value
+
+    @_properties.expression
+    def _properties(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.properties
+
+    @hybrid_property
+    def type(self) -> str:
+        return self.revision.type
+
+    @type.setter
+    def type(self, value: str) -> None:
+        self.revision.type = value
+
+    @type.expression
+    def type(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.type
+
+    @hybrid_property
+    def status(self) -> str:
+        return self.revision.status
+
+    @status.setter
+    def status(self, value: str) -> None:
+        self.revision.status = value
+
+    @status.expression
+    def status(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.status
+
+    @hybrid_property
+    def created(self) -> datetime:
+        return self.revision.created
+
+    @created.setter
+    def created(self, value: datetime) -> None:
+        self.revision.created = value
+
+    @created.expression
+    def created(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.created
+
+    @hybrid_property
+    def updated(self) -> datetime:
+        return self.revision.updated
+
+    @updated.setter
+    def updated(self, value: datetime) -> None:
+        self.revision.updated = value
+
+    @updated.expression
+    def updated(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.updated
+
+    @hybrid_property
+    def is_deleted(self) -> bool:
+        return self.revision.is_deleted
+
+    @is_deleted.setter
+    def is_deleted(self, value: bool) -> None:
+        self.revision.is_deleted = value
+
+    @is_deleted.expression
+    def is_deleted(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.is_deleted
+
+    @hybrid_property
+    def is_archived(self) -> bool:
+        return self.revision.is_archived
+
+    @is_archived.setter
+    def is_archived(self, value: bool) -> None:
+        self.revision.is_archived = value
+
+    @is_archived.expression
+    def is_archived(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.is_archived
+
+    @hybrid_property
+    def revision_type(self) -> str:
+        return self.revision.revision_type
+
+    @revision_type.setter
+    def revision_type(self, value: str) -> None:
+        self.revision.revision_type = value
+
+    @revision_type.expression
+    def revision_type(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.revision_type
+
+    @hybrid_property
+    def workspace_id(self) -> int:
+        return self.revision.workspace_id
+
+    @workspace_id.setter
+    def workspace_id(self, value: int) -> None:
+        self.revision.workspace_id = value
+
+    @workspace_id.expression
+    def workspace_id(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.workspace_id
+
+    @hybrid_property
+    def workspace(self) -> Workspace:
+        return self.revision.workspace
+
+    @workspace.setter
+    def workspace(self, value: Workspace) -> None:
+        self.revision.workspace = value
+
+    @workspace.expression
+    def workspace(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.workspace
+
+    @hybrid_property
+    def parent_id(self) -> int:
+        return self.revision.parent_id
+
+    @parent_id.setter
+    def parent_id(self, value: int) -> None:
+        self.revision.parent_id = value
+
+    @parent_id.expression
+    def parent_id(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.parent_id
+
+    @hybrid_property
+    def parent(self) -> 'Content':
+        return self.revision.parent
+
+    @parent.setter
+    def parent(self, value: 'Content') -> None:
+        self.revision.parent = value
+
+    @parent.expression
+    def parent(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.parent
+
+    @hybrid_property
+    def node(self) -> 'Content':
+        return self.revision.node
+
+    @node.setter
+    def node(self, value: 'Content') -> None:
+        self.revision.node = value
+
+    @node.expression
+    def node(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.node
+
+    @hybrid_property
+    def owner(self) -> User:
+        return self.revision.owner
+
+    @owner.setter
+    def owner(self, value: User) -> None:
+        self.revision.owner = value
+
+    @owner.expression
+    def owner(cls) -> InstrumentedAttribute:
+        return ContentRevisionRO.owner
+
+    @hybrid_property
+    def children(self) -> ['Content']:
+        """
+        :return: list of children Content
+        :rtype Content
+        """
+        # Return a list of unique revisions parent content
+        return list(set([revision.node for revision in self.children_revisions]))
+
+    @property
+    def revision(self) -> ContentRevisionRO:
+        return self.get_current_revision()
+
+    def get_current_revision(self) -> ContentRevisionRO:
+        if not self.revisions:
+            return self.new_revision()
+
+        # If last revisions revision don't have revision_id, return it we just add it.
+        if self.revisions[-1].revision_id is None:
+            return self.revisions[-1]
+
+        # Revisions should be ordred by revision_id but we ensure that here
+        revisions = sorted(self.revisions, key=lambda revision: revision.revision_id)
+        return revisions[-1]
+
+    def new_revision(self) -> None:
+        """
+        Return and assign to this content a new revision.
+        If it's a new content, revision is totally new.
+        If this content already own revision, revision is build from last revision.
+        :return:
+        """
+        if not self.revisions:
+            self.revisions.append(ContentRevisionRO())
+            return self.revisions[0]
+
+        new_rev = ContentRevisionRO.new_from(self.get_current_revision())
+        self.revisions.append(new_rev)
+        return new_rev
+
     def get_valid_children(self, content_types: list=None) -> ['Content']:
         for child in self.children:
             if not child.is_deleted and not child.is_archived:
                 if not content_types or child.type in content_types:
-                    yield child
+                    yield child.node
 
     @hybrid_property
-    def properties(self):
+    def properties(self) -> dict:
         """ return a structure decoded from json content of _properties """
         if not self._properties:
             ContentChecker.reset_properties(self)
         return json.loads(self._properties)
 
     @properties.setter
-    def properties(self, properties_struct):
+    def properties(self, properties_struct: dict) -> None:
         """ encode a given structure into json and store it in _properties attribute"""
         self._properties = json.dumps(properties_struct)
         ContentChecker.check_properties(self)
@@ -519,7 +994,6 @@ class Content(DeclarativeBase):
             'html.parser'  # Fixes hanging bug - http://stackoverflow.com/questions/12618567/problems-running-beautifulsoup4-within-apache-mod-python-django
         )
 
-
         for link in soup.findAll('a'):
             href = link.get('href')
             label = link.contents
@@ -530,7 +1004,6 @@ class Content(DeclarativeBase):
         ## FIXME - Does this return a sorted list ???!
         return sorted_links
 
-
     def get_child_nb(self, content_type: ContentType, content_status = ''):
         child_nb = 0
         for child in self.get_valid_children():
@@ -586,7 +1059,7 @@ class Content(DeclarativeBase):
         children = []
         for child in self.children:
             if ContentType.Comment==child.type and not child.is_deleted and not child.is_archived:
-                children.append(child)
+                children.append(child.node)
         return children
 
     def get_last_comment_from(self, user: User) -> 'Content':
@@ -615,19 +1088,6 @@ class Content(DeclarativeBase):
 
         return None
 
-    def get_current_revision(self) -> 'ContentRevisionRO':
-        # TODO - D.A. - 2015-08-26
-        # This code is not efficient at all!!!
-        # We should get the revision id directly from the view
-        rev_ids = [revision.revision_id for revision in self.revisions]
-        rev_ids.sort()
-
-        for revision in self.revisions:
-            if revision.revision_id == rev_ids[-1]:
-                return revision
-
-        return None
-
     def description_as_raw_text(self):
         # 'html.parser' fixes a hanging bug
         # see http://stackoverflow.com/questions/12618567/problems-running-beautifulsoup4-within-apache-mod-python-django
@@ -667,115 +1127,14 @@ class Content(DeclarativeBase):
         return url_template.format(wid=wid, fid=fid, ctype=ctype, cid=cid)
 
 
-class ContentChecker(object):
-
-    @classmethod
-    def check_properties(cls, item: Content):
-        if item.type==ContentType.Folder:
-            properties = item.properties
-            if 'allowed_content' not in properties.keys():
-                return False
-            if 'folders' not in properties['allowed_content']:
-                return False
-            if 'files' not in properties['allowed_content']:
-                return False
-            if 'pages' not in properties['allowed_content']:
-                return False
-            if 'threads' not in properties['allowed_content']:
-                return False
-
-            return True
-
-        raise NotImplementedError
-
-    @classmethod
-    def reset_properties(cls, item: Content):
-        if item.type==ContentType.Folder:
-            item.properties = dict(
-                allowed_content = dict (
-                    folder = True,
-                    file = True,
-                    page = True,
-                    thread = True
-                )
-            )
-            return
-
-        raise NotImplementedError
-
-
-class ContentRevisionRO(DeclarativeBase):
-
-    __tablename__ = 'content_revisions'
-
-    revision_id = Column(Integer, Sequence('seq__content_revisions__revision_id'), primary_key=True)
-    content_id = Column(Integer, ForeignKey('contents.content_id'))
-    owner_id = Column(Integer, ForeignKey('users.user_id'), nullable=True)
-    label = Column(Unicode(1024), unique=False, nullable=False)
-    description = Column(Text(), unique=False, nullable=False, default='')
-    file_name = Column(Unicode(255),  unique=False, nullable=False, default='')
-    file_mimetype = Column(Unicode(255),  unique=False, nullable=False, default='')
-    file_content = deferred(Column(LargeBinary(), unique=False, nullable=False, default=None))
-
-    type = Column(Unicode(32), unique=False, nullable=False)
-    status = Column(Unicode(32), unique=False, nullable=False)
-    created = Column(DateTime, unique=False, nullable=False)
-    updated = Column(DateTime, unique=False, nullable=False)
-    is_deleted = Column(Boolean, unique=False, nullable=False)
-    is_archived = Column(Boolean, unique=False, nullable=False)
-    revision_type = Column(Unicode(32), unique=False, nullable=False, default='')
-
-    workspace_id = Column(Integer, ForeignKey('workspaces.workspace_id'), unique=False, nullable=True)
-    workspace = relationship('Workspace', remote_side=[Workspace.workspace_id])
-
-    node = relationship('Content', remote_side=[Content.content_id], backref='revisions')
-    owner = relationship('User', remote_side=[User.user_id])
-
-    def get_status(self):
-        return ContentStatus(self.status)
-
-    def get_label(self):
-        return self.label if self.label else self.file_name if self.file_name else ''
-
-    def get_last_action(self) -> ActionDescription:
-        return ActionDescription(self.revision_type)
-
-    # Read by must be used like this:
-    # read_datetime = revision.ready_by[<User instance>]
-    # if user did not read the content, then a key error is raised
-    read_by = association_proxy(
-        'revision_read_statuses',  # name of the attribute
-        'view_datetime',  # attribute the value is taken from
-        creator=lambda k, v: \
-            RevisionReadStatus(user=k, view_datetime=v)
-    )
-
-    def has_new_information_for(self, user: User) -> bool:
-        """
-        :param user: the session current user
-        :return: bool, True if there is new information for given user else False
-                       False if the user is None
-        """
-        if not user:
-            return False
-
-        if user not in self.read_by.keys():
-            return True
-
-        return False
-
 class RevisionReadStatus(DeclarativeBase):
 
     __tablename__ = 'revision_read_status'
 
     revision_id = Column(Integer, ForeignKey('content_revisions.revision_id', ondelete='CASCADE', onupdate='CASCADE'), primary_key=True)
     user_id = Column(Integer, ForeignKey('users.user_id', ondelete='CASCADE', onupdate='CASCADE'), primary_key=True)
-    view_datetime = Column(DateTime, unique=False, nullable=False, server_default=func.now())
-
-    # content_revision = relationship(
-    #     'ContentRevisionRO',
-    #     remote_side=[ContentRevisionRO.revision_id],
-    #     backref='revision_read_statuses')
+    #  Default value datetime.utcnow, see: http://stackoverflow.com/a/13370382/801924 (or http://pastebin.com/VLyWktUn)
+    view_datetime = Column(DateTime, unique=False, nullable=False, default=datetime.utcnow)
 
     content_revision = relationship(
         'ContentRevisionRO',
@@ -831,7 +1190,7 @@ class VirtualEvent(object):
         action_description = ActionDescription(revision.revision_type)
 
         return VirtualEvent(id=revision.revision_id,
-                            created=revision.created,
+                            created=revision.updated,
                             owner=revision.owner,
                             type=action_description,
                             label=action_description.label,

tracim/tracim/model/serializers.py

@@ -138,7 +138,7 @@ class Context(object):
         try:
             converter = Context._converters[context_string][model_class]
             return converter
-        except:
+        except KeyError:
             if CTX.DEFAULT in Context._converters:
                 if model_class in Context._converters[CTX.DEFAULT]:
                     return Context._converters[CTX.DEFAULT][model_class]

tracim/tracim/tests/__init__.py

@@ -2,14 +2,15 @@
 """Unit and functional test suite for tracim."""
 import argparse
 import os
+import time
 from os import getcwd
 
 import ldap3
 import tg
-import time
 import transaction
 from gearbox.commands.setup_app import SetupAppCommand
 from ldap_test import LdapServer
+from nose.tools import eq_
 from nose.tools import ok_
 from paste.deploy import loadapp
 from sqlalchemy.engine import reflection
@@ -28,7 +29,9 @@ from who_ldap import make_connection
 from tracim.fixtures import FixturesLoader
 from tracim.fixtures.users_and_groups import Base as BaseFixture
 from tracim.lib.base import logger
-from tracim.model import DBSession
+from tracim.lib.content import ContentApi
+from tracim.model import DBSession, Content
+from tracim.model.data import Workspace, ContentType, ContentRevisionRO
 
 __all__ = ['setup_app', 'setup_db', 'teardown_db', 'TestController']
 
@@ -293,3 +296,44 @@ class LDAPTest(object):
 class ArgumentParser(argparse.ArgumentParser):
     def exit(self, status=0, message=None):
         raise Exception(message)
+
+
+class BaseTest(object):
+
+    def _create_workspace_and_test(self, name, *args, **kwargs) -> Workspace:
+        """
+        All extra parameters (*args, **kwargs) are for Workspace init
+        :return: Created workspace instance
+        """
+        workspace = Workspace(label=name, *args, **kwargs)
+        DBSession.add(workspace)
+        DBSession.flush()
+
+        eq_(1, DBSession.query(Workspace).filter(Workspace.label == name).count())
+        return DBSession.query(Workspace).filter(Workspace.label == name).one()
+
+    def _create_content_and_test(self, name, workspace, *args, **kwargs) -> Content:
+        """
+        All extra parameters (*args, **kwargs) are for Content init
+        :return: Created Content instance
+        """
+        content = Content(*args, **kwargs)
+        content.label = name
+        content.workspace = workspace
+        DBSession.add(content)
+        DBSession.flush()
+
+        eq_(1, ContentApi.get_canonical_query().filter(Content.label == name).count())
+        return ContentApi.get_canonical_query().filter(Content.label == name).one()
+
+
+class BaseTestThread(BaseTest):
+
+    def _create_thread_and_test(self, workspace_name='workspace_1', folder_name='folder_1', thread_name='thread_1') -> Content:
+        """
+        :return: Thread
+        """
+        workspace = self._create_workspace_and_test(workspace_name)
+        folder = self._create_content_and_test(folder_name, workspace, type=ContentType.Folder)
+        thread = self._create_content_and_test(thread_name, workspace, type=ContentType.Thread, parent=folder)
+        return thread

tracim/tracim/tests/library/test_content_api.py

@@ -12,10 +12,11 @@ from tracim.lib.group import GroupApi
 from tracim.lib.user import UserApi
 from tracim.lib.workspace import RoleApi
 from tracim.lib.workspace import WorkspaceApi
+from tracim.model import DBSession, new_revision
 
 from tracim.model.auth import Group
 
-from tracim.model.data import ActionDescription
+from tracim.model.data import ActionDescription, ContentRevisionRO, Workspace
 from tracim.model.data import Content
 from tracim.model.data import ContentType
 from tracim.model.data import UserRoleInWorkspace
@@ -123,7 +124,8 @@ class TestContentApi(TestStandard):
         eq_(2, len(items))
 
         items = api.get_all(None, ContentType.Any, workspace)
-        api.delete(items[0])
+        with new_revision(items[0]):
+            api.delete(items[0])
         transaction.commit()
 
         # Refresh instances after commit
@@ -172,7 +174,8 @@ class TestContentApi(TestStandard):
         eq_(2, len(items))
 
         items = api.get_all(None, ContentType.Any, workspace)
-        api.archive(items[0])
+        with new_revision(items[0]):
+            api.archive(items[0])
         transaction.commit()
 
         # Refresh instances after commit
@@ -276,7 +279,8 @@ class TestContentApi(TestStandard):
                                                         save_now=True)
         api = ContentApi(user)
         c = api.create(ContentType.Folder, workspace, None, 'parent', True)
-        api.set_status(c, 'unknown-status')
+        with new_revision(c):
+            api.set_status(c, 'unknown-status')
 
     def test_set_status_ok(self):
         uapi = UserApi(None)
@@ -291,11 +295,13 @@ class TestContentApi(TestStandard):
                                                         save_now=True)
         api = ContentApi(user)
         c = api.create(ContentType.Folder, workspace, None, 'parent', True)
-        for new_status in ['open', 'closed-validated', 'closed-unvalidated',
-                           'closed-deprecated']:
-            api.set_status(c, new_status)
-            eq_(new_status, c.status)
-            eq_(ActionDescription.STATUS_UPDATE, c.revision_type)
+        with new_revision(c):
+            for new_status in ['open', 'closed-validated', 'closed-unvalidated',
+                               'closed-deprecated']:
+                api.set_status(c, new_status)
+
+                eq_(new_status, c.status)
+                eq_(ActionDescription.STATUS_UPDATE, c.revision_type)
 
     def test_create_comment_ok(self):
         uapi = UserApi(None)
@@ -370,7 +376,8 @@ class TestContentApi(TestStandard):
         u2 = UserApi(None).get_one(u2id)
         api2 = ContentApi(u2)
         content2 = api2.get_one(pcid, ContentType.Any, workspace)
-        api2.update_content(content2, 'this is an updated page', 'new content')
+        with new_revision(content2):
+            api2.update_content(content2, 'this is an updated page', 'new content')
         api2.save(content2)
         transaction.commit()
 
@@ -435,8 +442,9 @@ class TestContentApi(TestStandard):
         u2 = UserApi(None).get_one(u2id)
         api2 = ContentApi(u2)
         content2 = api2.get_one(pcid, ContentType.Any, workspace)
-        api2.update_file_data(content2, 'index.html', 'text/html',
-                              b'<html>hello world</html>')
+        with new_revision(content2):
+            api2.update_file_data(content2, 'index.html', 'text/html',
+                                  b'<html>hello world</html>')
         api2.save(content2)
         transaction.commit()
 
@@ -501,7 +509,8 @@ class TestContentApi(TestStandard):
         u2 = UserApi(None).get_one(u2id)
         api2 = ContentApi(u2, show_archived=True)
         content2 = api2.get_one(pcid, ContentType.Any, workspace)
-        api2.archive(content2)
+        with new_revision(content2):
+            api2.archive(content2)
         api2.save(content2)
         transaction.commit()
 
@@ -522,7 +531,8 @@ class TestContentApi(TestStandard):
         ####
 
         updated2 = api.get_one(pcid, ContentType.Any, workspace)
-        api.unarchive(updated)
+        with new_revision(updated):
+            api.unarchive(updated)
         api.save(updated2)
         eq_(False, updated2.is_archived)
         eq_(ActionDescription.UNARCHIVING, updated2.revision_type)
@@ -574,7 +584,8 @@ class TestContentApi(TestStandard):
         u2 = UserApi(None).get_one(u2id)
         api2 = ContentApi(u2, show_deleted=True)
         content2 = api2.get_one(pcid, ContentType.Any, workspace)
-        api2.delete(content2)
+        with new_revision(content2):
+            api2.delete(content2)
         api2.save(content2)
         transaction.commit()
 
@@ -597,7 +608,8 @@ class TestContentApi(TestStandard):
         ####
 
         updated2 = api.get_one(pcid, ContentType.Any, workspace)
-        api.undelete(updated)
+        with new_revision(updated2):
+            api.undelete(updated2)
         api.save(updated2)
         eq_(False, updated2.is_deleted)
         eq_(ActionDescription.UNDELETION, updated2.revision_type)
@@ -623,7 +635,10 @@ class TestContentApi(TestStandard):
                        'this is randomized folder', True)
         p = api.create(ContentType.Page, workspace, a,
                        'this is randomized label content', True)
-        p.description = 'This is some amazing test'
+
+        with new_revision(p):
+            p.description = 'This is some amazing test'
+
         api.save(p)
         original_id = p.content_id
 
@@ -653,7 +668,10 @@ class TestContentApi(TestStandard):
                        'this is randomized folder', True)
         p = api.create(ContentType.Page, workspace, a,
                        'this is dummy label content', True)
-        p.description = 'This is some amazing test'
+
+        with new_revision(p):
+            p.description = 'This is some amazing test'
+
         api.save(p)
         original_id = p.content_id
 
@@ -685,15 +703,27 @@ class TestContentApi(TestStandard):
                        'this is randomized folder', True)
         p1 = api.create(ContentType.Page, workspace, a,
                         'this is dummy label content', True)
-        p1.description = 'This is some amazing test'
         p2 = api.create(ContentType.Page, workspace, a, 'Hey ! Jon !', True)
-        p2.description = 'What\'s up ?'
+
+        with new_revision(p1):
+            p1.description = 'This is some amazing test'
+
+        with new_revision(p2):
+            p2.description = 'What\'s up ?'
+
         api.save(p1)
         api.save(p2)
 
         id1 = p1.content_id
         id2 = p2.content_id
 
+        eq_(1, DBSession.query(Workspace).filter(Workspace.label == 'test workspace').count())
+        eq_(1, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'this is randomized folder').count())
+        eq_(2, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'this is dummy label content').count())
+        eq_(1, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.description == 'This is some amazing test').count())
+        eq_(2, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'Hey ! Jon !').count())
+        eq_(1, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.description == 'What\'s up ?').count())
+
         res = api.search(['dummy', 'jon'])
         eq_(2, len(res.all()))
 

tracim/tracim/tests/library/test_serializers.py

@@ -5,9 +5,6 @@ from nose.tools import eq_
 from nose.tools import ok_
 from nose.tools import raises
 
-from sqlalchemy.orm.exc import NoResultFound
-
-import transaction
 import tg
 
 from tracim.model import DBSession
@@ -25,8 +22,6 @@ from tracim.model.serializers import pod_serializer
 
 from tracim.model.data import ActionDescription
 
-from tracim.lib.user import UserApi
-
 from tracim.tests import TestStandard
 
 
@@ -221,11 +216,13 @@ class TestSerializers(TestStandard):
     def test_serializer_content__menui_api_context__children(self):
         folder_without_child = Content()
         folder_without_child.type = ContentType.Folder
+        folder_without_child.label = 'folder_without_child'
         res = Context(CTX.MENU_API).toDict(folder_without_child)
         eq_(False, res['children'])
 
         folder_with_child = Content()
         folder_with_child.type = ContentType.Folder
+        folder_with_child.label = 'folder_with_child'
         folder_without_child.parent = folder_with_child
         DBSession.add(folder_with_child)
         DBSession.add(folder_without_child)
@@ -238,9 +235,11 @@ class TestSerializers(TestStandard):
             if curtype not in (ContentType.Folder, ContentType.Comment):
                 item = Content()
                 item.type = curtype
+                item.label = 'item'
 
                 fake_child = Content()
                 fake_child.type = curtype
+                fake_child.label = 'fake_child'
                 fake_child.parent = item
 
                 DBSession.add(item)

tracim/tracim/tests/library/test_thread.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+import transaction
+from nose.tools import eq_
+
+from tracim.tests import BaseTestThread, TestStandard
+
+
+class TestThread(BaseTestThread, TestStandard):
+
+    def test_create_thread(self, key='1'):
+        return self._create_thread_and_test(
+            workspace_name='workspace_%s' % key,
+            folder_name='folder_%s' % key,
+            thread_name='thread_%s' % key,
+        )

tracim/tracim/tests/library/test_workspace.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+import transaction
+from nose.tools import eq_
+
+from tracim.lib.content import ContentApi
+from tracim.model import DBSession, Content
+from tracim.model.data import Workspace
+from tracim.tests import BaseTestThread, TestStandard
+
+
+class TestThread(BaseTestThread, TestStandard):
+
+    def test_children(self):
+        self._create_thread_and_test(
+            workspace_name='workspace_1',
+            folder_name='folder_1',
+            thread_name='thread_1',
+        )
+        workspace = DBSession.query(Workspace).filter(Workspace.label == 'workspace_1').one()
+        folder = ContentApi.get_canonical_query().filter(Content.label == 'folder_1').one()
+        eq_([folder, ], list(workspace.get_valid_children()))

tracim/tracim/tests/models/test_content.py

@@ -0,0 +1,171 @@
+# -*- coding: utf-8 -*-
+import time
+from nose.tools import raises, ok_
+from sqlalchemy.sql.elements import and_
+from sqlalchemy.testing import eq_
+
+from tracim.lib.content import ContentApi
+from tracim.lib.exception import ContentRevisionUpdateError
+from tracim.model import DBSession, User, Content, new_revision
+from tracim.model.data import ContentRevisionRO, Workspace, ActionDescription, ContentType
+from tracim.tests import TestStandard
+
+
+class TestContent(TestStandard):
+
+    @raises(ContentRevisionUpdateError)
+    def test_update_without_prepare(self):
+        content1 = self.test_create()
+        content1.description = 'FOO'  # Raise ContentRevisionUpdateError because revision can't be updated
+
+    def test_query(self):
+        content1 = self.test_create()
+        with new_revision(content1):
+            content1.description = 'TEST_CONTENT_DESCRIPTION_1_UPDATED'
+        DBSession.flush()
+
+        content2 = self.test_create(key='2')
+        with new_revision(content2):
+            content2.description = 'TEST_CONTENT_DESCRIPTION_2_UPDATED'
+        DBSession.flush()
+
+        workspace1 = DBSession.query(Workspace).filter(Workspace.label == 'TEST_WORKSPACE_1').one()
+        workspace2 = DBSession.query(Workspace).filter(Workspace.label == 'TEST_WORKSPACE_2').one()
+
+        # To get Content in database we have to join Content and ContentRevisionRO with particular condition:
+        # Join have to be on most recent revision
+        join_sub_query = DBSession.query(ContentRevisionRO.revision_id)\
+            .filter(ContentRevisionRO.content_id == Content.id)\
+            .order_by(ContentRevisionRO.revision_id.desc())\
+            .limit(1)\
+            .correlate(Content)
+
+        base_query = DBSession.query(Content)\
+            .join(ContentRevisionRO, and_(Content.id == ContentRevisionRO.content_id,
+                                          ContentRevisionRO.revision_id == join_sub_query))
+
+        eq_(2, base_query.count())
+
+        eq_(1, base_query.filter(Content.workspace == workspace1).count())
+        eq_(1, base_query.filter(Content.workspace == workspace2).count())
+
+        content1_from_query = base_query.filter(Content.workspace == workspace1).one()
+        eq_(content1.id, content1_from_query.id)
+        eq_('TEST_CONTENT_DESCRIPTION_1_UPDATED', content1_from_query.description)
+
+        user_admin = DBSession.query(User).filter(User.email == 'admin@admin.admin').one()
+        api = ContentApi(None)
+
+        content1_from_api = api.get_one(content1.id, ContentType.Page, workspace1)
+
+    def test_update(self):
+        created_content = self.test_create()
+        content = DBSession.query(Content).filter(Content.id == created_content.id).one()
+        eq_(1, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_1').count())
+
+        with new_revision(content):
+            time.sleep(0.00001)
+            content.description = 'TEST_CONTENT_DESCRIPTION_1_UPDATED'
+        DBSession.flush()
+
+        eq_(2, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_1').count())
+        eq_(1, DBSession.query(Content).filter(Content.id == created_content.id).count())
+
+        with new_revision(content):
+            time.sleep(0.00001)
+            content.description = 'TEST_CONTENT_DESCRIPTION_1_UPDATED_2'
+            content.label = 'TEST_CONTENT_1_UPDATED_2'
+        DBSession.flush()
+
+        eq_(1, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_1_UPDATED_2').count())
+        eq_(1, DBSession.query(Content).filter(Content.id == created_content.id).count())
+
+        revision_1 = DBSession.query(ContentRevisionRO)\
+            .filter(ContentRevisionRO.description == 'TEST_CONTENT_DESCRIPTION_1').one()
+        revision_2 = DBSession.query(ContentRevisionRO)\
+            .filter(ContentRevisionRO.description == 'TEST_CONTENT_DESCRIPTION_1_UPDATED').one()
+        revision_3 = DBSession.query(ContentRevisionRO)\
+            .filter(ContentRevisionRO.description == 'TEST_CONTENT_DESCRIPTION_1_UPDATED_2').one()
+
+        # Updated dates must be different
+        ok_(revision_1.updated < revision_2.updated < revision_3.updated)
+        # Created dates must be equal
+        ok_(revision_1.created == revision_2.created == revision_3.created)
+
+    def test_creates(self):
+        eq_(0, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_1').count())
+        eq_(0, DBSession.query(Workspace).filter(Workspace.label == 'TEST_WORKSPACE_1').count())
+
+        user_admin = DBSession.query(User).filter(User.email == 'admin@admin.admin').one()
+        workspace = Workspace(label="TEST_WORKSPACE_1")
+        DBSession.add(workspace)
+        DBSession.flush()
+        eq_(1, DBSession.query(Workspace).filter(Workspace.label == 'TEST_WORKSPACE_1').count())
+
+        first_content = self._create_content(
+            owner=user_admin,
+            workspace=workspace,
+            type=ContentType.Page,
+            label='TEST_CONTENT_1',
+            description='TEST_CONTENT_DESCRIPTION_1',
+            revision_type=ActionDescription.CREATION,
+            is_deleted=False,  # TODO: pk ?
+            is_archived=False,  # TODO: pk ?
+            #file_content=None,  # TODO: pk ? (J'ai du mettre nullable=True)
+        )
+
+        eq_(1, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_1').count())
+
+        content = DBSession.query(Content).filter(Content.id == first_content.id).one()
+        eq_('TEST_CONTENT_1', content.label)
+        eq_('TEST_CONTENT_DESCRIPTION_1', content.description)
+
+        # Create a second content
+        second_content = self._create_content(
+            owner=user_admin,
+            workspace=workspace,
+            type=ContentType.Page,
+            label='TEST_CONTENT_2',
+            description='TEST_CONTENT_DESCRIPTION_2',
+            revision_type=ActionDescription.CREATION
+        )
+
+        eq_(1, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_2').count())
+
+        content = DBSession.query(Content).filter(Content.id == second_content.id).one()
+        eq_('TEST_CONTENT_2', content.label)
+        eq_('TEST_CONTENT_DESCRIPTION_2', content.description)
+
+    def test_create(self, key='1'):
+        eq_(0, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_%s' % key).count())
+        eq_(0, DBSession.query(Workspace).filter(Workspace.label == 'TEST_WORKSPACE_%s' % key).count())
+
+        user_admin = DBSession.query(User).filter(User.email == 'admin@admin.admin').one()
+        workspace = Workspace(label="TEST_WORKSPACE_%s" % key)
+        DBSession.add(workspace)
+        DBSession.flush()
+        eq_(1, DBSession.query(Workspace).filter(Workspace.label == 'TEST_WORKSPACE_%s' % key).count())
+
+        created_content = self._create_content(
+            owner=user_admin,
+            workspace=workspace,
+            type=ContentType.Page,
+            label='TEST_CONTENT_%s' % key,
+            description='TEST_CONTENT_DESCRIPTION_%s' % key,
+            revision_type=ActionDescription.CREATION
+        )
+
+        eq_(1, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_%s' % key).count())
+
+        content = DBSession.query(Content).filter(Content.id == created_content.id).one()
+        eq_('TEST_CONTENT_%s' % key, content.label)
+        eq_('TEST_CONTENT_DESCRIPTION_%s' % key, content.description)
+
+        return created_content
+
+    def _create_content(self, *args, **kwargs):
+        content = Content(*args, **kwargs)
+        DBSession.add(content)
+        DBSession.flush()
+
+        return content

tracim/tracim/tests/models/test_content_revision.py

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+from collections import OrderedDict
+
+from nose.tools import eq_
+from sqlalchemy import inspect
+
+from tracim.model import DBSession, ContentRevisionRO
+from tracim.model import User
+from tracim.model.data import ContentType
+from tracim.tests import TestStandard, BaseTest
+
+
+class TestContentRevision(BaseTest, TestStandard):
+
+    def _new_from(self, revision):
+        excluded_columns = ('revision_id', '_sa_instance_state')
+        revision_columns = [attr.key for attr in inspect(revision).attrs if not attr.key in excluded_columns]
+        new_revision = ContentRevisionRO()
+
+        for revision_column in revision_columns:
+            old_revision_column_value = getattr(revision, revision_column)
+            setattr(new_revision, revision_column, old_revision_column_value)
+
+        return new_revision
+
+    def _get_dict_representation(self, revision):
+        keys_to_remove = ('updated', '_sa_instance_state')
+        dict_repr = OrderedDict(sorted(revision.__dict__.items()))
+        for key_to_remove in keys_to_remove:
+            dict_repr.pop(key_to_remove, None)
+        return dict_repr
+
+    def test_new_revision(self):
+        admin = DBSession.query(User).filter(User.email == 'admin@admin.admin').one()
+        workspace = self._create_workspace_and_test(name='workspace_1')
+        folder = self._create_content_and_test(name='folder_1', workspace=workspace, type=ContentType.Folder)
+        page = self._create_content_and_test(
+            workspace=workspace,
+            parent=folder,
+            name='file_1',
+            description='content of file_1',
+            type=ContentType.Page,
+            owner=admin
+        )
+
+        DBSession.flush()
+
+        # Model create a new instance with list of column
+        new_revision_by_model = ContentRevisionRO.new_from(page.revision)
+        # Test create a new instance from dynamic listing of model columns mapping
+        new_revision_by_test = self._new_from(page.revision)
+
+        new_revision_by_model_dict = self._get_dict_representation(new_revision_by_model)
+        new_revision_by_test_dict = self._get_dict_representation(new_revision_by_test)
+
+        # They must be identical
+        eq_(new_revision_by_model_dict, new_revision_by_test_dict)

tracim/tracim/websetup/schema.py

@@ -17,12 +17,7 @@ def setup_schema(command, conf, vars):
     
     # <websetup.websetup.schema.before.metadata.create_all>
     print("Creating tables")
-    # model.metadata.create_all(bind=config['tg.app_globals'].sa_engine)
-
-    # result = config['tg.app_globals'].sa_engine.execute(get_initial_schema())
-    from sqlalchemy import DDL
-    result = model.DBSession.execute(DDL(get_initial_schema()))
-    print("Initial schema created.")
+    model.metadata.create_all(bind=config['tg.app_globals'].sa_engine)
 
     #ALTER TABLE bibi ADD COLUMN popo integer;
 
@@ -37,266 +32,3 @@ def setup_schema(command, conf, vars):
     alembic_cfg.set_main_option("script_location", "migration")
     alembic_cfg.set_main_option("sqlalchemy.url", config['sqlalchemy.url'])
     alembic.command.stamp(alembic_cfg, "head")
-
-
-def get_initial_schema():
-    return """
-SET statement_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = on;
-SET check_function_bodies = false;
-SET client_min_messages = warning;
-
-SET search_path = public, pg_catalog;
-
-
-CREATE OR REPLACE FUNCTION update_node() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-INSERT INTO content_revisions (content_id, parent_id, type, created, updated,
-       label, description, status,
-       file_name, file_content, file_mimetype,
-       owner_id, revision_id, workspace_id, is_deleted, is_archived, properties, revision_type) VALUES (NEW.content_id, NEW.parent_id, NEW.type, NEW.created, NEW.updated, NEW.label, NEW.description, NEW.status, NEW.file_name, NEW.file_content, NEW.file_mimetype, NEW.owner_id, nextval('seq__content_revisions__revision_id'), NEW.workspace_id, NEW.is_deleted, NEW.is_archived, NEW.properties, NEW.revision_type);
-return new;
-END;
-$$;
-
-CREATE OR REPLACE FUNCTION set_created() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-    NEW.created = CURRENT_TIMESTAMP;
-    NEW.updated = CURRENT_TIMESTAMP;
-    RETURN NEW;
-END;
-$$;
-
-CREATE OR REPLACE FUNCTION set_updated() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-    NEW.updated = CURRENT_TIMESTAMP;
-    RETURN NEW;
-END;
-$$;
-
-SET default_tablespace = '';
-SET default_with_oids = false;
-
-
-CREATE TABLE groups (
-    group_id integer NOT NULL,
-    group_name character varying(16) NOT NULL,
-    display_name character varying(255),
-    created timestamp without time zone
-);
-
-CREATE SEQUENCE seq__groups__group_id
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE seq__groups__group_id OWNED BY groups.group_id;
-
-CREATE TABLE group_permission (
-    group_id integer NOT NULL,
-    permission_id integer NOT NULL
-);
-
-CREATE SEQUENCE seq__content_revisions__revision_id
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-CREATE TABLE content_revisions (
-    content_id integer NOT NULL,
-    parent_id integer,
-    type character varying(16) DEFAULT 'data'::character varying NOT NULL,
-    created timestamp without time zone,
-    updated timestamp without time zone,
-    label character varying(1024),
-    description text DEFAULT ''::text NOT NULL,
-    status character varying(32) DEFAULT 'new'::character varying,
-    file_name character varying(255),
-    file_content bytea,
-    file_mimetype character varying(255),
-    owner_id integer,
-    revision_id integer DEFAULT nextval('seq__content_revisions__revision_id'::regclass) NOT NULL,
-    workspace_id integer,
-    is_deleted boolean DEFAULT false NOT NULL,
-    is_archived boolean DEFAULT false NOT NULL,
-    properties text,
-    revision_type character varying(32)
-);
-
-COMMENT ON COLUMN content_revisions.properties IS 'This column contain properties specific to a given type. these properties are json encoded (so there is no structure "a priori")';
-
-CREATE VIEW contents AS
-    SELECT DISTINCT ON (content_revisions.content_id) content_revisions.content_id, content_revisions.parent_id, content_revisions.type, content_revisions.created, content_revisions.updated, content_revisions.label, content_revisions.description, content_revisions.status, content_revisions.file_name, content_revisions.file_content, content_revisions.file_mimetype, content_revisions.owner_id, content_revisions.workspace_id, content_revisions.is_deleted, content_revisions.is_archived, content_revisions.properties, content_revisions.revision_type FROM content_revisions ORDER BY content_revisions.content_id, content_revisions.updated DESC, content_revisions.created DESC;
-
-CREATE SEQUENCE seq__contents__content_id
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE seq__contents__content_id OWNED BY content_revisions.content_id;
-
-CREATE TABLE permissions (
-    permission_id integer NOT NULL,
-    permission_name character varying(63) NOT NULL,
-    description character varying(255)
-);
-
-CREATE SEQUENCE seq__permissions__permission_id
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE seq__permissions__permission_id OWNED BY permissions.permission_id;
-
-CREATE TABLE users (
-    user_id integer NOT NULL,
-    email character varying(255) NOT NULL,
-    display_name character varying(255),
-    password character varying(128),
-    created timestamp without time zone,
-    is_active boolean DEFAULT true NOT NULL,
-    imported_from character varying(32)
-);
-
-CREATE TABLE user_group (
-    user_id integer NOT NULL,
-    group_id integer NOT NULL
-);
-
-CREATE SEQUENCE seq__users__user_id
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE seq__users__user_id OWNED BY users.user_id;
-
-CREATE TABLE user_workspace (
-    user_id integer NOT NULL,
-    workspace_id integer NOT NULL,
-    role integer,
-    do_notify boolean DEFAULT FALSE NOT NULL
-);
-
-CREATE TABLE workspaces (
-    workspace_id integer NOT NULL,
-    label character varying(1024),
-    description text,
-    created timestamp without time zone,
-    updated timestamp without time zone,
-    is_deleted boolean DEFAULT false NOT NULL
-);
-
-CREATE SEQUENCE seq__workspaces__workspace_id
-    START WITH 11
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER TABLE ONLY groups ALTER COLUMN group_id SET DEFAULT nextval('seq__groups__group_id'::regclass);
-ALTER TABLE ONLY content_revisions ALTER COLUMN content_id SET DEFAULT nextval('seq__contents__content_id'::regclass);
-ALTER TABLE ONLY permissions ALTER COLUMN permission_id SET DEFAULT nextval('seq__permissions__permission_id'::regclass);
-ALTER TABLE ONLY users ALTER COLUMN user_id SET DEFAULT nextval('seq__users__user_id'::regclass);
-ALTER TABLE ONLY workspaces ALTER COLUMN workspace_id SET DEFAULT nextval('seq__workspaces__workspace_id'::regclass);
-
-
-SELECT pg_catalog.setval('seq__groups__group_id', 4, true);
-SELECT pg_catalog.setval('seq__contents__content_id', 1, true);
-SELECT pg_catalog.setval('seq__content_revisions__revision_id', 2568, true);
-SELECT pg_catalog.setval('seq__permissions__permission_id', 1, true);
-SELECT pg_catalog.setval('seq__users__user_id', 2, true);
-
-SELECT pg_catalog.setval('seq__workspaces__workspace_id', 1, true);
-
-ALTER TABLE ONLY user_workspace
-    ADD CONSTRAINT pk__user_workspace__user_id__workspace_id PRIMARY KEY (user_id, workspace_id);
-
-ALTER TABLE ONLY workspaces
-    ADD CONSTRAINT pk__workspace__workspace_id PRIMARY KEY (workspace_id);
-
-ALTER TABLE ONLY groups
-    ADD CONSTRAINT uk__groups__group_name UNIQUE (group_name);
-
-ALTER TABLE ONLY group_permission
-    ADD CONSTRAINT pk__group_permission__group_id__permission_id PRIMARY KEY (group_id, permission_id);
-
-ALTER TABLE ONLY groups
-    ADD CONSTRAINT pk__groups__group_id PRIMARY KEY (group_id);
-
-ALTER TABLE ONLY content_revisions
-    ADD CONSTRAINT pk__content_revisions__revision_id PRIMARY KEY (revision_id);
-
-ALTER TABLE ONLY permissions
-    ADD CONSTRAINT uk__permissions__permission_name UNIQUE (permission_name);
-
-ALTER TABLE ONLY permissions
-    ADD CONSTRAINT pk__permissions__permission_id PRIMARY KEY (permission_id);
-
-ALTER TABLE ONLY users
-    ADD CONSTRAINT uk__users__email UNIQUE (email);
-
-ALTER TABLE ONLY user_group
-    ADD CONSTRAINT pk__user_group__user_id__group_id PRIMARY KEY (user_id, group_id);
-
-ALTER TABLE ONLY users
-    ADD CONSTRAINT pk__users__user_id PRIMARY KEY (user_id);
-
-CREATE INDEX idx__content_revisions__owner_id ON content_revisions USING btree (owner_id);
-
-CREATE INDEX idx__content_revisions__parent_id ON content_revisions USING btree (parent_id);
-
-CREATE RULE rul__insert__new_node AS ON INSERT TO contents DO INSTEAD INSERT INTO content_revisions (content_id, parent_id, type, created, updated, label, description, status, file_name, file_content, file_mimetype, owner_id, revision_id, workspace_id, is_deleted, is_archived, properties, revision_type) VALUES (nextval('seq__contents__content_id'::regclass), new.parent_id, new.type, new.created, new.updated, new.label, new.description, new.status, new.file_name, new.file_content, new.file_mimetype, new.owner_id, nextval('seq__content_revisions__revision_id'::regclass), new.workspace_id, new.is_deleted, new.is_archived, new.properties, new.revision_type) RETURNING content_revisions.content_id, content_revisions.parent_id, content_revisions.type, content_revisions.created, content_revisions.updated, content_revisions.label, content_revisions.description, content_revisions.status, content_revisions.file_name, content_revisions.file_content, content_revisions.file_mimetype, content_revisions.owner_id, content_revisions.workspace_id, content_revisions.is_deleted, content_revisions.is_archived, content_revisions.properties, content_revisions.revision_type;
-
-CREATE TRIGGER trg__contents__on_insert__set_created BEFORE INSERT ON content_revisions FOR EACH ROW EXECUTE PROCEDURE set_created();
-CREATE TRIGGER trg__contents__on_update__set_updated BEFORE UPDATE ON content_revisions FOR EACH ROW EXECUTE PROCEDURE set_updated();
-
-CREATE TRIGGER trg__contents__on_update INSTEAD OF UPDATE ON contents FOR EACH ROW EXECUTE PROCEDURE update_node();
-CREATE TRIGGER trg__workspaces__on_insert__set_created BEFORE INSERT ON workspaces FOR EACH ROW EXECUTE PROCEDURE set_created();
-CREATE TRIGGER trg__workspaces__on_update__set_updated BEFORE UPDATE ON workspaces FOR EACH ROW EXECUTE PROCEDURE set_updated();
-
-ALTER TABLE ONLY user_workspace
-    ADD CONSTRAINT fk__user_workspace__user_id FOREIGN KEY (user_id) REFERENCES users(user_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-ALTER TABLE ONLY user_workspace
-    ADD CONSTRAINT fk__user_workspace__workspace_id FOREIGN KEY (workspace_id) REFERENCES workspaces(workspace_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-ALTER TABLE ONLY group_permission
-    ADD CONSTRAINT fk__group_permission__group_id FOREIGN KEY (group_id) REFERENCES groups(group_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-ALTER TABLE ONLY group_permission
-    ADD CONSTRAINT fk__group_permission__permission_id FOREIGN KEY (permission_id) REFERENCES permissions(permission_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-ALTER TABLE ONLY content_revisions
-    ADD CONSTRAINT fk__content_revisions__owner_id FOREIGN KEY (owner_id) REFERENCES users(user_id);
-
-ALTER TABLE ONLY user_group
-    ADD CONSTRAINT fk__user_group__group_id FOREIGN KEY (group_id) REFERENCES groups(group_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-ALTER TABLE ONLY user_group
-    ADD CONSTRAINT fk__user_group__user_id FOREIGN KEY (user_id) REFERENCES users(user_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-COMMIT;
-"""