wip

Author: brendt

src/StoredEvents/EventsReplayCommand.php

@@ -9,6 +9,7 @@
 use Tempest\Container\Container;
 use Tempest\Database\Builder\QueryBuilders\QueryBuilder;
 
+use function Tempest\Database\query;
 use function Tempest\Support\arr;
 use function Tempest\Support\str;
 
@@ -45,9 +46,7 @@ public function __invoke(?string $replay = null): void
             return;
         }
 
-        $eventCount = new QueryBuilder(StoredEvent::class)
-            ->select('COUNT(*) as `count`')
-            ->first()['count'];
+        $eventCount = query(StoredEvent::class)->count()->execute();
 
         $confirm = $this->confirm(sprintf(
             'We\'re going to replay %d events on %d %s, this will take a while. Continue?',

src/Web/Analytics/Chart.php

@@ -6,8 +6,11 @@
 
 final readonly class Chart
 {
+
     public function __construct(
         public ImmutableArray $labels,
         public ImmutableArray $values,
-    ) {}
+        public ?int $min = null,
+    ) {
+    }
 }

src/Web/Analytics/PackageDownloadsPerDay/PackageDownloadsPerDayProjector.php

@@ -4,9 +4,10 @@
 
 use App\StoredEvents\Projector;
 use App\Web\Analytics\PackageDownloadsListed;
+use PDOException;
 use Tempest\Database\Builder\QueryBuilders\QueryBuilder;
-use Tempest\Database\Query;
 use Tempest\EventBus\EventHandler;
+use function Tempest\Database\query;
 
 final readonly class PackageDownloadsPerDayProjector implements Projector
 {
@@ -15,6 +16,7 @@ public function clear(): void
     {
         new QueryBuilder(PackageDownloadsPerDay::class)
             ->delete()
+            ->allowAll()
             ->execute();
     }
 
@@ -29,19 +31,28 @@ public function replay(object $event): void
     #[EventHandler]
     public function onPackageDownloadsListed(PackageDownloadsListed $event): void
     {
+        $date = $event->date->setTime(0, 0);
+
         $count = $event->total;
 
         $count = max($count, 0);
 
-        PackageDownloadsPerDay::updateOrCreate(
-            [
-                'date' => $event->date,
-                'package' => $event->package,
-            ],
-            [
-                'total' => $event->total,
-                'count' => $count,
-            ],
-        );
+        $packageDownloadsPerDay = query(PackageDownloadsPerDay::class)
+            ->select()
+            ->where('date = ? AND package = ?', $date, $event->package)
+            ->first();
+
+        if (!$packageDownloadsPerDay) {
+            $packageDownloadsPerDay = new PackageDownloadsPerDay(
+                date: $date,
+                package: $event->package,
+                count: 0,
+                total: 0,
+            );
+        }
+
+        $packageDownloadsPerDay->total = $event->total;
+        $packageDownloadsPerDay->count = $count;
+        $packageDownloadsPerDay->save();
     }
 }

src/Web/Analytics/PackageDownloadsPerHour/PackageDownloadsPerHourProjector.php

@@ -15,6 +15,7 @@ public function clear(): void
     {
         new QueryBuilder(PackageDownloadsPerHour::class)
             ->delete()
+            ->allowAll()
             ->execute();
     }
 

src/Web/Analytics/StatsController.php

@@ -2,6 +2,7 @@
 
 namespace App\Web\Analytics;
 
+use App\Web\Analytics\PackageDownloadsPerDay\PackageDownloadsPerDay;
 use App\Web\Analytics\VisitsPerDay\VisitsPerDay;
 use Tempest\Clock\Clock;
 use Tempest\DateTime\Duration;
@@ -17,8 +18,19 @@
     #[Get('/stats')]
     public function __invoke(Clock $clock): View
     {
+        $limit = 30;
+
         $visitsPerDay = arr(
-            query(VisitsPerDay::class)->select()->orderBy('date DESC')->limit(30)->all(),
+            query(VisitsPerDay::class)->select()->orderBy('date DESC')->limit($limit)->all(),
+        )->reverse();
+
+        $packageDownloadsPerDay = arr(
+            query(PackageDownloadsPerDay::class)
+                ->select()
+                ->whereField('package', 'framework')
+                ->orderBy('date DESC')
+                ->limit($limit)
+                ->all(),
         )->reverse();
 
         return view(
@@ -28,6 +40,12 @@ public function __invoke(Clock $clock): View
                 labels: $visitsPerDay->map(fn (VisitsPerDay $item) => $item->date->format('Y-m-d')),
                 values: $visitsPerDay->map(fn (VisitsPerDay $item) => $item->count),
             ),
+
+            packageDownloadsPerDay: new Chart(
+                labels: $packageDownloadsPerDay->map(fn (PackageDownloadsPerDay $item) => $item->date->format('Y-m-d')),
+                values: $packageDownloadsPerDay->map(fn (PackageDownloadsPerDay $item) => $item->total),
+                min: $packageDownloadsPerDay->sortByCallback(fn (PackageDownloadsPerDay $a, PackageDownloadsPerDay $b) => $a->total)->first()->total,
+            ),
         );
     }
 }

src/Web/Analytics/VisitsPerDay/VisitsPerDayProjector.php

@@ -22,6 +22,7 @@ public function clear(): void
     {
         new QueryBuilder(VisitsPerDay::class)
             ->delete()
+            ->allowAll()
             ->execute();
     }
 

src/Web/Analytics/VisitsPerHour/VisitsPerHourProjector.php

@@ -23,6 +23,7 @@ public function clear(): void
     {
         new QueryBuilder(VisitsPerHour::class)
             ->delete()
+            ->allowAll()
             ->execute();
     }
 

src/Web/Analytics/chart.view.php

@@ -1,20 +1,15 @@
 <x-base>
+    <x-aurora class="dark:hidden" />
+
     <x-slot name="head">
         <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
     </x-slot>
 
-    <div class="@HeroBlock">
-        <div class="flex flex-col gap-4 px-4 items-center justify-center py-8 max-w-screen-xl mx-auto w-full text-white">
-            <div class=" flex-1 flex flex-col items-center justify-center gap-8">
-                <h1 class="text-[1.5rem] md:text-[2.5rem] max-w-[640px] leading-[1.1] text-center font-display font-extrabold">Tempest Stats</h1>
-            </div>
-        </div>
-    </div>
-
-    <div class="w-full flex flex-col ">
+    <div class="w-full flex flex-col pb-8">
         <div class="w-full z-10 md:py-24 pt-12">
             <div class="w-full mx-auto grid md:grid-cols-2 xl:grid-cols-3 gap-12 md:px-24 px-8">
-                <x-chart :chart="$visitsPerDay" label="Visits per day" title="Website visits last 30 days"></x-chart>
+                <x-chart :chart="$visitsPerDay" label="Visits" chart-title="Website visits last 30 days"></x-chart>
+                <x-chart :chart="$packageDownloadsPerDay" label="Downloads" chart-title="Package downloads over time"></x-chart>
             </div>
         </div>
     </div>

src/Web/Analytics/stats.view.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @var \App\Web\Analytics\Chart $chart
+ * @var string $label
+ * @var string $title
+ */
+
+use Symfony\Component\Uid\Uuid;
+
+$uuid = Uuid::v4()->toString();
+?>
+
+<div class="grid gap-2">
+    <h2 class="font-bold">{{ $chartTitle }}</h2>
+    <div>
+        <canvas id="<?= $uuid ?>" class="h-[300px] w-[100px]"></canvas>
+    </div>
+
+    <script>
+        var ctx = document.getElementById('<?= $uuid ?>');
+
+        new Chart(ctx, {
+            type: 'line',
+            data: {
+                labels: <?= json_encode($chart->labels->values()->toArray()) ?>,
+                datasets: [{
+                    label: '<?= $label ?>',
+                    data: <?= json_encode($chart->values->values()->toArray()) ?>,
+                    borderWidth: 2
+                }]
+            },
+            options: {
+                maintainAspectRatio: false,
+                elements: {
+                    line: {
+                        tension: 0.4
+                    }
+                },
+                scales: {
+                    y: {
+                        <?php if ($chart->min !== null): ?>
+                            min: <?= $chart->min - 100 ?>,
+                        <?php endif; ?>
+                        beginAtZero: true
+                    }
+                }
+            }
+        });
+    </script>
+</div>