WIP: Added command to purge orphaned checkout acceptances

app/Console/Commands/PurgeOrphanedCheckoutAcceptances.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\CheckoutAcceptance;
+use Illuminate\Console\Command;
+
+class PurgeOrphanedCheckoutAcceptances extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:purge-orphaned-checkout-acceptances';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Deletes pending checkout acceptances where the user has been deleted.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $orphanedAcceptances = CheckoutAcceptance::pending()
+            ->whereDoesntHave('assignedTo')
+            ->get();
+
+        if ($orphanedAcceptances->isEmpty()) {
+            $this->info('No orphaned checkout acceptances found.');
+
+            return 0;
+        }
+
+        $this->info('Found ' . $orphanedAcceptances->count() . ' orphaned checkout acceptances.');
+
+        $this->table(['ID', 'Checkoutable Type', 'Assigned To ID'], $orphanedAcceptances->map(function ($acceptance) {
+            return [
+                $acceptance->id,
+                $acceptance->checkoutable_type,
+                $acceptance->assigned_to_id,
+            ];
+        }));
+
+        if (!$this->confirm('Do you wish to permanently delete these ' . $orphanedAcceptances->count() . ' orphaned checkout acceptances?')) {
+            $this->info('Aborting.');
+
+            return 0;
+        }
+
+        $orphanedAcceptances->each->forceDelete();
+
+        $this->info('Orphaned checkout acceptances have been deleted.');
+
+        return 0;
+    }
+}

app/Http/Controllers/ReportsController.php

@@ -17,8 +17,10 @@
 use App\Models\License;
 use App\Models\ReportTemplate;
 use App\Models\Setting;
+use App\Models\User;
 use App\Notifications\CheckoutAssetNotification;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -1117,9 +1119,11 @@ public function getAssetAcceptanceReport($deleted = false) : View
                 'checkoutable' => function (MorphTo $query) {
                     $query->morphWith([
                         AssetModel::class => ['model'],
-                        Company::class => ['company'],
                         Asset::class => ['assignedTo'],
-                    ])->with('model.category');
+                    ])->with([
+                        'company',
+                        'model.category',
+                    ])->where('assigned_type', User::class);
                 },
                 'assignedTo' => function($query){
                          $query->withTrashed();

app/Http/Controllers/Users/UsersController.php

@@ -332,6 +332,7 @@ public function destroy(DeleteUserRequest $request, $id)
             $this->authorize('delete', $user);
 
             if ($user->delete()) {
+                $user->pendingCheckoutAcceptances()->delete();
                 return redirect()->route('users.index')->with('success', trans('admin/users/message.success.delete'));
             }
         }

app/Models/User.php

@@ -521,6 +521,11 @@ public function acceptances()
             ->orderBy('created_at', 'desc');
     }
 
+    public function pendingCheckoutAcceptances()
+    {
+        return $this->hasMany(CheckoutAcceptance::class, 'assigned_to_id')->pending();
+    }
+
     /**
      * Establishes the user -> requested assets relationship
      *

database/factories/CheckoutAcceptanceFactory.php

@@ -5,6 +5,8 @@
 use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
+use App\Models\Consumable;
+use App\Models\LicenseSeat;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -31,7 +33,7 @@ public function configure(): static
                 $this->createdAssociatedActionLogEntry($acceptance);
             }
 
-            if ($acceptance->checkoutable instanceof Asset && $acceptance->assignedTo instanceof User) {
+            if ($acceptance->checkoutable instanceof Asset && $acceptance->assignedTo instanceof User && !$acceptance->isPending()) {
                 $acceptance->checkoutable->update([
                     'assigned_to' => $acceptance->assigned_to_id,
                     'assigned_type' => get_class($acceptance->assignedTo),
@@ -48,6 +50,30 @@ public function forAccessory()
         ]);
     }
 
+    public function forAsset()
+    {
+        return $this->state([
+            'checkoutable_type' => Asset::class,
+            'checkoutable_id' => Asset::factory(),
+        ]);
+    }
+
+    public function forConsumable()
+    {
+        return $this->state([
+            'checkoutable_type' => Consumable::class,
+            'checkoutable_id' => Consumable::factory(),
+        ]);
+    }
+
+    public function forLicenseSeat()
+    {
+        return $this->state([
+            'checkoutable_type' => LicenseSeat::class,
+            'checkoutable_id' => LicenseSeat::factory(),
+        ]);
+    }
+
     public function pending()
     {
         return $this->state([

tests/Feature/Console/PurgeOrphanedCheckoutAcceptancesTest.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Tests\Feature\Console;
+
+use App\Models\CheckoutAcceptance;
+use Tests\TestCase;
+
+class PurgeOrphanedCheckoutAcceptancesTest extends TestCase
+{
+    public function testPurgeOrphanedCheckoutAcceptances()
+    {
+        [$pendingForAccessory, $pendingForAccessoryWithDeletedUser] = CheckoutAcceptance::factory()->count(2)->pending()->forAccessory()->create();
+        [$pendingForAsset, $pendingForAssetWithDeletedUser] = CheckoutAcceptance::factory()->count(2)->pending()->forAsset()->create();
+        [$pendingForConsumable, $pendingForConsumableWithDeletedUser] = CheckoutAcceptance::factory()->count(2)->pending()->forConsumable()->create();
+        [$pendingForLicenseSeat, $pendingForLicenseSeatWithDeletedUser] = CheckoutAcceptance::factory()->count(2)->pending()->forLicenseSeat()->create();
+
+        [$acceptedForAccessory, $acceptedForAccessoryWithDeletedUser] = CheckoutAcceptance::factory()->count(2)->accepted()->forAccessory()->create();
+        [$acceptedForAsset, $acceptedForAssetWithDeletedUser] = CheckoutAcceptance::factory()->count(2)->accepted()->forAsset()->create();
+        [$acceptedForConsumable, $acceptedForConsumableWithDeletedUser] = CheckoutAcceptance::factory()->count(2)->accepted()->forConsumable()->create();
+        [$acceptedForLicenseSeat, $acceptedForLicenseSeatWithDeletedUser] = CheckoutAcceptance::factory()->count(2)->accepted()->forLicenseSeat()->create();
+
+        $this->assertDatabaseCount('checkout_acceptances', 16);
+
+        $pendingForAccessoryWithDeletedUser->assignedTo->delete();
+        $pendingForAssetWithDeletedUser->assignedTo->delete();
+        $pendingForConsumableWithDeletedUser->assignedTo->forceDelete();
+        $pendingForLicenseSeatWithDeletedUser->assignedTo->forceDelete();
+
+        $acceptedForAccessoryWithDeletedUser->assignedTo->delete();
+        $acceptedForAssetWithDeletedUser->assignedTo->delete();
+        $acceptedForConsumableWithDeletedUser->assignedTo->forceDelete();
+        $acceptedForLicenseSeatWithDeletedUser->assignedTo->forceDelete();
+
+        $this->assertDatabaseCount('checkout_acceptances', 16);
+
+        $this->artisan('snipeit:purge-orphaned-checkout-acceptances')
+            ->expectsConfirmation('Do you wish to permanently delete these 4 orphaned checkout acceptances?', 'yes')
+            ->assertSuccessful();
+
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $pendingForAccessory->id]);
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $pendingForAsset->id]);
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $pendingForConsumable->id]);
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $pendingForLicenseSeat->id]);
+
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $acceptedForAccessory->id]);
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $acceptedForAsset->id]);
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $acceptedForConsumable->id]);
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $acceptedForLicenseSeat->id]);
+
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $acceptedForAccessoryWithDeletedUser->id]);
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $acceptedForAssetWithDeletedUser->id]);
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $acceptedForConsumableWithDeletedUser->id]);
+        $this->assertDatabaseHas('checkout_acceptances', ['id' => $acceptedForLicenseSeatWithDeletedUser->id]);
+
+        $this->assertDatabaseMissing('checkout_acceptances', ['id' => $pendingForAccessoryWithDeletedUser->id]);
+        $this->assertDatabaseMissing('checkout_acceptances', ['id' => $pendingForAssetWithDeletedUser->id]);
+        $this->assertDatabaseMissing('checkout_acceptances', ['id' => $pendingForConsumableWithDeletedUser->id]);
+        $this->assertDatabaseMissing('checkout_acceptances', ['id' => $pendingForLicenseSeatWithDeletedUser->id]);
+
+        $this->assertDatabaseCount('checkout_acceptances', 12);
+    }
+}

tests/Feature/Users/Ui/DeleteUserTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Feature\Users\Ui;
 
+use App\Models\CheckoutAcceptance;
 use Tests\TestCase;
 use App\Models\LicenseSeat;
 use App\Models\Location;
@@ -159,20 +160,6 @@ public function testDisallowUserDeletionIfStillHaveLicenses()
     }
 
 
-    public function testAllowUserDeletionIfNotManagingLocations()
-    {
-        $manager = User::factory()->create();
-        $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())->assertTrue($manager->isDeletable());
-
-        $response = $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
-            ->delete(route('users.destroy', $manager->id))
-            ->assertStatus(302)
-            ->assertRedirect(route('users.index'));
-
-        $this->followRedirects($response)->assertSee('Success');
-
-    }
-
     public function testDisallowUserDeletionIfNoDeletePermissions()
     {
         $manager = User::factory()->create();
@@ -202,7 +189,6 @@ public function testDisallowUserDeletionIfTheyStillHaveAssets()
         $this->followRedirects($response)->assertSee('Error');
     }
 
-
     public function testUsersCannotDeleteThemselves()
     {
         $manager = User::factory()->deleteUsers()->viewUsers()->create();
@@ -216,5 +202,32 @@ public function testUsersCannotDeleteThemselves()
         $this->followRedirects($response)->assertSee('Error');
     }
 
+    public function testCanDeleteUser()
+    {
+        $user = User::factory()->create();
 
+        $response = $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
+            ->delete(route('users.destroy', $user->id))
+            ->assertStatus(302)
+            ->assertRedirect(route('users.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+
+        $this->assertSoftDeleted($user);
+    }
+
+    public function testUsersUnacceptedCheckoutAcceptancesAreSoftDeletedWhenUserIsDeleted()
+    {
+        $user = User::factory()->create();
+
+        $checkoutAcceptance = CheckoutAcceptance::factory()
+            ->pending()
+            ->for($user, 'assignedTo')
+            ->create();
+
+        $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
+            ->delete(route('users.destroy', $user->id));
+
+        $this->assertSoftDeleted($checkoutAcceptance);
+    }
 }

tests/Feature/Users/Ui/RestoreUserTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Feature\Users\Ui;
+
+use Tests\TestCase;
+
+class RestoreUserTest extends TestCase
+{
+    public function testPermissionNeededToRestoreUser()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testCanRestoreUser()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testRestoringUserDoesNotRestorePendingCheckoutAcceptances()
+    {
+        $this->markTestIncomplete();
+    }
+}

tests/Unit/UserTest.php

@@ -1,6 +1,7 @@
 <?php
 namespace Tests\Unit;
 
+use App\Models\CheckoutAcceptance;
 use App\Models\User;
 use Tests\TestCase;
 
@@ -103,4 +104,22 @@ public function testFirstNameLastInitial()
         $user = User::generateFormattedNameFromFullName($fullname, 'firstnamelastinitial');
         $this->assertEquals($expected_username, $user['username']);
     }
+
+    public function testPendingCheckoutAcceptancesRelationship()
+    {
+        $user = User::factory()->create();
+
+        $acceptedAcceptance = CheckoutAcceptance::factory()
+            ->accepted()
+            ->for($user, 'assignedTo')
+            ->create();
+
+        $pendingAcceptance = CheckoutAcceptance::factory()
+            ->pending()
+            ->for($user, 'assignedTo')
+            ->create();
+
+        $this->assertFalse($user->pendingCheckoutAcceptances->contains($acceptedAcceptance));
+        $this->assertTrue($user->pendingCheckoutAcceptances->contains($pendingAcceptance));
+    }
 }