Add extras fields to discussion

We need it for transport.data.gouv.fr
It'll be only accessible through API for now

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## Current (in progress)
 
-- Nothing yet
+- Add extras field in discussions [#1360](https://github.com/opendatateam/udata/pull/1360)
 
 ## 1.2.7 (2018-01-10)
 

udata/core/discussions/api.py

@@ -44,6 +44,7 @@
     'discussion': fields.Nested(message_fields),
     'url': fields.UrlFor('api.discussion',
                          description='The discussion API URI'),
+    'extras': fields.Raw(description='Extra attributes as key-value pairs'),
 })
 
 start_discussion_fields = api.model('DiscussionStart', {
@@ -54,6 +55,7 @@
     'subject': fields.Nested(api.model_reference,
                              description='The discussion target object',
                              required=True),
+    'extras': fields.Raw(description='Extras attributes as key-value pairs'),
 })
 
 comment_discussion_fields = api.model('DiscussionResponse', {

udata/core/discussions/forms.py

@@ -11,10 +11,11 @@
 
 class DiscussionCreateForm(ModelForm):
     model_class = Discussion
-    
+
     title = fields.StringField(_('Title'), [validators.required()])
     comment = fields.StringField(_('Comment'), [validators.required()])
     subject = fields.ModelField(_('Subject'), [validators.required()])
+    extras = fields.ExtrasField(extras=Discussion.extras)
 
 
 class DiscussionCommentForm(Form):

udata/core/discussions/models.py

@@ -23,6 +23,7 @@ class Discussion(db.Document):
     created = db.DateTimeField(default=datetime.now, required=True)
     closed = db.DateTimeField()
     closed_by = db.ReferenceField('User')
+    extras = db.ExtrasField()
 
     meta = {
         'indexes': [

udata/tests/test_discussions.py

@@ -31,8 +31,7 @@
 class DiscussionsTest(APITestCase):
     modules = ['core.user']
 
-    def test_new_discussion(self):
-        self.app.config['USE_METRICS'] = True
+    def test_new_discussion_with_extras(self):
         user = self.login()
         dataset = Dataset.objects.create(title='Test dataset')
 
@@ -47,9 +46,6 @@ def test_new_discussion(self):
             })
         self.assert201(response)
 
-        dataset.reload()
-        self.assertEqual(dataset.metrics['discussions'], 1)
-
         discussions = Discussion.objects(subject=dataset)
         self.assertEqual(len(discussions), 1)
 
@@ -100,6 +96,44 @@ def test_new_discussion_missing_subject(self):
         })
         self.assertStatus(response, 400)
 
+    def test_new_discussion(self):
+        self.app.config['USE_METRICS'] = True
+        user = self.login()
+        dataset = Dataset.objects.create(title='Test dataset',
+                                         extras={'key': 'value'})
+
+        with self.assert_emit(on_new_discussion):
+            response = self.post(url_for('api.discussions'), {
+                'title': 'test title',
+                'comment': 'bla bla',
+                'subject': {
+                    'class': 'Dataset',
+                    'id': dataset.id,
+                },
+                'extras': {'key': 'value'}
+            })
+        self.assert201(response)
+
+        dataset.reload()
+        self.assertEqual(dataset.metrics['discussions'], 1)
+
+        discussions = Discussion.objects(subject=dataset)
+        self.assertEqual(len(discussions), 1)
+
+        discussion = discussions[0]
+        self.assertEqual(discussion.user, user)
+        self.assertEqual(len(discussion.discussion), 1)
+        self.assertIsNotNone(discussion.created)
+        self.assertIsNone(discussion.closed)
+        self.assertIsNone(discussion.closed_by)
+        self.assertEqual(discussion.title, 'test title')
+        self.assertEqual(discussion.extras, {u'key': u'value'})
+
+        message = discussion.discussion[0]
+        self.assertEqual(message.content, 'bla bla')
+        self.assertEqual(message.posted_by, user)
+        self.assertIsNotNone(message.posted_on)
+
     def test_list_discussions(self):
         dataset = Dataset.objects.create(title='Test dataset')
         open_discussions = []