refactor: use 30-day volume for previous "cotm" winners

app/Data/Collections/CollectionOfTheMonthData.php

@@ -4,6 +4,8 @@
 
 namespace App\Data\Collections;
 
+use App\Data\VolumeData;
+use App\Enums\Period;
 use App\Models\CollectionWinner;
 use App\Transformers\IpfsGatewayUrlTransformer;
 use Spatie\LaravelData\Attributes\WithTransformer;
@@ -17,7 +19,7 @@ public function __construct(
         #[WithTransformer(IpfsGatewayUrlTransformer::class)]
         public ?string $image,
         public int $votes,
-        public ?string $volume,
+        public VolumeData $volume,
         public ?string $floorPrice,
         public ?string $floorPriceCurrency,
         public ?int $floorPriceDecimals,
@@ -31,7 +33,7 @@ public static function fromModel(CollectionWinner $winner): self
         return new self(
             image: $winner->collection->extra_attributes->get('image'),
             votes: $winner->votes,
-            volume: $winner->collection->volume,
+            volume: $winner->collection->createVolumeData(Period::MONTH),
             floorPrice: $winner->collection->floor_price,
             floorPriceCurrency: $winner->collection->floorPriceToken?->symbol,
             floorPriceDecimals: $winner->collection->floorPriceToken?->decimals,

app/Models/CollectionWinner.php

@@ -52,7 +52,7 @@ public static function ineligibleCollectionIds(): LaravelCollection
     public static function getByMonth(): LaravelCollection
     {
         $winners = static::query()
-                        ->with('collection', 'collection.floorPriceToken')
+                        ->with('collection', 'collection.floorPriceToken', 'collection.network.nativeToken')
                         ->orderBy('year', 'desc')
                         ->orderBy('month', 'desc')
                         ->get()
@@ -81,7 +81,7 @@ public static function current(): LaravelCollection
         return static::query()
                     ->where('year', $previousMonth->year)
                     ->where('month', $previousMonth->month)
-                    ->with('collection', 'collection.floorPriceToken')
+                    ->with('collection', 'collection.floorPriceToken', 'collection.network.nativeToken')
                     ->orderBy('rank', 'asc')
                     ->limit(3)
                     ->get();

app/Models/Traits/HasVolume.php

@@ -51,7 +51,7 @@ public function getVolume(?Period $period = null): ?string
     /**
      * Create a volume DTO based on the volume in the given period.
      */
-    public function createVolumeData(Period $period, CurrencyCode $currency): VolumeData
+    public function createVolumeData(Period $period, ?CurrencyCode $currency = CurrencyCode::USD): VolumeData
     {
         $volume = $this->getVolume($period);
         $token = $this->nativeToken();

resources/js/Pages/Collections/Components/WinnerCollections/WinnerCollections.blocks.tsx

@@ -69,7 +69,7 @@ export const WinnerCollectionMainInfo = ({
 
                 <p
                     className={cn(
-                        "line-clamp-2 w-full text-sm font-medium text-theme-secondary-900 group-hover:text-theme-primary-700 dark:text-theme-dark-50 dark:text-theme-dark-50 dark:group-hover:text-theme-primary-400",
+                        "line-clamp-2 w-full text-sm font-medium text-theme-secondary-900 group-hover:text-theme-primary-700 dark:text-theme-dark-50 dark:group-hover:text-theme-primary-400",
                     )}
                 >
                     {collection.name}
@@ -79,8 +79,12 @@ export const WinnerCollectionMainInfo = ({
             <div className="mt-4 flex w-full flex-col items-center space-y-4 sm:flex-row sm:justify-between sm:space-y-0 lg:hidden">
                 <WinnerCollectionLabel label={t("common.volume")}>
                     <FormatCrypto
-                        value={collection.volume ?? "0"}
-                        token={token}
+                        value={collection.volume.value ?? "0"}
+                        token={{
+                            symbol: collection.volume.currency,
+                            name: collection.volume.currency,
+                            decimals: collection.volume.decimals,
+                        }}
                     />
                 </WinnerCollectionLabel>
 
@@ -248,8 +252,12 @@ export const WinnerCollectionTableRow = ({
             >
                 <WinnerCollectionLabel label={t("common.volume")}>
                     <FormatCrypto
-                        value={collection.volume ?? "0"}
-                        token={token}
+                        value={collection.volume.value ?? "0"}
+                        token={{
+                            symbol: collection.volume.currency,
+                            name: collection.volume.currency,
+                            decimals: collection.volume.decimals,
+                        }}
                     />
                 </WinnerCollectionLabel>
             </TableCell>

resources/js/Tests/Factories/Collections/CollectionOfTheMonthFactory.ts

@@ -1,12 +1,13 @@
 import { faker } from "@faker-js/faker";
 import ModelFactory from "@/Tests/Factories/ModelFactory";
+import VolumeFactory from "@/Tests/Factories/VolumeFactory";
 
 export default class CollectionOfTheMonthFactory extends ModelFactory<App.Data.Collections.CollectionOfTheMonthData> {
     protected factory(): App.Data.Collections.CollectionOfTheMonthData {
         return {
             image: this.optional(faker.image.avatar(), 0.9),
             votes: faker.datatype.number({ min: 1, max: 100000 }),
-            volume: "1",
+            volume: new VolumeFactory().create(),
             floorPrice: "1",
             floorPriceCurrency: "ETH",
             floorPriceDecimals: 18,

resources/types/generated.d.ts

@@ -215,7 +215,7 @@ declare namespace App.Data.Collections {
     export type CollectionOfTheMonthData = {
         image: string | null;
         votes: number;
-        volume: string | null;
+        volume: App.Data.VolumeData;
         floorPrice: string | null;
         floorPriceCurrency: string | null;
         floorPriceDecimals: number | null;

tests/App/Http/Controllers/CollectionOfTheMonthControllerTest.php

@@ -4,9 +4,17 @@
 
 use App\Models\Collection;
 use App\Models\CollectionWinner;
+use App\Models\Network;
+use App\Models\Token;
 
 it('opens the collection of the month page', function () {
-    $collection = Collection::factory()->create();
+    Token::factory()->matic()->create([
+        'is_native_token' => true,
+    ]);
+
+    $network = Network::polygon();
+
+    $collection = Collection::factory()->for($network)->create();
 
     CollectionWinner::factory()->for($collection)->create();