mirror of
https://github.com/archtechx/tenancy.git
synced 2026-06-21 10:24:03 +00:00
Add --skip-tenants option to HasTenantOptions (#1436)
Adds a --skip-tenants option to all tenant artisan commands (`tenants:run`, `tenants:migrate`, `tenants:rollback`, `tenants:seed`, `tenants:up`, `tenants:down`). The option is the complement of the existing `--tenants` option instead of specifying which tenants to include, you specify which to exclude. --------- Co-authored-by: Jimish Gamit <unique.jimish@gmail.com> Co-authored-by: Samuel Stancl <samuel@archte.ch> Co-authored-by: lukinovec <lukinovec@gmail.com>
This commit is contained in:
parent
dfb0e1ad66
commit
652bc987ce
3 changed files with 57 additions and 4 deletions
|
|
@ -10,15 +10,16 @@ use Stancl\Tenancy\Database\Concerns\PendingScope;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
|
||||
/**
|
||||
* Adds 'tenants' and 'with-pending' options.
|
||||
* Adds 'tenants', 'skip-tenants', and 'with-pending' options.
|
||||
*/
|
||||
trait HasTenantOptions
|
||||
{
|
||||
protected function getOptions()
|
||||
{
|
||||
return array_merge([
|
||||
new InputOption('tenants', null, InputOption::VALUE_IS_ARRAY|InputOption::VALUE_OPTIONAL, 'The tenants to run this command for. Leave empty for all tenants', null),
|
||||
new InputOption('with-pending', null, InputOption::VALUE_OPTIONAL, 'Include pending tenants in query if true/1, exclude if false/0. Defaults to the tenancy.pending.include_in_queries config value.'),
|
||||
new InputOption('tenants', null, InputOption::VALUE_IS_ARRAY|InputOption::VALUE_OPTIONAL, 'The tenants to run this command for. Leave empty for all tenants', null),
|
||||
new InputOption('skip-tenants', null, InputOption::VALUE_IS_ARRAY|InputOption::VALUE_OPTIONAL, 'The tenants to skip when running this command', null),
|
||||
new InputOption('with-pending', null, InputOption::VALUE_OPTIONAL, 'Include pending tenants in query if true/1, exclude if false/0. Defaults to the tenancy.pending.include_in_queries config value.'),
|
||||
], parent::getOptions());
|
||||
}
|
||||
|
||||
|
|
@ -42,6 +43,9 @@ trait HasTenantOptions
|
|||
->when($this->option('tenants'), function ($query) {
|
||||
$query->whereIn(tenancy()->model()->getTenantKeyName(), $this->option('tenants'));
|
||||
})
|
||||
->when($this->option('skip-tenants'), function ($query) {
|
||||
$query->whereNotIn(tenancy()->model()->getTenantKeyName(), $this->option('skip-tenants'));
|
||||
})
|
||||
->when(tenancy()->model()::hasGlobalScope(PendingScope::class), function ($query) {
|
||||
$includePending = $this->input->hasParameterOption('--with-pending')
|
||||
? filter_var($this->option('with-pending') ?? true, FILTER_VALIDATE_BOOLEAN)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue