1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 00:42:41 +01:00

add ids and phids to maniphest.query

Summary: requires add withTaskPHIDs to maniphest query class.

Test Plan: queried via conduit by task id and task phid -- respective success!

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T2017

Differential Revision: https://secure.phabricator.com/D3863
This commit is contained in:
Bob Trahan 2012-11-01 10:47:45 -07:00
parent 209954f28c
commit a977b49e33
2 changed files with 49 additions and 19 deletions

View file

@ -53,10 +53,12 @@ class ConduitAPI_maniphest_query_Method
$orders = implode(', ', $orders);
return array(
'ownerPHIDs' => 'optional list',
'authorPHIDs' => 'optional list',
'projectPHIDs' => 'optional list',
'ccPHIDs' => 'optional list',
'ids' => 'optional list<uint>',
'phids' => 'optional list<phid>',
'ownerPHIDs' => 'optional list<phid>',
'authorPHIDs' => 'optional list<phid>',
'projectPHIDs' => 'optional list<phid>',
'ccPHIDs' => 'optional list<phid>',
'fullText' => 'optional string',
'status' => 'optional enum<'.$statuses.'>',
@ -79,6 +81,16 @@ class ConduitAPI_maniphest_query_Method
protected function execute(ConduitAPIRequest $request) {
$query = new ManiphestTaskQuery();
$task_ids = $request->getValue('ids');
if ($task_ids) {
$query->withTaskIDs($task_ids);
}
$task_phids = $request->getValue('phids');
if ($task_phids) {
$query->withTaskPHIDs($task_phids);
}
$owners = $request->getValue('ownerPHIDs');
if ($owners) {
$query->withOwners($owners);

View file

@ -25,6 +25,7 @@
final class ManiphestTaskQuery extends PhabricatorQuery {
private $taskIDs = array();
private $taskPHIDs = array();
private $authorPHIDs = array();
private $ownerPHIDs = array();
private $includeUnowned = null;
@ -85,6 +86,11 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
return $this;
}
public function withTaskPHIDs(array $phids) {
$this->taskPHIDs = $phids;
return $this;
}
public function withOwners(array $owners) {
$this->includeUnowned = false;
foreach ($owners as $k => $phid) {
@ -197,6 +203,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
$where = array();
$where[] = $this->buildTaskIDsWhereClause($conn);
$where[] = $this->buildTaskPHIDsWhereClause($conn);
$where[] = $this->buildStatusWhereClause($conn);
$where[] = $this->buildPriorityWhereClause($conn);
$where[] = $this->buildAuthorWhereClause($conn);
@ -288,7 +295,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
return $tasks;
}
private function buildTaskIDsWhereClause($conn) {
private function buildTaskIDsWhereClause(AphrontDatabaseConnection $conn) {
if (!$this->taskIDs) {
return null;
}
@ -299,7 +306,18 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
$this->taskIDs);
}
private function buildStatusWhereClause($conn) {
private function buildTaskPHIDsWhereClause(AphrontDatabaseConnection $conn) {
if (!$this->taskPHIDs) {
return null;
}
return qsprintf(
$conn,
'phid in (%Ls)',
$this->taskPHIDs);
}
private function buildStatusWhereClause(AphrontDatabaseConnection $conn) {
static $map = array(
self::STATUS_RESOLVED => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
@ -328,7 +346,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
}
}
private function buildPriorityWhereClause($conn) {
private function buildPriorityWhereClause(AphrontDatabaseConnection $conn) {
if ($this->priority !== null) {
return qsprintf(
$conn,
@ -345,7 +363,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
return null;
}
private function buildAuthorWhereClause($conn) {
private function buildAuthorWhereClause(AphrontDatabaseConnection $conn) {
if (!$this->authorPHIDs) {
return null;
}
@ -356,7 +374,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
$this->authorPHIDs);
}
private function buildOwnerWhereClause($conn) {
private function buildOwnerWhereClause(AphrontDatabaseConnection $conn) {
if (!$this->ownerPHIDs) {
if ($this->includeUnowned === null) {
return null;
@ -384,7 +402,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
}
}
private function buildFullTextWhereClause($conn) {
private function buildFullTextWhereClause(AphrontDatabaseConnection $conn) {
if (!$this->fullTextSearch) {
return null;
}
@ -408,7 +426,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
$fulltext_results);
}
private function buildSubscriberWhereClause($conn) {
private function buildSubscriberWhereClause(AphrontDatabaseConnection $conn) {
if (!$this->subscriberPHIDs) {
return null;
}
@ -419,7 +437,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
$this->subscriberPHIDs);
}
private function buildProjectWhereClause($conn) {
private function buildProjectWhereClause(AphrontDatabaseConnection $conn) {
if (!$this->projectPHIDs && !$this->includeNoProject) {
return null;
}
@ -440,7 +458,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
return '('.implode(') OR (', $parts).')';
}
private function buildProjectJoinClause($conn) {
private function buildProjectJoinClause(AphrontDatabaseConnection $conn) {
if (!$this->projectPHIDs && !$this->includeNoProject) {
return null;
}
@ -453,7 +471,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
$project_dao->getTableName());
}
private function buildAnyProjectWhereClause($conn) {
private function buildAnyProjectWhereClause(AphrontDatabaseConnection $conn) {
if (!$this->anyProjectPHIDs) {
return null;
}
@ -464,7 +482,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
$this->anyProjectPHIDs);
}
private function buildAnyProjectJoinClause($conn) {
private function buildAnyProjectJoinClause(AphrontDatabaseConnection $conn) {
if (!$this->anyProjectPHIDs) {
return null;
}
@ -476,7 +494,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
$project_dao->getTableName());
}
private function buildXProjectWhereClause($conn) {
private function buildXProjectWhereClause(AphrontDatabaseConnection $conn) {
if (!$this->xprojectPHIDs) {
return null;
}
@ -486,7 +504,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
'xproject.projectPHID IS NULL');
}
private function buildXProjectJoinClause($conn) {
private function buildXProjectJoinClause(AphrontDatabaseConnection $conn) {
if (!$this->xprojectPHIDs) {
return null;
}
@ -500,7 +518,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
$this->xprojectPHIDs);
}
private function buildSubscriberJoinClause($conn) {
private function buildSubscriberJoinClause(AphrontDatabaseConnection $conn) {
if (!$this->subscriberPHIDs) {
return null;
}
@ -512,7 +530,7 @@ final class ManiphestTaskQuery extends PhabricatorQuery {
$subscriber_dao->getTableName());
}
private function buildOrderClause($conn) {
private function buildOrderClause(AphrontDatabaseConnection $conn) {
$order = array();
switch ($this->groupBy) {