Merge pull request #2687 from ushahidi/release/comrades-and-fixes

Release comrades changes and category fixes

application/classes/Ushahidi/Repository/Tag.php

@@ -42,14 +42,13 @@ protected function getTable()
 	// ReadRepository
 	public function getEntity(Array $data = null)
 	{
-		if (!empty($data['id']))
-		{
+		if (!empty($data['id'])) {
 			// If this is a top level category
-			if(empty($data['parent_id'])) {
+			if (empty($data['parent_id'])) {
 				// Load children
 				$data['children'] = DB::select('id')
 					->from('tags')
-					->where('parent_id','=',$data['id'])
+					->where('parent_id', '=', $data['id'])
 					->execute($this->db)
 					->as_array(null, 'id');
 			}
@@ -74,10 +73,9 @@ public function getSearchFields()
 	protected function setSearchConditions(SearchData $search)
 	{
 		$query = $this->search_query;
-		foreach (['tag', 'type', 'parent_id'] as $key)
-		{
+		foreach (['tag', 'type', 'parent_id'] as $key) {
 			if ($search->$key) {
-				 $query->where($key, '=', $search->$key);
+				$query->where($key, '=', $search->$key);
 			}
 		}
 
@@ -86,9 +84,9 @@ protected function setSearchConditions(SearchData $search)
 			$query->where('tag', 'LIKE', "%{$search->q}%");
 		}
 
-		if($search->level) {
+		if ($search->level) {
 			//searching for top-level-tags
-			if($search->level === 'parent') {
+			if ($search->level === 'parent') {
 				$query->where('parent_id', '=', null);
 			}
 		}
@@ -162,8 +160,31 @@ public function delete(Entity $entity)
 	public function deleteTag($id)
 	{
 		// Remove tag from attribute options
-		$this->removeTagFromAttributeOptions($entity->id);
-
+		$this->removeTagFromAttributeOptions($id);
 		return $this->delete(compact('id'));
 	}
+
+	/**
+	 * Checks if the assigned role is valid for this tag.
+	 * True if there is no role or if it's a parent with no children
+	 * @param Validation $validation
+	 * @param $fullData
+	 * @return bool
+	 */
+	public function isRoleValid(Validation $validation, $fullData)
+	{
+		$valid = true;
+		$entityFullData = $this->getEntity($fullData);
+		$isChild = !!$entityFullData->parent_id;
+		$hasRole = !!$entityFullData->role;
+		$parent = $isChild ? $this->selectOne(['id' => $entityFullData->parent_id]) : null;
+		if ($hasRole && $isChild && $parent) {
+			$parent = $this->getEntity($parent);
+			$valid = $parent->role == $entityFullData->role;
+		}
+		if (!$valid) {
+			$validation->error('role', 'tag.role');
+		}
+		return $valid;
+	}
 }

application/classes/Ushahidi/Validator/Tag/Update.php

@@ -63,6 +63,7 @@ protected function getRules()
 			],
 			'role' => [
 				[[$this->role_repo, 'exists'], [':value']],
+				[[$this->repo, 'isRoleValid'], [':validation', ':fulldata']]
 			]
 		];
 	}

application/messages/tag.php

@@ -2,7 +2,9 @@
 
 return array(
 	'isSlugAvailable' => ':field :value is already in use',
-  'description.regex' => 'The description must contain only letters, numbers, spaces and punctuation',
-  'tag.regex' => 'The category name must contain only letters, numbers, spaces and punctuation',
+	'isRoleValid' => 'Role must match the parent category',
+	'tag.role.isRoleValid' => 'Role must match the parent category',
+	'description.regex' => 'The description must contain only letters, numbers, spaces and punctuation',
+	'tag.regex' => 'The category name must contain only letters, numbers, spaces and punctuation',
 );
 

codeship-steps.yml

@@ -18,7 +18,7 @@
     tag: staging
     command: >
       ANSIBLE_GITHUB_REPO=platform-cloud-ansible
-      ANSIBLE_GITHUB_REPO_VERSION=master
+      ANSIBLE_GITHUB_REPO_VERSION=develop
       ush-ansible-playbook.sh -vv -i hosts/rackspace_staging platform-api-update.yml
         -e PLATFORM_CLIENT_VERSION="$CI_COMMIT_ID"
 

tests/datasets/ushahidi/Base.yml

@@ -1085,6 +1085,7 @@ tags:
     slug: "test-tag"
     priority: 0
     type: 'category'
+    role: '["admin", "user"]'
   -
     id: 2
     parent_id:
@@ -1128,6 +1129,38 @@ tags:
     priority: 0
     type: "category"
     role: '["admin"]'
+  -
+    id: 8
+    parent_id:
+    role: 'admin'
+    tag: "Test tag - no children"
+    slug: "test-tag-no-children"
+    priority: 0
+    type: 'category'
+  -
+    id: 9
+    parent_id:
+    role: 'admin'
+    tag: "Test tag - with children"
+    slug: "test-tag-with-children"
+    priority: 0
+    type: 'category'
+  -
+    id: 10
+    role: 'admin'
+    parent_id: 9
+    tag: "Child 1"
+    slug: "child-one"
+    priority: 0
+    type: 'category'
+  -
+    id: 11
+    role: 'admin'
+    parent_id: 9
+    tag: "Child 2"
+    slug: "child-two"
+    priority: 0
+    type: 'category'
 posts_tags:
   -
     post_id: 1

tests/integration/acl.feature

@@ -601,7 +601,7 @@ Feature: API Access Control Layer
         Then the response is JSON
         And the response has a "count" property
         And the type of the "count" property is "numeric"
-        And the "count" property equals "7"
+        And the "count" property equals "11"
         Then the guzzle status code should be 200
 
     @rolesEnabled

tests/integration/media.feature

@@ -114,6 +114,7 @@ Feature: Testing the Media API
         And the response has a "errors" property
         Then the guzzle status code should be 404
 
+    @resetFixture
     Scenario: Fail to create a new Media with size greater than limit
         Given that I want to make a new "Media"
         And that the post field "caption" is "ihub"

tests/integration/tags.feature

@@ -13,11 +13,7 @@ Feature: Testing the Tags API
                 "type":"category",
                 "priority":1,
                 "color":"00ff00",
-                "role":
-                    [
-                        "user",
-                        "admin"
-                    ]
+                "role": ["admin", "user"]
             }
             """
         When I request "/tags"
@@ -31,7 +27,6 @@ Feature: Testing the Tags API
         And the "priority" property equals "1"
         And the "type" property equals "category"
         And the response has a "role" property
-        And the type of the "role" property is "array"
         And the "parent.id" property equals "1"
         Then the guzzle status code should be 200
 
@@ -218,7 +213,7 @@ Feature: Testing the Tags API
         Then the response is JSON
         And the response has a "count" property
         And the type of the "count" property is "numeric"
-        And the "count" property equals "7"
+        And the "count" property equals "11"
         Then the guzzle status code should be 200
 
     @resetFixture
@@ -243,7 +238,7 @@ Feature: Testing the Tags API
             """
         When I request "/tags"
         Then the response is JSON
-        And the "count" property equals "5"
+        And the "count" property equals "9"
         Then the guzzle status code should be 200
 
     @resetFixture
@@ -301,3 +296,53 @@ Feature: Testing the Tags API
         When I request "/tags"
         And the response has a "errors" property
         Then the guzzle status code should be 404
+
+    Scenario: Creating a new child for a tag with role=admin
+        Given that I want to make a new "Tag"
+        And that the request "data" is:
+            """
+            {
+                "parent_id":9,
+                "tag":"Valid child",
+                "slug":"valid-child",
+                "description":"I am a valid tag",
+                "type":"category",
+                "priority":1,
+                "color":"00ff00",
+                "role": "admin"
+            }
+            """
+        When I request "/tags"
+        Then the response is JSON
+        And the response has a "id" property
+        And the type of the "id" property is "numeric"
+        And the "tag" property equals "Valid child"
+        And the "slug" property equals "valid-child"
+        And the "description" property equals "I am a valid tag"
+        And the "color" property equals "#00ff00"
+        And the "priority" property equals "1"
+        And the "type" property equals "category"
+        And the response has a "role" property
+        And the type of the "role" property is "array"
+        And the "parent.id" property equals "9"
+        Then the guzzle status code should be 200
+
+    Scenario: Creating a new invalid child for a tag with role=admin
+        Given that I want to make a new "Tag"
+        And that the request "data" is:
+            """
+            {
+                "parent_id":9,
+                "tag":"Not a valid tag role",
+                "slug":"not-valid-tag-role",
+                "description":"My role is invalid",
+                "type":"category",
+                "priority":1,
+                "color":"00ff00",
+                "role":"nope"
+            }
+            """
+        When I request "/tags"
+        Then the response is JSON
+        And the response has a "errors" property
+        Then the guzzle status code should be 422