Update HomeService to improve user filament statistics handling; adjust welcome page to display average metrics and user count.

Author: andrey-helldar

app/Services/Pages/HomeService.php

@@ -35,12 +35,22 @@ public function colors(): Collection
         return Color::query()
             ->whereHas('userFilament')
             ->orderBy('title')
-            ->get(['title', 'hex']);
+            ->get(['id', 'title', 'hex']);
     }
 
-    public function userFilaments(): Collection
+    public function userFilaments(int $count = 100): Collection
     {
         return UserFilament::query()
+            ->select([
+                'machine_id',
+                'filament_id',
+                'color_id',
+            ])
+            ->selectRaw('count(*) as users_count')
+            ->selectRaw('avg(pressure_advance) as pressure_advance')
+            ->selectRaw('avg(filament_flow_ratio) as filament_flow_ratio')
+            ->selectRaw('avg(filament_max_volumetric_speed) as filament_max_volumetric_speed')
+            ->selectRaw('avg(nozzle_temperature) as nozzle_temperature')
             ->with([
                 'machine.vendor',
                 'filament' => ['vendor', 'type'],
@@ -49,7 +59,8 @@ public function userFilaments(): Collection
             ->orderBy('machine_id')
             ->orderBy('filament_id')
             ->orderBy('color_id')
-            ->orderBy('id')
+            ->groupBy(['machine_id', 'filament_id', 'color_id'])
+            ->limit($count)
             ->get();
     }
 }

resources/js/pages/welcome.tsx

@@ -64,22 +64,25 @@ export default function Welcome({ userFilaments, machines, filamentTypes, colors
                                             Color
                                         </th>
                                         <th className="border border-gray-300 p-3 text-left font-semibold text-gray-900 dark:border-gray-600 dark:text-gray-200">
-                                            Pressure Advance
+                                            Average Pressure Advance
                                         </th>
                                         <th className="border border-gray-300 p-3 text-left font-semibold text-gray-900 dark:border-gray-600 dark:text-gray-200">
-                                            Flow Ratio
+                                            Average Flow Ratio
                                         </th>
                                         <th className="border border-gray-300 p-3 text-left font-semibold text-gray-900 dark:border-gray-600 dark:text-gray-200">
-                                            Max Volumetric Speed
+                                            Average Max Volumetric Speed
                                         </th>
                                         <th className="border border-gray-300 p-3 text-left font-semibold text-gray-900 dark:border-gray-600 dark:text-gray-200">
-                                            Nozzle Temperature
+                                            Average Nozzle Temperature
+                                        </th>
+                                        <th className="border border-gray-300 p-3 text-left font-semibold text-gray-900 dark:border-gray-600 dark:text-gray-200">
+                                            User Profiles
                                         </th>
                                     </tr>
                                     </thead>
                                     <tbody>
                                     { userFilaments.map((item) => (
-                                            <tr key={ item.id }>
+                                            <tr>
                                                 <td className="border border-gray-300 p-3 text-left text-gray-900 dark:border-gray-600 dark:text-gray-200">
                                                     { item.machine.vendor.title }&nbsp;
                                                     { item.machine.title }
@@ -103,6 +106,9 @@ export default function Welcome({ userFilaments, machines, filamentTypes, colors
                                                 <td className="border border-gray-300 p-3 text-left text-gray-900 dark:border-gray-600 dark:text-gray-200">
                                                     { item.nozzle_temperature }
                                                 </td>
+                                                <td className="border border-gray-300 p-3 text-left text-gray-900 dark:border-gray-600 dark:text-gray-200">
+                                                    { item.users_count }
+                                                </td>
                                             </tr>
                                     )) }
                                     </tbody>

resources/js/types/index.d.ts

@@ -1,21 +1,26 @@
-export interface Auth {
+export interface Auth
+{
     user: User;
 }
 
-export interface SharedData {
+export interface SharedData
+{
     name: string;
     quote: { message: string; author: string };
     auth: Auth;
+
     [key: string]: unknown;
 }
 
-export interface User {
+export interface User
+{
     id: number;
     name: string;
     email: string;
     avatar?: string;
     email_verified_at: string | null;
     created_at: string;
     updated_at: string;
+
     [key: string]: unknown; // This allows for additional properties...
 }