results: fix --json flag for issues command

The `kci-dev results issues --json` command was not outputting JSON
format. The --json flag was accepted but the print_issues() function
did not have a use_json parameter, so it always printed text format.

Signed-off-by: Ben Copeland <ben.copeland@linaro.org>

Author: bhcopeland

kcidev/subcommands/results/__init__.py

@@ -909,7 +909,7 @@ def issues(
     if not new and not missing:
         if not any([giturl, branch, commit]):
             data = dashboard_fetch_issue_list(origin, days, use_json)
-            print_issues(data)
+            print_issues(data, use_json)
             return
         if not all([giturl, branch, commit]):
             raise click.UsageError(

kcidev/subcommands/results/parser.py

@@ -997,14 +997,28 @@ def print_issue(issue, new_tag=False):
     kci_msg("")
 
 
-def print_issues(data):
+def print_issues(data, use_json=False):
     """Print a list of issues with formatting
     data (dict): provide dictionary with 'issues' and 'extras' keys"""
 
     if not data.get("issues") or not data.get("extras"):
         kci_err("Please provide dictionary with 'issues' and 'extras' keys")
         return
 
+    if use_json:
+        # Build JSON output with issues and their extras merged
+        output = []
+        issues = data["issues"]
+        extras = data["extras"]
+        for issue in issues:
+            issue_data = dict(issue)
+            extra = extras.get(issue.get("id"))
+            if extra:
+                issue_data["extra"] = {issue["id"]: extra}
+            output.append(issue_data)
+        kci_msg_json(output)
+        return
+
     issues = data["issues"]
     extras = data["extras"]
     for issue in issues: