[issue-359] Convert underscores to dashes in enum names

Signed-off-by: Nicolaus Weidner <[email protected]>

Author: Nicolaus Weidner

src/jsonschema/external_package_ref_converter.py

@@ -23,7 +23,7 @@ def _get_property_value(self, external_ref: ExternalPackageRef, external_ref_pro
         if external_ref_property == ExternalPackageRefProperty.COMMENT:
             return external_ref.comment
         elif external_ref_property == ExternalPackageRefProperty.REFERENCE_CATEGORY:
-            return external_ref.category.name
+            return external_ref.category.json_name()
         elif external_ref_property == ExternalPackageRefProperty.REFERENCE_LOCATOR:
             return external_ref.locator
         elif external_ref_property == ExternalPackageRefProperty.REFERENCE_TYPE:

src/jsonschema/package_converter.py

@@ -99,7 +99,7 @@ def _get_property_value(self, package: Package, package_property: PackagePropert
         elif package_property == PackageProperty.PACKAGE_VERIFICATION_CODE:
             return apply_if_present(self.package_verification_code_converter.convert, package.verification_code)
         elif package_property == PackageProperty.PRIMARY_PACKAGE_PURPOSE:
-            return package.primary_package_purpose.name if package.primary_package_purpose is not None else None
+            return package.primary_package_purpose.json_name() if package.primary_package_purpose is not None else None
         elif package_property == PackageProperty.RELEASE_DATE:
             return apply_if_present(datetime_to_iso_string, package.release_date)
         elif package_property == PackageProperty.SOURCE_INFO:

src/model/package.py

@@ -36,6 +36,9 @@ class PackagePurpose(Enum):
     INSTALL = auto()
     OTHER = auto()
 
+    def json_name(self):
+        return self.name.replace("_", "-")
+
 
 @dataclass_with_properties
 class PackageVerificationCode:
@@ -53,6 +56,9 @@ class ExternalPackageRefCategory(Enum):
     PERSISTENT_ID = auto()
     OTHER = auto()
 
+    def json_name(self) -> str:
+        return self.name.replace("_", "-")
+
 
 @dataclass_with_properties
 class ExternalPackageRef:

tests/jsonschema/test_external_package_ref_converter.py

@@ -45,7 +45,7 @@ def test_successful_conversion(converter: ExternalPackageRefConverter):
 
     assert converted_dict == {
         converter.json_property_name(ExternalPackageRefProperty.COMMENT): "comment",
-        converter.json_property_name(ExternalPackageRefProperty.REFERENCE_CATEGORY): "PACKAGE_MANAGER",
+        converter.json_property_name(ExternalPackageRefProperty.REFERENCE_CATEGORY): "PACKAGE-MANAGER",
         converter.json_property_name(ExternalPackageRefProperty.REFERENCE_LOCATOR): "locator",
         converter.json_property_name(ExternalPackageRefProperty.REFERENCE_TYPE): "type"
     }

tests/jsonschema/test_package_converter.py

@@ -107,7 +107,7 @@ def test_successful_conversion(converter: PackageConverter):
                       copyright_text="copyrightText", summary="summary", description="description", comment="comment",
                       external_references=[external_package_ref_fixture()],
                       attribution_texts=["attributionText1", "attributionText2"],
-                      primary_package_purpose=PackagePurpose.APPLICATION, release_date=datetime(2022, 12, 1),
+                      primary_package_purpose=PackagePurpose.OPERATING_SYSTEM, release_date=datetime(2022, 12, 1),
                       built_date=datetime(2022, 12, 2), valid_until_date=datetime(2022, 12, 3))
 
     annotation = Annotation(package.spdx_id, AnnotationType.REVIEW, Actor(ActorType.TOOL, "toolName"),
@@ -141,7 +141,7 @@ def test_successful_conversion(converter: PackageConverter):
         converter.json_property_name(PackageProperty.DESCRIPTION): "description",
         converter.json_property_name(PackageProperty.COMMENT): "comment",
         converter.json_property_name(PackageProperty.EXTERNAL_REFS): ["mock_package_ref"],
-        converter.json_property_name(PackageProperty.PRIMARY_PACKAGE_PURPOSE): "APPLICATION",
+        converter.json_property_name(PackageProperty.PRIMARY_PACKAGE_PURPOSE): "OPERATING-SYSTEM",
         converter.json_property_name(PackageProperty.RELEASE_DATE): "2022-12-01T00:00:00Z",
         converter.json_property_name(PackageProperty.BUILT_DATE): "2022-12-02T00:00:00Z",
         converter.json_property_name(PackageProperty.VALID_UNTIL_DATE): "2022-12-03T00:00:00Z"