Uses shared library to retrieve user's Bitbucket PRs per repo.

Integrates changes from gitkraken/provider-apis-package-js#223 Solves #4128
gitkraken · Mar 10, 2025 · 1845881 · 1845881
1 parent 5601400
commit 1845881
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 66 deletions.
diff --git a/src/plus/integrations/providers/bitbucket.ts b/src/plus/integrations/providers/bitbucket.ts
@@ -207,9 +207,18 @@ export class BitbucketIntegration extends HostingIntegration<
 			return undefined;
 		}
 
+		const api = await this.getProvidersApi();
+		if (!api) {
+			return undefined;
+		}
+
 		const remotes = await flatSettled(this.container.git.openRepositories.map(r => r.git.remotes().getRemotes()));
 		const workspaceRepos = await nonnullSettled(
-			remotes.map(async r => ((await r.getIntegration())?.id === this.id ? r.path : undefined)),
+			remotes.map(async r => {
+				const integration = await r.getIntegration();
+				const [namespace, name] = r.path.split('/');
+				return integration?.id === this.id ? { name: name, namespace: namespace } : undefined;
+			}),
 		);
 
 		const user = await this.getProviderCurrentAccount(session);
@@ -218,44 +227,25 @@ export class BitbucketIntegration extends HostingIntegration<
 		const workspaces = await this.getProviderResourcesForUser(session);
 		if (workspaces == null || workspaces.length === 0) return undefined;
 
-		const providersApi = await this.getProvidersApi();
-		const api = await this.container.bitbucket;
-		if (!providersApi && !api) {
-			return undefined;
-		}
-
 		const integration = await this.container.integrations.get(this.id);
 
-		const authoredPrs = providersApi
-			? workspaces.map(async ws => {
-					const prs = await providersApi.getBitbucketPullRequestsAuthoredByUserForWorkspace(
-						user.id,
-						ws.slug,
-						{
-							accessToken: session.accessToken,
-						},
-					);
-					return prs?.map(pr => fromProviderPullRequest(pr, integration));
-			  })
-			: [];
+		const authoredPrs = workspaces.map(async ws => {
+			const prs = await api.getBitbucketPullRequestsAuthoredByUserForWorkspace(user.id, ws.slug, {
+				accessToken: session.accessToken,
+			});
+			return prs?.map(pr => fromProviderPullRequest(pr, integration));
+		});
 
 		const reviewingPrs = api
-			? workspaceRepos.map(repo => {
-					const [owner, name] = repo.split('/');
-					return api.getUsersReviewingPullRequestsForRepo(
-						this,
-						session.accessToken,
-						user.id,
-						owner,
-						name,
-						this.apiBaseUrl,
-					);
-			  })
-			: [];
+			.getPullRequestsForRepos(this.id, workspaceRepos, {
+				query: `state="OPEN" AND reviewers.uuid="${user.id}"`,
+				accessToken: session.accessToken,
+			})
+			.then(r => r.values?.map(pr => fromProviderPullRequest(pr, integration)));
 
 		return [
 			...uniqueBy(
-				await flatSettled([...authoredPrs, ...reviewingPrs]),
+				await flatSettled([...authoredPrs, reviewingPrs]),
 				pr => pr.url,
 				(orig, _cur) => orig,
 			),
@@ -346,7 +336,7 @@ export function isBitbucketCloudDomain(domain: string | undefined): boolean {
 	return domain != null && bitbucketCloudDomainRegex.test(domain);
 }
 
-type MaybePromiseArr<T> = Promise<T | undefined>[] | (T | undefined)[];
+type MaybePromiseArr<T> = (Promise<T | undefined> | T | undefined)[];
 
 async function nonnullSettled<T>(arr: MaybePromiseArr<T>): Promise<T[]> {
 	const all = await Promise.allSettled(arr);

diff --git a/src/plus/integrations/providers/bitbucket/bitbucket.ts b/src/plus/integrations/providers/bitbucket/bitbucket.ts
@@ -289,39 +289,6 @@ export class BitbucketApi implements Disposable {
 		}
 	}
 
-	async getUsersReviewingPullRequestsForRepo(
-		provider: Provider,
-		token: string,
-		userUuid: string,
-		owner: string,
-		repo: string,
-		baseUrl: string,
-	): Promise<PullRequest[] | undefined> {
-		const scope = getLogScope();
-
-		const query = encodeURIComponent(`state="OPEN" AND reviewers.uuid="${userUuid}"`);
-		const response = await this.request<{
-			values: BitbucketPullRequest[];
-			pagelen: number;
-			size: number;
-			page: number;
-		}>(
-			provider,
-			token,
-			baseUrl,
-			`repositories/${owner}/${repo}/pullrequests?q=${query}&state=OPEN&fields=%2Bvalues.reviewers,%2Bvalues.participants`,
-			{
-				method: 'GET',
-			},
-			scope,
-		);
-
-		if (!response?.values?.length) {
-			return undefined;
-		}
-		return response.values.map(pr => fromBitbucketPullRequest(pr, provider));
-	}
-
 	private async request<T>(
 		provider: Provider,
 		token: string,

diff --git a/src/plus/integrations/providers/models.ts b/src/plus/integrations/providers/models.ts
@@ -152,6 +152,7 @@ export interface GetPullRequestsOptions {
 	assigneeLogins?: string[];
 	reviewRequestedLogin?: string;
 	mentionLogin?: string;
+	query?: string;
 	cursor?: string; // stringified JSON object of type { type: 'cursor' | 'page'; value: string | number } | {}
 	baseUrl?: string;
 }