add updated check-compliance

Signed-off-by: NucleonGodX <[email protected]>

Author: NucleonGodX

scanpipe/management/commands/check-compliance.py

@@ -74,16 +74,28 @@ def check_compliance(self, fail_level):
             len(issues) for model in alerts.values() for issues in model.values()
         )
 
-        if count and self.verbosity > 0:
-            self.stderr.write(f"{count} compliance issues detected.")
+        extra_data = self.project.extra_data or {}
+        clarity_alert = extra_data.get("clarity_compliance_alert")
+
+        # Count clarity issue only if alert is not 'ok' or None
+        clarity_issue_count = 1 if clarity_alert and clarity_alert != "ok" else 0
+
+        total_issues = count + clarity_issue_count
+
+        if total_issues and self.verbosity > 0:
+            self.stderr.write(f"{total_issues} compliance issues detected.")
             for label, model in alerts.items():
                 self.stderr.write(f"[{label}]")
                 for severity, entries in model.items():
                     self.stderr.write(f" > {severity.upper()}: {len(entries)}")
                     if self.verbosity > 1:
                         self.stderr.write("   " + "\n   ".join(entries))
 
-        return count > 0
+            if clarity_issue_count:
+                self.stderr.write("[License Clarity Compliance]")
+                self.stderr.write(f" > Alert Level: {clarity_alert}")
+
+        return total_issues > 0
 
     def check_vulnerabilities(self):
         packages = self.project.discoveredpackages.vulnerable_ordered()

scanpipe/tests/test_commands.py

@@ -1213,6 +1213,48 @@ def test_scanpipe_management_command_check_compliance(self):
         )
         self.assertEqual(expected, out_value)
 
+    def test_scanpipe_management_command_check_clarity_compliance_only(self):
+        project = make_project(name="my_project_clarity")
+
+        project.extra_data = {"clarity_compliance_alert": "error"}
+        project.save(update_fields=["extra_data"])
+
+        out = StringIO()
+        options = ["--project", project.name]
+        with self.assertRaises(SystemExit) as cm:
+            call_command("check-compliance", *options, stderr=out)
+        self.assertEqual(cm.exception.code, 1)
+        out_value = out.getvalue().strip()
+        expected = (
+            "1 compliance issues detected."
+            "\n[License Clarity Compliance]\n > Alert Level: error"
+        )
+        self.assertEqual(expected, out_value)
+
+    def test_scanpipe_management_command_check_both_compliance_and_clarity(self):
+        project = make_project(name="my_project_both")
+
+        make_package(
+            project,
+            package_url="pkg:generic/[email protected]",
+            compliance_alert=CodebaseResource.Compliance.ERROR,
+        )
+        project.extra_data = {"clarity_compliance_alert": "warning"}
+        project.save(update_fields=["extra_data"])
+
+        out = StringIO()
+        options = ["--project", project.name, "--fail-level", "WARNING"]
+        with self.assertRaises(SystemExit) as cm:
+            call_command("check-compliance", *options, stderr=out)
+        self.assertEqual(cm.exception.code, 1)
+        out_value = out.getvalue().strip()
+        expected = (
+            "2 compliance issues detected."
+            "\n[packages]\n > ERROR: 1"
+            "\n[License Clarity Compliance]\n > Alert Level: warning"
+        )
+        self.assertEqual(expected, out_value)
+
     def test_scanpipe_management_command_check_compliance_vulnerabilities(self):
         project = make_project(name="my_project")
         package1 = make_package(project, package_url="pkg:generic/[email protected]")