From 624465e352786738be5d69a6acf50b14135f8ee8 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Wed, 20 Apr 2022 12:50:48 +0200
Subject: [PATCH] #118 - fix

---
 .../Providers/AuthServiceProvider.php         |  1 -
 .../Http/Controllers/KeysController.php       | 26 ++++++++++++++-----
 database/seeders/DatabaseSeeder.php           |  1 -
 resources/lang/pl.json                        |  8 +++---
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/Architecture/Providers/AuthServiceProvider.php b/app/Architecture/Providers/AuthServiceProvider.php
index e57ef42..cb5b112 100644
--- a/app/Architecture/Providers/AuthServiceProvider.php
+++ b/app/Architecture/Providers/AuthServiceProvider.php
@@ -35,6 +35,5 @@ class AuthServiceProvider extends ServiceProvider
         Gate::define("manageVacationLimits", fn(User $user) => $user->role === Role::AdministrativeApprover);
         Gate::define("generateTimesheet", fn(User $user) => $user->role === Role::AdministrativeApprover);
         Gate::define("listMonthlyUsage", fn(User $user) => $user->role === Role::AdministrativeApprover);
-        Gate::define("manageKeys", fn(User $user) => $user->role === Role::AdministrativeApprover);
     }
 }
diff --git a/app/Infrastructure/Http/Controllers/KeysController.php b/app/Infrastructure/Http/Controllers/KeysController.php
index 7e63a5a..6482823 100644
--- a/app/Infrastructure/Http/Controllers/KeysController.php
+++ b/app/Infrastructure/Http/Controllers/KeysController.php
@@ -43,33 +43,45 @@ class KeysController extends Controller
     {
         $this->authorize("manageKeys");
 
-        $request->user()->keys()->create();
+        $key = $request->user()->keys()->create();
 
         return redirect()
             ->back()
-            ->with("success", __("Key has been created."));
+            ->with("success", __("Key no :number has been created.", [
+                "number" => $key->id,
+            ]));
     }
 
     public function take(Key $key, Request $request): RedirectResponse
     {
+        $previousUser = $key->user;
+
         $key->user()->associate($request->user());
 
         $key->save();
 
         return redirect()
             ->back()
-            ->with("success", __("Key has been taken."));
+            ->with("success", __("Key no :number has been taken from :user.", [
+                "number" => $key->id,
+                "user" => $previousUser->profile->full_name,
+            ]));
     }
 
     public function give(Key $key, GiveKeyRequest $request): RedirectResponse
     {
-        $key->user()->associate($request->recipient());
+        $recipient = $request->recipient();
+
+        $key->user()->associate($recipient);
 
         $key->save();
 
         return redirect()
             ->back()
-            ->with("success", __("Key has been given."));
+            ->with("success", __("Key no :number has been given to :user.", [
+                "number" => $key->id,
+                "user" => $recipient->profile->full_name,
+            ]));
     }
 
     public function destroy(Key $key): RedirectResponse
@@ -80,6 +92,8 @@ class KeysController extends Controller
 
         return redirect()
             ->back()
-            ->with("success", __("Key has been deleted."));
+            ->with("success", __("Key no :number has been deleted.", [
+                "number" => $key->id,
+            ]));
     }
 }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 5225924..5519dcb 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -90,7 +90,6 @@ class DatabaseSeeder extends Seeder
         foreach ($users as $user) {
             Key::factory()
                 ->for($user, "owner")
-                ->for($user, "previousOwner")
                 ->create();
         }
     }
diff --git a/resources/lang/pl.json b/resources/lang/pl.json
index 108595e..7ef65e1 100644
--- a/resources/lang/pl.json
+++ b/resources/lang/pl.json
@@ -67,8 +67,8 @@
   "The vacation request :title from user :requester has been :status.": "Wniosek urlopowy :title użytkownika :requester został :status.",
   "Vacation request :title has been created on your behalf": "Wniosek urlopowy :title został utworzony w Twoim imieniu",
   "The vacation request :title has been created correctly by user :creator on your behalf in the :appName.": "W systemie :appName został poprawnie utworzony wniosek urlopowy :title w Twoim imieniu przez użytkownika :creator.",
-  "Key has been created.": "Klucz został utworzony.",
-  "Key has been deleted.": "Klucz został usunięty.",
-  "Key has been taken.": "Klucz został zabrany.",
-  "Key has been given.": "Klucz został przekazany."
+  "Key no :number has been created.": "Klucz nr :number został utworzony.",
+  "Key no :number has been deleted.": "Klucz nr :number został usunięty.",
+  "Key no :number has been taken from :user.": "Klucz nr :number został zabrany od użytkownika :user.",
+  "Key no :number has been given to :user.": "Klucz nr :number został przekazany użytkownikowi :user."
 }