From 79758e926557f028722ae3f2b5fbedc327693607 Mon Sep 17 00:00:00 2001
From: Jakub Frejlach <jfrejlac@redhat.com>
Date: Fri, 8 Dec 2023 13:25:43 +0100
Subject: [PATCH] Standardize work with related data

sources and upstreams are transformed to raw JSON now so we avoid
problems when mixing middleware CLI data and component registry data
(eg. Component registry bindings models vs JSON)
---
 griffon/output.py | 54 +++++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/griffon/output.py b/griffon/output.py
index b3b65b1..f02de32 100644
--- a/griffon/output.py
+++ b/griffon/output.py
@@ -8,6 +8,9 @@
 import re
 
 import click
+from component_registry_bindings.bindings.python_client.types import (
+    ComponentRegistryModel,
+)
 from packageurl import PackageURL
 from rich.console import Console
 from rich.text import Text
@@ -29,25 +32,38 @@ class DEST(enum.Enum):
     FILE = "file"
 
 
+def raw_json_transform_related(data: dict, name):
+    """normalise ralated data which were piggy-backed to data"""
+    transformed = []
+    related_data = data.get(name)
+    if related_data is not None:
+        if isinstance(related_data, list):
+            transformed = [
+                item.to_dict() if isinstance(item, ComponentRegistryModel) else item
+                for item in related_data
+            ]
+
+    return transformed
+
+
 def raw_json_transform(data, show_count: bool) -> dict:
     """normalise all data to dict"""
     if type(data) is list:
         results = []
-        for d in data:
-            if type(d) is dict:
-                results.append(d)
-            else:
-                results.append(d.to_dict())
+        for item in data:
+            transformed = item if type(item) is dict else item.to_dict()
+            for related_data in ("upstreams", "sources"):
+                transformed[related_data] = raw_json_transform_related(transformed, related_data)
+            results.append(transformed)
         output = {
             "results": results,
         }
         if show_count:
             output["count"] = len(results)  # type: ignore
     else:
-        if type(data) is dict:
-            output = data
-        else:
-            output = data.to_dict()
+        transformed = data if type(data) is dict else data.to_dict()
+        for related_data in ("upstreams", "sources"):
+            transformed[related_data] = raw_json_transform_related(transformed, related_data)
     return output
 
 
@@ -274,7 +290,7 @@ def generate_affects(
                 for nvr in result_tree[pv][ps][component_name].keys():
                     if result_tree[pv][ps][component_name][nvr]["sources"]:
                         source_names = [
-                            source.name
+                            source["name"]
                             for source in result_tree[pv][ps][component_name][nvr]["sources"]
                             if source.namespace == "REDHAT"
                         ]
@@ -389,6 +405,7 @@ def text_output_products_contain_component(
                             nvr = list(result_tree[pv][ps][cn].keys())[-1]
                             # highlight search term
                             dep_name = nvr
+                            print(dep_name)
                             try:
                                 dep_name = re.sub(
                                     re.escape(search_component_name),
@@ -398,6 +415,7 @@ def text_output_products_contain_component(
                             except re.error:
                                 pass
                             dep = f"[grey93]{dep_name} ({result_tree[pv][ps][cn][nvr]['type']})[/grey93]"  # noqa
+                            print(dep)
                             related_url = result_tree[pv][ps][cn][nvr].get("related_url")
                             try:
                                 if result_tree[pv][ps][cn][nvr]["related_url"]:
@@ -413,7 +431,7 @@ def text_output_products_contain_component(
                                     list(
                                         set(
                                             [
-                                                source.name
+                                                source["name"]
                                                 for source in result_tree[pv][ps][cn][nvr][
                                                     "upstreams"
                                                 ]
@@ -439,7 +457,7 @@ def text_output_products_contain_component(
                                     list(
                                         set(
                                             [
-                                                source.name
+                                                source["name"]
                                                 for source in result_tree[pv][ps][cn][nvr][
                                                     "sources"
                                                 ]
@@ -503,7 +521,7 @@ def text_output_products_contain_component(
                                     list(
                                         set(
                                             [
-                                                source.name
+                                                source["name"]
                                                 for source in result_tree[pv][ps][cn][nvr][
                                                     "upstreams"
                                                 ]
@@ -530,7 +548,7 @@ def text_output_products_contain_component(
                                     list(
                                         set(
                                             [
-                                                source.name
+                                                source["name"]
                                                 for source in result_tree[pv][ps][cn][nvr][
                                                     "sources"
                                                 ]
@@ -598,7 +616,7 @@ def text_output_products_contain_component(
                                     list(
                                         set(
                                             [
-                                                source.name
+                                                source["name"]
                                                 for source in result_tree[pv][ps][cn][nvr][
                                                     "upstreams"
                                                 ]
@@ -620,7 +638,7 @@ def text_output_products_contain_component(
                                     list(
                                         set(
                                             [
-                                                source.name
+                                                source["name"]
                                                 for source in result_tree[pv][ps][cn][nvr][
                                                     "sources"
                                                 ]
@@ -684,7 +702,7 @@ def text_output_products_contain_component(
                                     list(
                                         set(
                                             [
-                                                source.nvr
+                                                source["nvr"]
                                                 for source in result_tree[pv][ps][cn][nvr][
                                                     "upstreams"
                                                 ]
@@ -706,7 +724,7 @@ def text_output_products_contain_component(
                                     list(
                                         set(
                                             [
-                                                source.nvr
+                                                source["nvr"]
                                                 for source in result_tree[pv][ps][cn][nvr][
                                                     "sources"
                                                 ]