Merge pull request #488 from middlewarehq/feat/gitlab-integration

Add GitLab integration functionality

Author: jayantbh

backend/analytics_server/mhq/service/code/sync/etl_handler.py

@@ -3,6 +3,7 @@
 
 import pytz
 
+from mhq.store.models.code.enums import CodeProvider
 from mhq.service.settings.configuration_settings import (
     get_settings_service,
     SettingsService,
@@ -42,11 +43,11 @@ def __init__(
         self.bookmark_service = bookmark_service
         self.settings_service = settings_service
 
-    def sync_org_repos(self, org_id: str):
+    def sync_org_repos(self, org_id: str, provider: CodeProvider):
         if not self.etl_service.check_pat_validity():
             LOG.error("Invalid PAT for code provider")
             return
-        org_repos: List[OrgRepo] = self._sync_org_repos(org_id)
+        org_repos: List[OrgRepo] = self._sync_org_repos(org_id, provider)
         for org_repo in org_repos:
             try:
                 self._sync_repo_pull_requests_data(org_repo)
@@ -56,9 +57,11 @@ def sync_org_repos(self, org_id: str):
                 )
                 continue
 
-    def _sync_org_repos(self, org_id: str) -> List[OrgRepo]:
+    def _sync_org_repos(self, org_id: str, provider: CodeProvider) -> List[OrgRepo]:
         try:
-            org_repos = self.code_repo_service.get_active_org_repos(org_id)
+            org_repos = self.code_repo_service.get_active_org_repos_for_provider(
+                org_id, provider
+            )
             org_repos = self.etl_service.get_org_repos(org_repos)
             self.code_repo_service.update_org_repos(org_repos)
             return org_repos
@@ -141,7 +144,7 @@ def sync_code_repos(org_id: str):
                 get_bookmark_service(),
                 get_settings_service(),
             )
-            code_etl_handler.sync_org_repos(org_id)
+            code_etl_handler.sync_org_repos(org_id, CodeProvider(provider))
             LOG.info(f"Synced org repos for provider {provider}")
         except Exception as e:
             LOG.error(f"Error syncing org repos for provider {provider}: {str(e)}")

backend/analytics_server/mhq/store/repos/code.py

@@ -2,6 +2,7 @@
 from operator import and_
 from typing import Optional, List
 
+from mhq.store.models.code.enums import CodeProvider
 from sqlalchemy import or_
 from sqlalchemy.orm import defer
 from mhq.store.models.core import Team
@@ -35,6 +36,20 @@ def get_active_org_repos(self, org_id: str) -> List[OrgRepo]:
             .all()
         )
 
+    @rollback_on_exc
+    def get_active_org_repos_for_provider(
+        self, org_id: str, provider: CodeProvider
+    ) -> List[OrgRepo]:
+        return (
+            self._db.session.query(OrgRepo)
+            .filter(
+                OrgRepo.org_id == org_id,
+                OrgRepo.is_active.is_(True),
+                OrgRepo.provider == provider.value,
+            )
+            .all()
+        )
+
     @rollback_on_exc
     def update_org_repos(self, org_repos: List[OrgRepo]):
         [self._db.session.merge(org_repo) for org_repo in org_repos]

web-server/pages/api/integrations/orgs.ts

@@ -13,7 +13,7 @@ import { db, dbRaw } from '@/utils/db';
 
 const getSchema = yup.object().shape({
   org_id: yup.string().uuid().required(),
-  provider: yup.string().oneOf(Object.values(Integration))
+  providers: yup.array(yup.string().oneOf(Object.values(Integration)))
 });
 
 const endpoint = new Endpoint(nullSchema);
@@ -23,14 +23,14 @@ endpoint.handle.GET(getSchema, async (req, res) => {
     return res.send(selectedDBReposMock);
   }
 
-  const { org_id, provider } = req.payload;
+  const { org_id, providers } = req.payload;
 
-  res.send(await getSelectedReposForOrg(org_id, provider as Integration));
+  res.send(await getSelectedReposForOrg(org_id, providers as Integration[]));
 });
 
 export const getSelectedReposForOrg = async (
   org_id: ID,
-  provider: Integration
+  providers: Integration[]
 ): Promise<RepoWithMultipleWorkflows[]> => {
   const dbRepos: RepoWithSingleWorkflow[] = await db(Table.OrgRepo)
     .leftJoin({ rw: Table.RepoWorkflow }, function () {
@@ -47,7 +47,8 @@ export const getSelectedReposForOrg = async (
     .select(dbRaw.raw('to_json(rw) as repo_workflow'))
     .select('tr.deployment_type', 'tr.team_id')
     .from('OrgRepo')
-    .where({ org_id, 'OrgRepo.provider': provider })
+    .where('org_id', org_id)
+    .and.whereIn('OrgRepo.provider', providers)
     .andWhereNot('OrgRepo.is_active', false);
 
   const repoToWorkflowMap = dbRepos.reduce(