Merge pull request #83 from siemens/fix/remove_rf

fix(rf): Remove rf prefix from license fields in json Reviewed-by: [email protected] Tested-by: [email protected]
fossology · Sep 27, 2024 · 4eee53c · 4eee53c
2 parents 1a392a1 + 97b885c
commit 4eee53c
Show file tree

Hide file tree

Showing 6 changed files with 227 additions and 225 deletions.
diff --git a/cmd/laas/docs/docs.go b/cmd/laas/docs/docs.go
@@ -394,12 +394,12 @@ const docTemplate = `{
                     },
                     {
                         "enum": [
-                            "rf_spdx_id",
-                            "rf_shortname",
-                            "rf_fullname"
+                            "spdx_id",
+                            "shortname",
+                            "fullname"
                         ],
                         "type": "string",
-                        "default": "rf_shortname",
+                        "default": "shortname",
                         "description": "Sort by field",
                         "name": "sort_by",
                         "in": "query"
@@ -1772,7 +1772,7 @@ const docTemplate = `{
                 },
                 "field": {
                     "type": "string",
-                    "example": "rf_text"
+                    "example": "text"
                 },
                 "id": {
                     "type": "integer",
@@ -1837,87 +1837,87 @@ const docTemplate = `{
         "models.LicenseDB": {
             "type": "object",
             "required": [
-                "rf_fullname",
-                "rf_shortname",
-                "rf_spdx_id",
-                "rf_text"
+                "fullname",
+                "shortname",
+                "spdx_id",
+                "text"
             ],
             "properties": {
-                "external_ref": {
-                    "$ref": "#/definitions/datatypes.JSONType-models_LicenseDBSchemaExtension"
-                },
-                "marydone": {
+                "FSFfree": {
                     "type": "boolean"
                 },
-                "rf_FSFfree": {
-                    "type": "boolean"
-                },
-                "rf_Fedora": {
+                "Fedora": {
                     "type": "string"
                 },
-                "rf_GPLv2compatible": {
+                "GPLv2compatible": {
                     "type": "boolean"
                 },
-                "rf_GPLv3compatible": {
+                "GPLv3compatible": {
                     "type": "boolean"
                 },
-                "rf_OSIapproved": {
+                "OSIapproved": {
                     "type": "boolean"
                 },
-                "rf_active": {
+                "active": {
                     "type": "boolean"
                 },
-                "rf_add_date": {
+                "add_date": {
                     "type": "string",
                     "example": "2023-12-01T18:10:25.00+05:30"
                 },
-                "rf_copyleft": {
+                "copyleft": {
                     "type": "boolean"
                 },
-                "rf_detector_type": {
+                "detector_type": {
                     "type": "integer",
                     "maximum": 2,
                     "minimum": 0,
                     "example": 1
                 },
-                "rf_flag": {
+                "external_ref": {
+                    "$ref": "#/definitions/datatypes.JSONType-models_LicenseDBSchemaExtension"
+                },
+                "flag": {
                     "type": "integer",
                     "maximum": 2,
                     "minimum": 0,
                     "example": 1
                 },
-                "rf_fullname": {
+                "fullname": {
                     "type": "string",
                     "example": "MIT License"
                 },
-                "rf_notes": {
+                "marydone": {
+                    "type": "boolean"
+                },
+                "notes": {
                     "type": "string",
                     "example": "This license has been superseded."
                 },
-                "rf_risk": {
+                "risk": {
                     "type": "integer",
                     "maximum": 5,
                     "minimum": 0
                 },
-                "rf_shortname": {
+                "shortname": {
                     "type": "string",
                     "example": "MIT"
                 },
-                "rf_source": {
+                "source": {
                     "type": "string"
                 },
-                "rf_spdx_id": {
+                "spdx_id": {
                     "type": "string",
                     "example": "MIT"
                 },
-                "rf_text": {
+                "text": {
                     "type": "string",
                     "example": "MIT License Text here"
                 },
-                "rf_text_updatable": {
+                "text_updatable": {
                     "type": "boolean"
                 },
-                "rf_url": {
+                "url": {
                     "type": "string",
                     "example": "https://opensource.org/licenses/MIT"
                 }
@@ -2052,84 +2052,84 @@ const docTemplate = `{
         "models.LicenseUpdateJSONSchema": {
             "type": "object",
             "properties": {
-                "external_ref": {
-                    "$ref": "#/definitions/datatypes.JSONType-models_LicenseDBSchemaExtension"
-                },
-                "marydone": {
-                    "type": "boolean",
-                    "example": false
-                },
-                "rf_FSFfree": {
+                "FSFfree": {
                     "type": "boolean",
                     "example": false
                 },
-                "rf_Fedora": {
+                "Fedora": {
                     "type": "string",
                     "example": "Fedora"
                 },
-                "rf_GPLv2compatible": {
+                "GPLv2compatible": {
                     "type": "boolean",
                     "example": false
                 },
-                "rf_GPLv3compatible": {
+                "GPLv3compatible": {
                     "type": "boolean",
                     "example": false
                 },
-                "rf_OSIapproved": {
+                "OSIapproved": {
                     "type": "boolean",
                     "example": false
                 },
-                "rf_active": {
+                "active": {
                     "type": "boolean",
                     "example": true
                 },
-                "rf_copyleft": {
+                "copyleft": {
                     "type": "boolean",
                     "example": false
                 },
-                "rf_detector_type": {
+                "detector_type": {
                     "type": "integer",
                     "maximum": 2,
                     "minimum": 0,
                     "example": 1
                 },
-                "rf_flag": {
+                "external_ref": {
+                    "$ref": "#/definitions/datatypes.JSONType-models_LicenseDBSchemaExtension"
+                },
+                "flag": {
                     "type": "integer",
                     "maximum": 2,
                     "minimum": 0,
                     "example": 1
                 },
-                "rf_fullname": {
+                "fullname": {
                     "type": "string",
                     "example": "MIT License"
                 },
-                "rf_notes": {
+                "marydone": {
+                    "type": "boolean",
+                    "example": false
+                },
+                "notes": {
                     "type": "string",
                     "example": "This license has been superseded."
                 },
-                "rf_risk": {
+                "risk": {
                     "type": "integer",
                     "maximum": 5,
                     "minimum": 0,
                     "example": 1
                 },
-                "rf_source": {
+                "source": {
                     "type": "string",
                     "example": "Source"
                 },
-                "rf_spdx_id": {
+                "spdx_id": {
                     "type": "string",
                     "example": "MIT"
                 },
-                "rf_text": {
+                "text": {
                     "type": "string",
                     "example": "MIT License Text here"
                 },
-                "rf_text_updatable": {
+                "text_updatable": {
                     "type": "boolean",
                     "example": false
                 },
-                "rf_url": {
+                "url": {
                     "type": "string",
                     "example": "https://opensource.org/licenses/MIT"
                 }
@@ -2515,7 +2515,7 @@ const docTemplate = `{
             "properties": {
                 "field": {
                     "type": "string",
-                    "example": "rf_text"
+                    "example": "text"
                 },
                 "search": {
                     "type": "string",