From 90abfd8901cba77770716d2fa8e278041da5b6a4 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 21 Jul 2016 09:23:35 -0400 Subject: [PATCH] Include state_name in the json representation of models. --- rida/database.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/rida/database.py b/rida/database.py index f0998656..c24fd0ca 100644 --- a/rida/database.py +++ b/rida/database.py @@ -212,6 +212,7 @@ class ModuleBuild(Base): 'version': self.version, 'release': self.release, 'state': self.state, + 'state_name': INVERSE_BUILD_STATES[self.state], # This is too spammy.. #'modulemd': self.modulemd, @@ -247,7 +248,7 @@ class ComponentBuild(Base): return session.query(cls).filter(cls.task_id==event['msg']['task_id']).first() def json(self): - return { + retval = { 'id': self.id, 'package': self.package, 'format': self.format, @@ -256,6 +257,18 @@ class ComponentBuild(Base): 'module_build': self.module_id, } + try: + # Koji is py2 only, so this fails if the main web process is + # running on py3. + import koji + retval['state_name'] = koji.BUILD_STATES[self.state] + except ImportError: + pass + + return retval + + + def __repr__(self): return "" % ( self.package, self.module_id, self.state, self.task_id)