udata 9.2.2.dev31595__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/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-9.2.2.dev31595.dist-info → udata-9.2.2.dev31630.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.2.2.dev31595
+Version: 9.2.2.dev31630
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -141,6 +141,7 @@ It is collectively taken care of by members of the
 ## Current (in progress)
 
 - 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.dev31595.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
@@ -110,6 +110,7 @@ udata/core/discussions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 udata/core/discussions/actions.py,sha256=seKxsKut6xLkobfC2Yy2wpD_-flsT8HcFPcN6SDpz6k,789
 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
@@ -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.dev31595.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.2.2.dev31595.dist-info/METADATA,sha256=HGZs0bXBUTcDx6EIpQ6SBOQe3-fTCuLZe3CGI_XfFZ0,131028
-udata-9.2.2.dev31595.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.2.2.dev31595.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.2.2.dev31595.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.2.2.dev31595.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,,