udata 9.2.2.dev31578__py2.py3-none-any.whl → 9.2.2.dev31630__py2.py3-none-any.whl

udata/core/dataset/csv.py

@@ -1,4 +1,5 @@
-from udata.core.discussions.models import Discussion
+# for backwards compatibility (see https://github.com/opendatateam/udata/pull/3152)
+from udata.core.discussions.csv import DiscussionCsvAdapter  # noqa: F401
 from udata.frontend import csv
 
 from .models import Dataset, Resource
@@ -90,18 +91,3 @@ class ResourcesCsvAdapter(csv.NestedAdapter):
         ("preview_url", lambda o: o.preview_url or False),
     )
     attribute = "resources"
-
-
-@csv.adapter(Discussion)
-class DiscussionCsvAdapter(csv.Adapter):
-    fields = (
-        "id",
-        "user",
-        "subject",
-        "title",
-        ("size", lambda o: len(o.discussion)),
-        ("messages", lambda o: "\n".join(msg.content for msg in o.discussion)),
-        "created",
-        "closed",
-        "closed_by",
-    )

udata/core/discussions/api.py

@@ -6,6 +6,10 @@ from flask_security import current_user
 
 from udata.api import API, api, fields
 from udata.auth import admin_permission
+from udata.core.dataservices.models import Dataservice
+from udata.core.dataset.models import Dataset
+from udata.core.organization.models import Organization
+from udata.core.reuse.models import Reuse
 from udata.core.spam.api import SpamAPIMixin
 from udata.core.spam.fields import spam_fields
 from udata.core.user.api_fields import user_ref_fields
@@ -73,8 +77,15 @@ comment_discussion_fields = api.model(
 discussion_page_fields = api.model("DiscussionPage", fields.pager(discussion_fields))
 
 parser = api.parser()
+sorting_keys: list[str] = ["created", "title", "closed"]
+sorting_choices: list[str] = sorting_keys + ["-" + k for k in sorting_keys]
 parser.add_argument(
-    "sort", type=str, default="-created", location="args", help="The sorting attribute"
+    "sort",
+    type=str,
+    default="-created",
+    choices=sorting_choices,
+    location="args",
+    help="The field (and direction) on which sorting apply",
 )
 parser.add_argument(
     "closed",
@@ -85,6 +96,9 @@ parser.add_argument(
 parser.add_argument(
     "for", type=str, location="args", action="append", help="Filter discussions for a given subject"
 )
+parser.add_argument(
+    "org", type=str, location="args", help="Filter discussions for a given organization"
+)
 parser.add_argument("user", type=str, location="args", help="Filter discussions created by a user")
 parser.add_argument("page", type=int, default=1, location="args", help="The page to fetch")
 parser.add_argument(
@@ -198,6 +212,15 @@ class DiscussionsAPI(API):
         discussions = Discussion.objects
         if args["for"]:
             discussions = discussions.generic_in(subject=args["for"])
+        if args["org"]:
+            org = Organization.objects.get_or_404(id=id_or_404(args["org"]))
+            if not org:
+                api.abort(404, "Organization does not exist")
+            reuses = Reuse.objects(organization=org).only("id")
+            datasets = Dataset.objects(organization=org).only("id")
+            dataservices = Dataservice.objects(organization=org).only("id")
+            subjects = list(reuses) + list(datasets) + list(dataservices)
+            discussions = discussions(subject__in=subjects)
         if args["user"]:
             discussions = discussions(discussion__posted_by=ObjectId(args["user"]))
         if args["closed"] is False:

udata/core/discussions/csv.py

@@ -0,0 +1,22 @@
+from udata.frontend import csv
+
+from .models import Discussion
+
+
+@csv.adapter(Discussion)
+class DiscussionCsvAdapter(csv.Adapter):
+    fields = (
+        "id",
+        "user",
+        "subject",
+        ("subject_class", "subject._class_name"),
+        ("subject_id", "subject.id"),
+        "title",
+        ("size", lambda o: len(o.discussion)),
+        ("participants", lambda o: ",".join(set(str(msg.posted_by.id) for msg in o.discussion))),
+        ("messages", lambda o: "\n".join(msg.content.replace("\n", " ") for msg in o.discussion)),
+        "created",
+        "closed",
+        ("closed_by_fullname", "closed_by"),
+        ("closed_by_id", "closed_by.id"),
+    )

udata/tests/test_discussions.py

@@ -2,8 +2,11 @@ from datetime import datetime
 
 import pytest
 from flask import url_for
+from werkzeug.test import TestResponse
 
+from udata.core.dataservices.factories import DataserviceFactory
 from udata.core.dataset.factories import DatasetFactory
+from udata.core.discussions.factories import DiscussionFactory
 from udata.core.discussions.metrics import update_discussions_metric  # noqa
 from udata.core.discussions.models import Discussion, Message
 from udata.core.discussions.notifications import discussions_notifications
@@ -19,8 +22,11 @@ from udata.core.discussions.tasks import (
     notify_new_discussion_comment,
 )
 from udata.core.organization.factories import OrganizationFactory
+from udata.core.organization.models import Organization
+from udata.core.reuse.factories import ReuseFactory
 from udata.core.spam.signals import on_new_potential_spam
 from udata.core.user.factories import AdminFactory, UserFactory
+from udata.core.user.models import User
 from udata.models import Dataset, Member
 from udata.tests.helpers import capture_mails
 from udata.utils import faker
@@ -358,6 +364,61 @@ class DiscussionsTest(APITestCase):
 
         self.assertEqual(len(response.json["data"]), len(discussions))
 
+    def assertIdIn(self, json_data: dict, id_: str) -> None:
+        for item in json_data:
+            if item["id"] == id_:
+                return
+        self.fail(f"id {id_} not in {json_data}")
+
+    def test_list_discussions_org_does_not_exist(self) -> None:
+        response: TestResponse = self.get(url_for("api.discussions", org="bad org id"))
+        self.assert404(response)
+
+    def test_list_discussions_org(self) -> None:
+        organization: Organization = OrganizationFactory()
+        user: User = UserFactory()
+        _discussion: Discussion = DiscussionFactory(user=user)
+        dataset = DatasetFactory(organization=organization)
+        dataservice = DataserviceFactory(organization=organization)
+        reuse = ReuseFactory(organization=organization)
+        discussion_for_dataset: Discussion = DiscussionFactory(subject=dataset, user=user)
+        discussion_for_dataservice: Discussion = DiscussionFactory(subject=dataservice, user=user)
+        discussion_for_reuse: Discussion = DiscussionFactory(subject=reuse, user=user)
+
+        response: TestResponse = self.get(url_for("api.discussions", org=organization.id))
+        self.assert200(response)
+        self.assertEqual(len(response.json["data"]), 3)
+        self.assertIdIn(response.json["data"], str(discussion_for_dataset.id))
+        self.assertIdIn(response.json["data"], str(discussion_for_dataservice.id))
+        self.assertIdIn(response.json["data"], str(discussion_for_reuse.id))
+
+    def test_list_discussions_sort(self) -> None:
+        user: User = UserFactory()
+        sorting_keys_dict: dict = {
+            "title": ["aaa", "bbb"],
+            "created": ["2023-12-12", "2024-01-01"],
+            "closed": ["2023-12-12", "2024-01-01"],
+        }
+        for sorting_key, values in sorting_keys_dict.items():
+            discussion1: Discussion = DiscussionFactory(user=user, **{sorting_key: values[0]})
+            discussion2: Discussion = DiscussionFactory(user=user, **{sorting_key: values[1]})
+
+            response: TestResponse = self.get(url_for("api.discussions", sort=sorting_key))
+            self.assert200(response)
+            self.assertEqual(len(response.json["data"]), 2)
+            self.assertEqual(response.json["data"][0]["id"], str(discussion1.id))
+            self.assertEqual(response.json["data"][1]["id"], str(discussion2.id))
+
+            # Reverse sort
+            response: TestResponse = self.get(url_for("api.discussions", sort="-" + sorting_key))
+            self.assert200(response)
+            self.assertEqual(len(response.json["data"]), 2)
+            self.assertEqual(response.json["data"][0]["id"], str(discussion2.id))
+            self.assertEqual(response.json["data"][1]["id"], str(discussion1.id))
+
+            # Clean slate
+            Discussion.objects.delete()
+
     def test_list_discussions_user(self):
         dataset = DatasetFactory()
         discussions = []

{udata-9.2.2.dev31578.dist-info → udata-9.2.2.dev31630.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.2.2.dev31578
+Version: 9.2.2.dev31630
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -140,7 +140,8 @@ It is collectively taken care of by members of the
 
 ## Current (in progress)
 
-- Nothing yet
+- Add a filter on organization and document sort parameters in the `/discussions` endpoint [#3147](https://github.com/opendatateam/udata/pull/3147)
+- Move discussion catalog creation and add fields [#3152](https://github.com/opendatateam/udata/pull/3152)
 
 ## 9.2.1 (2024-09-23)
 

{udata-9.2.2.dev31578.dist-info → udata-9.2.2.dev31630.dist-info}/RECORD

@@ -94,7 +94,7 @@ udata/core/dataset/api_fields.py,sha256=ZF24FhKYe5jlV8jXG6YR0Hko9WOuV0446FAlLkEg
 udata/core/dataset/apiv2.py,sha256=VTE4eYx5udzOdHDUkD7TYpuCtppZMKp1okTSEE1fcgI,16925
 udata/core/dataset/commands.py,sha256=__hPAk_6iHtgMnEG51ux0vbNWJHxUjXhi1ukH4hF5jY,3714
 udata/core/dataset/constants.py,sha256=pkOvrdNBq3k1ojJcv6oSg7kK1IUtb3PqLni-YJ3rKSY,2880
-udata/core/dataset/csv.py,sha256=XMl8MaYCEyGmkCZqRSWrGRxCht2C9e3aQYGwDQLXYT0,3618
+udata/core/dataset/csv.py,sha256=8vCJKCnmIun2_N5x4bvCYCk-jVXzHxhRHYrToiCObpA,3383
 udata/core/dataset/events.py,sha256=LEL9_iMTZ0bZlli2TdkQtV8pCRbFQBd91Hqh_WCW84c,3444
 udata/core/dataset/exceptions.py,sha256=uKiayLSpSzsnLvClObS6hOO0qXEqvURKN7_w8eimQNU,498
 udata/core/dataset/factories.py,sha256=fRDWDlybR_ud4pDs1-ntWuYHKtV9LMHeBOBp2SmTT6M,9006
@@ -108,8 +108,9 @@ udata/core/dataset/signals.py,sha256=WN4sV-lJlNsRkhcnhoy0SYJvCoYmK_5QFYZd1u-h4gs
 udata/core/dataset/tasks.py,sha256=yDPK2oKSzTXfST8Up7vMd13XPEK5r6iapq7hUIow6BI,8493
 udata/core/discussions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/discussions/actions.py,sha256=seKxsKut6xLkobfC2Yy2wpD_-flsT8HcFPcN6SDpz6k,789
-udata/core/discussions/api.py,sha256=Fjt6F04jRHwYrtMYcokjfDxBQqRJWgyh1H5jrDyLtvA,8376
+udata/core/discussions/api.py,sha256=YsVz7JB7RazAeiydxGe1q1t8sIpxCM_w1b71oT9oN_8,9422
 udata/core/discussions/constants.py,sha256=nbZgXESpg0TykIGPxW8xUtHtk7TwQoyOL0Ky4U4B7c8,27
+udata/core/discussions/csv.py,sha256=jYD_313Jos1YGwlNzai-pg79HPhLfxiWlIFV4TU7eI4,696
 udata/core/discussions/factories.py,sha256=CgQaUmmyDu90XtyBsqXVa-TmZMrN7Dwuu1Cnr5wNrVc,350
 udata/core/discussions/forms.py,sha256=CalmOTslnfBY-SJatvqN2UjFJ-1S1rF57sbW8UbvmPE,838
 udata/core/discussions/metrics.py,sha256=WMalLO9GEHXlqE2WbZX-HQUpvte6cRwuHuoL96QwWSg,354
@@ -580,7 +581,7 @@ udata/tests/plugin.py,sha256=dT3KfQiVYwLM61TbB894wzTelnlPIsCHaiPEH-Jirfk,11580
 udata/tests/schemas.json,sha256=szM1jDpkogfOG4xWbjIGjLgG8l9-ZyE3JKQtecJyD1E,4990
 udata/tests/test_activity.py,sha256=x-pDK6VW9wAG0uxYRZQ3DWTRjfCU729iaMGMJb1rWYU,3195
 udata/tests/test_cors.py,sha256=b_pyxKeIyqhnsXxXryPf4d0V0QxaLQ1P_VjY89Q_j3g,3233
-udata/tests/test_discussions.py,sha256=UN2mlZp-h3m3HqdF_nz9WOxwPKgXok47E2Rrp2dknYI,30464
+udata/tests/test_discussions.py,sha256=Qo7nhIUY7YAATZfWl5Mgo0XhngGwFULgqEoMhsHZtFE,33587
 udata/tests/test_i18n.py,sha256=u60344JNRG_8s0t89ghXtQ1FbF4TayEHBzuBFxqnQ_Y,3152
 udata/tests/test_linkchecker.py,sha256=W8jrwKYXM8wWXZFjiaBwpWGRBhZ8bsSHGHzL9voDN7U,10218
 udata/tests/test_mail.py,sha256=ijcrniawbvftm5UF8KDApBoxMHyZwULAA25LrnLmeI8,1629
@@ -697,9 +698,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=WpPzAqVd2Onv_kz45ULUySKPLrpjcc
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=18Op9RUITewoDRewlOdYzzq6gjsf1lsvepACV1d7zxs,44976
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=NIYRNhVoETZUvIvWm3cCW7DtMBAnS2vXzZjMF5ZzD_c,28500
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=rQB-4V4WJ7bURj6g2j653vItr5TMHadcLQxec7_fDmg,51545
-udata-9.2.2.dev31578.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.2.2.dev31578.dist-info/METADATA,sha256=A2qsgIGm1QV5SmTZqksgcyjwSYuG5jEt6DwbmfD_0i8,130894
-udata-9.2.2.dev31578.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.2.2.dev31578.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.2.2.dev31578.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.2.2.dev31578.dist-info/RECORD,,
+udata-9.2.2.dev31630.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.2.2.dev31630.dist-info/METADATA,sha256=VMRLK7oaR65QgEmsJoIEIx-xJqy0Itm71wlAE9_RuHo,131135
+udata-9.2.2.dev31630.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.2.2.dev31630.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.2.2.dev31630.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.2.2.dev31630.dist-info/RECORD,,