PLAT-10320:adding monitorUsageEqual to kalturaPartnerfilter

Amirhalfon1 · Mar 3, 2020 · ae5ce73 · ae5ce73
1 parent 5d42423
commit ae5ce73
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/alpha/apps/kaltura/lib/model/objectfilters/partnerFilter.class.php b/alpha/apps/kaltura/lib/model/objectfilters/partnerFilter.class.php
@@ -34,6 +34,7 @@ public function init ()
 		    "_notin_id",
 			"_partner_permissions_exist",
 			'_gte_created_at',
+			'_eq_monitor_usage'
 			) , NULL );
 
 		$this->allowed_order_fields = array ( "created_at" , "updated_at", "id", "name", "website", "admin_name", "admin_email", "status");

diff --git a/api_v3/lib/types/partner/KalturaPartner.php b/api_v3/lib/types/partner/KalturaPartner.php
@@ -391,6 +391,13 @@ class KalturaPartner extends KalturaObject implements IFilterable
 	 */
 	public $lastFreeTrialNotificationDay;
 
+	/**
+	 * @var int
+	 * @filter eq
+	 * @readonly
+	 */
+	public $monitorUsage;
+
 	private static $map_between_objects = array
 	(
 		'id' , 'name', 'website' => 'url1' , 'notificationUrl' => 'url2' , 'appearInSearch' , 'createdAt' , 'adminName' , 'adminEmail' ,
@@ -400,7 +407,8 @@ class KalturaPartner extends KalturaObject implements IFilterable
 		'firstName' , 'lastName' , 'country' , 'state' , 'publishersQuota', 'partnerGroupType', 'defaultEntitlementEnforcement', 
 		'defaultDeliveryType', 'defaultEmbedCodeType', 'deliveryTypes', 'embedCodeTypes',  'templatePartnerId', 'ignoreSeoLinks',
 		'host', 'cdnHost', 'isFirstLogin', 'logoutUrl', 'partnerParentId','crmId', 'referenceId', 'timeAlignedRenditions','eSearchLanguages',
-		'publisherEnvironmentType', 'ovpEnvironmentUrl', 'ottEnvironmentUrl', 'authenticationType', 'extendedFreeTrailExpiryReason', 'extendedFreeTrailExpiryDate', 'extendedFreeTrail', 'extendedFreeTrailEndsWarning', 'eightyPercentWarning', 'usageLimitWarning', 'lastFreeTrialNotificationDay'
+		'publisherEnvironmentType', 'ovpEnvironmentUrl', 'ottEnvironmentUrl', 'authenticationType', 'extendedFreeTrailExpiryReason', 'extendedFreeTrailExpiryDate',
+		'extendedFreeTrail', 'extendedFreeTrailEndsWarning', 'eightyPercentWarning', 'usageLimitWarning', 'lastFreeTrialNotificationDay','monitorUsage'
 	);
 
 	public function getMapBetweenObjects ( )
@@ -438,6 +446,7 @@ public function doFromObject($partner, KalturaDetachedResponseProfile $responseP
 			$this->eightyPercentWarning = null;
 			$this->usageLimitWarning = null;
 			$this->lastFreeTrialNotificationDay = null;
+			$this->monitorUsage = null;
 		}
 	}
 

diff --git a/api_v3/lib/types/partner/filters/base/KalturaPartnerBaseFilter.php b/api_v3/lib/types/partner/filters/base/KalturaPartnerBaseFilter.php
@@ -25,6 +25,7 @@ abstract class KalturaPartnerBaseFilter extends KalturaFilter
 		"partnerNameDescriptionWebsiteAdminNameAdminEmailLike" => "_like_partner_name-description-website-admin_name-admin_email",
 		"createdAtGreaterThanOrEqual" => "_gte_created_at",
 		"idGreaterThan" => "_gt_id",
+		'monitorUsageEqual' => '_eq_monitor_usage',
 	);
 
 	static private $order_by_map = array
@@ -139,4 +140,9 @@ public function getOrderByMap()
 	 * @var int
 	 */
 	public $idGreaterThan;
+
+	/**
+	 * @var int
+	 */
+	public $monitorUsageEqual;
 }
diff --git a/batch/batches/StorageUpdate/KAsyncStorageUpdate.php b/batch/batches/StorageUpdate/KAsyncStorageUpdate.php
@@ -101,6 +101,7 @@ public function getSystemPartnerList($lowPartnerWaterMark, $pageIndex, $bulkSize
 		$filter->partnerPackageIn = KAsyncStorageUpdateUtils::PARTNER_PACKAGE_FREE .','. KAsyncStorageUpdateUtils::PARTNER_PACKAGE_INTERNAL_TRIAL;
 		$filter->statusIn = KalturaPartnerStatus::ACTIVE .','. KalturaPartnerStatus::BLOCKED .','. KalturaPartnerStatus::FULL_BLOCK;
 		$filter->idGreaterThan = $lowPartnerWaterMark;
+		$filter->monitorUsageEqual = 1;
 		$filter->orderBy = '+id';
 
 		$pager = new KalturaFilterPager();