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

fix bug

parent 94a7900d

rpc/methods.py

+2 −2
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ def advanced_search( 
            resources_set = resources_set.exclude(

                tags__uid__in=search_term["exclude_tags"]

            )

    for resource_instance in resources_set.distinct()[limit_from, limit_to]:

    for resource_instance in resources_set.distinct()[limit_from:limit_to]:

        results["resources"].append(

            serializers.resource(resource_instance, include_metas=include_metas)

        )
@@ -1120,7 +1120,7 @@ def advanced_search( 
            collections_set = collections_set.exclude(

                tags__uid__in=search_term["exclude_tags"]

            )

    for collection_instance in collections_set.distinct()[limit_from, limit_to]:

    for collection_instance in collections_set.distinct()[limit_from:limit_to]:

        results["collections"].append(serializers.collection(collection_instance))



    return results

rpc/tests.py

+25 −0
Original line number Diff line number Diff line
@@ -43,6 +43,17 @@ class ServiceTestCase(TestCase): 
            project=self.test_project, user=self.test_user, role=self.admin_role

        )



        # public user

        self.public_user = User.objects.create(username="public_user")

        self.public_role = models.Role.objects.create(

            label="public", project=self.test_project

        )

        for perm in models.Permission.objects.all():

            self.public_role.permissions.add(perm)

        models.ProjectAccess.objects.get_or_create(

            project=self.test_project, user=self.public_user, role=self.public_role

        )



    def test_ping(self):

        self.assertEqual(

            methods.ping(self.test_user), "pong {}".format(self.test_user.username)
@@ -116,3 +127,17 @@ class ServiceTestCase(TestCase): 
        self.assertEqual(

            len(methods.recycle_bin(self.test_user, self.test_project.pk)), 1

        )



    def test_search(self):

        terms = [

            {"property": "title", "term": "contains", "value": "cherbourg"},

        ]

        methods.advanced_search(

            self.public_user,

            terms,

            self.test_project.pk,

            include_metas=True,

            collection_id=321,

            limit_from=0,

            limit_to=2000,

        )