From 1bc174be101002859051445b6013f5415137cdf0 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Tue, 8 Sep 2020 09:58:25 +0100
Subject: [PATCH] Fix comment tag collection and integration.

---
 .../publish/integrate_hierarchy_ftrack.py     | 21 +++++++++++++++++++
 .../publish/collect_hierarchy_context.py      |  3 +--
 .../nukestudio/publish/collect_shots.py       |  5 +++--
 .../publish/collect_tag_comments.py           |  2 +-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py b/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py
index cc569ce2d1..c4d8f2f705 100644
--- a/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py
+++ b/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py
@@ -167,6 +167,27 @@ class IntegrateHierarchyToFtrack(pyblish.api.ContextPlugin):
                 self.session.rollback()
                 six.reraise(tp, value, tb)
 
+            # Create notes.
+            user = self.session.query(
+                "User where username is \"{}\"".format(self.session.api_user)
+            ).first()
+            if user:
+                for comment in entity_data.get("comments", []):
+                    entity.create_note(comment, user)
+            else:
+                self.log.warning(
+                    "Was not able to query current User {}".format(
+                        self.session.api_user
+                    )
+                )
+            try:
+                self.session.commit()
+            except Exception:
+                tp, value, tb = sys.exc_info()
+                self.session.rollback()
+                six.reraise(tp, value, tb)
+
+            # Import children.
             if 'childs' in entity_data:
                 self.import_to_ftrack(
                     entity_data['childs'], entity)
diff --git a/pype/plugins/nukestudio/publish/collect_hierarchy_context.py b/pype/plugins/nukestudio/publish/collect_hierarchy_context.py
index a41e987bdb..930efd618e 100644
--- a/pype/plugins/nukestudio/publish/collect_hierarchy_context.py
+++ b/pype/plugins/nukestudio/publish/collect_hierarchy_context.py
@@ -273,8 +273,6 @@ class CollectHierarchyContext(pyblish.api.ContextPlugin):
                             instance.data["clipOut"] -
                             instance.data["clipIn"])
 
-
-
             self.log.debug(
                 "__ instance.data[parents]: {}".format(
                     instance.data["parents"]
@@ -319,6 +317,7 @@ class CollectHierarchyContext(pyblish.api.ContextPlugin):
                     })
 
             in_info['tasks'] = instance.data['tasks']
+            in_info["comments"] = instance.data.get("comments", [])
 
             parents = instance.data.get('parents', [])
             self.log.debug("__ in_info: {}".format(in_info))
diff --git a/pype/plugins/nukestudio/publish/collect_shots.py b/pype/plugins/nukestudio/publish/collect_shots.py
index 455e25bf82..7055167143 100644
--- a/pype/plugins/nukestudio/publish/collect_shots.py
+++ b/pype/plugins/nukestudio/publish/collect_shots.py
@@ -40,11 +40,12 @@ class CollectShots(api.InstancePlugin):
         data["name"] = data["subset"] + "_" + data["asset"]
 
         data["label"] = (
-            "{} - {} - tasks:{} - assetbuilds:{}".format(
+            "{} - {} - tasks: {} - assetbuilds: {} - comments: {}".format(
                 data["asset"],
                 data["subset"],
                 data["tasks"],
-                [x["name"] for x in data.get("assetbuilds", [])]
+                [x["name"] for x in data.get("assetbuilds", [])],
+                len(data.get("comments", []))
             )
         )
 
diff --git a/pype/plugins/nukestudio/publish/collect_tag_comments.py b/pype/plugins/nukestudio/publish/collect_tag_comments.py
index 1ec98e3d3b..e14e53d439 100644
--- a/pype/plugins/nukestudio/publish/collect_tag_comments.py
+++ b/pype/plugins/nukestudio/publish/collect_tag_comments.py
@@ -17,7 +17,7 @@ class CollectClipTagComments(api.InstancePlugin):
         for tag in instance.data["tags"]:
             if tag["name"].lower() == "comment":
                 instance.data["comments"].append(
-                    tag.metadata().dict()["tag.note"]
+                    tag["metadata"]["tag.note"]
                 )
 
         # Find tags on the source clip.