Refactor out state and an IssueReference

Author: alexr00

src/github/interface.ts

@@ -204,6 +204,13 @@ export interface Issue {
 	reactionCount: number;
 }
 
+export interface IssueReference {
+	id: number;
+	number: number;
+	title: string;
+	state: GithubItemStateEnum;
+}
+
 export interface PullRequest extends Issue {
 	isDraft?: boolean;
 	isRemoteHeadDeleted?: boolean;
@@ -223,7 +230,7 @@ export interface PullRequest extends Issue {
 	mergeCommitMeta?: { title: string, description: string };
 	squashCommitMeta?: { title: string, description: string };
 	suggestedReviewers?: ISuggestedReviewer[];
-	closingIssues?: Pick<Issue, 'id' | 'title' | 'number' | 'state'>[]
+	closingIssues?: IssueReference[]
 	hasComments?: boolean;
 }
 

src/github/issueModel.ts

@@ -18,7 +18,7 @@ import {
 	UpdateIssueResponse,
 } from './graphql';
 import { GithubItemStateEnum, IAccount, IIssueEditData, IMilestone, IProject, IProjectItem, Issue } from './interface';
-import { parseGraphQlIssueComment, parseGraphQLTimelineEvents } from './utils';
+import { parseGraphQlIssueComment, parseGraphQLTimelineEvents, parsePullRequestState } from './utils';
 
 export class IssueModel<TItem extends Issue = Issue> {
 	static ID = 'IssueModel';
@@ -104,11 +104,7 @@ export class IssueModel<TItem extends Issue = Issue> {
 	}
 
 	protected updateState(state: string) {
-		if (state.toLowerCase() === 'open') {
-			this.state = GithubItemStateEnum.Open;
-		} else {
-			this.state = GithubItemStateEnum.Closed;
-		}
+		this.state = parsePullRequestState(state);
 	}
 
 	update(issue: TItem): void {

src/github/pullRequestModel.ts

@@ -57,6 +57,7 @@ import {
 	IGitTreeItem,
 	IRawFileChange,
 	IRawFileContent,
+	IssueReference,
 	ISuggestedReviewer,
 	ITeam,
 	MergeMethod,
@@ -83,6 +84,7 @@ import {
 	parseGraphQLTimelineEvents,
 	parseMergeability,
 	parseMergeQueueEntry,
+	parsePullRequestState,
 	restPaginate,
 } from './utils';
 
@@ -121,7 +123,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 	public conflicts?: string[];
 	public suggestedReviewers?: ISuggestedReviewer[];
 	public hasChangesSinceLastReview?: boolean;
-	public closingIssues: Pick<IssueModel, 'id' | 'title' | 'number' | 'state'>[];
+	public closingIssues: IssueReference[];
 	private _showChangesSinceReview: boolean;
 	private _hasPendingReview: boolean = false;
 	private _onDidChangePendingReviewState: vscode.EventEmitter<boolean> = new vscode.EventEmitter<boolean>();
@@ -236,23 +238,15 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 	public base: GitHubRef;
 
 	protected override updateState(state: string) {
-		if (state.toLowerCase() === 'open') {
-			this.state = GithubItemStateEnum.Open;
-		} else if (state.toLowerCase() === 'merged' || this.item.merged) {
-			this.state = GithubItemStateEnum.Merged;
-		} else {
-			this.state = GithubItemStateEnum.Closed;
-		}
+		const newState = parsePullRequestState(state);
+		this.state = this.item.merged ? GithubItemStateEnum.Merged : newState;
 	}
 
 	override update(item: PullRequest): void {
 		super.update(item);
 		this.isDraft = item.isDraft;
 		this.suggestedReviewers = item.suggestedReviewers;
-		this.closingIssues = (item.closingIssues ?? []).map(issue => ({
-			...issue,
-			state: issue.state as GithubItemStateEnum
-		}));
+		this.closingIssues = item.closingIssues ?? [];
 		if (item.isRemoteHeadDeleted != null) {
 			this.isRemoteHeadDeleted = item.isRemoteHeadDeleted;
 		}

src/github/utils.ts

@@ -742,6 +742,16 @@ export function parseMergeability(mergeability: 'UNKNOWN' | 'MERGEABLE' | 'CONFL
 	return parsed;
 }
 
+export function parsePullRequestState(state: string): GithubItemStateEnum {
+	if (state.toLowerCase() === 'open') {
+		return GithubItemStateEnum.Open;
+	} else if (state.toLowerCase() === 'merged') {
+		return GithubItemStateEnum.Merged;
+	} else {
+		return GithubItemStateEnum.Closed;
+	}
+}
+
 export function parseGraphQLPullRequest(
 	graphQLPullRequest: GraphQL.PullRequest,
 	githubRepository: GitHubRepository,
@@ -925,7 +935,7 @@ function parseSuggestedReviewers(
 }
 
 function parseClosingIssuesReferences(
-	closingIssuesReferences: Array<{ id: number, number: number, title: string, state: 'CLOSED' | 'OPEN' }> | undefined
+	closingIssuesReferences: Array<{ id: number, number: number, title: string, state: string }> | undefined
 ): Array<{ id: number, number: number, title: string, state: GithubItemStateEnum }> {
 	if (!closingIssuesReferences) {
 		return [];
@@ -935,7 +945,7 @@ function parseClosingIssuesReferences(
 		id: issue.id,
 		number: issue.number,
 		title: issue.title,
-		state: issue.state as GithubItemStateEnum
+		state: parsePullRequestState(issue.state)
 	}));
 }