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

* Ready for pushing story to issue.

Browse Source
This commit is contained in:
dingguodong
2021-06-28 14:39:33 +08:00
parent 3429d54c09
commit 9623172398
3 changed files with 61 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+41 -12
View File
@@ -478,6 +478,23 @@ class gitlabModel extends model
->fetchGroup('AID');
}
/**
* Get gitlabID and projectID.
*
* @param string $objectType
* @param int $objectID
* @access public
* @return object
*/
public function getGitlabIDprojectID($objectType, $objectID)
{
return $this->dao->select('extra as gitlabID, BVersion as projectID')->from(TABLE_RELATION)
->where('relation')->eq('gitlab')
->andWhere('Atype')->eq($objectType)
->andWhere('AID')->eq($objectID)
->fetch();
}
/**
* Create relationship between zentao product and gitlab project.
*
@@ -558,7 +575,7 @@ class gitlabModel extends model
}
/**
* Sync story to gitlab issue.
* Push story to gitlab issue.
*
* @param int $storyID
* @param int $gitlab
@@ -566,18 +583,30 @@ class gitlabModel extends model
* @access public
* @return void
*/
public function syncStory($storyID, $gitlab, $gitlabProject)
public function pushStory($storyID, $gitlabID, $projectID)
{
$story = $this->loadModel('story')->getByID($storyID);
$syncedIssue = $this->getSyncedIssue($objectType = 'story', $objectID = $storyID, $gitlab);
$issue = $this->storyToIssue($gitlab, $gitlabProject, $story);
$this->createZentaoObjectLabel($gitlab, $gitlabProject, 'story', $storyID);
$issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, 'story', $storyID);
if($syncedIssue) $issue = $this->apiUpdateIssue($gitlab, $gitlabProject, $syncedIssue, $issue);
$issue = $this->apiCreateIssue($gitlab, $gitlabProject, $issue);
if($issue) $this->saveSyncedIssue('story', $story, $gitlab, $issue);
if(!$gitlabID or !$projectID)
{
$result = $this->getGitlabIDprojectID('story', $storyID);
$gitlabID = $result->gitlabID;
$projectID = $result->projectID;
}
$syncedIssue = $this->getSyncedIssue($objectType = 'story', $objectID = $storyID, $gitlabID);
$issue = $this->storyToIssue($gitlabID, $projectID, $story);
if($syncedIssue)
{
$this->apiUpdateIssue($gitlabID, $projectID, $syncedIssue->AID, $issue);
}
else
{
$this->createZentaoObjectLabel($gitlabID, $projectID, 'story', $storyID);
$issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, 'story', $storyID);
$issue = $this->apiCreateIssue($gitlabID, $projectID, $issue);
if($issue) $this->saveSyncedIssue('story', $story, $gitlabID, $issue);
}
}
/**
@@ -710,7 +739,7 @@ class gitlabModel extends model
}
if($value) $issue->$field = $value;
}
return $issue;
}