Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

*Finish 44403,44406,44406,44401

Browse Source
This commit is contained in:
xiawenlong
2021-11-17 10:53:37 +08:00
parent 86431ddb80
commit 8c1f8ea70c
11 changed files with 222 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+28 -10
View File
@@ -84,12 +84,11 @@ class mrModel extends model
*/
public function create()
{
if (!empty($_POST['compile']))
if (!empty($_POST['job']))
{
$repoID = $this->post->repo;
$jobID = $this->post->job;
$compileID = $this->post->compile;
$compileStatus = $this->loadModel('compile')->getByID($this->post->compile)->status;
$MR = fixer::input('post')
->add('createdBy', $this->app->user->account)
@@ -97,7 +96,6 @@ class mrModel extends model
->add('repoID', $repoID)
->add('jobID', $jobID)
->add('compileID', $compileID)
->add('compileStatus', $compileStatus)
->get();
}
else
@@ -108,6 +106,18 @@ class mrModel extends model
->get();
}
/* Exec Job */
if($MR->jobID)
{
$pipeline = $this->loadModel('job')->exec($MR->jobID);
if($pipeline->queue)
{
$compile = $this->loadModel('compile')->getByQueue($pipeline->queue);
$MR->compileID = $compile->id;
$MR->compileStatus = $compile->status;
}
}
$this->dao->insert(TABLE_MR)->data($MR, $this->config->mr->create->skippedFields)
->batchCheck($this->config->mr->create->requiredFields, 'notempty')
->autoCheck()
@@ -172,20 +182,16 @@ class mrModel extends model
*/
public function update($MRID)
{
if (!empty($_POST['compile']))
if (!empty($_POST['job']))
{
$repoID = $this->post->repo;
$jobID = $this->post->job;
$compileID = $this->post->compile;
$compileStatus = $this->loadModel('compile')->getByID($this->post->compile)->status;
$MR = fixer::input('post')
->setDefault('editedBy', $this->app->user->account)
->setDefault('editedDate', helper::now())
->add('repoID', $repoID)
->add('jobID', $jobID)
->add('compileID', $compileID)
->add('compileStatus', $compileStatus)
->get();
}
else
@@ -195,6 +201,20 @@ class mrModel extends model
->setDefault('editedDate', helper::now())
->get();
}
$oldMR = $this->getByID($MRID);
/* Exec Job */
if($MR->jobID)
{
$pipeline = $this->loadModel('job')->exec($MR->jobID);
if($pipeline->queue && $MR->jobID != $oldMR->jobID)
{
$compile = $this->loadModel('compile')->getByQueue($pipeline->queue);
$MR->compileID = $compile->id;
$MR->compileStatus = $compile->status;
}
}
/* Update MR in GitLab. */
$newMR = new stdclass;
@@ -203,8 +223,6 @@ class mrModel extends model
$newMR->assignee_ids = $MR->assignee;
$newMR->target_branch = $MR->targetBranch;
$oldMR = $this->getByID($MRID);
/* Known issue: `reviewer_ids` takes no effect. */
$rawMR = $this->apiUpdateMR($oldMR->gitlabID, $oldMR->targetProject, $oldMR->mriid, $newMR);