From 038f672af7c46c6996f63f8f480cb3ca1d8c8852 Mon Sep 17 00:00:00 2001
From: James McMullan <jpmcmu@gmail.com>
Date: Tue, 23 Jul 2024 16:08:06 -0400
Subject: [PATCH] HPCC4J-608 JirabotMerge: Fixed syntax error (#723)

Signed-off-by: James McMullan James.McMullan@lexisnexis.com
---
 .github/workflows/Jirabot.yml      | 54 ++++++++++++++++++------------
 .github/workflows/JirabotMerge.yml |  5 +--
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/Jirabot.yml b/.github/workflows/Jirabot.yml
index 62bcf7c8d..d6d49582e 100644
--- a/.github/workflows/Jirabot.yml
+++ b/.github/workflows/Jirabot.yml
@@ -61,28 +61,7 @@ jobs:
                 issueName = issue['key']
                 issueFields = issue['fields']
 
-                try:
-                    transitionId = jira.get_transition_id_to_status_name(issue_name, desiredStatus)
-                    jira.set_issue_status_by_transition_id(issue_name, transitionId)
-                    result += 'Workflow Transition To: ' + desiredStatus + '\n'
-                except Exception as error:
-                    transitions = jira.get_issue_transitions(issueName)
-                    result += 'Error: Transitioning to: "' + desiredStatus + '" failed with: "' + str(error) + '" Valid transitions=' + str(transitions) + '\n'
-
-                prFieldName = propertyMap.get('pullRequestFieldName', 'customfield_10010')
-
-                if prFieldName in issueFields:
-                    currentPR = issueFields[prFieldName]
-                else:
-                    print('Error: Unable to find pull request field with field name: ' + prFieldName)
-                    currentPR = None
-
-                if currentPR is None:
-                    jira.update_issue_field(issueName, {prFieldName: pull_url})
-                    result += 'Updated PR\n'
-                elif currentPR is not None and currentPR != pull_url:
-                    result += 'Additional PR: ' + pull_url + '\n'
-
+                # Need to update user first in case we are starting from Unresourced
                 if prAuthor:
                     assignee = issueFields['assignee']
                     if assignee is None:
@@ -105,6 +84,37 @@ jobs:
                         result += 'Changing assignee from: ' + assigneeEmail + ' to: ' + prAuthorEmail + '\n'
                         jira.assign_issue(issueName, prAuthorId)
 
+                # We should be able to transition directly to Merge Pending, keeping this for future reference
+                transitionFlow = ['Merge Pending']
+                # statusName = str(issueFields['status']['name'])
+                # if statusName == 'Awaiting Information' or statusName == 'Unresourced':
+                #     transitionFlow = ['Accepted', 'Active', 'Merge Pending']
+                # elif statusName != 'Active':
+                #     transitionFlow = ['Active', 'Merge Pending']
+
+                for desiredStatus in transitionFlow:
+                    try:
+                        transitionId = jira.get_transition_id_to_status_name(issueName, desiredStatus)
+                        jira.set_issue_status_by_transition_id(issueName, transitionId)
+                        result += 'Workflow Transition To: ' + desiredStatus + '\n'
+                    except Exception as error:
+                        transitions = jira.get_issue_transitions(issueName)
+                        result += 'Error: Transitioning to: "' + desiredStatus + '" failed with: "' + str(error) + '" Valid transitions=' + str(transitions) + '\n'
+
+                prFieldName = propertyMap.get('pullRequestFieldName', 'customfield_10010')
+
+                if prFieldName in issueFields:
+                    currentPR = issueFields[prFieldName]
+                else:
+                    print('Error: Unable to find pull request field with field name: ' + prFieldName)
+                    currentPR = None
+
+                if currentPR is None:
+                    jira.update_issue_field(issueName, {prFieldName: pull_url})
+                    result += 'Updated PR\n'
+                elif currentPR is not None and currentPR != pull_url:
+                    result += 'Additional PR: ' + pull_url + '\n'
+
                 return result
 
             jirabot_user = os.environ['JIRABOT_USERNAME']
diff --git a/.github/workflows/JirabotMerge.yml b/.github/workflows/JirabotMerge.yml
index 1807378e6..1c37f0da8 100644
--- a/.github/workflows/JirabotMerge.yml
+++ b/.github/workflows/JirabotMerge.yml
@@ -56,12 +56,13 @@ jobs:
             import subprocess
             import time
             import sys
+            import json
             from atlassian.jira import Jira
 
             def extractVersion(versionStr):
                 parts = versionStr.split('.')
                 if len(parts) != 3:
-                    print('Invalid version: ' + version)
+                    print('Invalid version: ' + versionStr)
                     sys.exit(1)
                 if parts[2].lower() == 'x':
                     parts[2] = '0'
@@ -142,7 +143,7 @@ jobs:
                             project = jira.get_project(projectName)
                             projectId = project['id']
                             jira.add_version(projectName, projectId, fixVersion)
-                    catch Exception as error:
+                    except Exception as error:
                         print('Error: Unable to add fix version: ' + fixVersion + ' with: ' + str(error))
                         sys.exit(1)