Move generate_patch_url function to utils

Signed-off-by: ziad hany <ziadhany2016@gmail.com>

Author: ziadhany

vulnerabilities/improvers/__init__.py

@@ -30,10 +30,10 @@
 from vulnerabilities.pipelines.v2_improvers import (
     enhance_with_metasploit as enhance_with_metasploit_v2,
 )
+from vulnerabilities.pipelines.v2_improvers import fetch_patch_url as fetch_patch_url_v2
 from vulnerabilities.pipelines.v2_improvers import flag_ghost_packages as flag_ghost_packages_v2
 from vulnerabilities.pipelines.v2_improvers import relate_severities
 from vulnerabilities.pipelines.v2_improvers import unfurl_version_range as unfurl_version_range_v2
-from vulnerabilities.pipelines.v2_improvers import fetch_patch_url as fetch_patch_url_v2
 from vulnerabilities.utils import create_registry
 
 IMPROVERS_REGISTRY = create_registry(

vulnerabilities/pipelines/v2_improvers/fetch_patch_url.py

@@ -7,9 +7,11 @@
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 
-from vulnerabilities.models import PackageCommitPatch, Patch
+from vulnerabilities.models import PackageCommitPatch
+from vulnerabilities.models import Patch
 from vulnerabilities.pipelines import VulnerableCodePipeline
 from vulnerabilities.utils import fetch_response
+from vulnerabilities.utils import generate_patch_url
 
 
 class FetchPatchURLImproverPipeline(VulnerableCodePipeline):
@@ -20,9 +22,7 @@ class FetchPatchURLImproverPipeline(VulnerableCodePipeline):
 
     @classmethod
     def steps(cls):
-        return (
-            cls.collect_patch_text,
-        )
+        return (cls.collect_patch_text,)
 
     def fetch_patch_content(self, url):
         """
@@ -42,8 +42,8 @@ def fetch_patch_content(self, url):
 
     def advisories_count(self) -> int:
         return (
-            PackageCommitPatch.objects.filter(patch_text__isnull=True).count() +
-            Patch.objects.filter(patch_text__isnull=True).count()
+            PackageCommitPatch.objects.filter(patch_text__isnull=True).count()
+            + Patch.objects.filter(patch_text__isnull=True).count()
         )
 
     def collect_patch_text(self):
@@ -62,22 +62,3 @@ def collect_patch_text(self):
 
             patch.patch_text = content
             patch.save()
-
-def generate_patch_url(vcs_url, commit_hash):
-    """
-    Generate patch URL from VCS URL and commit hash.
-    """
-    if not vcs_url or not commit_hash:
-        return None
-
-    vcs_url = vcs_url.rstrip("/")
-
-    if vcs_url.startswith("https://github.com"):
-        return f"{vcs_url}/commit/{commit_hash}.patch"
-    elif vcs_url.startswith("https://gitlab.com"):
-        return f"{vcs_url}/-/commit/{commit_hash}.patch"
-    elif vcs_url.startswith("https://bitbucket.org"):
-        return f"{vcs_url}/-/commit/{commit_hash}/raw"
-    elif vcs_url.startswith("https://git.kernel.org"):
-        return f"{vcs_url}.git/patch/?id={commit_hash}"
-    return

vulnerabilities/tests/pipelines/v2_improvers/test_fetch_patch_url.py

@@ -12,7 +12,8 @@
 
 import pytest
 
-from vulnerabilities.models import PackageCommitPatch, Patch
+from vulnerabilities.models import PackageCommitPatch
+from vulnerabilities.models import Patch
 from vulnerabilities.pipelines.v2_improvers.fetch_patch_url import FetchPatchURLImproverPipeline
 
 
@@ -24,14 +25,11 @@ def test_collect_patch_text_success(mock_get):
     mock_get.side_effect = [res1, res2]
 
     pcp = PackageCommitPatch.objects.create(
-        vcs_url="https://github.com/nexB/vulnerablecode",
-        commit_hash="abc1234",
-        patch_text=None
+        vcs_url="https://github.com/nexB/vulnerablecode", commit_hash="abc1234", patch_text=None
     )
 
     patch = Patch.objects.create(
-        patch_url="https://gitlab.com/nexB/vulnerablecode/-/commit/def5678.patch",
-        patch_text=None
+        patch_url="https://gitlab.com/nexB/vulnerablecode/-/commit/def5678.patch", patch_text=None
     )
     pipeline = FetchPatchURLImproverPipeline()
     pipeline.collect_patch_text()
@@ -42,17 +40,16 @@ def test_collect_patch_text_success(mock_get):
     assert pcp.patch_text == "diff --git a/file1"
     assert patch.patch_text == "diff --git a/file2"
 
+
 @pytest.mark.django_db
 @mock.patch("vulnerabilities.utils.requests.get")
 def test_collect_patch_text_failure(mock_get):
     mock_get.side_effect = Exception("Connection Error")
 
     pcp = PackageCommitPatch.objects.create(
-        vcs_url="https://github.com/nexB/vulnerablecode",
-        commit_hash="abc1234",
-        patch_text=None
+        vcs_url="https://github.com/nexB/vulnerablecode", commit_hash="abc1234", patch_text=None
     )
 
     pipeline = FetchPatchURLImproverPipeline()
     pipeline.collect_patch_text()
-    assert pcp.patch_text is None
+    assert pcp.patch_text is None

vulnerabilities/utils.py

@@ -867,3 +867,23 @@ def group_advisories_by_content(advisories):
             entry["secondary"].add(advisory)
 
     return grouped
+
+
+def generate_patch_url(vcs_url, commit_hash):
+    """
+    Generate patch URL from VCS URL and commit hash.
+    """
+    if not vcs_url or not commit_hash:
+        return None
+
+    vcs_url = vcs_url.rstrip("/")
+
+    if vcs_url.startswith("https://github.com"):
+        return f"{vcs_url}/commit/{commit_hash}.patch"
+    elif vcs_url.startswith("https://gitlab.com"):
+        return f"{vcs_url}/-/commit/{commit_hash}.patch"
+    elif vcs_url.startswith("https://bitbucket.org"):
+        return f"{vcs_url}/-/commit/{commit_hash}/raw"
+    elif vcs_url.startswith("https://git.kernel.org"):
+        return f"{vcs_url}.git/patch/?id={commit_hash}"
+    return