From c7c0818011bc8dee6a695871e7201b22a9a72e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Thu, 4 May 2023 13:40:58 +0000
Subject: [PATCH] Fix #98 Validate the existence of a similar key on POST
 /account_types for 1.2

---
 .../Api/Admin/AccountTypeController.php       |  2 +-
 flexiapi/tests/Feature/AccountTypeTest.php    | 49 +++++++++++--------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/flexiapi/app/Http/Controllers/Api/Admin/AccountTypeController.php b/flexiapi/app/Http/Controllers/Api/Admin/AccountTypeController.php
index 24f31d9..ec84a29 100644
--- a/flexiapi/app/Http/Controllers/Api/Admin/AccountTypeController.php
+++ b/flexiapi/app/Http/Controllers/Api/Admin/AccountTypeController.php
@@ -41,7 +41,7 @@ class AccountTypeController extends Controller
     public function store(Request $request)
     {
         $request->validate([
-            'key' => ['required', 'alpha_dash', new NoUppercase],
+            'key' => ['required', 'alpha_dash', new NoUppercase, 'unique:account_types,key'],
         ]);
 
         $accountType = new AccountType;
diff --git a/flexiapi/tests/Feature/AccountTypeTest.php b/flexiapi/tests/Feature/AccountTypeTest.php
index 77fa37d..8c93d84 100644
--- a/flexiapi/tests/Feature/AccountTypeTest.php
+++ b/flexiapi/tests/Feature/AccountTypeTest.php
@@ -47,17 +47,26 @@ class AccountTypeTest extends TestCase
 
         $this->assertEquals(1, AccountType::count());
 
+        // Same key
+        $this->keyAuthenticated($admin->account)
+            ->json($this->method, $this->route, [
+                'key' => 'phone',
+            ])
+            ->assertJsonValidationErrorFor('key')
+            ->assertStatus(422);
+
+
         // Missing key
         $this->keyAuthenticated($admin->account)
-        ->json($this->method, $this->route, [])
-        ->assertStatus(422);
+            ->json($this->method, $this->route, [])
+            ->assertStatus(422);
 
         // Invalid key
         $this->keyAuthenticated($admin->account)
-        ->json($this->method, $this->route, [
-            'key' => 'Abc1234',
-        ])
-        ->assertStatus(422);
+            ->json($this->method, $this->route, [
+                'key' => 'Abc1234',
+            ])
+            ->assertStatus(422);
 
         $this->keyAuthenticated($admin->account)
             ->get($this->route)
@@ -83,7 +92,7 @@ class AccountTypeTest extends TestCase
         $accountType = AccountType::first();
 
         $this->keyAuthenticated($admin->account)
-            ->delete($this->route.'/'.$accountType->id)
+            ->delete($this->route . '/' . $accountType->id)
             ->assertStatus(200);
 
         $this->assertEquals(0, AccountType::count());
@@ -104,7 +113,7 @@ class AccountTypeTest extends TestCase
         $accountType = AccountType::first();
 
         $this->keyAuthenticated($admin->account)
-            ->json('PUT', $this->route.'/'.$accountType->id, [
+            ->json('PUT', $this->route . '/' . $accountType->id, [
                 'key' => 'door',
             ])
             ->assertStatus(200);
@@ -137,34 +146,34 @@ class AccountTypeTest extends TestCase
         $password = Password::factory()->create();
 
         $this->keyAuthenticated($admin->account)
-            ->json($this->method, '/api/accounts/'.$password->account->id.'/types/'.$accountType->id)
+            ->json($this->method, '/api/accounts/' . $password->account->id . '/types/' . $accountType->id)
             ->assertStatus(200);
 
         $this->keyAuthenticated($admin->account)
-            ->json($this->method, '/api/accounts/'.$password->account->id.'/types/'.$accountType->id)
+            ->json($this->method, '/api/accounts/' . $password->account->id . '/types/' . $accountType->id)
             ->assertStatus(403);
 
         $this->keyAuthenticated($admin->account)
-        ->get('/api/accounts/'.$password->account->id)
-        ->assertJson([
-            'types' => [
-                [
-                    'id' => $accountType->id,
-                    'key' => $accountType->key
+            ->get('/api/accounts/' . $password->account->id)
+            ->assertJson([
+                'types' => [
+                    [
+                        'id' => $accountType->id,
+                        'key' => $accountType->key
+                    ]
                 ]
-            ]
-        ]);
+            ]);
 
         // Remove
         $this->keyAuthenticated($admin->account)
-            ->delete('/api/accounts/'.$password->account->id.'/types/'.$accountType->id)
+            ->delete('/api/accounts/' . $password->account->id . '/types/' . $accountType->id)
             ->assertStatus(200);
 
         $this->assertEquals(0, DB::table('account_account_type')->count());
 
         // Retry
         $this->keyAuthenticated($admin->account)
-            ->delete('/api/accounts/'.$password->account->id.'/types/'.$accountType->id)
+            ->delete('/api/accounts/' . $password->account->id . '/types/' . $accountType->id)
             ->assertStatus(403);
         $this->assertEquals(0, DB::table('account_account_type')->count());
     }