From 308f5bc7cff05fbe3c4b595ec1afbdd093ba473b Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Jul 29 2019 07:56:30 +0000
Subject: Serialize component build state trace correctly if state is None


Fixes #1179

Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---

diff --git a/module_build_service/models.py b/module_build_service/models.py
index a2cffb6..df1f849 100644
--- a/module_build_service/models.py
+++ b/module_build_service/models.py
@@ -1251,7 +1251,7 @@ class ComponentBuild(MBSBase):
                 {
                     "time": _utc_datetime_to_iso(record.state_time),
                     "state": record.state,
-                    "state_name": INVERSE_BUILD_STATES[record.state],
+                    "state_name": INVERSE_BUILD_STATES.get(record.state),
                     "reason": record.state_reason,
                 }
                 for record in self.state_trace(db_session)
diff --git a/tests/test_views/test_views.py b/tests/test_views/test_views.py
index e29bdd0..2161d9c 100644
--- a/tests/test_views/test_views.py
+++ b/tests/test_views/test_views.py
@@ -36,17 +36,17 @@ import pytest
 import re
 import sqlalchemy
 
-from tests import app, init_data, clean_database, staged_data_filename
+from tests import app, init_data, clean_database, staged_data_filename, make_module_in_db
 from tests import read_staged_data
 from tests.test_scm import base_dir as scm_base_dir
 from module_build_service.errors import UnprocessableEntity
-from module_build_service.models import ModuleBuild, BUILD_STATES
+from module_build_service.models import ModuleBuild, BUILD_STATES, ComponentBuild
 from module_build_service import db, version
 import module_build_service.config as mbs_config
 import module_build_service.scheduler.handlers.modules
 from module_build_service.utils.general import (
-    import_mmd, mmd_to_str, load_mmd
-)
+    import_mmd, mmd_to_str, load_mmd,
+    get_rpm_release)
 
 
 user = ("Homer J. Simpson", set(["packager"]))
@@ -568,6 +568,43 @@ class TestViews:
         assert data["state_trace"][0]["state_name"] == "wait"
         assert data["state_url"], "/module-build-service/1/component-builds/3"
 
+    def test_query_component_builds_trace_is_serialized_with_none_state(self, db_session):
+        # Beside the module builds and their component builds created already
+        # in setup_method, some new component builds with None state must be
+        # created for this test to ensure the extended_json works well to
+        # serialize component build trace correctly.
+
+        module_build = make_module_in_db(
+            "cool-module:10:201907291454:c1", db_session=db_session)
+        component_release = get_rpm_release(db_session, module_build)
+
+        # No state is set.
+        component_build = ComponentBuild(
+            package="nginx",
+            scmurl="git://pkgs.domain.local/rpms/nginx?"
+                   "#ga95886c8a443b36a9ce31abda1f9bed22f2f8c3",
+            format="rpms",
+            task_id=1000,
+            nvr="nginx-1.10.1-2.{0}".format(component_release),
+            batch=1,
+            module_id=module_build.id,
+            tagged=True,
+            tagged_in_final=True
+        )
+        db_session.add(component_build)
+        db_session.commit()
+
+        db_session.refresh(component_build)
+
+        rv = self.client.get("/module-build-service/1/component-builds/?verbose=true")
+        data = json.loads(rv.data)
+
+        component_builds = [
+            item for item in data["items"]
+            if item["id"] == component_build.id
+        ]
+        assert component_builds[0]["state_trace"][0]["state_name"] is None
+
     def test_query_component_builds_filter_format(self):
         rv = self.client.get("/module-build-service/1/component-builds/?format=rpms")
         data = json.loads(rv.data)