Move all requirement logics to the CollectibleController

Author: Obi-Wana

app/Http/Controllers/Collectible/CollectibleController.php

@@ -46,52 +46,74 @@ public function show(Collectible $collectible): \Illuminate\Contracts\View\Facto
 
         $collectible->load('requirements');
 
-        // Evaluate the requirements for this collectible for the current user
+        // User attributes
         $userAttributes = [
             'uploaded' => [
                 'value' => $user->uploaded ?? 0,
-                'label' => 'Account Upload'
+                'label' => __('common.account').' '.__('common.upload')
             ],
             'seedsize' => [
                 'value' => $user->seedsize ?? 0,
-                'label' => 'Seeding Size'
+                'label' => __('torrent.seedsize')
             ],
             'average_seedtime' => [
                 'value' => $user->history_avg_seedtime ?? 0,
-                'label' => 'Average Seedtime'
+                'label' => 'Average '.__('torrent.seedtime')
             ],
             'ratio' => [
                 'value' => $user->ratio ?? 0,
-                'label' => 'Account Ratio'
+                'label' => __('common.account').' '.__('common.ratio')
             ],
             'age' => [
                 'value' => $user->created_at->diffInSeconds(now()),
-                'label' => 'Account Age'
+                'label' => __('common.account').' '.__('torrent.age')
             ],
         ];
 
+        $requirementsResults = [];
+
         $userMeetsAllRequirements = true;
 
         foreach ($collectible->requirements as $req) {
             $attrValue = $userAttributes[$req->operand1]['value'];
 
-            // Determine if the requirement is met
-            $requirementMet = match ($req->operator) {
-                '>'     => $attrValue > $req->operand2,
-                '<'     => $attrValue < $req->operand2,
-                '='     => $attrValue == $req->operand2,
-                '>='    => $attrValue >= $req->operand2,
-                '<='    => $attrValue <= $req->operand2,
-                default => false,
-            };
-
-            // Update the overall requirement status
-            $userMeetsAllRequirements &= $requirementMet;
-
-            // Break early if any requirement is not met
-            if (!$userMeetsAllRequirements) {
-                break;
+            // Evaluate the requirement using switch statement
+            switch ($req->operator) {
+                case '>':
+                    $meetsRequirement = $attrValue > $req->operand2;
+
+                    break;
+                case '<':
+                    $meetsRequirement = $attrValue < $req->operand2;
+
+                    break;
+                case '=':
+                    $meetsRequirement = $attrValue == $req->operand2;
+
+                    break;
+                case '>=':
+                    $meetsRequirement = $attrValue >= $req->operand2;
+
+                    break;
+                case '<=':
+                    $meetsRequirement = $attrValue <= $req->operand2;
+
+                    break;
+                default:
+                    $meetsRequirement = false;
+
+                    break;
             }
+
+            // Collect result for the view
+            $requirementsResults[] = [
+                'requirement' => $req,
+                'meets'       => $meetsRequirement,
+                'label'       => $userAttributes[$req->operand1]['label']
+            ];
+
+            // Update overall status
+            $userMeetsAllRequirements &= $meetsRequirement;
         }
 
         return view('collectible.show', [
@@ -110,6 +132,7 @@ public function show(Collectible $collectible): \Illuminate\Contracts\View\Facto
                 ->first(),
             'availableCount'           => $collectible->items()->whereNull('user_id')->count(),
             'userAttributes'           => $userAttributes,
+            'requirementsResults'      => $requirementsResults,
             'userMeetsAllRequirements' => $userMeetsAllRequirements,
         ]);
     }

app/Http/Controllers/User/CollectibleController.php

@@ -39,7 +39,7 @@ public function index(Request $request, User $user): \Illuminate\Contracts\View\
                 ->with('category')
                 ->get()
                 ->groupBy('category_id'),
-            'user'                   => $user,
+            'user' => $user,
         ]);
     }
 }

resources/views/collectible/show.blade.php

@@ -210,25 +210,11 @@ class="form__button form__button--filled"
                     @endif
                 </dd>
             </div>
-            @foreach ($collectible->requirements as $requirement)
+            @foreach ($requirementsResults as $result)
                 <div class="key-value__group">
-                    <dt>{{ $userAttributes[$requirement->operand1]['label'] }}</dt>
+                    <dt>{{ $result['label'] }}</dt>
                     <dd>
-                        @php
-                            // Retrieve the user's attribute value or default to 0
-                            $userValue = $userAttributes[$requirement->operand1]['value'] ?? 0;
-                            // Build the comparison expression
-                            $operator = $requirement->operator; // e.g., '>=', '<=', '==', etc.
-                            $operand2 = $requirement->operand2 ?? 0;
-                            $expression = '$userValue ' . $operator . ' ' . $operand2;
-                        @endphp
-
-                        @php
-                            $meetsRequirement = false;
-                            eval('$meetsRequirement = (' . $expression . ');');
-                        @endphp
-
-                        @if ($meetsRequirement)
+                        @if ($result['meets'])
                             <i class="{{ config('other.font-awesome') }} fa-check text-green"></i>
                         @else
                             <i class="{{ config('other.font-awesome') }} fa-times text-red"></i>