udata 10.0.5.dev32777__py2.py3-none-any.whl → 10.0.5.dev32808__py2.py3-none-any.whl

udata/core/dataservices/models.py

@@ -109,6 +109,11 @@ class Dataservice(WithMetrics, Owned, db.Document):
         "auto_create_index_on_save": True,
     }
 
+    verbose_name = _("dataservice")
+
+    def __str__(self):
+        return self.title or ""
+
     title = field(
         db.StringField(required=True),
         example="My awesome API",
@@ -198,6 +203,11 @@ class Dataservice(WithMetrics, Owned, db.Document):
         readonly=True,
     )
 
+    def url_for(self, *args, **kwargs):
+        return endpoint_for(
+            "dataservices.show", "api.dataservice", dataservice=self, *args, **kwargs
+        )
+
     @function_field(description="Link to the API endpoint for this dataservice")
     def self_api_url(self):
         return endpoint_for("api.dataservice", dataservice=self, _external=True)

udata/core/discussions/actions.py

@@ -16,6 +16,10 @@ def discussions_for(user, only_open=True):
     datasets = Dataset.objects.owned_by(user.id, *user.organizations).only("id", "slug")
     reuses = Reuse.objects.owned_by(user.id, *user.organizations).only("id", "slug")
 
+    # TODO: add dataservices when ready. It would now break notification routing in current admin
+    # since dataservices aren't supported by the current admin.
+    # dataservices = Dataservice.objects.owned_by(user.id, *user.organizations).only("id", "slug")
+
     qs = Discussion.objects(subject__in=list(datasets) + list(reuses))
     if only_open:
         qs = qs(closed__exists=False)

udata/core/discussions/constants.py

@@ -1 +1,8 @@
+from udata.core.dataservices.models import Dataservice
+from udata.core.dataset.models import Dataset
+from udata.core.post.models import Post
+from udata.core.reuse.models import Reuse
+
 COMMENT_SIZE_LIMIT = 50000
+
+NOTIFY_DISCUSSION_SUBJECTS = (Dataset, Reuse, Post, Dataservice)

udata/core/discussions/tasks.py

@@ -1,10 +1,8 @@
 from udata import mail
-from udata.core.dataset.models import Dataset
-from udata.core.post.models import Post
-from udata.core.reuse.models import Reuse
 from udata.i18n import lazy_gettext as _
 from udata.tasks import connect, get_logger
 
+from .constants import NOTIFY_DISCUSSION_SUBJECTS
 from .models import Discussion
 from .signals import on_discussion_closed, on_new_discussion, on_new_discussion_comment
 
@@ -23,7 +21,7 @@ def owner_recipients(discussion):
 @connect(on_new_discussion, by_id=True)
 def notify_new_discussion(discussion_id):
     discussion = Discussion.objects.get(pk=discussion_id)
-    if isinstance(discussion.subject, (Dataset, Reuse, Post)):
+    if isinstance(discussion.subject, NOTIFY_DISCUSSION_SUBJECTS):
         recipients = owner_recipients(discussion)
         subject = _("Your %(type)s have a new discussion", type=discussion.subject.verbose_name)
         mail.send(
@@ -41,7 +39,7 @@ def notify_new_discussion(discussion_id):
 def notify_new_discussion_comment(discussion_id, message=None):
     discussion = Discussion.objects.get(pk=discussion_id)
     message = discussion.discussion[message]
-    if isinstance(discussion.subject, (Dataset, Reuse, Post)):
+    if isinstance(discussion.subject, NOTIFY_DISCUSSION_SUBJECTS):
         recipients = owner_recipients(discussion) + [m.posted_by for m in discussion.discussion]
         recipients = list({u.id: u for u in recipients if u != message.posted_by}.values())
         subject = _("%(user)s commented your discussion", user=message.posted_by.fullname)
@@ -57,7 +55,7 @@ def notify_new_discussion_comment(discussion_id, message=None):
 def notify_discussion_closed(discussion_id, message=None):
     discussion = Discussion.objects.get(pk=discussion_id)
     message = discussion.discussion[message]
-    if isinstance(discussion.subject, (Dataset, Reuse, Post)):
+    if isinstance(discussion.subject, NOTIFY_DISCUSSION_SUBJECTS):
         recipients = owner_recipients(discussion) + [m.posted_by for m in discussion.discussion]
         recipients = list({u.id: u for u in recipients if u != message.posted_by}.values())
         subject = _("A discussion has been closed")

{udata-10.0.5.dev32777.dist-info → udata-10.0.5.dev32808.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.0.5.dev32777
+Version: 10.0.5.dev32808
 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 dataservice csv adapter [#3208](https://github.com/opendatateam/udata/pull/3208)
+- Add url_for for dataservices and mail notifications [#3213](https://github.com/opendatateam/udata/pull/3213)
 
 ## 10.0.4 (2024-11-29)
 

{udata-10.0.5.dev32777.dist-info → udata-10.0.5.dev32808.dist-info}/RECORD

@@ -84,7 +84,7 @@ udata/core/dataservices/api.py,sha256=LpRc1FNTA6jAOj1KsFme5TxVn4SgcUWlDBWi43H1eZ
 udata/core/dataservices/apiv2.py,sha256=XIqJq58uLtxtt52iKYo7Fl0ZXv9Sz72uA7JIGwP8Qos,995
 udata/core/dataservices/csv.py,sha256=pL3j8-_KZWJaX1xFyILXt9wBtXn9Cmov5FUQgd0lNh0,1040
 udata/core/dataservices/factories.py,sha256=LDk8vvG0zhW8J-ZX5LoJQDU13pqeIyjQ05muuMro_eA,876
-udata/core/dataservices/models.py,sha256=efMTBNZ8p0vsAm5854w8Bls4csaSq8q4IwGgFTHDmQ8,8662
+udata/core/dataservices/models.py,sha256=cDG5jBCieDwEy7nzKGwovJ9lutubPl-RYw9vwGiYh1E,8921
 udata/core/dataservices/permissions.py,sha256=98zM_R4v2ZtRubflB7ajaVQz-DVc-pZBMgtKUYy34oI,169
 udata/core/dataservices/rdf.py,sha256=9dWSqONCD5m9HmAU_ndmEmG3F1IuRUOW6MWTmk2GEEI,6792
 udata/core/dataservices/search.py,sha256=htjh3sq3tDuD2qwgRgZsW6ClrHLF6hMwYO4nfBO0Hr4,4171
@@ -110,9 +110,9 @@ udata/core/dataset/search.py,sha256=E7LqHBnq3sMefvmLwTpiw-Ovem2a3NJswHesRjctboE,
 udata/core/dataset/signals.py,sha256=WN4sV-lJlNsRkhcnhoy0SYJvCoYmK_5QFYZd1u-h4gs,161
 udata/core/dataset/tasks.py,sha256=F31TDKaawtOx6oxmWh9Vu24m0R4KVMouxFyAbaXVG6E,9609
 udata/core/discussions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/discussions/actions.py,sha256=seKxsKut6xLkobfC2Yy2wpD_-flsT8HcFPcN6SDpz6k,789
+udata/core/discussions/actions.py,sha256=kjdBLDIeu0yWTSxQGgOpN1WoxUqbMygn4SiBk_S9T5I,1051
 udata/core/discussions/api.py,sha256=5yMdKeWp0c9H2ipy5bXoMf82r3ULMIARhvuIdM-XJp0,9446
-udata/core/discussions/constants.py,sha256=nbZgXESpg0TykIGPxW8xUtHtk7TwQoyOL0Ky4U4B7c8,27
+udata/core/discussions/constants.py,sha256=8crl2Lmkv9dmJe4KACM0JJcpoHePmGtmvI6ixfvukhc,277
 udata/core/discussions/csv.py,sha256=c7ZHMicIi8R0kvMjnsUooO0WlH0t90hJ9kO2mmFnUM0,672
 udata/core/discussions/factories.py,sha256=CgQaUmmyDu90XtyBsqXVa-TmZMrN7Dwuu1Cnr5wNrVc,350
 udata/core/discussions/forms.py,sha256=CalmOTslnfBY-SJatvqN2UjFJ-1S1rF57sbW8UbvmPE,838
@@ -121,7 +121,7 @@ udata/core/discussions/models.py,sha256=UkeEdzRkSrx9t2UiWow0GmtWh6R6_1p8p1olxS_g
 udata/core/discussions/notifications.py,sha256=5MuoZDPmmvkloZ3i8I6TELgE1KXZ_cB9QiDerFBD9dM,1052
 udata/core/discussions/permissions.py,sha256=r8uB_w29R6fICr0TUHIX_7JkXUpFcVBWWZRYW-xC0rY,640
 udata/core/discussions/signals.py,sha256=tJ83RJIsBAny08Q6IDwehE6lDDRf6ynIFCl0WqnayoU,543
-udata/core/discussions/tasks.py,sha256=XC3e26iNmK9wH-B8exBP3EX3yahlX-z6lSi-ODzBgng,2807
+udata/core/discussions/tasks.py,sha256=QeLo1X6fNz2wl2rpZCu6NzAH83PgZqeMuwo4qBh7GXY,2741
 udata/core/followers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/followers/api.py,sha256=qeArJ-bqXlLHZWBZk2aVDX66FHS4TKH0ctpM9JRnIhU,2531
 udata/core/followers/metrics.py,sha256=nKgoiM2Gu-XHrgEf9duW1My66zFSKbmw25BGqo5wWtY,190
@@ -709,9 +709,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=nGPoTSbeRlpCQGuxoJ7Oa650flpeeh
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=f-tilnngNNBEIQdXmm3GbdaLlvbwG9YLLwhqyRD5Lh4,44871
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=8RL_aEe-0QJdgY-TNMy7bS4z8X9IOK8-C076dxcp3As,28163
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=Cp0bKPeIbuAqvFeoey_9ItQbAHIeiFZPnZLa6A6JNbI,51363
-udata-10.0.5.dev32777.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.0.5.dev32777.dist-info/METADATA,sha256=Gny39LrdRBPBsC5JcyqwkReariJsO0gnRxSBVNHueXU,136237
-udata-10.0.5.dev32777.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-10.0.5.dev32777.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-10.0.5.dev32777.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.0.5.dev32777.dist-info/RECORD,,
+udata-10.0.5.dev32808.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.0.5.dev32808.dist-info/METADATA,sha256=RuoqpyAib_uJCVEasPzIGVckpLcTrU8upXi41O_LBUo,136348
+udata-10.0.5.dev32808.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-10.0.5.dev32808.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-10.0.5.dev32808.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.0.5.dev32808.dist-info/RECORD,,