Merge pull request #276 from collective/erral-index-comments

Index discussion items on import

Author: pbauer

CHANGES.rst

@@ -5,7 +5,9 @@ Changelog
 1.16 (unreleased)
 -----------------
 
-- Skip setting a default page if the default is already set to the same value. 
+- Notify the comment creation to have them indexed in the catalog
+  [erral]
+- Skip setting a default page if the default is already set to the same value.
   [mamico]
 - Fixed data extraction of Archetypes ATFilefields to concatenate all `Pdata` chunks, when the FileField data was still stored in Filestorage and not not migrated to use blobstorage (using plone.app.blobs).
   [@jnptk]

src/collective/exportimport/import_other.py

@@ -24,8 +24,10 @@
 from zope.component import queryUtility
 from zope.component.interfaces import IFactory
 from zope.container.interfaces import INameChooser
+from zope.event import notify
 from zope.globalrequest import getRequest
 from zope.interface import alsoProvides
+from zope.lifecycleevent import ObjectAddedEvent
 from ZPublisher.HTTPRequest import FileUpload
 
 import dateutil
@@ -681,6 +683,10 @@ def import_data(self, data):
                     annotions = IAnnotations(obj)
                     if DISCUSSION_ANNOTATION_KEY not in annotions:
                         annotions[DISCUSSION_ANNOTATION_KEY] = aq_base(conversation)
+
+                    comment = comment.__of__(conversation)
+                    notify(ObjectAddedEvent(comment))
+
                     added += 1
                 logger.info("Added {} comments to {}".format(added, obj.absolute_url()))
                 results += added

src/collective/exportimport/tests/test_import.py

@@ -20,7 +20,8 @@
 from zope.annotation.interfaces import IAnnotations
 from zope.component import getUtility
 from zope.lifecycleevent import modified
-
+from plone.app.discussion.interfaces import IConversation
+from zope.component import createObject
 import json
 import os
 import shutil
@@ -1484,6 +1485,50 @@ def test_reset_dates(self):
         convert = catalog._catalog.indexes["modified"]._convert
         self.assertEqual(indexdata["modified"], convert(reset_modification_date))
 
+    def test_import_discussion(self):
+        app = self.layer["app"]
+        portal = self.layer["portal"]
+        login(app, SITE_OWNER_NAME)
+        doc1 = api.content.create(
+            container=portal, type="Document", id="doc1", title="Document 1"
+        )
+        conversation = IConversation(doc1)
+        comment = createObject("plone.Comment")
+        comment.text = "Comment text"
+        conversation.addComment(comment)
+        transaction.commit()
+
+        browser = self.open_page("@@export_discussion")
+        browser.getForm(action="@@export_discussion").submit(name="form.submitted")
+        contents = browser.contents
+        if not browser.contents:
+            contents = DATA[-1]
+        data = json.loads(contents)
+        self.assertEqual(data[0]["uuid"], doc1.UID())
+        self.assertEqual(
+            data[0]["conversation"]["items"][0]["text"]["data"], "Comment text"
+        )
+
+        # Delete the comment to prepare the import
+        del conversation[comment.id]
+        self.assertEqual(len(conversation), 0)
+
+        transaction.commit()
+
+        browser = self.open_page("@@import_discussion")
+        browser.getForm(action="@@import_discussion").submit(name="form.submitted")
+        upload = browser.getControl(name="jsonfile")
+        upload.add_file(contents, "application/json", "export_discussion.json")
+        browser.getForm(action="@@import_discussion").submit()
+
+        self.assertIn("Imported 1 comments", browser.contents)
+
+        brains = api.content.find(portal_type="Discussion Item")
+        self.assertEqual(len(brains), 1)
+        conversation = IConversation(doc1)
+
+        self.assertEqual(len(conversation), 1)
+
 
 def dateify(value):
     return value.asdatetime().replace(microsecond=0)