Merge pull request #100 from davidbgk/99-moderation-discussions

Add the ability to delete a discussion, refs #99

udata/core/discussions/api.py

@@ -5,14 +5,18 @@
 
 from flask.ext.security import current_user
 
+from udata.auth import admin_permission
 from udata.api import api, API, fields
 from udata.models import Dataset, DatasetDiscussion, Reuse, ReuseDiscussion
 from udata.core.user.api_fields import user_ref_fields
 
 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
+from .signals import (
+    on_new_discussion, on_new_discussion_comment, on_discussion_closed,
+    on_discussion_deleted
+)
 
 ns = api.namespace('discussions', 'Discussion related operations')
 
@@ -67,7 +71,7 @@ def get(self, id):
     @api.response(403, 'Not allowed to close this discussion')
     @api.marshal_with(discussion_fields)
     def post(self, id):
-        '''Add comment and optionnaly close an discussion given its ID'''
+        '''Add comment and optionnaly close a discussion given its ID'''
         discussion = Discussion.objects.get_or_404(id=id)
         form = api.validate(DiscussionCommentForm)
         message = Message(
@@ -87,6 +91,16 @@ def post(self, id):
             on_new_discussion_comment.send(discussion, message=message)
         return discussion
 
+    @api.secure(admin_permission)
+    @api.doc('delete_discussion')
+    @api.response(403, 'Not allowed to delete this discussion')
+    def delete(self, id):
+        '''Delete a discussion given its ID'''
+        discussion = Discussion.objects.get_or_404(id=id)
+        discussion.delete()
+        on_discussion_deleted.send(discussion)
+        return '', 204
+
 
 @ns.route('/', endpoint='discussions')
 class DiscussionsAPI(API):

udata/core/discussions/metrics.py

@@ -5,7 +5,9 @@
 from udata.i18n import lazy_gettext as _
 
 from .models import Discussion
-from .signals import on_new_discussion, on_discussion_closed
+from .signals import (
+    on_new_discussion, on_discussion_closed, on_discussion_deleted
+)
 
 
 class DiscussionsMetric(Metric):
@@ -18,6 +20,7 @@ def get_value(self):
 
 @on_new_discussion.connect
 @on_discussion_closed.connect
+@on_discussion_deleted.connect
 def update_discussions_metric(discussion, **kwargs):
     model = discussion.subject.__class__
     for name, cls in Metric.get_for(model).items():

udata/core/discussions/signals.py

@@ -13,3 +13,6 @@
 
 #: Trigerred when an discussion is closed
 on_discussion_closed = namespace.signal('on-discussion-closed')
+
+#: Trigerred when an discussion is deleted
+on_discussion_deleted = namespace.signal('on-discussion-deleted')

udata/tests/test_discussions.py

@@ -14,7 +14,8 @@
 
 from .api import APITestCase
 from .factories import (
-    faker, UserFactory, OrganizationFactory, DatasetFactory, DatasetDiscussionFactory
+    faker, AdminFactory, UserFactory, OrganizationFactory, DatasetFactory,
+    DatasetDiscussionFactory
 )
 
 
@@ -261,6 +262,50 @@ def test_close_discussion_permissions(self):
         # Metrics unchanged after attempt to close the discussion.
         self.assertEqual(dataset.metrics['discussions'], 1)
 
+    def test_delete_discussion(self):
+        owner = self.login(AdminFactory())
+        user = UserFactory()
+        dataset = Dataset.objects.create(title='Test dataset', owner=owner)
+        message = Message(content='bla bla', posted_by=user)
+        discussion = DatasetDiscussion.objects.create(
+            subject=dataset.id,
+            user=user,
+            title='test discussion',
+            discussion=[message]
+        )
+        on_new_discussion.send(discussion)  # Updating metrics.
+        self.assertEqual(DatasetDiscussion.objects(subject=dataset.id).count(),
+                         1)
+
+        response = self.delete(url_for('api.discussion', id=discussion.id))
+        self.assertStatus(response, 204)
+
+        dataset.reload()
+        self.assertEqual(dataset.metrics['discussions'], 0)
+        self.assertEqual(DatasetDiscussion.objects(subject=dataset.id).count(),
+                         0)
+
+    def test_delete_discussion_permissions(self):
+        owner = self.login()
+        dataset = Dataset.objects.create(title='Test dataset', owner=owner)
+        user = UserFactory()
+        message = Message(content='bla bla', posted_by=user)
+        discussion = DatasetDiscussion.objects.create(
+            subject=dataset.id,
+            user=user,
+            title='test discussion',
+            discussion=[message]
+        )
+        on_new_discussion.send(discussion)  # Updating metrics.
+
+        self.login()
+        response = self.delete(url_for('api.discussion', id=discussion.id))
+        self.assert403(response)
+
+        dataset.reload()
+        # Metrics unchanged after attempt to delete the discussion.
+        self.assertEqual(dataset.metrics['discussions'], 1)
+
 
 class DiscussionCsvTest(FrontTestCase):