Extract NewIssueData from PullRequestCreated (#150)

PullRequestCreated/PullRequestCreated.ts

@@ -1,11 +1,7 @@
 import { OctokitAction } from '../lib/OctokitAction';
 import { PullRequest } from '../lib/OctokitTypes';
 import { JIRA_DOMAIN, JIRA_ISSUE_PATTERN } from '../lib/Constants';
-
-interface IssueParameters {
-  issuetype: { name: string };
-  parent?: { key: string };
-}
+import { NewIssueData } from '../lib/NewIssueData';
 
 class PullRequestCreated extends OctokitAction {
   protected async execute(): Promise<void> {
@@ -30,103 +26,35 @@ class PullRequestCreated extends OctokitAction {
   }
 
   private async processNewJiraIssue(pr: PullRequest, newTitle: string): Promise<string> {
-    const issueId = await this.createJiraIssue(pr);
-    if (issueId) {
-      newTitle = `${issueId} ${newTitle}`;
-      await this.addLinkedIssuesToDescription(pr, [issueId]);
-      await this.jira.moveIssue(issueId, 'Commit');  // OPEN  -> TO DO
-      await this.jira.moveIssue(issueId, 'Start');   // TO DO -> IN PROGRESS
-      const userEmail = await this.findEmail(this.payload.sender.login);
-      if (userEmail) {
-        await this.jira.assignIssue(issueId, userEmail);             // Even if there's already a reviewer, we need this first to populate the lastAssignee field in Jira.
-      }
-      if (this.payload.pull_request.requested_reviewers.length > 0) { // When PR is created directly with a reviewer, process it here. RequestReview action can be scheduled faster and PR title might not have an issue ID yet
-        await this.processRequestReview(issueId, this.payload.pull_request.requested_reviewers[0]);
-      }
-    }
-    return newTitle;
-  }
-
-  private async createJiraIssue(pr: PullRequest): Promise<string> {
-    const additionalFields = this.parseAdditionalFields();
-    const parent = await this.findNonSubTaskParent(this.findMentionedIssues(pr));
-    const projectKey = this.projectKey(parent);
-    if (projectKey) {
-      const parameters = await this.newIssueParameters(projectKey, parent, additionalFields.issuetype?.name ?? 'Task'); // Transfer issuetype name manually, because parameters should have priority due to Sub-task.
-      const issueId = await this.jira.createIssue(projectKey, pr.title, { ...additionalFields, ...parameters });
+    const data = await NewIssueData.create(this.jira, pr, this.getInput('jira-project'), this.getInput('additional-fields'), await this.findEmail(this.payload.sender.login));
+    if (data.projectKey) {
+      const issueId = await this.jira.createIssue(data.projectKey, pr.title, data.additionalFields);;
       if (issueId == null) {
         this.setFailed('Failed to create a new issue in Jira');
       }
-      return issueId;
+      else {
+        newTitle = `${issueId} ${newTitle}`;
+        await this.addLinkedIssuesToDescription(pr, [issueId]);
+        await this.jira.moveIssue(issueId, 'Commit');  // OPEN  -> TO DO
+        await this.jira.moveIssue(issueId, 'Start');   // TO DO -> IN PROGRESS
+        if (data.accountId != null) {
+          await this.jira.assignIssueToAccount(issueId, data.accountId);             // Even if there's already a reviewer, we need this first to populate the lastAssignee field in Jira.
+        }
+        if (this.payload.pull_request.requested_reviewers.length > 0) { // When PR is created directly with a reviewer, process it here. RequestReview action can be scheduled faster and PR title might not have an issue ID yet
+          await this.processRequestReview(issueId, this.payload.pull_request.requested_reviewers[0]);
+        }
+      }
     } else {
       this.log('No suitable project key found, issue will not be created');
-      return null;
-    }
-  }
-
-  private projectKey(parent: any): string {
-    const projectKey = this.getInput('jira-project');
-    // If projectKey is not defined (like in rspec), we want only to create only Sub-tasks in other tasks (not Epics).
-    if (projectKey) {
-      return projectKey;
-    } else if (parent && !["Epic", "Sub-task"].includes(parent.fields.issuetype.name)) {
-      return parent.fields.project.key;
-    } else {
-      return null;
-    }
-  }
-
-  private parseAdditionalFields(): any {
-    const inputAdditionFields = this.getInput('additional-fields');
-    if (inputAdditionFields) {
-      try {
-        return JSON.parse(inputAdditionFields);
-      } catch (error) {
-        console.log(`Unable to parse additional-fields: ${inputAdditionFields}`, error);
-      }
-    }
-    return {};
-  }
-
-  private async newIssueParameters(projectKey: string, parent: any, issueType: string): Promise<IssueParameters> {
-    switch (parent?.fields.issuetype.name) {
-      case 'Epic':
-        return { issuetype: { name: issueType }, parent: { key: parent.key } };
-      case 'Sub-task':
-      case undefined:
-      case null:
-        return { issuetype: { name: issueType } };
-      default:
-        return parent.fields.project.key === projectKey   // Sub-task must be created in the same project
-          ? { issuetype: { name: 'Sub-task' }, parent: { key: parent.key } }
-          : { issuetype: { name: issueType } };
     }
+    return newTitle;
   }
 
   private async addLinkedIssuesToDescription(pr: PullRequest, linkedIssues: string[]): Promise<void> {
     console.log(`Adding the following ticket in description: ${linkedIssues}`);
     await this.updatePullRequestDescription(pr.number, `${linkedIssues.map(x => this.issueLink(x)).join('\n')}\n\n${pr.body || ''}`);
   }
 
-  private async findNonSubTaskParent(issues: Set<string>): Promise<any> {
-    console.log('Looking for a non-Sub-task ticket');
-    for (const issueKey of issues) {
-      const issue = await this.jira.getIssue(issueKey);
-      if (issue?.fields.issuetype.name !== 'Sub-task') {
-        console.log(`Parent issue: ${issue.key} ${issue.fields.issuetype.name}`);
-        return issue;
-      }
-    }
-    console.log('No parent issue found');
-    return null;
-  }
-
-  private findMentionedIssues(pr: PullRequest): Set<string> {
-    const mentionedIssues = pr.body?.match(JIRA_ISSUE_PATTERN) || [];
-    console.log(mentionedIssues.length > 0 ? `Found mentioned issues: ${mentionedIssues}` : 'No mentioned issues found');
-    return new Set(mentionedIssues);
-  }
-
   private issueLink(issue: string): string {
     return `[${issue}](${JIRA_DOMAIN}/browse/${issue})`;
   }