Test and workflow

Author: mchev

.github/workflows/lint.yml

@@ -1,53 +1,49 @@
-name: tests
+name: Tests
 
 on:
   push:
-    branches:
-      - develop
-      - main
+    branches: [ main ]
   pull_request:
-    branches:
-      - develop
-      - main
+    branches: [ main ]
 
 jobs:
-  ci:
+  test:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+    - uses: actions/checkout@v4
 
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.4
-          tools: composer:v2
-          coverage: xdebug
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.4'
+        extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
 
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          cache: 'npm'
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
 
-      - name: Install Node Dependencies
-        run: npm ci
+    - name: Copy .env
+      run: php -r "file_exists('.env') || copy('.env.example', '.env');"
 
-      - name: Install Dependencies
-        run: composer install --no-interaction --prefer-dist --optimize-autoloader
+    - name: Install PHP Dependencies
+      run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
-      - name: Copy Environment File
-        run: cp .env.example .env
+    - name: Install Node Dependencies
+      run: npm ci
 
-      - name: Generate Application Key
-        run: php artisan key:generate
+    - name: Generate key
+      run: php artisan key:generate
 
-      - name: Publish Ziggy Configuration
-        run: php artisan ziggy:generate
+    - name: Run Laravel Pint
+      run: vendor/bin/pint --test
 
-      - name: Build Assets
-        run: npm run build
+    - name: PHP Lint
+      run: find app tests -name "*.php" -print0 | xargs -0 -n1 php -l
 
-      - name: Tests
-        run: ./vendor/bin/pest
+    - name: Run ESLint
+      run: npm run lint
+
+    - name: Run Tests
+      run: php artisan test

.github/workflows/tests.yml

@@ -36,6 +36,6 @@ public function store(Request $request): RedirectResponse
 
         $request->session()->put('auth.password_confirmed_at', time());
 
-        return redirect()->intended(route('dashboard', absolute: false));
+        return redirect()->intended(route('app.dashboard', absolute: false));
     }
 }

app/Http/Controllers/Auth/ConfirmablePasswordController.php

@@ -5,30 +5,21 @@
 use App\Http\Controllers\Controller;
 use App\Models\Category;
 use App\Models\Equipment;
+use App\Services\LocationPreferencesService;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
 use Inertia\Inertia;
 
 class HomeController extends Controller
 {
+    public function __construct(
+        private readonly LocationPreferencesService $locationService
+    ) {}
+
     public function index(Request $request)
     {
-
-        if ($request->user()) {
-            $cacheKey = 'user_preferences_'.$request->user()->id;
-            $userPreferences = Cache::get($cacheKey);
-            $locationData = $request->only(['coordinates', 'radius', 'city', 'postcode']);
-
-            if ($this->hasValidLocationData($request) && $this->shouldUpdatePreferences($userPreferences, $locationData)) {
-                $request->user()->update(['preferences' => $locationData]);
-                Cache::put($cacheKey, $locationData, now()->addDays(30));
-                $userPreferences = $locationData;
-            } else {
-                $userPreferences = null;
-            }
-        } else {
-            $userPreferences = $this->hasValidLocationData($request) ? $request->only(['coordinates', 'radius', 'city', 'postcode']) : null;
-        }
+        // Handle location preferences
+        $locationPreferences = $this->locationService->updateLocationPreferences($request)
+            ?? $this->locationService->getLocationPreferences($request);
 
         $query = Equipment::query()
             ->select([
@@ -55,63 +46,47 @@ public function index(Request $request)
             $query->where('name', 'like', '%'.$request->search.'%');
         }
 
-        if ($request->filled('category')) {
-            if ($request->category !== 'all') {
-                $query->where('category_id', $request->category);
-            }
+        if ($request->filled('category') && $request->category !== 'all') {
+            $query->where('category_id', $request->category);
         }
 
-        if ($userPreferences && $userPreferences['coordinates'] && $userPreferences['radius']) {
-            $location = $userPreferences['coordinates'];
-            $query->whereHas('depot', function ($query) use ($location, $userPreferences) {
+        // Apply location filter if preferences exist
+        if ($locationPreferences && isset($locationPreferences['coordinates'], $locationPreferences['radius'])) {
+            $location = $locationPreferences['coordinates'];
+            $query->whereHas('depot', function ($query) use ($location, $locationPreferences) {
                 $query->whereRaw('ST_Distance_Sphere(
                     POINT(depots.longitude, depots.latitude),
                     POINT(?, ?)
                 ) <= ?', [
                     $location['lng'],
                     $location['lat'],
-                    $userPreferences['radius'] * 1000, // Convert km to meters
+                    $locationPreferences['radius'] * 1000, // Convert km to meters
                 ]);
             });
         }
 
-        // Availability
+        // Availability filter
         if ($request->filled('start_date') && $request->filled('end_date')) {
             $query->whereDoesntHave('reservations', function ($query) use ($request) {
                 $query->whereBetween('start_date', [$request->start_date, $request->end_date]);
             });
         }
 
-        $equipments = $query->paginate(12);
-
-        // Get stats for filters
-        $stats = [
-            'categories' => Category::select(['id', 'name'])->orderBy('name')->get(),
-        ];
-
         return Inertia::render('Public/Home', [
-            'equipments' => $equipments,
+            'equipments' => $query->paginate(12),
             'filters' => [
                 'search' => $request->search,
                 'category' => $request->category,
                 'start_date' => $request->start_date,
                 'end_date' => $request->end_date,
-                'coordinates' => $userPreferences['coordinates'] ?? null,
-                'radius' => $userPreferences['radius'] ?? null,
-                'city' => $userPreferences['city'] ?? null,
-                'postcode' => $userPreferences['postcode'] ?? null,
+                'coordinates' => $locationPreferences['coordinates'] ?? null,
+                'radius' => $locationPreferences['radius'] ?? null,
+                'city' => $locationPreferences['city'] ?? null,
+                'postcode' => $locationPreferences['postcode'] ?? null,
+            ],
+            'stats' => [
+                'categories' => Category::select(['id', 'name'])->orderBy('name')->get(),
             ],
-            'stats' => $stats,
         ]);
     }
-
-    private function hasValidLocationData(Request $request)
-    {
-        return $request->filled('coordinates') && $request->filled('radius') && $request->filled('city') && $request->filled('postcode');
-    }
-
-    private function shouldUpdatePreferences($userPreferences, $locationData)
-    {
-        return ! $userPreferences || $userPreferences['coordinates'] !== $locationData['coordinates'] || $userPreferences['radius'] !== $locationData['radius'] || $userPreferences['city'] !== $locationData['city'] || $userPreferences['postcode'] !== $locationData['postcode'];
-    }
 }

app/Http/Controllers/Public/HomeController.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+
+class LocationPreferencesService
+{
+    private const GUEST_CACHE_TTL = 86400; // 24 hours
+
+    private const USER_CACHE_TTL = 2592000; // 30 days
+
+    private const REQUIRED_LOCATION_FIELDS = ['coordinates', 'radius', 'city', 'postcode'];
+
+    public function getLocationPreferences(Request $request): ?array
+    {
+        if ($request->user()) {
+            return $this->getAuthenticatedUserPreferences($request->user());
+        }
+
+        return $this->getGuestPreferences($request);
+    }
+
+    public function updateLocationPreferences(Request $request): ?array
+    {
+        $locationData = $request->only(self::REQUIRED_LOCATION_FIELDS);
+
+        if (! $this->hasValidLocationData($locationData)) {
+            return null;
+        }
+
+        if ($request->user()) {
+            return $this->updateAuthenticatedUserPreferences($request->user(), $locationData);
+        }
+
+        return $this->updateGuestPreferences($locationData);
+    }
+
+    private function getAuthenticatedUserPreferences(User $user): ?array
+    {
+        $cacheKey = $this->getUserCacheKey($user);
+
+        return Cache::remember($cacheKey, self::USER_CACHE_TTL, function () use ($user) {
+            return $user->preferences;
+        });
+    }
+
+    private function getGuestPreferences(Request $request): ?array
+    {
+        $cacheKey = $this->getGuestCacheKey($request);
+
+        return Cache::get($cacheKey);
+    }
+
+    private function updateAuthenticatedUserPreferences(User $user, array $locationData): array
+    {
+        $user->update(['preferences' => $locationData]);
+
+        $cacheKey = $this->getUserCacheKey($user);
+        Cache::put($cacheKey, $locationData, self::USER_CACHE_TTL);
+
+        return $locationData;
+    }
+
+    private function updateGuestPreferences(array $locationData): array
+    {
+        $cacheKey = $this->getGuestCacheKey(request());
+        Cache::put($cacheKey, $locationData, self::GUEST_CACHE_TTL);
+
+        return $locationData;
+    }
+
+    private function hasValidLocationData(?array $locationData): bool
+    {
+        if (! $locationData) {
+            return false;
+        }
+        // check if latitude and longitude exists and are not null
+        if (! isset($locationData['coordinates']['lat']) || ! isset($locationData['coordinates']['lng'])) {
+            return false;
+        }
+
+        return collect(self::REQUIRED_LOCATION_FIELDS)
+            ->every(fn ($field) => ! empty($locationData[$field]));
+    }
+
+    private function getUserCacheKey(User $user): string
+    {
+        return "user_location_preferences_{$user->id}";
+    }
+
+    private function getGuestCacheKey(Request $request): string
+    {
+        return 'guest_location_preferences_'.md5($request->ip());
+    }
+}

app/Services/LocationPreferencesService.php

@@ -4,7 +4,6 @@
 
 use App\Models\Category;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Str;
 
 /**
  * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Category>
@@ -28,8 +27,7 @@ public function definition(): array
         $name = $this->faker->unique()->words(rand(1, 3), true);
 
         return [
-            'name' => ucwords($name),
-            'slug' => Str::slug($name),
+            'name' => $name,
             'description' => $this->faker->optional(0.7)->sentence(),
             'parent_id' => null,
             'order' => $this->faker->numberBetween(0, 100),