udata 9.1.4__py2.py3-none-any.whl → 9.1.4.dev30973__py2.py3-none-any.whl

udata/commands/purge.py

@@ -3,9 +3,8 @@ import logging
 import click
 
 from udata.commands import cli, success
-
-from udata.core.dataset.tasks import purge_datasets  # isort: skip
 from udata.core.dataservices.tasks import purge_dataservices
+from udata.core.dataset.tasks import purge_datasets
 from udata.core.organization.tasks import purge_organizations
 from udata.core.reuse.tasks import purge_reuses
 

udata/commands/tests/test_fixtures.py

@@ -1,7 +1,10 @@
+import json
 from tempfile import NamedTemporaryFile
 
 import pytest
 import requests
+import werkzeug.test
+from pytest_mock import MockerFixture
 from werkzeug.wrappers.response import Response
 
 import udata.commands.fixtures
@@ -14,7 +17,7 @@ from udata.core.dataset.factories import (
 )
 from udata.core.discussions.factories import DiscussionFactory, MessageDiscussionFactory
 from udata.core.organization.factories import OrganizationFactory
-from udata.core.organization.models import Member
+from udata.core.organization.models import Member, Organization
 from udata.core.reuse.factories import ReuseFactory
 from udata.core.user.factories import UserFactory
 
@@ -27,28 +30,21 @@ class FixturesTest:
         """Test generating fixtures from the current env, then importing them back."""
         assert models.Dataset.objects.count() == 0  # Start with a clean slate.
         user = UserFactory()
-        admin = UserFactory()
-        org = OrganizationFactory(
-            members=[Member(user=user, role="editor"), Member(user=admin, role="admin")]
-        )
+        org = OrganizationFactory(**{}, members=[Member(user=user)])
         # Set the same slug we're 'exporting' from the FIXTURE_DATASET_SLUG config, see the
         # @pytest.mark.options above.
-        dataset = DatasetFactory(slug="some-test-dataset-slug", organization=org)
-        res = ResourceFactory()
+        dataset = DatasetFactory(**{}, slug="some-test-dataset-slug", organization=org)
+        res = ResourceFactory(**{})
         dataset.add_resource(res)
-        ReuseFactory(datasets=[dataset], owner=user)
-        CommunityResourceFactory(dataset=dataset, owner=user)
+        ReuseFactory(**{}, datasets=[dataset], owner=user)
+        CommunityResourceFactory(**{}, dataset=dataset, owner=user)
         DiscussionFactory(
             **{},
             subject=dataset,
             user=user,
-            discussion=[
-                MessageDiscussionFactory(posted_by=user),
-                MessageDiscussionFactory(posted_by=admin),
-            ],
-            closed_by=admin,
+            discussion=[MessageDiscussionFactory(**{}, posted_by=user)],
         )
-        DataserviceFactory(datasets=[dataset], organization=org)
+        DataserviceFactory(**{}, datasets=[dataset])
 
         with NamedTemporaryFile(mode="w+", delete=True) as fixtures_fd:
             # Get the fixtures from the local instance.
@@ -58,43 +54,14 @@ class FixturesTest:
             fixtures_fd.flush()
             assert "Fixtures saved to file " in result.output
 
-            # Delete everything, so we can make sure the objects are imported.
-            models.Organization.drop_collection()
-            models.Dataset.drop_collection()
-            models.Discussion.drop_collection()
-            models.CommunityResource.drop_collection()
-            models.User.drop_collection()
-            models.Dataservice.drop_collection()
-
-            assert models.Organization.objects(slug=org.slug).count() == 0
-            assert models.Dataset.objects.count() == 0
-            assert models.Discussion.objects.count() == 0
-            assert models.CommunityResource.objects.count() == 0
-            assert models.User.objects.count() == 0
-            assert models.Dataservice.objects.count() == 0
-
             # Then load them in the database to make sure they're correct.
             result = cli("import-fixtures", fixtures_fd.name)
         assert models.Organization.objects(slug=org.slug).count() > 0
-        result_org = models.Organization.objects.get(slug=org.slug)
-        assert result_org.members[0].user.id == user.id
-        assert result_org.members[0].role == "editor"
-        assert result_org.members[1].user.id == admin.id
-        assert result_org.members[1].role == "admin"
         assert models.Dataset.objects.count() > 0
         assert models.Discussion.objects.count() > 0
-        result_discussion = models.Discussion.objects.first()
-        assert result_discussion.user.id == user.id
-        assert result_discussion.closed_by.id == admin.id
-        assert len(result_discussion.discussion) == 2
-        assert result_discussion.discussion[0].posted_by.id == user.id
-        assert result_discussion.discussion[1].posted_by.id == admin.id
         assert models.CommunityResource.objects.count() > 0
         assert models.User.objects.count() > 0
         assert models.Dataservice.objects.count() > 0
-        # Make sure we also import the dataservice organization
-        result_dataservice = models.Dataservice.objects.first()
-        assert result_dataservice.organization == org
 
     def test_import_fixtures_from_default_file(self, cli):
         """Test importing fixtures from udata.commands.fixture.DEFAULT_FIXTURE_FILE."""

udata/core/activity/api.py

@@ -1,6 +1,5 @@
 import logging
 
-from bson import ObjectId
 from mongoengine.errors import DoesNotExist
 
 from udata.api import API, api, fields
@@ -62,19 +61,13 @@ activity_parser.add_argument(
     help="Filter activities for that particular organization",
     location="args",
 )
-activity_parser.add_argument(
-    "related_to",
-    type=str,
-    help="Filter activities for that particular object id (ex : reuse, dataset, etc.)",
-    location="args",
-)
 
 
 @api.route("/activity", endpoint="activity")
 class SiteActivityAPI(API):
     @api.doc("activity")
     @api.expect(activity_parser)
-    @api.marshal_with(activity_page_fields)
+    @api.marshal_list_with(activity_page_fields)
     def get(self):
         """Fetch site activity, optionally filtered by user of org."""
         args = activity_parser.parse_args()
@@ -86,12 +79,6 @@ class SiteActivityAPI(API):
         if args["user"]:
             qs = qs(actor=args["user"])
 
-        if args["related_to"]:
-            if not ObjectId.is_valid(args["related_to"]):
-                api.abort(400, "`related_to` arg must be an identifier")
-
-            qs = qs(related_to=args["related_to"])
-
         qs = qs.order_by("-created_at")
         qs = qs.paginate(args["page"], args["page_size"])
 

udata/core/activity/tasks.py

@@ -1,7 +1,7 @@
 import logging
 
 from udata.models import Organization, User, db
-from udata.tasks import task
+from udata.tasks import celery, task
 
 from .signals import new_activity
 

udata/core/badges/models.py

@@ -5,9 +5,9 @@ from mongoengine.signals import post_save
 
 from udata.api_fields import field
 from udata.auth import current_user
-from udata.core.badges.fields import badge_fields
 from udata.mongo import db
 
+from .fields import badge_fields
 from .signals import on_badge_added, on_badge_removed
 
 log = logging.getLogger(__name__)
@@ -42,11 +42,7 @@ class BadgesList(db.EmbeddedDocumentListField):
 
 
 class BadgeMixin(object):
-    badges = field(
-        BadgesList(),
-        readonly=True,
-        inner_field_info={"nested_fields": badge_fields},
-    )
+    badges = BadgesList()
 
     def get_badge(self, kind):
         """Get a badge given its kind if present"""

udata/core/contact_point/api.py

@@ -1,8 +1,10 @@
 from udata.api import API, api
 from udata.api.parsers import ModelApiParser
+from udata.auth import admin_permission
 
-from .api_fields import contact_point_fields
+from .api_fields import contact_point_fields, contact_point_page_fields
 from .forms import ContactPointForm
+from .models import ContactPoint
 
 
 class ContactPointApiParser(ModelApiParser):

udata/core/dataservices/api.py

@@ -1,23 +1,18 @@
 from datetime import datetime
 
 import mongoengine
-from flask import make_response, redirect, request, url_for
+from flask import request
 from flask_login import current_user
 
 from udata.api import API, api
 from udata.api_fields import patch
 from udata.core.dataset.permissions import OwnablePermission
 from udata.core.followers.api import FollowAPI
-from udata.rdf import RDF_EXTENSIONS, graph_response, negociate_content
 
 from .models import Dataservice
-from .permissions import DataserviceEditPermission
-from .rdf import dataservice_to_rdf
 
 ns = api.namespace("dataservices", "Dataservices related operations (beta)")
 
-common_doc = {"params": {"dataservice": "The dataservice ID or slug"}}
-
 
 @ns.route("/", endpoint="dataservices")
 class DataservicesAPI(API):
@@ -92,37 +87,6 @@ class DataserviceAPI(API):
         return "", 204
 
 
-@ns.route("/<dataservice:dataservice>/rdf", endpoint="dataservice_rdf", doc=common_doc)
-@api.response(404, "Dataservice not found")
-@api.response(410, "Dataservice has been deleted")
-class DataserviceRdfAPI(API):
-    @api.doc("rdf_dataservice")
-    def get(self, dataservice):
-        format = RDF_EXTENSIONS[negociate_content()]
-        url = url_for("api.dataservice_rdf_format", dataservice=dataservice.id, format=format)
-        return redirect(url)
-
-
-@ns.route(
-    "/<dataservice:dataservice>/rdf.<format>", endpoint="dataservice_rdf_format", doc=common_doc
-)
-@api.response(404, "Dataservice not found")
-@api.response(410, "Dataservice has been deleted")
-class DataserviceRdfFormatAPI(API):
-    @api.doc("rdf_dataservice_format")
-    def get(self, dataservice, format):
-        if not DataserviceEditPermission(dataservice).can():
-            if dataservice.private:
-                api.abort(404)
-            elif dataservice.deleted_at:
-                api.abort(410)
-
-        resource = dataservice_to_rdf(dataservice)
-        # bypass flask-restplus make_response, since graph_response
-        # is handling the content negociation directly
-        return make_response(*graph_response(resource, format))
-
-
 @ns.route("/<id>/followers/", endpoint="dataservice_followers")
 @ns.doc(
     get={"id": "list_dataservice_followers"},

udata/core/dataservices/models.py

@@ -1,7 +1,5 @@
 from datetime import datetime
 
-from mongoengine import Q
-
 import udata.core.contact_point.api_fields as contact_api_fields
 import udata.core.dataset.api_fields as datasets_api_fields
 from udata.api_fields import field, function_field, generate_fields
@@ -31,42 +29,6 @@ class DataserviceQuerySet(OwnedQuerySet):
     def hidden(self):
         return self(db.Q(private=True) | db.Q(deleted_at__ne=None) | db.Q(archived_at__ne=None))
 
-    def filter_by_dataset_pagination(self, datasets: list[Dataset], page: int):
-        """Paginate the dataservices on the datasets provided.
-
-        This is a workaround, used (at least) in the catalogs for sites and organizations.
-        We paginate those kinda weirdly, on their datasets. So a given organization or site
-        catalog will only list a `page_size` number of datasets, but we'd still want to display
-        the site's or org's dataservices.
-        We can't "double paginate", so instead:
-        - only if it's the first page, list all the dataservices that serve no dataset
-        - list all the dataservices that serve the datasets in this page
-        """
-        # We need to add Dataservice to the catalog.
-        # In the best world, we want:
-        # - Keep the correct number of datasets on the page (if the requested page size is 100, we should have 100 datasets)
-        # - Have simple MongoDB queries
-        # - Do not duplicate the datasets (each dataset is present once in the catalog)
-        # - Do not duplicate the dataservices (each dataservice is present once in the catalog)
-        # - Every referenced dataset for one dataservices present on the page (hard to do)
-        #
-        # Multiple solutions are possible but none check all the constraints.
-        # The selected one is to put all the dataservices referencing at least one of the dataset on
-        # the page at the end of it. It means dataservices could be duplicated (present on multiple pages)
-        # and these dataservices may referenced some datasets not present in the current page. It's working
-        # if somebody is doing the same thing as us (keeping the list of all the datasets IDs for the entire catalog then
-        # listing all dataservices in a second pass)
-        # Another option is to do some tricky Mongo requests to order/group datasets by their presence in some dataservices but
-        # it could be really hard to do with a n..n relation.
-        # Let's keep this solution simple right now and iterate on it in the future.
-        dataservices_filter = Q(datasets__in=[d.id for d in datasets])
-
-        # On the first page, add all dataservices without datasets
-        if page == 1:
-            dataservices_filter = dataservices_filter | Q(datasets__size=0)
-
-        return self(dataservices_filter)
-
 
 @generate_fields()
 class HarvestMetadata(db.EmbeddedDocument):

udata/core/dataservices/tasks.py

@@ -3,7 +3,7 @@ from celery.utils.log import get_task_logger
 from udata.core.dataservices.models import Dataservice
 
 # from udata.harvest.models import HarvestJob
-from udata.models import Discussion, Follow, Transfer
+from udata.models import Activity, Discussion, Follow, Transfer
 from udata.tasks import job
 
 log = get_task_logger(__name__)

udata/core/dataset/events.py

@@ -49,10 +49,7 @@ def publish(url, document, resource_id, action):
         "dataset_id": str(document.id),
         "document": resource,
     }
-    headers = {}
-    if current_app.config["RESOURCES_ANALYSER_API_KEY"]:
-        headers = {"Authorization": f"Bearer {current_app.config['RESOURCES_ANALYSER_API_KEY']}"}
-    r = requests.post(url, json=payload, headers=headers)
+    r = requests.post(url, json=payload)
     r.raise_for_status()
 
 

udata/core/dataset/forms.py

@@ -1,3 +1,5 @@
+from mongoengine import ValidationError
+
 from udata.core.spatial.forms import SpatialCoverageField
 from udata.core.storages import resources
 from udata.forms import ModelForm, fields, validators

udata/core/dataset/models.py

@@ -256,8 +256,8 @@ class License(db.Document):
 
         if license is None:
             # Try to single match `slug` with a low Damerau-Levenshtein distance
-            computed = ((license_, rdlevenshtein(license_.slug, slug)) for license_ in cls.objects)
-            candidates = [license_ for license_, d in computed if d <= MAX_DISTANCE]
+            computed = ((l, rdlevenshtein(l.slug, slug)) for l in cls.objects)
+            candidates = [l for l, d in computed if d <= MAX_DISTANCE]
             # If there is more that one match, we cannot determinate
             # which one is closer to safely choose between candidates
             if len(candidates) == 1:
@@ -265,10 +265,8 @@ class License(db.Document):
 
         if license is None:
             # Try to match `title` with a low Damerau-Levenshtein distance
-            computed = (
-                (license_, rdlevenshtein(license_.title.lower(), text)) for license_ in cls.objects
-            )
-            candidates = [license_ for license_, d in computed if d <= MAX_DISTANCE]
+            computed = ((l, rdlevenshtein(l.title.lower(), text)) for l in cls.objects)
+            candidates = [l for l, d in computed if d <= MAX_DISTANCE]
             # If there is more that one match, we cannot determinate
             # which one is closer to safely choose between candidates
             if len(candidates) == 1:
@@ -277,11 +275,11 @@ class License(db.Document):
         if license is None:
             # Try to single match `alternate_titles` with a low Damerau-Levenshtein distance
             computed = (
-                (license_, rdlevenshtein(cls.slug.slugify(title_), slug))
-                for license_ in cls.objects
-                for title_ in license_.alternate_titles
+                (l, rdlevenshtein(cls.slug.slugify(t), slug))
+                for l in cls.objects
+                for t in l.alternate_titles
             )
-            candidates = [license_ for license_, distance_ in computed if distance_ <= MAX_DISTANCE]
+            candidates = [l for l, d in computed if d <= MAX_DISTANCE]
             # If there is more that one license matching, we cannot determinate
             # which one is closer to safely choose between candidates
             if len(set(candidates)) == 1:
@@ -1000,7 +998,7 @@ class ResourceSchema(object):
                     f"Schemas catalog does not exist at {endpoint}"
                 )
             response.raise_for_status()
-        except requests.exceptions.RequestException:
+        except requests.exceptions.RequestException as e:
             log.exception(f"Error while getting schema catalog from {endpoint}")
             schemas = cache.get(cache_key)
         else:
@@ -1008,7 +1006,7 @@ class ResourceSchema(object):
             cache.set(cache_key, schemas)
         # no cached version or no content
         if not schemas:
-            log.error("No content found inc. from cache for schema catalog")
+            log.error(f"No content found inc. from cache for schema catalog")
             raise SchemasCacheUnavailableException("No content in cache for schema catalog")
 
         return schemas

udata/core/dataset/rdf.py

@@ -387,7 +387,7 @@ def spatial_from_rdf(graph):
             continue
 
     if not polygons:
-        log.warning("No supported types found in the GeoJSON data.")
+        log.warning(f"No supported types found in the GeoJSON data.")
         return None
 
     spatial_coverage = SpatialCoverage(

udata/core/discussions/api.py

@@ -152,7 +152,7 @@ class DiscussionAPI(API):
 
 @ns.route("/<id>/comments/<int:cidx>/spam", endpoint="discussion_comment_spam")
 @ns.doc(delete={"id": "unspam"})
-class DiscussionCommentSpamAPI(SpamAPIMixin):
+class DiscussionSpamAPI(SpamAPIMixin):
     def get_model(self, id, cidx):
         discussion = Discussion.objects.get_or_404(id=id_or_404(id))
         if len(discussion.discussion) <= cidx:

udata/core/discussions/models.py

@@ -20,7 +20,7 @@ class Message(SpamMixin, db.EmbeddedDocument):
         return [self.content]
 
     def spam_report_message(self, breadcrumb):
-        message = "Spam potentiel dans le message"
+        message = f"Spam potentiel dans le message"
         if self.posted_by:
             message += f" de [{self.posted_by.fullname}]({self.posted_by.external_url})"
 
@@ -34,7 +34,7 @@ class Message(SpamMixin, db.EmbeddedDocument):
         discussion = breadcrumb[0]
         if not isinstance(discussion, Discussion):
             log.warning(
-                "`spam_report_message` called on message with a breadcrumb not containing a Discussion at index 0.",
+                f"`spam_report_message` called on message with a breadcrumb not containing a Discussion at index 0.",
                 extra={"breadcrumb": breadcrumb},
             )
             return message

udata/core/discussions/tasks.py

@@ -5,7 +5,7 @@ from udata.core.reuse.models import Reuse
 from udata.i18n import lazy_gettext as _
 from udata.tasks import connect, get_logger
 
-from .models import Discussion
+from .models import Discussion, Message
 from .signals import on_discussion_closed, on_new_discussion, on_new_discussion_comment
 
 log = get_logger(__name__)

udata/core/metrics/models.py

@@ -5,10 +5,7 @@ __all__ = ("WithMetrics",)
 
 
 class WithMetrics(object):
-    metrics = field(
-        db.DictField(),
-        readonly=True,
-    )
+    metrics = field(db.DictField())
 
     __metrics_keys__ = []
 

udata/core/organization/api.py

@@ -8,22 +8,19 @@ from udata.api.parsers import ModelApiParser
 from udata.auth import admin_permission, current_user
 from udata.core.badges import api as badges_api
 from udata.core.badges.fields import badge_fields
-from udata.core.contact_point.api import ContactPointApiParser
-from udata.core.contact_point.api_fields import contact_point_page_fields
-from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.api import DatasetApiParser
 from udata.core.dataset.api_fields import dataset_page_fields
 from udata.core.dataset.models import Dataset
 from udata.core.discussions.api import discussion_fields
 from udata.core.discussions.models import Discussion
 from udata.core.followers.api import FollowAPI
+from udata.core.reuse.api_fields import reuse_fields
 from udata.core.reuse.models import Reuse
 from udata.core.storages.api import (
     image_parser,
     parse_uploaded_image,
     uploaded_image_fields,
 )
-from udata.models import ContactPoint
 from udata.rdf import RDF_EXTENSIONS, graph_response, negociate_content
 from udata.utils import multi_to_dict
 
@@ -176,12 +173,7 @@ class OrganizationRdfFormatAPI(API):
         page = int(params.get("page", 1))
         page_size = int(params.get("page_size", 100))
         datasets = Dataset.objects(organization=org).visible().paginate(page, page_size)
-        dataservices = (
-            Dataservice.objects(organization=org)
-            .visible()
-            .filter_by_dataset_pagination(datasets, page)
-        )
-        catalog = build_org_catalog(org, datasets, dataservices, format=format)
+        catalog = build_org_catalog(org, datasets, format=format)
         # bypass flask-restplus make_response, since graph_response
         # is handling the content negociation directly
         return make_response(*graph_response(catalog, format))
@@ -215,6 +207,10 @@ class OrganizationBadgeAPI(API):
         return badges_api.remove(org, badge_kind)
 
 
+from udata.core.contact_point.api import ContactPointApiParser
+from udata.core.contact_point.api_fields import contact_point_page_fields
+from udata.models import ContactPoint
+
 contact_point_parser = ContactPointApiParser()
 
 
@@ -467,7 +463,7 @@ class OrgDatasetsAPI(API):
 @ns.route("/<org:org>/reuses/", endpoint="org_reuses")
 class OrgReusesAPI(API):
     @api.doc("list_organization_reuses")
-    @api.marshal_list_with(Reuse.__read_fields__)
+    @api.marshal_list_with(reuse_fields)
     def get(self, org):
         """List organization reuses (including private ones when member)"""
         qs = Reuse.objects.owned_by(org)

udata/core/organization/api_fields.py

@@ -41,11 +41,10 @@ org_ref_fields = api.inherit(
     },
 )
 
-# This import is not at the top of the file to avoid circular imports
-from udata.core.user.api_fields import user_ref_fields  # noqa
+from udata.core.user.api_fields import user_ref_fields  # noqa: required
 
 
-def check_can_access_user_private_info():
+def check_can_access_email():
     # This endpoint is secure, only organization member has access.
     if request.endpoint == "api.request_membership":
         return True
@@ -65,13 +64,8 @@ member_user_with_email_fields = api.inherit(
     user_ref_fields,
     {
         "email": fields.Raw(
-            attribute=lambda o: o.email if check_can_access_user_private_info() else None,
-            description="The user email (only present on show organization endpoint if the current user is member of the organization: admin or editor)",
-            readonly=True,
-        ),
-        "last_login_at": fields.Raw(
-            attribute=lambda o: o.last_login_at if check_can_access_user_private_info() else None,
-            description="The user last connection date (only present on show organization endpoint if the current user is member of the organization: admin or editor)",
+            attribute=lambda o: o.email if check_can_access_email() else None,
+            description="The user email (only present on show organization endpoint if the current user has edit permission on the org)",
             readonly=True,
         ),
     },

udata/core/organization/apiv2.py

@@ -7,7 +7,7 @@ from udata.core.contact_point.api_fields import contact_point_fields
 from udata.utils import multi_to_dict
 
 from .api_fields import member_fields, org_fields, org_page_fields
-from .permissions import EditOrganizationPermission
+from .permissions import EditOrganizationPermission, OrganizationPrivatePermission
 from .search import OrganizationSearch
 
 apiv2.inherit("OrganizationPage", org_page_fields)

udata/core/organization/csv.py

@@ -11,7 +11,6 @@ class OrganizationCsvAdapter(csv.Adapter):
     fields = (
         "id",
         "name",
-        "acronym",
         "slug",
         ("url", "external_url"),
         "description",

udata/core/organization/rdf.py

@@ -7,7 +7,6 @@ from flask import url_for
 from rdflib import BNode, Graph, Literal, URIRef
 from rdflib.namespace import FOAF, RDF, RDFS
 
-from udata.core.dataservices.rdf import dataservice_to_rdf
 from udata.core.dataset.rdf import dataset_to_rdf
 from udata.rdf import DCAT, DCT, namespace_manager, paginate_catalog
 from udata.uris import endpoint_for
@@ -36,7 +35,7 @@ def organization_to_rdf(org, graph=None):
     return o
 
 
-def build_org_catalog(org, datasets, dataservices, format=None):
+def build_org_catalog(org, datasets, format=None):
     graph = Graph(namespace_manager=namespace_manager)
     org_catalog_url = url_for("api.organization_rdf", org=org.id, _external=True)
 
@@ -48,8 +47,6 @@ def build_org_catalog(org, datasets, dataservices, format=None):
 
     for dataset in datasets:
         catalog.add(DCAT.dataset, dataset_to_rdf(dataset, graph))
-    for dataservice in dataservices:
-        catalog.add(DCAT.dataservice, dataservice_to_rdf(dataservice, graph))
 
     values = {"org": org.id}
 

udata/core/owned.py

@@ -32,7 +32,7 @@ def check_owner_is_current_user(owner):
         current_user.is_authenticated
         and owner
         and not admin_permission
-        and current_user.id != owner.id
+        and current_user.id != owner
     ):
         raise FieldValidationError(_("You can only set yourself as owner"), field="owner")
 
@@ -41,7 +41,7 @@ def check_organization_is_valid_for_current_user(organization):
     from udata.auth import current_user
     from udata.models import Organization
 
-    org = Organization.objects(id=organization.id).first()
+    org = Organization.objects(id=organization).first()
     if org is None:
         raise FieldValidationError(_("Unknown organization"), field="organization")
 
@@ -62,7 +62,6 @@ class Owned(object):
         description="Only present if organization is not set. Can only be set to the current authenticated user.",
         check=check_owner_is_current_user,
         allow_null=True,
-        filterable={},
     )
     organization = field(
         ReferenceField(Organization, reverse_delete_rule=NULLIFY),
@@ -70,7 +69,6 @@ class Owned(object):
         description="Only present if owner is not set. Can only be set to an organization of the current authenticated user.",
         check=check_organization_is_valid_for_current_user,
         allow_null=True,
-        filterable={},
     )
 
     on_owner_change = signal("Owned.on_owner_change")

udata/core/post/api.py

@@ -3,7 +3,7 @@ from datetime import datetime
 from udata.api import API, api, fields
 from udata.auth import admin_permission
 from udata.core.dataset.api_fields import dataset_fields
-from udata.core.reuse.models import Reuse
+from udata.core.reuse.api_fields import reuse_fields
 from udata.core.storages.api import (
     image_parser,
     parse_uploaded_image,
@@ -29,7 +29,7 @@ post_fields = api.model(
         "credit_url": fields.String(description="An optional link associated to the credits"),
         "tags": fields.List(fields.String, description="Some keywords to help in search"),
         "datasets": fields.List(fields.Nested(dataset_fields), description="The post datasets"),
-        "reuses": fields.List(fields.Nested(Reuse.__read_fields__), description="The post reuses"),
+        "reuses": fields.List(fields.Nested(reuse_fields), description="The post reuses"),
         "owner": fields.Nested(
             user_ref_fields, description="The owner user", readonly=True, allow_null=True
         ),