JSON encode saved search filters when updating (not just creating)

Refs T1678

Conflicts:
	application/classes/Ushahidi/Repository/Set.php

Author: rjmackay

application/classes/Ushahidi/Repository/Set.php

@@ -68,30 +68,42 @@ protected function selectQuery(Array $where = [])
 
 	// CreateRepository
 	public function create(Entity $entity) {
+		// Get record as an array
+		$record = $entity->asArray();
+		// .. then filter empty values and JSON encode properties
 		$record = array_filter($this->json_transcoder->encode(
-			$entity->asArray(),
+			$record,
 			$this->json_properties
 		));
+		// Set the created time
 		$record['created'] = time();
+		// And save if this is a saved search or collection
 		$record['search'] = (int)$this->savedSearch;
+		// Finally, save the record to the DB
 		return $this->executeInsert($this->removeNullValues($record));
 
 	}
 
 	// UpdateRepository
 	public function update(Entity $entity)
 	{
-		$record = array_filter($this->json_transcoder->encode(
-			$entity->asArray(),
-			$this->json_properties
-		));
+		// Get changed values
 		$record = $entity->getChanged();
+
+		// .. then JSON encode json properties
+		$record = $this->json_transcoder->encode(
+			$record,
+			$this->json_properties
+		);
+
+		// Set the updated time
 		$record['updated'] = time();
 
+		// Finally, update the record in the DB
 		return $this->executeUpdate([
 			'id' => $entity->id,
 			'search' => (int)$this->savedSearch
-		], $entity->getChanged());
+		], $record);
 	}
 
 	// DeleteRepository

application/tests/features/api.savedsearch.feature

@@ -56,7 +56,10 @@ Feature: Testing the Sets API
 		And that the request "data" is:
 			"""
 			{
-				"name":"Updated Search One"
+				"name":"Updated Search One",
+				"filter":{
+					"q":"updated"
+				}
 			}
 			"""
 		And that its "id" is "4"
@@ -65,6 +68,7 @@ Feature: Testing the Sets API
 		And the "id" property equals "4"
 		And the response has a "name" property
 		And the "name" property equals "Updated Search One"
+		And the "filter.q" property equals "updated"
 		Then the guzzle status code should be 200
 
 	Scenario: Updating a non-existent SavedSearch