Move the timeline methods back into the models (#7312)

* Move the timeline methods back into the models
This is part 3 of adding a refresh event to the models

* Fix tests

Author: alexr00

src/github/activityBarViewProvider.ts

@@ -79,7 +79,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 		} while (attemptsRemaining > 0 && mergability === PullRequestMergeability.Unknown);
 
 		const result: Partial<PullRequest> = {
-			events: await this._item.githubRepository.getTimelineEvents(this._item),
+			events: await this._item.getTimelineEvents(this._item),
 			mergeable: mergability,
 		};
 		await this.refresh();
@@ -213,7 +213,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				pullRequestModel.number,
 			),
 			this._folderRepositoryManager.getPullRequestRepositoryAccessAndMergeMethods(pullRequestModel),
-			pullRequestModel.githubRepository.getTimelineEvents(pullRequestModel),
+			pullRequestModel.getTimelineEvents(pullRequestModel),
 			pullRequestModel.getReviewRequests(),
 			this._folderRepositoryManager.getBranchNameForPullRequest(pullRequestModel),
 			this._folderRepositoryManager.getPullRequestRepositoryDefaultBranch(pullRequestModel),

src/github/copilotPrWatcher.ts

@@ -186,7 +186,7 @@ export class CopilotPRWatcher extends Disposable {
 			const prs = await folderManager.getPullRequestsForCategory(githubRepository, await variableSubstitution(query, undefined, await folderManager.getPullRequestDefaults(), await this._getCurrentUser(folderManager)));
 			for (const pr of prs?.items ?? []) {
 				unseenKeys.delete(this._model.makeKey(pr.remote.owner, pr.remote.repositoryName, pr.number));
-				const copilotEvents = await pr.githubRepository.getCopilotTimelineEvents(pr);
+				const copilotEvents = await pr.getCopilotTimelineEvents(pr);
 				if (copilotEvents.length === 0) {
 					continue;
 				}

src/github/folderRepositoryManager.ts

@@ -1737,7 +1737,7 @@ export class FolderRepositoryManager extends Disposable {
 				*/
 				this.telemetry.sendTelemetryEvent('pr.merge.success');
 				this._onDidMergePullRequest.fire();
-				return { merged: true, message: '', timeline: await parseCombinedTimelineEvents(result.data?.mergePullRequest.pullRequest.timelineItems.nodes ?? [], await pullRequest.githubRepository.getCopilotTimelineEvents(pullRequest), pullRequest.githubRepository) };
+				return { merged: true, message: '', timeline: await parseCombinedTimelineEvents(result.data?.mergePullRequest.pullRequest.timelineItems.nodes ?? [], await pullRequest.getCopilotTimelineEvents(pullRequest), pullRequest.githubRepository) };
 			})
 			.catch(e => {
 				/* __GDPR__
@@ -2524,7 +2524,7 @@ export class FolderRepositoryManager extends Disposable {
 	private async promptPullBrach(pr: PullRequestModel, branch: Branch, autoStashSetting?: boolean) {
 		if (!this._updateMessageShown || autoStashSetting) {
 			// When the PR is from Copilot, we only want to show the notification when Copilot is done working
-			const copilotStatus = await pr.githubRepository.copilotWorkingStatus(pr);
+			const copilotStatus = await pr.copilotWorkingStatus(pr);
 			if (copilotStatus === CopilotWorkingStatus.InProgress) {
 				return;
 			}

src/github/githubRepository.ts

@@ -8,13 +8,10 @@ import { ApolloQueryResult, DocumentNode, FetchResult, MutationOptions, NetworkS
 import LRUCache from 'lru-cache';
 import * as vscode from 'vscode';
 import { AuthenticationError, AuthProvider, GitHubServerType, isSamlError } from '../common/authentication';
-import { COPILOT_ACCOUNTS, IComment, IReviewThread } from '../common/comment';
 import { Disposable, disposeAll } from '../common/lifecycle';
 import Logger from '../common/logger';
 import { GitHubRemote, parseRemote } from '../common/remote';
 import { ITelemetry } from '../common/telemetry';
-import * as Common from '../common/timelineEvent';
-import { compareIgnoreCase, formatError } from '../common/utils';
 import { PRCommentControllerRegistry } from '../view/pullRequestCommentControllerRegistry';
 import { mergeQuerySchemaWithShared, OctokitCommon, Schema } from './common';
 import { CredentialStore, GitHub } from './credentials';
@@ -43,7 +40,6 @@ import {
 	RepoProjectsResponse,
 	RevertPullRequestResponse,
 	SuggestedActorsResponse,
-	TimelineEventsResponse,
 	UserResponse,
 	ViewerPermissionResponse,
 } from './graphql';
@@ -70,20 +66,16 @@ import * as limitedSchema from './queriesLimited.gql';
 import * as sharedSchema from './queriesShared.gql';
 import {
 	convertRESTPullRequestToRawPullRequest,
-	eventTime,
 	getAvatarWithEnterpriseFallback,
 	getOverrideBranch,
-	insertNewCommitsSinceReview,
 	isInCodespaces,
 	parseAccount,
-	parseCombinedTimelineEvents,
 	parseGraphQLIssue,
 	parseGraphQLPullRequest,
 	parseGraphQLUser,
 	parseGraphQLViewerPermission,
 	parseMergeMethod,
 	parseMilestone,
-	parseSelectRestTimelineEvents,
 	restPaginate,
 } from './utils';
 
@@ -1516,229 +1508,6 @@ export class GitHubRepository extends Disposable {
 		return this._credentialStore.isCurrentUser(authProviderId, login);
 	}
 
-
-	/**
-	 * TODO: @alexr00 we should delete this https://github.com/microsoft/vscode-pull-request-github/issues/6965
-	 */
-	async getCopilotTimelineEvents(issueModel: IssueModel, skipMerge: boolean = false): Promise<Common.TimelineEvent[]> {
-		if (!COPILOT_ACCOUNTS[issueModel.author.login]) {
-			return [];
-		}
-
-		Logger.debug(`Fetch Copilot timeline events of issue #${issueModel.number} - enter`, GitHubRepository.ID);
-
-		const { octokit, remote } = await this.ensure();
-		try {
-			const timeline = await restPaginate<typeof octokit.api.issues.listEventsForTimeline, OctokitCommon.ListEventsForTimelineResponse>(octokit.api.issues.listEventsForTimeline, {
-				issue_number: issueModel.number,
-				owner: remote.owner,
-				repo: remote.repositoryName,
-				per_page: 100
-			});
-
-			const timelineEvents = parseSelectRestTimelineEvents(issueModel, timeline);
-			if (timelineEvents.length === 0) {
-				return [];
-			}
-			if (!skipMerge) {
-				const oldLastEvent = issueModel.timelineEvents.length > 0 ? issueModel.timelineEvents[issueModel.timelineEvents.length - 1] : undefined;
-				let allEvents: Common.TimelineEvent[];
-				if (!oldLastEvent) {
-					allEvents = timelineEvents;
-				} else {
-					const oldEventTime = (eventTime(oldLastEvent) ?? 0);
-					const newEvents = timelineEvents.filter(event => (eventTime(event) ?? 0) > oldEventTime);
-					allEvents = [...issueModel.timelineEvents, ...newEvents];
-				}
-				const oldTimeline = issueModel.timelineEvents;
-				issueModel.timelineEvents = allEvents;
-				if (oldLastEvent && (allEvents.length !== oldTimeline.length)) {
-					this._onDidChangePullRequests.fire([issueModel]);
-				}
-			}
-			return timelineEvents;
-		} catch (e) {
-			Logger.error(`Error fetching Copilot timeline events of issue #${issueModel.number} - ${formatError(e)}`, GitHubRepository.ID);
-			return [];
-		}
-	}
-
-	async getIssueTimelineEvents(issueModel: IssueModel): Promise<Common.TimelineEvent[]> {
-		Logger.debug(`Fetch timeline events of issue #${issueModel.number} - enter`, GitHubRepository.ID);
-		const { query, remote, schema } = await this.ensure();
-
-		try {
-			const { data } = await query<TimelineEventsResponse>({
-				query: schema.IssueTimelineEvents,
-				variables: {
-					owner: remote.owner,
-					name: remote.repositoryName,
-					number: issueModel.number,
-				},
-			});
-
-			if (data.repository === null) {
-				Logger.error('Unexpected null repository when getting issue timeline events', GitHubRepository.ID);
-				return [];
-			}
-			const ret = data.repository.pullRequest.timelineItems.nodes;
-			const events = await parseCombinedTimelineEvents(ret, await this.getCopilotTimelineEvents(issueModel, true), this);
-
-			const crossRefs = new Map(events
-				.filter((event): event is Common.CrossReferencedEvent => {
-					if ((event.event === Common.EventType.CrossReferenced) && !event.source.isIssue) {
-						return (compareIgnoreCase(event.source.owner, issueModel.remote.owner) === 0 && compareIgnoreCase(event.source.repo, issueModel.remote.repositoryName) === 0);
-					}
-					return false;
-
-				}).map((event: Common.CrossReferencedEvent) => {
-					return [event.source.url, event];
-				}));
-
-			for (const pr of this._pullRequestModelsByNumber.values()) {
-				if (crossRefs.has(pr.model.html_url)) {
-					crossRefs.delete(pr.model.html_url);
-				}
-			}
-			const oldEvents = issueModel.timelineEvents;
-			issueModel.timelineEvents = events;
-			if (crossRefs.size > 0) {
-				this._onDidChangePullRequests.fire([issueModel]);
-			} else if (oldEvents.length !== events.length) {
-				this._onDidChangePullRequests.fire([issueModel]);
-			}
-			return events;
-		} catch (e) {
-			console.log(e);
-			return [];
-		}
-	}
-
-	async copilotWorkingStatus(issueModel: IssueModel): Promise<CopilotWorkingStatus | undefined> {
-		const copilotEvents = await this.getCopilotTimelineEvents(issueModel);
-		if (copilotEvents.length > 0) {
-			const lastEvent = copilotEvents[copilotEvents.length - 1];
-			if (lastEvent.event === Common.EventType.CopilotFinished) {
-				return CopilotWorkingStatus.Done;
-			} else if (lastEvent.event === Common.EventType.CopilotStarted) {
-				return CopilotWorkingStatus.InProgress;
-			} else if (lastEvent.event === Common.EventType.CopilotFinishedError) {
-				return CopilotWorkingStatus.Error;
-			}
-		}
-		return CopilotWorkingStatus.NotCopilotIssue;
-	}
-
-	/**
-	 * Get the timeline events of a pull request, including comments, reviews, commits, merges, deletes, and assigns.
-	 */
-	async getTimelineEvents(pullRequestModel: PullRequestModel): Promise<Common.TimelineEvent[]> {
-		const getTimelineEvents = async () => {
-			Logger.debug(`Fetch timeline events of PR #${pullRequestModel.number} - enter`, PullRequestModel.ID);
-			const { query, remote, schema } = await this.ensure();
-			try {
-				const { data } = await query<TimelineEventsResponse>({
-					query: schema.TimelineEvents,
-					variables: {
-						owner: remote.owner,
-						name: remote.repositoryName,
-						number: pullRequestModel.number,
-					},
-				});
-
-				if (data.repository === null) {
-					Logger.error('Unexpected null repository when fetching timeline', PullRequestModel.ID);
-				}
-				return data;
-			} catch (e) {
-				Logger.error(`Failed to get pull request timeline events: ${e}`, PullRequestModel.ID);
-				console.log(e);
-				return undefined;
-			}
-		};
-
-		const [data, latestReviewCommitInfo, currentUser, reviewThreads] = await Promise.all([
-			getTimelineEvents(),
-			pullRequestModel.getViewerLatestReviewCommit(),
-			(await this.getAuthenticatedUser()).login,
-			pullRequestModel.getReviewThreads()
-		]);
-
-
-		const ret = data?.repository?.pullRequest.timelineItems.nodes ?? [];
-		const events = await parseCombinedTimelineEvents(ret, await this.getCopilotTimelineEvents(pullRequestModel, true), this);
-
-		this.addReviewTimelineEventComments(events, reviewThreads);
-		insertNewCommitsSinceReview(events, latestReviewCommitInfo?.sha, currentUser, pullRequestModel.head);
-		Logger.debug(`Fetch timeline events of PR #${pullRequestModel.number} - done`, PullRequestModel.ID);
-		const oldEvents = pullRequestModel.timelineEvents;
-		pullRequestModel.timelineEvents = events;
-		if (oldEvents.length !== events.length) {
-			this._onDidChangePullRequests.fire([pullRequestModel]);
-		}
-		return events;
-	}
-
-	private addReviewTimelineEventComments(events: Common.TimelineEvent[], reviewThreads: IReviewThread[]): void {
-		interface CommentNode extends IComment {
-			childComments?: CommentNode[];
-		}
-
-		const reviewEvents = events.filter((e): e is Common.ReviewEvent => e.event === Common.EventType.Reviewed);
-		const reviewComments = reviewThreads.reduce((previous, current) => (previous as IComment[]).concat(current.comments), []);
-
-		const reviewEventsById = reviewEvents.reduce((index, evt) => {
-			index[evt.id] = evt;
-			evt.comments = [];
-			return index;
-		}, {} as { [key: number]: Common.ReviewEvent });
-
-		const commentsById = reviewComments.reduce((index, evt) => {
-			index[evt.id] = evt;
-			return index;
-		}, {} as { [key: number]: CommentNode });
-
-		const roots: CommentNode[] = [];
-		let i = reviewComments.length;
-		while (i-- > 0) {
-			const c: CommentNode = reviewComments[i];
-			if (!c.inReplyToId) {
-				roots.unshift(c);
-				continue;
-			}
-			const parent = commentsById[c.inReplyToId];
-			parent.childComments = parent.childComments || [];
-			parent.childComments = [c, ...(c.childComments || []), ...parent.childComments];
-		}
-
-		roots.forEach(c => {
-			const review = reviewEventsById[c.pullRequestReviewId!];
-			if (review) {
-				review.comments = review.comments.concat(c).concat(c.childComments || []);
-			}
-		});
-
-		reviewThreads.forEach(thread => {
-			if (!thread.prReviewDatabaseId || !reviewEventsById[thread.prReviewDatabaseId]) {
-				return;
-			}
-			const prReviewThreadEvent = reviewEventsById[thread.prReviewDatabaseId];
-			prReviewThreadEvent.reviewThread = {
-				threadId: thread.id,
-				canResolve: thread.viewerCanResolve,
-				canUnresolve: thread.viewerCanUnresolve,
-				isResolved: thread.isResolved
-			};
-
-		});
-
-		const pendingReview = reviewEvents.filter(r => r.state?.toLowerCase() === 'pending')[0];
-		if (pendingReview) {
-			// Ensures that pending comments made in reply to other reviews are included for the pending review
-			pendingReview.comments = reviewComments.filter(c => c.isDraft);
-		}
-	}
-
 	/**
 	 * Get the status checks of the pull request, those for the last commit.
 	 *