refactor: Scope items to current game version

Fixes #98
StarCitizenWiki · Dec 31, 2023 · f286ea5 · f286ea5
1 parent cd422eb
commit f286ea5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/app/Http/Controllers/Api/V2/AbstractApiV2Controller.php b/app/Http/Controllers/Api/V2/AbstractApiV2Controller.php
@@ -151,13 +151,13 @@ protected function processRequestParams(): void
      */
     private function processLimit(): void
     {
-        if ($this->request->has(self::LIMIT) && null !== $this->request->get(self::LIMIT)) {
-            $itemLimit = (int)$this->request->get(self::LIMIT);
+        if ($this->request->input(self::LIMIT) !== null) {
+            $itemLimit = (int) $this->request->get(self::LIMIT);
 
-            if ($itemLimit > 0) {
+            if ($itemLimit > 500) {
+                $this->limit = 500;
+            } elseif ($itemLimit >= 0) {
                 $this->limit = $itemLimit;
-            } elseif (0 === $itemLimit) {
-                $this->limit = 0;
             }
         }
     }

diff --git a/app/Http/Controllers/Api/V2/SC/ItemController.php b/app/Http/Controllers/Api/V2/SC/ItemController.php
@@ -47,11 +47,6 @@ class ItemController extends AbstractApiV2Controller
     public function index(Request $request): AnonymousResourceCollection
     {
         $query = QueryBuilder::for(Item::class, $request)
-            ->where(
-                'version',
-                'LIKE',
-                $request->get('version', config('api.sc_data_version')) . '%'
-            )
             ->allowedFilters([
                 'type',
                 'sub_type',
@@ -106,13 +101,11 @@ public function show(Request $request)
 
         try {
             $item = QueryBuilder::for(Item::class, $request)
-                ->where('version', 'LIKE', $request->get('version', config('api.sc_data_version')) . '%')
                 ->where('class_name', 'NOT LIKE', '%test_%')
                 ->where(function (Builder $query) use ($identifier) {
                     $query->where('uuid', $identifier)
                       ->orWhere('name', $identifier);
                 })
-                ->orderByDesc('version')
                 ->allowedIncludes(ItemResource::validIncludes())
                 ->with([
                     'dimensions',
@@ -200,7 +193,6 @@ public function search(ItemSearchRequest $request): JsonResource
         }
 
         $items = $items
-            ->where('version', 'LIKE', $request->get('version', config('api.sc_data_version')) . '%')
             ->where(function (Builder $query) use ($toSearch) {
                 $query->where('name', 'like', "%{$toSearch}%")
                     ->orWhere('uuid', $toSearch)

diff --git a/app/Http/Controllers/Api/V2/SC/Vehicle/VehicleController.php b/app/Http/Controllers/Api/V2/SC/Vehicle/VehicleController.php
@@ -125,12 +125,6 @@ public function show(Request $request): AbstractBaseResource
 
         try {
             $vehicleModel = QueryBuilder::for(UnpackedVehicle::class)
-                ->whereRelation(
-                    'item',
-                    'version',
-                    'LIKE',
-                    $request->get('version', config('api.sc_data_version')) . '%'
-                )
                 ->where(function (Builder $query) use ($identifier, $underscored) {
                     $query->where('name', $identifier)
                         ->orWhere('class_name', $underscored)
@@ -211,12 +205,6 @@ public function search(Request $request): AnonymousResourceCollection
         $underscored = str_replace(' ', '_', $identifier);
 
         $queryBuilder = QueryBuilder::for(UnpackedVehicle::class)
-            ->whereRelation(
-                'item',
-                'version',
-                'LIKE',
-                $request->get('version', config('api.sc_data_version')) . '%'
-            )
             ->where(function (Builder $query) use ($identifier, $underscored) {
                 $query->Where('class_name', 'LIKE', "%{$underscored}")
                     ->orWhere('class_name', $identifier)

diff --git a/app/Models/SC/Item/Item.php b/app/Models/SC/Item/Item.php
@@ -38,6 +38,7 @@
 use App\Models\System\Translation\AbstractHasTranslations as HasTranslations;
 use App\Traits\HasDescriptionDataTrait;
 use App\Traits\HasModelChangelogTrait as ModelChangelog;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -87,6 +88,18 @@ public function getRouteKey()
         'requiredTags',
     ];
 
+    protected static function boot(): void
+    {
+        parent::boot();
+
+        static::addGlobalScope(
+            'version',
+            static function (Builder $builder) {
+                $builder->where('version', config('api.sc_data_version'));
+            }
+        );
+    }
+
     public function translations(): HasMany
     {
         return $this->hasMany(