udata 10.2.1.dev34767__py2.py3-none-any.whl → 10.2.1.dev34775__py2.py3-none-any.whl

udata/harvest/actions.py

@@ -34,25 +34,14 @@ def list_backends():
     return backends.get_all(current_app).values()
 
 
-def _sources_queryset(owner=None, deleted=False):
+def list_sources(owner=None, deleted=False):
+    """List all harvest sources"""
     sources = HarvestSource.objects
     if not deleted:
         sources = sources.visible()
     if owner:
         sources = sources.owned_by(owner)
-    return sources
-
-
-def list_sources(owner=None, deleted=False):
-    """List all harvest sources"""
-    return list(_sources_queryset(owner=owner, deleted=deleted))
-
-
-def paginate_sources(owner=None, page=1, page_size=DEFAULT_PAGE_SIZE, deleted=False):
-    """Paginate harvest sources"""
-    sources = _sources_queryset(owner=owner, deleted=deleted)
-    page = max(page or 1, 1)
-    return sources.paginate(page, page_size)
+    return list(sources)
 
 
 def get_source(ident):

udata/harvest/api.py

@@ -1,4 +1,3 @@
-from bson import ObjectId
 from flask import current_app, request
 from werkzeug.exceptions import BadRequest
 
@@ -253,6 +252,7 @@ source_parser.add_argument(
 source_parser.add_argument(
     "deleted", type=bool, location="args", default=False, help="Include sources flaggued as deleted"
 )
+source_parser.add_argument("q", type=str, location="args", help="The search query")
 
 
 @ns.route("/sources/", endpoint="harvest_sources")
@@ -264,15 +264,19 @@ class SourcesAPI(API):
         """List all harvest sources"""
         args = source_parser.parse_args()
 
-        if args.get("owner") and not ObjectId.is_valid(args.get("owner")):
-            api.abort(400, "`owner` arg must be an identifier")
+        sources = HarvestSource.objects()
 
-        return actions.paginate_sources(
-            args.get("owner"),
-            page=args["page"],
-            page_size=args["page_size"],
-            deleted=args["deleted"],
-        )
+        if not args["deleted"]:
+            sources = sources.visible()
+
+        if args["owner"]:
+            sources = sources.owned_by(args["owner"])
+
+        if args["q"]:
+            phrase_query = " ".join([f'"{elem}"' for elem in args["q"].split(" ")])
+            sources = sources.search_text(phrase_query)
+
+        return sources.paginate(args["page"], args["page_size"])
 
     @api.secure
     @api.doc("create_harvest_source")

udata/harvest/models.py

@@ -155,6 +155,11 @@ class HarvestSource(Owned, db.Document):
 
     meta = {
         "indexes": [
+            {
+                "fields": ["$name", "$url"],
+                "default_language": "french",
+                "weights": {"name": 10, "url": 5},
+            },
             "-created_at",
             "slug",
             ("deleted", "-created_at"),

udata/harvest/tests/test_actions.py

@@ -14,7 +14,7 @@ from udata.core.organization.factories import OrganizationFactory
 from udata.core.user.factories import UserFactory
 from udata.models import Dataset, PeriodicTask
 from udata.tests.helpers import assert_emit, assert_equal_dates
-from udata.utils import Paginable, faker
+from udata.utils import faker
 
 from .. import actions, signals
 from ..backends import BaseBackend
@@ -113,59 +113,6 @@ class HarvestActionsTest:
         for source in sources:
             assert source in result
 
-    def test_paginate_sources(self):
-        result = actions.paginate_sources()
-        assert isinstance(result, Paginable)
-        assert result.page == 1
-        assert result.page_size == actions.DEFAULT_PAGE_SIZE
-        assert result.total == 0
-        assert len(result.objects) == 0
-
-        HarvestSourceFactory.create_batch(3)
-
-        result = actions.paginate_sources(page_size=2)
-        assert isinstance(result, Paginable)
-        assert result.page == 1
-        assert result.page_size == 2
-        assert result.total == 3
-        assert len(result.objects) == 2
-
-        result = actions.paginate_sources(page=2, page_size=2)
-        assert isinstance(result, Paginable)
-        assert result.page == 2
-        assert result.page_size == 2
-        assert result.total == 3
-        assert len(result.objects) == 1
-
-    def test_paginate_sources_exclude_deleted(self):
-        HarvestSourceFactory.create_batch(2)
-        HarvestSourceFactory(deleted=datetime.utcnow())
-
-        result = actions.paginate_sources(page_size=2)
-        assert isinstance(result, Paginable)
-        assert result.page == 1
-        assert result.page_size == 2
-        assert result.total == 2
-        assert len(result.objects) == 2
-
-    def test_paginate_sources_include_deleted(self):
-        HarvestSourceFactory.create_batch(2)
-        HarvestSourceFactory(deleted=datetime.utcnow())
-
-        result = actions.paginate_sources(page_size=2, deleted=True)
-        assert isinstance(result, Paginable)
-        assert result.page == 1
-        assert result.page_size == 2
-        assert result.total == 3
-        assert len(result.objects) == 2
-
-        result = actions.paginate_sources(page=2, page_size=2, deleted=True)
-        assert isinstance(result, Paginable)
-        assert result.page == 2
-        assert result.page_size == 2
-        assert result.total == 3
-        assert len(result.objects) == 1
-
     def test_create_source(self):
         source_url = faker.url()
 

udata/harvest/tests/test_api.py

@@ -8,7 +8,7 @@ from pytest_mock import MockerFixture
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.user.factories import AdminFactory, UserFactory
 from udata.models import Member, PeriodicTask
-from udata.tests.helpers import assert200, assert201, assert204, assert400, assert403
+from udata.tests.helpers import assert200, assert201, assert204, assert400, assert403, assert404
 from udata.tests.plugin import ApiClient
 from udata.utils import faker
 
@@ -85,6 +85,38 @@ class HarvestAPITest(MockBackendsMixin):
 
         assert len(response.json["data"]) == len(sources)
 
+    def test_list_sources_search(self, api):
+        HarvestSourceFactory.create_batch(3)
+        source = HarvestSourceFactory(name="Moissonneur GeoNetwork de la ville de Rennes")
+
+        url = url_for("api.harvest_sources", q="geonetwork rennes")
+        response = api.get(url)
+        assert200(response)
+
+        assert len(response.json["data"]) == 1
+        assert response.json["data"][0]["id"] == str(source.id)
+
+    def test_list_sources_paginate(self, api):
+        total = 25
+        page_size = 20
+        HarvestSourceFactory.create_batch(total)
+
+        url = url_for("api.harvest_sources", page=1, page_size=page_size)
+        response = api.get(url)
+        assert200(response)
+        assert len(response.json["data"]) == page_size
+        assert response.json["total"] == total
+
+        url = url_for("api.harvest_sources", page=2, page_size=page_size)
+        response = api.get(url)
+        assert200(response)
+        assert len(response.json["data"]) == total - page_size
+        assert response.json["total"] == total
+
+        url = url_for("api.harvest_sources", page=3, page_size=page_size)
+        response = api.get(url)
+        assert404(response)
+
     def test_create_source_with_owner(self, api):
         """It should create and attach a new source to an owner"""
         user = api.login()