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

* Finish task #57657.

Browse Source
This commit is contained in:
liyuchun
2022-06-21 03:25:51 +00:00
parent 413a9bd667
commit 76c813efc9
1 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+96
View File
@@ -236,6 +236,12 @@ class mrModel extends model
/* Update MR in Zentao database. */
$this->dao->update(TABLE_MR)->data($newMR)->where('id')->eq($MRID)->autoCheck()->exec();
/* Link stories,bugs and tasks. */
$MR->id = $MRID;
$MR->mriid = $newMR->mriid;
$this->linkObjects($MR);
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => helper::createLink('mr', 'browse'));
}
@@ -388,7 +394,9 @@ class mrModel extends model
->batchCheck($this->config->mr->edit->requiredFields, 'notempty')
->autoCheck()
->exec();
$MR = $this->getByID($MRID);
$this->linkObjects($MR);
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => helper::createLink('mr', 'browse'));
@@ -675,6 +683,22 @@ class mrModel extends model
return json_decode(commonModel::http($url));
}
/**
* Get MR commits by API.
*
* @link https://docs.gitlab.com/ee/api/merge_requests.html#get-commits
* @param int $gitlabID
* @param int $projectID targetProject
* @param int $MRID
* @access public
* @return object
*/
public function apiGetMRCommits($gitlabID, $projectID, $MRID)
{
$url = sprintf($this->gitlab->getApiRoot($gitlabID), "/projects/$projectID/merge_requests/$MRID/commits");
return json_decode(commonModel::http($url));
}
/**
* Update MR by API.
*
@@ -1435,6 +1459,78 @@ class mrModel extends model
}
}
/**
* Link objects.
*
* @param object $MR
* @access public
* @return void
*/
public function linkObjects($MR)
{
$this->loadModel('repo');
$this->loadModel('action');
/* Init objects. */
$stories = $bugs = $tasks = array();
/* Get commits by MR. */
$commits = $this->apiGetMRCommits($MR->gitlabID, $MR->targetProject, $MR->mriid);
foreach($commits as $commit)
{
$objects = $this->repo->parseComment($commit->message);
$stories = array_merge($stories, $objects['stories']);
$bugs = array_merge($bugs, $objects['bugs']);
$tasks = array_merge($tasks, $objects['tasks']);
}
$users = $this->loadModel('user')->getPairs('noletter');
$MRCreateAction = $MR->createdDate . '::' . zget($users, $MR->createdBy) . '::' . helper::createLink('mr', 'view', "mr={$MR->id}");
$product = $this->getMRProduct($MR);
foreach($stories as $storyID)
{
$relation = new stdclass;
$relation->product = $product->id;
$relation->AType = 'mr';
$relation->AID = $MR->id;
$relation->relation = 'interrated';
$relation->BType = 'story';
$relation->BID = $storyID;
$this->dao->replace(TABLE_RELATION)->data($relation)->exec();
$this->action->create('story', $linkID, 'createmr', '', $MRCreateAction);
}
foreach($bugs as $bugID)
{
$relation = new stdclass;
$relation->product = $product->id;
$relation->AType = 'mr';
$relation->AID = $MR->id;
$relation->relation = 'interrated';
$relation->BType = 'bug';
$relation->BID = $bugID;
$this->dao->replace(TABLE_RELATION)->data($relation)->exec();
$this->action->create('bug', $linkID, 'createmr', '', $MRCreateAction);
}
foreach($tasks as $taskID)
{
$relation = new stdclass;
$relation->product = $product->id;
$relation->AType = 'mr';
$relation->AID = $MR->id;
$relation->relation = 'interrated';
$relation->BType = 'task';
$relation->BID = $taskID;
$this->dao->replace(TABLE_RELATION)->data($relation)->exec();
$this->action->create('task', $linkID, 'createmr', '', $MRCreateAction);
}
}
/**
* unLink an mr link.
*