fix failing tests

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

vulnerabilities/importers/github.py

@@ -39,7 +39,6 @@
 from univers.version_range import NugetVersionRange
 from univers.version_range import PypiVersionRange
 from univers.version_range import VersionRange
-from univers.versions import version_class_by_package_type
 
 from vulnerabilities.importer import AdvisoryData
 from vulnerabilities.importer import AffectedPackage
@@ -360,51 +359,52 @@ def get_inferences(self, advisory_data: AdvisoryData) -> Iterable[Inference]:
         name = process_name_namespace(ecosystem, pkg_name, pkg_namespace)
         if hasattr(self.version_api, "module_name_by_package_name"):
             pkg_name = self.version_api.module_name_by_package_name.get(name, pkg_name)
-        aff_vers, unaff_vers = categorize_versions(
-            pkg_type,
-            affected_version_ranges,
-            self.version_api.get(name, until=advisory_data.date_published).valid_versions,
-        )
-        affected_purls = [
-            PackageURL(name=pkg_name, namespace=pkg_namespace, version=version, type=pkg_type)
-            for version in aff_vers
-        ]
-
-        unaffected_purls = [
-            PackageURL(name=purl.name, namespace=purl.namespace, version=version, type=purl.type)
-            for version in unaff_vers
-        ]
-
-        for fixed_purl in unaffected_purls:
-            yield Inference.from_advisory_data(
-                advisory_data,
-                confidence=90,
-                affected_purls=affected_purls,
-                fixed_purl=fixed_purl,
+        for affected_version_range in affected_version_ranges:
+            aff_vers, unaff_vers = categorize_versions(
+                ecosystem,
+                affected_version_range,
+                self.version_api.get(name, until=advisory_data.date_published).valid_versions,
             )
+            affected_purls = [
+                PackageURL(name=pkg_name, namespace=pkg_namespace, version=version, type=pkg_type)
+                for version in aff_vers
+            ]
+
+            unaffected_purls = [
+                PackageURL(name=purl.name, namespace=purl.namespace, version=version, type=purl.type)
+                for version in unaff_vers
+            ]
+
+            for fixed_purl in unaffected_purls:
+                yield Inference.from_advisory_data(
+                    advisory_data,
+                    confidence=90,
+                    affected_purls=affected_purls,
+                    fixed_purl=fixed_purl,
+                )
 
     def set_api(self, ecosystem, name):
         self.version_api = get_version_api(ecosystem)
         asyncio.run(self.version_api.load_api([name]))
 
 
 def categorize_versions(
-    package_type: str, version_range: str, all_versions: Set[str]
+    ecosystem: str, version_range: VersionRange, all_versions: Set[str]
 ) -> Tuple[List[str], List[str]]:
     """
     Return `affected_versions` and `unaffected_versions`
     iterate on `all_versions` and if the version is affected by `version_range`
     append it in `affected_versions`
     else append it in `unaffected_versions`
     """
-    version_class = version_class_by_package_type[package_type]
+    version_class: VersionRange = ECOSYSTEM_VERSION_RANGE_MAPPING.get(ecosystem) 
     affected_versions = []
     unaffected_versions = []
     for version in all_versions:
         if version in IGNORE_VERSIONS:
             continue
 
-        if version_class(version) in version_range:
+        if version in version_class.from_string(version_range.to_string()):
             affected_versions.append(version)
         else:
             unaffected_versions.append(version)