archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-06 01:14:03 +00:00
Code Activity

Code and comment style improvements

Browse source
This commit is contained in:
lukinovec 2022-07-22 09:24:42 +02:00 • committed by GitHub
parent 1e75221e12
commit f4136f697c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Database/Concerns/HasPending.php
View file

@ -47,7 +47,7 @@ trait HasPending
*/
public function pending()
{
return !is_null($this->pending_since);
return ! is_null($this->pending_since);
}
public static function createPending($attributes = []): void
@ -56,8 +56,8 @@ trait HasPending
event(new CreatingPendingTenant($tenant));
// We add the pending value only after the model has then been created.
// this ensures the model is not marked as pending until the migrations, seeders, etc. are done
// Add the pending value only after creating the model
// To ensure it's not marked as pending until finishing running the migrations, seeders, etc.
$tenant->update([
'pending_since' => now()->timestamp
]);
@ -67,14 +67,14 @@ trait HasPending
public static function pullPendingTenant(bool $firstOrCreate = false): ?Tenant
{
if (!static::onlyPending()->exists()) {
if (!$firstOrCreate) {
if (! static::onlyPending()->exists()) {
if (! $firstOrCreate) {
return null;
}
static::createPending();
}
// At this point we can guarantee a pending tenant is free and can be called.
// At this point, we can guarantee a pending tenant is free and can be called
$tenant = static::onlyPending()->first();
event(new PullingPendingTenant($tenant));

11
src/Database/Concerns/PendingScope.php
View file

@ -27,7 +27,7 @@ class PendingScope implements Scope
*/
public function apply(Builder $builder, Model $model)
{
$builder->when(!config('tenancy.pending.include_in_queries'), function (Builder $builder){
$builder->when(! config('tenancy.pending.include_in_queries'), function (Builder $builder){
$builder->whereNull('data->pending_since');
});
}
@ -71,10 +71,8 @@ class PendingScope implements Scope
{
$builder->macro('withoutPending', function (Builder $builder) {
// Only use whereNull('data->pending_since') when Laravel 6 support is dropped
// Issue fixed in Laravel 7 https://github.com/laravel/framework/pull/32417
$builder->withoutGlobalScope($this)
->where('data->pending_since', 'like', 'null')
->whereNull('data->pending_since')
->orWhereNull('data');
return $builder;
@ -90,10 +88,7 @@ class PendingScope implements Scope
protected function addOnlyPending(Builder $builder)
{
$builder->macro('onlyPending', function (Builder $builder) {
// Use whereNotNull when Laravel 6 is dropped
// Issue fixed in Laravel 7 https://github.com/laravel/framework/pull/32417
$builder->withoutGlobalScope($this)->where('data->pending_since', 'not like', 'null');
$builder->withoutGlobalScope($this)->whereNotNull('data->pending_since');
return $builder;
});