Commit 0ffc3a27 authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

fix collection bug

parent 36421bd5

rpc/methods.py

+3 −2
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ def collections( 
                project__projectaccess__user=user,

                project__projectaccess__role__permissions__label="collection.read",

            )

            project_id = parent.project_id

    except Collection.DoesNotExist:

        raise ServiceException("no such collection")

    limit_from = int(limit_from)
@@ -325,7 +326,7 @@ def collections( 
    data = []

    if flat_list:

        query_set: Union[Iterator[Collection], QuerySet] = Collection.objects.filter(

            project=parent.project,

            project_id=project_id,

            deleted_at__isnull=True,

            project__projectaccess__user=user,

            project__projectaccess__role__permissions__label="collection.read",
@@ -334,7 +335,7 @@ def collections( 
        query_set: Union[Iterator[Collection], QuerySet] = Collection.objects.filter(

            parent=parent,

            deleted_at__isnull=True,

            project=parent.project,

            project_id=project_id,

            project__projectaccess__user=user,

            project__projectaccess__role__permissions__label="collection.read",

        )

rpc/serializers.py

+1 −3
Original line number Diff line number Diff line
@@ -76,9 +76,7 @@ def collection(collection_instance: models.Collection, recursive: bool = False) 
        .count(),

        "descendants_count": collection_instance.descendants_count(),

        "descendants_resources_count": collection_instance.descendants_resources_count(),

        "parent": collection_instance.parent_id

        if collection_instance.parent_id != 1

        else None,

        "parent": collection_instance.parent_id,

        "children": None,

        "project_id": collection_instance.project_id,

        "metas": [],

rpc/tests.py

+9 −0
Original line number Diff line number Diff line
@@ -53,3 +53,12 @@ class ServiceTestCase(TestCase): 
            self.assertTrue(

                methods.has_permission(self.test_user, self.test_project.pk, perm.label)

            )



    def test_add_collection(self):

        collection = methods.add_collection(

            self.test_user, "test_collection", project_id=self.test_project.pk

        )

        collections = methods.collections(

            self.test_user, project_id=self.test_project.pk

        )

        self.assertEqual(len(collections), 1)