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

Naos-14.10.0-PLAT-9384-Beacon search #7897

Merged
merged 10 commits into from Dec 5, 2018

Conversation

Projects
None yet
2 participants
@ZurKaltura
Copy link
Contributor

ZurKaltura commented Dec 4, 2018

No description provided.

@@ -35,3 +35,12 @@ permissionItem4.param4 =
permissionItem4.param5 =
permissionItem4.tags =
permissionItem4.permissions = -1>BATCH_BASE, -1>PARTNER_-1_GROUP_*_PERMISSION

permissionItem2.service = beacon_beacon

This comment has been minimized.

@MosheMaorKaltura

MosheMaorKaltura Dec 4, 2018

Contributor

rename to permissionItem5

{
private static $mapBetweenObjects = array();
public function getMapBetweenObjects()

This comment has been minimized.

@MosheMaorKaltura

MosheMaorKaltura Dec 4, 2018

Contributor

The entire code in this class is useless , you can just leave the skeleton and remove the var mapBetweenObjects and function getMapBetweenObjects

'kScheduledResourcePartnerEntitlementDecorator'
);
public static function getEntitlementFilterQueries()

This comment has been minimized.

@MosheMaorKaltura

MosheMaorKaltura Dec 4, 2018

Contributor

Move to base class

{
$scheduledResourceQuery = array();
$allowedSearchTypes = ESearchEntryItem::getAllowedSearchTypesForField();
$queryAttributes->getQueryHighlightsAttributes()->setScopeToGlobal();

This comment has been minimized.

@MosheMaorKaltura

MosheMaorKaltura Dec 4, 2018

Contributor

remove

$subQuery = kESearchQueryManager::getRangeQuery($this, $this->getFieldName(), $allowedSearchTypes, $queryAttributes);
break;
default:
KalturaLog::log("Undefined item type[" . $this->getItemType() . "]");

This comment has been minimized.

@MosheMaorKaltura

MosheMaorKaltura Dec 4, 2018

Contributor

Throw exception

public function __construct()
{
parent::__construct();
$beaconElasticConfig = kConf::get('beacon', 'elastic');

This comment has been minimized.

@MosheMaorKaltura

MosheMaorKaltura Dec 4, 2018

Contributor

Handle case that map does not exist, throw exception

public function doSearch(ESearchOperator $eSearchOperator, $statuses = array(), $objectId, kPager $pager = null,
ESearchOrderBy $order = null)
{
elasticSearchUtils::$shouldLower = false;

This comment has been minimized.

@MosheMaorKaltura

MosheMaorKaltura Dec 4, 2018

Contributor

Try to avoid it by using argument

return $result;
}
private function initEntitlement()

This comment has been minimized.

@MosheMaorKaltura

MosheMaorKaltura Dec 4, 2018

Contributor

Protected

return;
{
return;
}

This comment has been minimized.

@MosheMaorKaltura

MosheMaorKaltura Dec 4, 2018

Contributor

Indentation

return;
{
return;
}

This comment has been minimized.

@MosheMaorKaltura

MosheMaorKaltura Dec 4, 2018

Contributor

Indentation

@ZurKaltura ZurKaltura merged commit d47506b into Naos-14.10.0 Dec 5, 2018

@ZurKaltura ZurKaltura deleted the Naos-14.9.0-PLAT-9384 branch Dec 5, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment