refactor: remove unused nfts_count column from the collection_traits table

app/Data/Collections/CollectionTraitData.php

@@ -16,7 +16,6 @@
     '/** Use the displayType to infer the actual type. */ value' => 'string | number',
     '/** Only present for numeric displayTypes. */ valueMin' => '?number',
     '/** Only present for numeric displayTypes. */ valueMax' => '?number',
-    'nftsCount' => 'number',
     'nftsPercentage' => 'number',
 ])]
 class CollectionTraitData extends Data
@@ -27,7 +26,6 @@ public function __construct(
         public string|float $value,
         public ?float $valueMin,
         public ?float $valueMax,
-        public float $nftsCount,
         public float $nftsPercentage,
     ) {
     }
@@ -40,7 +38,6 @@ public static function fromModel(CollectionTrait $trait): self
             value: self::extractValue($trait),
             valueMin: $trait['value_min'] ?? null,
             valueMax: $trait['value_max'] ?? null,
-            nftsCount: $trait['nfts_count'],
             nftsPercentage: $trait['nfts_percentage'],
         );
     }

app/Data/Web3/Web3CollectionTrait.php

@@ -13,7 +13,6 @@ public function __construct(
         public string $value,
         public ?float $valueMin,
         public ?float $valueMax,
-        public string $nftsCount,
         public float $nftsPercentage,
         public TraitDisplayType $displayType,
     ) {

app/Http/Client/Mnemonic/MnemonicPendingRequest.php

@@ -281,7 +281,6 @@ public function getCollectionTraits(Chain $chain, string $contractAddress): Coll
             value: $trait['value'],
             valueMin: null,
             valueMax: null,
-            nftsCount: $trait['nftsCount'],
             nftsPercentage: $trait['nftsPercentage'],
             displayType: TraitDisplayType::fromMnemonicDisplayType($trait['displayType'] ?? null, $trait['value']),
         ));
@@ -297,7 +296,6 @@ public function getCollectionTraits(Chain $chain, string $contractAddress): Coll
             value: Web3NftHandler::$numericTraitPlaceholder,
             valueMin: $trait['valueMin'],
             valueMax: $trait['valueMax'],
-            nftsCount: $trait['nftsCount'] ?? '0',
             nftsPercentage: $trait['nftsPercentage'] ?? 0,
             displayType: TraitDisplayType::fromMnemonicDisplayType($trait['displayType'] ?? null, null),
         ));

app/Models/CollectionTrait.php

@@ -28,7 +28,6 @@ class CollectionTrait extends Model
         'value_min',
         'value_max',
         'nfts_percentage',
-        'nfts_count',
     ];
 
     protected $casts = [

app/Support/Web3CollectionHandler.php

@@ -26,18 +26,14 @@ public function storeTraits(int $collectionId, Collection $traits): void
             return [
                 'collection_id' => $collectionId,
                 'name' => $trait->name,
-
                 'value' => $trait->value,
                 'display_type' => $trait->displayType->value,
-
                 'value_min' => $trait->valueMin,
                 'value_max' => $trait->valueMax,
-
-                'nfts_count' => $trait->nftsCount,
                 'nfts_percentage' => $trait->nftsPercentage,
             ];
         })->toArray(),
             ['collection_id', 'name', 'value'],
-            ['display_type', 'value_min', 'value_max', 'nfts_count', 'nfts_percentage']);
+            ['display_type', 'value_min', 'value_max', 'nfts_percentage']);
     }
 }

app/Support/Web3NftHandler.php

@@ -300,7 +300,6 @@ private function getChainId(): int
     /**
      * @param  Collection<int, Web3NftData>  $nfts
      * @param  Collection<string, \App\Models\Collection>  $collectionLookup
-     *                                                                        NOTE: The caller is responsible for ensuring atomicity. Make sure to always call this inside a `DB::Transaction`.
      */
     public function upsertTraits(Collection $nfts, Collection $collectionLookup, Carbon $now): void
     {
@@ -339,16 +338,13 @@ public function upsertTraits(Collection $nfts, Collection $collectionLookup, Car
                 $trait['normalizedValue'],
                 $trait['displayType']->value,
                 0,
-                0,
                 $now,
                 $now,
             ]);
 
-        $placeholders = $params->map(fn ($_) => '(?, ?, ?, ?, ?, ?, ?, ?)')->join(', ');
-
         $query = sprintf(
             get_query('nfts.insert_collection_traits'),
-            $placeholders
+            $params->map(fn ($_) => '(?, ?, ?, ?, ?, ?, ?)')->join(', ')
         );
 
         $dbTraits = collect(DB::select($query, $params->flatten()->toArray()));

database/factories/CollectionTraitFactory.php

@@ -43,7 +43,6 @@ public function definition(): array
             'value_max' => $valueMax,
 
             'nfts_percentage' => fn () => fake()->randomFloat(3, 0, 100.0),
-            'nfts_count' => fn () => random_int(0, 10000),
         ];
     }
 }

database/migrations/2024_02_19_141526_remove_nfts_count_from_collection_traits_table.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('collection_traits', function (Blueprint $table) {
+            $table->dropColumn('nfts_count');
+        });
+    }
+};

database/seeders/LiveUserSeeder.php

@@ -211,7 +211,6 @@ private function ingestCollectionTraitsFixtures(string $fileName): void
                         value: $trait['value'],
                         valueMin: $trait['valueMin'] ?? 0,
                         valueMax: $trait['valueMax'] ?? 0,
-                        nftsCount: $trait['nftsCount'],
                         nftsPercentage: $trait['nftsPercentage'],
                         displayType: TraitDisplayType::from($trait['displayType']),
                     ))->unique(fn ($trait) => '_'.$dbCollection->id.'_'.$trait->name.'_'.$trait->value);

database/seeders/TopCollectionsNftsSeeder.php

@@ -72,7 +72,6 @@ public function run(): void
                     'value_max' => $trait['valueMin'],
                     'value_min' => $trait['valueMax'],
                     'display_type' => $trait['displayType'],
-                    'nfts_count' => $trait['nftsCount'],
                     'nfts_percentage' => $trait['nftsPercentage'],
                 ]);
 

queries/nfts.insert_collection_traits.sql

@@ -1,9 +1,5 @@
-insert into collection_traits (
-    collection_id, name, value, display_type,
-    nfts_count, nfts_percentage,
-    created_at, updated_at
-) values %s
+insert into collection_traits (collection_id, name, value, display_type, nfts_percentage, created_at, updated_at)
+values %s
 on conflict (collection_id, name, value) do update
-set nfts_count = (case when excluded.nfts_count > 0 then excluded.nfts_count else collection_traits.nfts_count end),
-    nfts_percentage = (case when excluded.nfts_percentage > 0 then excluded.nfts_percentage else collection_traits.nfts_percentage end)
-returning id, collection_id, name, value
+set nfts_percentage = (case when excluded.nfts_percentage > 0 then excluded.nfts_percentage else collection_traits.nfts_percentage end)
+returning id, collection_id, name, value

resources/js/Tests/Factories/CollectionTraitDataFactory.ts

@@ -10,7 +10,6 @@ export default class CollectionTraitDataFactory extends ModelFactory<App.Data.Co
             nftsPercentage: faker.datatype.float({ min: 0, max: 100 }),
             valueMax: faker.datatype.number(),
             valueMin: faker.datatype.number(),
-            nftsCount: faker.datatype.number(),
         };
     }
 }

resources/types/generated.d.ts

@@ -234,7 +234,6 @@ declare namespace App.Data.Collections {
         /** Use the displayType to infer the actual type. */ value: string | number;
         /** Only present for numeric displayTypes. */ valueMin: ?number;
         /** Only present for numeric displayTypes. */ valueMax: ?number;
-        nftsCount: number;
         nftsPercentage: number;
     };
     export type CollectionTraitFilterData = {