mirror of
https://github.com/archtechx/tenancy.git
synced 2026-06-21 07:24:05 +00:00
> Minor breaking change: Pending tenants would previously go through the creation pipeline as *not* pending and would only be marked as pending after full creation. Now, pending tenants go through the creation process with pending_since set from the start. Pending tenants aren't getting their `pending_since` set until they're created completely (e.g. their DB was created, migrated and seeded -- first, the tenant is created fully, and only after that, the tenant is updated to have `pending_since`). This is a problem if someone wants to e.g. add a job to the `DatabaseCreated` job pipeline that would check `$this->tenant->pending()`. Since at the point of `DatabaseCreated`, the tenant's `pending_since` isn't set yet, `$this->tenant->pending()` returns `false`, even for tenants created using `createPending()`. So instead of letting the pending tenant get fully created, and only after that, setting its `pending_since` (using `update()`), we now set `pending_since` in `create()`. `CreatingPendingTenant` is now dispatched from the `static::creating` hook, and `PendingTenantCreated` is dispatched from `static::created` for consistency. Setting `pending_since` right in `create()` made the `MigrateDatabase` and `SeedDatabase` jobs exclude the pending tenants during their creation if the `tenancy.pending.include_in_queries` config was set to `false` -- in that case, these jobs would never migrate or seed the databases of pending tenants. So these jobs now pass `--with-pending` to their underlying commands, with the value set in their `$includePending` static property (`true` by default). This overrides the `tenancy.pending.include_in_queries` config -- unless the `$includePending` properties are set to `false`, these jobs will always include pending tenants. The `--with-pending` tenant command option originally worked just to opt-in for including pending tenants in the command. Now, `--with-pending` can accept values (`true`/`1` or `false`/`0`), so e.g. - `tenants:run foo` with `--with-pending`/`--with-pending=true`/`--with-pending=1` includes pending tenants - `tenants:run foo` with `--with-pending=false`/`--with-pending=0` **excludes** pending tenants (also `--with-pending=foobar` -- invalid input, considered `false`) Passing `--with-pending` makes the command bypass the `tenancy.pending.include_in_queries` config (so e.g. if `tenancy.pending.include_in_queries` is set to `true`, and `--with-pending=false` is passed to a command, the command will exclude pending tenants). When `--with-pending` is not passed, the command will include or exclude pending tenants based on the `tenancy.pending.include_in_queries` config. --------- Co-authored-by: Copilot <copilot@github.com> Co-authored-by: Samuel Štancl <samuel@archte.ch>
126 lines
3.9 KiB
PHP
126 lines
3.9 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace Stancl\Tenancy\Database\Concerns;
|
|
|
|
use Carbon\Carbon;
|
|
use Illuminate\Database\Eloquent\Model;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Stancl\Tenancy\Contracts\Tenant;
|
|
use Stancl\Tenancy\Events\CreatingPendingTenant;
|
|
use Stancl\Tenancy\Events\PendingTenantCreated;
|
|
use Stancl\Tenancy\Events\PendingTenantPulled;
|
|
use Stancl\Tenancy\Events\PullingPendingTenant;
|
|
|
|
/**
|
|
* @property ?Carbon $pending_since
|
|
*
|
|
* @method static static|\Illuminate\Database\Eloquent\Builder<static>|\Illuminate\Database\Query\Builder withPending(bool $withPending = true)
|
|
* @method static static|\Illuminate\Database\Eloquent\Builder<static>|\Illuminate\Database\Query\Builder onlyPending()
|
|
* @method static static|\Illuminate\Database\Eloquent\Builder<static>|\Illuminate\Database\Query\Builder withoutPending()
|
|
*/
|
|
trait HasPending
|
|
{
|
|
public static string $pendingSinceCast = 'timestamp';
|
|
|
|
/** Boot the trait. */
|
|
public static function bootHasPending(): void
|
|
{
|
|
static::addGlobalScope(new PendingScope());
|
|
|
|
static::creating(function (self $tenant): void {
|
|
if ($tenant->pending()) {
|
|
event(new CreatingPendingTenant($tenant));
|
|
}
|
|
});
|
|
|
|
static::created(function (self $tenant): void {
|
|
if ($tenant->pending()) {
|
|
event(new PendingTenantCreated($tenant));
|
|
}
|
|
});
|
|
}
|
|
|
|
/** Initialize the trait. */
|
|
public function initializeHasPending(): void
|
|
{
|
|
$this->casts['pending_since'] = static::$pendingSinceCast;
|
|
}
|
|
|
|
/** Determine if the model instance is in a pending state. */
|
|
public function pending(): bool
|
|
{
|
|
return ! is_null($this->pending_since);
|
|
}
|
|
|
|
/**
|
|
* Create a pending tenant.
|
|
*
|
|
* @param array<string, mixed> $attributes
|
|
*/
|
|
public static function createPending(array $attributes = []): Model&Tenant
|
|
{
|
|
return static::create(array_merge(
|
|
static::getPendingAttributes($attributes),
|
|
$attributes,
|
|
['pending_since' => now()->timestamp],
|
|
));
|
|
}
|
|
|
|
/**
|
|
* Attributes to be set when a pending tenant is initially created.
|
|
*
|
|
* @param array<string, mixed> $attributes The attributes passed to createPending() (will be merged with the returned array)
|
|
* @return array<string, mixed>
|
|
*/
|
|
public static function getPendingAttributes(array $attributes): array
|
|
{
|
|
return [];
|
|
}
|
|
|
|
/**
|
|
* Pull a pending tenant from the pool or create a new one if the pool is empty.
|
|
*
|
|
* @param array $attributes The attributes to set on the tenant.
|
|
*/
|
|
public static function pullPending(array $attributes = []): Model&Tenant
|
|
{
|
|
/** @var Model&Tenant $pendingTenant */
|
|
$pendingTenant = static::pullPendingFromPool(true, $attributes);
|
|
|
|
return $pendingTenant;
|
|
}
|
|
|
|
/**
|
|
* Try to pull a tenant from the pool of pending tenants.
|
|
*
|
|
* @param bool $firstOrCreate If true, a tenant will be *created* if the pool is empty. Otherwise null is returned.
|
|
* @param array $attributes The attributes to set on the tenant.
|
|
*/
|
|
public static function pullPendingFromPool(bool $firstOrCreate = false, array $attributes = []): ?Tenant
|
|
{
|
|
$tenant = DB::transaction(function () use ($attributes): ?Tenant {
|
|
/** @var (Model&Tenant)|null $tenant */
|
|
$tenant = static::onlyPending()->first();
|
|
|
|
if ($tenant !== null) {
|
|
event(new PullingPendingTenant($tenant));
|
|
$tenant->update(array_merge($attributes, [
|
|
'pending_since' => null,
|
|
]));
|
|
}
|
|
|
|
return $tenant;
|
|
});
|
|
|
|
if ($tenant === null) {
|
|
return $firstOrCreate ? static::create($attributes) : null;
|
|
}
|
|
|
|
// Only triggered if a tenant that was pulled from the pool is returned
|
|
event(new PendingTenantPulled($tenant));
|
|
|
|
return $tenant;
|
|
}
|
|
}
|