From 4fc7bc18cb5b985b6f2bcf7f848b5ea7feed048e Mon Sep 17 00:00:00 2001
From: Qixiang Wan <qwan@redhat.com>
Date: Jun 08 2017 07:33:06 +0000
Subject: Use ArtifactType instead of string in record_build


---

diff --git a/freshmaker/handlers/__init__.py b/freshmaker/handlers/__init__.py
index 23f0abf..efe654c 100644
--- a/freshmaker/handlers/__init__.py
+++ b/freshmaker/handlers/__init__.py
@@ -91,19 +91,19 @@ class BaseHandler(object):
                                            namespace='container',
                                            scratch=conf.koji_container_scratch_build)
 
-    def record_build(self, event, name, type, build_id, dep_of=None):
+    def record_build(self, event, name, artifact_type, build_id, dep_of=None):
         """
         Record build in db.
 
         :param event: instance of an event.
         :param name: name of the artifact.
-        :param type: type of the artifact, can be 'rpm', 'image' or module.
+        :param artifact_type: an enum member of ArtifactType.
         :param build_id: id of the build in build system.
         :param def_of: the artifact which this one depends on.
         """
         ev = models.Event.get_or_create(db.session, event.msg_id,
                                         event.search_key, event.__class__)
-        models.ArtifactBuild.create(db.session, ev, name, type, build_id, dep_of)
+        models.ArtifactBuild.create(db.session, ev, name, artifact_type.name.lower(), build_id, dep_of)
         db.session.commit()
 
     def allow_build(self, artifact_type, name, branch):
diff --git a/freshmaker/handlers/bodhi/update_complete_stable.py b/freshmaker/handlers/bodhi/update_complete_stable.py
index 2609148..f12ef73 100644
--- a/freshmaker/handlers/bodhi/update_complete_stable.py
+++ b/freshmaker/handlers/bodhi/update_complete_stable.py
@@ -62,7 +62,7 @@ class BodhiUpdateCompleteStableHandler(BaseHandler):
 
                 task_id = self.build_container(name, branch, rev)
                 if task_id is not None:
-                    self.record_build(event, container['name'], 'image', task_id)
+                    self.record_build(event, container['name'], ArtifactType.IMAGE, task_id)
             except:
                 log.exception('Error when rebuild %s', container)
 
diff --git a/freshmaker/handlers/git/dockerfile_change.py b/freshmaker/handlers/git/dockerfile_change.py
index 9f38ea2..964ed18 100644
--- a/freshmaker/handlers/git/dockerfile_change.py
+++ b/freshmaker/handlers/git/dockerfile_change.py
@@ -48,7 +48,7 @@ class GitDockerfileChangeHandler(BaseHandler):
             task_id = self.build_container(event.container, event.branch, event.rev)
 
             if task_id is not None:
-                self.record_build(event, event.container, 'image', task_id)
+                self.record_build(event, event.container, ArtifactType.IMAGE, task_id)
 
         except koji.krbV.Krb5Error as e:
             log.exception('Failed to login Koji via Kerberos using GSSAPI. %s', e.args[1])
diff --git a/freshmaker/handlers/git/module_metadata_change.py b/freshmaker/handlers/git/module_metadata_change.py
index 9f1f436..209153e 100644
--- a/freshmaker/handlers/git/module_metadata_change.py
+++ b/freshmaker/handlers/git/module_metadata_change.py
@@ -47,6 +47,6 @@ class GitModuleMetadataChangeHandler(BaseHandler):
 
         build_id = self.build_module(event.module, event.branch, event.rev)
         if build_id is not None:
-            self.record_build(event, event.module, 'module', build_id)
+            self.record_build(event, event.module, ArtifactType.MODULE, build_id)
 
         return []
diff --git a/freshmaker/handlers/git/rpm_spec_change.py b/freshmaker/handlers/git/rpm_spec_change.py
index 43d2dc1..e6aeaca 100644
--- a/freshmaker/handlers/git/rpm_spec_change.py
+++ b/freshmaker/handlers/git/rpm_spec_change.py
@@ -63,6 +63,6 @@ class GitRPMSpecChangeHandler(BaseHandler):
             rev = utils.bump_distgit_repo('modules', name, branch=version, commit_msg=commit_msg, logger=log)
             build_id = self.build_module(name, version, rev)
             if build_id is not None:
-                self.record_build(event, name, 'module', build_id)
+                self.record_build(event, name, ArtifactType.MODULE, build_id)
 
         return []
diff --git a/freshmaker/handlers/mbs/module_state_change.py b/freshmaker/handlers/mbs/module_state_change.py
index 118fcb4..ddd8982 100644
--- a/freshmaker/handlers/mbs/module_state_change.py
+++ b/freshmaker/handlers/mbs/module_state_change.py
@@ -98,6 +98,6 @@ class MBSModuleStateChangeHandler(BaseHandler):
                 rev = utils.bump_distgit_repo('modules', name, branch=version, commit_msg=commit_msg, logger=log)
                 new_build_id = self.build_module(name, version, rev)
                 if new_build_id is not None:
-                    self.record_build(event, name, 'module', new_build_id, dep_of=module_build)
+                    self.record_build(event, name, ArtifactType.MODULE, new_build_id, dep_of=module_build)
 
         return []