tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changes filters route

This commit is contained in:
weryques 2018-02-22 13:12:06 -03:00
parent 9a55ac198b
commit 048b95d652
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/endpoints/class-tainacan-rest-filters-controller.php
View File

@ -39,12 +39,14 @@ class TAINACAN_REST_Filters_Controller extends TAINACAN_REST_Controller {
}
public function register_routes() {
register_rest_route($this->namespace, '/' . $this->rest_base, array(
register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/field/(?P<field_id>[\d]+)/' . $this->rest_base, array(
array(
'methods' => WP_REST_Server::CREATABLE,
'callback' => array($this, 'create_item'),
'permission_callback' => array($this, 'create_item_permissions_check')
),
));
register_rest_route($this->namespace, '/' . $this->rest_base, array(
array(
'methods' => WP_REST_Server::READABLE,
'callback' => array($this, 'get_items'),
@ -79,8 +81,8 @@ class TAINACAN_REST_Filters_Controller extends TAINACAN_REST_Controller {
public function prepare_item_for_database( $request ) {
$body = json_decode($request->get_body(), true);
$collection_id = $body['collection_id'];
$field_id = $body['field_id'];
$collection_id = $request['collection_id'];
$field_id = $request['field_id'];
$filter = $body['filter'];
$received_type = $body['filter_type'];
@ -128,13 +130,13 @@ class TAINACAN_REST_Filters_Controller extends TAINACAN_REST_Controller {
}
return new WP_REST_Response([
'error_message' => 'One or more attributes are invalid',
'error_message' => __('One or more attributes are invalid', 'tainacan'),
'error' => $this->filter->get_errors()
], 400);
}
return new WP_REST_Response([
'error_message' => 'The body could not be empty.',
'error_message' => __('The body could not be empty', 'tainacan'),
'body' => $request->get_body()
], 400);
}
@ -147,8 +149,8 @@ class TAINACAN_REST_Filters_Controller extends TAINACAN_REST_Controller {
public function create_item_permissions_check( $request ) {
$body = json_decode($request->get_body(), true);
$metadata = $this->field_repository->fetch($body['field_id']);
$collection = $this->collection_repository->fetch($body['collection_id']);
$metadata = $this->field_repository->fetch($request['field_id']);
$collection = $this->collection_repository->fetch($request['collection_id']);
if(($metadata instanceof Entities\Field) && ($collection instanceof Entities\Collection)) {
return $this->filter_repository->can_edit($this->filter) && $metadata->can_edit() && $collection->can_edit();
@ -176,7 +178,7 @@ class TAINACAN_REST_Filters_Controller extends TAINACAN_REST_Controller {
}
return new WP_REST_Response([
'error_message' => 'The body could not be empty',
'error_message' => __('The body could not be empty', 'tainacan'),
'body' => $request->get_body()
], 400);
}

4
tests/test-api-filters.php
View File

@ -32,8 +32,6 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
$request_body = json_encode(
array(
'collection_id' => $collection->get_id(),
'field_id' => $field->get_id(),
'filter_type' => 'range',
'filter' => [
'name' => 'Filter name',
@ -42,7 +40,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
)
);
$request = new \WP_REST_Request('POST', $this->namespace . '/filters');
$request = new \WP_REST_Request('POST', $this->namespace . '/collection/' . $collection->get_id() . '/field/' . $field->get_id(). '/filters');
$request->set_body($request_body);

10
tests/test-api-queries.php
View File

@ -3,7 +3,7 @@
namespace Tainacan\Tests;
/**
* @group queries
* @group api
* **/
class TAINACAN_REST_Queries extends TAINACAN_UnitApiTestCase {
@ -191,13 +191,15 @@ class TAINACAN_REST_Queries extends TAINACAN_UnitApiTestCase {
$this->assertCount(2, $data3);
$values = [$data3[0]['metadata']['Field A-1']['value'], $data3[1]['metadata']['Field A-1']['value']];
$fieldA1_slug = $fieldA1->get_slug();
$values = [$data3[0]['metadata'][$fieldA1_slug]['value'], $data3[1]['metadata'][$fieldA1_slug]['value']];
$this->assertNotContains('G', $values);
// E have to come first, because DESC
$this->assertEquals('E', $data3[0]['metadata']['Field A-1']['value']);
$this->assertEquals('D', $data3[1]['metadata']['Field A-1']['value']);
$this->assertEquals('E', $data3[0]['metadata'][$fieldA1_slug]['value']);
$this->assertEquals('D', $data3[1]['metadata'][$fieldA1_slug]['value']);
/* Date Query: