[#jira] Fix billable flag

larowlan · Jan 15, 2019 · 5044bb0 · 5044bb0
1 parent 67a1341
commit 5044bb0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Connector/JiraConnector.php b/src/Connector/JiraConnector.php
@@ -73,6 +73,13 @@ class JiraConnector implements Connector, ConfigurableService {
    */
   private $httpClient;
 
+  /**
+   * Non billable project IDs.
+   *
+   * @var array
+   */
+  protected $nonBillableProjects = [];
+
   /**
    * Constructs a new JiraConnector.
    *
@@ -102,6 +109,9 @@ public function __construct(array $configuration, Cache $cache, array $config, $
     $this->userName = $configuration['jira_username'];
     $this->version = $version;
     $this->httpClient = $httpClient;
+    $this->nonBillableProjects = array_map(function ($item) {
+      return (int) $item;
+    }, $config['jira_non_billable_projects'] ?? []);
   }
 
   /**
@@ -223,8 +233,7 @@ public function ticketDetails($id, $connectorId) {
       }
       return FALSE;
     }
-    // @todo work out if ticket is billable.
-    return new Ticket(sprintf('[%s] %s', $issue->key, $issue->fields->summary), $issue->fields->getProjectId(), TRUE);
+    return new Ticket(sprintf('[%s] %s', $issue->key, $issue->fields->summary), $issue->fields->getProjectId(), !in_array((int) $issue->fields->getProjectId(), $this->nonBillableProjects, TRUE));
   }
 
   /**

diff --git a/src/Connector/RedmineConnector.php b/src/Connector/RedmineConnector.php
@@ -45,7 +45,9 @@ public function __construct(ClientInterface $httpClient, Cache $cache, array $co
     $this->httpClient = $httpClient;
     $this->url = $config['url'];
     $this->apiKey = $config['api_key'];
-    $this->nonBillableProjects = isset($config['non_billable_projects']) ? $config['non_billable_projects'] : [];
+    $this->nonBillableProjects = array_map(function ($item) {
+      return (int) $item;
+    }, $config['non_billable_projects'] ?? []);
     $this->cache = $cache;
     $this->version = $version;
   }
@@ -360,7 +362,7 @@ public function pause($ticket_id, $comment, $connectorId) {
    *   TRUE if billable.
    */
   protected function isBillable($project_id) {
-    return !in_array($project_id, $this->nonBillableProjects, TRUE);
+    return !in_array((int) $project_id, $this->nonBillableProjects, TRUE);
   }
 
   /**