Merge branch 'main' into #10-regulations-for-escooters

app/Http/Controllers/CityOpinionController.php

@@ -6,24 +6,19 @@
 
 use App\Http\Requests\CityOpinionRequest;
 use App\Models\CityOpinion;
-use Illuminate\Support\Facades\Auth;
 
 class CityOpinionController extends Controller
 {
     public function store(CityOpinionRequest $request): void
     {
-        $opinion = $request->only(["rating", "content", "city_id"]);
-        $opinion["user_id"] = Auth::id();
-
-        CityOpinion::query()->create($opinion);
+        $request->user()
+            ->cityOpinions()
+            ->create($request->validated());
     }
 
     public function update(CityOpinionRequest $request, CityOpinion $cityOpinion): void
     {
-        $opinion = $request->only(["rating", "content", "city_id"]);
-        $opinion["user_id"] = Auth::id();
-
-        $cityOpinion->update($opinion);
+        $cityOpinion->update($request->validated());
     }
 
     public function destroy(CityOpinion $cityOpinion): void

app/Importers/DataImporter.php

@@ -90,6 +90,7 @@ protected function deleteMissingProviders(string $providerName, array $existingC
             ->whereNotIn("city_id", $existingCityProviders)
             ->whereNot("created_by", "admin")
             ->get();
+
         $cityProvidersToDelete->each(fn($cityProvider) => $cityProvider->delete());
     }
 

app/Policies/CityOpinionPolicy.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Policies;
+
+use App\Models\CityOpinion;
+use App\Models\User;
+
+class CityOpinionPolicy
+{
+    public function update(User $user, CityOpinion $cityOpinion): bool
+    {
+        return $cityOpinion->user_id === $user->id;
+    }
+
+    public function delete(User $user, CityOpinion $cityOpinion): bool
+    {
+        return $cityOpinion->user_id === $user->id || $user->hasRole("admin");
+    }
+}

app/Providers/AppServiceProvider.php

@@ -4,7 +4,10 @@
 
 namespace App\Providers;
 
+use App\Models\CityOpinion;
+use App\Policies\CityOpinionPolicy;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Sanctum\PersonalAccessToken;
 use Laravel\Sanctum\Sanctum;
@@ -28,6 +31,7 @@ public function register(): void
     public function boot(): void
     {
         JsonResource::withoutWrapping();
+        Gate::policy(CityOpinion::class, CityOpinionPolicy::class);
         Sanctum::usePersonalAccessTokenModel(PersonalAccessToken::class);
     }
 }

docker-compose.staging.yaml

@@ -43,7 +43,7 @@ services:
                 condition: service_healthy
 
     database:
-        image: postgres:15.2-alpine3.17
+        image: postgres:15.6-alpine3.19
         container_name: escooters-db-staging
         environment:
             - POSTGRES_USER=${DB_USERNAME}
@@ -64,7 +64,7 @@ services:
         restart: unless-stopped
 
     redis:
-        image: redis:7.0.11-alpine3.17
+        image: redis:7.2.4-alpine3.19
         container_name: escooters-redis-staging
         ports:
             - ${DOCKER_REDIS_HOST_PORT:-3852}:6379

docker-compose.yaml

@@ -51,7 +51,7 @@ services:
                 condition: service_healthy
 
     database:
-        image: postgres:15.2-alpine3.17
+        image: postgres:15.6-alpine3.19
         container_name: escooters-db-dev
         environment:
             - POSTGRES_USER=${DB_USERNAME}
@@ -72,7 +72,7 @@ services:
         restart: unless-stopped
 
     mailpit:
-        image: axllent/mailpit:v1.6.9
+        image: axllent/mailpit:v1.16
         container_name: escooters-mailpit-dev
         labels:
             - "traefik.enable=true"
@@ -95,7 +95,7 @@ services:
             - ${DOCKER_MAILPIT_DASHBOARD_HOST_PORT:-3856}:8025
 
     redis:
-        image: redis:7.0.11-alpine3.17
+        image: redis:7.2.4-alpine3.19
         container_name: escooters-redis-dev
         ports:
             - ${DOCKER_REDIS_HOST_PORT:-3852}:6379

environment/dev/app/Dockerfile

@@ -1,6 +1,6 @@
-FROM composer/composer:2.6.6-bin as composer-bin
+FROM composer/composer:2.7.2-bin as composer-bin
 
-FROM node:21.4.0-bullseye-slim as node
+FROM node:21.7.1-bullseye-slim as node
 
 FROM php:8.3.3-fpm-bullseye
 

environment/staging/app/Dockerfile

@@ -1,6 +1,6 @@
-FROM composer/composer:2.6.6-bin as composer-bin
+FROM composer/composer:2.7.2-bin as composer-bin
 
-FROM node:20.4.0-bullseye-slim as node
+FROM node:21.7.1-bullseye-slim as node
 
 FROM php:8.3.3-fpm-bullseye