From 5fbe2ed7e4c4474969685649c03eea1b396db935 Mon Sep 17 00:00:00 2001
From: Fame <fame@sky-fighter.com>
Date: Sun, 11 Aug 2024 04:34:01 +0200
Subject: [PATCH 01/14] Fursuit API implementation

---
 .../API/AuthenticationMiddleware.php          | 27 ++++++++++++++++
 app/Http/Resources/FursuitCollection.php      | 17 ++++++++++
 app/Http/Resources/FursuitResource.php        | 31 +++++++++++++++++++
 app/Models/User.php                           | 15 +--------
 bootstrap/app.php                             |  1 +
 config/api.php                                | 17 ++++++++++
 routes/api.php                                |  6 ++++
 7 files changed, 100 insertions(+), 14 deletions(-)
 create mode 100644 app/Http/Middleware/API/AuthenticationMiddleware.php
 create mode 100644 app/Http/Resources/FursuitCollection.php
 create mode 100644 app/Http/Resources/FursuitResource.php
 create mode 100644 config/api.php
 create mode 100644 routes/api.php

diff --git a/app/Http/Middleware/API/AuthenticationMiddleware.php b/app/Http/Middleware/API/AuthenticationMiddleware.php
new file mode 100644
index 0000000..09054e1
--- /dev/null
+++ b/app/Http/Middleware/API/AuthenticationMiddleware.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware\API;
+
+use Closure;
+use Illuminate\Http\Request;
+
+/**
+ * API calls expect bearer token to be set.
+ * If invalid the return will be 403 forbidden
+ * If valid the actual API request will be called
+ * api_middleware_bearer_token might be null if configuration is incomplete
+ */
+
+class AuthenticationMiddleware
+{
+    public function handle(Request $request, Closure $next)
+    {
+        if ($request->bearerToken() !== config("api.api_middleware_bearer_token") || config("api.api_middleware_bearer_token") === null) {
+            return response()->json([
+                'message' => 'Forbidden.'
+            ], 403);
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Resources/FursuitCollection.php b/app/Http/Resources/FursuitCollection.php
new file mode 100644
index 0000000..6963180
--- /dev/null
+++ b/app/Http/Resources/FursuitCollection.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+/** @see \App\Models\Fursuit\Fursuit */
+class FursuitCollection extends ResourceCollection
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'data' => $this->collection,
+        ];
+    }
+}
diff --git a/app/Http/Resources/FursuitResource.php b/app/Http/Resources/FursuitResource.php
new file mode 100644
index 0000000..8ca016a
--- /dev/null
+++ b/app/Http/Resources/FursuitResource.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\Species;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin \App\Models\Fursuit\Fursuit
+ * Builds a array with relevant data from fursuits
+ * Filters out unnecessary details
+ * withCount("badges"), with("species") and with("user") are recommended to save database load
+ * */
+class FursuitResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            "reg_id" => (int) $this->user->attendee_id,
+            'status' => $this->status,
+            'name' => $this->name,
+            'published' => $this->published,
+            'catch_em_all' => $this->catch_em_all,
+            'image_url' => $this->image_url,
+            'badges_count' => $this->badges_count,
+
+            "species" => $this->species->only(["id", "name", "type"]),
+        ];
+    }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index 6297e5b..1dbbc61 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -36,7 +36,6 @@ class User extends Authenticatable implements FilamentUser, Wallet, WalletFloat,
      * @var array<int, string>
      */
     protected $hidden = [
-        'password',
         'remember_token',
         'token',
         'token_expires_at',
@@ -50,21 +49,9 @@ class User extends Authenticatable implements FilamentUser, Wallet, WalletFloat,
         'refresh_token_expires_at' => 'datetime',
         'token' => 'encrypted',
         'token_expires_at' => 'datetime',
+        'attendee_id' => 'integer',
     ];
 
-    /**
-     * Get the attributes that should be cast.
-     *
-     * @return array<string, string>
-     */
-    protected function casts(): array
-    {
-        return [
-            'email_verified_at' => 'datetime',
-            'password' => 'hashed',
-        ];
-    }
-
     public function badges()
     {
         return $this->hasManyThrough(Badge::class, Fursuit::class);
diff --git a/bootstrap/app.php b/bootstrap/app.php
index e30d6cb..f2531e1 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -8,6 +8,7 @@
 return Application::configure(basePath: dirname(__DIR__))
     ->withRouting(
         web: __DIR__.'/../routes/web.php',
+        api: __DIR__.'/../routes/api.php',
         commands: __DIR__.'/../routes/console.php',
         health: '/up',
     )
diff --git a/config/api.php b/config/api.php
new file mode 100644
index 0000000..ceda1d3
--- /dev/null
+++ b/config/api.php
@@ -0,0 +1,17 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | API Middleware Bearer Token
+    |--------------------------------------------------------------------------
+    |
+    | This token is the expected bearer token from clients which is used to
+    | validate the authentication. Connection will be prohibited if none or
+    | the wrong token is provided by the user. When using this token a check
+    | for null must be performed in case the configuration file misses the entry.
+    */
+
+    'api_middleware_bearer_token' => env('API_MIDDLEWARE_BEARER_TOKEN', null),
+];
diff --git a/routes/api.php b/routes/api.php
new file mode 100644
index 0000000..8dd9109
--- /dev/null
+++ b/routes/api.php
@@ -0,0 +1,6 @@
+<?php
+
+use App\Http\Middleware\API\AuthenticationMiddleware;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/fursuits', [\App\Http\Controllers\API\FursuitController::class, 'index'])->middleware(AuthenticationMiddleware::class)->name('api.fursuits.index');

From ca1f2c6ea2adb4a6d602c0da9235cda04fae1afd Mon Sep 17 00:00:00 2001
From: Fame <fame@sky-fighter.com>
Date: Sun, 11 Aug 2024 04:56:45 +0200
Subject: [PATCH 02/14] Fursuit API implementation

---
 .../Controllers/API/FursuitController.php     | 52 +++++++++++++++++++
 .../Requests/API/FursuitSearchRequest.php     | 25 +++++++++
 database/seeders/BalentySeeder.php            | 22 ++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 app/Http/Controllers/API/FursuitController.php
 create mode 100644 app/Http/Requests/API/FursuitSearchRequest.php
 create mode 100644 database/seeders/BalentySeeder.php

diff --git a/app/Http/Controllers/API/FursuitController.php b/app/Http/Controllers/API/FursuitController.php
new file mode 100644
index 0000000..57d3bcf
--- /dev/null
+++ b/app/Http/Controllers/API/FursuitController.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Controllers\API;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\API\FursuitSearchRequest;
+use App\Http\Resources\FursuitCollection;
+use App\Models\Fursuit\Fursuit;
+use App\Models\Fursuit\States\Approved;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Response;
+
+
+class FursuitController extends Controller
+{
+    private int $pageSize = 10; // Start paginate the returns based on $pageSize entrys per page
+
+    /**
+     * Expects an optional attendee_id, optional fursuit name and optional status
+     * attendee_id: Returns all fursuits of the user with the corresponding ID
+     * fursuit name: Returns all fursuits with which contains the term in its name. %NAME%
+     * status: by default set to approved. Can be set for a specific search or set to "any" if status shall be ignored
+     */
+
+    public function index(FursuitSearchRequest $request) {
+        $regID = $request->validated("reg_id");
+        $name = $request->validated("name");
+        $status = $request->validated("status") ?? Approved::$name;
+
+        // start building Query
+        $query = Fursuit::query()->withCount("badges")->with("species")->with("user");
+
+        // Search for reg_id
+        if ($request->exists("reg_id"))
+            $query->whereHas("user", function(Builder $query) use ($regID) {
+                $query->where("attendee_id", "=", $regID);
+            });
+
+        // Search for Fursuit Name
+        if ($request->exists("name"))
+            $query->where("name", 'like', '%'.$name.'%');
+
+        // Search for status (approved by default) and not filtered when "any"
+        if ($status != 'any')
+            $query->where("status", '=', $status);
+
+        // returns the results paginated and filteres by FursuitCollection
+        return new FursuitCollection($query->paginate($this->pageSize));
+    }
+}
diff --git a/app/Http/Requests/API/FursuitSearchRequest.php b/app/Http/Requests/API/FursuitSearchRequest.php
new file mode 100644
index 0000000..8723783
--- /dev/null
+++ b/app/Http/Requests/API/FursuitSearchRequest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Requests\API;
+
+use App\Models\Fursuit\States\Approved;
+use App\Models\Fursuit\States\Pending;
+use App\Models\Fursuit\States\Rejected;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class FursuitSearchRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     * Validates name, red_id and status in requests to specific rules
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => ['max:64', 'string', 'nullable'],
+            'reg_id' => ['integer', 'nullable', 'exists:users,attendee_id'],
+            'status' => ['string', 'nullable', Rule::in([Pending::$name, Approved::$name, Rejected::$name, 'any'])],
+        ];
+    }
+}
diff --git a/database/seeders/BalentySeeder.php b/database/seeders/BalentySeeder.php
new file mode 100644
index 0000000..c207345
--- /dev/null
+++ b/database/seeders/BalentySeeder.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\Badge\Badge;
+use App\Models\Event;
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Artisan;
+
+class BalentySeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        Artisan::call("event:state preorder");
+        $event =  Event::first();
+        Badge::factory(30)->recycle($event)->create();
+    }
+}

From fcb3a7f72201a626af46e41b6c3b440ac95bd46d Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Mon, 26 Aug 2024 05:24:24 +0200
Subject: [PATCH 03/14] Fursuit Catch Code generating + seeder

---
 .../Controllers/API/FursuitController.php     |  2 +-
 app/Models/Fursuit/Fursuit.php                | 12 +++++++
 app/Models/Fursuit/FursuitCatchCode.php       | 26 ++++++++++++++
 config/app.php                                | 11 ++++++
 database/seeders/FursuitCatchCodeSeeder.php   | 35 +++++++++++++++++++
 5 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 app/Models/Fursuit/FursuitCatchCode.php
 create mode 100644 database/seeders/FursuitCatchCodeSeeder.php

diff --git a/app/Http/Controllers/API/FursuitController.php b/app/Http/Controllers/API/FursuitController.php
index 57d3bcf..ea3776b 100644
--- a/app/Http/Controllers/API/FursuitController.php
+++ b/app/Http/Controllers/API/FursuitController.php
@@ -46,7 +46,7 @@ public function index(FursuitSearchRequest $request) {
         if ($status != 'any')
             $query->where("status", '=', $status);
 
-        // returns the results paginated and filteres by FursuitCollection
+        // returns the results paginated and filtered by FursuitCollection
         return new FursuitCollection($query->paginate($this->pageSize));
     }
 }
diff --git a/app/Models/Fursuit/Fursuit.php b/app/Models/Fursuit/Fursuit.php
index 5c2c790..b8d4680 100644
--- a/app/Models/Fursuit/Fursuit.php
+++ b/app/Models/Fursuit/Fursuit.php
@@ -112,4 +112,16 @@ public function isClaimedBySelf(User $user)
     {
         return (int) cache()->get($this->getClaimCacheKey()) == $user->id;
     }
+
+    public static function booted()
+    {
+        static::saving(function (Fursuit $fursuit) {
+            // Only generate if required and not existing
+            if (!$fursuit->catch_em_all || $fursuit->catch_code <> null)
+                return;
+
+            // Generate an unique Catch Code before saving the fursuit
+            $fursuit->catch_code = (new FursuitCatchCode(Fursuit::class, 'catch_code'))->generate();
+        });
+    }
 }
diff --git a/app/Models/Fursuit/FursuitCatchCode.php b/app/Models/Fursuit/FursuitCatchCode.php
new file mode 100644
index 0000000..3d061bf
--- /dev/null
+++ b/app/Models/Fursuit/FursuitCatchCode.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Models\Fursuit;
+
+use Illuminate\Support\Str;
+
+// Simple class for the Catch Em All code fursuits receive.
+// generate() outputs a X digit Number/Character code which is not used yet
+class FursuitCatchCode
+{
+    public function __construct(protected string $model, protected string $column) {}
+
+    public function generate(): string
+    {
+        do {
+            $identifier = strtoupper(Str::password(
+                $length = config("app.fursuit_catch_code_length"), // by default 5
+                $letters = true,
+                $numbers = true,
+                $symbols = false,
+                $spaces = false));
+        } while ($this->model::where($this->column, $identifier)->exists());
+
+        return $identifier;
+    }
+}
diff --git a/config/app.php b/config/app.php
index 5d36186..1804d61 100644
--- a/config/app.php
+++ b/config/app.php
@@ -123,4 +123,15 @@
         'store' => env('APP_MAINTENANCE_STORE', 'database'),
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Fursuit Catch Code Length
+    |--------------------------------------------------------------------------
+    |
+    | Length of characters and digits the code of fursuits for the catch em all feature
+    | Printed on the ordered fursuit badges
+    |
+    */
+
+    'fursuit_catch_code_length' => env('FURSUIT_CATCH_CODE_LENGTH', 5),
 ];
diff --git a/database/seeders/FursuitCatchCodeSeeder.php b/database/seeders/FursuitCatchCodeSeeder.php
new file mode 100644
index 0000000..fcac6a7
--- /dev/null
+++ b/database/seeders/FursuitCatchCodeSeeder.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\Fursuit\Fursuit;
+use App\Models\Fursuit\FursuitCatchCode;
+use Illuminate\Database\Seeder;
+
+class FursuitCatchCodeSeeder extends Seeder
+{
+    // Code which should be run once to generate all missing codes
+    // Further Fursuit Creation/Updates should be caught by an observer
+    // Will fill catch_em_all_code of fursuits who choose to participate
+    public function run(): void
+    {
+        $purgeAllCodes = false; // disabled as you might want keep codes (especially if badges are printed)
+        $purgeCodesOfNonParticipants = false; // disabled as you might want to keep codes if users reenter the system at later time
+
+        // to purge all codes and build new
+        if ($purgeAllCodes)
+            Fursuit::query()->update(['catch_code' => null]);
+
+        // removing of codes of these who unregistered from the system
+        if ($purgeCodesOfNonParticipants)
+            Fursuit::where('catch_em_all', 0)->update(['catch_code' => null]);
+
+        // Iterate and save manually to trigger Fursuit::saving()
+        foreach (Fursuit::all() as $fursuit) {
+            if (!$fursuit->catch_em_all || $fursuit->catch_code <> null)
+                continue;
+
+            $fursuit->save();
+        }
+    }
+}

From 0bf5a0536f1ae9a609485718fe63f54affcf67a6 Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Mon, 26 Aug 2024 17:46:51 +0200
Subject: [PATCH 04/14] Fursuit Catch Code database migration

---
 ...6_151326_add_catch_code_to_fursuits_table.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 database/migrations/2024_08_26_151326_add_catch_code_to_fursuits_table.php

diff --git a/database/migrations/2024_08_26_151326_add_catch_code_to_fursuits_table.php b/database/migrations/2024_08_26_151326_add_catch_code_to_fursuits_table.php
new file mode 100644
index 0000000..88fe2ae
--- /dev/null
+++ b/database/migrations/2024_08_26_151326_add_catch_code_to_fursuits_table.php
@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('fursuits', function (Blueprint $table) {
+            $table->after('catch_em_all', function (Blueprint $table) {
+                $table->string('catch_code', length: 255)->nullable()->unique();
+            });
+        });
+    }
+};

From c7c1981b1cd9237f4edfc5c1abd936a68d5ea5c8 Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Wed, 28 Aug 2024 15:45:10 +0200
Subject: [PATCH 05/14] FCEA - Logging and User Ranking - Database Part

---
 .../Controllers/FCEA/DashboardController.php  | 99 +++++++++++++++++++
 app/Http/Requests/UserCatchRequest.php        | 16 +++
 app/Http/Resources/user_catch_logResource.php | 25 +++++
 app/Models/FCEA/UserCatchLog.php              | 40 ++++++++
 app/Models/FCEA/UserFursuitCatch.php          | 33 +++++++
 .../FCEA/UserFursuitCatchesUserRanking.php    | 17 ++++
 app/Models/Fursuit/Fursuit.php                |  6 ++
 app/Models/Fursuit/FursuitCatchCode.php       |  2 +-
 app/Models/User.php                           |  6 ++
 app/Policies/UserCatchLogPolicy.php           | 47 +++++++++
 app/Rules/FursuitCatchCodeRule.php            | 17 ++++
 bootstrap/app.php                             |  4 +
 config/app.php                                | 12 ---
 config/fcea.php                               | 28 ++++++
 .../FCEA/UserFursuitCatchFactory.php          | 26 +++++
 ...27_225952_create_user_catch_logs_table.php | 25 +++++
 ...1438_create_user_fursuit_catches_table.php | 25 +++++
 ...er_fursuit_catches_user_rankings_table.php | 24 +++++
 database/seeders/BalentySeeder.php            |  2 +
 database/seeders/FursuitCatchCodeSeeder.php   |  4 +-
 resources/css/fcea.css                        | 24 +++++
 resources/js/Pages/FCEA/Dashboard.vue         | 94 ++++++++++++++++++
 resources/js/Pages/POS/Dashboard.vue          |  2 +-
 routes/fcea.php                               | 10 ++
 24 files changed, 573 insertions(+), 15 deletions(-)
 create mode 100644 app/Http/Controllers/FCEA/DashboardController.php
 create mode 100644 app/Http/Requests/UserCatchRequest.php
 create mode 100644 app/Http/Resources/user_catch_logResource.php
 create mode 100644 app/Models/FCEA/UserCatchLog.php
 create mode 100644 app/Models/FCEA/UserFursuitCatch.php
 create mode 100644 app/Models/FCEA/UserFursuitCatchesUserRanking.php
 create mode 100644 app/Policies/UserCatchLogPolicy.php
 create mode 100644 app/Rules/FursuitCatchCodeRule.php
 create mode 100644 config/fcea.php
 create mode 100644 database/factories/FCEA/UserFursuitCatchFactory.php
 create mode 100644 database/migrations/2024_08_27_225952_create_user_catch_logs_table.php
 create mode 100644 database/migrations/2024_08_28_021438_create_user_fursuit_catches_table.php
 create mode 100644 database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php
 create mode 100644 resources/css/fcea.css
 create mode 100644 resources/js/Pages/FCEA/Dashboard.vue
 create mode 100644 routes/fcea.php

diff --git a/app/Http/Controllers/FCEA/DashboardController.php b/app/Http/Controllers/FCEA/DashboardController.php
new file mode 100644
index 0000000..670b217
--- /dev/null
+++ b/app/Http/Controllers/FCEA/DashboardController.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Http\Controllers\FCEA;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UserCatchRequest;
+use App\Models\FCEA\UserCatchLog;
+use App\Models\FCEA\UserFursuitCatch;
+use App\Models\FCEA\UserFursuitCatchesUserRanking;
+use App\Models\Fursuit\Fursuit;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
+use Inertia\Inertia;
+
+class DashboardController extends Controller
+{
+    public function index()
+    {
+        return Inertia::render('FCEA/Dashboard');
+    }
+    public function catch(UserCatchRequest $request)
+    {
+        $catch_code = $request->validated("catch_code");
+        $logEntry = new UserCatchLog();
+        $logEntry->user_id = Auth::id();
+        $logEntry->catch_code = $catch_code;
+        $logEntry->is_successful = false;
+        $logEntry->already_caught = false;
+
+        if (!$logEntry->FursuitExist())
+        {
+            $logEntry->save();
+            return Inertia::render('FCEA/Dashboard');
+        }
+
+        $logEntry->already_caught =
+            UserFursuitCatch::where('user_id', Auth::id())
+                            ->where('fursuit_id', $logEntry->tryGetFursuit()->id)
+                             ->exists(); // Entry exists
+
+        if ($logEntry->already_caught)
+        {
+            $logEntry->save();
+            return Inertia::render('FCEA/Dashboard');
+        }
+
+        $logEntry->is_successful = true;
+        $logEntry->save();
+
+        $UserFursuitCatchEntry = new UserFursuitCatch();
+        $UserFursuitCatchEntry->user_id = Auth::id();
+        $UserFursuitCatchEntry->fursuit_id = $logEntry->tryGetFursuit()->id;
+        $UserFursuitCatchEntry->save();
+        $this->RefreshUserRanking();
+        return Inertia::render('FCEA/Dashboard');
+    }
+
+    public function RefreshUserRanking() {
+        $catchersOrdered = User::query()
+            ->withCount("fursuitsCatched")
+            ->orderByDesc("fursuits_catched_count")
+            ->get();
+
+        // How many users do we have in totel (Users with 0 score are counted too)
+        $maxCount = $catchersOrdered->count();
+
+        // Save required informations for iteration
+        $current = array(
+            'count' => 1,
+            'rank' => 1,
+            'score' => $catchersOrdered->first()->fursuits_catched_count
+        );
+
+        // Need to have stats of previous Rank
+        $previous = $current;
+
+        // Clean Ranking
+        UserFursuitCatchesUserRanking::truncate();
+
+        // Iterate all users to build Ranking (players with same score have same ranking)
+        foreach ($catchersOrdered as $catcher) {
+            // Increase Rank when Score updates (players get same rank with same score)
+            if ($current['score'] > $catcher->fursuits_catched_count) {
+                $previous = $current;
+                $current['rank']++;
+                $current['score'] = $catcher->fursuits_catched_count;
+            }
+
+            $rankingEntry = new UserFursuitCatchesUserRanking();
+            $rankingEntry->user_id = $catcher->id;
+            $rankingEntry->rank = $current['rank'];
+            $rankingEntry->catches = $catcher->fursuits_catched_count;
+            $rankingEntry->catches_till_next = $previous['score'] - $current['score'];
+            $rankingEntry->users_behind = $maxCount - $previous['count'];
+            $rankingEntry->save();
+            $current['count']++;
+        }
+    }
+}
diff --git a/app/Http/Requests/UserCatchRequest.php b/app/Http/Requests/UserCatchRequest.php
new file mode 100644
index 0000000..23b327e
--- /dev/null
+++ b/app/Http/Requests/UserCatchRequest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Rules\FursuitCatchCodeRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UserCatchRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'catch_code' => ['required','string', 'min:'.config("fcea.fursuit_catch_code_length"), 'max:'.config("fcea.fursuit_catch_code_length"), new FursuitCatchCodeRule()]
+        ];
+    }
+}
diff --git a/app/Http/Resources/user_catch_logResource.php b/app/Http/Resources/user_catch_logResource.php
new file mode 100644
index 0000000..aaff0b4
--- /dev/null
+++ b/app/Http/Resources/user_catch_logResource.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin \App\Models\FCEA\UserCatchLog */
+class user_catch_logResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+            'id' => $this->id,
+            'catch_code' => $this->catch_code,
+            'is_successful' => $this->is_successful,
+            'already_caught' => $this->already_caught,
+
+            'user_id' => $this->user_id,
+            'user_id' => $this->user_id,
+        ];
+    }
+}
diff --git a/app/Models/FCEA/UserCatchLog.php b/app/Models/FCEA/UserCatchLog.php
new file mode 100644
index 0000000..46ef07c
--- /dev/null
+++ b/app/Models/FCEA/UserCatchLog.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models\FCEA;
+
+use App\Models\Fursuit\Fursuit;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+// Model to manage Logging for the Catch feature. Attempts/Successful/Duplicates. Allows to detect Cheating/Bruteforcing.
+class UserCatchLog extends Model
+{
+    // Simple caching so save database lookups
+    protected Fursuit|null $fursuit = null;
+
+    protected $casts = [
+        'is_successful' => 'boolean',
+        'already_caught' => 'boolean',
+    ];
+
+    public function user() : BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    // Look if a Fursuit Exist with the given catch code - might be null
+    public function tryGetFursuit() : Fursuit|null
+    {
+        // If Fursuit not found yet ot catch_code not correct -> lookup Fursuit
+        if (!$this->fursuit || $this->fursuit->catch_code != $this->catch_code)
+            $this->fursuit = Fursuit::where("catch_code", $this->catch_code)->first();;
+        return $this->fursuit;
+    }
+
+    // True means tryGetFursuit() will give an result. False means tryGetFursuit() will give null.
+    public function FursuitExist() : bool
+    {
+        return $this->TryGetFursuit() != null;
+    }
+}
diff --git a/app/Models/FCEA/UserFursuitCatch.php b/app/Models/FCEA/UserFursuitCatch.php
new file mode 100644
index 0000000..5da0c99
--- /dev/null
+++ b/app/Models/FCEA/UserFursuitCatch.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Models\FCEA;
+
+use App\Models\Fursuit\Fursuit;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Spatie\Activitylog\LogOptions;
+use Spatie\Activitylog\Traits\LogsActivity;
+
+// Model for the actual unique catches. Will be used to calculate statistics
+class UserFursuitCatch extends Model
+{
+    use LogsActivity, HasFactory;
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function fursuit(): BelongsTo
+    {
+        return $this->belongsTo(Fursuit::class);
+    }
+
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logOnly(['user_id', 'fursuit_id']);
+        // Chain fluent methods for configuration options
+    }
+}
diff --git a/app/Models/FCEA/UserFursuitCatchesUserRanking.php b/app/Models/FCEA/UserFursuitCatchesUserRanking.php
new file mode 100644
index 0000000..8d2f9d6
--- /dev/null
+++ b/app/Models/FCEA/UserFursuitCatchesUserRanking.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models\FCEA;
+
+use App\Models\User;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class UserFursuitCatchesUserRanking extends Model
+{
+    public $timestamps = false;
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+}
diff --git a/app/Models/Fursuit/Fursuit.php b/app/Models/Fursuit/Fursuit.php
index b8d4680..29e3dfd 100644
--- a/app/Models/Fursuit/Fursuit.php
+++ b/app/Models/Fursuit/Fursuit.php
@@ -4,6 +4,7 @@
 
 use App\Models\Badge\Badge;
 use App\Models\Event;
+use App\Models\FCEA\UserFursuitCatch;
 use App\Models\Fursuit\States\FursuitStatusState;
 use App\Models\Species;
 use App\Models\User;
@@ -113,6 +114,11 @@ public function isClaimedBySelf(User $user)
         return (int) cache()->get($this->getClaimCacheKey()) == $user->id;
     }
 
+    public function catchedByUsers()
+    {
+        return $this->hasMany(UserFursuitCatch::class);
+    }
+
     public static function booted()
     {
         static::saving(function (Fursuit $fursuit) {
diff --git a/app/Models/Fursuit/FursuitCatchCode.php b/app/Models/Fursuit/FursuitCatchCode.php
index 3d061bf..57b6fca 100644
--- a/app/Models/Fursuit/FursuitCatchCode.php
+++ b/app/Models/Fursuit/FursuitCatchCode.php
@@ -14,7 +14,7 @@ public function generate(): string
     {
         do {
             $identifier = strtoupper(Str::password(
-                $length = config("app.fursuit_catch_code_length"), // by default 5
+                $length = config("fcea.fursuit_catch_code_length"), // by default 5
                 $letters = true,
                 $numbers = true,
                 $symbols = false,
diff --git a/app/Models/User.php b/app/Models/User.php
index 1dbbc61..eacc24b 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -4,6 +4,7 @@
 
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
 use App\Models\Badge\Badge;
+use App\Models\FCEA\UserFursuitCatch;
 use App\Models\Fursuit\Fursuit;
 use Bavix\Wallet\Interfaces\Customer;
 use Bavix\Wallet\Interfaces\Wallet;
@@ -62,6 +63,11 @@ public function fursuits()
         return $this->hasMany(Fursuit::class);
     }
 
+    public function fursuitsCatched()
+    {
+        return $this->hasMany(UserFursuitCatch::class);
+    }
+
     public function canAccessPanel(Panel $panel): bool
     {
         return $this->is_admin || $this->is_reviewer;
diff --git a/app/Policies/UserCatchLogPolicy.php b/app/Policies/UserCatchLogPolicy.php
new file mode 100644
index 0000000..67077ed
--- /dev/null
+++ b/app/Policies/UserCatchLogPolicy.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\FCEA\UserCatchLog;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class UserCatchLogPolicy
+{
+    use HandlesAuthorization;
+
+    public function viewAny(User $user): bool
+    {
+        return $user->is_admin;
+    }
+
+    public function view(User $user, UserCatchLog $user_catch_log): bool
+    {
+        return $user->is_admin;
+    }
+
+    public function create(User $user): bool
+    {
+        return false;
+    }
+
+    public function update(User $user, UserCatchLog $user_catch_log): bool
+    {
+        return $user->is_admin;
+    }
+
+    public function delete(User $user, UserCatchLog $user_catch_log): bool
+    {
+        return false;
+    }
+
+    public function restore(User $user, UserCatchLog $user_catch_log): bool
+    {
+        return $user->is_admin;
+    }
+
+    public function forceDelete(User $user, UserCatchLog $user_catch_log): bool
+    {
+        return $user->is_admin;
+    }
+}
diff --git a/app/Rules/FursuitCatchCodeRule.php b/app/Rules/FursuitCatchCodeRule.php
new file mode 100644
index 0000000..e9a3abd
--- /dev/null
+++ b/app/Rules/FursuitCatchCodeRule.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Rules;
+
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Support\Str;
+
+class FursuitCatchCodeRule implements ValidationRule
+{
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (! preg_match('/^[a-zA-Z0-9]+$/u', $value)) {
+            $fail(Str::ucfirst($attribute) . ' can only contain letters and numbers');
+        }
+    }
+}
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 997de7d..4a016ac 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -12,6 +12,10 @@
         commands: __DIR__.'/../routes/console.php',
         health: '/up',
         then: function() {
+            \Illuminate\Support\Facades\Route::prefix('fcea/')
+                ->name('fcea.')
+                ->middleware('web')
+                ->group(base_path('routes/fcea.php'));
             \Illuminate\Support\Facades\Route::middleware(['auth:machine','auth:machine-user'])
                 ->prefix('pos/')
                 ->name('pos.')
diff --git a/config/app.php b/config/app.php
index 1804d61..e233b03 100644
--- a/config/app.php
+++ b/config/app.php
@@ -122,16 +122,4 @@
         'driver' => env('APP_MAINTENANCE_DRIVER', 'file'),
         'store' => env('APP_MAINTENANCE_STORE', 'database'),
     ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Fursuit Catch Code Length
-    |--------------------------------------------------------------------------
-    |
-    | Length of characters and digits the code of fursuits for the catch em all feature
-    | Printed on the ordered fursuit badges
-    |
-    */
-
-    'fursuit_catch_code_length' => env('FURSUIT_CATCH_CODE_LENGTH', 5),
 ];
diff --git a/config/fcea.php b/config/fcea.php
new file mode 100644
index 0000000..4439ca5
--- /dev/null
+++ b/config/fcea.php
@@ -0,0 +1,28 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Fursuit Catch Code Length
+    |--------------------------------------------------------------------------
+    |
+    | Length of characters and digits the code of fursuits for the catch em all feature
+    | Printed on the ordered fursuit badges
+    |
+    */
+
+    'fursuit_catch_code_length' => env('FURSUIT_CATCH_CODE_LENGTH', 5),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Fursuit Catch Attempts per Minute
+    |--------------------------------------------------------------------------
+    |
+    | Amount of times per 60 seconds a user can submit a Fursuit Catch Code
+    | in attempt to catch a fursuiter. Will respond "429 Too Many Requests" if triggered.
+    | Used to prevent bruteforcing attempts.
+    |
+    */
+
+    'fursuit_catch_attempts_per_minute' => env('FURSUIT_CATCH_ATTEMPTS_PER_MINUTE', 20),
+];
diff --git a/database/factories/FCEA/UserFursuitCatchFactory.php b/database/factories/FCEA/UserFursuitCatchFactory.php
new file mode 100644
index 0000000..9b5c2cb
--- /dev/null
+++ b/database/factories/FCEA/UserFursuitCatchFactory.php
@@ -0,0 +1,26 @@
+<?php
+
+
+namespace Database\Factories\FCEA;
+
+use App\Models\FCEA\UserFursuitCatch;
+use App\Models\Fursuit\Fursuit;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Carbon;
+
+class UserFursuitCatchFactory extends Factory
+{
+    protected $model = UserFursuitCatch::class;
+
+    public function definition(): array
+    {
+        return [
+            'created_at' => Carbon::now(),
+            'updated_at' => Carbon::now(),
+
+            'user_id' => User::factory(),
+            'fursuit_id' => Fursuit::factory(),
+        ];
+    }
+}
diff --git a/database/migrations/2024_08_27_225952_create_user_catch_logs_table.php b/database/migrations/2024_08_27_225952_create_user_catch_logs_table.php
new file mode 100644
index 0000000..010c9da
--- /dev/null
+++ b/database/migrations/2024_08_27_225952_create_user_catch_logs_table.php
@@ -0,0 +1,25 @@
+<?php
+
+use App\Models\User;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::create('user_catch_logs', function (Blueprint $table) {
+            $table->id();
+            $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
+            $table->string('catch_code', 255);
+            $table->boolean('is_successful');
+            $table->boolean('already_caught');
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('user_catch_logs');
+    }
+};
diff --git a/database/migrations/2024_08_28_021438_create_user_fursuit_catches_table.php b/database/migrations/2024_08_28_021438_create_user_fursuit_catches_table.php
new file mode 100644
index 0000000..af31b76
--- /dev/null
+++ b/database/migrations/2024_08_28_021438_create_user_fursuit_catches_table.php
@@ -0,0 +1,25 @@
+<?php
+
+use App\Models\Fursuit\Fursuit;
+use App\Models\User;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::create('user_fursuit_catches', function (Blueprint $table) {
+            $table->id();
+            $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(Fursuit::class)->constrained()->cascadeOnDelete();
+            $table->timestamps();
+            $table->unique(['user_id', 'fursuit_id']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('user_fursuit_catches');
+    }
+};
diff --git a/database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php b/database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php
new file mode 100644
index 0000000..56d944e
--- /dev/null
+++ b/database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php
@@ -0,0 +1,24 @@
+<?php
+
+use App\Models\User;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::create('user_fursuit_catches_user_rankings', function (Blueprint $table) {
+            $table->integer('rank');
+            $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
+            $table->integer('catches');
+            $table->integer('catches_till_next');
+            $table->integer('users_behind');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('user_fursuit_catches_user_rankings');
+    }
+};
diff --git a/database/seeders/BalentySeeder.php b/database/seeders/BalentySeeder.php
index c207345..521f0fa 100644
--- a/database/seeders/BalentySeeder.php
+++ b/database/seeders/BalentySeeder.php
@@ -4,6 +4,7 @@
 
 use App\Models\Badge\Badge;
 use App\Models\Event;
+use App\Models\FCEA\UserFursuitCatch;
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Artisan;
@@ -18,5 +19,6 @@ public function run(): void
         Artisan::call("event:state preorder");
         $event =  Event::first();
         Badge::factory(30)->recycle($event)->create();
+        UserFursuitCatch::factory(30)->recycle($event)->create();
     }
 }
diff --git a/database/seeders/FursuitCatchCodeSeeder.php b/database/seeders/FursuitCatchCodeSeeder.php
index fcac6a7..81dcd61 100644
--- a/database/seeders/FursuitCatchCodeSeeder.php
+++ b/database/seeders/FursuitCatchCodeSeeder.php
@@ -2,8 +2,10 @@
 
 namespace Database\Seeders;
 
+use App\Models\Badge\Badge;
+use App\Models\Event;
+use App\Models\FCEA\UserFursuitCatch;
 use App\Models\Fursuit\Fursuit;
-use App\Models\Fursuit\FursuitCatchCode;
 use Illuminate\Database\Seeder;
 
 class FursuitCatchCodeSeeder extends Seeder
diff --git a/resources/css/fcea.css b/resources/css/fcea.css
new file mode 100644
index 0000000..7bf31e3
--- /dev/null
+++ b/resources/css/fcea.css
@@ -0,0 +1,24 @@
+.card {
+    border: 1px solid #ccc;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+}
+
+h3 {
+    font-family: 'Arial', sans-serif;
+    font-weight: bold;
+}
+
+.card-header {
+    background-color: #f8f9fa;
+}
+
+.list-group-item {
+    display: flex;
+    justify-content: space-between;
+    font-weight: bold;
+}
+
+.text-center {
+    font-family: 'Arial', sans-serif;
+    margin-top: 10px;
+}
diff --git a/resources/js/Pages/FCEA/Dashboard.vue b/resources/js/Pages/FCEA/Dashboard.vue
new file mode 100644
index 0000000..82760cf
--- /dev/null
+++ b/resources/js/Pages/FCEA/Dashboard.vue
@@ -0,0 +1,94 @@
+<script setup>
+import {Link, Head, usePage} from '@inertiajs/vue3'
+import {useForm} from 'laravel-precognition-vue-inertia'
+import Button from 'primevue/button';
+
+
+const form = useForm('post', route('fcea.dashboard.catch'), {
+    catch_code: ""
+})
+
+function submit() {
+    form.submit();
+}
+</script>
+<template>
+    <Head>
+        <title>POS - Dashboard</title>
+    </Head>
+    <div class="card mt-5" style="width: 18rem; margin: auto;">
+        <div class="card-header text-center">
+            <h3>Fursuit Catch Em All</h3>
+        </div>
+        <div class="card-body">
+            <h4 class="text-center">Place #{{ place }}</h4>
+            <p class="text-center"><small>{{ toNextPlace }} more to advance to the next place</small></p>
+            <p class="text-center"><small>{{ behindYou }} behind you</small></p>
+
+            <div class="text-center">
+                 <input type="text" class="form-control mb-2" v-model="form.catch_code" placeholder="Enter Code" />
+                <button class="btn btn-primary" @click="submit()">Submit ></button>
+            </div>
+
+            <div class="mt-4">
+                <h5>Top Catchers</h5>
+                <ul class="list-group">
+                    <li class="list-group-item">Top 1: {{ topCatchers[0] }}</li>
+                    <li class="list-group-item">Top 2...10: {{ topCatchers[1] }}</li>
+                    <li class="list-group-item">...</li>
+                    <li class="list-group-item">Top 704: {{ topCatchers[2] }}</li>
+                </ul>
+            </div>
+
+            <div class="mt-4">
+                <h5>Top Fursuiters</h5>
+                <ul class="list-group">
+                    <li class="list-group-item">Top 1: {{ topFursuiters[0] }}</li>
+                    <li class="list-group-item">Top 2...10: {{ topFursuiters[1] }}</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            place: 705,
+            toNextPlace: 4,
+            behindYou: 232,
+            code: '',
+            topCatchers: [999, 421, 4, 8],
+            topFursuiters: [999, 421, 1],
+        };
+    }
+};
+</script>
+
+<style scoped>
+.card {
+    border: 1px solid #ccc;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+}
+
+h3 {
+    font-family: 'Arial', sans-serif;
+    font-weight: bold;
+}
+
+.card-header {
+    background-color: #f8f9fa;
+}
+
+.list-group-item {
+    display: flex;
+    justify-content: space-between;
+    font-weight: bold;
+}
+
+.text-center {
+    font-family: 'Arial', sans-serif;
+    margin-top: 10px;
+}
+</style>
diff --git a/resources/js/Pages/POS/Dashboard.vue b/resources/js/Pages/POS/Dashboard.vue
index 2abd47a..854117e 100644
--- a/resources/js/Pages/POS/Dashboard.vue
+++ b/resources/js/Pages/POS/Dashboard.vue
@@ -13,7 +13,7 @@ const buttons = [
     { label: "Cash Register", route: '#', icon: 'pi pi-euro' },
     { label: "Logout", route: '#', icon: 'pi pi-wallet' },
 ];
-</script>sd
+</script>
 
 <template>
     <Head>
diff --git a/routes/fcea.php b/routes/fcea.php
new file mode 100644
index 0000000..7426fcc
--- /dev/null
+++ b/routes/fcea.php
@@ -0,0 +1,10 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+/**
+ * CONTAINS ALL ROUTES FOR FCEA (Fursuit Catch Em All) SYSTEM
+ */
+
+Route::get('/', [\App\Http\Controllers\FCEA\DashboardController::class, 'index'])->middleware('auth')->name('dashboard');
+Route::post('/',[\App\Http\Controllers\FCEA\DashboardController::class,'catch'])->middleware('auth')->middleware('throttle:'.config("fcea.fursuit_catch_attempts_per_minute").',1')->name('dashboard.catch');

From 9a135f30c1668c0a057a220cb59b19f6b5a6c411 Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Thu, 29 Aug 2024 01:59:46 +0200
Subject: [PATCH 06/14] Update Limiter, Based on ID and not IP

---
 .../Controllers/FCEA/DashboardController.php  | 16 +++++++++++-
 app/Http/Resources/user_catch_logResource.php | 25 -------------------
 routes/fcea.php                               |  2 +-
 3 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 app/Http/Resources/user_catch_logResource.php

diff --git a/app/Http/Controllers/FCEA/DashboardController.php b/app/Http/Controllers/FCEA/DashboardController.php
index 670b217..ba4edc8 100644
--- a/app/Http/Controllers/FCEA/DashboardController.php
+++ b/app/Http/Controllers/FCEA/DashboardController.php
@@ -10,6 +10,7 @@
 use App\Models\Fursuit\Fursuit;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\RateLimiter;
 use Inertia\Inertia;
 
 class DashboardController extends Controller
@@ -20,6 +21,9 @@ public function index()
     }
     public function catch(UserCatchRequest $request)
     {
+        if ($second = $this->IsLimited(Auth::id()))
+            return 'You may try again in '.$second.' seconds.';
+
         $catch_code = $request->validated("catch_code");
         $logEntry = new UserCatchLog();
         $logEntry->user_id = Auth::id();
@@ -77,7 +81,7 @@ public function RefreshUserRanking() {
         // Clean Ranking
         UserFursuitCatchesUserRanking::truncate();
 
-        // Iterate all users to build Ranking (players with same score have same ranking)
+        // Iterate all users to build Ranking
         foreach ($catchersOrdered as $catcher) {
             // Increase Rank when Score updates (players get same rank with same score)
             if ($current['score'] > $catcher->fursuits_catched_count) {
@@ -96,4 +100,14 @@ public function RefreshUserRanking() {
             $current['count']++;
         }
     }
+
+    protected function IsLimited(int $identifier, string $action = 'fursuit_catch') : int
+    {
+        $rateLimiterKey = $action.':'.$identifier;
+        if (RateLimiter::tooManyAttempts($rateLimiterKey, $perMinute = config("fcea.fursuit_catch_attempts_per_minute")))
+            return RateLimiter::availableIn($rateLimiterKey);
+
+        RateLimiter::increment($rateLimiterKey);
+        return 0;
+    }
 }
diff --git a/app/Http/Resources/user_catch_logResource.php b/app/Http/Resources/user_catch_logResource.php
deleted file mode 100644
index aaff0b4..0000000
--- a/app/Http/Resources/user_catch_logResource.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin \App\Models\FCEA\UserCatchLog */
-class user_catch_logResource extends JsonResource
-{
-    public function toArray(Request $request): array
-    {
-        return [
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-            'id' => $this->id,
-            'catch_code' => $this->catch_code,
-            'is_successful' => $this->is_successful,
-            'already_caught' => $this->already_caught,
-
-            'user_id' => $this->user_id,
-            'user_id' => $this->user_id,
-        ];
-    }
-}
diff --git a/routes/fcea.php b/routes/fcea.php
index 7426fcc..f199816 100644
--- a/routes/fcea.php
+++ b/routes/fcea.php
@@ -7,4 +7,4 @@
  */
 
 Route::get('/', [\App\Http\Controllers\FCEA\DashboardController::class, 'index'])->middleware('auth')->name('dashboard');
-Route::post('/',[\App\Http\Controllers\FCEA\DashboardController::class,'catch'])->middleware('auth')->middleware('throttle:'.config("fcea.fursuit_catch_attempts_per_minute").',1')->name('dashboard.catch');
+Route::post('/',[\App\Http\Controllers\FCEA\DashboardController::class,'catch'])->middleware('auth')->name('dashboard.catch');

From de62ebd51cff6780f0b164012add626c971b7a12 Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Fri, 30 Aug 2024 16:59:12 +0200
Subject: [PATCH 07/14] Adding command fursuit:create-catch-code, Adding
 Event_Id, newest_catch_at

---
 .../FursuitCreateCatchCodeCommand.php         | 19 ++++---
 .../Controllers/FCEA/DashboardController.php  | 57 ++++++++++++-------
 .../FCEA/UserCatchUserRankingCollection.php   | 17 ++++++
 .../FCEA/UserCatchUserRankingResource.php     | 31 ++++++++++
 app/Http/Resources/FursuitResource.php        |  2 +-
 .../{UserFursuitCatch.php => UserCatch.php}   |  2 +-
 app/Models/FCEA/UserCatchLog.php              |  4 +-
 ...erRanking.php => UserCatchUserRanking.php} |  2 +-
 app/Models/Fursuit/Fursuit.php                |  5 +-
 app/Models/User.php                           |  4 +-
 app/Rules/FursuitCatchCodeRule.php            |  2 +-
 .../Fursuit => Services}/FursuitCatchCode.php |  2 +-
 .../FCEA/UserFursuitCatchFactory.php          |  4 +-
 ...27_225952_create_user_catch_logs_table.php |  1 +
 ...1438_create_user_fursuit_catches_table.php |  6 +-
 ...er_fursuit_catches_user_rankings_table.php |  4 +-
 database/seeders/BalentySeeder.php            |  4 +-
 resources/js/Pages/FCEA/Dashboard.vue         | 14 ++++-
 routes/fcea.php                               |  2 +-
 19 files changed, 135 insertions(+), 47 deletions(-)
 rename database/seeders/FursuitCatchCodeSeeder.php => app/Console/Commands/FursuitCreateCatchCodeCommand.php (74%)
 create mode 100644 app/Http/Resources/FCEA/UserCatchUserRankingCollection.php
 create mode 100644 app/Http/Resources/FCEA/UserCatchUserRankingResource.php
 rename app/Models/FCEA/{UserFursuitCatch.php => UserCatch.php} (95%)
 rename app/Models/FCEA/{UserFursuitCatchesUserRanking.php => UserCatchUserRanking.php} (85%)
 rename app/{Models/Fursuit => Services}/FursuitCatchCode.php (96%)

diff --git a/database/seeders/FursuitCatchCodeSeeder.php b/app/Console/Commands/FursuitCreateCatchCodeCommand.php
similarity index 74%
rename from database/seeders/FursuitCatchCodeSeeder.php
rename to app/Console/Commands/FursuitCreateCatchCodeCommand.php
index 81dcd61..035251d 100644
--- a/database/seeders/FursuitCatchCodeSeeder.php
+++ b/app/Console/Commands/FursuitCreateCatchCodeCommand.php
@@ -1,19 +1,20 @@
 <?php
 
-namespace Database\Seeders;
+namespace App\Console\Commands;
 
-use App\Models\Badge\Badge;
-use App\Models\Event;
-use App\Models\FCEA\UserFursuitCatch;
 use App\Models\Fursuit\Fursuit;
-use Illuminate\Database\Seeder;
+use Illuminate\Console\Command;
 
-class FursuitCatchCodeSeeder extends Seeder
+class FursuitCreateCatchCodeCommand extends Command
 {
+    protected $signature = 'fursuit:create-catch-code';
+
+    protected $description = 'Command description';
+
     // Code which should be run once to generate all missing codes
     // Further Fursuit Creation/Updates should be caught by an observer
     // Will fill catch_em_all_code of fursuits who choose to participate
-    public function run(): void
+    public function handle(): void
     {
         $purgeAllCodes = false; // disabled as you might want keep codes (especially if badges are printed)
         $purgeCodesOfNonParticipants = false; // disabled as you might want to keep codes if users reenter the system at later time
@@ -26,12 +27,16 @@ public function run(): void
         if ($purgeCodesOfNonParticipants)
             Fursuit::where('catch_em_all', 0)->update(['catch_code' => null]);
 
+        $counter = 0;
         // Iterate and save manually to trigger Fursuit::saving()
         foreach (Fursuit::all() as $fursuit) {
             if (!$fursuit->catch_em_all || $fursuit->catch_code <> null)
                 continue;
 
+            $counter++;
             $fursuit->save();
         }
+
+        $this->info($counter.' Fursuit Catch Codes created!');
     }
 }
diff --git a/app/Http/Controllers/FCEA/DashboardController.php b/app/Http/Controllers/FCEA/DashboardController.php
index ba4edc8..dcda422 100644
--- a/app/Http/Controllers/FCEA/DashboardController.php
+++ b/app/Http/Controllers/FCEA/DashboardController.php
@@ -2,11 +2,12 @@
 
 namespace App\Http\Controllers\FCEA;
 
+use App\Enum\EventStateEnum;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UserCatchRequest;
 use App\Models\FCEA\UserCatchLog;
-use App\Models\FCEA\UserFursuitCatch;
-use App\Models\FCEA\UserFursuitCatchesUserRanking;
+use App\Models\FCEA\UserCatch;
+use App\Models\FCEA\UserCatchUserRanking;
 use App\Models\Fursuit\Fursuit;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
@@ -17,15 +18,26 @@ class DashboardController extends Controller
 {
     public function index()
     {
-        return Inertia::render('FCEA/Dashboard');
+        $fursuit = UserCatchUserRanking::query()->with("user")->get();
+        return Inertia::render('FCEA/Dashboard', [
+            'tempVar1' => 1,
+            'tempVar2' => 4,
+            'tempVar3' => "trololol",
+            'tempVar4' => $fursuit,
+        ]);
     }
     public function catch(UserCatchRequest $request)
     {
+        $event = \App\Models\Event::getActiveEvent();
+        if (!$event)
+            return "error"; // TODO
+
         if ($second = $this->IsLimited(Auth::id()))
             return 'You may try again in '.$second.' seconds.';
 
-        $catch_code = $request->validated("catch_code");
+        $catch_code = strtoupper($request->validated("catch_code"));
         $logEntry = new UserCatchLog();
+        $logEntry->event_id = $event->id;
         $logEntry->user_id = Auth::id();
         $logEntry->catch_code = $catch_code;
         $logEntry->is_successful = false;
@@ -38,7 +50,7 @@ public function catch(UserCatchRequest $request)
         }
 
         $logEntry->already_caught =
-            UserFursuitCatch::where('user_id', Auth::id())
+            UserCatch::where('user_id', Auth::id())
                             ->where('fursuit_id', $logEntry->tryGetFursuit()->id)
                              ->exists(); // Entry exists
 
@@ -51,18 +63,21 @@ public function catch(UserCatchRequest $request)
         $logEntry->is_successful = true;
         $logEntry->save();
 
-        $UserFursuitCatchEntry = new UserFursuitCatch();
-        $UserFursuitCatchEntry->user_id = Auth::id();
-        $UserFursuitCatchEntry->fursuit_id = $logEntry->tryGetFursuit()->id;
-        $UserFursuitCatchEntry->save();
-        $this->RefreshUserRanking();
+        $userCatch = new UserCatch();
+        $userCatch->event_id = $event->id;
+        $userCatch->user_id = Auth::id();
+        $userCatch->fursuit_id = $logEntry->tryGetFursuit()->id;
+        $userCatch->save();
+        //$this->RefreshUserRanking();
         return Inertia::render('FCEA/Dashboard');
     }
 
     public function RefreshUserRanking() {
         $catchersOrdered = User::query()
             ->withCount("fursuitsCatched")
+            ->withMax("fursuitsCatched","created_at")
             ->orderByDesc("fursuits_catched_count")
+            ->orderBy("fursuits_catched_max_created_at")
             ->get();
 
         // How many users do we have in totel (Users with 0 score are counted too)
@@ -79,7 +94,7 @@ public function RefreshUserRanking() {
         $previous = $current;
 
         // Clean Ranking
-        UserFursuitCatchesUserRanking::truncate();
+        UserCatchUserRanking::truncate();
 
         // Iterate all users to build Ranking
         foreach ($catchersOrdered as $catcher) {
@@ -90,21 +105,25 @@ public function RefreshUserRanking() {
                 $current['score'] = $catcher->fursuits_catched_count;
             }
 
-            $rankingEntry = new UserFursuitCatchesUserRanking();
-            $rankingEntry->user_id = $catcher->id;
-            $rankingEntry->rank = $current['rank'];
-            $rankingEntry->catches = $catcher->fursuits_catched_count;
-            $rankingEntry->catches_till_next = $previous['score'] - $current['score'];
-            $rankingEntry->users_behind = $maxCount - $previous['count'];
-            $rankingEntry->save();
+            $userRanking = new UserCatchUserRanking();
+            $userRanking->user_id = $catcher->id;
+            $userRanking->rank = $current['rank'];
+            $userRanking->catches = $catcher->fursuits_catched_count;
+            $userRanking->catches_till_next = $previous['score'] - $current['score'];
+            $userRanking->users_behind = $maxCount - $previous['count'];
+            $userRanking->newest_catch_at = $catcher->fursuits_catched_max_created_at;
+            $userRanking->save();
             $current['count']++;
         }
     }
 
+    // Small function to limit users interaction by id. By default 20 Catches per minute.
+    // User ID and Action can be modified on call, Limit per minute is set on config
+    // If successful, return is 0 otherwise return is the remaining seconds until next attempt is allowed.
     protected function IsLimited(int $identifier, string $action = 'fursuit_catch') : int
     {
         $rateLimiterKey = $action.':'.$identifier;
-        if (RateLimiter::tooManyAttempts($rateLimiterKey, $perMinute = config("fcea.fursuit_catch_attempts_per_minute")))
+        if (RateLimiter::tooManyAttempts($rateLimiterKey, config("fcea.fursuit_catch_attempts_per_minute")))
             return RateLimiter::availableIn($rateLimiterKey);
 
         RateLimiter::increment($rateLimiterKey);
diff --git a/app/Http/Resources/FCEA/UserCatchUserRankingCollection.php b/app/Http/Resources/FCEA/UserCatchUserRankingCollection.php
new file mode 100644
index 0000000..a8e0289
--- /dev/null
+++ b/app/Http/Resources/FCEA/UserCatchUserRankingCollection.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+/** @see \App\Models\FCEA\UserCatchUserRanking */
+class UserCatchUserRankingCollection extends ResourceCollection
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'data' => $this->collection,
+        ];
+    }
+}
diff --git a/app/Http/Resources/FCEA/UserCatchUserRankingResource.php b/app/Http/Resources/FCEA/UserCatchUserRankingResource.php
new file mode 100644
index 0000000..8bf0680
--- /dev/null
+++ b/app/Http/Resources/FCEA/UserCatchUserRankingResource.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\Species;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin \App\Models\FCEA\UserCatchUserRanking
+ * Builds a array with relevant data from user_catch_user_rankings
+ * Filters out unnecessary details
+ * withCount("user"), with("fursuit") and with("species") are recommended to save database load
+ * */
+class UserCatchUserRankingResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            "reg_id" => $this->user->attendee_id,
+            'status' => $this->status,
+            'name' => $this->name,
+            'published' => $this->published,
+            'catch_em_all' => $this->catch_em_all,
+            'image_url' => $this->image_url,
+            'badges_count' => $this->badges_count,
+
+            "species" => $this->species->only(["id", "name", "type"]),
+        ];
+    }
+}
diff --git a/app/Http/Resources/FursuitResource.php b/app/Http/Resources/FursuitResource.php
index 8ca016a..0e3ce25 100644
--- a/app/Http/Resources/FursuitResource.php
+++ b/app/Http/Resources/FursuitResource.php
@@ -17,7 +17,7 @@ public function toArray(Request $request): array
     {
         return [
             'id' => $this->id,
-            "reg_id" => (int) $this->user->attendee_id,
+            "reg_id" => $this->user->attendee_id,
             'status' => $this->status,
             'name' => $this->name,
             'published' => $this->published,
diff --git a/app/Models/FCEA/UserFursuitCatch.php b/app/Models/FCEA/UserCatch.php
similarity index 95%
rename from app/Models/FCEA/UserFursuitCatch.php
rename to app/Models/FCEA/UserCatch.php
index 5da0c99..785206f 100644
--- a/app/Models/FCEA/UserFursuitCatch.php
+++ b/app/Models/FCEA/UserCatch.php
@@ -11,7 +11,7 @@
 use Spatie\Activitylog\Traits\LogsActivity;
 
 // Model for the actual unique catches. Will be used to calculate statistics
-class UserFursuitCatch extends Model
+class UserCatch extends Model
 {
     use LogsActivity, HasFactory;
     public function user(): BelongsTo
diff --git a/app/Models/FCEA/UserCatchLog.php b/app/Models/FCEA/UserCatchLog.php
index 46ef07c..0c07dc9 100644
--- a/app/Models/FCEA/UserCatchLog.php
+++ b/app/Models/FCEA/UserCatchLog.php
@@ -33,8 +33,8 @@ public function tryGetFursuit() : Fursuit|null
     }
 
     // True means tryGetFursuit() will give an result. False means tryGetFursuit() will give null.
-    public function FursuitExist() : bool
+    public function fursuitExist() : bool
     {
-        return $this->TryGetFursuit() != null;
+        return $this->tryGetFursuit() != null;
     }
 }
diff --git a/app/Models/FCEA/UserFursuitCatchesUserRanking.php b/app/Models/FCEA/UserCatchUserRanking.php
similarity index 85%
rename from app/Models/FCEA/UserFursuitCatchesUserRanking.php
rename to app/Models/FCEA/UserCatchUserRanking.php
index 8d2f9d6..afa2818 100644
--- a/app/Models/FCEA/UserFursuitCatchesUserRanking.php
+++ b/app/Models/FCEA/UserCatchUserRanking.php
@@ -6,7 +6,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-class UserFursuitCatchesUserRanking extends Model
+class UserCatchUserRanking extends Model
 {
     public $timestamps = false;
 
diff --git a/app/Models/Fursuit/Fursuit.php b/app/Models/Fursuit/Fursuit.php
index 29e3dfd..7fd7b4b 100644
--- a/app/Models/Fursuit/Fursuit.php
+++ b/app/Models/Fursuit/Fursuit.php
@@ -4,10 +4,11 @@
 
 use App\Models\Badge\Badge;
 use App\Models\Event;
-use App\Models\FCEA\UserFursuitCatch;
+use App\Models\FCEA\UserCatch;
 use App\Models\Fursuit\States\FursuitStatusState;
 use App\Models\Species;
 use App\Models\User;
+use App\Services\FursuitCatchCode;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -116,7 +117,7 @@ public function isClaimedBySelf(User $user)
 
     public function catchedByUsers()
     {
-        return $this->hasMany(UserFursuitCatch::class);
+        return $this->hasMany(UserCatch::class);
     }
 
     public static function booted()
diff --git a/app/Models/User.php b/app/Models/User.php
index eacc24b..31bc61a 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -4,7 +4,7 @@
 
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
 use App\Models\Badge\Badge;
-use App\Models\FCEA\UserFursuitCatch;
+use App\Models\FCEA\UserCatch;
 use App\Models\Fursuit\Fursuit;
 use Bavix\Wallet\Interfaces\Customer;
 use Bavix\Wallet\Interfaces\Wallet;
@@ -65,7 +65,7 @@ public function fursuits()
 
     public function fursuitsCatched()
     {
-        return $this->hasMany(UserFursuitCatch::class);
+        return $this->hasMany(UserCatch::class);
     }
 
     public function canAccessPanel(Panel $panel): bool
diff --git a/app/Rules/FursuitCatchCodeRule.php b/app/Rules/FursuitCatchCodeRule.php
index e9a3abd..270cc3d 100644
--- a/app/Rules/FursuitCatchCodeRule.php
+++ b/app/Rules/FursuitCatchCodeRule.php
@@ -10,7 +10,7 @@ class FursuitCatchCodeRule implements ValidationRule
 {
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        if (! preg_match('/^[a-zA-Z0-9]+$/u', $value)) {
+        if (!preg_match('/^[a-zA-Z0-9]+$/u', $value)) {
             $fail(Str::ucfirst($attribute) . ' can only contain letters and numbers');
         }
     }
diff --git a/app/Models/Fursuit/FursuitCatchCode.php b/app/Services/FursuitCatchCode.php
similarity index 96%
rename from app/Models/Fursuit/FursuitCatchCode.php
rename to app/Services/FursuitCatchCode.php
index 57b6fca..a2c54ef 100644
--- a/app/Models/Fursuit/FursuitCatchCode.php
+++ b/app/Services/FursuitCatchCode.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Fursuit;
+namespace App\Services;
 
 use Illuminate\Support\Str;
 
diff --git a/database/factories/FCEA/UserFursuitCatchFactory.php b/database/factories/FCEA/UserFursuitCatchFactory.php
index 9b5c2cb..227165c 100644
--- a/database/factories/FCEA/UserFursuitCatchFactory.php
+++ b/database/factories/FCEA/UserFursuitCatchFactory.php
@@ -3,7 +3,7 @@
 
 namespace Database\Factories\FCEA;
 
-use App\Models\FCEA\UserFursuitCatch;
+use App\Models\FCEA\UserCatch;
 use App\Models\Fursuit\Fursuit;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -11,7 +11,7 @@
 
 class UserFursuitCatchFactory extends Factory
 {
-    protected $model = UserFursuitCatch::class;
+    protected $model = UserCatch::class;
 
     public function definition(): array
     {
diff --git a/database/migrations/2024_08_27_225952_create_user_catch_logs_table.php b/database/migrations/2024_08_27_225952_create_user_catch_logs_table.php
index 010c9da..0853443 100644
--- a/database/migrations/2024_08_27_225952_create_user_catch_logs_table.php
+++ b/database/migrations/2024_08_27_225952_create_user_catch_logs_table.php
@@ -10,6 +10,7 @@ public function up(): void
     {
         Schema::create('user_catch_logs', function (Blueprint $table) {
             $table->id();
+            $table->foreignIdFor(Event::class)->constrained()->cascadeOnDelete();
             $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
             $table->string('catch_code', 255);
             $table->boolean('is_successful');
diff --git a/database/migrations/2024_08_28_021438_create_user_fursuit_catches_table.php b/database/migrations/2024_08_28_021438_create_user_fursuit_catches_table.php
index af31b76..3f74ebe 100644
--- a/database/migrations/2024_08_28_021438_create_user_fursuit_catches_table.php
+++ b/database/migrations/2024_08_28_021438_create_user_fursuit_catches_table.php
@@ -2,6 +2,7 @@
 
 use App\Models\Fursuit\Fursuit;
 use App\Models\User;
+use App\Models\Event;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -9,8 +10,9 @@
 return new class extends Migration {
     public function up(): void
     {
-        Schema::create('user_fursuit_catches', function (Blueprint $table) {
+        Schema::create('user_catches', function (Blueprint $table) {
             $table->id();
+            $table->foreignIdFor(Event::class)->constrained()->cascadeOnDelete();
             $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
             $table->foreignIdFor(Fursuit::class)->constrained()->cascadeOnDelete();
             $table->timestamps();
@@ -20,6 +22,6 @@ public function up(): void
 
     public function down(): void
     {
-        Schema::dropIfExists('user_fursuit_catches');
+        Schema::dropIfExists('user_catches');
     }
 };
diff --git a/database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php b/database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php
index 56d944e..71e6e05 100644
--- a/database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php
+++ b/database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php
@@ -8,7 +8,7 @@
 return new class extends Migration {
     public function up(): void
     {
-        Schema::create('user_fursuit_catches_user_rankings', function (Blueprint $table) {
+        Schema::create('user_catch_user_rankings', function (Blueprint $table) {
             $table->integer('rank');
             $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
             $table->integer('catches');
@@ -19,6 +19,6 @@ public function up(): void
 
     public function down(): void
     {
-        Schema::dropIfExists('user_fursuit_catches_user_rankings');
+        Schema::dropIfExists('user_catch_user_rankings');
     }
 };
diff --git a/database/seeders/BalentySeeder.php b/database/seeders/BalentySeeder.php
index 521f0fa..ac521c9 100644
--- a/database/seeders/BalentySeeder.php
+++ b/database/seeders/BalentySeeder.php
@@ -4,7 +4,7 @@
 
 use App\Models\Badge\Badge;
 use App\Models\Event;
-use App\Models\FCEA\UserFursuitCatch;
+use App\Models\FCEA\UserCatch;
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Artisan;
@@ -19,6 +19,6 @@ public function run(): void
         Artisan::call("event:state preorder");
         $event =  Event::first();
         Badge::factory(30)->recycle($event)->create();
-        UserFursuitCatch::factory(30)->recycle($event)->create();
+        UserCatch::factory(30)->recycle($event)->create();
     }
 }
diff --git a/resources/js/Pages/FCEA/Dashboard.vue b/resources/js/Pages/FCEA/Dashboard.vue
index 82760cf..b6a4720 100644
--- a/resources/js/Pages/FCEA/Dashboard.vue
+++ b/resources/js/Pages/FCEA/Dashboard.vue
@@ -7,6 +7,14 @@ import Button from 'primevue/button';
 const form = useForm('post', route('fcea.dashboard.catch'), {
     catch_code: ""
 })
+const props = defineProps(
+    {
+        tempVar1: Number,
+        tempVar2: Number,
+        tempVar3: String,
+        tempVar4: Object
+    }
+)
 
 function submit() {
     form.submit();
@@ -21,13 +29,17 @@ function submit() {
             <h3>Fursuit Catch Em All</h3>
         </div>
         <div class="card-body">
+            <h4 class="text-center">Var1 #{{ tempVar1 }}</h4>
+            <h4 class="text-center">Var2 #{{ tempVar2 }}</h4>
+            <h4 class="text-center">Var3 #{{ tempVar3 }}</h4>
+            <h4 class="text-center">Fursuit #{{ tempVar4[0]['user_id'] }}</h4>
             <h4 class="text-center">Place #{{ place }}</h4>
             <p class="text-center"><small>{{ toNextPlace }} more to advance to the next place</small></p>
             <p class="text-center"><small>{{ behindYou }} behind you</small></p>
 
             <div class="text-center">
                  <input type="text" class="form-control mb-2" v-model="form.catch_code" placeholder="Enter Code" />
-                <button class="btn btn-primary" @click="submit()">Submit ></button>
+                <Button class="btn btn-primary" @click="submit()">Submit ></Button>
             </div>
 
             <div class="mt-4">
diff --git a/routes/fcea.php b/routes/fcea.php
index f199816..79d381e 100644
--- a/routes/fcea.php
+++ b/routes/fcea.php
@@ -7,4 +7,4 @@
  */
 
 Route::get('/', [\App\Http\Controllers\FCEA\DashboardController::class, 'index'])->middleware('auth')->name('dashboard');
-Route::post('/',[\App\Http\Controllers\FCEA\DashboardController::class,'catch'])->middleware('auth')->name('dashboard.catch');
+Route::post('/',[\App\Http\Controllers\FCEA\DashboardController::class, 'catch'])->middleware('auth')->name('dashboard.catch');

From 8279c379d28ef51c54c353071d18f260a29b65d1 Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Sat, 31 Aug 2024 03:46:12 +0200
Subject: [PATCH 08/14] Adding Fursuit Ranking

---
 .../Controllers/FCEA/DashboardController.php  | 78 +++++++++++++++----
 app/Models/FCEA/UserCatchFursuitRanking.php   | 24 ++++++
 app/Models/FCEA/UserCatchUserRanking.php      |  7 ++
 ...r_fursuit_catches_user_rankings_table.php} | 10 ++-
 ...eate_user_catch_fursuit_rankings_table.php | 26 +++++++
 5 files changed, 126 insertions(+), 19 deletions(-)
 create mode 100644 app/Models/FCEA/UserCatchFursuitRanking.php
 rename database/migrations/{2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php => 2024_08_28_070324_create_user_fursuit_catches_user_rankings_table.php} (60%)
 create mode 100644 database/migrations/2024_08_31_005045_create_user_catch_fursuit_rankings_table.php

diff --git a/app/Http/Controllers/FCEA/DashboardController.php b/app/Http/Controllers/FCEA/DashboardController.php
index dcda422..485da12 100644
--- a/app/Http/Controllers/FCEA/DashboardController.php
+++ b/app/Http/Controllers/FCEA/DashboardController.php
@@ -5,6 +5,7 @@
 use App\Enum\EventStateEnum;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UserCatchRequest;
+use App\Models\FCEA\userCatchFursuitRanking;
 use App\Models\FCEA\UserCatchLog;
 use App\Models\FCEA\UserCatch;
 use App\Models\FCEA\UserCatchUserRanking;
@@ -68,26 +69,27 @@ public function catch(UserCatchRequest $request)
         $userCatch->user_id = Auth::id();
         $userCatch->fursuit_id = $logEntry->tryGetFursuit()->id;
         $userCatch->save();
-        //$this->RefreshUserRanking();
+        $this->RefreshUserRanking();
         return Inertia::render('FCEA/Dashboard');
     }
 
+    // Function to build User Ranking. Truncated Table and iterates all users. Similar to the Fursuit Ranking
     public function RefreshUserRanking() {
-        $catchersOrdered = User::query()
+        $usersOrdered = User::query()
             ->withCount("fursuitsCatched")
             ->withMax("fursuitsCatched","created_at")
             ->orderByDesc("fursuits_catched_count")
             ->orderBy("fursuits_catched_max_created_at")
             ->get();
 
-        // How many users do we have in totel (Users with 0 score are counted too)
-        $maxCount = $catchersOrdered->count();
+        // How many users do we have in total (Users with 0 score are counted too)
+        $maxCount = $usersOrdered->count();
 
-        // Save required informations for iteration
+        // Save required information for iteration
         $current = array(
             'count' => 1,
             'rank' => 1,
-            'score' => $catchersOrdered->first()->fursuits_catched_count
+            'score' => $usersOrdered->first()->fursuits_catched_count
         );
 
         // Need to have stats of previous Rank
@@ -97,27 +99,73 @@ public function RefreshUserRanking() {
         UserCatchUserRanking::truncate();
 
         // Iterate all users to build Ranking
-        foreach ($catchersOrdered as $catcher) {
+        foreach ($usersOrdered as $user) {
             // Increase Rank when Score updates (players get same rank with same score)
-            if ($current['score'] > $catcher->fursuits_catched_count) {
+            if ($current['score'] > $user->fursuits_catched_count) {
                 $previous = $current;
                 $current['rank']++;
-                $current['score'] = $catcher->fursuits_catched_count;
+                $current['score'] = $user->fursuits_catched_count;
             }
 
             $userRanking = new UserCatchUserRanking();
-            $userRanking->user_id = $catcher->id;
+            $userRanking->user_id = $user->id;
             $userRanking->rank = $current['rank'];
-            $userRanking->catches = $catcher->fursuits_catched_count;
-            $userRanking->catches_till_next = $previous['score'] - $current['score'];
-            $userRanking->users_behind = $maxCount - $previous['count'];
-            $userRanking->newest_catch_at = $catcher->fursuits_catched_max_created_at;
+            $userRanking->score = $user->fursuits_catched_count;
+            $userRanking->score_till_next = $previous['score'] - $current['score'];
+            $userRanking->others_behind = $maxCount - $previous['count'];
+            $userRanking->score_reached_at = $user->fursuits_catched_max_created_at;
             $userRanking->save();
             $current['count']++;
         }
     }
 
-    // Small function to limit users interaction by id. By default 20 Catches per minute.
+    // Function to build Fursuit Ranking. Truncated Table and iterates all fursuits. Similar to the User Ranking
+    public function RefreshFursuitRanking() {
+        $fursuitsOrdered = Fursuit::query()
+            ->withCount("catchedByUsers")
+            ->withMax("catchedByUsers","created_at")
+            ->orderByDesc("catched_by_users_count")
+            ->orderBy("catched_by_users_max_created_at")
+            ->get();
+
+        // How many users do we have in total (Users with 0 score are counted too)
+        $maxCount = $fursuitsOrdered->count();
+
+        // Save required information for iteration
+        $current = array(
+            'count' => 1,
+            'rank' => 1,
+            'score' => $fursuitsOrdered->first()->catched_by_users_count
+        );
+
+        // Need to have stats of previous Rank
+        $previous = $current;
+
+        // Clean Ranking
+        UserCatchFursuitRanking::truncate();
+
+        // Iterate all users to build Ranking
+        foreach ($fursuitsOrdered as $fursuit) {
+            // Increase Rank when Score updates (players get same rank with same score)
+            if ($current['score'] > $fursuit->catched_by_users_count) {
+                $previous = $current;
+                $current['rank']++;
+                $current['score'] = $fursuit->catched_by_users_count;
+            }
+
+            $fursuitRanking = new UserCatchFursuitRanking();
+            $fursuitRanking->fursuit_id = $fursuit->id;
+            $fursuitRanking->rank = $current['rank'];
+            $fursuitRanking->score = $fursuit->catched_by_users_count;
+            $fursuitRanking->score_till_next = $previous['score'] - $current['score'];
+            $fursuitRanking->others_behind = $maxCount - $previous['count'];
+            $fursuitRanking->score_reached_at = $fursuit->catched_by_users_max_created_at;
+            $fursuitRanking->save();
+            $current['count']++;
+        }
+    }
+
+    // Small function to limit users interaction by id. By default, 20 Catches per minute.
     // User ID and Action can be modified on call, Limit per minute is set on config
     // If successful, return is 0 otherwise return is the remaining seconds until next attempt is allowed.
     protected function IsLimited(int $identifier, string $action = 'fursuit_catch') : int
diff --git a/app/Models/FCEA/UserCatchFursuitRanking.php b/app/Models/FCEA/UserCatchFursuitRanking.php
new file mode 100644
index 0000000..a54c376
--- /dev/null
+++ b/app/Models/FCEA/UserCatchFursuitRanking.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models\FCEA;
+
+use App\Models\Fursuit\Fursuit;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class userCatchFursuitRanking extends Model
+{
+    public $timestamps = false;
+
+    public function fursuit(): BelongsTo
+    {
+        return $this->belongsTo(Fursuit::class);
+    }
+
+    protected function casts(): array
+    {
+        return [
+            'score_reached_at' => 'timestamp',
+        ];
+    }
+}
diff --git a/app/Models/FCEA/UserCatchUserRanking.php b/app/Models/FCEA/UserCatchUserRanking.php
index afa2818..d94ee0d 100644
--- a/app/Models/FCEA/UserCatchUserRanking.php
+++ b/app/Models/FCEA/UserCatchUserRanking.php
@@ -14,4 +14,11 @@ public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
+
+    protected function casts(): array
+    {
+        return [
+            'score_reached_at' => 'timestamp',
+        ];
+    }
 }
diff --git a/database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php b/database/migrations/2024_08_28_070324_create_user_fursuit_catches_user_rankings_table.php
similarity index 60%
rename from database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php
rename to database/migrations/2024_08_28_070324_create_user_fursuit_catches_user_rankings_table.php
index 71e6e05..c4dbdc6 100644
--- a/database/migrations/2024_08_28_050324_create_user_fursuit_catches_user_rankings_table.php
+++ b/database/migrations/2024_08_28_070324_create_user_fursuit_catches_user_rankings_table.php
@@ -9,11 +9,13 @@
     public function up(): void
     {
         Schema::create('user_catch_user_rankings', function (Blueprint $table) {
+            $table->id();
             $table->integer('rank');
-            $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
-            $table->integer('catches');
-            $table->integer('catches_till_next');
-            $table->integer('users_behind');
+            $table->foreignIdFor(User::class)->unique()->constrained()->cascadeOnDelete();
+            $table->integer('score');
+            $table->integer('score_till_next');
+            $table->integer('others_behind');
+            $table->timestamp('score_reached_at')->nullable();
         });
     }
 
diff --git a/database/migrations/2024_08_31_005045_create_user_catch_fursuit_rankings_table.php b/database/migrations/2024_08_31_005045_create_user_catch_fursuit_rankings_table.php
new file mode 100644
index 0000000..f570498
--- /dev/null
+++ b/database/migrations/2024_08_31_005045_create_user_catch_fursuit_rankings_table.php
@@ -0,0 +1,26 @@
+<?php
+
+use App\Models\Fursuit\Fursuit;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::create('user_catch_fursuit_rankings', function (Blueprint $table) {
+            $table->id();
+            $table->integer('rank');
+            $table->foreignIdFor(Fursuit::class)->unique()->constrained()->cascadeOnDelete();
+            $table->integer('score');
+            $table->integer('score_till_next');
+            $table->integer('others_behind');
+            $table->timestamp('score_reached_at')->nullable();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('user_catch_fursuit_rankings');
+    }
+};

From 7c1bdfb80cd059a3397fead0e4a418d2aced76ba Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Sun, 1 Sep 2024 05:51:14 +0200
Subject: [PATCH 09/14] Merging Fursuit and User Ranking Model. DB Transactions
 for Ranking refresh

---
 .../Controllers/FCEA/DashboardController.php  | 29 +++++++++----
 ...ion.php => UserCatchRankingCollection.php} |  4 +-
 .../FCEA/UserCatchRankingResource.php         | 28 +++++++++++++
 .../FCEA/UserCatchUserRankingResource.php     | 31 --------------
 app/Models/FCEA/UserCatchFursuitRanking.php   | 24 -----------
 app/Models/FCEA/UserCatchRanking.php          | 41 +++++++++++++++++++
 app/Models/FCEA/UserCatchUserRanking.php      | 24 -----------
 ...er_fursuit_catches_user_rankings_table.php | 26 ------------
 ...eate_user_catch_fursuit_rankings_table.php | 26 ------------
 ...27325_create_user_catch_rankings_table.php | 36 ++++++++++++++++
 10 files changed, 127 insertions(+), 142 deletions(-)
 rename app/Http/Resources/FCEA/{UserCatchUserRankingCollection.php => UserCatchRankingCollection.php} (69%)
 create mode 100644 app/Http/Resources/FCEA/UserCatchRankingResource.php
 delete mode 100644 app/Http/Resources/FCEA/UserCatchUserRankingResource.php
 delete mode 100644 app/Models/FCEA/UserCatchFursuitRanking.php
 create mode 100644 app/Models/FCEA/UserCatchRanking.php
 delete mode 100644 app/Models/FCEA/UserCatchUserRanking.php
 delete mode 100644 database/migrations/2024_08_28_070324_create_user_fursuit_catches_user_rankings_table.php
 delete mode 100644 database/migrations/2024_08_31_005045_create_user_catch_fursuit_rankings_table.php
 create mode 100644 database/migrations/2024_09_01_027325_create_user_catch_rankings_table.php

diff --git a/app/Http/Controllers/FCEA/DashboardController.php b/app/Http/Controllers/FCEA/DashboardController.php
index 485da12..26b3256 100644
--- a/app/Http/Controllers/FCEA/DashboardController.php
+++ b/app/Http/Controllers/FCEA/DashboardController.php
@@ -5,13 +5,13 @@
 use App\Enum\EventStateEnum;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UserCatchRequest;
-use App\Models\FCEA\userCatchFursuitRanking;
 use App\Models\FCEA\UserCatchLog;
 use App\Models\FCEA\UserCatch;
-use App\Models\FCEA\UserCatchUserRanking;
+use App\Models\FCEA\UserCatchRanking;
 use App\Models\Fursuit\Fursuit;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\RateLimiter;
 use Inertia\Inertia;
 
@@ -19,7 +19,7 @@ class DashboardController extends Controller
 {
     public function index()
     {
-        $fursuit = UserCatchUserRanking::query()->with("user")->get();
+        $fursuit = UserCatchRanking::query()->with("user")->get();
         return Inertia::render('FCEA/Dashboard', [
             'tempVar1' => 1,
             'tempVar2' => 4,
@@ -29,6 +29,8 @@ public function index()
     }
     public function catch(UserCatchRequest $request)
     {
+        $this->RefreshUserRanking();
+        $this->RefreshFursuitRanking();
         $event = \App\Models\Event::getActiveEvent();
         if (!$event)
             return "error"; // TODO
@@ -69,7 +71,6 @@ public function catch(UserCatchRequest $request)
         $userCatch->user_id = Auth::id();
         $userCatch->fursuit_id = $logEntry->tryGetFursuit()->id;
         $userCatch->save();
-        $this->RefreshUserRanking();
         return Inertia::render('FCEA/Dashboard');
     }
 
@@ -95,8 +96,10 @@ public function RefreshUserRanking() {
         // Need to have stats of previous Rank
         $previous = $current;
 
+        DB::beginTransaction();
+
         // Clean Ranking
-        UserCatchUserRanking::truncate();
+        UserCatchRanking::where('user_id', '<>', null)->delete();
 
         // Iterate all users to build Ranking
         foreach ($usersOrdered as $user) {
@@ -107,7 +110,8 @@ public function RefreshUserRanking() {
                 $current['score'] = $user->fursuits_catched_count;
             }
 
-            $userRanking = new UserCatchUserRanking();
+            $userRanking = new UserCatchRanking();
+            $userRanking->id = $current['count'];
             $userRanking->user_id = $user->id;
             $userRanking->rank = $current['rank'];
             $userRanking->score = $user->fursuits_catched_count;
@@ -117,6 +121,8 @@ public function RefreshUserRanking() {
             $userRanking->save();
             $current['count']++;
         }
+
+        DB::commit();
     }
 
     // Function to build Fursuit Ranking. Truncated Table and iterates all fursuits. Similar to the User Ranking
@@ -141,10 +147,12 @@ public function RefreshFursuitRanking() {
         // Need to have stats of previous Rank
         $previous = $current;
 
+        DB::beginTransaction();
+
         // Clean Ranking
-        UserCatchFursuitRanking::truncate();
+        UserCatchRanking::where('fursuit_id', '<>', null)->delete();
 
-        // Iterate all users to build Ranking
+        // Iterate all fursuits to build Ranking
         foreach ($fursuitsOrdered as $fursuit) {
             // Increase Rank when Score updates (players get same rank with same score)
             if ($current['score'] > $fursuit->catched_by_users_count) {
@@ -153,7 +161,8 @@ public function RefreshFursuitRanking() {
                 $current['score'] = $fursuit->catched_by_users_count;
             }
 
-            $fursuitRanking = new UserCatchFursuitRanking();
+            $fursuitRanking = new UserCatchRanking();
+            $fursuitRanking->id = $current['count'];
             $fursuitRanking->fursuit_id = $fursuit->id;
             $fursuitRanking->rank = $current['rank'];
             $fursuitRanking->score = $fursuit->catched_by_users_count;
@@ -163,6 +172,8 @@ public function RefreshFursuitRanking() {
             $fursuitRanking->save();
             $current['count']++;
         }
+
+        DB::commit();
     }
 
     // Small function to limit users interaction by id. By default, 20 Catches per minute.
diff --git a/app/Http/Resources/FCEA/UserCatchUserRankingCollection.php b/app/Http/Resources/FCEA/UserCatchRankingCollection.php
similarity index 69%
rename from app/Http/Resources/FCEA/UserCatchUserRankingCollection.php
rename to app/Http/Resources/FCEA/UserCatchRankingCollection.php
index a8e0289..57d9c8a 100644
--- a/app/Http/Resources/FCEA/UserCatchUserRankingCollection.php
+++ b/app/Http/Resources/FCEA/UserCatchRankingCollection.php
@@ -5,8 +5,8 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
-/** @see \App\Models\FCEA\UserCatchUserRanking */
-class UserCatchUserRankingCollection extends ResourceCollection
+/** @see \App\Models\FCEA\UserCatchRanking */
+class UserCatchRankingCollection extends ResourceCollection
 {
     public function toArray(Request $request): array
     {
diff --git a/app/Http/Resources/FCEA/UserCatchRankingResource.php b/app/Http/Resources/FCEA/UserCatchRankingResource.php
new file mode 100644
index 0000000..0d858b8
--- /dev/null
+++ b/app/Http/Resources/FCEA/UserCatchRankingResource.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Resources\FCEA;
+
+use App\Http\Resources\FursuitResource;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin \App\Models\FCEA\UserCatchRanking */
+class UserCatchRankingResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'rank' => $this->rank,
+            'score' => $this->score,
+            'score_till_next' => $this->score_till_next,
+            'others_behind' => $this->others_behind,
+            'score_reached_at' => $this->score_reached_at,
+
+            'user_id' => $this->user_id,
+            'fursuit_id' => $this->fursuit_id,
+
+            'fursuit' => new FursuitResource($this->whenLoaded('fursuit')),
+        ];
+    }
+}
diff --git a/app/Http/Resources/FCEA/UserCatchUserRankingResource.php b/app/Http/Resources/FCEA/UserCatchUserRankingResource.php
deleted file mode 100644
index 8bf0680..0000000
--- a/app/Http/Resources/FCEA/UserCatchUserRankingResource.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Models\Species;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin \App\Models\FCEA\UserCatchUserRanking
- * Builds a array with relevant data from user_catch_user_rankings
- * Filters out unnecessary details
- * withCount("user"), with("fursuit") and with("species") are recommended to save database load
- * */
-class UserCatchUserRankingResource extends JsonResource
-{
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            "reg_id" => $this->user->attendee_id,
-            'status' => $this->status,
-            'name' => $this->name,
-            'published' => $this->published,
-            'catch_em_all' => $this->catch_em_all,
-            'image_url' => $this->image_url,
-            'badges_count' => $this->badges_count,
-
-            "species" => $this->species->only(["id", "name", "type"]),
-        ];
-    }
-}
diff --git a/app/Models/FCEA/UserCatchFursuitRanking.php b/app/Models/FCEA/UserCatchFursuitRanking.php
deleted file mode 100644
index a54c376..0000000
--- a/app/Models/FCEA/UserCatchFursuitRanking.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Models\FCEA;
-
-use App\Models\Fursuit\Fursuit;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-class userCatchFursuitRanking extends Model
-{
-    public $timestamps = false;
-
-    public function fursuit(): BelongsTo
-    {
-        return $this->belongsTo(Fursuit::class);
-    }
-
-    protected function casts(): array
-    {
-        return [
-            'score_reached_at' => 'timestamp',
-        ];
-    }
-}
diff --git a/app/Models/FCEA/UserCatchRanking.php b/app/Models/FCEA/UserCatchRanking.php
new file mode 100644
index 0000000..4822341
--- /dev/null
+++ b/app/Models/FCEA/UserCatchRanking.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Models\FCEA;
+
+use App\Models\Fursuit\Fursuit;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+// Model of the Ranking entrys for fursuits and users. Contains user_id and fursuit_id but only one of them is used at a time.
+// Depends if it is a user ranking entry or fursuit ranking entry
+class UserCatchRanking extends Model
+{
+    public $timestamps = false;
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function fursuit(): BelongsTo
+    {
+        return $this->belongsTo(Fursuit::class);
+    }
+
+    public function hasUser(): bool
+    {
+        return $this->user_id <> null;
+    }
+
+    public function hasFursuit(): bool
+    {
+        return $this->fursuit_id <> null;
+    }
+    protected function casts(): array
+    {
+        return [
+            'score_reached_at' => 'timestamp',
+        ];
+    }
+}
diff --git a/app/Models/FCEA/UserCatchUserRanking.php b/app/Models/FCEA/UserCatchUserRanking.php
deleted file mode 100644
index d94ee0d..0000000
--- a/app/Models/FCEA/UserCatchUserRanking.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Models\FCEA;
-
-use App\Models\User;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-class UserCatchUserRanking extends Model
-{
-    public $timestamps = false;
-
-    public function user(): BelongsTo
-    {
-        return $this->belongsTo(User::class);
-    }
-
-    protected function casts(): array
-    {
-        return [
-            'score_reached_at' => 'timestamp',
-        ];
-    }
-}
diff --git a/database/migrations/2024_08_28_070324_create_user_fursuit_catches_user_rankings_table.php b/database/migrations/2024_08_28_070324_create_user_fursuit_catches_user_rankings_table.php
deleted file mode 100644
index c4dbdc6..0000000
--- a/database/migrations/2024_08_28_070324_create_user_fursuit_catches_user_rankings_table.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-use App\Models\User;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-    public function up(): void
-    {
-        Schema::create('user_catch_user_rankings', function (Blueprint $table) {
-            $table->id();
-            $table->integer('rank');
-            $table->foreignIdFor(User::class)->unique()->constrained()->cascadeOnDelete();
-            $table->integer('score');
-            $table->integer('score_till_next');
-            $table->integer('others_behind');
-            $table->timestamp('score_reached_at')->nullable();
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::dropIfExists('user_catch_user_rankings');
-    }
-};
diff --git a/database/migrations/2024_08_31_005045_create_user_catch_fursuit_rankings_table.php b/database/migrations/2024_08_31_005045_create_user_catch_fursuit_rankings_table.php
deleted file mode 100644
index f570498..0000000
--- a/database/migrations/2024_08_31_005045_create_user_catch_fursuit_rankings_table.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-use App\Models\Fursuit\Fursuit;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-    public function up(): void
-    {
-        Schema::create('user_catch_fursuit_rankings', function (Blueprint $table) {
-            $table->id();
-            $table->integer('rank');
-            $table->foreignIdFor(Fursuit::class)->unique()->constrained()->cascadeOnDelete();
-            $table->integer('score');
-            $table->integer('score_till_next');
-            $table->integer('others_behind');
-            $table->timestamp('score_reached_at')->nullable();
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::dropIfExists('user_catch_fursuit_rankings');
-    }
-};
diff --git a/database/migrations/2024_09_01_027325_create_user_catch_rankings_table.php b/database/migrations/2024_09_01_027325_create_user_catch_rankings_table.php
new file mode 100644
index 0000000..0c6c8fa
--- /dev/null
+++ b/database/migrations/2024_09_01_027325_create_user_catch_rankings_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use App\Models\Fursuit\Fursuit;
+use App\Models\User;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use PhpParser\Node\Expr\AssignOp\Coalesce;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::create('user_catch_rankings', function (Blueprint $table) {
+            $table->integer('id');
+            $table->integer('rank');
+            $table->foreignIdFor(User::class)->nullable()->unique()->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(Fursuit::class)->nullable()->unique()->constrained()->cascadeOnDelete();
+            $table->integer('score');
+            $table->integer('score_till_next');
+            $table->integer('others_behind');
+            $table->timestamp('score_reached_at')->nullable();
+        });
+
+        DB::statement(
+            'ALTER TABLE user_catch_rankings
+                    ADD CONSTRAINT user_xor_fursuit_exist
+                    CHECK ((user_id IS NOT NULL OR fursuit_id IS NOT NULL)
+                               AND NOT (user_id IS NOT NULL AND fursuit_id IS NOT NULL));'
+        );
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('user_catch_rankings');
+    }
+};

From 9b31fd54b068c748d403bdbda6fca2de245bda8c Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Thu, 5 Sep 2024 22:02:08 +0200
Subject: [PATCH 10/14] Providing UserInfo and UserRanking to Frontend

---
 .../Controllers/FCEA/DashboardController.php  | 15 +++++-----
 app/Models/FCEA/UserCatchRanking.php          | 29 +++++++++++++++++++
 resources/js/Pages/FCEA/Dashboard.vue         | 16 ++++------
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/FCEA/DashboardController.php b/app/Http/Controllers/FCEA/DashboardController.php
index 26b3256..de42c52 100644
--- a/app/Http/Controllers/FCEA/DashboardController.php
+++ b/app/Http/Controllers/FCEA/DashboardController.php
@@ -19,12 +19,11 @@ class DashboardController extends Controller
 {
     public function index()
     {
-        $fursuit = UserCatchRanking::query()->with("user")->get();
+        $myUserInfo = UserCatchRanking::getInfoOfUser(Auth::id());
+        $userRanking = UserCatchRanking::queryUserRanking()->get();
         return Inertia::render('FCEA/Dashboard', [
-            'tempVar1' => 1,
-            'tempVar2' => 4,
-            'tempVar3' => "trololol",
-            'tempVar4' => $fursuit,
+            'myUserInfo' => $myUserInfo,
+            'userRanking' => $userRanking,
         ]);
     }
     public function catch(UserCatchRequest $request)
@@ -33,7 +32,7 @@ public function catch(UserCatchRequest $request)
         $this->RefreshFursuitRanking();
         $event = \App\Models\Event::getActiveEvent();
         if (!$event)
-            return "error"; // TODO
+            return "No Active Event"; // TODO
 
         if ($second = $this->IsLimited(Auth::id()))
             return 'You may try again in '.$second.' seconds.';
@@ -99,7 +98,7 @@ public function RefreshUserRanking() {
         DB::beginTransaction();
 
         // Clean Ranking
-        UserCatchRanking::where('user_id', '<>', null)->delete();
+        UserCatchRanking::deleteUserRanking();
 
         // Iterate all users to build Ranking
         foreach ($usersOrdered as $user) {
@@ -150,7 +149,7 @@ public function RefreshFursuitRanking() {
         DB::beginTransaction();
 
         // Clean Ranking
-        UserCatchRanking::where('fursuit_id', '<>', null)->delete();
+        UserCatchRanking::deleteFursuitRanking();
 
         // Iterate all fursuits to build Ranking
         foreach ($fursuitsOrdered as $fursuit) {
diff --git a/app/Models/FCEA/UserCatchRanking.php b/app/Models/FCEA/UserCatchRanking.php
index 4822341..53a383c 100644
--- a/app/Models/FCEA/UserCatchRanking.php
+++ b/app/Models/FCEA/UserCatchRanking.php
@@ -6,6 +6,7 @@
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Builder;
 
 // Model of the Ranking entrys for fursuits and users. Contains user_id and fursuit_id but only one of them is used at a time.
 // Depends if it is a user ranking entry or fursuit ranking entry
@@ -32,6 +33,34 @@ public function hasFursuit(): bool
     {
         return $this->fursuit_id <> null;
     }
+
+    static public function getInfoOfUser(int $userId): UserCatchRanking
+    {
+        return UserCatchRanking::where('user_id', '=', $userId)->with("user")->first();
+    }
+    static public function getInfoOfFursuit(int $fursuitId): UserCatchRanking
+    {
+        return UserCatchRanking::where('fursuit_id', '=', $fursuitId)->with("fursuit")->first();
+    }
+
+    static public function deleteUserRanking(): void
+    {
+        UserCatchRanking::where('user_id', '<>', null)->delete();
+    }
+    static public function deleteFursuitRanking(): void
+    {
+        UserCatchRanking::where('fursuit_id', '<>', null)->delete();
+    }
+
+    static public function queryUserRanking(): \LaravelIdea\Helper\App\Models\FCEA\_IH_UserCatchRanking_QB|Builder
+    {
+        return UserCatchRanking::where('user_id', '<>', null)->with("user");
+    }
+    static public function queryFursuitRanking(): \LaravelIdea\Helper\App\Models\FCEA\_IH_UserCatchRanking_QB|Builder
+    {
+        return UserCatchRanking::where('fursuit_id', '<>', null)->with("fursuit");
+    }
+
     protected function casts(): array
     {
         return [
diff --git a/resources/js/Pages/FCEA/Dashboard.vue b/resources/js/Pages/FCEA/Dashboard.vue
index b6a4720..9aa9c77 100644
--- a/resources/js/Pages/FCEA/Dashboard.vue
+++ b/resources/js/Pages/FCEA/Dashboard.vue
@@ -9,10 +9,8 @@ const form = useForm('post', route('fcea.dashboard.catch'), {
 })
 const props = defineProps(
     {
-        tempVar1: Number,
-        tempVar2: Number,
-        tempVar3: String,
-        tempVar4: Object
+        myUserInfo: Object,
+        userRanking: Object,
     }
 )
 
@@ -29,13 +27,9 @@ function submit() {
             <h3>Fursuit Catch Em All</h3>
         </div>
         <div class="card-body">
-            <h4 class="text-center">Var1 #{{ tempVar1 }}</h4>
-            <h4 class="text-center">Var2 #{{ tempVar2 }}</h4>
-            <h4 class="text-center">Var3 #{{ tempVar3 }}</h4>
-            <h4 class="text-center">Fursuit #{{ tempVar4[0]['user_id'] }}</h4>
-            <h4 class="text-center">Place #{{ place }}</h4>
-            <p class="text-center"><small>{{ toNextPlace }} more to advance to the next place</small></p>
-            <p class="text-center"><small>{{ behindYou }} behind you</small></p>
+            <h4 class="text-center">Place #{{ myUserInfo.rank }} with {{ myUserInfo.score }} catches</h4>
+            <p class="text-center" v-if="myUserInfo.score_till_next ==! 0"><small>{{ myUserInfo.score_till_next }} more to advance to the next place</small></p>
+            <p class="text-center"><small>{{ myUserInfo.others_behind }} behind you</small></p>
 
             <div class="text-center">
                  <input type="text" class="form-control mb-2" v-model="form.catch_code" placeholder="Enter Code" />

From 17672703fe1648a91c5cd4e249b2506eda888944 Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Sun, 8 Sep 2024 17:09:47 +0200
Subject: [PATCH 11/14] Finish Backend Build of User Ranking. myFursuits List
 build. Further Frontend Changes

---
 .../Controllers/FCEA/DashboardController.php  | 60 +++++++++++++++++--
 app/Models/FCEA/UserCatchRanking.php          |  6 +-
 resources/js/Pages/FCEA/Dashboard.vue         |  6 +-
 3 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/FCEA/DashboardController.php b/app/Http/Controllers/FCEA/DashboardController.php
index 4a0f77b..6c742b2 100644
--- a/app/Http/Controllers/FCEA/DashboardController.php
+++ b/app/Http/Controllers/FCEA/DashboardController.php
@@ -14,22 +14,64 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\RateLimiter;
 use Inertia\Inertia;
+use function Sodium\add;
 
 class DashboardController extends Controller
 {
     public function index()
     {
-        $myUserInfo = UserCatchRanking::getInfoOfUser(Auth::id());
-        $userRanking = UserCatchRanking::queryUserRanking()->get();
+        $rankingSize = 10;
+        $myUserInfo = UserCatchRanking::getInfoOfUser(Auth::id()); // Getting own Rank, may be null if user is new
+
+        if (!$myUserInfo) { // User not in ranking
+            $this->refreshRanking();  // refresh it.
+            $myUserInfo = UserCatchRanking::getInfoOfUser(Auth::id()); // should not be new anymore
+        }
+
+        $ownRankingRange = [$myUserInfo->rank - ($rankingSize / 2), $myUserInfo->rank + ($rankingSize / 2)];
+
+        $topUserRanking = UserCatchRanking::queryUserRanking()
+            ->whereBetween('rank', [1, $rankingSize]) // Top X Ranking
+            ->orderBy('id') // already ordered by rank/score_reached_at
+            ->limit($rankingSize);
+
+        $userRanking = UserCatchRanking::queryUserRanking()
+            ->whereBetween('rank',  $ownRankingRange) // Ranking around own position - Be aware that you need to add separator to the ranking frontend if there is a jump in the ranking
+            ->orderBy('id')  // already ordered by rank/score_reached_at
+            ->limit($rankingSize)
+            ->union($topUserRanking)
+            ->distinct() // remove duplicates
+            ->orderBy('id') // Last time order to merge union select
+            ->get();
+
+        $lastID = $userRanking->first()->id;
+        // Iterate manually to find jumps in id (every id is used at least once) always starting with 1
+        foreach ($userRanking as $ranking) {
+            // Check if we incremented by more than one (jump)
+            if ($lastID + 1 < $ranking->rank) {
+                $newItem = new UserCatchRanking();
+                $newItem->id = $lastID + 1; // Use this rank for correct sorting
+                $newItem->user = new User();
+                $newItem->user->name = "...";
+                $userRanking->add($newItem); // Adding a fake item to indicate separators
+            }
+
+            $lastID = $ranking->id;
+        }
+
+        // Should not change the order as it was ordered by id to begin with
+        $userRanking = $userRanking->sortBy('id')->values();
+
+        $myFursuits = $myUserInfo->user->fursuits;
+
         return Inertia::render('FCEA/Dashboard', [
             'myUserInfo' => $myUserInfo,
             'userRanking' => $userRanking,
+            'myFursuits' => $myFursuits,
         ]);
     }
     public function catch(UserCatchRequest $request)
     {
-        $this->refreshUserRanking();
-        $this->refreshFursuitRanking();
         $event = \App\Models\Event::getActiveEvent();
         if (!$event)
             return "No Active Event"; // TODO
@@ -48,7 +90,7 @@ public function catch(UserCatchRequest $request)
         if (!$logEntry->fursuitExist())
         {
             $logEntry->save();
-            return Inertia::render('FCEA/Dashboard');
+            return "Invalid Code";
         }
 
         $logEntry->already_caught =
@@ -59,7 +101,7 @@ public function catch(UserCatchRequest $request)
         if ($logEntry->already_caught)
         {
             $logEntry->save();
-            return Inertia::render('FCEA/Dashboard');
+            return "Fursuit already caught";
         }
 
         $logEntry->is_successful = true;
@@ -70,9 +112,15 @@ public function catch(UserCatchRequest $request)
         $userCatch->user_id = Auth::id();
         $userCatch->fursuit_id = $logEntry->tryGetFursuit()->id;
         $userCatch->save();
+        $this->refreshRanking();
         return Inertia::render('FCEA/Dashboard');
     }
 
+    public function refreshRanking() {
+        $this->refreshUserRanking();
+        $this->refreshFursuitRanking();
+    }
+
     // Function to build User Ranking. Truncated Table and iterates all users. Similar to the Fursuit Ranking
     public function refreshUserRanking() {
         $usersOrdered = User::query()
diff --git a/app/Models/FCEA/UserCatchRanking.php b/app/Models/FCEA/UserCatchRanking.php
index 53a383c..f7f2574 100644
--- a/app/Models/FCEA/UserCatchRanking.php
+++ b/app/Models/FCEA/UserCatchRanking.php
@@ -34,11 +34,11 @@ public function hasFursuit(): bool
         return $this->fursuit_id <> null;
     }
 
-    static public function getInfoOfUser(int $userId): UserCatchRanking
+    static public function getInfoOfUser(int $userId): UserCatchRanking|null
     {
-        return UserCatchRanking::where('user_id', '=', $userId)->with("user")->first();
+        return UserCatchRanking::where('user_id', '=', $userId)->with("user")->with("fursuit")->first();
     }
-    static public function getInfoOfFursuit(int $fursuitId): UserCatchRanking
+    static public function getInfoOfFursuit(int $fursuitId): UserCatchRanking|null
     {
         return UserCatchRanking::where('fursuit_id', '=', $fursuitId)->with("fursuit")->first();
     }
diff --git a/resources/js/Pages/FCEA/Dashboard.vue b/resources/js/Pages/FCEA/Dashboard.vue
index 9aa9c77..ff6a66a 100644
--- a/resources/js/Pages/FCEA/Dashboard.vue
+++ b/resources/js/Pages/FCEA/Dashboard.vue
@@ -2,6 +2,7 @@
 import {Link, Head, usePage} from '@inertiajs/vue3'
 import {useForm} from 'laravel-precognition-vue-inertia'
 import Button from 'primevue/button';
+import DashboardButton from "@/Components/POS/DashboardButton.vue";
 
 
 const form = useForm('post', route('fcea.dashboard.catch'), {
@@ -39,10 +40,7 @@ function submit() {
             <div class="mt-4">
                 <h5>Top Catchers</h5>
                 <ul class="list-group">
-                    <li class="list-group-item">Top 1: {{ topCatchers[0] }}</li>
-                    <li class="list-group-item">Top 2...10: {{ topCatchers[1] }}</li>
-                    <li class="list-group-item">...</li>
-                    <li class="list-group-item">Top 704: {{ topCatchers[2] }}</li>
+                    <li class="list-group-item" v-for="i in userRanking"><p v-if="i.user_id == myUserInfo.user_id">[YOU]</p> Top {{i.rank}}: {{i.user.name}} [{{i.score}}]</li>
                 </ul>
             </div>
 

From 9906653766eca5f924c17e554802364fbb16e4a8 Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Mon, 9 Sep 2024 04:10:58 +0200
Subject: [PATCH 12/14] restructure FCEA Ranking load. Finished Fursuit Ranking
 Load

---
 .../Controllers/FCEA/DashboardController.php  | 139 ++++++++++++------
 app/Models/FCEA/UserCatchRanking.php          |  13 +-
 app/Models/Fursuit/Fursuit.php                |   2 +-
 ...tCatchFactory.php => UserCatchFactory.php} |   2 +-
 resources/js/Pages/FCEA/Dashboard.vue         |   7 +-
 5 files changed, 112 insertions(+), 51 deletions(-)
 rename database/factories/FCEA/{UserFursuitCatchFactory.php => UserCatchFactory.php} (91%)

diff --git a/app/Http/Controllers/FCEA/DashboardController.php b/app/Http/Controllers/FCEA/DashboardController.php
index 6c742b2..4fd9866 100644
--- a/app/Http/Controllers/FCEA/DashboardController.php
+++ b/app/Http/Controllers/FCEA/DashboardController.php
@@ -10,6 +10,7 @@
 use App\Models\FCEA\UserCatchRanking;
 use App\Models\Fursuit\Fursuit;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\RateLimiter;
@@ -21,53 +22,19 @@ class DashboardController extends Controller
     public function index()
     {
         $rankingSize = 10;
-        $myUserInfo = UserCatchRanking::getInfoOfUser(Auth::id()); // Getting own Rank, may be null if user is new
-
-        if (!$myUserInfo) { // User not in ranking
-            $this->refreshRanking();  // refresh it.
-            $myUserInfo = UserCatchRanking::getInfoOfUser(Auth::id()); // should not be new anymore
-        }
 
-        $ownRankingRange = [$myUserInfo->rank - ($rankingSize / 2), $myUserInfo->rank + ($rankingSize / 2)];
-
-        $topUserRanking = UserCatchRanking::queryUserRanking()
-            ->whereBetween('rank', [1, $rankingSize]) // Top X Ranking
-            ->orderBy('id') // already ordered by rank/score_reached_at
-            ->limit($rankingSize);
-
-        $userRanking = UserCatchRanking::queryUserRanking()
-            ->whereBetween('rank',  $ownRankingRange) // Ranking around own position - Be aware that you need to add separator to the ranking frontend if there is a jump in the ranking
-            ->orderBy('id')  // already ordered by rank/score_reached_at
-            ->limit($rankingSize)
-            ->union($topUserRanking)
-            ->distinct() // remove duplicates
-            ->orderBy('id') // Last time order to merge union select
-            ->get();
-
-        $lastID = $userRanking->first()->id;
-        // Iterate manually to find jumps in id (every id is used at least once) always starting with 1
-        foreach ($userRanking as $ranking) {
-            // Check if we incremented by more than one (jump)
-            if ($lastID + 1 < $ranking->rank) {
-                $newItem = new UserCatchRanking();
-                $newItem->id = $lastID + 1; // Use this rank for correct sorting
-                $newItem->user = new User();
-                $newItem->user->name = "...";
-                $userRanking->add($newItem); // Adding a fake item to indicate separators
-            }
-
-            $lastID = $ranking->id;
-        }
-
-        // Should not change the order as it was ordered by id to begin with
-        $userRanking = $userRanking->sortBy('id')->values();
-
-        $myFursuits = $myUserInfo->user->fursuits;
+        // --------------------------------- Getting User Ranking Data ---------------------------------
+        $myUserInfo = $this->getMyUserInfo();
+        $userRanking = $this->getUserRanking($myUserInfo, $rankingSize);
+        // --------------------------------- Getting Fursuit Ranking Data ---------------------------------
+        $myFursuitInfos = $this->getMyFursuitInfos($myUserInfo);
+        $fursuitRanking = $this->getFursuitRanking($myFursuitInfos, $rankingSize);
 
         return Inertia::render('FCEA/Dashboard', [
             'myUserInfo' => $myUserInfo,
             'userRanking' => $userRanking,
-            'myFursuits' => $myFursuits,
+            'myFursuitInfos' => $myFursuitInfos,
+            'fursuitRanking' => $fursuitRanking,
         ]);
     }
     public function catch(UserCatchRequest $request)
@@ -235,4 +202,92 @@ protected function IsLimited(int $identifier, string $action = 'fursuit_catch')
         RateLimiter::increment($rateLimiterKey);
         return 0;
     }
+
+    private function getMyUserInfo() : UserCatchRanking
+    {
+        $myUserInfo = UserCatchRanking::getInfoOfUser(Auth::id()); // Getting own Rank, may be null if user is new
+
+        if (!$myUserInfo) { // User not in ranking
+            $this->refreshRanking();  // refresh it.
+            $myUserInfo = UserCatchRanking::getInfoOfUser(Auth::id()); // should not be new anymore
+        }
+
+        return $myUserInfo;
+    }
+
+    private function getUserRanking(UserCatchRanking $myUserInfo, int $rankingSize)
+    {
+        $topRanking = UserCatchRanking::queryUserRanking()
+            ->whereBetween('id', [1, $rankingSize]) // Top X Ranking
+            ->orderBy('id') // already ordered by rank/score_reached_at
+            ->limit($rankingSize);
+
+        $ownIdRange = [$myUserInfo->id - ($rankingSize / 2), $myUserInfo->id + ($rankingSize / 2)];
+
+        $ranking = UserCatchRanking::queryUserRanking()
+            ->whereBetween('id',  $ownIdRange) // Ranking around own position - Be aware that you need to add separator to the ranking frontend if there is a jump in the ranking
+            ->orderBy('id')  // already ordered by rank/score_reached_at
+            ->limit($rankingSize)
+            ->union($topRanking)
+            ->distinct() // remove duplicates
+            ->orderBy('id'); // Last time order to merge union select
+
+        // Add Separators when its jumping
+        return $this->AddPlaceholderOnJump($ranking->get());
+    }
+
+    private function getMyFursuitInfos(UserCatchRanking $myUserInfo) : Collection
+    {
+        $myFursuitIDs = $myUserInfo->user->fursuits->pluck('id')->toArray();  // Get all own Fursuit IDs
+        return UserCatchRanking::getInfoOfFursuits($myFursuitIDs); // Get Ranking info of my fursuits
+    }
+
+    private function getFursuitRanking(Collection $myFursuitInfos, int $rankingSize) : Collection
+    {
+        $topRanking = UserCatchRanking::queryFursuitRanking()
+            ->whereBetween('id', [1, $rankingSize]) // Top X Ranking
+            ->orderBy('id') // already ordered by rank/score_reached_at
+            ->limit($rankingSize);
+
+        $ranking = $topRanking;
+
+        foreach ($myFursuitInfos as $myFursuitInfo) {
+            $ownIdRange = [$myFursuitInfo->id - ($rankingSize / 2), $myFursuitInfo->id + ($rankingSize / 2)];
+
+            $ranking = UserCatchRanking::queryFursuitRanking()
+                ->whereBetween('id', $ownIdRange) // Ranking around own position - Be aware that you need to add separator to the ranking frontend if there is a jump in the ranking
+                ->orderBy('id')  // already ordered by rank/score_reached_at
+                ->limit($rankingSize)
+                ->union($ranking)
+                ->distinct() // remove duplicates
+                ->orderBy('id'); // Last time order to merge union select
+        }
+
+        // Add Separators when its jumping
+        return $this->AddPlaceholderOnJump($ranking->get());
+    }
+
+    private function AddPlaceholderOnJump(Collection $userRanking) : Collection
+    {
+        $lastID = $userRanking->first()->id;
+        // Iterate manually to find jumps in id (every id is used at least once) always starting with 1
+        foreach ($userRanking as $ranking) {
+            // Check if we incremented by more than one (jump)
+            if ($lastID + 1 < $ranking->id) {
+                $newItem = new UserCatchRanking();
+                $newItem->id = $lastID + 1; // Use this rank for correct sorting
+                $newItem->user = new User(); // Consider keeping user/fursuit null for performance
+                $newItem->user->name = "...";
+                $newItem->fursuit = new Fursuit();
+                $newItem->fursuit->name = "...";
+                $newItem->fursuit->image="filler"; // Crashes if this is null
+                $userRanking->add($newItem); // Adding a fake item to indicate separators
+            }
+
+            $lastID = $ranking->id;
+        }
+
+        // Should not change the order as it was ordered by id to begin with
+        return $userRanking->sortBy('id')->values();
+    }
 }
diff --git a/app/Models/FCEA/UserCatchRanking.php b/app/Models/FCEA/UserCatchRanking.php
index f7f2574..c3ea04f 100644
--- a/app/Models/FCEA/UserCatchRanking.php
+++ b/app/Models/FCEA/UserCatchRanking.php
@@ -4,6 +4,7 @@
 
 use App\Models\Fursuit\Fursuit;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Builder;
@@ -38,9 +39,13 @@ static public function getInfoOfUser(int $userId): UserCatchRanking|null
     {
         return UserCatchRanking::where('user_id', '=', $userId)->with("user")->with("fursuit")->first();
     }
-    static public function getInfoOfFursuit(int $fursuitId): UserCatchRanking|null
+    static public function getInfoOfFursuit(int $fursuitID): UserCatchRanking|null
     {
-        return UserCatchRanking::where('fursuit_id', '=', $fursuitId)->with("fursuit")->first();
+        return UserCatchRanking::where('fursuit_id', '=', $fursuitID)->with("fursuit")->first();
+    }
+    static public function getInfoOfFursuits(array $fursuitIDs): Collection
+    {
+        return UserCatchRanking::whereBetween('fursuit_id', $fursuitIDs)->with("fursuit")->get();
     }
 
     static public function deleteUserRanking(): void
@@ -52,11 +57,11 @@ static public function deleteFursuitRanking(): void
         UserCatchRanking::where('fursuit_id', '<>', null)->delete();
     }
 
-    static public function queryUserRanking(): \LaravelIdea\Helper\App\Models\FCEA\_IH_UserCatchRanking_QB|Builder
+    static public function queryUserRanking(): Builder
     {
         return UserCatchRanking::where('user_id', '<>', null)->with("user");
     }
-    static public function queryFursuitRanking(): \LaravelIdea\Helper\App\Models\FCEA\_IH_UserCatchRanking_QB|Builder
+    static public function queryFursuitRanking(): Builder
     {
         return UserCatchRanking::where('fursuit_id', '<>', null)->with("fursuit");
     }
diff --git a/app/Models/Fursuit/Fursuit.php b/app/Models/Fursuit/Fursuit.php
index 7fd7b4b..ffedb1f 100644
--- a/app/Models/Fursuit/Fursuit.php
+++ b/app/Models/Fursuit/Fursuit.php
@@ -127,7 +127,7 @@ public static function booted()
             if (!$fursuit->catch_em_all || $fursuit->catch_code <> null)
                 return;
 
-            // Generate an unique Catch Code before saving the fursuit
+            // Generate a unique Catch Code before saving the fursuit
             $fursuit->catch_code = (new FursuitCatchCode(Fursuit::class, 'catch_code'))->generate();
         });
     }
diff --git a/database/factories/FCEA/UserFursuitCatchFactory.php b/database/factories/FCEA/UserCatchFactory.php
similarity index 91%
rename from database/factories/FCEA/UserFursuitCatchFactory.php
rename to database/factories/FCEA/UserCatchFactory.php
index 227165c..d5ac341 100644
--- a/database/factories/FCEA/UserFursuitCatchFactory.php
+++ b/database/factories/FCEA/UserCatchFactory.php
@@ -9,7 +9,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
-class UserFursuitCatchFactory extends Factory
+class UserCatchFactory extends Factory
 {
     protected $model = UserCatch::class;
 
diff --git a/resources/js/Pages/FCEA/Dashboard.vue b/resources/js/Pages/FCEA/Dashboard.vue
index ff6a66a..d233ba7 100644
--- a/resources/js/Pages/FCEA/Dashboard.vue
+++ b/resources/js/Pages/FCEA/Dashboard.vue
@@ -12,6 +12,8 @@ const props = defineProps(
     {
         myUserInfo: Object,
         userRanking: Object,
+        myFursuitInfos: Object,
+        fursuitRanking: Object,
     }
 )
 
@@ -40,15 +42,14 @@ function submit() {
             <div class="mt-4">
                 <h5>Top Catchers</h5>
                 <ul class="list-group">
-                    <li class="list-group-item" v-for="i in userRanking"><p v-if="i.user_id == myUserInfo.user_id">[YOU]</p> Top {{i.rank}}: {{i.user.name}} [{{i.score}}]</li>
+                    <li class="list-group-item" v-for="i in userRanking"><p v-if="i.user_id == myUserInfo.user_id">[YOU]</p> Top {{i.id}} - {{i.rank}}: {{i.user.name}} [{{i.score}}]</li>
                 </ul>
             </div>
 
             <div class="mt-4">
                 <h5>Top Fursuiters</h5>
                 <ul class="list-group">
-                    <li class="list-group-item">Top 1: {{ topFursuiters[0] }}</li>
-                    <li class="list-group-item">Top 2...10: {{ topFursuiters[1] }}</li>
+                    <li class="list-group-item" v-for="i in fursuitRanking">Top {{i.id}} - {{i.rank}}: {{i.fursuit.name??'error'}} [{{i.score}}]</li>
                 </ul>
             </div>
         </div>

From 58c7b13ab86c63b46337fe02b47334323b11b938 Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Thu, 12 Sep 2024 01:33:13 +0200
Subject: [PATCH 13/14] Merge Issue Fixed

---
 app/Models/Fursuit/Fursuit.php |  3 ++-
 yarn.lock                      | 17 ++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/Models/Fursuit/Fursuit.php b/app/Models/Fursuit/Fursuit.php
index 314a3f8..9bf0b43 100644
--- a/app/Models/Fursuit/Fursuit.php
+++ b/app/Models/Fursuit/Fursuit.php
@@ -112,10 +112,11 @@ public function isClaimed()
 
     public function isClaimedBySelf(User $user)
     {
-        return (int) cache()->get($this->getClaimCacheKey()) == $user->id;
+        return (int)cache()->get($this->getClaimCacheKey()) == $user->id;
     }
 
     public function catchedByUsers()
     {
         return $this->hasMany(UserCatch::class);
     }
+}
diff --git a/yarn.lock b/yarn.lock
index e7bd693..3cc9a15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,10 +12,10 @@
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz"
   integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==
 
-"@esbuild/linux-x64@0.20.2":
+"@esbuild/win32-x64@0.20.2":
   version "0.20.2"
-  resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz"
-  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
+  resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz"
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
 
 "@inertiajs/core@1.1.0":
   version "1.1.0"
@@ -106,15 +106,10 @@
   resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@rollup/rollup-linux-x64-gnu@4.18.0":
+"@rollup/rollup-win32-x64-msvc@4.18.0":
   version "4.18.0"
-  resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz"
-  integrity sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==
-
-"@rollup/rollup-linux-x64-musl@4.18.0":
-  version "4.18.0"
-  resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz"
-  integrity sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==
+  resolved "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz"
+  integrity sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==
 
 "@tailwindcss/forms@^0.5.3":
   version "0.5.7"

From dd4cad0d29d5a7714a3f2754c9ed5c9d134658af Mon Sep 17 00:00:00 2001
From: Balenty <balenty@live.de>
Date: Thu, 12 Sep 2024 03:36:33 +0200
Subject: [PATCH 14/14] FCEA - Adding Fursuit Catched Total, Prevent user from
 catching his own fursuits

---
 app/Http/Controllers/FCEA/DashboardController.php | 9 +++++++++
 resources/js/Pages/FCEA/Dashboard.vue             | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/app/Http/Controllers/FCEA/DashboardController.php b/app/Http/Controllers/FCEA/DashboardController.php
index 4fd9866..9b549d5 100644
--- a/app/Http/Controllers/FCEA/DashboardController.php
+++ b/app/Http/Controllers/FCEA/DashboardController.php
@@ -30,11 +30,14 @@ public function index()
         $myFursuitInfos = $this->getMyFursuitInfos($myUserInfo);
         $fursuitRanking = $this->getFursuitRanking($myFursuitInfos, $rankingSize);
 
+        $myFursuitInfoCatchedTotal = $myFursuitInfos->sum(function ($entry) { return $entry->score; });
+
         return Inertia::render('FCEA/Dashboard', [
             'myUserInfo' => $myUserInfo,
             'userRanking' => $userRanking,
             'myFursuitInfos' => $myFursuitInfos,
             'fursuitRanking' => $fursuitRanking,
+            'myFursuitInfoCatchedTotal' => $myFursuitInfoCatchedTotal, // How many times the user got catched on all fursuits summed up
         ]);
     }
     public function catch(UserCatchRequest $request)
@@ -60,6 +63,12 @@ public function catch(UserCatchRequest $request)
             return "Invalid Code";
         }
 
+        if (Auth::id() == $logEntry->tryGetFursuit()->user_id)
+        {
+            $logEntry->save();
+            return "You can't catch yourself";
+        }
+
         $logEntry->already_caught =
             UserCatch::where('user_id', Auth::id())
                             ->where('fursuit_id', $logEntry->tryGetFursuit()->id)
diff --git a/resources/js/Pages/FCEA/Dashboard.vue b/resources/js/Pages/FCEA/Dashboard.vue
index d233ba7..822aab8 100644
--- a/resources/js/Pages/FCEA/Dashboard.vue
+++ b/resources/js/Pages/FCEA/Dashboard.vue
@@ -14,6 +14,7 @@ const props = defineProps(
         userRanking: Object,
         myFursuitInfos: Object,
         fursuitRanking: Object,
+        myFursuitInfoCatchedTotal: Number,
     }
 )
 
@@ -46,6 +47,11 @@ function submit() {
                 </ul>
             </div>
 
+            <h4 class="text-center">Place #{{ myFursuitInfos[0].rank }} with {{ myFursuitInfos[0].score }} times being catched</h4>
+            <p class="text-center" v-if="myFursuitInfos[0].score_till_next ==! 0"><small>{{ myFursuitInfos[0].score_till_next }} more to advance to the next place</small></p>
+            <p class="text-center"><small>{{ myFursuitInfos[0].others_behind }} behind you</small></p>
+            <p class="text-center"><small>You were been {{ myFursuitInfoCatchedTotal }} catched between all fursuits</small></p>
+
             <div class="mt-4">
                 <h5>Top Fursuiters</h5>
                 <ul class="list-group">