t-bug-catcher 0.2.6__tar.gz → 0.3.0__tar.gz

{t_bug_catcher-0.2.6 → t_bug_catcher-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: t_bug_catcher
-Version: 0.2.6
+Version: 0.3.0
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful

{t_bug_catcher-0.2.6 → t_bug_catcher-0.3.0}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.6
+current_version = 0.3.0
 commit = True
 tag = False
 

{t_bug_catcher-0.2.6 → t_bug_catcher-0.3.0}/setup.py

@@ -26,7 +26,7 @@ setup(
     packages=find_packages(include=["t_bug_catcher", "t_bug_catcher.*"]),
     test_suite="tests",
     url="https://www.thoughtful.ai/",
-    version="0.2.6",
+    version="0.3.0",
     zip_safe=False,
     install_requires=install_requirements,
 )

{t_bug_catcher-0.2.6 → t_bug_catcher-0.3.0}/t_bug_catcher/__init__.py

@@ -3,7 +3,7 @@
 __author__ = """Thoughtful"""
 __email__ = "support@thoughtful.ai"
 # fmt: off
-__version__ = '0.2.6'
+__version__ = '0.3.0'
 # fmt: on
 
 from .bug_catcher import (

{t_bug_catcher-0.2.6 → t_bug_catcher-0.3.0}/t_bug_catcher/config.py

@@ -1,6 +1,6 @@
 import os
 
-from .workitems import variables
+from .workitems import metadata, variables
 
 
 class Config:
@@ -13,6 +13,8 @@ class Config:
         MAX_ISSUE_ATTACHMENTS: int = 100
         MAX_DESCRIPTION_LENGTH: int = 250
 
+    SUPPORT_BOARD = "AB"
+
     RC_RUN_LINK = (
         f"https://cloud.robocorp.com/organizations/{os.environ.get('RC_ORGANIZATION_ID')}"
         f"/workspaces/{os.environ.get('RC_WORKSPACE_ID')}/processes"
@@ -25,5 +27,9 @@ class Config:
         else variables.get("environment", "local")
     )
 
+    STAGE = metadata.get("process", dict()).get("implementationStage", "")
+    ADMIN_CODE = metadata.get("process", dict()).get("adminCode", "")
+    EMPOWER_URL = metadata.get("process", dict()).get("processRunUrl") or variables.get("processRunUrl")
+
 
 CONFIG = Config()

{t_bug_catcher-0.2.6 → t_bug_catcher-0.3.0}/t_bug_catcher/jira.py

@@ -89,7 +89,12 @@ class Jira:
                 )
 
     def config(
-        self, login, api_token, project_key, webhook_url: Optional[str] = None, default_assignee: Optional[str] = None
+        self,
+        login: str,
+        api_token: str,
+        project_key: str,
+        webhook_url: Optional[str] = None,
+        default_assignee: Optional[str] = None,
     ) -> bool:
         """Sets the webhook URL for the Jira project.
 
@@ -104,7 +109,7 @@ class Jira:
             bool: True if the configuration was successful, False otherwise.
         """
         try:
-            self._project_key = project_key
+            self._project_key = project_key if CONFIG.STAGE not in ["hypercare", "support"] else CONFIG.SUPPORT_BOARD
             self._default_assignee = default_assignee
             if not webhook_url:
                 logger.warning("No JIRA webhook URL provided. All issues will be posted to backlog.")
@@ -227,6 +232,8 @@ class Jira:
         }
         if labels:
             fields["fields"]["labels"] = labels
+        if self._project_key == CONFIG.SUPPORT_BOARD and CONFIG.ADMIN_CODE:
+            fields["fields"]["customfield_10077"] = [CONFIG.ADMIN_CODE]
         payload = json.dumps(fields)
         return payload
 
@@ -525,11 +532,11 @@ class Jira:
             variables.get("environment"): [
                 {
                     "type": "text",
-                    "text": variables.get("processRunUrl"),
+                    "text": CONFIG.EMPOWER_URL,
                     "marks": [
                         {
                             "type": "link",
-                            "attrs": {"href": variables.get("processRunUrl")},
+                            "attrs": {"href": CONFIG.EMPOWER_URL},
                         },
                         {"type": "underline"},
                     ],
@@ -839,11 +846,20 @@ class Jira:
         Returns:
             The response from creating the ticket.
         """
-        issue_type = (
-            self._issue_types.get("bug")
-            or self._issue_types.get("task")
-            or self._issue_types.get("support", self._issue_types["epic"])
-        )
+        if CONFIG.STAGE.lower() == "hypercare":
+            issue_type = self._issue_types.get("hypercare") or self._issue_types.get("epic")
+        elif CONFIG.STAGE.lower() == "support":
+            issue_type = self._issue_types.get("support") or self._issue_types.get("epic")
+        elif CONFIG.STAGE.lower() == "delivery" and self._project_key == CONFIG.SUPPORT_BOARD:
+            issue_type = self._issue_types.get("development") or self._issue_types.get("epic")
+        else:
+            issue_type = (
+                self._issue_types.get("bug")
+                or self._issue_types.get("task")
+                or self._issue_types.get("support")
+                or self._issue_types.get("epic")
+            )
+
         issue = self.__generate_issue_body(
             summary=summary[:255].split("\n")[0],
             description=description,
@@ -877,7 +893,7 @@ class Jira:
             for attachment in attachments:
                 if os.path.exists(str(attachment)):
                     self.add_attachment(attachment, ticket_id)
-        if self._webhook_url:
+        if self._webhook_url and self._project_key != CONFIG.SUPPORT_BOARD:
             self.move_ticket_to_board(ticket_id)
         return response
 
@@ -1218,4 +1234,6 @@ class Jira:
             f"[{exc_type.__name__}:{os.path.basename(file_name)}:{line_no}] "
             f"{self.remove_locators_from_exception(exc_value)}"
         )
+        if self._project_key == CONFIG.SUPPORT_BOARD and CONFIG.ADMIN_CODE:
+            summary = CONFIG.ADMIN_CODE + " - " + summary
         return summary

{t_bug_catcher-0.2.6 → t_bug_catcher-0.3.0}/t_bug_catcher/workitems.py

@@ -7,6 +7,8 @@ try:
     work_items.get_input_work_item()
     work_item = work_items.get_work_item_variables()
     variables = work_item.get("variables", dict())
+    metadata = work_item.get("metadata", dict())
 except (ImportError, KeyError):
     logger.warning("Workitems unavailable. Variables will be empty.")
     variables = {}
+    metadata = {}

{t_bug_catcher-0.2.6 → t_bug_catcher-0.3.0}/t_bug_catcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: t_bug_catcher
-Version: 0.2.6
+Version: 0.3.0
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful