tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Branch: use new ts_merge_request column

This commit is contained in:
Thomas Gelf 2021-10-05 22:25:47 +02:00
parent f7d100ea24
commit 59f6051623
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/Director/Db/Branch/Branch.php
View File

@ -30,8 +30,8 @@ class Branch
/** @var @var string */
protected $description;
/** @var bool */
protected $shouldBeMerged;
/** @var ?int */
protected $tsMergeRequest;
/** @var int */
protected $cntActivities;
@ -39,10 +39,16 @@ class Branch
public static function fromDbRow(stdClass $row)
{
$self = new static;
if (is_resource($row->uuid)) {
$row->uuid = stream_get_contents($row->uuid);
}
if (strlen($row->uuid) !== 16) {
throw new RuntimeException('Valid UUID expected, got ' . var_export($row->uuid, 1));
}
$self->branchUuid = Uuid::fromBytes($row->uuid);
$self->name = $row->branch_name;
$self->owner = $row->owner;
$self->shouldBeMerged = $row->should_be_merged === 'y';
$self->tsMergeRequest = $row->ts_merge_request;
if (isset($row->cnt_activities)) {
$self->cntActivities = $row->cnt_activities;
} else {
@ -131,7 +137,7 @@ class Branch
*/
public function shouldBeMerged()
{
return $this->shouldBeMerged;
return $this->tsMergeRequest !== null;
}
/**