Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Orion-15.18.0-PLAT-10706-Add support for isQuiz filter #9197

Merged
merged 2 commits into from Feb 23, 2020
Merged

Orion-15.18.0-PLAT-10706-Add support for isQuiz filter #9197

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d38c11
Orion-15.18.0-PLAT-10706-Add support for isQuiz filter to the query e…
ZurPHP Feb 19, 2020
c1b2a59
Orion-15.18.0-PLAT-10706 Fixing code review comment
ZurPHP Feb 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 25 additions & 2 deletions plugins/search/providers/elastic_search/lib/model/filters/ESearchQueryFromAdvancedSearch.php
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ class ESearchQueryFromAdvancedSearch
const SEARCH_OPERATOR = 'AdvancedSearchFilterOperator';
const ADVANCED_SEARCH_FILTER_MATCH_CONDITION = 'AdvancedSearchFilterMatchCondition';
const ENTRY_CAPTION_ADVANCED_FILTER = 'kEntryCaptionAdvancedFilter';
const QUIZ_ADVANCED_FILTER = 'kQuizAdvancedFilter';
const MRP_DATA_FIELD = '/*[local-name()=\'metadata\']/*[local-name()=\'MRPData\']';

/**
Expand All @@ -32,7 +33,9 @@ public function processAdvanceFilter($advancedSearchFilterItem)
return $this->createESearchQueryFromSearchFilterOperator($advancedSearchFilterItem);
break;
case self::ENTRY_CAPTION_ADVANCED_FILTER:
return $this->createESearchQueryFromEntryCatpionAdvancedFilter($advancedSearchFilterItem);
return $this->createESearchQueryFromEntryCaptionAdvancedFilter($advancedSearchFilterItem);
case self::QUIZ_ADVANCED_FILTER:
return $this->createESearchQueryFromEntryQuizAdvancedFilter($advancedSearchFilterItem);
default:
KalturaLog::crit('Tried to convert not supported advance filter of type:' . get_class($advancedSearchFilterItem));
}
Expand Down Expand Up @@ -81,7 +84,7 @@ protected function createESearchQueryFromSearchFilterOperator(AdvancedSearchFilt
return $advanceFilterOperator;
}

protected function createESearchQueryFromEntryCatpionAdvancedFilter(kEntryCaptionAdvancedFilter $searchFilter)
protected function createESearchQueryFromEntryCaptionAdvancedFilter(kEntryCaptionAdvancedFilter $searchFilter)
{
$item = new ESearchCaptionItem();
$item->setFieldName(ESearchCaptionFieldName::CONTENT);
Expand All @@ -100,6 +103,25 @@ protected function createESearchQueryFromEntryCatpionAdvancedFilter(kEntryCaptio
return $result;
}

protected function createESearchQueryFromEntryQuizAdvancedFilter(kQuizAdvancedFilter $filter)
{
$item = new ESearchEntryItem();
$item->setFieldName(ESearchEntryFieldName::IS_QUIZ);
$item->setItemType(ESearchItemType::EXISTS);
if($filter->getIsQuiz())
{
$result = $item;
}
else
{
$result = new ESearchOperator();
ZurPHP marked this conversation as resolved.
Show resolved Hide resolved
$result->setOperator(ESearchOperatorType::NOT_OP);
$result->setSearchItems(array($item));
}

return $result;
}

/**
* Some fields have special usage in the sphinx so we need to return the relevant ESearchItemType for it
* @param $field
Expand Down Expand Up @@ -199,6 +221,7 @@ protected static function canTransformType($type, $item)
return self::gotESearchOperator($item->getType());
case self::ADVANCED_SEARCH_FILTER_MATCH_CONDITION:
case self::ENTRY_CAPTION_ADVANCED_FILTER:
case self::QUIZ_ADVANCED_FILTER:
return true;
default:
return false;
Expand Down