From 0b0a9ca2815251ba423f543e376a38e5805c0aba Mon Sep 17 00:00:00 2001
From: "clement.hector" <clement.hector@fixstudio.com>
Date: Mon, 16 May 2022 15:46:47 +0200
Subject: [PATCH] by default use task status if not specified in config

---
 .../plugins/publish/integrate_kitsu_note.py   | 34 ++++++++++++-------
 .../defaults/project_settings/kitsu.json      |  3 +-
 .../projects_schema/schema_project_kitsu.json |  9 +++--
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py
index 876eb6bf29..ae559e660e 100644
--- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py
+++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from distutils.log import debug
 import gazu
 import pyblish.api
 
@@ -9,7 +10,8 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin):
     order = pyblish.api.IntegratorOrder
     label = "Kitsu Note and Status"
     # families = ["kitsu"]
-    waiting_for_approval_status = "wfa"
+    set_status_note = False
+    note_status_shortname = "wfa"
 
     def process(self, context):
 
@@ -20,21 +22,29 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin):
 
         self.log.debug("Comment is `{}`".format(publish_comment))
 
-        # Get Waiting for Approval status
-        kitsu_status = gazu.task.get_task_status_by_short_name(
-            self.waiting_for_approval_status
-        )
-        if not kitsu_status:
-            self.log.info(
-                "Cannot find {} status. The status will not be "
-                "changed!".format(self.waiting_for_approval_status)
+        # Get note status, by default uses the task status for the note 
+        # if it is not specified in the configuration
+        note_status = context.data["kitsu_task"]["task_status_id"]
+        if self.set_status_note:
+            kitsu_status = gazu.task.get_task_status_by_short_name(
+                self.note_status_shortname
             )
-            kitsu_status = context.data["kitsu_task"].get("task_status")
-        self.log.debug("Kitsu status: {}".format(kitsu_status))
+            if not kitsu_status:
+                self.log.info(
+                    "Cannot find {} status. The status will not be "
+                    "changed!".format(self.note_status_shortname)
+                )
+            else:
+                note_status = kitsu_status
+                self.log.info("Note Kitsu status: {}".format(note_status))
 
         # Add comment to kitsu task
+        self.log.debug("Add new note in taks id {}".format(
+            context.data["kitsu_task"]['id']))
         kitsu_comment = gazu.task.add_comment(
-            context.data["kitsu_task"], kitsu_status, comment=publish_comment
+            context.data["kitsu_task"], 
+            note_status, 
+            comment=publish_comment
         )
 
         context.data["kitsu_comment"] = kitsu_comment
diff --git a/openpype/settings/defaults/project_settings/kitsu.json b/openpype/settings/defaults/project_settings/kitsu.json
index 2f1566d89a..ba02d8d259 100644
--- a/openpype/settings/defaults/project_settings/kitsu.json
+++ b/openpype/settings/defaults/project_settings/kitsu.json
@@ -10,7 +10,8 @@
     },
     "publish": {
         "IntegrateKitsuNote": {
-            "waiting_for_approval_status": "wfa"
+            "set_status_note": false,
+            "note_status_shortname": "wfa"
         }
     }
 }
\ No newline at end of file
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_kitsu.json b/openpype/settings/entities/schemas/projects_schema/schema_project_kitsu.json
index cffd7ff578..014a1b7886 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_kitsu.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_kitsu.json
@@ -60,10 +60,15 @@
                     "key": "IntegrateKitsuNote",
                     "label": "Integrate Kitsu Note",
                     "children": [
+                        {
+                            "type": "boolean",
+                            "key": "set_status_note",
+                            "label": "Set status on note"
+                        },
                         {
                             "type": "text",
-                            "key": "waiting_for_approval_status",
-                            "label": "Waiting for Aproval Status:"
+                            "key": "note_status_shortname",
+                            "label": "Note shortname"
                         }
                     ]
                 }