Merge pull request #83 from tracim/feature/583_Api_for_generic_content

README.md

@@ -5,7 +5,7 @@
 tracim_backend
 ==============
 
-This code is Work in progress. Not usable at all for production.
+This code is "work in progress". Not usable at all for production.
 
 Backend source code of tracim v2, using Pyramid Framework.
 

tracim/exceptions.py

@@ -97,9 +97,17 @@ class GroupDoesNotExist(TracimError):
     pass
 
 
+class ContentStatusNotExist(TracimError):
+    pass
+
+
+class ContentTypeNotExist(TracimError):
+    pass
+
+
 class UserDoesNotExist(TracimException):
     pass
 
 
 class UserNotFoundInTracimRequest(TracimException):
-    pass
+    pass

tracim/fixtures/__init__.py

@@ -1,3 +1,4 @@
+import copy
 import transaction
 
 
@@ -23,7 +24,11 @@ class FixturesLoader(object):
         loaded = [] if loaded is None else loaded
         self._loaded = loaded
         self._session = session
-        self._config = config
+        # FIXME - G.M - 2018-06-169 - Fixture failed with email_notification
+        # activated, disable it there now. Find better way to fix this
+        # later
+        self._config = copy.copy(config)
+        self._config.EMAIL_NOTIFICATION_ACTIVATED = False
 
     def loads(self, fixtures_classes):
         for fixture_class in fixtures_classes:

tracim/fixtures/content.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from depot.io.utils import FileIntent
+import transaction
 
 from tracim import models
 from tracim.fixtures import Fixture
@@ -9,6 +10,7 @@ from tracim.lib.core.userworkspace import RoleApi
 from tracim.lib.core.workspace import WorkspaceApi
 from tracim.models.data import ContentType
 from tracim.models.data import UserRoleInWorkspace
+from tracim.models.revision_protection import new_revision
 
 
 class Content(Fixture):
@@ -43,133 +45,206 @@ class Content(Fixture):
         )
 
         # Workspaces
-        w1 = admin_workspace_api.create_workspace(
-            'w1',
-            description='This is a workspace',
-            save_now=True
+        business_workspace = admin_workspace_api.create_workspace(
+            'Business',
+            description='All importants documents',
+            save_now=True,
         )
-        w2 = bob_workspace_api.create_workspace(
-            'w2',
-            description='A great workspace',
-            save_now=True
+        recipe_workspace = admin_workspace_api.create_workspace(
+            'Recipes',
+            description='Our best recipes',
+            save_now=True,
         )
-        w3 = admin_workspace_api.create_workspace(
-            'w3',
-            description='Just another workspace',
-            save_now=True
+        other_workspace = bob_workspace_api.create_workspace(
+            'Others',
+            description='Other Workspace',
+            save_now=True,
         )
 
         # Workspaces roles
         role_api.create_one(
             user=bob,
-            workspace=w1,
+            workspace=recipe_workspace,
             role_level=UserRoleInWorkspace.CONTENT_MANAGER,
             with_notif=False,
         )
-
         # Folders
-        w1f1 = content_api.create(
+
+        tool_workspace = content_api.create(
             content_type=ContentType.Folder,
-            workspace=w1,
-            label='w1f1',
+            workspace=business_workspace,
+            label='Tools',
             do_save=True,
             do_notify=False,
         )
-        w1f2 = content_api.create(
+        menu_workspace = content_api.create(
             content_type=ContentType.Folder,
-            workspace=w1,
-            label='w1f2',
+            workspace=business_workspace,
+            label='Menus',
             do_save=True,
             do_notify=False,
         )
 
-        w2f1 = content_api.create(
+        dessert_folder = content_api.create(
             content_type=ContentType.Folder,
-            workspace=w2,
-            label='w2f1',
+            workspace=recipe_workspace,
+            label='Desserts',
             do_save=True,
             do_notify=False,
         )
-        w2f2 = content_api.create(
+        salads_folder = content_api.create(
             content_type=ContentType.Folder,
-            workspace=w2,
-            label='w2f2',
+            workspace=recipe_workspace,
+            label='Salads',
             do_save=True,
             do_notify=False,
         )
-
-        w3f1 = content_api.create(
+        other_folder = content_api.create(
             content_type=ContentType.Folder,
-            workspace=w3,
-            label='w3f3',
+            workspace=other_workspace,
+            label='Infos',
             do_save=True,
             do_notify=False,
         )
 
         # Pages, threads, ..
-        w1f1p1 = content_api.create(
+        tiramisu_page = content_api.create(
             content_type=ContentType.Page,
-            workspace=w1,
-            parent=w1f1,
-            label='w1f1p1',
+            workspace=recipe_workspace,
+            parent=dessert_folder,
+            label='Tiramisu Recipe',
             do_save=True,
             do_notify=False,
         )
-        w1f1t1 = content_api.create(
+        best_cake_thread = content_api.create(
             content_type=ContentType.Thread,
-            workspace=w1,
-            parent=w1f1,
-            label='w1f1t1',
+            workspace=recipe_workspace,
+            parent=dessert_folder,
+            label='Best Cakes ?',
             do_save=False,
             do_notify=False,
         )
-        w1f1t1.description = 'w1f1t1 description'
-        self._session.add(w1f1t1)
-        w1f1d1_txt = content_api.create(
+        best_cake_thread.description = 'What is the best cake ?'
+        self._session.add(best_cake_thread)
+        apple_pie_recipe = content_api.create(
             content_type=ContentType.File,
-            workspace=w1,
-            parent=w1f1,
-            label='w1f1d1',
+            workspace=recipe_workspace,
+            parent=dessert_folder,
+            label='Apple_Pie',
             do_save=False,
             do_notify=False,
         )
-        w1f1d1_txt.file_extension = '.txt'
-        w1f1d1_txt.depot_file = FileIntent(
-            b'w1f1d1 content',
-            'w1f1d1.txt',
+        apple_pie_recipe.file_extension = '.txt'
+        apple_pie_recipe.depot_file = FileIntent(
+            b'Apple pie Recipe',
+            'apple_Pie.txt',
             'text/plain',
         )
-        self._session.add(w1f1d1_txt)
-        w1f1d2_html = content_api.create(
+        self._session.add(apple_pie_recipe)
+        Brownie_recipe = content_api.create(
             content_type=ContentType.File,
-            workspace=w1,
-            parent=w1f1,
-            label='w1f1d2',
+            workspace=recipe_workspace,
+            parent=dessert_folder,
+            label='Brownie Recipe',
             do_save=False,
             do_notify=False,
         )
-        w1f1d2_html.file_extension = '.html'
-        w1f1d2_html.depot_file = FileIntent(
-            b'<p>w1f1d2 content</p>',
-            'w1f1d2.html',
+        Brownie_recipe.file_extension = '.html'
+        Brownie_recipe.depot_file = FileIntent(
+            b'<p>Brownie Recipe</p>',
+            'brownie_recipe.html',
             'text/html',
         )
-        self._session.add(w1f1d2_html)
-        w1f1f1 = content_api.create(
+        self._session.add(Brownie_recipe)
+        fruits_desserts_folder = content_api.create(
             content_type=ContentType.Folder,
-            workspace=w1,
-            label='w1f1f1',
-            parent=w1f1,
+            workspace=recipe_workspace,
+            label='Fruits Desserts',
+            parent=dessert_folder,
+            do_save=True,
+        )
+
+        menu_page = content_api.create(
+            content_type=ContentType.Page,
+            workspace=business_workspace,
+            parent=menu_workspace,
+            label='Current Menu',
+            do_save=True,
+        )
+
+        new_fruit_salad = content_api.create(
+            content_type=ContentType.Page,
+            workspace=recipe_workspace,
+            parent=fruits_desserts_folder,
+            label='New Fruit Salad',
+            do_save=True,
+        )
+        old_fruit_salad = content_api.create(
+            content_type=ContentType.Page,
+            workspace=recipe_workspace,
+            parent=fruits_desserts_folder,
+            label='Fruit Salad',
             do_save=True,
             do_notify=False,
         )
+        with new_revision(
+                session=self._session,
+                tm=transaction.manager,
+                content=old_fruit_salad,
+        ):
+            content_api.archive(old_fruit_salad)
+        content_api.save(old_fruit_salad)
 
-        w2f1p1 = content_api.create(
+        bad_fruit_salad = content_api.create(
             content_type=ContentType.Page,
-            workspace=w2,
-            parent=w2f1,
-            label='w2f1p1',
+            workspace=recipe_workspace,
+            parent=fruits_desserts_folder,
+            label='Bad Fruit Salad',
             do_save=True,
             do_notify=False,
         )
+        with new_revision(
+                session=self._session,
+                tm=transaction.manager,
+                content=bad_fruit_salad,
+        ):
+            content_api.delete(bad_fruit_salad)
+        content_api.save(bad_fruit_salad)
+
+        # File at the root for test
+        new_fruit_salad = content_api.create(
+            content_type=ContentType.Page,
+            workspace=other_workspace,
+            label='New Fruit Salad',
+            do_save=True,
+        )
+        old_fruit_salad = content_api.create(
+            content_type=ContentType.Page,
+            workspace=other_workspace,
+            label='Fruit Salad',
+            do_save=True,
+        )
+        with new_revision(
+                session=self._session,
+                tm=transaction.manager,
+                content=old_fruit_salad,
+        ):
+            content_api.archive(old_fruit_salad)
+        content_api.save(old_fruit_salad)
+
+        bad_fruit_salad = content_api.create(
+            content_type=ContentType.Page,
+            workspace=other_workspace,
+            label='Bad Fruit Salad',
+            do_save=True,
+        )
+        with new_revision(
+                session=self._session,
+                tm=transaction.manager,
+                content=bad_fruit_salad,
+        ):
+            content_api.delete(bad_fruit_salad)
+        content_api.save(bad_fruit_salad)
+
+
         self._session.flush()

tracim/lib/core/content.py

@@ -1,25 +1,17 @@
 # -*- coding: utf-8 -*-
 from contextlib import contextmanager
-
 import os
-
+import datetime
+import re
+import typing
 from operator import itemgetter
+from operator import not_
 
 import transaction
 from sqlalchemy import func
 from sqlalchemy.orm import Query
-
-__author__ = 'damien'
-
-import datetime
-import re
-import typing
-
-from tracim.lib.utils.translation import fake_translator as _
-
 from depot.manager import DepotManager
 from depot.io.utils import FileIntent
-
 import sqlalchemy
 from sqlalchemy.orm import aliased
 from sqlalchemy.orm import joinedload
@@ -29,6 +21,7 @@ from sqlalchemy import desc
 from sqlalchemy import distinct
 from sqlalchemy import or_
 from sqlalchemy.sql.elements import and_
+
 from tracim.lib.utils.utils import cmp_to_key
 from tracim.lib.core.notifications import NotifierFactory
 from tracim.exceptions import SameValueError
@@ -44,6 +37,11 @@ from tracim.models.data import NodeTreeItem
 from tracim.models.data import RevisionReadStatus
 from tracim.models.data import UserRoleInWorkspace
 from tracim.models.data import Workspace
+from tracim.lib.utils.translation import fake_translator as _
+from tracim.models.context_models import ContentInContext
+
+
+__author__ = 'damien'
 
 
 def compare_content_for_sorting_by_type_and_name(
@@ -103,6 +101,7 @@ class ContentApi(object):
         ContentType.Comment,
         ContentType.Thread,
         ContentType.Page,
+        ContentType.MarkdownPage,
     )
 
     def __init__(
@@ -113,6 +112,7 @@ class ContentApi(object):
             show_archived: bool = False,
             show_deleted: bool = False,
             show_temporary: bool = False,
+            show_active: bool = True,
             all_content_in_treeview: bool = True,
             force_show_all_types: bool = False,
             disable_user_workspaces_filter: bool = False,
@@ -124,6 +124,7 @@ class ContentApi(object):
         self._show_archived = show_archived
         self._show_deleted = show_deleted
         self._show_temporary = show_temporary
+        self._show_active = show_active
         self._show_all_type_of_contents_in_treeview = all_content_in_treeview
         self._force_show_all_types = force_show_all_types
         self._disable_user_workspaces_filter = disable_user_workspaces_filter
@@ -156,6 +157,9 @@ class ContentApi(object):
             self._show_deleted = previous_show_deleted
             self._show_temporary = previous_show_temporary
 
+    def get_content_in_context(self, content: Content):
+        return ContentInContext(content, self._session, self._config)
+
     def get_revision_join(self) -> sqlalchemy.sql.elements.BooleanClauseList:
         """
         Return the Content/ContentRevision query join condition
@@ -234,6 +238,11 @@ class ContentApi(object):
     def _base_query(self, workspace: Workspace=None) -> Query:
         result = self.__real_base_query(workspace)
 
+        if not self._show_active:
+            result = result.filter(or_(
+                Content.is_deleted==True,
+                Content.is_archived==True,
+            ))
         if not self._show_deleted:
             result = result.filter(Content.is_deleted==False)
 
@@ -686,8 +695,9 @@ class ContentApi(object):
 
         if parent_id:
             resultset = resultset.filter(Content.parent_id==parent_id)
-        if parent_id is False:
+        if parent_id == 0 or parent_id is False:
             resultset = resultset.filter(Content.parent_id == None)
+        # parent_id == None give all contents
 
         return resultset.all()
 

tracim/models/contents.py

@@ -0,0 +1,248 @@
+# -*- coding: utf-8 -*-
+import typing
+from enum import Enum
+
+from tracim.exceptions import ContentStatusNotExist, ContentTypeNotExist
+from tracim.models.applications import htmlpage, _file, thread, markdownpluspage
+
+
+####
+# Content Status
+
+
+class GlobalStatus(Enum):
+    OPEN = 'open'
+    CLOSED = 'closed'
+
+
+class NewContentStatus(object):
+    """
+    Future ContentStatus object class
+    """
+    def __init__(
+            self,
+            slug: str,
+            global_status: str,
+            label: str,
+            fa_icon: str,
+            hexcolor: str,
+    ):
+        self.slug = slug
+        self.global_status = global_status
+        self.label = label
+        self.fa_icon = fa_icon
+        self.hexcolor = hexcolor
+
+
+open_status = NewContentStatus(
+    slug='open',
+    global_status=GlobalStatus.OPEN.value,
+    label='Open',
+    fa_icon='fa-square-o',
+    hexcolor='#000FF',
+)
+
+closed_validated_status = NewContentStatus(
+    slug='closed-validated',
+    global_status=GlobalStatus.CLOSED.value,
+    label='Validated',
+    fa_icon='fa-check-square-o',
+    hexcolor='#000FF',
+)
+
+closed_unvalidated_status = NewContentStatus(
+    slug='closed-unvalidated',
+    global_status=GlobalStatus.CLOSED.value,
+    label='Cancelled',
+    fa_icon='fa-close',
+    hexcolor='#000FF',
+)
+
+closed_deprecated_status = NewContentStatus(
+    slug='closed-deprecated',
+    global_status=GlobalStatus.CLOSED.value,
+    label='Deprecated',
+    fa_icon='fa-warning',
+    hexcolor='#000FF',
+)
+
+
+CONTENT_DEFAULT_STATUS = [
+    open_status,
+    closed_validated_status,
+    closed_unvalidated_status,
+    closed_deprecated_status,
+]
+
+
+class ContentStatusLegacy(NewContentStatus):
+    """
+    Temporary remplacement object for Legacy ContentStatus Object
+    """
+    OPEN = open_status.slug
+    CLOSED_VALIDATED = closed_validated_status.slug
+    CLOSED_UNVALIDATED = closed_unvalidated_status.slug
+    CLOSED_DEPRECATED = closed_deprecated_status.slug
+
+    def __init__(self, slug: str):
+        for status in CONTENT_DEFAULT_STATUS:
+            if slug == status.slug:
+                super(ContentStatusLegacy, self).__init__(
+                    slug=status.slug,
+                    global_status=status.global_status,
+                    label=status.label,
+                    fa_icon=status.fa_icon,
+                    hexcolor=status.hexcolor,
+                )
+                return
+        raise ContentStatusNotExist()
+
+    @classmethod
+    def all(cls, type='') -> ['NewContentStatus']:
+        return CONTENT_DEFAULT_STATUS
+
+    @classmethod
+    def allowed_values(cls):
+        return [status.slug for status in CONTENT_DEFAULT_STATUS]
+
+
+####
+# ContentType
+
+
+class NewContentType(object):
+    """
+    Future ContentType object class
+    """
+    def __init__(
+            self,
+            slug: str,
+            fa_icon: str,
+            hexcolor: str,
+            label: str,
+            creation_label: str,
+            available_statuses: typing.List[NewContentStatus],
+
+    ):
+        self.slug = slug
+        self.fa_icon = fa_icon
+        self.hexcolor = hexcolor
+        self.label = label
+        self.creation_label = creation_label
+        self.available_statuses = available_statuses
+
+
+thread_type = NewContentType(
+    slug='thread',
+    fa_icon=thread.fa_icon,
+    hexcolor=thread.hexcolor,
+    label='Thread',
+    creation_label='Discuss about a topic',
+    available_statuses=CONTENT_DEFAULT_STATUS,
+)
+
+file_type = NewContentType(
+    slug='file',
+    fa_icon=_file.fa_icon,
+    hexcolor=_file.hexcolor,
+    label='File',
+    creation_label='Upload a file',
+    available_statuses=CONTENT_DEFAULT_STATUS,
+)
+
+markdownpluspage_type = NewContentType(
+    slug='markdownpage',
+    fa_icon=markdownpluspage.fa_icon,
+    hexcolor=markdownpluspage.hexcolor,
+    label='Rich Markdown File',
+    creation_label='Create a Markdown document',
+    available_statuses=CONTENT_DEFAULT_STATUS,
+)
+
+htmlpage_type = NewContentType(
+    slug='page',
+    fa_icon=htmlpage.fa_icon,
+    hexcolor=htmlpage.hexcolor,
+    label='Text Document',
+    creation_label='Write a document',
+    available_statuses=CONTENT_DEFAULT_STATUS,
+)
+
+# TODO - G.M - 31-05-2018 - Set Better folder params
+folder_type = NewContentType(
+    slug='folder',
+    fa_icon=thread.fa_icon,
+    hexcolor=thread.hexcolor,
+    label='Folder',
+    creation_label='Create collection of any documents',
+    available_statuses=CONTENT_DEFAULT_STATUS,
+)
+
+CONTENT_DEFAULT_TYPE = [
+    thread_type,
+    file_type,
+    markdownpluspage_type,
+    htmlpage_type,
+    folder_type,
+]
+
+
+class ContentTypeLegacy(NewContentType):
+    """
+    Temporary remplacement object for Legacy ContentType Object
+    """
+
+    # special type
+    Any = 'any'
+    Folder = 'folder'
+    Event = 'event'
+    Comment = 'comment'
+
+    File = file_type.slug
+    Thread = thread_type.slug
+    Page = htmlpage_type.slug
+    MarkdownPage = markdownpluspage_type.slug
+
+    def __init__(self, slug: str):
+        for content_type in CONTENT_DEFAULT_TYPE:
+            if slug == content_type.slug:
+                super(ContentTypeLegacy, self).__init__(
+                    slug=content_type.slug,
+                    fa_icon=content_type.fa_icon,
+                    hexcolor=content_type.hexcolor,
+                    label=content_type.label,
+                    creation_label=content_type.creation_label,
+                    available_statuses=content_type.available_statuses
+                )
+                return
+        raise ContentTypeNotExist()
+
+    @classmethod
+    def all(cls) -> typing.List[str]:
+        return cls.allowed_types()
+
+    @classmethod
+    def allowed_types(cls) -> typing.List[str]:
+        contents_types = [status.slug for status in CONTENT_DEFAULT_TYPE]
+        contents_types.extend([cls.Folder, cls.Event, cls.Comment])
+        return contents_types
+
+    @classmethod
+    def allowed_types_for_folding(cls):
+        # This method is used for showing only "main"
+        # types in the left-side treeview
+        contents_types = [status.slug for status in CONTENT_DEFAULT_TYPE]
+        contents_types.extend([cls.Folder])
+        return contents_types
+
+    # TODO - G.M - 30-05-2018 - This method don't do anything.
+    @classmethod
+    def sorted(cls, types: ['ContentType']) -> ['ContentType']:
+        return types
+
+    @property
+    def id(self):
+        return self.slug
+
+    def toDict(self):
+        raise NotImplementedError()

tracim/models/context_models.py

@@ -7,11 +7,20 @@ from sqlalchemy.orm import Session
 from tracim import CFG
 from tracim.models import User
 from tracim.models.auth import Profile
+from tracim.models.data import Content
 from tracim.models.data import Workspace, UserRoleInWorkspace
 from tracim.models.workspace_menu_entries import default_workspace_menu_entry
 from tracim.models.workspace_menu_entries import WorkspaceMenuEntry
 
 
+class MoveParams(object):
+    """
+    Json body params for move action
+    """
+    def __init__(self, new_parent_id: str):
+        self.new_parent_id = new_parent_id
+
+
 class LoginCredentials(object):
     """
     Login credentials model for login
@@ -22,6 +31,45 @@ class LoginCredentials(object):
         self.password = password
 
 
+class WorkspaceAndContentPath(object):
+    """
+    Paths params with workspace id and content_id
+    """
+    def __init__(self, workspace_id: int, content_id: int):
+        self.content_id = content_id
+        self.workspace_id = workspace_id
+
+
+class ContentFilter(object):
+    """
+    Content filter model
+    """
+    def __init__(
+            self,
+            parent_id: int = None,
+            show_archived: int = 0,
+            show_deleted: int = 0,
+            show_active: int = 1,
+    ):
+        self.parent_id = parent_id
+        self.show_archived = bool(show_archived)
+        self.show_deleted = bool(show_deleted)
+        self.show_active = bool(show_active)
+
+
+class ContentCreation(object):
+    """
+    Content creation model
+    """
+    def __init__(
+            self,
+            label: str,
+            content_type_slug: str,
+    ):
+        self.label = label
+        self.content_type_slug = content_type_slug
+
+
 class UserInContext(object):
     """
     Interface to get User data and User data related to context.
@@ -211,3 +259,67 @@ class UserRoleWorkspaceInContext(object):
             self.dbsession,
             self.config
         )
+
+
+class ContentInContext(object):
+    """
+    Interface to get Content data and Content data related to context.
+    """
+
+    def __init__(self, content: Content, dbsession: Session, config: CFG):
+        self.content = content
+        self.dbsession = dbsession
+        self.config = config
+
+    # Default
+
+    @property
+    def id(self) -> int:
+        return self.content.content_id
+
+    @property
+    def parent_id(self) -> int:
+        return self.content.parent_id
+
+    @property
+    def workspace_id(self) -> int:
+        return self.content.workspace_id
+
+    @property
+    def label(self) -> str:
+        return self.content.label
+
+    @property
+    def content_type_slug(self) -> str:
+        return self.content.type
+
+    @property
+    def sub_content_type_slug(self) -> typing.List[str]:
+        return [type.slug for type in self.content.get_allowed_content_types()]
+
+    @property
+    def status_slug(self) -> str:
+        return self.content.status
+
+    @property
+    def is_archived(self):
+        return self.content.is_archived
+
+    @property
+    def is_deleted(self):
+        return self.content.is_deleted
+
+    # Context-related
+
+    @property
+    def show_in_ui(self):
+        # TODO - G.M - 31-05-2018 - Enable Show_in_ui params
+        # if false, then do not show content in the treeview.
+        # This may his maybe used for specific contents or for sub-contents.
+        # Default is True.
+        # In first version of the API, this field is always True
+        return True
+
+    @property
+    def slug(self):
+        return slugify(self.content.label)

tracim/models/data.py

@@ -292,250 +292,254 @@ class ActionDescription(object):
                 ]
 
 
-class ContentStatus(object):
-    """
-    Allowed status are:
-    - open
-    - closed-validated
-    - closed-invalidated
-    - closed-deprecated
-    """
-
-    OPEN = 'open'
-    CLOSED_VALIDATED = 'closed-validated'
-    CLOSED_UNVALIDATED = 'closed-unvalidated'
-    CLOSED_DEPRECATED = 'closed-deprecated'
-
-    # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-    # _LABELS = {'open': l_('work in progress'),
-    #            'closed-validated': l_('closed — validated'),
-    #            'closed-unvalidated': l_('closed — cancelled'),
-    #            'closed-deprecated': l_('deprecated')}
-    #
-    # _LABELS_THREAD = {'open': l_('subject in progress'),
-    #                   'closed-validated': l_('subject closed — resolved'),
-    #                   'closed-unvalidated': l_('subject closed — cancelled'),
-    #                   'closed-deprecated': l_('deprecated')}
-    #
-    # _LABELS_FILE = {'open': l_('work in progress'),
-    #                 'closed-validated': l_('closed — validated'),
-    #                 'closed-unvalidated': l_('closed — cancelled'),
-    #                 'closed-deprecated': l_('deprecated')}
-    #
-    # _ICONS = {
-    #     'open': 'fa fa-square-o',
-    #     'closed-validated': 'fa fa-check-square-o',
-    #     'closed-unvalidated': 'fa fa-close',
-    #     'closed-deprecated': 'fa fa-warning',
-    # }
-    #
-    # _CSS = {
-    #     'open': 'tracim-status-open',
-    #     'closed-validated': 'tracim-status-closed-validated',
-    #     'closed-unvalidated': 'tracim-status-closed-unvalidated',
-    #     'closed-deprecated': 'tracim-status-closed-deprecated',
-    # }
-
-    def __init__(self,
-                 id,
-                 # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-                 # type=''
-    ):
-        self.id = id
-        self.label = self.id
-        # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-        # self.fa_icon = ContentStatus._ICONS[id]
-        # self.css = ContentStatus._CSS[id]
-        #
-        # if type==ContentType.Thread:
-        #     self.label = ContentStatus._LABELS_THREAD[id]
-        # elif type==ContentType.File:
-        #     self.label = ContentStatus._LABELS_FILE[id]
-        # else:
-        #     self.label = ContentStatus._LABELS[id]
-
-
-    @classmethod
-    def all(cls, type='') -> ['ContentStatus']:
-        # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-        # all = []
-        # all.append(ContentStatus('open', type))
-        # all.append(ContentStatus('closed-validated', type))
-        # all.append(ContentStatus('closed-unvalidated', type))
-        # all.append(ContentStatus('closed-deprecated', type))
-        # return all
-        status_list = list()
-        for elem in cls.allowed_values():
-            status_list.append(ContentStatus(elem))
-        return status_list
-
-    @classmethod
-    def allowed_values(cls):
-        # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-        # return ContentStatus._LABELS.keys()
-        return [
-            ContentStatus.OPEN,
-            ContentStatus.CLOSED_UNVALIDATED,
-            ContentStatus.CLOSED_VALIDATED,
-            ContentStatus.CLOSED_DEPRECATED
-        ]
-
-
-class ContentType(object):
-    Any = 'any'
-
-    Folder = 'folder'
-    File = 'file'
-    Comment = 'comment'
-    Thread = 'thread'
-    Page = 'page'
-    Event = 'event'
-
-    # TODO - G.M - 10-04-2018 - [Cleanup] Do we really need this ?
-    # _STRING_LIST_SEPARATOR = ','
-
-    # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-    # _ICONS = {  # Deprecated
-    #     'dashboard': 'fa-home',
-    #     'workspace': 'fa-bank',
-    #     'folder': 'fa fa-folder-open-o',
-    #     'file': 'fa fa-paperclip',
-    #     'page': 'fa fa-file-text-o',
-    #     'thread': 'fa fa-comments-o',
-    #     'comment': 'fa fa-comment-o',
-    #     'event': 'fa fa-calendar-o',
-    # }
-    #
-    # _CSS_ICONS = {
-    #     'dashboard': 'fa fa-home',
-    #     'workspace': 'fa fa-bank',
-    #     'folder': 'fa fa-folder-open-o',
-    #     'file': 'fa fa-paperclip',
-    #     'page': 'fa fa-file-text-o',
-    #     'thread': 'fa fa-comments-o',
-    #     'comment': 'fa fa-comment-o',
-    #     'event': 'fa fa-calendar-o',
-    # }
-    #
-    # _CSS_COLORS = {
-    #     'dashboard': 't-dashboard-color',
-    #     'workspace': 't-less-visible',
-    #     'folder': 't-folder-color',
-    #     'file': 't-file-color',
-    #     'page': 't-page-color',
-    #     'thread': 't-thread-color',
-    #     'comment': 't-thread-color',
-    #     'event': 't-event-color',
-    # }
-
-    _ORDER_WEIGHT = {
-        'folder': 0,
-        'page': 1,
-        'thread': 2,
-        'file': 3,
-        'comment': 4,
-        'event': 5,
-    }
-
-    # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-    # _LABEL = {
-    #     'dashboard': '',
-    #     'workspace': l_('workspace'),
-    #     'folder': l_('folder'),
-    #     'file': l_('file'),
-    #     'page': l_('page'),
-    #     'thread': l_('thread'),
-    #     'comment': l_('comment'),
-    #     'event': l_('event'),
-    # }
-    #
-    # _DELETE_LABEL = {
-    #     'dashboard': '',
-    #     'workspace': l_('Delete this workspace'),
-    #     'folder': l_('Delete this folder'),
-    #     'file': l_('Delete this file'),
-    #     'page': l_('Delete this page'),
-    #     'thread': l_('Delete this thread'),
-    #     'comment': l_('Delete this comment'),
-    #     'event': l_('Delete this event'),
-    # }
-    #
-    # @classmethod
-    # def get_icon(cls, type: str):
-    #     assert(type in ContentType._ICONS) # DYN_REMOVE
-    #     return ContentType._ICONS[type]
-
-    @classmethod
-    def all(cls):
-        return cls.allowed_types()
-
-    @classmethod
-    def allowed_types(cls):
-        return [cls.Folder, cls.File, cls.Comment, cls.Thread, cls.Page,
-                cls.Event]
-
-    @classmethod
-    def allowed_types_for_folding(cls):
-        # This method is used for showing only "main"
-        # types in the left-side treeview
-        return [cls.Folder, cls.File, cls.Thread, cls.Page]
-
-    # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-    # @classmethod
-    # def allowed_types_from_str(cls, allowed_types_as_string: str):
-    #     allowed_types = []
-    #     # HACK - THIS
-    #     for item in allowed_types_as_string.split(ContentType._STRING_LIST_SEPARATOR):
-    #         if item and item in ContentType.allowed_types_for_folding():
-    #             allowed_types.append(item)
-    #     return allowed_types
-    #
-    # @classmethod
-    # def fill_url(cls, content: 'Content'):
-    #     # TODO - DYNDATATYPE - D.A. - 2014-12-02
-    #     # Make this code dynamic loading data types
-    #
-    #     if content.type==ContentType.Folder:
-    #         return '/workspaces/{}/folders/{}'.format(content.workspace_id, content.content_id)
-    #     elif content.type==ContentType.File:
-    #         return '/workspaces/{}/folders/{}/files/{}'.format(content.workspace_id, content.parent_id, content.content_id)
-    #     elif content.type==ContentType.Thread:
-    #         return '/workspaces/{}/folders/{}/threads/{}'.format(content.workspace_id, content.parent_id, content.content_id)
-    #     elif content.type==ContentType.Page:
-    #         return '/workspaces/{}/folders/{}/pages/{}'.format(content.workspace_id, content.parent_id, content.content_id)
-    #
-    # @classmethod
-    # def fill_url_for_workspace(cls, workspace: Workspace):
-    #     # TODO - DYNDATATYPE - D.A. - 2014-12-02
-    #     # Make this code dynamic loading data types
-    #     return '/workspaces/{}'.format(workspace.workspace_id)
-
-    @classmethod
-    def sorted(cls, types: ['ContentType']) -> ['ContentType']:
-        return sorted(types, key=lambda content_type: content_type.priority)
-
-    @property
-    def type(self):
-        return self.id
-
-    def __init__(self, type):
-        self.id = type
-        # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-        # self.fa_icon = ContentType._CSS_ICONS[type]
-        # self.color = ContentType._CSS_COLORS[type]  # deprecated
-        # self.css = ContentType._CSS_COLORS[type]
-        # self.label = ContentType._LABEL[type]
-        self.priority = ContentType._ORDER_WEIGHT[type]
-
-    def toDict(self):
-        return dict(id=self.type,
-                    type=self.type,
-                    # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-                    # fa_icon=self.fa_icon,
-                    # color=self.color,
-                    # label=self.label,
-                    priority=self.priority)
-
+from tracim.models.contents import ContentStatusLegacy as ContentStatus
+from tracim.models.contents import ContentTypeLegacy as ContentType
+# TODO - G.M - 30-05-2018 - Drop this old code when whe are sure nothing
+# is lost .
+
+
+# class ContentStatus(object):
+#     """
+#     Allowed status are:
+#     - open
+#     - closed-validated
+#     - closed-invalidated
+#     - closed-deprecated
+#     """
+#
+#     OPEN = 'open'
+#     CLOSED_VALIDATED = 'closed-validated'
+#     CLOSED_UNVALIDATED = 'closed-unvalidated'
+#     CLOSED_DEPRECATED = 'closed-deprecated'
+#
+#     # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
+#     # _LABELS = {'open': l_('work in progress'),
+#     #            'closed-validated': l_('closed — validated'),
+#     #            'closed-unvalidated': l_('closed — cancelled'),
+#     #            'closed-deprecated': l_('deprecated')}
+#     #
+#     # _LABELS_THREAD = {'open': l_('subject in progress'),
+#     #                   'closed-validated': l_('subject closed — resolved'),
+#     #                   'closed-unvalidated': l_('subject closed — cancelled'),
+#     #                   'closed-deprecated': l_('deprecated')}
+#     #
+#     # _LABELS_FILE = {'open': l_('work in progress'),
+#     #                 'closed-validated': l_('closed — validated'),
+#     #                 'closed-unvalidated': l_('closed — cancelled'),
+#     #                 'closed-deprecated': l_('deprecated')}
+#     #
+#     # _ICONS = {
+#     #     'open': 'fa fa-square-o',
+#     #     'closed-validated': 'fa fa-check-square-o',
+#     #     'closed-unvalidated': 'fa fa-close',
+#     #     'closed-deprecated': 'fa fa-warning',
+#     # }
+#     #
+#     # _CSS = {
+#     #     'open': 'tracim-status-open',
+#     #     'closed-validated': 'tracim-status-closed-validated',
+#     #     'closed-unvalidated': 'tracim-status-closed-unvalidated',
+#     #     'closed-deprecated': 'tracim-status-closed-deprecated',
+#     # }
+#
+#     def __init__(self,
+#                  id,
+#                  # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
+#                  # type=''
+#     ):
+#         self.id = id
+#         # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
+#         # self.icon = ContentStatus._ICONS[id]
+#         # self.css = ContentStatus._CSS[id]
+#         #
+#         # if type==ContentType.Thread:
+#         #     self.label = ContentStatus._LABELS_THREAD[id]
+#         # elif type==ContentType.File:
+#         #     self.label = ContentStatus._LABELS_FILE[id]
+#         # else:
+#         #     self.label = ContentStatus._LABELS[id]
+#
+#
+#     @classmethod
+#     def all(cls, type='') -> ['ContentStatus']:
+#         # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
+#         # all = []
+#         # all.append(ContentStatus('open', type))
+#         # all.append(ContentStatus('closed-validated', type))
+#         # all.append(ContentStatus('closed-unvalidated', type))
+#         # all.append(ContentStatus('closed-deprecated', type))
+#         # return all
+#         status_list = list()
+#         for elem in cls.allowed_values():
+#             status_list.append(ContentStatus(elem))
+#         return status_list
+#
+#     @classmethod
+#     def allowed_values(cls):
+#         # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
+#         # return ContentStatus._LABELS.keys()
+#         return [
+#             ContentStatus.OPEN,
+#             ContentStatus.CLOSED_UNVALIDATED,
+#             ContentStatus.CLOSED_VALIDATED,
+#             ContentStatus.CLOSED_DEPRECATED
+#         ]
+
+
+# class ContentType(object):
+#     Any = 'any'
+#
+#     Folder = 'folder'
+#     File = 'file'
+#     Comment = 'comment'
+#     Thread = 'thread'
+#     Page = 'page'
+#     Event = 'event'
+#
+#     # TODO - G.M - 10-04-2018 - [Cleanup] Do we really need this ?
+#     # _STRING_LIST_SEPARATOR = ','
+#
+#     # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
+#     # _ICONS = {  # Deprecated
+#     #     'dashboard': 'fa-home',
+#     #     'workspace': 'fa-bank',
+#     #     'folder': 'fa fa-folder-open-o',
+#     #     'file': 'fa fa-paperclip',
+#     #     'page': 'fa fa-file-text-o',
+#     #     'thread': 'fa fa-comments-o',
+#     #     'comment': 'fa fa-comment-o',
+#     #     'event': 'fa fa-calendar-o',
+#     # }
+#     #
+#     # _CSS_ICONS = {
+#     #     'dashboard': 'fa fa-home',
+#     #     'workspace': 'fa fa-bank',
+#     #     'folder': 'fa fa-folder-open-o',
+#     #     'file': 'fa fa-paperclip',
+#     #     'page': 'fa fa-file-text-o',
+#     #     'thread': 'fa fa-comments-o',
+#     #     'comment': 'fa fa-comment-o',
+#     #     'event': 'fa fa-calendar-o',
+#     # }
+#     #
+#     # _CSS_COLORS = {
+#     #     'dashboard': 't-dashboard-color',
+#     #     'workspace': 't-less-visible',
+#     #     'folder': 't-folder-color',
+#     #     'file': 't-file-color',
+#     #     'page': 't-page-color',
+#     #     'thread': 't-thread-color',
+#     #     'comment': 't-thread-color',
+#     #     'event': 't-event-color',
+#     # }
+#
+#     _ORDER_WEIGHT = {
+#         'folder': 0,
+#         'page': 1,
+#         'thread': 2,
+#         'file': 3,
+#         'comment': 4,
+#         'event': 5,
+#     }
+#
+#     # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
+#     # _LABEL = {
+#     #     'dashboard': '',
+#     #     'workspace': l_('workspace'),
+#     #     'folder': l_('folder'),
+#     #     'file': l_('file'),
+#     #     'page': l_('page'),
+#     #     'thread': l_('thread'),
+#     #     'comment': l_('comment'),
+#     #     'event': l_('event'),
+#     # }
+#     #
+#     # _DELETE_LABEL = {
+#     #     'dashboard': '',
+#     #     'workspace': l_('Delete this workspace'),
+#     #     'folder': l_('Delete this folder'),
+#     #     'file': l_('Delete this file'),
+#     #     'page': l_('Delete this page'),
+#     #     'thread': l_('Delete this thread'),
+#     #     'comment': l_('Delete this comment'),
+#     #     'event': l_('Delete this event'),
+#     # }
+#     #
+#     # @classmethod
+#     # def get_icon(cls, type: str):
+#     #     assert(type in ContentType._ICONS) # DYN_REMOVE
+#     #     return ContentType._ICONS[type]
+#
+#     @classmethod
+#     def all(cls):
+#         return cls.allowed_types()
+#
+#     @classmethod
+#     def allowed_types(cls):
+#         return [cls.Folder, cls.File, cls.Comment, cls.Thread, cls.Page,
+#                 cls.Event]
+#
+#     @classmethod
+#     def allowed_types_for_folding(cls):
+#         # This method is used for showing only "main"
+#         # types in the left-side treeview
+#         return [cls.Folder, cls.File, cls.Thread, cls.Page]
+#
+#     # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
+#     # @classmethod
+#     # def allowed_types_from_str(cls, allowed_types_as_string: str):
+#     #     allowed_types = []
+#     #     # HACK - THIS
+#     #     for item in allowed_types_as_string.split(ContentType._STRING_LIST_SEPARATOR):
+#     #         if item and item in ContentType.allowed_types_for_folding():
+#     #             allowed_types.append(item)
+#     #     return allowed_types
+#     #
+#     # @classmethod
+#     # def fill_url(cls, content: 'Content'):
+#     #     # TODO - DYNDATATYPE - D.A. - 2014-12-02
+#     #     # Make this code dynamic loading data types
+#     #
+#     #     if content.type==ContentType.Folder:
+#     #         return '/workspaces/{}/folders/{}'.format(content.workspace_id, content.content_id)
+#     #     elif content.type==ContentType.File:
+#     #         return '/workspaces/{}/folders/{}/files/{}'.format(content.workspace_id, content.parent_id, content.content_id)
+#     #     elif content.type==ContentType.Thread:
+#     #         return '/workspaces/{}/folders/{}/threads/{}'.format(content.workspace_id, content.parent_id, content.content_id)
+#     #     elif content.type==ContentType.Page:
+#     #         return '/workspaces/{}/folders/{}/pages/{}'.format(content.workspace_id, content.parent_id, content.content_id)
+#     #
+#     # @classmethod
+#     # def fill_url_for_workspace(cls, workspace: Workspace):
+#     #     # TODO - DYNDATATYPE - D.A. - 2014-12-02
+#     #     # Make this code dynamic loading data types
+#     #     return '/workspaces/{}'.format(workspace.workspace_id)
+#
+#     @classmethod
+#     def sorted(cls, types: ['ContentType']) -> ['ContentType']:
+#         return sorted(types, key=lambda content_type: content_type.priority)
+#
+#     @property
+#     def type(self):
+#         return self.id
+#
+#     def __init__(self, type):
+#         self.id = type
+#         # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
+#         # self.icon = ContentType._CSS_ICONS[type]
+#         # self.color = ContentType._CSS_COLORS[type]  # deprecated
+#         # self.css = ContentType._CSS_COLORS[type]
+#         # self.label = ContentType._LABEL[type]
+#         self.priority = ContentType._ORDER_WEIGHT[type]
+#
+#     def toDict(self):
+#         return dict(id=self.type,
+#                     type=self.type,
+#                     # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
+#                     # icon=self.icon,
+#                     # color=self.color,
+#                     # label=self.label,
+#                     priority=self.priority)
 
 class ContentChecker(object):
 
@@ -1147,6 +1151,10 @@ class Content(DeclarativeBase):
         return not self.is_archived and not self.is_deleted
 
     @property
+    def is_active(self) -> bool:
+        return self.is_editable
+
+    @property
     def depot_file(self) -> UploadedFile:
         return self.revision.depot_file
 

tracim/tests/functional/test_mail_notification.py

@@ -129,7 +129,7 @@ class TestNotificationsSync(MailHogTest):
             session=self.session,
             config=self.app_config,
         )
-        workspace = wapi.get_one_by_label('w1')
+        workspace = wapi.get_one_by_label('Recipes')
         user = uapi.get_one_by_email('bob@fsf.local')
         wapi.enable_notifications(user, workspace)
 
@@ -161,9 +161,9 @@ class TestNotificationsSync(MailHogTest):
         headers = response[0]['Content']['Headers']
         assert headers['From'][0] == '"Bob i. via Tracim" <test_user_from+3@localhost>'  # nopep8
         assert headers['To'][0] == 'Global manager <admin@admin.admin>'
-        assert headers['Subject'][0] == '[TRACIM] [w1] file1 (open)'
-        assert headers['References'][0] == 'test_user_refs+13@localhost'
-        assert headers['Reply-to'][0] == '"Bob i. & all members of w1" <test_user_reply+13@localhost>'  # nopep8
+        assert headers['Subject'][0] == '[TRACIM] [Recipes] file1 (Open)'
+        assert headers['References'][0] == 'test_user_refs+19@localhost'
+        assert headers['Reply-to'][0] == '"Bob i. & all members of Recipes" <test_user_reply+19@localhost>'  # nopep8
 
 
 class TestNotificationsAsync(MailHogTest):
@@ -221,7 +221,7 @@ class TestNotificationsAsync(MailHogTest):
             session=self.session,
             config=self.app_config,
         )
-        workspace = wapi.get_one_by_label('w1')
+        workspace = wapi.get_one_by_label('Recipes')
         user = uapi.get_one_by_email('bob@fsf.local')
         wapi.enable_notifications(user, workspace)
 
@@ -262,6 +262,6 @@ class TestNotificationsAsync(MailHogTest):
         headers = response[0]['Content']['Headers']
         assert headers['From'][0] == '"Bob i. via Tracim" <test_user_from+3@localhost>'  # nopep8
         assert headers['To'][0] == 'Global manager <admin@admin.admin>'
-        assert headers['Subject'][0] == '[TRACIM] [w1] file1 (open)'
-        assert headers['References'][0] == 'test_user_refs+13@localhost'
-        assert headers['Reply-to'][0] == '"Bob i. & all members of w1" <test_user_reply+13@localhost>'  # nopep8
+        assert headers['Subject'][0] == '[TRACIM] [Recipes] file1 (Open)'
+        assert headers['References'][0] == 'test_user_refs+19@localhost'
+        assert headers['Reply-to'][0] == '"Bob i. & all members of Recipes" <test_user_reply+19@localhost>'  # nopep8

tracim/tests/functional/test_system.py

@@ -59,7 +59,7 @@ class TestApplicationEndpoint(FunctionalTest):
         assert application['is_active'] is True
         assert 'config' in application
 
-    def test_api__get_workspace__err_401__unregistered_user(self):
+    def test_api__get_applications__err_401__unregistered_user(self):
         """
         Get applications list with an unregistered user (bad auth)
         """
@@ -75,3 +75,78 @@ class TestApplicationEndpoint(FunctionalTest):
         assert 'code' in res.json.keys()
         assert 'message' in res.json.keys()
         assert 'details' in res.json.keys()
+
+
+class TestContentsTypesEndpoint(FunctionalTest):
+    """
+    Tests for /api/v2/system/content_types
+    """
+
+    def test_api__get_content_types__ok_200__nominal_case(self):
+        """
+        Get system content_types list with a registered user.
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get('/api/v2/system/content_types', status=200)
+        res = res.json_body
+
+        content_type = res[0]
+        assert content_type['slug'] == 'thread'
+        assert content_type['fa_icon'] == 'comments-o'
+        assert content_type['hexcolor'] == '#ad4cf9'
+        assert content_type['label'] == 'Thread'
+        assert content_type['creation_label'] == 'Discuss about a topic'
+        assert 'available_statuses' in content_type
+        assert len(content_type['available_statuses']) == 4
+
+        content_type = res[1]
+        assert content_type['slug'] == 'file'
+        assert content_type['fa_icon'] == 'paperclip'
+        assert content_type['hexcolor'] == '#FF9900'
+        assert content_type['label'] == 'File'
+        assert content_type['creation_label'] == 'Upload a file'
+        assert 'available_statuses' in content_type
+        assert len(content_type['available_statuses']) == 4
+
+        content_type = res[2]
+        assert content_type['slug'] == 'markdownpage'
+        assert content_type['fa_icon'] == 'file-code'
+        assert content_type['hexcolor'] == '#f12d2d'
+        assert content_type['label'] == 'Rich Markdown File'
+        assert content_type['creation_label'] == 'Create a Markdown document'
+        assert 'available_statuses' in content_type
+        assert len(content_type['available_statuses']) == 4
+
+        content_type = res[3]
+        assert content_type['slug'] == 'page'
+        assert content_type['fa_icon'] == 'file-text-o'
+        assert content_type['hexcolor'] == '#3f52e3'
+        assert content_type['label'] == 'Text Document'
+        assert content_type['creation_label'] == 'Write a document'
+        assert 'available_statuses' in content_type
+        assert len(content_type['available_statuses']) == 4
+        # TODO - G.M - 31-05-2018 - Check Folder type
+        # TODO - G.M - 29-05-2018 - Better check for available_statuses
+
+    def test_api__get_content_types__err_401__unregistered_user(self):
+        """
+        Get system content_types list with an unregistered user (bad auth)
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'john@doe.doe',
+                'lapin'
+            )
+        )
+        res = self.testapp.get('/api/v2/system/content_types', status=401)
+        assert isinstance(res.json, dict)
+        assert 'code' in res.json.keys()
+        assert 'message' in res.json.keys()
+        assert 'details' in res.json.keys()

tracim/tests/functional/test_user.py

@@ -29,7 +29,7 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         res = res.json_body
         workspace = res[0]
         assert workspace['id'] == 1
-        assert workspace['label'] == 'w1'
+        assert workspace['label'] == 'Business'
         assert len(workspace['sidebar_entries']) == 7
 
         sidebar_entry = workspace['sidebar_entries'][0]

tracim/tests/functional/test_workspaces.py

@@ -28,9 +28,9 @@ class TestWorkspaceEndpoint(FunctionalTest):
         res = self.testapp.get('/api/v2/workspaces/1', status=200)
         workspace = res.json_body
         assert workspace['id'] == 1
-        assert workspace['slug'] == 'w1'
-        assert workspace['label'] == 'w1'
-        assert workspace['description'] == 'This is a workspace'
+        assert workspace['slug'] == 'business'
+        assert workspace['label'] == 'Business'
+        assert workspace['description'] == 'All importants documents'
         assert len(workspace['sidebar_entries']) == 7
 
         sidebar_entry = workspace['sidebar_entries'][0]
@@ -153,7 +153,7 @@ class TestWorkspaceMembersEndpoint(FunctionalTest):
             )
         )
         res = self.testapp.get('/api/v2/workspaces/1/members', status=200).json_body   # nopep8
-        assert len(res) == 2
+        assert len(res) == 1
         user_role = res[0]
         assert user_role['role_slug'] == 'workspace-manager'
         assert user_role['user_id'] == 1
@@ -215,3 +215,751 @@ class TestWorkspaceMembersEndpoint(FunctionalTest):
         assert 'code' in res.json.keys()
         assert 'message' in res.json.keys()
         assert 'details' in res.json.keys()
+
+
+class TestWorkspaceContents(FunctionalTest):
+    """
+    Tests for /api/v2/workspaces/{workspace_id}/contents endpoint
+    """
+
+    fixtures = [BaseFixture, ContentFixtures]
+
+    def test_api__get_workspace_content__ok_200__get_default(self):
+        """
+        Check obtain workspace contents with defaults filters
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get('/api/v2/workspaces/1/contents', status=200).json_body   # nopep8
+        # TODO - G.M - 30-05-2018 - Check this test
+        assert len(res) == 3
+        content = res[0]
+        assert content['id'] == 1
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'Tools'
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'tools'
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 1
+        content = res[1]
+        assert content['id'] == 2
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'Menus'
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'menus'
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 1
+        content = res[2]
+        assert content['id'] == 11
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'Current Menu'
+        assert content['parent_id'] == 2
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'current-menu'
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 1
+
+    # Root related
+
+    def test_api__get_workspace_content__ok_200__get_all_root_content(self):
+        """
+        Check obtain workspace all root contents
+        """
+        params = {
+            'parent_id': 0,
+            'show_archived': 1,
+            'show_deleted': 1,
+            'show_active': 1,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'bob@fsf.local',
+                'foobarbaz'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/3/contents',
+            status=200,
+            params=params,
+        ).json_body  # nopep8
+        # TODO - G.M - 30-05-2018 - Check this test
+        assert len(res) == 4
+        content = res[1]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 15
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'New Fruit Salad'
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'new-fruit-salad'
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 3
+
+        content = res[2]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 16
+        assert content['is_archived'] is True
+        assert content['is_deleted'] is False
+        assert content['label'].startswith('Fruit Salad')
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'].startswith('fruit-salad')
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 3
+
+        content = res[3]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 17
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is True
+        assert content['label'].startswith('Bad Fruit Salad')
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'].startswith('bad-fruit-salad')
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 3
+
+    def test_api__get_workspace_content__ok_200__get_only_active_root_content(self):  # nopep8
+        """
+        Check obtain workspace root active contents
+        """
+        params = {
+            'parent_id': 0,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'bob@fsf.local',
+                'foobarbaz'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/3/contents',
+            status=200,
+            params=params,
+        ).json_body   # nopep8
+        # TODO - G.M - 30-05-2018 - Check this test
+        assert len(res) == 2
+        content = res[1]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 15
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'New Fruit Salad'
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'new-fruit-salad'
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 3
+
+    def test_api__get_workspace_content__ok_200__get_only_archived_root_content(self):  # nopep8
+        """
+        Check obtain workspace root archived contents
+        """
+        params = {
+            'parent_id': 0,
+            'show_archived': 1,
+            'show_deleted': 0,
+            'show_active': 0,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'bob@fsf.local',
+                'foobarbaz'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/3/contents',
+            status=200,
+            params=params,
+        ).json_body   # nopep8
+        assert len(res) == 1
+        content = res[0]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 16
+        assert content['is_archived'] is True
+        assert content['is_deleted'] is False
+        assert content['label'].startswith('Fruit Salad')
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'].startswith('fruit-salad')
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 3
+
+    def test_api__get_workspace_content__ok_200__get_only_deleted_root_content(self):  # nopep8
+        """
+         Check obtain workspace root deleted contents
+         """
+        params = {
+            'parent_id': 0,
+            'show_archived': 0,
+            'show_deleted': 1,
+            'show_active': 0,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'bob@fsf.local',
+                'foobarbaz'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/3/contents',
+            status=200,
+            params=params,
+        ).json_body   # nopep8
+        # TODO - G.M - 30-05-2018 - Check this test
+
+        assert len(res) == 1
+        content = res[0]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 17
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is True
+        assert content['label'].startswith('Bad Fruit Salad')
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'].startswith('bad-fruit-salad')
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 3
+
+    def test_api__get_workspace_content__ok_200__get_nothing_root_content(self):
+        """
+        Check obtain workspace root content who does not match any type
+        (archived, deleted, active) result should be empty list.
+        """
+        params = {
+            'parent_id': 0,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 0,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'bob@fsf.local',
+                'foobarbaz'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/3/contents',
+            status=200,
+            params=params,
+        ).json_body  # nopep8
+        # TODO - G.M - 30-05-2018 - Check this test
+        assert res == []
+
+    # Folder related
+
+    def test_api__get_workspace_content__ok_200__get_all_folder_content(self):
+        """
+         Check obtain workspace folder all contents
+         """
+        params = {
+            'parent_id': 10,  # TODO - G.M - 30-05-2018 - Find a real id
+            'show_archived': 1,
+            'show_deleted': 1,
+            'show_active': 1,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/2/contents',
+            status=200,
+            params=params,
+        ).json_body   # nopep8
+        assert len(res) == 3
+        content = res[0]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 12
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'New Fruit Salad'
+        assert content['parent_id'] == 10
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'new-fruit-salad'
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 2
+
+        content = res[1]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 13
+        assert content['is_archived'] is True
+        assert content['is_deleted'] is False
+        assert content['label'].startswith('Fruit Salad')
+        assert content['parent_id'] == 10
+        assert content['show_in_ui'] is True
+        assert content['slug'].startswith('fruit-salad')
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 2
+
+        content = res[2]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 14
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is True
+        assert content['label'].startswith('Bad Fruit Salad')
+        assert content['parent_id'] == 10
+        assert content['show_in_ui'] is True
+        assert content['slug'].startswith('bad-fruit-salad')
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 2
+
+    def test_api__get_workspace_content__ok_200__get_only_active_folder_content(self):  # nopep8
+        """
+         Check obtain workspace folder active contents
+         """
+        params = {
+            'parent_id': 10,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/2/contents',
+            status=200,
+            params=params,
+        ).json_body   # nopep8
+        assert len(res) == 1
+        content = res[0]
+        assert content['content_type_slug']
+        assert content['id'] == 12
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'New Fruit Salad'
+        assert content['parent_id'] == 10
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'new-fruit-salad'
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 2
+
+    def test_api__get_workspace_content__ok_200__get_only_archived_folder_content(self):  # nopep8
+        """
+         Check obtain workspace folder archived contents
+         """
+        params = {
+            'parent_id': 10,
+            'show_archived': 1,
+            'show_deleted': 0,
+            'show_active': 0,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/2/contents',
+            status=200,
+            params=params,
+        ).json_body   # nopep8
+        assert len(res) == 1
+        content = res[0]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 13
+        assert content['is_archived'] is True
+        assert content['is_deleted'] is False
+        assert content['label'].startswith('Fruit Salad')
+        assert content['parent_id'] == 10
+        assert content['show_in_ui'] is True
+        assert content['slug'].startswith('fruit-salad')
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 2
+
+    def test_api__get_workspace_content__ok_200__get_only_deleted_folder_content(self):  # nopep8
+        """
+         Check obtain workspace folder deleted contents
+         """
+        params = {
+            'parent_id': 10,
+            'show_archived': 0,
+            'show_deleted': 1,
+            'show_active': 0,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/2/contents',
+            status=200,
+            params=params,
+        ).json_body   # nopep8
+
+        assert len(res) == 1
+        content = res[0]
+        assert content['content_type_slug'] == 'page'
+        assert content['id'] == 14
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is True
+        assert content['label'].startswith('Bad Fruit Salad')
+        assert content['parent_id'] == 10
+        assert content['show_in_ui'] is True
+        assert content['slug'].startswith('bad-fruit-salad')
+        assert content['status_slug'] == 'open'
+        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert content['workspace_id'] == 2
+
+    def test_api__get_workspace_content__ok_200__get_nothing_folder_content(self):  # nopep8
+        """
+        Check obtain workspace folder content who does not match any type
+        (archived, deleted, active) result should be empty list.
+        """
+        params = {
+            'parent_id': 10,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 0,
+        }
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/2/contents',
+            status=200,
+            params=params,
+        ).json_body   # nopep8
+        # TODO - G.M - 30-05-2018 - Check this test
+        assert res == []
+
+    # Error case
+
+    def test_api__get_workspace_content__err_403__unallowed_user(self):
+        """
+        Check obtain workspace content list with an unreachable workspace for
+        user
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'lawrence-not-real-email@fsf.local',
+                'foobarbaz'
+            )
+        )
+        res = self.testapp.get('/api/v2/workspaces/3/contents', status=403)
+        assert isinstance(res.json, dict)
+        assert 'code' in res.json.keys()
+        assert 'message' in res.json.keys()
+        assert 'details' in res.json.keys()
+
+    def test_api__get_workspace_content__err_401__unregistered_user(self):
+        """
+        Check obtain workspace content list with an unregistered user
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'john@doe.doe',
+                'lapin'
+            )
+        )
+        res = self.testapp.get('/api/v2/workspaces/1/contents', status=401)
+        assert isinstance(res.json, dict)
+        assert 'code' in res.json.keys()
+        assert 'message' in res.json.keys()
+        assert 'details' in res.json.keys()
+
+    def test_api__get_workspace_content__err_403__workspace_does_not_exist(self):  # nopep8
+        """
+        Check obtain workspace contents list with an existing user but
+        an unexisting workspace
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get('/api/v2/workspaces/5/contents', status=403)
+        assert isinstance(res.json, dict)
+        assert 'code' in res.json.keys()
+        assert 'message' in res.json.keys()
+        assert 'details' in res.json.keys()
+
+    def test_api__post_content_create_generic_content__ok_200__nominal_case(self) -> None:  # nopep8
+        """
+        Create generic content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': 'GenericCreatedContent',
+            'content_type_slug': 'markdownpage',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/contents',
+            params=params,
+            status=200
+        )
+        assert res
+        assert res.json_body
+        assert res.json_body['status_slug'] == 'open'
+        assert res.json_body['id']
+        assert res.json_body['content_type_slug'] == 'markdownpage'
+        assert res.json_body['is_archived'] is False
+        assert res.json_body['is_deleted'] is False
+        assert res.json_body['workspace_id'] == 1
+        assert res.json_body['slug'] == 'genericcreatedcontent'
+        assert res.json_body['parent_id'] is None
+        assert res.json_body['show_in_ui'] is True
+        assert res.json_body['sub_content_type_slug']
+        params_active = {
+            'parent_id': 0,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        # INFO - G.M - 2018-06-165 - Verify if new content is correctly created
+        active_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_active, status=200).json_body  # nopep8
+        assert res.json_body in active_contents
+
+    def test_api_put_move_content__ok_200__nominal_case(self):
+        """
+        Move content
+        move Apple_Pie (content_id: 8)
+        from Desserts folder(content_id: 3) to Salads subfolder (content_id: 4)
+        of workspace Recipes.
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'new_parent_id': '4',  # Salads
+        }
+        params_folder1 = {
+            'parent_id': 3,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        params_folder2 = {
+            'parent_id': 4,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
+        folder2_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder2, status=200).json_body  # nopep8
+        assert [content for content in folder1_contents if content['id'] == 8]  # nopep8
+        assert not [content for content in folder2_contents if content['id'] == 8]  # nopep8
+        # TODO - G.M - 2018-06-163 - Check content
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/8/move',
+            params=params,
+            status=200
+        )
+        new_folder1_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder1, status=200).json_body  # nopep8
+        new_folder2_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_folder2, status=200).json_body  # nopep8
+        assert not [content for content in new_folder1_contents if content['id'] == 8]  # nopep8
+        assert [content for content in new_folder2_contents if content['id'] == 8]  # nopep8
+
+    def test_api_put_delete_content__ok_200__nominal_case(self):
+        """
+        delete content
+        delete Apple_pie ( content_id: 8, parent_id: 3)
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params_active = {
+            'parent_id': 3,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        params_deleted = {
+            'parent_id': 3,
+            'show_archived': 0,
+            'show_deleted': 1,
+            'show_active': 0,
+        }
+        active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
+        deleted_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_deleted, status=200).json_body  # nopep8
+        assert [content for content in active_contents if content['id'] == 8]  # nopep8
+        assert not [content for content in deleted_contents if content['id'] == 8]  # nopep8
+        # TODO - G.M - 2018-06-163 - Check content
+        res = self.testapp.put_json(
+            # INFO - G.M - 2018-06-163 - delete Apple_Pie
+            '/api/v2/workspaces/2/contents/8/delete',
+            status=200
+        )
+        new_active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
+        new_deleted_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_deleted, status=200).json_body  # nopep8
+        assert not [content for content in new_active_contents if content['id'] == 8]  # nopep8
+        assert [content for content in new_deleted_contents if content['id'] == 8]  # nopep8
+
+    def test_api_put_archive_content__ok_200__nominal_case(self):
+        """
+        archive content
+        archive Apple_pie ( content_id: 8, parent_id: 3)
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params_active = {
+            'parent_id': 3,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        params_archived = {
+            'parent_id': 3,
+            'show_archived': 1,
+            'show_deleted': 0,
+            'show_active': 0,
+        }
+        active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
+        archived_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_archived, status=200).json_body  # nopep8
+        assert [content for content in active_contents if content['id'] == 8]  # nopep8
+        assert not [content for content in archived_contents if content['id'] == 8]  # nopep8
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/8/archive',
+            status=200
+        )
+        new_active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
+        new_archived_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_archived, status=200).json_body  # nopep8
+        assert not [content for content in new_active_contents if content['id'] == 8]  # nopep8
+        assert [content for content in new_archived_contents if content['id'] == 8]  # nopep8
+
+    def test_api_put_undelete_content__ok_200__nominal_case(self):
+        """
+        Undelete content
+        undelete Bad_Fruit_Salad ( content_id: 14, parent_id: 10)
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'bob@fsf.local',
+                'foobarbaz'
+            )
+        )
+        params_active = {
+            'parent_id': 10,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        params_deleted = {
+            'parent_id': 10,
+            'show_archived': 0,
+            'show_deleted': 1,
+            'show_active': 0,
+        }
+        active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
+        deleted_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_deleted, status=200).json_body  # nopep8
+        assert not [content for content in active_contents if content['id'] == 14]  # nopep8
+        assert [content for content in deleted_contents if content['id'] == 14]  # nopep8
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/14/undelete',
+            status=200
+        )
+        new_active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
+        new_deleted_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_deleted, status=200).json_body  # nopep8
+        assert [content for content in new_active_contents if content['id'] == 14]  # nopep8
+        assert not [content for content in new_deleted_contents if content['id'] == 14]  # nopep8
+
+    def test_api_put_unarchive_content__ok_200__nominal_case(self):
+        """
+        unarchive content,
+        unarchive Fruit_salads ( content_id: 13, parent_id: 10)
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'bob@fsf.local',
+                'foobarbaz'
+            )
+        )
+        params_active = {
+            'parent_id': 10,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        params_archived = {
+            'parent_id': 10,
+            'show_archived': 1,
+            'show_deleted': 0,
+            'show_active': 0,
+        }
+        active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
+        archived_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_archived, status=200).json_body  # nopep8
+        assert not [content for content in active_contents if content['id'] == 13]  # nopep8
+        assert [content for content in archived_contents if content['id'] == 13]  # nopep8
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/13/unarchive',
+            status=200
+        )
+        new_active_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_active, status=200).json_body  # nopep8
+        new_archived_contents = self.testapp.get('/api/v2/workspaces/2/contents', params=params_archived, status=200).json_body  # nopep8
+        assert [content for content in new_active_contents if content['id'] == 13]  # nopep8
+        assert not [content for content in new_archived_contents if content['id'] == 13]  # nopep8

tracim/tests/library/test_webdav.py

@@ -162,11 +162,11 @@ class TestWebDav(StandardTest):
         )
 
         workspaces_names = [w.name for w in children]
-        assert 'w1' in workspaces_names, \
-            'w1 should be in names ({0})'.format(
+        assert 'Recipes' in workspaces_names, \
+            'Recipes should be in names ({0})'.format(
                 workspaces_names,
         )
-        assert 'w2' in workspaces_names, 'w2 should be in names ({0})'.format(
+        assert 'Others' in workspaces_names, 'Others should be in names ({0})'.format(
             workspaces_names,
         )
 
@@ -186,138 +186,138 @@ class TestWebDav(StandardTest):
         eq_(
             2,
             len(children),
-            msg='RootResource should return 2 workspaces instead {0}'.format(
+            msg='RootResource should return 3 workspaces instead {0}'.format(
                 len(children),
             )
         )
 
         workspaces_names = [w.name for w in children]
-        assert 'w1' in workspaces_names, 'w1 should be in names ({0})'.format(
+        assert 'Recipes' in workspaces_names, 'Recipes should be in names ({0})'.format(
             workspaces_names,
         )
-        assert 'w3' in workspaces_names, 'w3 should be in names ({0})'.format(
+        assert 'Business' in workspaces_names, 'Business should be in names ({0})'.format(
             workspaces_names,
         )
 
     def test_unit__list_workspace_folders__ok(self):
         provider = self._get_provider(self.app_config)
-        w1 = provider.getResourceInst(
-            '/w1/',
+        Recipes = provider.getResourceInst(
+            '/Recipes/',
             self._get_environ(
                 provider,
                 'bob@fsf.local',
             )
         )
-        assert w1, 'Path /w1 should return a Wrkspace instance'
+        assert Recipes, 'Path /Recipes should return a Wrkspace instance'
 
-        children = w1.getMemberList()
+        children = Recipes.getMemberList()
         eq_(
             2,
             len(children),
-            msg='w1 should list 2 folders instead {0}'.format(
+            msg='Recipes should list 2 folders instead {0}'.format(
                 len(children),
             ),
         )
 
         folders_names = [f.name for f in children]
-        assert 'w1f1' in folders_names, 'w1f1 should be in names ({0})'.format(
+        assert 'Salads' in folders_names, 'Salads should be in names ({0})'.format(
                 folders_names,
         )
-        assert 'w1f2' in folders_names, 'w1f2 should be in names ({0})'.format(
+        assert 'Desserts' in folders_names, 'Desserts should be in names ({0})'.format(
                 folders_names,
         )
 
     def test_unit__list_content__ok(self):
         provider = self._get_provider(self.app_config)
-        w1f1 = provider.getResourceInst(
-            '/w1/w1f1',
+        Salads = provider.getResourceInst(
+            '/Recipes/Desserts',
             self._get_environ(
                 provider,
                 'bob@fsf.local',
             )
         )
-        assert w1f1, 'Path /w1f1 should return a Wrkspace instance'
+        assert Salads, 'Path /Salads should return a Wrkspace instance'
 
-        children = w1f1.getMemberList()
+        children = Salads.getMemberList()
         eq_(
             5,
             len(children),
-            msg='w1f1 should list 5 folders instead {0}'.format(
+            msg='Salads should list 5 Files instead {0}'.format(
                 len(children),
             ),
         )
 
         content_names = [c.name for c in children]
-        assert 'w1f1p1.html' in content_names, \
-            'w1f1.html should be in names ({0})'.format(
+        assert 'Brownie Recipe.html' in content_names, \
+            'Brownie Recipe.html should be in names ({0})'.format(
                 content_names,
         )
 
-        assert 'w1f1t1.html' in content_names,\
-            'w1f1t1.html should be in names ({0})'.format(
+        assert 'Best Cakes ʔ.html' in content_names,\
+            'Best Cakes ʔ.html should be in names ({0})'.format(
                 content_names,
         )
-        assert 'w1f1d1.txt' in content_names,\
-            'w1f1d1.txt should be in names ({0})'.format(content_names,)
+        assert 'Apple_Pie.txt' in content_names,\
+            'Apple_Pie.txt should be in names ({0})'.format(content_names,)
 
-        assert 'w1f1f1' in content_names, \
-            'w1f1f1 should be in names ({0})'.format(
+        assert 'Fruits Desserts' in content_names, \
+            'Fruits Desserts should be in names ({0})'.format(
                 content_names,
         )
 
-        assert 'w1f1d2.html' in content_names,\
-            'w1f1d2.html should be in names ({0})'.format(
+        assert 'Tiramisu Recipe.html' in content_names,\
+            'Tiramisu Recipe.html should be in names ({0})'.format(
                 content_names,
         )
 
     def test_unit__get_content__ok(self):
         provider = self._get_provider(self.app_config)
-        w1f1d1 = provider.getResourceInst(
-            '/w1/w1f1/w1f1d1.txt',
+        pie = provider.getResourceInst(
+            '/Recipes/Desserts/Apple_Pie.txt',
             self._get_environ(
                 provider,
                 'bob@fsf.local',
             )
         )
 
-        assert w1f1d1, 'w1f1d1 should be found'
-        eq_('w1f1d1.txt', w1f1d1.name)
+        assert pie, 'Apple_Pie should be found'
+        eq_('Apple_Pie.txt', pie.name)
 
     def test_unit__delete_content__ok(self):
         provider = self._get_provider(self.app_config)
-        w1f1d1 = provider.getResourceInst(
-            '/w1/w1f1/w1f1d1.txt',
+        pie = provider.getResourceInst(
+            '/Recipes/Desserts/Apple_Pie.txt',
             self._get_environ(
                 provider,
                 'bob@fsf.local',
             )
         )
         
-        content_w1f1d1 = self.session.query(ContentRevisionRO) \
-            .filter(Content.label == 'w1f1d1') \
+        content_pie = self.session.query(ContentRevisionRO) \
+            .filter(Content.label == 'Apple_Pie') \
             .one()  # It must exist only one revision, cf fixtures
         eq_(
             False,
-            content_w1f1d1.is_deleted,
+            content_pie.is_deleted,
             msg='Content should not be deleted !'
         )
-        content_w1f1d1_id = content_w1f1d1.content_id
+        content_pie_id = content_pie.content_id
 
-        w1f1d1.delete()
+        pie.delete()
 
         self.session.flush()
-        content_w1f1d1 = self.session.query(ContentRevisionRO) \
-            .filter(Content.content_id == content_w1f1d1_id) \
+        content_pie = self.session.query(ContentRevisionRO) \
+            .filter(Content.content_id == content_pie_id) \
             .order_by(Content.revision_id.desc()) \
             .first()
         eq_(
             True,
-            content_w1f1d1.is_deleted,
+            content_pie.is_deleted,
             msg='Content should be deleted !'
         )
 
         result = provider.getResourceInst(
-            '/w1/w1f1/w1f1d1.txt',
+            '/Recipes/Desserts/Apple_Pie.txt',
             self._get_environ(
                 provider,
                 'bob@fsf.local',
@@ -334,7 +334,7 @@ class TestWebDav(StandardTest):
             'bob@fsf.local',
         )
         result = provider.getResourceInst(
-            '/w1/w1f1/new_file.txt',
+            '/Recipes/Salads/greek_salad.txt',
             environ,
         )
 
@@ -345,17 +345,17 @@ class TestWebDav(StandardTest):
         result = self._put_new_text_file(
             provider,
             environ,
-            '/w1/w1f1/new_file.txt',
-            b'hello\n',
+            '/Recipes/Salads/greek_salad.txt',
+            b'Greek Salad\n',
         )
 
         assert result, 'Result should not be None instead {0}'.format(
             result
         )
         eq_(
-            b'hello\n',
+            b'Greek Salad\n',
             result.content.depot_file.file.read(),
-            msg='fiel content should be "hello\n" but it is {0}'.format(
+            msg='fiel content should be "Greek Salad\n" but it is {0}'.format(
                 result.content.depot_file.file.read()
             )
         )
@@ -367,7 +367,7 @@ class TestWebDav(StandardTest):
             'bob@fsf.local',
         )
         new_file = provider.getResourceInst(
-            '/w1/w1f1/new_file.txt',
+            '/Recipes/Salads/greek_salad.txt',
             environ,
         )
 
@@ -379,15 +379,15 @@ class TestWebDav(StandardTest):
         new_file = self._put_new_text_file(
             provider,
             environ,
-            '/w1/w1f1/new_file.txt',
-            b'hello\n',
+            '/Recipes/Salads/greek_salad.txt',
+            b'Greek Salad\n',
         )
         assert new_file, 'Result should not be None instead {0}'.format(
             new_file
         )
 
         content_new_file = self.session.query(ContentRevisionRO) \
-            .filter(Content.label == 'new_file') \
+            .filter(Content.label == 'greek_salad') \
             .one()  # It must exist only one revision
         eq_(
             False,
@@ -400,18 +400,18 @@ class TestWebDav(StandardTest):
         new_file.delete()
 
         self.session.flush()
-        content_w1f1d1 = self.session.query(ContentRevisionRO) \
+        content_pie = self.session.query(ContentRevisionRO) \
             .filter(Content.content_id == content_new_file_id) \
             .order_by(Content.revision_id.desc()) \
             .first()
         eq_(
             True,
-            content_w1f1d1.is_deleted,
+            content_pie.is_deleted,
             msg='Content should be deleted !'
         )
 
         result = provider.getResourceInst(
-            '/w1/w1f1/new_file.txt',
+            '/Recipes/Salads/greek_salad.txt',
             self._get_environ(
                 provider,
                 'bob@fsf.local',
@@ -425,8 +425,8 @@ class TestWebDav(StandardTest):
         new_file = self._put_new_text_file(
             provider,
             environ,
-            '/w1/w1f1/new_file.txt',
-            b'hello\n',
+            '/Recipes/Salads/greek_salad.txt',
+            b'greek_salad\n',
         )
         assert new_file, 'Result should not be None instead {0}'.format(
             new_file
@@ -434,19 +434,19 @@ class TestWebDav(StandardTest):
 
         # Previous file is still dleeted
         self.session.flush()
-        content_w1f1d1 = self.session.query(ContentRevisionRO) \
+        content_pie = self.session.query(ContentRevisionRO) \
             .filter(Content.content_id == content_new_file_id) \
             .order_by(Content.revision_id.desc()) \
             .first()
         eq_(
             True,
-            content_w1f1d1.is_deleted,
+            content_pie.is_deleted,
             msg='Content should be deleted !'
         )
 
         # And an other file exist for this name
         content_new_new_file = self.session.query(ContentRevisionRO) \
-            .filter(Content.label == 'new_file') \
+            .filter(Content.label == 'greek_salad') \
             .order_by(Content.revision_id.desc()) \
             .first()
         assert content_new_new_file.content_id != content_new_file_id,\
@@ -464,29 +464,29 @@ class TestWebDav(StandardTest):
             provider,
             'bob@fsf.local',
         )
-        w1f1d1 = provider.getResourceInst(
-            '/w1/w1f1/w1f1d1.txt',
+        pie = provider.getResourceInst(
+            '/Recipes/Desserts/Apple_Pie.txt',
             environ,
         )
 
-        content_w1f1d1 = self.session.query(ContentRevisionRO) \
-            .filter(Content.label == 'w1f1d1') \
+        content_pie = self.session.query(ContentRevisionRO) \
+            .filter(Content.label == 'Apple_Pie') \
             .one()  # It must exist only one revision, cf fixtures
-        assert content_w1f1d1, 'w1f1d1 should be exist'
-        content_w1f1d1_id = content_w1f1d1.content_id
+        assert content_pie, 'Apple_Pie should be exist'
+        content_pie_id = content_pie.content_id
 
-        w1f1d1.moveRecursive('/w1/w1f1/w1f1d1_RENAMED.txt')
+        pie.moveRecursive('/Recipes/Desserts/Apple_Pie_RENAMED.txt')
 
         # Database content is renamed
-        content_w1f1d1 = self.session.query(ContentRevisionRO) \
-            .filter(ContentRevisionRO.content_id == content_w1f1d1_id) \
+        content_pie = self.session.query(ContentRevisionRO) \
+            .filter(ContentRevisionRO.content_id == content_pie_id) \
             .order_by(ContentRevisionRO.revision_id.desc()) \
             .first()
         eq_(
-            'w1f1d1_RENAMED',
-            content_w1f1d1.label,
-            msg='File should be labeled w1f1d1_RENAMED, not {0}'.format(
-                content_w1f1d1.label
+            'Apple_Pie_RENAMED',
+            content_pie.label,
+            msg='File should be labeled Apple_Pie_RENAMED, not {0}'.format(
+                content_pie.label
             )
         )
 
@@ -496,34 +496,34 @@ class TestWebDav(StandardTest):
             provider,
             'bob@fsf.local',
         )
-        w1f1d1 = provider.getResourceInst(
-            '/w1/w1f1/w1f1d1.txt',
+        pie = provider.getResourceInst(
+            '/Recipes/Desserts/Apple_Pie.txt',
             environ,
         )
 
-        content_w1f1d1 = self.session.query(ContentRevisionRO) \
-            .filter(Content.label == 'w1f1d1') \
+        content_pie = self.session.query(ContentRevisionRO) \
+            .filter(Content.label == 'Apple_Pie') \
             .one()  # It must exist only one revision, cf fixtures
-        assert content_w1f1d1, 'w1f1d1 should be exist'
-        content_w1f1d1_id = content_w1f1d1.content_id
-        content_w1f1d1_parent = content_w1f1d1.parent
+        assert content_pie, 'Apple_Pie should be exist'
+        content_pie_id = content_pie.content_id
+        content_pie_parent = content_pie.parent
         eq_(
-            content_w1f1d1_parent.label,
-            'w1f1',
-            msg='field parent should be w1f1',
+            content_pie_parent.label,
+            'Desserts',
+            msg='field parent should be Desserts',
         )
 
-        w1f1d1.moveRecursive('/w1/w1f2/w1f1d1.txt')  # move in f2
+        pie.moveRecursive('/Recipes/Salads/Apple_Pie.txt')  # move in f2
 
         # Database content is moved
-        content_w1f1d1 = self.session.query(ContentRevisionRO) \
-            .filter(ContentRevisionRO.content_id == content_w1f1d1_id) \
+        content_pie = self.session.query(ContentRevisionRO) \
+            .filter(ContentRevisionRO.content_id == content_pie_id) \
             .order_by(ContentRevisionRO.revision_id.desc()) \
             .first()
 
-        assert content_w1f1d1.parent.label != content_w1f1d1_parent.label,\
-            'file should be moved in w1f2 but is in {0}'.format(
-                content_w1f1d1.parent.label
+        assert content_pie.parent.label != content_pie_parent.label,\
+            'file should be moved in Salads but is in {0}'.format(
+                content_pie.parent.label
         )
 
     def test_unit__move_and_rename_content__ok(self):
@@ -532,39 +532,39 @@ class TestWebDav(StandardTest):
             provider,
             'bob@fsf.local',
         )
-        w1f1d1 = provider.getResourceInst(
-            '/w1/w1f1/w1f1d1.txt',
+        pie = provider.getResourceInst(
+            '/Recipes/Desserts/Apple_Pie.txt',
             environ,
         )
 
-        content_w1f1d1 = self.session.query(ContentRevisionRO) \
-            .filter(Content.label == 'w1f1d1') \
+        content_pie = self.session.query(ContentRevisionRO) \
+            .filter(Content.label == 'Apple_Pie') \
             .one()  # It must exist only one revision, cf fixtures
-        assert content_w1f1d1, 'w1f1d1 should be exist'
-        content_w1f1d1_id = content_w1f1d1.content_id
-        content_w1f1d1_parent = content_w1f1d1.parent
+        assert content_pie, 'Apple_Pie should be exist'
+        content_pie_id = content_pie.content_id
+        content_pie_parent = content_pie.parent
         eq_(
-            content_w1f1d1_parent.label,
-            'w1f1',
-            msg='field parent should be w1f1',
+            content_pie_parent.label,
+            'Desserts',
+            msg='field parent should be Desserts',
         )
 
-        w1f1d1.moveRecursive('/w1/w1f2/w1f1d1_RENAMED.txt')
+        pie.moveRecursive('/Others/Infos/Apple_Pie_RENAMED.txt')
 
         # Database content is moved
-        content_w1f1d1 = self.session.query(ContentRevisionRO) \
-            .filter(ContentRevisionRO.content_id == content_w1f1d1_id) \
+        content_pie = self.session.query(ContentRevisionRO) \
+            .filter(ContentRevisionRO.content_id == content_pie_id) \
             .order_by(ContentRevisionRO.revision_id.desc()) \
             .first()
-        assert content_w1f1d1.parent.label != content_w1f1d1_parent.label,\
-            'file should be moved in w1f2 but is in {0}'.format(
-                content_w1f1d1.parent.label
+        assert content_pie.parent.label != content_pie_parent.label,\
+            'file should be moved in Recipesf2 but is in {0}'.format(
+                content_pie.parent.label
         )
         eq_(
-            'w1f1d1_RENAMED',
-            content_w1f1d1.label,
-            msg='File should be labeled w1f1d1_RENAMED, not {0}'.format(
-                content_w1f1d1.label
+            'Apple_Pie_RENAMED',
+            content_pie.label,
+            msg='File should be labeled Apple_Pie_RENAMED, not {0}'.format(
+                content_pie.label
             )
         )
 
@@ -575,23 +575,23 @@ class TestWebDav(StandardTest):
             'bob@fsf.local',
         )
         content_to_move_res = provider.getResourceInst(
-            '/w1/w1f1/w1f1d1.txt',
+            '/Recipes/Desserts/Apple_Pie.txt',
             environ,
         )
 
         content_to_move = self.session.query(ContentRevisionRO) \
-            .filter(Content.label == 'w1f1d1') \
+            .filter(Content.label == 'Apple_Pie') \
             .one()  # It must exist only one revision, cf fixtures
-        assert content_to_move, 'w1f1d1 should be exist'
+        assert content_to_move, 'Apple_Pie should be exist'
         content_to_move_id = content_to_move.content_id
         content_to_move_parent = content_to_move.parent
         eq_(
             content_to_move_parent.label,
-            'w1f1',
-            msg='field parent should be w1f1',
+            'Desserts',
+            msg='field parent should be Desserts',
         )
 
-        content_to_move_res.moveRecursive('/w2/w2f1/w1f1d1.txt')  # move in w2, f1
+        content_to_move_res.moveRecursive('/Others/Infos/Apple_Pie.txt')  # move in Business, f1
 
         # Database content is moved
         content_to_move = self.session.query(ContentRevisionRO) \
@@ -601,8 +601,8 @@ class TestWebDav(StandardTest):
 
         assert content_to_move.parent, 'Content should have a parent'
 
-        assert content_to_move.parent.label == 'w2f1',\
-            'file should be moved in w2f1 but is in {0}'.format(
+        assert content_to_move.parent.label == 'Infos',\
+            'file should be moved in Infos but is in {0}'.format(
                 content_to_move.parent.label
         )
 
@@ -613,7 +613,7 @@ class TestWebDav(StandardTest):
             'bob@fsf.local',
         )
         result = provider.getResourceInst(
-            '/w1/w1f1/new_file.txt',
+            '/Recipes/Salads/greek_salad.txt',
             environ,
         )
 
@@ -624,7 +624,7 @@ class TestWebDav(StandardTest):
         result = self._put_new_text_file(
             provider,
             environ,
-            '/w1/w1f1/new_file.txt',
+            '/Recipes/Salads/greek_salad.txt',
             b'hello\n',
         )
 

tracim/views/core_api/schemas.py

@@ -4,6 +4,14 @@ from marshmallow import post_load
 from marshmallow.validate import OneOf
 
 from tracim.models.auth import Profile
+from tracim.models.contents import CONTENT_DEFAULT_TYPE
+from tracim.models.contents import CONTENT_DEFAULT_STATUS
+from tracim.models.contents import GlobalStatus
+from tracim.models.contents import open_status
+from tracim.models.context_models import ContentCreation
+from tracim.models.context_models import MoveParams
+from tracim.models.context_models import WorkspaceAndContentPath
+from tracim.models.context_models import ContentFilter
 from tracim.models.context_models import LoginCredentials
 from tracim.models.data import UserRoleInWorkspace
 
@@ -65,12 +73,63 @@ class UserSchema(marshmallow.Schema):
         description = 'User account of Tracim'
 
 
+# Path Schemas
+
+
 class UserIdPathSchema(marshmallow.Schema):
-    user_id = marshmallow.fields.Int(example=3)
+    user_id = marshmallow.fields.Int(example=3, required=True)
 
 
 class WorkspaceIdPathSchema(marshmallow.Schema):
-    workspace_id = marshmallow.fields.Int(example=4)
+    workspace_id = marshmallow.fields.Int(example=4, required=True)
+
+
+class ContentIdPathSchema(marshmallow.Schema):
+    content_id = marshmallow.fields.Int(example=6, required=True)
+
+
+class WorkspaceAndContentIdPathSchema(WorkspaceIdPathSchema, ContentIdPathSchema):
+    @post_load
+    def make_path_object(self, data):
+        return WorkspaceAndContentPath(**data)
+
+
+class FilterContentQuerySchema(marshmallow.Schema):
+    parent_id = workspace_id = marshmallow.fields.Int(
+        example=2,
+        default=None,
+        description='allow to filter items in a folder.'
+                    ' If not set, then return all contents.'
+                    ' If set to 0, then return root contents.'
+                    ' If set to another value, return all contents'
+                    ' directly included in the folder parent_id'
+    )
+    show_archived = marshmallow.fields.Int(
+        example=0,
+        default=0,
+        description='if set to 1, then show archived contents.'
+                    ' Default is 0 - hide archived content'
+    )
+    show_deleted = marshmallow.fields.Int(
+        example=0,
+        default=0,
+        description='if set to 1, then show deleted contents.'
+                    ' Default is 0 - hide deleted content'
+    )
+    show_active = marshmallow.fields.Int(
+        example=1,
+        default=1,
+        description='f set to 1, then show active contents. '
+                    'Default is 1 - show active content.'
+                    ' Note: active content are content '
+                    'that is neither archived nor deleted. '
+                    'The reason for this parameter to exist is for example '
+                    'to allow to show only archived documents'
+    )
+    @post_load
+    def make_content_filter(self, data):
+        return ContentFilter(**data)
+###
 
 
 class BasicAuthSchema(marshmallow.Schema):
@@ -188,3 +247,114 @@ class ApplicationSchema(marshmallow.Schema):
 
     class Meta:
         description = 'Tracim Application informations'
+
+
+class StatusSchema(marshmallow.Schema):
+    slug = marshmallow.fields.String(
+        example='open',
+        description='the slug represents the type of status. '
+                    'Statuses are open, closed-validated, closed-invalidated, closed-deprecated'  # nopep8
+    )
+    global_status = marshmallow.fields.String(
+        example='Open',
+        description='global_status: open, closed',
+        validate=OneOf([status.value for status in GlobalStatus]),
+    )
+    label = marshmallow.fields.String(example='Open')
+    fa_icon = marshmallow.fields.String(example='fa-check')
+    hexcolor = marshmallow.fields.String(example='#0000FF')
+
+
+class ContentTypeSchema(marshmallow.Schema):
+    slug = marshmallow.fields.String(
+        example='pagehtml',
+        validate=OneOf([content.slug for content in CONTENT_DEFAULT_TYPE]),
+    )
+    fa_icon = marshmallow.fields.String(
+        example='fa-file-text-o',
+        description='CSS class of the icon. Example: file-o for using Fontawesome file-o icon',  # nopep8
+    )
+    hexcolor = marshmallow.fields.String(
+        example="#FF0000",
+        description='HTML encoded color associated to the application. Example:#FF0000 for red'  # nopep8
+    )
+    label = marshmallow.fields.String(
+        example='Text Documents'
+    )
+    creation_label = marshmallow.fields.String(
+        example='Write a document'
+    )
+    available_statuses = marshmallow.fields.Nested(
+        StatusSchema,
+        many=True
+    )
+
+
+class ContentMoveSchema(marshmallow.Schema):
+    # TODO - G.M - 30-05-2018 - Read and apply this note
+    # Note:
+    # if the new workspace is different, then the backend
+    # must check if the user is allowed to move to this workspace
+    # (the user must be content manager of both workspaces)
+    new_parent_id = marshmallow.fields.Int(
+        example=42,
+        description='id of the new parent content id.'
+    )
+
+    @post_load
+    def make_move_params(self, data):
+        return MoveParams(**data)
+
+
+class ContentCreationSchema(marshmallow.Schema):
+    label = marshmallow.fields.String(
+        example='contract for client XXX',
+        description='Title of the content to create'
+    )
+    content_type_slug = marshmallow.fields.String(
+        example='htmlpage',
+        validate=OneOf([content.slug for content in CONTENT_DEFAULT_TYPE]),
+    )
+
+    @post_load
+    def make_content_filter(self, data):
+        return ContentCreation(**data)
+
+
+class ContentDigestSchema(marshmallow.Schema):
+    id = marshmallow.fields.Int(example=6)
+    slug = marshmallow.fields.Str(example='intervention-report-12')
+    parent_id = marshmallow.fields.Int(
+        example=34,
+        allow_none=True,
+        default=None
+    )
+    workspace_id = marshmallow.fields.Int(
+        example=19,
+    )
+    label = marshmallow.fields.Str(example='Intervention Report 12')
+    content_type_slug = marshmallow.fields.Str(
+        example='htmlpage',
+        validate=OneOf([content.slug for content in CONTENT_DEFAULT_TYPE]),
+    )
+    sub_content_type_slug = marshmallow.fields.List(
+        marshmallow.fields.Str,
+        description='list of content types allowed as sub contents. '
+                    'This field is required for folder contents, '
+                    'set it to empty list in other cases'
+    )
+    status_slug = marshmallow.fields.Str(
+        example='closed-deprecated',
+        validate=OneOf([status.slug for status in CONTENT_DEFAULT_STATUS]),
+        description='this slug is found in content_type available statuses',
+        default=open_status
+    )
+    is_archived = marshmallow.fields.Bool(example=False, default=False)
+    is_deleted = marshmallow.fields.Bool(example=False, default=False)
+    show_in_ui = marshmallow.fields.Bool(
+        example=True,
+        description='if false, then do not show content in the treeview. '
+                    'This may his maybe used for specific contents or '
+                    'for sub-contents. Default is True. '
+                    'In first version of the API, this field is always True',
+    )

tracim/views/core_api/system_controller.py

@@ -1,10 +1,11 @@
 # coding=utf-8
 from pyramid.config import Configurator
-
-from tracim.exceptions import NotAuthenticated, InsufficientUserProfile
+from tracim.exceptions import NotAuthenticated
+from tracim.exceptions import InsufficientUserProfile
 from tracim.lib.utils.authorization import require_profile
 from tracim.models import Group
 from tracim.models.applications import applications
+from tracim.models.contents import CONTENT_DEFAULT_TYPE
 
 try:  # Python 3.5+
     from http import HTTPStatus
@@ -15,6 +16,7 @@ from tracim import TracimRequest
 from tracim.extensions import hapic
 from tracim.views.controllers import Controller
 from tracim.views.core_api.schemas import ApplicationSchema
+from tracim.views.core_api.schemas import ContentTypeSchema
 
 
 class SystemController(Controller):
@@ -30,6 +32,18 @@ class SystemController(Controller):
         """
         return applications
 
+    @hapic.with_api_doc()
+    @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
+    @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
+    @require_profile(Group.TIM_USER)
+    @hapic.output_body(ContentTypeSchema(many=True),)
+    def content_types(self, context, request: TracimRequest, hapic_data=None):
+        """
+        Get list of alls applications installed in this tracim instance.
+        """
+
+        return CONTENT_DEFAULT_TYPE
+
     def bind(self, configurator: Configurator) -> None:
         """
         Create all routes and views using pyramid configurator
@@ -40,3 +54,8 @@ class SystemController(Controller):
         configurator.add_route('applications', '/system/applications', request_method='GET')  # nopep8
         configurator.add_view(self.applications, route_name='applications')
 
+        # Content_types
+        configurator.add_route('content_types', '/system/content_types', request_method='GET')  # nopep8
+        configurator.add_view(self.content_types, route_name='content_types')
+
+

tracim/views/core_api/workspace_controller.py

@@ -1,30 +1,36 @@
 import typing
 
+import transaction
 from pyramid.config import Configurator
-from sqlalchemy.orm.exc import NoResultFound
-
-from tracim.lib.core.userworkspace import RoleApi
-from tracim.lib.utils.authorization import require_workspace_role
-from tracim.models.context_models import WorkspaceInContext
-from tracim.models.context_models import UserRoleWorkspaceInContext
-from tracim.models.data import UserRoleInWorkspace
-
 try:  # Python 3.5+
     from http import HTTPStatus
 except ImportError:
     from http import client as HTTPStatus
 
 from tracim import hapic, TracimRequest
+from tracim.lib.core.workspace import WorkspaceApi
+from tracim.lib.core.content import ContentApi
+from tracim.lib.core.userworkspace import RoleApi
+from tracim.lib.utils.authorization import require_workspace_role
+from tracim.models.data import UserRoleInWorkspace, ActionDescription
+from tracim.models.context_models import UserRoleWorkspaceInContext
+from tracim.models.context_models import ContentInContext
 from tracim.exceptions import NotAuthenticated
 from tracim.exceptions import InsufficientUserProfile
 from tracim.exceptions import WorkspaceNotFound
-from tracim.lib.core.user import UserApi
-from tracim.lib.core.workspace import WorkspaceApi
 from tracim.views.controllers import Controller
+from tracim.views.core_api.schemas import FilterContentQuerySchema
+from tracim.views.core_api.schemas import ContentMoveSchema
+from tracim.views.core_api.schemas import NoContentSchema
+from tracim.views.core_api.schemas import ContentCreationSchema
+from tracim.views.core_api.schemas import WorkspaceAndContentIdPathSchema
+from tracim.views.core_api.schemas import ContentDigestSchema
 from tracim.views.core_api.schemas import WorkspaceSchema
-from tracim.views.core_api.schemas import UserSchema
 from tracim.views.core_api.schemas import WorkspaceIdPathSchema
 from tracim.views.core_api.schemas import WorkspaceMemberSchema
+from tracim.models.contents import ContentTypeLegacy as ContentType
+from tracim.models.revision_protection import new_revision
+
 
 class WorkspaceController(Controller):
 
@@ -77,14 +83,282 @@ class WorkspaceController(Controller):
             for user_role in roles
         ]
 
+    @hapic.with_api_doc()
+    @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
+    @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
+    @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
+    @require_workspace_role(UserRoleInWorkspace.READER)
+    @hapic.input_path(WorkspaceIdPathSchema())
+    @hapic.input_query(FilterContentQuerySchema())
+    @hapic.output_body(ContentDigestSchema(many=True))
+    def workspace_content(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None,
+    ) -> typing.List[ContentInContext]:
+        """
+        return list of contents found in the workspace
+        """
+        app_config = request.registry.settings['CFG']
+        content_filter = hapic_data.query
+        api = ContentApi(
+            current_user=request.current_user,
+            session=request.dbsession,
+            config=app_config,
+            show_archived=content_filter.show_archived,
+            show_deleted=content_filter.show_deleted,
+            show_active=content_filter.show_active,
+        )
+        contents = api.get_all(
+            parent_id=content_filter.parent_id,
+            workspace=request.current_workspace,
+        )
+        contents = [
+            api.get_content_in_context(content) for content in contents
+        ]
+        return contents
+
+    @hapic.with_api_doc()
+    @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
+    @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
+    @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
+    @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
+    @hapic.input_path(WorkspaceIdPathSchema())
+    @hapic.input_body(ContentCreationSchema())
+    @hapic.output_body(ContentDigestSchema())
+    def create_generic_empty_content(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None,
+    ) -> typing.List[ContentInContext]:
+        """
+        create a generic empty content
+        """
+        app_config = request.registry.settings['CFG']
+        creation_data = hapic_data.body
+        api = ContentApi(
+            current_user=request.current_user,
+            session=request.dbsession,
+            config=app_config,
+        )
+        content = api.create(
+            label=creation_data.label,
+            content_type=creation_data.content_type_slug,
+            workspace=request.current_workspace,
+        )
+        api.save(content, ActionDescription.CREATION)
+        content = api.get_content_in_context(content)
+        return content
+
+    @hapic.with_api_doc()
+    @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
+    @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
+    @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
+    @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
+    @hapic.input_path(WorkspaceAndContentIdPathSchema())
+    @hapic.input_body(ContentMoveSchema())
+    @hapic.output_body(NoContentSchema())
+    def move_content(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None,
+    ) -> typing.List[ContentInContext]:
+        """
+        move a content
+        """
+        app_config = request.registry.settings['CFG']
+        path_data = hapic_data.path
+        move_data = hapic_data.body
+        api = ContentApi(
+            current_user=request.current_user,
+            session=request.dbsession,
+            config=app_config,
+        )
+        content = api.get_one(
+            path_data.content_id,
+            content_type=ContentType.Any
+        )
+        new_parent = api.get_one(
+            move_data.new_parent_id, content_type=ContentType.Any
+        )
+        with new_revision(
+                session=request.dbsession,
+                tm=transaction.manager,
+                content=content
+        ):
+            api.move(content, new_parent=new_parent)
+        return
+
+    @hapic.with_api_doc()
+    @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
+    @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
+    @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
+    @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
+    @hapic.input_path(WorkspaceAndContentIdPathSchema())
+    @hapic.output_body(NoContentSchema())
+    def delete_content(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None,
+    ) -> typing.List[ContentInContext]:
+        """
+        delete a content
+        """
+        app_config = request.registry.settings['CFG']
+        path_data = hapic_data.path
+        api = ContentApi(
+            current_user=request.current_user,
+            session=request.dbsession,
+            config=app_config,
+        )
+        content = api.get_one(
+            path_data.content_id,
+            content_type=ContentType.Any
+        )
+        with new_revision(
+                session=request.dbsession,
+                tm=transaction.manager,
+                content=content
+        ):
+            api.delete(content)
+        return
+
+    @hapic.with_api_doc()
+    @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
+    @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
+    @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
+    @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
+    @hapic.input_path(WorkspaceAndContentIdPathSchema())
+    @hapic.output_body(NoContentSchema())
+    def undelete_content(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None,
+    ) -> typing.List[ContentInContext]:
+        """
+        undelete a content
+        """
+        app_config = request.registry.settings['CFG']
+        path_data = hapic_data.path
+        api = ContentApi(
+            current_user=request.current_user,
+            session=request.dbsession,
+            config=app_config,
+            show_deleted=True,
+        )
+        content = api.get_one(
+            path_data.content_id,
+            content_type=ContentType.Any
+        )
+        with new_revision(
+                session=request.dbsession,
+                tm=transaction.manager,
+                content=content
+        ):
+            api.undelete(content)
+        return
+
+    @hapic.with_api_doc()
+    @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
+    @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
+    @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
+    @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
+    @hapic.input_path(WorkspaceAndContentIdPathSchema())
+    @hapic.output_body(NoContentSchema())
+    def archive_content(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None,
+    ) -> typing.List[ContentInContext]:
+        """
+        archive a content
+        """
+        app_config = request.registry.settings['CFG']
+        path_data = hapic_data.path
+        api = ContentApi(
+            current_user=request.current_user,
+            session=request.dbsession,
+            config=app_config,
+        )
+        content = api.get_one(path_data.content_id, content_type=ContentType.Any)
+        with new_revision(
+                session=request.dbsession,
+                tm=transaction.manager,
+                content=content
+        ):
+            api.archive(content)
+        return
+
+    @hapic.with_api_doc()
+    @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
+    @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
+    @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
+    @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
+    @hapic.input_path(WorkspaceAndContentIdPathSchema())
+    @hapic.output_body(NoContentSchema())
+    def unarchive_content(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None,
+    ) -> typing.List[ContentInContext]:
+        """
+        unarchive a content
+        """
+        app_config = request.registry.settings['CFG']
+        path_data = hapic_data.path
+        api = ContentApi(
+            current_user=request.current_user,
+            session=request.dbsession,
+            config=app_config,
+            show_archived=True,
+        )
+        content = api.get_one(
+            path_data.content_id,
+            content_type=ContentType.Any
+        )
+        with new_revision(
+                session=request.dbsession,
+                tm=transaction.manager,
+                content=content
+        ):
+            api.unarchive(content)
+        return
+
     def bind(self, configurator: Configurator) -> None:
         """
         Create all routes and views using
         pyramid configurator for this controller
         """
 
-        # Applications
+        # Workspace
         configurator.add_route('workspace', '/workspaces/{workspace_id}', request_method='GET')  # nopep8
         configurator.add_view(self.workspace, route_name='workspace')
+        # Workspace Members (Roles)
         configurator.add_route('workspace_members', '/workspaces/{workspace_id}/members', request_method='GET')  # nopep8
         configurator.add_view(self.workspaces_members, route_name='workspace_members')  # nopep8
+        # Workspace Content
+        configurator.add_route('workspace_content', '/workspaces/{workspace_id}/contents', request_method='GET')  # nopep8
+        configurator.add_view(self.workspace_content, route_name='workspace_content')  # nopep8
+        # Create Generic Content
+        configurator.add_route('create_generic_content', '/workspaces/{workspace_id}/contents', request_method='POST')  # nopep8
+        configurator.add_view(self.create_generic_empty_content, route_name='create_generic_content')  # nopep8
+        # Move Content
+        configurator.add_route('move_content', '/workspaces/{workspace_id}/contents/{content_id}/move', request_method='PUT')  # nopep8
+        configurator.add_view(self.move_content, route_name='move_content')  # nopep8
+        # Delete/Undelete Content
+        configurator.add_route('delete_content', '/workspaces/{workspace_id}/contents/{content_id}/delete', request_method='PUT')  # nopep8
+        configurator.add_view(self.delete_content, route_name='delete_content')  # nopep8
+        configurator.add_route('undelete_content', '/workspaces/{workspace_id}/contents/{content_id}/undelete', request_method='PUT')  # nopep8
+        configurator.add_view(self.undelete_content, route_name='undelete_content')  # nopep8
+        # # Archive/Unarchive Content
+        configurator.add_route('archive_content', '/workspaces/{workspace_id}/contents/{content_id}/archive', request_method='PUT')  # nopep8
+        configurator.add_view(self.archive_content, route_name='archive_content')  # nopep8
+        configurator.add_route('unarchive_content', '/workspaces/{workspace_id}/contents/{content_id}/unarchive', request_method='PUT')  # nopep8
+        configurator.add_view(self.unarchive_content, route_name='unarchive_content')  # nopep8