Remove code duplication #346

Signed-off-by: tdruez <tdruez@nexb.com>

Author: tdruez

workflow/integrations/gitlab.py

@@ -41,15 +41,15 @@ def sync(self, request):
         external_issue = request.external_issue
         if external_issue:
             self.update_issue(
-                project_path=project_path,
+                repo_id=project_path,
                 issue_id=external_issue.issue_id,
                 title=self.make_issue_title(request),
                 description=self.make_issue_body(request),
                 state_event="close" if request.is_closed else "reopen",
             )
         else:
             issue = self.create_issue(
-                project_path=project_path,
+                repo_id=project_path,
                 title=self.make_issue_title(request),
                 description=self.make_issue_body(request),
             )
@@ -59,9 +59,9 @@ def sync(self, request):
                 issue_id=issue["iid"],
             )
 
-    def create_issue(self, project_path, title, description=""):
+    def create_issue(self, repo_id, title, description=""):
         """Create a new GitLab issue."""
-        project_path = requests.utils.quote(project_path, safe="")
+        project_path = requests.utils.quote(repo_id, safe="")
         url = f"{self.api_url}/projects/{project_path}/issues"
         data = {"title": title, "description": description}
 
@@ -73,9 +73,9 @@ def create_issue(self, project_path, title, description=""):
         response.raise_for_status()
         return response.json()
 
-    def update_issue(self, project_path, issue_id, title=None, description=None, state_event=None):
+    def update_issue(self, repo_id, issue_id, title=None, description=None, state_event=None):
         """Update an existing GitLab issue."""
-        project_path = requests.utils.quote(project_path, safe="")
+        project_path = requests.utils.quote(repo_id, safe="")
         url = f"{self.api_url}/projects/{project_path}/issues/{issue_id}"
         data = {}
         if title:
@@ -93,9 +93,9 @@ def update_issue(self, project_path, issue_id, title=None, description=None, sta
         response.raise_for_status()
         return response.json()
 
-    def post_comment(self, project_path, issue_id, comment_body):
+    def post_comment(self, repo_id, issue_id, comment_body):
         """Post a comment on an existing GitLab issue."""
-        project_path = requests.utils.quote(project_path, safe="")
+        project_path = requests.utils.quote(repo_id, safe="")
         url = f"{self.api_url}/projects/{project_path}/issues/{issue_id}/notes"
         data = {"body": comment_body}
 

workflow/models.py

@@ -39,8 +39,8 @@
 from dje.models import HistoryDateFieldsMixin
 from dje.models import HistoryFieldsMixin
 from dje.models import get_unsecured_manager
-from workflow.integrations.gitlab import GitLabIntegration
 from workflow.integrations.github import GitHubIntegration
+from workflow.integrations.gitlab import GitLabIntegration
 from workflow.notification import request_comment_slack_payload
 from workflow.notification import request_slack_payload
 
@@ -136,6 +136,13 @@ def icon_css_class(self):
         }
         return platform_icons.get(self.platform, "fa-solid fa-square-up-right")
 
+    @property
+    def integration_class(self):
+        if self.platform == self.Platform.GITHUB:
+            return GitHubIntegration
+        elif self.platform == self.Platform.GITLAB:
+            return GitLabIntegration
+
 
 class RequestQuerySet(DataspacedQuerySet):
     BASE_SELECT_RELATED = [
@@ -618,7 +625,7 @@ def handle_integrations(self):
 
         if "github.com" in issue_tracker_id:
             GitHubIntegration(dataspace=self.dataspace).sync(request=self)
-        if "gitlab.com" in issue_tracker_id:
+        elif "gitlab.com" in issue_tracker_id:
             GitLabIntegration(dataspace=self.dataspace).sync(request=self)
 
 
@@ -693,18 +700,12 @@ def handle_integrations(self):
         if not self.event_type == self.CLOSED:
             return
 
-        if external_issue.platform == ExternalIssueLink.Platform.GITHUB:
-            GitHubIntegration(dataspace=self.dataspace).post_comment(
+        if integration_class := external_issue.integration_class:
+            integration_class(dataspace=self.dataspace).post_comment(
                 repo_id=external_issue.repo,
                 issue_id=external_issue.issue_id,
                 comment_body=self.text,
             )
-        elif external_issue.platform == ExternalIssueLink.Platform.GITLAB:
-            GitLabIntegration(dataspace=self.dataspace).post_comment(
-                project_path=external_issue.repo,
-                issue_id=external_issue.issue_id,
-                comment_body=self.text,
-            )
 
 
 class RequestComment(AbstractRequestEvent):
@@ -781,18 +782,12 @@ def handle_integrations(self):
         if not external_issue:
             return
 
-        if external_issue.platform == ExternalIssueLink.Platform.GITHUB:
-            GitHubIntegration(dataspace=self.dataspace).post_comment(
+        if integration_class := external_issue.integration_class:
+            integration_class(dataspace=self.dataspace).post_comment(
                 repo_id=external_issue.repo,
                 issue_id=external_issue.issue_id,
                 comment_body=self.text,
             )
-        elif external_issue.platform == ExternalIssueLink.Platform.GITLAB:
-            GitLabIntegration(dataspace=self.dataspace).post_comment(
-                project_path=external_issue.repo,
-                issue_id=external_issue.issue_id,
-                comment_body=self.text,
-            )
 
 
 class RequestTemplateQuerySet(DataspacedQuerySet):