Restore CELERY_TASK_EAGER_PROPAGATES to True

CHANGELOG.md

@@ -8,6 +8,9 @@
 - Fix: refuse an organisation access request when multiple access requests are pending [#2960](https://github.com/opendatateam/udata/pull/2960)
 - Add downloads count in datasets' CSV [#2953](https://github.com/opendatateam/udata/pull/2953)
 - Allow dicts in datasets' extras [#2958](https://github.com/opendatateam/udata/pull/2958)
+- Fix: do not send mail about discussions when there is no owner / no organisation members [#2962](https://github.com/opendatateam/udata/pull/2962)
+- Fix: 'backend' is now required in `HarvestSource` [#2962](https://github.com/opendatateam/udata/pull/2962)
+- Fix: URL to organisations in mails are now independent from `udata-front` (show the URL of the API if no `udata-front`) [#2962](https://github.com/opendatateam/udata/pull/2962)
 
 ## 7.0.2 (2024-01-23)
 

udata/core/discussions/api.py

@@ -14,10 +14,8 @@
 from .forms import DiscussionCreateForm, DiscussionCommentForm
 from .models import Message, Discussion
 from .permissions import CloseDiscussionPermission
-from .signals import (
-    on_new_discussion, on_new_discussion_comment, on_discussion_closed,
-    on_discussion_deleted
-)
+from .signals import on_discussion_deleted
+
 
 ns = api.namespace('discussions', 'Discussion related operations')
 

udata/core/discussions/tasks.py

@@ -16,8 +16,10 @@
 def owner_recipients(discussion):
     if getattr(discussion.subject, 'organization', None):
         return [m.user for m in discussion.subject.organization.members]
-    else:
+    elif getattr(discussion.subject, 'owner', None):
         return [discussion.subject.owner]
+    else:
+        return []
 
 
 @connect(on_new_discussion, by_id=True)

udata/harvest/backends/base.py

@@ -156,15 +156,15 @@ def perform_initialization(self):
             self.job.errors.append(error)
             self.job.status = 'failed'
             self.end()
-            return
+            return None
         except Exception as e:
             self.job.status = 'failed'
             error = HarvestError(message=safe_unicode(e))
             self.job.errors.append(error)
             self.end()
             msg = 'Initialization failed for "{0.name}" ({0.backend})'
             log.exception(msg.format(self.source))
-            return
+            return None
 
         if self.max_items:
             self.job.items = self.job.items[:self.max_items]

udata/harvest/models.py

@@ -94,7 +94,7 @@ class HarvestSource(db.Owned, db.Document):
                         populate_from='name', update=True)
     description = db.StringField()
     url = db.StringField(required=True)
-    backend = db.StringField()
+    backend = db.StringField(required=True)
     config = db.DictField()
     periodic_task = db.ReferenceField('PeriodicTask',
                                       reverse_delete_rule=db.NULLIFY)

udata/harvest/tasks.py

@@ -19,15 +19,18 @@ def harvest(self, ident):
     Backend = backends.get(current_app, source.backend)
     backend = Backend(source)
     items = backend.perform_initialization()
-    if items > 0:
+    if items is None:
+        pass
+    elif items == 0:
+        backend.finalize()
+    else:
         finalize = harvest_job_finalize.s(backend.job.id)
         items = [
             harvest_job_item.s(backend.job.id, item.remote_id)
             for item in backend.job.items
         ]
         chord(items)(finalize)
-    elif items == 0:
-        backend.finalize()
+
 
 
 @task(ignore_result=False, route='low.harvest')

udata/harvest/tests/factories.py

@@ -22,6 +22,7 @@ class Meta:
     name = factory.Faker('name')
     url = factory.Faker('url')
     description = factory.Faker('text')
+    backend = 'factory'
 
 
 class HarvestJobFactory(ModelFactory):

udata/harvest/tests/test_models.py

@@ -12,7 +12,7 @@
 @pytest.mark.usefixtures('clean_db')
 class HarvestSourceTest:
     def test_defaults(self):
-        source = HarvestSource.objects.create(name='Test', url=faker.url())
+        source = HarvestSource.objects.create(name='Test', url=faker.url(), backend='factory')
         assert source.name == 'Test'
         assert source.slug == 'test'
 

udata/settings.py

@@ -471,7 +471,7 @@ class Testing(object):
     AUTO_INDEX = False
     CELERY_TASK_ALWAYS_EAGER = True
     # TODO: ideally, this should be set to True in order to reveal exceptions in delayed tasks
-    CELERY_TASK_EAGER_PROPAGATES = False
+    CELERY_TASK_EAGER_PROPAGATES = True
     TEST_WITH_PLUGINS = False
     PLUGINS = []
     TEST_WITH_THEME = False

udata/templates/mail/membership_refused.html

@@ -7,7 +7,7 @@
 {{ _('Your membership for the organization "%(org)s" has been refused',
     org=(
         '<a href="'|safe
-        + url_for('organizations.show', org=org, _external=True)
+        + org.url_for(_external=True)
         + '">'|safe
         + org.name
         + '</a>'|safe

udata/templates/mail/membership_request.html

@@ -15,7 +15,7 @@
     ),
     org=(
         '<a href="'|safe
-        + url_for('organizations.show', org=org, _external=True)
+        + org.url_for(_external=True)
         + '">'|safe
         + org.name
         + '</a>'|safe

udata/templates/mail/new_member.html

@@ -7,7 +7,7 @@
 {{ _('Congratulations, you are now a member of the organization "%(org)s"',
     org=(
         '<a href="'|safe
-        + url_for('organizations.show', org=org, _external=True)
+        + org.url_for(_external=True)
         + '">'|safe
         + org.name
         + '</a>'|safe
@@ -19,7 +19,7 @@
         <td align="center">
             {{ mail_button(
                 _('See the organization page'),
-                url_for('organizations.show', org=org, _external=True)
+                org.url_for(_external=True)
             ) }}
         </td>
     </tr>

udata/templates/mail/new_member.txt

@@ -7,5 +7,5 @@
 
 
 {{ _('You can go on your organization page') }}:
-{{ url_for('organizations.show', org=org, _external=True) }}
+{{ org.url_for(_external=True) }}
 {% endblock %}