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

Merge branch 'liyuchun_64263' into 'zenops_41'

Browse Source 
* Finish task #64263.

See merge request easycorp/zentaopms!4958
This commit is contained in:
孙广明
2022-08-15 00:22:26 +00:00
parent 3ad35dd9d5 9bade59d7b
commit d7a8b587db
5 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+33 -31
View File
@@ -1226,29 +1226,6 @@ class mrModel extends model
return json_decode(commonModel::http($url));
}
/**
* Get diff commits of MR from GitLab API.
*
* @param int $hostID
* @param int $projectID
* @param int $MRID
* @access public
* @return object
*/
public function apiGetDiffCommits($hostID, $projectID, $MRID)
{
$host = $this->loadModel('pipeline')->getByID($hostID);
if($host->type == 'gitlab')
{
$url = sprintf($this->gitlab->getApiRoot($hostID), "/projects/$projectID/merge_requests/$MRID/commits");
}
else
{
$url = sprintf($this->loadModel($host->type)->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID/commits");
}
return json_decode(commonModel::http($url));
}
/**
* Get diff of MR from Gitea API.
*
@@ -1737,6 +1714,33 @@ class mrModel extends model
->fetchPairs();
}
/**
* Get diff commits of MR.
*
* @param object $MR
* @access public
* @return array
*/
public function getDiffCommits($MR)
{
$host = $this->loadModel('pipeline')->getByID($MR->hostID);
if($host->type == 'gogs')
{
$repo = $this->loadModel('repo')->getRepoByID($MR->repoID);
$scm = $this->app->loadClass('scm');
$scm->setEngine($repo);
return $scm->getMRCommits($MR->sourceBranch, $MR->targetBranch);
}
else
{
$projectID = $MR->projectID;
$MRID = $MR->mriid;
if($host->type == 'gitlab') $url = sprintf($this->loadModel('gitlab')->getApiRoot($this->hostID), "/projects/$projectID/merge_requests/$MRID/commits");
if($host->type == 'gitea') $url = sprintf($this->loadModel('gitea')->getApiRoot($this->hostID), "/repos/$projectID/pulls/$MRID/commits");
return json_decode(commonModel::http($url));
}
}
/**
* Create an mr link.
*
@@ -1868,21 +1872,19 @@ class mrModel extends model
/**
* Get links by mr commites.
*
* @param int $hostID
* @param int $projectID
* @param int $MRID
* @param string $type
* @param object $MR
* @param string $type
* @access public
* @return array
*/
public function getCommitedLink($hostID, $projectID, $MRID, $type)
public function getCommitedLink($MR, $type)
{
$DiffCommits = $this->apiGetDiffCommits($hostID, $projectID, $MRID);
$diffCommits = $this->getDiffCommits($MR);
$commits = array();
foreach($DiffCommits as $DiffCommit)
foreach($diffCommits as $diffCommit)
{
if(isset($DiffCommit->id)) $commits[] = substr($DiffCommit->id, 0, 10);
if(isset($diffCommit->id)) $commits[] = substr($diffCommit->id, 0, 10);
}
return $this->dao->select('objectID')->from(TABLE_ACTION)->where('objectType')->eq($type)->andWhere('extra')->in($commits)->fetchPairs('objectID');