Allow mc_project_get_{issues,issue_headers} to work with ALL_PROJECTS

rombert · rombert · commit ecf3eb75802b · 2011-12-06T13:25:43.000+02:00
Fixes #13526: It is not possible to retrieve issues for 'All Projects'
diff --git a/api/soap/mc_project_api.php b/api/soap/mc_project_api.php
@@ -14,7 +14,7 @@ function mc_project_get_issues( $p_username, $p_password, $p_project_id, $p_page
 	
 	$t_lang = mci_get_user_lang( $t_user_id );
 	
-	if( !project_exists( $p_project_id ) ) {
+	if( $p_project_id != ALL_PROJECTS && !project_exists( $p_project_id ) ) {
 		return new soap_fault( 'Client', '', "Project '$p_project_id' does not exist." );
 	}
 
@@ -854,7 +854,7 @@ function mc_project_get_issue_headers( $p_username, $p_password, $p_project_id,
 	if( $t_user_id === false ) {
 		return mci_soap_fault_login_failed();
 	}
-	if( !project_exists( $p_project_id ) ) {
+	if( $p_project_id != ALL_PROJECTS && !project_exists( $p_project_id ) ) {
 		return new soap_fault( 'Client', '', "Project '$p_project_id' does not exist." );
 	}
 
diff --git a/tests/soap/FilterTest.php b/tests/soap/FilterTest.php
@@ -235,6 +235,43 @@ public function testGetIssuesPaged() {
 		$this->doTestGetPages('mc_project_get_issues');
 	}
 	
+	public function testGetAllProjectsIssues() {
+	
+		$initialIssues = $this->getAllProjectsIssues();
+	
+		$issueToAdd = $this->getIssueToAdd( 'FilterTest.testGetAllProjectsIssues' );
+	
+		$issueId = $this->client->mc_issue_add(
+			$this->userName,
+			$this->password,
+			$issueToAdd);
+			
+		$this->deleteAfterRun( $issueId );
+	
+		$projectIssues = $this->getAllProjectsIssues();
+	
+		$this->assertEquals( 1, count( $projectIssues ) - count( $initialIssues ), "count(projectIssues) - count(initialIssues)");
+		$this->assertEquals( $issueId, $projectIssues[0]->id, "issueId");
+	}
+	
+	public function testGetAllProjectsIssueHeaders() {
+	
+		$initialIssues = $this->getAllProjectsIssueHeaders();
+	
+		$issueToAdd = $this->getIssueToAdd( 'FilterTest.testGetProjectIssueHeaders' );
+	
+		$issueId = $this->client->mc_issue_add(
+			$this->userName,
+			$this->password,
+			$issueToAdd);
+			
+		$this->deleteAfterRun( $issueId );
+	
+		$projectIssues = $this->getAllProjectsIssueHeaders();
+	
+		$this->assertEquals( 1, count( $projectIssues ) - count( $initialIssues ), "count(projectIssues) - count(initialIssues)" );
+		$this->assertEquals( $issueId, $projectIssues[0]->id, "issueId" );
+	}
 
 	/**
 	 *
@@ -249,6 +286,20 @@ private function getProjectIssues() {
 			0,
 			self::ISSUES_TO_RETRIEVE);
 	}
+
+	/**
+	 *
+	 * @return Array the project issues
+	 */
+	private function getAllProjectsIssues() {
+
+		return $this->client->mc_project_get_issues(
+			$this->userName,
+			$this->password,
+			0,
+			0,
+			self::ISSUES_TO_RETRIEVE);
+	}
 	
 	/**
 	 *
@@ -263,4 +314,18 @@ private function getProjectIssueHeaders() {
 			0,
 			self::ISSUES_TO_RETRIEVE);
 	}
+
+	/**
+	 *
+	 * @return Array the project issues
+	 */
+	private function getAllProjectsIssueHeaders() {
+
+		return $this->client->mc_project_get_issue_headers(
+			$this->userName,
+			$this->password,
+			0,
+			0,
+			self::ISSUES_TO_RETRIEVE);
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function mc_project_get_issues( $p_username, $p_password, $p_project_id, $p_page`
`14`	`14`
`15`	`15`	`$t_lang = mci_get_user_lang( $t_user_id );`
`16`	`16`
`17`		`- if( !project_exists( $p_project_id ) ) {`
	`17`	`+ if( $p_project_id != ALL_PROJECTS && !project_exists( $p_project_id ) ) {`
`18`	`18`	`return new soap_fault( 'Client', '', "Project '$p_project_id' does not exist." );`
`19`	`19`	`}`
`20`	`20`
`@@ -854,7 +854,7 @@ function mc_project_get_issue_headers( $p_username, $p_password, $p_project_id,`
`854`	`854`	`if( $t_user_id === false ) {`
`855`	`855`	`return mci_soap_fault_login_failed();`
`856`	`856`	`}`
`857`		`- if( !project_exists( $p_project_id ) ) {`
	`857`	`+ if( $p_project_id != ALL_PROJECTS && !project_exists( $p_project_id ) ) {`
`858`	`858`	`return new soap_fault( 'Client', '', "Project '$p_project_id' does not exist." );`
`859`	`859`	`}`
`860`	`860`