feat(bitbucket): integrate Bitbucket support with repository search and team management

Ayyanaruto · Ayyanaruto · commit 0200881cb9cb · 2025-06-01T19:13:59.000+05:30
diff --git a/backend/analytics_server/mhq/api/request_utils.py b/backend/analytics_server/mhq/api/request_utils.py
@@ -7,6 +7,7 @@
 from stringcase import snakecase
 from voluptuous import Invalid
 from werkzeug.exceptions import BadRequest
+from mhq.utils.log import LOG
 from mhq.store.models.code.repository import TeamRepos
 from mhq.service.code.models.org_repo import RawTeamOrgRepo
 from mhq.store.models.code import WorkflowFilter, CodeProvider
@@ -82,20 +83,24 @@ def coerce_workflow_filter(filter_data: str) -> WorkflowFilter:
 
 
 def coerce_org_repo(repo: Dict[str, str]) -> RawTeamOrgRepo:
-    return RawTeamOrgRepo(
-        team_id=repo.get("team_id"),
-        provider=CodeProvider(repo.get("provider")),
-        name=repo.get("name"),
-        org_name=repo.get("org"),
-        slug=repo.get("slug"),
-        idempotency_key=repo.get("idempotency_key"),
-        default_branch=repo.get("default_branch"),
-        deployment_type=(
-            TeamReposDeploymentType(repo.get("deployment_type"))
-            if repo.get("deployment_type")
-            else TeamReposDeploymentType.PR_MERGE
-        ),
-    )
+    try:
+        return RawTeamOrgRepo(
+            team_id=repo.get("team_id"),
+            provider=CodeProvider(repo.get("provider")),
+            name=repo.get("name"),
+            org_name=repo.get("org"),
+            slug=repo.get("slug"),
+            idempotency_key=repo.get("idempotency_key"),
+            default_branch=repo.get("default_branch"),
+            deployment_type=(
+                TeamReposDeploymentType(repo.get("deployment_type"))
+                if repo.get("deployment_type")
+                else TeamReposDeploymentType.PR_MERGE
+            ),
+        )
+    except Exception as e:
+        LOG.error(f"Error creating RawTeamOrgRepo with data: {repo}. Error: {str(e)}")
+        raise
 
 
 def coerce_org_repos(repos: List[Dict[str, str]]) -> List[RawTeamOrgRepo]:
diff --git a/backend/analytics_server/mhq/store/models/code/enums.py b/backend/analytics_server/mhq/store/models/code/enums.py
@@ -4,6 +4,7 @@
 class CodeProvider(Enum):
     GITHUB = "github"
     GITLAB = "gitlab"
+    BITBUCKET = "bitbucket"
 
 
 class CodeBookmarkType(Enum):
diff --git a/web-server/pages/api/internal/[org_id]/git_provider_org.ts b/web-server/pages/api/internal/[org_id]/git_provider_org.ts
@@ -1,6 +1,6 @@
 import * as yup from 'yup';
 
-import { gitlabSearch, searchGithubRepos } from '@/api/internal/[org_id]/utils';
+import { gitlabSearch, searchGithubRepos, bitbucketSearch } from '@/api/internal/[org_id]/utils';
 import { Endpoint } from '@/api-helpers/global';
 import { Integration } from '@/constants/integrations';
 import { dec } from '@/utils/auth-supplementary';
@@ -68,6 +68,18 @@ const getGitlabToken = async (org_id: ID) => {
     .then((r) => dec(r.access_token_enc_chunks));
 };
 
+const getBitbucketToken = async (org_id: ID) => {
+  return await db('Integration')
+    .select()
+    .where({
+      org_id,
+      name: Integration.BITBUCKET
+    })
+    .returning('*')
+    .then(getFirstRow)
+    .then((r) => dec(r.access_token_enc_chunks));
+};
+
 const fetchMap = [
   {
     provider: Integration.GITHUB,
@@ -78,5 +90,10 @@ const fetchMap = [
     provider: Integration.GITLAB,
     search: gitlabSearch,
     getToken: getGitlabToken
+  },
+  {
+    provider: Integration.BITBUCKET,
+    search: bitbucketSearch,
+    getToken: getBitbucketToken
   }
 ];
diff --git a/web-server/pages/api/internal/[org_id]/utils.ts b/web-server/pages/api/internal/[org_id]/utils.ts
@@ -269,6 +269,134 @@ export const gitlabSearch = async (pat: string, searchString: string) => {
   return searchGitlabRepos(pat, search);
 };
 
+// Bitbucket functions
+
+type BitbucketRepo = {
+  uuid: string;
+  name: string;
+  full_name: string;
+  description?: string;
+  language?: string;
+  mainbranch?: {
+    name: string;
+  };
+  links: {
+    html: {
+      href: string;
+    };
+  };
+  owner: {
+    username: string;
+  };
+};
+
+type BitbucketResponse = {
+  values: BitbucketRepo[];
+  next?: string;
+};
+
+const BITBUCKET_API_URL = 'https://api.bitbucket.org/2.0';
+
+export const searchBitbucketRepos = async (
+  credentials: string,
+  searchString: string
+): Promise<BaseRepo[]> => {
+  let urlString = convertUrlToQuery(searchString);
+  if (urlString !== searchString && urlString.includes('/')) {
+    try {
+      return await searchBitbucketRepoWithURL(credentials, urlString);
+    } catch (e) {
+      return await searchBitbucketReposWithNames(credentials, urlString);
+    }
+  }
+  return await searchBitbucketReposWithNames(credentials, urlString);
+};
+
+const searchBitbucketRepoWithURL = async (
+  credentials: string,
+  searchString: string
+): Promise<BaseRepo[]> => {
+  const apiUrl = `${BITBUCKET_API_URL}/repositories/${searchString}`;
+  
+  const response = await fetch(apiUrl, {
+    method: 'GET',
+    headers: {
+      Authorization: `Basic ${credentials}`,
+      'Content-Type': 'application/json'
+    }
+  });
+
+  if (!response.ok) {
+    throw new Error(`Bitbucket API error: ${response.statusText}`);
+  }
+
+  const repo = (await response.json()) as BitbucketRepo;
+  
+  return [
+    {
+      id: repo.uuid.replace(/[{}]/g, ''),
+      name: repo.name,
+      desc: repo.description,
+      slug: repo.name,
+      parent: repo.owner.username,
+      web_url: repo.links.html.href,
+      branch: repo.mainbranch?.name,
+      language: repo.language,
+      provider: Integration.BITBUCKET
+    }
+  ] as BaseRepo[];
+};
+
+const searchBitbucketReposWithNames = async (
+  credentials: string,
+  searchString: string
+): Promise<BaseRepo[]> => {
+  const apiUrl = `${BITBUCKET_API_URL}/repositories`;
+  const params = new URLSearchParams({
+    q: `name~"${searchString}"`,
+    role: 'member',
+    pagelen: '50'
+  });
+
+  const response = await fetch(`${apiUrl}?${params}`, {
+    method: 'GET',
+    headers: {
+      Authorization: `Basic ${credentials}`,
+      'Content-Type': 'application/json'
+    }
+  });
+
+  if (!response.ok) {
+    throw new Error(`Bitbucket API error: ${response.statusText}`);
+  }
+
+  const responseBody = (await response.json()) as BitbucketResponse;
+  const repositories = responseBody.values || [];
+
+  return repositories.map(
+    (repo) =>
+      ({
+        id: repo.uuid.replace(/[{}]/g, ''),
+        name: repo.name,
+        desc: repo.description,
+        slug: repo.name,
+        parent: repo.owner.username,
+        web_url: repo.links.html.href,
+        branch: repo.mainbranch?.name,
+        language: repo.language || null,
+        provider: Integration.BITBUCKET
+      }) as BaseRepo
+  );
+};
+
+export const bitbucketSearch = async (
+  credentials: string,
+  searchString: string
+): Promise<BaseRepo[]> => {
+  let search = convertUrlToQuery(searchString);
+  return searchBitbucketRepos(credentials, search);
+};
+
 const convertUrlToQuery = (url: string) => {
   let query = url;
   try {
@@ -280,6 +408,7 @@ const convertUrlToQuery = (url: string) => {
     query = query.replace('http://', '');
     query = query.replace('github.com/', '');
     query = query.replace('gitlab.com/', '');
+    query = query.replace('bitbucket.org/', '');
     query = query.startsWith('www.') ? query.slice(4) : query;
     query = query.endsWith('/') ? query.slice(0, -1) : query;
   }
@@ -303,4 +432,4 @@ const replaceURL = async (url: string): Promise<string> => {
   }
 
   return url;
-};
+};
diff --git a/web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts b/web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts
@@ -91,7 +91,7 @@ endpoint.handle.GET(getSchema, async (req, res) => {
     org_id,
     providers?.length
       ? (providers as Integration[])
-      : [Integration.GITHUB, Integration.GITLAB]
+      : [Integration.GITHUB, Integration.GITLAB,Integration.BITBUCKET]
   );
 
   res.send({
@@ -116,6 +116,7 @@ endpoint.handle.POST(postSchema, async (req, res) => {
       } as any as ReqRepoWithProvider);
     });
   }, org_repos);
+  console.log('orgReposList in POST', orgReposList);
   const [team, onboardingState] = await Promise.all([
     createTeam(org_id, name, []),
     getOnBoardingState(org_id)
@@ -165,7 +166,7 @@ endpoint.handle.PATCH(patchSchema, async (req, res) => {
       } as any as ReqRepoWithProvider);
     });
   }, org_repos);
-
+console.log('orgReposList in Patch', orgReposList);
   const [team] = await Promise.all([
     updateTeam(id, name, []),
     handleRequest<(Row<'TeamRepos'> & Row<'OrgRepo'>)[]>(`/teams/${id}/repos`, {
@@ -301,7 +302,7 @@ const updateReposWorkflows = async (
       .whereIn('name', reposForWorkflows)
       .where('org_id', org_id)
       .andWhere('is_active', true)
-      .and.whereIn('provider', [Integration.GITHUB, Integration.GITLAB]);
+      .and.whereIn('provider', [Integration.GITHUB, Integration.GITLAB, Integration.BITBUCKET]);
 
     const groupedRepos = groupBy(dbReposForWorkflows, 'name');
 
diff --git a/web-server/src/components/Teams/CreateTeams.tsx b/web-server/src/components/Teams/CreateTeams.tsx
@@ -31,6 +31,7 @@ import { DeploymentWorkflowSelector } from '@/components/WorkflowSelector';
 import { Integration } from '@/constants/integrations';
 import { useBoolState, useEasyState } from '@/hooks/useEasyState';
 import GitlabIcon from '@/mocks/icons/gitlab.svg';
+import BitbucketIcon from '@/mocks/icons/bitbucket.svg'
 import { BaseRepo, DeploymentSources } from '@/types/resources';
 import { trimWithEllipsis } from '@/utils/stringFormatting';
 
@@ -257,7 +258,7 @@ const TeamRepos: FC = () => {
           )}
           renderOption={(props, option, { selected }) => (
             <li {...props}>
-              <FlexBox
+                <FlexBox
                 gap={2}
                 justifyBetween
                 fullWidth
@@ -266,34 +267,36 @@ const TeamRepos: FC = () => {
                   textOverflow: 'ellipsis',
                   overflow: 'hidden'
                 }}
-              >
+                >
                 <FlexBox
                   col
                   sx={{ maxWidth: '200px', overflow: 'hidden' }}
                   tooltipPlacement="right"
                   title={
-                    checkOverflow(option) ? (
-                      <OverFlowTooltip
-                        parent={option.parent}
-                        name={option.name}
-                      />
-                    ) : undefined
+                  checkOverflow(option) ? (
+                    <OverFlowTooltip
+                    parent={option.parent}
+                    name={option.name}
+                    />
+                  ) : undefined
                   }
                 >
                   <FlexBox gap={1 / 2} alignCenter>
-                    {option.provider === Integration.GITHUB ? (
-                      <GitHub sx={{ fontSize: '14px' }} />
-                    ) : (
-                      <GitlabIcon height={12} width={12} />
-                    )}
-                    <Line tiny>
-                      {addEllipsis(option.parent, MAX_LENGTH_PARENT_NAME)}
-                    </Line>
+                  {option.provider === Integration.GITHUB ? (
+                    <GitHub sx={{ fontSize: '14px' }} />
+                  ) : option.provider === Integration.BITBUCKET ? (
+                    <BitbucketIcon height={12} width={12} />
+                  ) : (
+                    <GitlabIcon height={12} width={12} />
+                  )}
+                  <Line tiny>
+                    {addEllipsis(option.parent, MAX_LENGTH_PARENT_NAME)}
+                  </Line>
                   </FlexBox>
                   <Line>{addEllipsis(option.name, MAX_LENGTH_REPO_NAME)}</Line>
                 </FlexBox>
                 {selected ? <Close fontSize="small" /> : null}
-              </FlexBox>
+                </FlexBox>
             </li>
           )}
           renderTags={() => null}
@@ -398,6 +401,8 @@ const DisplayRepos: FC = () => {
                   >
                     {repo.provider === Integration.GITHUB ? (
                       <GitHub sx={{ fontSize: '16px' }} />
+                    ) : repo.provider === Integration.BITBUCKET ? (
+                      <BitbucketIcon height={14} width={14} />
                     ) : (
                       <GitlabIcon height={14} width={14} />
                     )}
