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

* Refactor get user details logic.

Browse Source
This commit is contained in:
dingguodong
2021-08-19 10:38:18 +08:00
parent 6288345195
commit d7986085ad
1 changed files with 72 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/productissue.php
+72 -6
View File
@@ -33,9 +33,8 @@ class productIssueEntry extends entry
$issue->title = $story->title;
$issue->labels = array($this->app->lang->story->common, zget($this->app->lang->story->categoryList, $story->category));
$issue->pri = $story->pri;
$issue->assignedTo = $this->entry->getAssignees('story', $story);
$issue->openedDate = $story->openedDate;
$issue->openedBy = $this->entry->getUser($story->openedBy);
$issue->openedBy = $story->openedBy;
$issue->lastEditedDate = $story->lastEditedDate < '1970-01-01 01:01:01' ? $story->openedDate : $story->lastEditedDate;
$issue->lastEditedBy = $story->lastEditedDate < '1970-01-01 01:01:01' ? $story->openedBy : $story->lastEditedBy;
$issue->status = $storyStatus[$story->status];
@@ -43,6 +42,16 @@ class productIssueEntry extends entry
$storySpec = $this->dao->select('*')->from(TABLE_STORYSPEC)->where('story')->eq($id)->andWhere('version')->eq($story->version)->fetch();
$issue->desc = $storySpec->spec;
if($story->assignedTo == "")
{
$issue->assignedTo = array();
}
else
{
$issue->assignedTo = array($story->assignedTo);
}
break;
case 'bug':
$this->app->loadLang('bug');
@@ -55,15 +64,25 @@ class productIssueEntry extends entry
$issue->title = $bug->title;
$issue->labels = array($this->app->lang->bug->common, zget($this->app->lang->bug->typeList, $bug->type));
$issue->pri = $bug->pri;
$issue->assignedTo = $this->entry->getAssignees('bug', $bug);
$issue->openedDate = $bug->openedDate;
$issue->openedBy = $this->entry->getUser($bug->openedBy);
$issue->openedBy = $bug->openedBy;
$issue->lastEditedDate = $bug->lastEditedDate < '1970-01-01 01:01:01' ? $bug->openedDate : $bug->lastEditedDate;
$issue->lastEditedBy = $bug->lastEditedDate < '1970-01-01 01:01:01' ? $bug->openedBy : $bug->lastEditedBy;
$issue->status = $bugStatus[$bug->status];
$issue->url = helper::createLink('bug', 'view', "bugID=$id");
$issue->desc = $bug->steps;
if($bug->assignedTo == "")
{
$issue->assignedTo = array();
}
else
{
$issue->assignedTo = array($bug->assignedTo);
}
break;
case 'task':
$this->app->loadLang('task');
$taskStatus = array('' => '', 'wait' => 'opened', 'doing' => 'opened', 'done' => 'opened', 'pause' => 'opened', 'cancel' => 'opened', 'closed' => 'closed');
@@ -75,22 +94,69 @@ class productIssueEntry extends entry
$issue->title = $task->name;
$issue->labels = array($this->app->lang->task->common, zget($this->app->lang->task->typeList, $task->type));
$issue->pri = $task->pri;
$issue->assignedTo = $this->entry->getAssignees('task', $task);
$issue->openedDate = $task->openedDate;
$issue->openedBy = $this->entry->getUser($task->openedBy);
$issue->openedBy = $task->openedBy;
$issue->lastEditedDate = $task->lastEditedDate < '1970-01-01 01:01:01' ? $task->openedDate : $task->lastEditedDate;
$issue->lastEditedBy = $task->lastEditedDate < '1970-01-01 01:01:01' ? $task->openedBy : $task->lastEditedBy;
$issue->status = $taskStatus[$task->status];
$issue->url = helper::createLink('task', 'view', "taskID=$id");
$issue->desc = $task->desc;
/* Get assignees for task, the task object has the type of multiple assign only so far. */
$users = $this->dao->select('account')->from(TABLE_TEAM)
->where('type')->eq('task')
->andWhere('root')->eq($task->id)
->fetchAll();
if($users)
{
foreach($users as $user)
{
$issue->assignedTo[] = $user->account;
}
}
else
{
if($task->assignedTo == "")
{
$issue->assignedTo = array();
}
else
{
$issue->assignedTo = array($task->assignedTo);
}
}
break;
default:
$this->send404();
}
$actions = $this->loadModel('action')->getList($type, $issueID);
/**
* Get all users in issues so that we can bulk get user detail later.
*
*/
$userList = array();
foreach($issue->assignedTo as $user)
{
$userList[] = $user;
}
$userList[] = $issue->openedBy;
$userList = array_unique($userList);
$userDetails = $this->loadModel('user')->getUserDetailsForAPI($userList);
/**
* Set the user detail to assignedTo and openedBy.
*
*/
foreach($issue->assignedTo as $index => $user)
{
$issue->assignedTo[$index] = $userDetails[$user];
}
$issue->openedBy = $userDetails[$issue->openedBy];
$this->send(200, array('issue' => $this->format($issue, 'openedDate:time,lastEditedDate:time')));
}
}