wip

Author: brendt

.gitignore

@@ -18,3 +18,4 @@ tempest-access.log
 vite-tempest
 public/build/
 database.sqlite
+database-old.sqlite

src/Web/Analytics/StatsController.php

@@ -2,17 +2,13 @@
 
 namespace App\Web\Analytics;
 
-use App\Web\Analytics\PackageDownloadsPerHour\PackageDownloadsPerHour;
 use App\Web\Analytics\VisitsPerDay\VisitsPerDay;
-use App\Web\Analytics\VisitsPerHour\VisitsPerHour;
-use DateInterval;
-use DateTimeImmutable;
 use Tempest\Clock\Clock;
-use Tempest\Database\Query;
 use Tempest\DateTime\Duration;
 use Tempest\Router\Get;
 use Tempest\View\View;
 
+use function Tempest\Database\query;
 use function Tempest\Support\arr;
 use function Tempest\view;
 
@@ -21,54 +17,17 @@
     #[Get('/stats')]
     public function __invoke(Clock $clock): View
     {
-        $now = $clock->now();
-
-        $visitsPerHour = arr(
-            VisitsPerHour::select()
-                ->where('date >= ?', $now->minus(Duration::hours(24))->format('Y-m-d H:i:s'))
-                ->all(),
-        );
-
         $visitsPerDay = arr(
-            VisitsPerDay::select()
-                ->where('date >= ?', $now->minus(Duration::days(30))->format('Y-m-d H:i:s'))
-                ->all(),
-        );
-
-        $packageDownloadsPerHour = arr(new Query(<<<SQL
-        SELECT `date`, SUM(`count`) as `count` FROM package_downloads_per_hours WHERE `date` >= :date GROUP BY `date`
-        SQL)->fetch(
-            date: $now->minus(Duration::days(24))->format('Y-m-d H:i:s'),
-        ));
-
-        $packageDownloadsPerDay = arr(new Query(<<<SQL
-        SELECT `date`, SUM(`count`) as `count` FROM package_downloads_per_days WHERE date >= :date GROUP BY `date`
-        SQL)->fetch(
-            date: $now->minus(Duration::days(30))->format('Y-m-d H:i:s'),
-        ));
+            query(VisitsPerDay::class)->select()->orderBy('date DESC')->limit(30)->all(),
+        )->reverse();
 
         return view(
             __DIR__ . '/stats.view.php',
 
-            visitsPerHour: new Chart(
-                labels: $visitsPerHour->map(fn (VisitsPerHour $item) => $item->date->format('H:i')),
-                values: $visitsPerHour->map(fn (VisitsPerHour $item) => $item->count),
-            ),
-
             visitsPerDay: new Chart(
                 labels: $visitsPerDay->map(fn (VisitsPerDay $item) => $item->date->format('Y-m-d')),
                 values: $visitsPerDay->map(fn (VisitsPerDay $item) => $item->count),
             ),
-
-            packageDownloadsPerHour: new Chart(
-                labels: $packageDownloadsPerHour->map(fn (array $item) => new DateTimeImmutable($item['date'])->format('H:i')),
-                values: $packageDownloadsPerHour->map(fn (array $item) => $item['count']),
-            ),
-
-            packageDownloadsPerDay: new Chart(
-                labels: $packageDownloadsPerDay->map(fn (array $item) => new DateTimeImmutable($item['date'])->format('Y-m-d')),
-                values: $packageDownloadsPerDay->map(fn (array $item) => $item['count']),
-            ),
         );
     }
 }

src/Web/Analytics/stats.view.php

@@ -14,7 +14,6 @@
     <div class="w-full flex flex-col ">
         <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="$visitsPerHour" label="Visits per hour" title="Website visits last 24 hours"></x-chart>
                 <x-chart :chart="$visitsPerDay" label="Visits per day" title="Website visits last 30 days"></x-chart>
             </div>
         </div>