udata 7.0.7.dev28351__py2.py3-none-any.whl → 7.0.7.dev28410__py2.py3-none-any.whl

udata/core/topic/factories.py

@@ -16,6 +16,7 @@ class TopicFactory(ModelFactory):
     description = factory.Faker('text')
     tags = factory.LazyAttribute(lambda o: [utils.unique_string(16)
                                  for _ in range(3)])
+    private = False
 
     @factory.lazy_attribute
     def datasets(self):

udata/core/topic/parsers.py

@@ -1,15 +1,24 @@
+from bson.objectid import ObjectId
+
+from udata.api import api
 from udata.api.parsers import ModelApiParser
 
 
 class TopicApiParser(ModelApiParser):
     sorts = {
         'name': 'name',
-        'created': 'created_at'
+        'created': 'created_at',
+        'last_modified': 'last_modified',
     }
 
     def __init__(self):
         super().__init__()
         self.parser.add_argument('tag', type=str, location='args')
+        self.parser.add_argument('include_private', type=bool, location='args')
+        self.parser.add_argument('geozone', type=str, location='args')
+        self.parser.add_argument('granularity', type=str, location='args')
+        self.parser.add_argument('organization', type=str, location='args')
+        self.parser.add_argument('owner', type=str, location='args')
 
     @staticmethod
     def parse_filters(topics, args):
@@ -22,4 +31,18 @@ class TopicApiParser(ModelApiParser):
             topics = topics.search_text(phrase_query)
         if args.get('tag'):
             topics = topics.filter(tags=args['tag'])
+        if not args.get('include_private'):
+            topics = topics.filter(private=False)
+        if args.get('geozone'):
+            topics = topics.filter(spatial__zones=args['geozone'])
+        if args.get('granularity'):
+            topics = topics.filter(spatial__granularity=args['granularity'])
+        if args.get('organization'):
+            if not ObjectId.is_valid(args['organization']):
+                api.abort(400, 'Organization arg must be an identifier')
+            topics = topics.filter(organization=args['organization'])
+        if args.get('owner'):
+            if not ObjectId.is_valid(args['owner']):
+                api.abort(400, 'Owner arg must be an identifier')
+            topics = topics.filter(owner=args['owner'])
         return topics

udata/tests/api/test_topics_api.py

@@ -1,9 +1,10 @@
 from flask import url_for
 
 from udata.core.organization.factories import OrganizationFactory
+from udata.core.spatial.factories import SpatialCoverageFactory
 from udata.core.spatial.models import spatial_granularities
-from udata.core.topic.models import Topic
 from udata.core.topic.factories import TopicFactory
+from udata.core.topic.models import Topic
 from udata.core.user.factories import UserFactory
 from udata.models import Member, Discussion
 from udata.tests.api.test_datasets_api import SAMPLE_GEOM
@@ -17,13 +18,23 @@ class TopicsAPITest(APITestCase):
 
     def test_topic_api_list(self):
         '''It should fetch a topic list from the API'''
-        TopicFactory.create_batch(3)
+        owner = UserFactory()
+        org = OrganizationFactory()
+        paca, _, _ = create_geozones_fixtures()
+
         tag_topic = TopicFactory(tags=['energy'])
         name_topic = TopicFactory(name='topic-for-query')
+        private_topic = TopicFactory(private=True)
+        geozone_topic = TopicFactory(spatial=SpatialCoverageFactory(zones=[paca.id]))
+        granularity_topic = TopicFactory(
+            spatial=SpatialCoverageFactory(granularity='country')
+        )
+        owner_topic = TopicFactory(owner=owner)
+        org_topic = TopicFactory(organization=org)
 
         response = self.get(url_for('api.topics'))
         self.assert200(response)
-        self.assertEqual(len(response.json['data']), 5)
+        self.assertEqual(len(response.json['data']), 6)
 
         response = self.get(url_for('api.topics', q='topic-for'))
         self.assert200(response)
@@ -49,6 +60,32 @@ class TopicsAPITest(APITestCase):
             self.assertIsNotNone(reuse['uri'])
         self.assertEqual(len(reuses), 3)
 
+        response = self.get(url_for('api.topics', include_private='true'))
+        self.assert200(response)
+        self.assertEqual(len(response.json['data']), 7)
+        self.assertIn(str(private_topic.id), [t['id'] for t in response.json['data']])
+
+        response = self.get(url_for('api.topics', geozone=paca.id))
+        self.assert200(response)
+        self.assertEqual(len(response.json['data']), 1)
+        self.assertIn(str(geozone_topic.id), [t['id'] for t in response.json['data']])
+
+        response = self.get(url_for('api.topics', granularity='country'))
+        self.assert200(response)
+        self.assertEqual(len(response.json['data']), 1)
+        self.assertIn(str(granularity_topic.id), [t['id'] for t in response.json['data']])
+
+        response = self.get(url_for('api.topics', owner=owner.id))
+        self.assert200(response)
+        self.assertEqual(len(response.json['data']), 1)
+        self.assertIn(str(owner_topic.id), [t['id'] for t in response.json['data']])
+
+        response = self.get(url_for('api.topics', organization=org.id))
+        self.assert200(response)
+        self.assertEqual(len(response.json['data']), 1)
+        self.assertIn(str(org_topic.id), [t['id'] for t in response.json['data']])
+
+
     def test_topic_api_get(self):
         '''It should fetch a topic from the API'''
         topic = TopicFactory()

udata/tests/apiv2/test_topics.py

@@ -1,10 +1,13 @@
 from flask import url_for
 
-from udata.tests.api import APITestCase
 from udata.core.dataset.factories import DatasetFactory
-from udata.core.topic.factories import TopicFactory
+from udata.core.organization.factories import OrganizationFactory
+from udata.core.spatial.factories import SpatialCoverageFactory
 from udata.core.reuse.factories import ReuseFactory
+from udata.core.topic.factories import TopicFactory
 from udata.core.user.factories import UserFactory
+from udata.tests.api import APITestCase
+from udata.tests.features.territories import create_geozones_fixtures
 
 
 class TopicsAPITest(APITestCase):
@@ -12,14 +15,24 @@ class TopicsAPITest(APITestCase):
 
     def test_topic_api_list(self):
         '''It should fetch a topic list from the API'''
-        TopicFactory.create_batch(3)
+        owner = UserFactory()
+        org = OrganizationFactory()
+        paca, _, _ = create_geozones_fixtures()
+
         tag_topic = TopicFactory(tags=['energy'])
         name_topic = TopicFactory(name='topic-for-query')
+        private_topic = TopicFactory(private=True)
+        geozone_topic = TopicFactory(spatial=SpatialCoverageFactory(zones=[paca.id]))
+        granularity_topic = TopicFactory(
+            spatial=SpatialCoverageFactory(granularity='country')
+        )
+        owner_topic = TopicFactory(owner=owner)
+        org_topic = TopicFactory(organization=org)
 
         response = self.get(url_for('apiv2.topics_list'))
         assert response.status_code == 200
         data = response.json['data']
-        assert len(data) == 5
+        assert len(data) == 6
 
         hateoas_fields = ["rel", "href", "type", "total"]
         assert all(k in data[0]["datasets"] for k in hateoas_fields)
@@ -35,6 +48,31 @@ class TopicsAPITest(APITestCase):
         assert len(response.json['data']) == 1
         assert response.json['data'][0]['id'] == str(tag_topic.id)
 
+        response = self.get(url_for('api.topics', include_private='true'))
+        assert response.status_code == 200
+        assert len(response.json['data']) == 7
+        assert str(private_topic.id) in [t['id'] for t in response.json['data']]
+
+        response = self.get(url_for('api.topics', geozone=paca.id))
+        assert response.status_code == 200
+        assert len(response.json['data']) == 1
+        assert str(geozone_topic.id) in [t['id'] for t in response.json['data']]
+
+        response = self.get(url_for('api.topics', granularity='country'))
+        assert response.status_code == 200
+        assert len(response.json['data']) == 1
+        assert str(granularity_topic.id) in [t['id'] for t in response.json['data']]
+
+        response = self.get(url_for('api.topics', owner=owner.id))
+        assert response.status_code == 200
+        assert len(response.json['data']) == 1
+        assert str(owner_topic.id) in [t['id'] for t in response.json['data']]
+
+        response = self.get(url_for('api.topics', organization=org.id))
+        assert response.status_code == 200
+        assert len(response.json['data']) == 1
+        assert str(org_topic.id) in [t['id'] for t in response.json['data']]
+
     def test_topic_api_get(self):
         '''It should fetch a topic from the API'''
         topic = TopicFactory()

{udata-7.0.7.dev28351.dist-info → udata-7.0.7.dev28410.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 7.0.7.dev28351
+Version: 7.0.7.dev28410
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -138,7 +138,7 @@ It is collectively taken care of by members of the
 
 ## Current (in progress)
 
-- Nothing yet
+- Topic: add filters in API [#3007](https://github.com/opendatateam/udata/pull/3007)
 
 ## 7.0.6 (2024-03-29)
 

{udata-7.0.7.dev28351.dist-info → udata-7.0.7.dev28410.dist-info}/RECORD

@@ -203,10 +203,10 @@ udata/core/tags/views.py,sha256=BoBktrbx0tqkIu3yYLj_XJjB7ZHu_tq5vfEBrh0MUwI,384
 udata/core/topic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/topic/api.py,sha256=G3hN4e9rK5mIYvDLvPpAOo_DN2SySAGykVVvXGx4uMY,5105
 udata/core/topic/apiv2.py,sha256=cf-WUSZ7P6Tss3S8utS-uhreLgGI5XR3nn_1UWiZ_Xs,9846
-udata/core/topic/factories.py,sha256=Vy9dMVSI6XMeAWhxLH1OFJ0vbmEoOtStPDE6HF_nIc4,697
+udata/core/topic/factories.py,sha256=ksWcIAoYiKCS48q2-RKMYbNJfz1z9H0fBYM9lswFr-8,717
 udata/core/topic/forms.py,sha256=XqGI4nANdsm2UkIiGAuVqEdZkN5N9sqJ4VaM_PhTaVQ,987
 udata/core/topic/models.py,sha256=PZsYfiuEU86iL1x-qvDevn4Io8lKGahAbqky03j1N2k,2071
-udata/core/topic/parsers.py,sha256=oe_4ehnlgPKre2GG1LA6hcQa6H5V5q1adUsQIzVqb_Q,876
+udata/core/topic/parsers.py,sha256=p2JCGfjeqb5GQTstZssclzLRLqUHy7KWJ7TDcLSF51M,2103
 udata/core/topic/permissions.py,sha256=RtFPPlxuU_Bv7ip6LDO4AoPrKFnIOEs9cCMXaSSmEdk,118
 udata/core/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/user/activities.py,sha256=AMRbYgum8uJXAS3L-ddQN-xKtKRvsmesDZ0ItBY_jS0,2799
@@ -579,14 +579,14 @@ udata/tests/api/test_organizations_api.py,sha256=HxeTqP14wlWGaQt4fpQljuRy98HWnmL
 udata/tests/api/test_reuses_api.py,sha256=gQ-o4JXK2S6z2yW13-i8e81pCdr9j2yyM1KinPbkc5g,16971
 udata/tests/api/test_swagger.py,sha256=tLg452rCD5Q0AgFXOVZKMM6jGiWwC5diX5PxbdYni0o,760
 udata/tests/api/test_tags_api.py,sha256=xSIx_x5gqKz6BJCXKEsTqA_CR4BF1nG5NxEyfp9dy0o,2579
-udata/tests/api/test_topics_api.py,sha256=BYkfBJpz58DbCZ_fgPvpH0unKPJ1PY8B5dm9Km4YWkQ,7586
+udata/tests/api/test_topics_api.py,sha256=RItjoO7g2o2BZ34cOHJvPoSus_jIe-AYHFrX_iaHQ4o,9322
 udata/tests/api/test_transfer_api.py,sha256=aGGJp79YYHQQyMAKhp7urk4eD587v3kbIy-8rJ_kk1s,2901
 udata/tests/api/test_user_api.py,sha256=NVXsn-sRrMQYbbUyJ2_I2_C3UPfzgCZv-us6RvM5VE8,13597
 udata/tests/apiv2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/apiv2/test_datasets.py,sha256=j2cuaGtTnpF5TAvuzMEmx0uEXvuANlIKS5quupJocx4,17953
 udata/tests/apiv2/test_organizations.py,sha256=CpNG8xl13rZXxTN2-JRx9ZkyI7IuQUaOsNuumUxuB3I,6704
 udata/tests/apiv2/test_swagger.py,sha256=D8jpRqDUmqVkNVYkYaXfvMPUc7OBVs_dMsC13KZciWE,785
-udata/tests/apiv2/test_topics.py,sha256=d30tJU167B5r8WWBHvI9rKdjnGrVpf7-HyvKlWyaxtc,8260
+udata/tests/apiv2/test_topics.py,sha256=UA5LcILq7zUa9TXi1iplrvtcY5C0u-0R8PvTCUWPs2Q,10106
 udata/tests/cli/test_cli_base.py,sha256=piqoq4Ib5bdZQpuUAJh583qfjCSglWZQclKzhO3Yr_0,321
 udata/tests/cli/test_db_cli.py,sha256=-hw9SU3RvNT7fvqVtQHxEpKstnjMU4L_DY9tiBH-ybs,1726
 udata/tests/data/image.jpg,sha256=hdmpaCjOhmAAfNGuTqWKEjv7IC4GXJx-nP_rT274hc8,337049
@@ -664,9 +664,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=zCVMB-a4-mLM1jNyYMk58rgVRaVIwQ
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=avfWczvlLBKSohyB55-4TLmUGMU_Rze4XmAo4OTk2v0,43513
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=ScuqdpaV4y1ZIpBAEfxeaKdzkyGZL0mJmKMoG6w0iRQ,28553
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=QpgEXh1eHjztPa7oNLXd_sds1DC95A-STTtZyTE4m-E,50093
-udata-7.0.7.dev28351.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-7.0.7.dev28351.dist-info/METADATA,sha256=O7c7cWQ0rDluGfxbKvfyguPOtWQl62dHJuKvWtCddmI,120163
-udata-7.0.7.dev28351.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-udata-7.0.7.dev28351.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-7.0.7.dev28351.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-7.0.7.dev28351.dist-info/RECORD,,
+udata-7.0.7.dev28410.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-7.0.7.dev28410.dist-info/METADATA,sha256=7NK8ToqaPXg_f86QirGUcBqziTraRBZ8oWQLcYmStyE,120234
+udata-7.0.7.dev28410.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+udata-7.0.7.dev28410.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-7.0.7.dev28410.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-7.0.7.dev28410.dist-info/RECORD,,