From dfb992de483cd9792d70d159cfed6464bce91f89 Mon Sep 17 00:00:00 2001
From: Dan Cryer <dan@block8.co.uk>
Date: Mon, 14 Jul 2014 16:08:19 +0100
Subject: [PATCH] Updating webhooks to use build service

---
 PHPCI/Controller/WebhookController.php | 32 +++++++++++++++-----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php
index e95a5597..4d4501ed 100644
--- a/PHPCI/Controller/WebhookController.php
+++ b/PHPCI/Controller/WebhookController.php
@@ -13,6 +13,7 @@ use b8;
 use b8\Store;
 use PHPCI\BuildFactory;
 use PHPCI\Model\Build;
+use PHPCI\Service\BuildService;
 
 /**
  * Webhook Controller - Processes webhook pings from BitBucket, Github, Gitlab, etc.
@@ -29,9 +30,21 @@ class WebhookController extends \PHPCI\Controller
      */
     protected $buildStore;
 
+    /**
+     * @var \PHPCI\Store\ProjectStore
+     */
+    protected $projectStore;
+
+    /**
+     * @var \PHPCI\Service\BuildService
+     */
+    protected $buildService;
+
     public function init()
     {
         $this->buildStore = Store\Factory::getStore('Build');
+        $this->projectStore = Store\Factory::getStore('Project');
+        $this->buildService = new BuildService($this->buildStore);
     }
 
     /**
@@ -238,22 +251,15 @@ class WebhookController extends \PHPCI\Controller
             return true;
         }
 
-        // If not, create a new build job for it:
-        $build = new Build();
-        $build->setProjectId($projectId);
-        $build->setCommitId($commitId);
-        $build->setStatus(Build::STATUS_NEW);
-        $build->setLog('');
-        $build->setCreated(new \DateTime());
-        $build->setBranch($branch);
-        $build->setCommitterEmail($committer);
-        $build->setCommitMessage($commitMessage);
+        $project = $this->projectStore->getById($projectId);
 
-        if (!is_null($extra)) {
-            $build->setExtra(json_encode($extra));
+        if (empty($project)) {
+            throw new \Exception('Project does not exist:' . $projectId);
         }
 
-        $build = BuildFactory::getBuild($this->buildStore->save($build));
+        // If not, create a new build job for it:
+        $build = $this->buildService->createBuild($project, $commitId, $branch, $committer, $commitMessage, $extra);
+        $build = BuildFactory::getBuild($build);
 
         // Send a status postback if the build type provides one:
         $build->sendStatusPostback();