udata 9.0.1.dev29625__py2.py3-none-any.whl → 9.0.1.dev29667__py2.py3-none-any.whl

udata/api/__init__.py

@@ -323,6 +323,7 @@ def init_app(app):
     import udata.core.activity.api  # noqa
     import udata.core.spatial.api  # noqa
     import udata.core.user.api  # noqa
+    import udata.core.user.apiv2  # noqa
     import udata.core.dataset.api  # noqa
     import udata.core.dataset.apiv2  # noqa
     import udata.core.dataservices.api  # noqa

udata/core/dataservices/models.py

@@ -140,7 +140,7 @@ class Dataservice(WithMetrics, Owned, db.Document):
         db.ListField(
             field(
                 db.ReferenceField(Dataset),
-                nested_fields=datasets_api_fields.dataset_fields,
+                nested_fields=datasets_api_fields.dataset_ref_fields,
             )
         ),
         filterable={

udata/core/topic/models.py

@@ -3,7 +3,7 @@ from mongoengine.signals import pre_save
 from udata.models import db, SpatialCoverage
 from udata.search import reindex
 from udata.tasks import as_task_param
-from udata.core.owned import Owned
+from udata.core.owned import Owned, OwnedQuerySet
 
 
 __all__ = ('Topic', )
@@ -36,7 +36,8 @@ class Topic(db.Document, Owned, db.Datetimed):
             'slug'
         ] + Owned.meta['indexes'],
         'ordering': ['-created_at'],
-        'auto_create_index_on_save': True
+        'auto_create_index_on_save': True,
+        'queryset_class': OwnedQuerySet,
     }
 
     def __str__(self):

udata/core/topic/parsers.py

@@ -11,10 +11,11 @@ class TopicApiParser(ModelApiParser):
         'last_modified': 'last_modified',
     }
 
-    def __init__(self):
+    def __init__(self, with_include_private=True):
         super().__init__()
+        if with_include_private:
+            self.parser.add_argument('include_private', type=bool, location='args')
         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')

udata/core/user/apiv2.py

@@ -0,0 +1,28 @@
+from flask_security import current_user
+
+from udata.api import apiv2, API
+from udata.core.topic.apiv2 import topic_page_fields
+from udata.core.topic.parsers import TopicApiParser
+from udata.models import Topic
+
+me = apiv2.namespace('me', 'Connected user related operations (v2)')
+
+# we will force include_private to True, no need for this arg
+topic_parser = TopicApiParser(with_include_private=False)
+
+
+@me.route('/org_topics/', endpoint='my_org_topics')
+class MyOrgTopicsAPI(API):
+    @apiv2.secure
+    @apiv2.doc('my_org_topics')
+    @apiv2.expect(topic_parser.parser)
+    @apiv2.marshal_list_with(topic_page_fields)
+    def get(self):
+        '''List all topics related to me and my organizations.'''
+        args = topic_parser.parse()
+        args["include_private"] = True
+        owners = list(current_user.organizations) + [current_user.id]
+        topics = Topic.objects.owned_by(*owners)
+        topics = topic_parser.parse_filters(topics, args)
+        sort = args['sort'] or ('$text_score' if args['q'] else None) or '-last-modified'
+        return topics.order_by(sort).paginate(args['page'], args['page_size'])

udata/tests/apiv2/test_me_api.py

@@ -0,0 +1,40 @@
+from flask import url_for
+
+from udata.models import Member
+from udata.core.organization.factories import OrganizationFactory
+from udata.core.topic.factories import TopicFactory
+from udata.tests.api import APITestCase
+
+
+class MeAPIv2Test(APITestCase):
+    modules = []
+
+    def test_my_org_topics(self):
+        user = self.login()
+        member = Member(user=user, role='editor')
+        organization = OrganizationFactory(members=[member])
+        topics = [
+            TopicFactory(organization=organization, private=False, tags=['energy']),
+            TopicFactory(organization=organization, private=True),
+            TopicFactory(owner=user),
+        ]
+        # another topic that shouldn't pop up
+        TopicFactory()
+
+        response = self.get(url_for('apiv2.my_org_topics'))
+        assert response.status_code == 200
+        data = response.json['data']
+        assert len(data) == 3
+        assert all(
+            str(topic.id) in [remote_topic["id"] for remote_topic in data]
+            for topic in topics
+        )
+        assert 'rel' in data[0]['datasets']
+
+        # topic parser is already tested in topics test
+        # we're just making sure one of theme is working
+        response = self.get(url_for('apiv2.my_org_topics', tag='energy'))
+        assert response.status_code == 200
+        data = response.json['data']
+        assert len(data) == 1
+        assert data[0]['id'] == str(topics[0].id)

{udata-9.0.1.dev29625.dist-info → udata-9.0.1.dev29667.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.0.1.dev29625
+Version: 9.0.1.dev29667
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -145,7 +145,9 @@ It is collectively taken care of by members of the
 - Save and show harvest logs [#3053](https://github.com/opendatateam/udata/pull/3053)
 - Fix missing `ObjectId` validation on `/sources` endpoint [#3060](https://github.com/opendatateam/udata/pull/3060)
 - Improve URL validation errors [#3063](https://github.com/opendatateam/udata/pull/3063) [#2768](https://github.com/opendatateam/udata/pull/2768)
+- Do not return full dataset objects on dataservices endpoints [#3068](https://github.com/opendatateam/udata/pull/3068)
 - Update markdown base settings [#3067](https://github.com/opendatateam/udata/pull/3067)
+- Add api endpoint /me/org_topics/ [#3070](https://github.com/opendatateam/udata/pull/3070)
 
 ## 9.0.0 (2024-06-07)
 
@@ -165,7 +167,7 @@ It is collectively taken care of by members of the
 - Allow for series in CSW ISO 19139 DCAT backend [#3028](https://github.com/opendatateam/udata/pull/3028)
 - Add `email` to membership request list API response, add `since` to org members API responses, add `email` to members of org on show org endpoint for org's admins and editors [#3038](https://github.com/opendatateam/udata/pull/3038)
 - Add `resources_downloads` to datasets metrics [#3042](https://github.com/opendatateam/udata/pull/3042)
-- Fix do not override resources extras on admin during update [#3043](https://github.com/opendatateam/udata/pull/3043) 
+- Fix do not override resources extras on admin during update [#3043](https://github.com/opendatateam/udata/pull/3043)
 - Endpoint /users is now protected by admin permissions [#3047](https://github.com/opendatateam/udata/pull/3047)
 - Fix trailing `/` inside `GeoZone` routes not redirecting. Disallow `/` inside `GeoZone` ids [#3045](https://github.com/opendatateam/udata/pull/3045)
 

{udata-9.0.1.dev29625.dist-info → udata-9.0.1.dev29667.dist-info}/RECORD

@@ -24,7 +24,7 @@ udata/worker.py,sha256=K-Wafye5-uXP4kQlffRKws2J9YbJ6m6n2QjcVsY8Nsg,118
 udata/wsgi.py,sha256=P7AJvZ5JqY4uRSBOzaFiBniChWIU9RVQ-Y0PN4vCCMY,77
 udata/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/admin/views.py,sha256=wMlpnC1aINW-6JDk6-kQXhcTYBZH-5wajEuWzVDcIKA,331
-udata/api/__init__.py,sha256=I40g3PLG4s-zGNQfjB8_KQGzfs3ZyUrZdajd20vQ9ks,11388
+udata/api/__init__.py,sha256=RhgO7r6ROJzhEybCDmtHRwIiUpE-LjEIUr7dRmNdSeg,11429
 udata/api/commands.py,sha256=oK2p1VdUvULDdYuvYYpYvY_bdkPJy-KfROfoX71oOuA,3277
 udata/api/errors.py,sha256=Sy_f3WVrNTUPZjCOogIVgocDdUjnKz149KDi4mMA_Lg,240
 udata/api/fields.py,sha256=l-Fa27-easR86qgof2bk130jq1N1pNUgGmQzok1UI3Q,3094
@@ -80,7 +80,7 @@ udata/core/contact_point/forms.py,sha256=ggLhSJ1IRn5MclrhydckjAxwr4fFZxgAD4huSSu
 udata/core/contact_point/models.py,sha256=NlNKureCpzgTLJuGviZPjNx-ABYRp4j2L-ur9Gmixao,324
 udata/core/dataservices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataservices/api.py,sha256=rjCU55NNGgCDRlurfhJUT2byBGJWN5coM8b7AApzEew,3090
-udata/core/dataservices/models.py,sha256=8hqBRlxvEbfu6PqRzhfceU3r-93Px0jgzNoixgTQBfs,5864
+udata/core/dataservices/models.py,sha256=zMhzjnXm1p5GHZU1lYgMqft5u7iFyX0BIvNB1hM4D6Q,5868
 udata/core/dataservices/permissions.py,sha256=X9Bh8e0pnx6OgeEf6NowXZUiwyreUa6UY479B16cCqs,175
 udata/core/dataservices/rdf.py,sha256=TV02R2ZV_aDboSyl-4LJN1qG-5ibgrUYQZYmpl6Jqr4,2469
 udata/core/dataservices/tasks.py,sha256=NOWcTPoLasMrrvq9EkwQMGlUbQQmi_l3s815K-mtZTM,971
@@ -221,13 +221,14 @@ 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=ksWcIAoYiKCS48q2-RKMYbNJfz1z9H0fBYM9lswFr-8,717
 udata/core/topic/forms.py,sha256=XqGI4nANdsm2UkIiGAuVqEdZkN5N9sqJ4VaM_PhTaVQ,987
-udata/core/topic/models.py,sha256=Fsq4ONTOhDkgNijhRHXqUAOwtqAcUbjanmjftXN5GNE,2100
-udata/core/topic/parsers.py,sha256=p2JCGfjeqb5GQTstZssclzLRLqUHy7KWJ7TDcLSF51M,2103
+udata/core/topic/models.py,sha256=MOBrUNJ32r9Avsz1ueuF5DW3UEHIvxDyMUyxc8II-ig,2157
+udata/core/topic/parsers.py,sha256=4fOvUA5wE9NBtq8liF_mnsgF7obCsfPNzNpgc-tnQf0,2167
 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
 udata/core/user/api.py,sha256=ngVaVv17Jwrd4sv1Vp4FduSRan5wv2mOP9y43xWbjPk,12781
 udata/core/user/api_fields.py,sha256=aWw-vaLy5KqE8vr6HtWzoAbzHI8aoi9BV-m-oY7FJfo,5052
+udata/core/user/apiv2.py,sha256=j9qOqoQw5OQvRy84xcOHtf_SJqbpFwmE0OVdPWGwxjg,1125
 udata/core/user/commands.py,sha256=DlNBFaojhhPHH4kZazp0NMwYWnzPZXBba_vqH-cfR1U,3156
 udata/core/user/constants.py,sha256=aTluhTR2RGZ_cdG7-mkEoT5Ndbg8BNUwwzCOld0aLMY,77
 udata/core/user/factories.py,sha256=JiY-AghapelwhAVAExiUEHS1odyIu4PppWuhtZnkjBY,790
@@ -607,6 +608,7 @@ udata/tests/api/test_transfer_api.py,sha256=aGGJp79YYHQQyMAKhp7urk4eD587v3kbIy-8
 udata/tests/api/test_user_api.py,sha256=IWMonc6qAsUVAGkxb-FqnwPSO6dGNsdS3c8rLwXvGEA,14659
 udata/tests/apiv2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/apiv2/test_datasets.py,sha256=QDebrTdElry2yf3icjpo7FPm183U2vscHLpZrfap_3Y,18420
+udata/tests/apiv2/test_me_api.py,sha256=GjreAZfH3-j-yDgDqNrtPolUPAiqs_OJVtrQUkMm3Ww,1430
 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=UA5LcILq7zUa9TXi1iplrvtcY5C0u-0R8PvTCUWPs2Q,10106
@@ -688,9 +690,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=iAUNwbI8ESi8MHkE3ZCYCSIXfFC27z
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=uTmbHfzyFWrVXUkKSuNFzbGpX7EkUuBdD8fE04d3v5g,44572
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=1MbQHvKKNUwzMBWLNsH1qqBehO3aILhQiMhi5u1bY8E,28553
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=AAryt27Gbkhk7FntCCU8_e7HSXATfsAQhwFOFC8CAj0,51152
-udata-9.0.1.dev29625.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.0.1.dev29625.dist-info/METADATA,sha256=5iFQ5eGwqQr2AtgVLrJREIC6cVoa2tsnX4tkCNIaJE4,124938
-udata-9.0.1.dev29625.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.0.1.dev29625.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.0.1.dev29625.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.0.1.dev29625.dist-info/RECORD,,
+udata-9.0.1.dev29667.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.0.1.dev29667.dist-info/METADATA,sha256=jRGiYzGgQ4kjdR658hbqRitIq0Fl3XwiPfcKbR_eXmI,125149
+udata-9.0.1.dev29667.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.0.1.dev29667.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.0.1.dev29667.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.0.1.dev29667.dist-info/RECORD,,