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

Update calculate percent function #30

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
composer.lock
phpunit.xml
/vendor/
.idea
30 changes: 25 additions & 5 deletions src/Feature.php
Original file line number Diff line number Diff line change
Expand Up @@ -216,16 +216,20 @@ public function clear()
* @param array $requestParameters
* @return bool
*/
public function isActive(Rollout $rollout, RolloutUserInterface $user = null, array $requestParameters = array())
{
public function isActive(
Rollout $rollout,
RolloutUserInterface $user = null,
array $users = array(),
array $requestParameters = array()
) {
if (null == $user) {
return $this->isParamInRequestParams($requestParameters)
|| $this->percentage == 100
|| $this->isInActiveGroup($rollout);
}

return $this->isParamInRequestParams($requestParameters) ||
$this->isUserInPercentage($user) ||
$this->isUserInPercentage($user, $users) ||
$this->isUserInActiveUsers($user) ||
$this->isInActiveGroup($rollout, $user);
}
Expand Down Expand Up @@ -262,9 +266,25 @@ private function isParamInRequestParams(array $requestParameters)
* @param RolloutUserInterface $user
* @return bool
*/
private function isUserInPercentage(RolloutUserInterface $user)
private function isUserInPercentage(RolloutUserInterface $user, array $users)
{
return abs(crc32($user->getRolloutIdentifier()) % 100) < $this->percentage;
if ($this->percentage === 100) {
return true;
}

if ($this->percentage === 0) {
return false;
}

$limit = ceil(($this->percentage / 100) * count($users));
$users = array_slice($users, 0, $limit);
foreach ($users as $userData) {
if ($userData['slug'] === $user->getRolloutIdentifier()) {
return true;
}
}

return false;
}

/**
Expand Down
12 changes: 8 additions & 4 deletions src/Rollout.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,15 @@ public function defineGroup($group, \Closure $closure)
* @param array $requestParameters
* @return bool
*/
public function isActive($feature, RolloutUserInterface $user = null, array $requestParameters = array())
{
public function isActive(
$feature,
RolloutUserInterface $user = null,
array $users = array(),
array $requestParameters = array()
) {
$feature = $this->get($feature);

return $feature ? $feature->isActive($this, $user, $requestParameters) : false;
return $feature && $feature->isActive($this, $user, $users, $requestParameters);
}

/**
Expand Down Expand Up @@ -301,7 +305,7 @@ private function featuresKey()
/**
* @param Feature $feature
*/
protected function save(Feature $feature)
public function save(Feature $feature)
{
$name = $feature->getName();
$this->storage->set($this->key($name), $feature->serialize());
Expand Down