prepare for deploy (#9)

* move lang directory

* style: apply php-cs-fixer

* add responsecache

* clear cache on content change

* route view

* rate limit services

* throttle web

* add s3 driver

Dockerfile

@@ -71,6 +71,7 @@ COPY --from=assets --chown=www-data:www-data /build/public/build /var/www/public
 ENV APP_ENV production
 ENV APP_DEBUG false
 ENV LOG_CHANNEL stderr
+ENV RESPONSE_CACHE_ENABLED true
 
 ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME 0
 

app/Concerns/ClearsResponseCache.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns;
+
+use Spatie\ResponseCache\Facades\ResponseCache;
+
+trait ClearsResponseCache
+{
+    public static function bootClearsResponseCache()
+    {
+        self::created(fn () => self::clearResponseCache());
+        self::updated(fn () => self::clearResponseCache());
+        self::deleted(fn () => self::clearResponseCache());
+    }
+
+    private static function clearResponseCache(): void
+    {
+        ResponseCache::clear();
+    }
+}

app/Concerns/InteractsWithSearch.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Concerns;
 
 use App\Models\Ngo;
@@ -8,11 +10,10 @@
 
 trait InteractsWithSearch
 {
-
     public function scopeFilter(Builder $query, Collection $filters): Builder
     {
         foreach ($filters as $key => $value) {
-            if (!empty($value)) {
+            if (! empty($value)) {
                 if ($this->getModel() === Ngo::getModel()) {
                     $query->with('services');
                     match ($key) {
@@ -22,7 +23,6 @@ public function scopeFilter(Builder $query, Collection $filters): Builder
                         'county' => $query->where('county_id', $value),
                         default => $query,
                     };
-
                 } else {
                     match ($key) {
                         'intervention_domain' => $query->whereJsonContains('intervention_domains', $value),

app/Http/Controllers/PageController.php

@@ -28,7 +28,7 @@ public function ngoPage(string $local, string $slug)
 
     public function services(Request $request)
     {
-        $query =  Service::query()->filter(collect($request->all()))->with(['city', 'county']);
+        $query = Service::query()->filter(collect($request->all()))->with(['city', 'county']);
         $servicesJson = $query->get();
         $services = $query->paginate();
 

app/Http/Kernel.php

@@ -65,5 +65,6 @@ class Kernel extends HttpKernel
         'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'doNotCacheResponse' => \Spatie\ResponseCache\Middlewares\DoNotCacheResponse::class,
     ];
 }

app/Http/Middleware/LanguageManager.php

@@ -17,7 +17,6 @@ class LanguageManager
      */
     public function handle(Request $request, Closure $next): Response
     {
-
         $locale = $request->segment(1);
 
         $locals = ['ro', 'en', 'uk'];

app/Models/ActivityDomain.php

@@ -4,12 +4,14 @@
 
 namespace App\Models;
 
+use App\Concerns\ClearsResponseCache;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Translatable\HasTranslations;
 
 class ActivityDomain extends Model
 {
+    use ClearsResponseCache;
     use HasFactory;
     use HasTranslations;
 

app/Models/ActivityDomainService.php

@@ -4,13 +4,15 @@
 
 namespace App\Models;
 
+use App\Concerns\ClearsResponseCache;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Spatie\Translatable\HasTranslations;
 
 class ActivityDomainService extends Model
 {
+    use ClearsResponseCache;
     use HasFactory;
     use HasTranslations;
 

app/Models/BeneficiaryGroup.php

@@ -4,12 +4,14 @@
 
 namespace App\Models;
 
+use App\Concerns\ClearsResponseCache;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Translatable\HasTranslations;
 
 class BeneficiaryGroup extends Model
 {
+    use ClearsResponseCache;
     use HasFactory;
     use HasTranslations;
 

app/Models/City.php

@@ -4,12 +4,14 @@
 
 namespace App\Models;
 
+use App\Concerns\ClearsResponseCache;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class City extends Model
 {
+    use ClearsResponseCache;
     use HasFactory;
 
     public function county(): BelongsTo

app/Models/County.php

@@ -4,12 +4,14 @@
 
 namespace App\Models;
 
+use App\Concerns\ClearsResponseCache;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class County extends Model
 {
+    use ClearsResponseCache;
     use HasFactory;
 
     public function cities(): HasMany

app/Models/InterventionDomains.php

@@ -4,12 +4,14 @@
 
 namespace App\Models;
 
+use App\Concerns\ClearsResponseCache;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Translatable\HasTranslations;
 
 class InterventionDomains extends Model
 {
+    use ClearsResponseCache;
     use HasFactory;
     use HasTranslations;
 

app/Models/Ngo.php

@@ -4,6 +4,7 @@
 
 namespace App\Models;
 
+use App\Concerns\ClearsResponseCache;
 use App\Concerns\HasLocation;
 use App\Concerns\InteractsWithSearch;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -17,6 +18,7 @@
 
 class Ngo extends Model implements HasMedia
 {
+    use ClearsResponseCache;
     use HasFactory;
     use InteractsWithMedia;
     use HasTranslations;

app/Models/Service.php

@@ -4,18 +4,18 @@
 
 namespace App\Models;
 
+use App\Concerns\ClearsResponseCache;
 use App\Concerns\HasLocation;
 use App\Concerns\InteractsWithSearch;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
-use Illuminate\Support\Collection;
 use Spatie\Translatable\HasTranslations;
 
 class Service extends Model
 {
+    use ClearsResponseCache;
     use HasFactory;
     use HasTranslations;
     use HasLocation;

app/Providers/RouteServiceProvider.php

@@ -46,5 +46,13 @@ protected function configureRateLimiting(): void
         RateLimiter::for('api', function (Request $request) {
             return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
         });
+
+        RateLimiter::for('web', function (Request $request) {
+            return Limit::perMinute(120)->by($request->ip());
+        });
+
+        RateLimiter::for('services', function (Request $request) {
+            return Limit::perMinute(60)->by($request->ip());
+        });
     }
 }

composer.json

@@ -7,26 +7,28 @@
     "require": {
         "php": "^8.1",
         "blade-ui-kit/blade-heroicons": "^1.4",
-        "filament/filament": "^2.0",
-        "filament/spatie-laravel-media-library-plugin": "^2.0",
-        "filament/spatie-laravel-translatable-plugin": "^2.0",
+        "filament/filament": "^2.17",
+        "filament/spatie-laravel-media-library-plugin": "^2.17",
+        "filament/spatie-laravel-translatable-plugin": "^2.17",
         "guava/filament-icon-picker": "^1.3",
-        "guzzlehttp/guzzle": "^7.2",
+        "guzzlehttp/guzzle": "^7.5",
         "jeffgreco13/filament-breezy": "^1.5",
-        "laravel/framework": "^10.0",
+        "laravel/framework": "^10.9",
         "laravel/sanctum": "^3.2",
-        "laravel/tinker": "^2.8"
+        "laravel/tinker": "^2.8",
+        "league/flysystem-aws-s3-v3": "^3.15",
+        "spatie/laravel-responsecache": "^7.4"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.8",
-        "fakerphp/faker": "^1.9.1",
+        "fakerphp/faker": "^1.9",
         "friendsofphp/php-cs-fixer": "^3.14",
         "laravel/pint": "^1.0",
         "laravel/sail": "^1.18",
-        "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^7.0",
-        "phpunit/phpunit": "^10.0",
-        "spatie/laravel-ignition": "^2.0"
+        "mockery/mockery": "^1.4",
+        "nunomaduro/collision": "^7.5",
+        "phpunit/phpunit": "^10.1",
+        "spatie/laravel-ignition": "^2.1"
     },
     "autoload": {
         "psr-4": {