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

fix tests

This commit is contained in:
leogermani 2019-06-26 12:34:43 -03:00
parent 7886b9a78d
commit 3df60abead
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/classes/entities/class-tainacan-filter.php
View File

@ -46,12 +46,16 @@ class Filter extends Entity {
$filter_array['metadatum'] = []; $filter_array['metadatum'] = [];
$filter_array['metadatum']['metadatum_id'] = $metadatum_id; $filter_array['metadatum']['metadatum_id'] = $metadatum_id;
$filter_array['metadatum']['metadatum_name'] = $metadatum->get_name();
$meta_object = $metadatum->get_metadata_type_object(); if ($metadatum instanceof Metadatum) {
if (is_object($meta_object)) { $filter_array['metadatum']['metadatum_name'] = $metadatum->get_name();
$filter_array['metadatum']['metadata_type_object'] = $meta_object->_toArray(); $meta_object = $metadatum->get_metadata_type_object();
if (is_object($meta_object)) {
$filter_array['metadatum']['metadata_type_object'] = $meta_object->_toArray();
}
} }
return apply_filters('tainacan-filter-to-array', $filter_array, $this); return apply_filters('tainacan-filter-to-array', $filter_array, $this);
} }

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

@ -67,7 +67,10 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
array( array(
'name' => 'Metadatum filtered', 'name' => 'Metadatum filtered',
'description' => 'Is filtered', 'description' => 'Is filtered',
) 'collection_id' => $collection->get_id(),
'metadata_type' => 'Tainacan\Metadata_Types\Numeric',
),
true
); );
$filter = $this->tainacan_entity_factory->create_entity( $filter = $this->tainacan_entity_factory->create_entity(
@ -76,7 +79,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
'name' => 'filtro', 'name' => 'filtro',
'collection' => $collection, 'collection' => $collection,
'description' => 'descricao', 'description' => 'descricao',
'metadatum' => $metadatum, 'metadatum_id' => $metadatum->get_id(),
'filter_type' => 'Tainacan\Filter_Types\Custom_Interval', 'filter_type' => 'Tainacan\Filter_Types\Custom_Interval',
), ),
true true
@ -131,8 +134,10 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
array( array(
'name' => 'Metadatum filtered', 'name' => 'Metadatum filtered',
'description' => 'Is filtered', 'description' => 'Is filtered',
'collection_id' => $collection->get_id() 'collection_id' => $collection->get_id(),
) 'metadata_type' => 'Tainacan\Metadata_Types\Numeric',
),
true
); );
$filter_type = $this->tainacan_filter_factory->create_filter('custom_interval'); $filter_type = $this->tainacan_filter_factory->create_filter('custom_interval');
@ -143,7 +148,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
'name' => 'filtro', 'name' => 'filtro',
'collection' => $collection, 'collection' => $collection,
'description' => 'descricao', 'description' => 'descricao',
'metadatum' => $metadatum, 'metadatum_id' => $metadatum->get_id(),
'filter_type' => $filter_type, 'filter_type' => $filter_type,
), ),
true true