archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 16:54:05 +00:00
Code Activity

Remove pending tenant clearing time constraints

Browse source
This commit is contained in:
lukinovec 2022-07-27 13:01:09 +02:00
parent 677fdb23b9
commit 6766237669
3 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
assets/config.php
View file

@ -52,16 +52,6 @@ return [
* This depends on the volume of tenants you're creating. * This depends on the volume of tenants you're creating.
*/ */
'count' => env('TENANCY_PENDING_COUNT', 5), 'count' => env('TENANCY_PENDING_COUNT', 5),
/**
* You can define time constraints for automatically deleting unused
* pending tenants (schedule the `tenancy:pending-clear` command to make this work automatically).
*
* If both values are set to null, the time constraints won't be set and all pending tenants will be deleted.
*/
'older_than_days' => env('TENANCY_PENDING_OLDER_THAN_DAYS', null),
'older_than_hours' => env('TENANCY_PENDING_OLDER_THAN_HOURS', null),
], ],
/** /**

8
src/Commands/ClearPendingTenants.php
View file

@ -16,8 +16,8 @@ class ClearPendingTenants extends Command
*/ */
protected $signature = 'tenants:pending-clear protected $signature = 'tenants:pending-clear
{--all : Override the default settings and deletes all pending tenants} {--all : Override the default settings and deletes all pending tenants}
{--older-days= : Deletes all pending tenants older than the amount of days} {--older-than-days= : Deletes all pending tenants older than the amount of days}
{--older-hours= : Deletes all pending tenants older than the amount of hours}'; {--older-than-hours= : Deletes all pending tenants older than the amount of hours}';
/** /**
* The console command description. * The console command description.
@ -39,11 +39,11 @@ class ClearPendingTenants extends Command
// Skip the time constraints if the 'all' option is given // Skip the time constraints if the 'all' option is given
if (! $this->option('all')) { if (! $this->option('all')) {
if ($olderThanDays = $this->option('older-days') ?? config('tenancy.pending.older_than_days')) { if ($olderThanDays = $this->option('older-than-days')) {
$expirationDate->subDays($olderThanDays); $expirationDate->subDays($olderThanDays);
} }
if ($olderThanHours = $this->option('older-hours') ?? config('tenancy.pending.older_than_hours')) { if ($olderThanHours = $this->option('older-than-hours')) {
$expirationDate->subHours($olderThanHours); $expirationDate->subHours($olderThanHours);
} }
} }

4
tests/PendingTenantsTest.php
View file

@ -72,13 +72,11 @@ class PendingTenantsTest extends TestCase
Artisan::call(CreatePendingTenants::class); Artisan::call(CreatePendingTenants::class);
config(['tenancy.pending.older_than_days' => 2]);
tenancy()->model()->query()->onlyPending()->first()->update([ tenancy()->model()->query()->onlyPending()->first()->update([
'pending_since' => now()->subDays(5)->timestamp 'pending_since' => now()->subDays(5)->timestamp
]); ]);
Artisan::call(ClearPendingTenants::class); Artisan::call('tenants:pending-clear --older-than-days=2');
$this->assertCount(1, Tenant::onlyPending()->get()); $this->assertCount(1, Tenant::onlyPending()->get());
} }