Modify GraphQL query to exclude pending reviews from last review

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/github/graphql.ts

@@ -317,10 +317,12 @@ export interface LatestUpdatesResponse {
 export interface LatestReviewCommitResponse {
 	repository: {
 		pullRequest: {
-			viewerLatestReview: {
-				commit: {
-					oid: string;
-				}
+			reviews: {
+				nodes: {
+					commit: {
+						oid: string;
+					}
+				}[];
 			};
 		};
 	} | null;

src/github/pullRequestModel.ts

@@ -598,6 +598,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 	async getViewerLatestReviewCommit(): Promise<{ sha: string } | undefined> {
 		Logger.debug(`Fetch viewers latest review commit`, IssueModel.ID);
 		const { query, remote, schema } = await this.githubRepository.ensure();
+		const currentUser = (await this.githubRepository.getAuthenticatedUser()).login;
 
 		try {
 			const { data } = await query<LatestReviewCommitResponse>({
@@ -606,15 +607,17 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 					owner: remote.owner,
 					name: remote.repositoryName,
 					number: this.number,
+					author: currentUser,
 				},
 			});
 
 			if (data.repository === null) {
 				Logger.error('Unexpected null repository while getting last review commit', PullRequestModel.ID);
 			}
 
-			return data.repository?.pullRequest.viewerLatestReview ? {
-				sha: data.repository?.pullRequest.viewerLatestReview.commit.oid,
+			const latestReview = data.repository?.pullRequest.reviews.nodes[0];
+			return latestReview ? {
+				sha: latestReview.commit.oid,
 			} : undefined;
 		}
 		catch (e) {

src/github/queriesShared.gql

@@ -342,12 +342,14 @@ query IssueTimelineEvents($owner: String!, $name: String!, $number: Int!, $last:
 	}
 }
 
-query LatestReviewCommit($owner: String!, $name: String!, $number: Int!) {
+query LatestReviewCommit($owner: String!, $name: String!, $number: Int!, $author: String!) {
 	repository(owner: $owner, name: $name) {
 		pullRequest(number: $number) {
-			viewerLatestReview {
-				commit {
-					oid
+			reviews(first: 1, author: $author, states: [APPROVED, CHANGES_REQUESTED, COMMENTED, DISMISSED]) {
+				nodes {
+					commit {
+						oid
+					}
 				}
 			}
 		}

src/test/builders/graphql/latestReviewCommitBuilder.ts

@@ -10,16 +10,21 @@ import { RateLimitBuilder } from './rateLimitBuilder';
 
 type Repository = NonNullable<LatestReviewCommitResponse['repository']>;
 type PullRequest = Repository['pullRequest'];
-type ViewerLatestReview = PullRequest['viewerLatestReview'];
-type Commit = ViewerLatestReview['commit'];
+type Reviews = PullRequest['reviews'];
+type ReviewNode = Reviews['nodes'][0];
+type Commit = ReviewNode['commit'];
 
 export const LatestReviewCommitBuilder = createBuilderClass<LatestReviewCommitResponse>()({
 	repository: createLink<Repository>()({
 		pullRequest: createLink<PullRequest>()({
-			viewerLatestReview: createLink<ViewerLatestReview>()({
-				commit: createLink<Commit>()({
-					oid: { default: 'abc' },
-				}),
+			reviews: createLink<Reviews>()({
+				nodes: [
+					createLink<ReviewNode>()({
+						commit: createLink<Commit>()({
+							oid: { default: 'abc' },
+						}),
+					}),
+				],
 			}),
 		}),
 	}),