Two more command tests complete

Author: TomHAnderson

src/Console/Command/DeleteScope.php

@@ -2,32 +2,41 @@
 
 namespace ApiSkeletons\Laravel\Doctrine\ApiKey\Console\Command;
 
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\DuplicateName;
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\InvalidName;
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\ScopeHasApiKeys;
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Service\ApiKeyService;
 use Illuminate\Console\Command;
 
 final class DeleteScope extends Command
 {
+    private ApiKeyService $apiKeyService;
+
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'apikey:scope:delete {scopeName}';
+    protected $signature = 'apikey:scope:delete {name}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Delete a scope for ApiKeys';
+    protected $description = 'Delete an ApiKey Scope (Delete a scope, not a relationship)';
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(ApiKeyService $apiKeyService)
     {
         parent::__construct();
+
+        $this->apiKeyService = $apiKeyService;
     }
 
     /**
@@ -37,6 +46,32 @@ public function __construct()
      */
     public function handle()
     {
-        // $drip->send(User::find($this->argument('user')));
+        $name = $this->argument('name');
+
+        $scopeRepository = $this->apiKeyService->getEntityManager()
+            ->getRepository(Scope::class);
+
+        $scope = $scopeRepository->findOneBy([
+            'name' => $name,
+        ]);
+
+        if (! $scope) {
+            $this->error('Cannot find scope with name: ' . $name);
+
+            return 1;
+        }
+
+        try {
+            $scopeRepository->delete($scope);
+            $this->apiKeyService->getEntityManager()->flush();
+        } catch (ScopeHasApiKeys $e) {
+            $this->error($e->getMessage());
+
+            return 1;
+        }
+
+        $this->info('Scope has been deleted');
+
+        return 0;
     }
 }

src/Console/Command/GenerateScope.php

@@ -52,7 +52,7 @@ public function handle()
             ->getRepository(Scope::class);
 
         try {
-            $scopeRepository->generate($name);
+            $scope = $scopeRepository->generate($name);
         } catch (DuplicateName $e) {
             $this->error($e->getMessage());
 
@@ -63,16 +63,8 @@ public function handle()
             return 1;
         }
 
-
-
-        if (! $apiKey) {
-            $this->error('Invalid apiKey name');
-
-            return 1;
-        }
-
-        $headers = ['name', 'key', 'status'];
-        $rows = [[$apiKey->getName(), $apiKey->getKey(), $apiKey->getIsActive() ? 'active': 'deactivated']];
+        $headers = ['name', 'apiKey count'];
+        $rows = [[$scope->getName(), sizeof($scope->getApiKeys())]];
 
         $this->table($headers, $rows);
 

src/Exception/ScopeHasApiKeys.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace ApiSkeletons\Laravel\Doctrine\ApiKey\Exception;
+
+use Exception;
+
+class ScopeHasApiKeys extends Exception
+{
+
+}

src/Repository/ScopeRepository.php

@@ -5,6 +5,7 @@
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\DuplicateName;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\InvalidName;
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\ScopeHasApiKeys;
 use DateTime;
 use Doctrine\ORM\EntityRepository;
 use Exception;
@@ -45,7 +46,7 @@ public function canDelete(Scope $scope): bool
     public function delete(Scope $scope): Scope|bool
     {
         if (! $this->canDelete($scope)) {
-            return false;
+            throw new ScopeHasApiKeys('Cannot delete scope because it has ApiKeys assigned to it.');
         }
 
         $this->getEntityManager()->remove($scope);

test/Feature/Console/Command/DeleteScopeTest.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace ApiSkeletonsTest\Laravel\Doctrine\ApiKey\Feature\Console\Command;
+
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\ApiKey;
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\ScopeHasApiKeys;
+use ApiSkeletonsTest\Laravel\Doctrine\ApiKey\TestCase;
+use DateTime;
+
+final class DeleteScopeTest extends TestCase
+{
+    public function testDeleteScope(): void
+    {
+        $entityManager = app('em');
+        $this->createDatabase($entityManager);
+
+        $scopeRepository = $entityManager->getRepository(Scope::class);
+        $scope = $scopeRepository->generate('testing');
+        $entityManager->flush();
+
+        $this->artisan('apikey:scope:delete', [
+            'name' => $scope->getName(),
+        ])->assertExitCode(0);
+    }
+
+    public function testErrorOnInvalidName(): void
+    {
+        $entityManager = app('em');
+        $this->createDatabase($entityManager);
+
+        $this->artisan('apikey:scope:delete', [
+            'name' => 'invalid',
+        ])->assertExitCode(1);
+    }
+
+    public function testCannotDeleteScopeWithApiKeys(): void
+    {
+        $entityManager = $this->createDatabase(app('em'));
+        $apiKeyRepository = $entityManager->getRepository(ApiKey::class);
+        $scopeRepository = $entityManager->getRepository(Scope::class);
+        $apiKey = $apiKeyRepository->generate('testing');
+        $scope = $scopeRepository->generate('testing');
+        $entityManager->flush();
+
+        $apiKeyRepository->addScope($apiKey, $scope);
+        $entityManager->flush();
+
+        $this->artisan('apikey:scope:delete', [
+            'name' => $scope->getName(),
+        ])->assertExitCode(1);
+    }
+}

test/Feature/Console/Command/GenerateScopeTest.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace ApiSkeletonsTest\Laravel\Doctrine\ApiKey\Feature\Console\Command;
+
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
+use ApiSkeletonsTest\Laravel\Doctrine\ApiKey\TestCase;
+
+final class GenerateScopeTest extends TestCase
+{
+    public function testGenerateScope(): void
+    {
+        $this->createDatabase(app('em'));
+
+        $this->artisan('apikey:scope:generate', [
+            'name' => 'testing',
+        ])->assertExitCode(0);
+    }
+
+    public function testInvalidNameThrowsError(): void
+    {
+        $this->createDatabase(app('em'));
+
+        $this->artisan('apikey:scope:generate', [
+            'name' => 'test^ing',
+        ])->assertExitCode(1);
+    }
+
+    public function testDuplicateNameThrowsError(): void
+    {
+        $entityManager = app('em');
+
+        $this->createDatabase($entityManager);
+
+        $apiKeyRepository = $entityManager->getRepository(Scope::class);
+        $apiKey = $apiKeyRepository->generate('testing');
+        $entityManager->flush();
+
+        $this->artisan('apikey:scope:generate', [
+            'name' => $apiKey->getName(),
+        ])->assertExitCode(1);
+    }
+}

test/Feature/Repository/ScopeRepositoryTest.php

@@ -6,6 +6,7 @@
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Entity\Scope;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\DuplicateName;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\InvalidName;
+use ApiSkeletons\Laravel\Doctrine\ApiKey\Exception\ScopeHasApiKeys;
 use ApiSkeletonsTest\Laravel\Doctrine\ApiKey\TestCase;
 
 final class ScopeRepositoryTest extends TestCase
@@ -59,6 +60,8 @@ public function testCannotCreateDuplicateScope(): void
 
     public function testCannotDeleteScopeWithApiKeys(): void
     {
+        $this->expectException(ScopeHasApiKeys::class);
+
         $entityManager = $this->createDatabase(app('em'));
         $apiKeyRepository = $entityManager->getRepository(ApiKey::class);
         $scopeRepository = $entityManager->getRepository(Scope::class);
@@ -70,6 +73,5 @@ public function testCannotDeleteScopeWithApiKeys(): void
         $entityManager->flush();
 
         $result = $scopeRepository->delete($scope);
-        $this->assertFalse($result);
     }
 }