Merge pull request #968 from ushahidi/954-duplicate-notifications

Use user param to filter notifications and contacts
ushahidi · Mar 4, 2016 · d36f44e · d36f44e
2 parents 7e62949 + 8c02bd6
commit d36f44e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/application/classes/Ushahidi/Repository/Contact.php b/application/classes/Ushahidi/Repository/Contact.php
@@ -33,7 +33,7 @@ protected function getId(Entity $entity)
 			->execute($this->db);
 		return $result->get('id', 0);
 	}
-	
+
 	// Ushahidi_Repository
 	protected function getTable()
 	{
@@ -63,8 +63,9 @@ protected function setSearchConditions(SearchData $search)
 		$user = $this->getUser();
 
 		// Limit search to user's records unless they are admin
-		if (! $this->isUserAdmin($user)) {
-			$search->user = $user->getId();
+		// or if we get user=me as a search param
+		if (! $this->isUserAdmin($user) || $search->user === 'me') {
+			$search->user = $this->getUserId();
 		}
 
 		foreach ([
@@ -101,7 +102,7 @@ public function create(Entity $entity)
 			// Instead return the id of the contact that exists
 			return $id;
 		}
-		
+
 		$state = [
 			'created'  => time(),
 		];

diff --git a/application/classes/Ushahidi/Repository/Notification.php b/application/classes/Ushahidi/Repository/Notification.php
@@ -39,12 +39,13 @@ protected function getTable()
 	public function setSearchConditions(SearchData $search)
 	{
 		$query = $this->search_query;
-				
+
 		$user = $this->getUser();
 
 		// Limit search to user's records unless they are admin
-		if (! $this->isUserAdmin($user)) {
-			$search->user = $user->getId();
+		// or if we get user=me as a search param
+		if (! $this->isUserAdmin($user) || $search->user === 'me') {
+			$search->user = $this->getUserId();
 		}
 
 		foreach ([

diff --git a/application/tests/features/api.contacts.feature b/application/tests/features/api.contacts.feature
@@ -1,3 +1,4 @@
+@contacts
 Feature: Testing the Contacts API
     Scenario: Add a contact
         Given that I want to make a new "Contact"
@@ -56,6 +57,10 @@ Feature: Testing the Contacts API
     Scenario: Listing Contacts for a user
         Given that I want to get all "Contacts"
         And that the request "Authorization" header is "Bearer testbasicuser"
+        And that the request "query string" is:
+            """
+                user=me
+            """
         When I request "/contacts"
         Then the response is JSON
         And the response has a "count" property

diff --git a/application/tests/features/api.notifications.feature b/application/tests/features/api.notifications.feature
@@ -1,3 +1,4 @@
+@notifications
 Feature: Testing the Notifications API
 
     Scenario: Subscribe to a notification
@@ -42,6 +43,10 @@ Feature: Testing the Notifications API
     Scenario: Listing Notifications for a user
         Given that I want to get all "Notifications"
         And that the request "Authorization" header is "Bearer testbasicuser"
+        And that the request "query string" is:
+            """
+                user=me
+            """
         When I request "/notifications"
         Then the response is JSON
         And the response has a "count" property