Implements getPullRequestForCommit for Bitbucket DataCenter

(#4192, #4243)

Author: sergeibbb

src/plus/integrations/providers/bitbucket-server.ts

@@ -101,18 +101,13 @@ export class BitbucketServerIntegration extends HostingIntegration<
 		if (type === 'issue') {
 			return undefined;
 		}
-		const integration = await this.container.integrations.get(this.id);
-		if (!integration) {
-			return undefined;
-		}
 		return (await this.container.bitbucket)?.getServerPullRequestById(
 			this,
 			accessToken,
 			repo.owner,
 			repo.name,
 			id,
 			this.apiBaseUrl,
-			integration,
 		);
 	}
 
@@ -133,27 +128,29 @@ export class BitbucketServerIntegration extends HostingIntegration<
 			include?: PullRequestState[];
 		},
 	): Promise<PullRequest | undefined> {
-		const integration = await this.container.integrations.get(this.id);
-		if (!integration) {
-			return undefined;
-		}
 		return (await this.container.bitbucket)?.getServerPullRequestForBranch(
 			this,
 			accessToken,
 			repo.owner,
 			repo.name,
 			branch,
 			this.apiBaseUrl,
-			integration,
 		);
 	}
 
 	protected override async getProviderPullRequestForCommit(
-		_session: AuthenticationSession,
-		_repo: BitbucketRepositoryDescriptor,
-		_rev: string,
+		{ accessToken }: AuthenticationSession,
+		repo: BitbucketRepositoryDescriptor,
+		rev: string,
 	): Promise<PullRequest | undefined> {
-		return Promise.resolve(undefined);
+		return (await this.container.bitbucket)?.getServerPullRequestForCommit(
+			this,
+			accessToken,
+			repo.owner,
+			repo.name,
+			rev,
+			this.apiBaseUrl,
+		);
 	}
 
 	public override async getRepoInfo(repo: { owner: string; name: string }): Promise<ProviderRepository | undefined> {
@@ -210,14 +207,13 @@ export class BitbucketServerIntegration extends HostingIntegration<
 		}
 
 		const api = await this.getProvidersApi();
-		const integration = await this.container.integrations.get(this.id);
-		if (!api || !integration) {
+		if (!api) {
 			return undefined;
 		}
 		const prs = await api.getBitbucketServerPullRequestsForCurrentUser(this.apiBaseUrl, {
 			accessToken: session.accessToken,
 		});
-		return prs?.map(pr => fromProviderPullRequest(pr, integration));
+		return prs?.map(pr => fromProviderPullRequest(pr, this));
 	}
 
 	protected override async searchProviderMyIssues(

src/plus/integrations/providers/bitbucket/bitbucket.ts

@@ -25,7 +25,6 @@ import { Logger } from '../../../../system/logger';
 import type { LogScope } from '../../../../system/logger.scope';
 import { getLogScope } from '../../../../system/logger.scope';
 import { maybeStopWatch } from '../../../../system/stopwatch';
-import type { Integration } from '../../integration';
 import type { BitbucketServerPullRequest } from '../bitbucket-server/models';
 import { normalizeBitbucketServerPullRequest } from '../bitbucket-server/models';
 import { fromProviderPullRequest } from '../models';
@@ -105,7 +104,6 @@ export class BitbucketApi implements Disposable {
 		repo: string,
 		branch: string,
 		baseUrl: string,
-		integration: Integration,
 	): Promise<PullRequest | undefined> {
 		const scope = getLogScope();
 
@@ -130,7 +128,7 @@ export class BitbucketApi implements Disposable {
 		}
 
 		const providersPr = normalizeBitbucketServerPullRequest(response.values[0]);
-		const gitlensPr = fromProviderPullRequest(providersPr, integration);
+		const gitlensPr = fromProviderPullRequest(providersPr, provider);
 		return gitlensPr;
 	}
 
@@ -283,7 +281,6 @@ export class BitbucketApi implements Disposable {
 		repo: string,
 		id: string,
 		baseUrl: string,
-		integration: Integration,
 	): Promise<IssueOrPullRequest | undefined> {
 		const scope = getLogScope();
 
@@ -301,7 +298,7 @@ export class BitbucketApi implements Disposable {
 
 			if (prResponse) {
 				const providersPr = normalizeBitbucketServerPullRequest(prResponse);
-				const gitlensPr = fromProviderPullRequest(providersPr, integration);
+				const gitlensPr = fromProviderPullRequest(providersPr, provider);
 				return gitlensPr;
 			}
 		} catch (ex) {
@@ -369,6 +366,47 @@ export class BitbucketApi implements Disposable {
 		}
 	}
 
+	@debug<BitbucketApi['getServerPullRequestForCommit']>({ args: { 0: p => p.name, 1: '<token>' } })
+	async getServerPullRequestForCommit(
+		provider: Provider,
+		token: string,
+		owner: string,
+		repo: string,
+		rev: string,
+		baseUrl: string,
+		_options?: {
+			avatarSize?: number;
+		},
+		cancellation?: CancellationToken,
+	): Promise<PullRequest | undefined> {
+		const scope = getLogScope();
+
+		try {
+			const response = await this.request<{ values: BitbucketServerPullRequest[] }>(
+				provider,
+				token,
+				baseUrl,
+				`projects/${owner}/repos/${repo}/commits/${rev}/pull-requests`, //?fields=${fieldsParam}`,
+				{
+					method: 'GET',
+				},
+				scope,
+				cancellation,
+			);
+			const prResponse = response?.values?.reduce<BitbucketServerPullRequest | undefined>(
+				(acc, pr) => (!acc || pr.updatedDate > acc.updatedDate ? pr : acc),
+				undefined,
+			);
+			if (!prResponse) return undefined;
+			const providersPr = normalizeBitbucketServerPullRequest(prResponse);
+			const gitlensPr = fromProviderPullRequest(providersPr, provider);
+			return gitlensPr;
+		} catch (ex) {
+			Logger.error(ex, scope);
+			return undefined;
+		}
+	}
+
 	@debug<BitbucketApi['getPullRequestForCommit']>({ args: { 0: p => p.name, 1: '<token>' } })
 	async getPullRequestForCommit(
 		provider: Provider,

src/plus/integrations/providers/models.ts

@@ -55,7 +55,7 @@ import {
 	PullRequestReviewState,
 	PullRequestStatusCheckRollupState,
 } from '../../../git/models/pullRequest';
-import type { ProviderReference } from '../../../git/models/remoteProvider';
+import type { Provider, ProviderReference } from '../../../git/models/remoteProvider';
 import { equalsIgnoreCase } from '../../../system/string';
 import type { EnrichableItem } from '../../launchpad/models/enrichedItem';
 import type { Integration, IntegrationType } from '../integration';
@@ -959,11 +959,11 @@ export function toProviderPullRequest(pr: PullRequest): ProviderPullRequest {
 
 export function fromProviderPullRequest(
 	pr: ProviderPullRequest,
-	integration: Integration,
+	provider: Provider,
 	options?: { project?: IssueProject },
 ): PullRequest {
 	return new PullRequest(
-		integration,
+		provider,
 		fromProviderAccount(pr.author),
 		pr.id,
 		pr.graphQLId || pr.id,