no message

Author: MrKrisKrisu

app/Http/Controllers/API/v1/StatusController.php

@@ -276,39 +276,31 @@ public function show(int $id): StatusResource {
      *      @OA\Parameter (
      *          name="id",
      *          in="path",
-     *          description="Status-ID",
-     *          example=1337,
-     *          @OA\Schema(type="integer")
+     *          description="Status-ID or UUID",
+     *          example="123e4567-e89b-12d3-a456-426614174000",
+     *          @OA\Schema(type="string")
      *      ),
-     *      @OA\Response(
-     *          response=200,
-     *          description="successful operation",
-     *          @OA\JsonContent(
-     *                      ref="#/components/schemas/SuccessResponse"
-     *          )
-     *       ),
-     *       @OA\Response(response=400, description="Bad request"),
-     *       @OA\Response(response=404, description="No status found for this id"),
-     *       @OA\Response(response=403, description="User not authorized to manipulate this status"),
-     *       security={
-     *           {"passport": {"write-statuses"}}, {"token": {}}
-     *
-     *       }
-     *     )
-     *
-     * @param int $statusId
-     *
-     * @return JsonResponse
+     *      @OA\Response(response=204, description="Status deleted"),
+     *      @OA\Response(response=400, description="Bad request"),
+     *      @OA\Response(response=404, description="No status found for this id"),
+     *      @OA\Response(response=403, description="User not authorized to manipulate this status"),
+     *      security={
+     *          {"passport": {"write-statuses"}}, {"token": {}}
+     *      }
+     * )
      */
-    public function destroy(int $statusId): JsonResponse {
+    public function destroy(string|int $statusId): JsonResponse {
         try {
-            StatusBackend::DeleteStatus(Auth::user(), $statusId);
-            // ToDo: Remove message once the frontend doesn't use the message for anything
-            return $this->sendResponse(
-                ['message' => __('controller.status.delete-ok')],
-                200,
-                ['status' => 'success']
-            );
+            //TODO: check scope for write-statuses
+
+            if (is_numeric($statusId)) { //TODO: remove this after uuid migration done
+                $status = Status::findOrFail($statusId);
+            } else {
+                $status = Status::where('uuid', $statusId)->firstOrFail();
+            }
+            $this->authorize('delete', $status);
+            $status->delete();
+            return response()->json(null, 204);
         } catch (AuthorizationException) {
             return $this->sendError('You are not allowed to delete this status.', 403);
         } catch (ModelNotFoundException) {
@@ -360,6 +352,8 @@ public function destroy(int $statusId): JsonResponse {
      * @throws ValidationException
      */
     public function update(Request $request, int $statusId): JsonResponse {
+        //TODO: check scope for write-statuses
+
         $validator = Validator::make($request->all(), [
             //Just changing of metadata
             'body'                      => ['nullable', 'max:280', 'nullable'],
@@ -413,7 +407,7 @@ public function update(Request $request, int $statusId): JsonResponse {
                 'visibility' => StatusVisibility::from($validated['visibility']),
             ];
 
-            if($status->lock_visibility) {
+            if ($status->lock_visibility) {
                 // If moderation has locked the visibility, prevent the user from changing it
                 unset($updatePayload['visibility']);
             }

app/Http/Controllers/StatusController.php

@@ -275,8 +275,8 @@ public static function createStatus(
         User|Authenticatable $user,
         Business             $business,
         StatusVisibility     $visibility,
-        ?string               $body = null,
-        ?Event                $event = null
+        ?string              $body = null,
+        ?Event               $event = null
     ): Status {
         if ($event !== null && !Carbon::now()->isBetween($event->checkin_start, $event->checkin_end)) {
             Log::info('Event checkin was prevented because the event is not active anymore', [
@@ -293,6 +293,6 @@ public static function createStatus(
                                   'visibility' => $visibility,
                                   'event_id'   => $event?->id,
                                   'client_id'  => APIController::getCurrentOAuthClient()?->id,
-                              ]);
+                              ])->fresh();
     }
 }

app/Http/Resources/StatusResource.php

@@ -12,7 +12,7 @@
 /**
  * @OA\Schema(
  *      title="Status",
- *      @OA\Property(property="id", type="integer", example=12345),
+ *      @OA\Property(property="id", type="string", example="123e4567-e89b-12d3-a456-426614174000"),
  *      @OA\Property(property="body", description="User defined status text", example="Hello world!"),
  *      @OA\Property(property="bodyMentions", description="Mentions in the status body", type="array", @OA\Items(ref="#/components/schemas/MentionDto")),
  *      @OA\Property(property="business", ref="#/components/schemas/Business"),
@@ -33,18 +33,19 @@ class StatusResource extends JsonResource
     public function toArray($request): array {
         /** @var Status $this */
         return [
-            'id'             => (int) $this->id,
-            'body'           => (string) $this->body,
+            'id'             => $this->id,
+            'uuid'           => $this->uuid,
+            'body'           => $this->body,
             'bodyMentions'   => $this->mentions->map(
                 fn($mention) => new MentionDto($mention->mentioned, $mention->position, $mention->length)
             ),
-            'user'           => (int) $this->user->id, // TODO: deprectated: remove after 2024-08
-            'username'       => (string) $this->user->username, // TODO: deprectated: remove after 2024-08
+            'user'           => $this->user->id, // TODO: deprectated: remove after 2024-08
+            'username'       => $this->user->username, // TODO: deprectated: remove after 2024-08
             'profilePicture' => ProfilePictureController::getUrl($this->user), // TODO: deprectated: remove after 2024-08
-            'preventIndex'   => (bool) $this->user->prevent_index, // TODO: deprectated: remove after 2024-08
-            'business'       => (int) $this->business->value,
-            'visibility'     => (int) $this->visibility->value,
-            'likes'          => (int) $this->likes->count(),
+            'preventIndex'   => $this->user->prevent_index, // TODO: deprectated: remove after 2024-08
+            'business'       => $this->business->value,
+            'visibility'     => $this->visibility->value,
+            'likes'          => $this->likes->count(),
             'liked'          => (bool) $this->favorited,
             'isLikable'      => Gate::allows('like', $this->resource),
             'client'         => new ClientResource($this->client),

app/Models/Checkin.php

@@ -166,7 +166,7 @@ public function getSpeedAttribute(): float {
     public function getAlsoOnThisConnectionAttribute(): Collection {
         return self::with(['status'])
                    ->where([
-                               ['status_id', '<>', $this->status->id],
+                               ['status_id', '<>', $this->status_id],
                                ['trip_id', '=', $this->trip->trip_id],
                                ['arrival', '>', $this->departure],
                                ['departure', '<', $this->arrival]

app/Models/Status.php

@@ -4,6 +4,7 @@
 
 use App\Enum\Business;
 use App\Enum\StatusVisibility;
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -17,6 +18,7 @@
 /**
  * //properties
  * @property int                   id
+ * @property string                uuid
  * @property int                   user_id
  * @property string                body
  * @property Business              business
@@ -43,16 +45,21 @@
 class Status extends Model
 {
 
-    use HasFactory, LogsActivity;
+    use HasFactory, LogsActivity, HasUuids;
+
+    protected $primaryKey = 'uuid'; // temporary until the migration to uuid is done. 'id' is auto-incrementing in the database
+    protected $keyType    = 'string';
 
     protected              $fillable     = [
+        'uuid',
         'user_id', 'body', 'business', 'visibility', 'event_id', 'mastodon_post_id', 'client_id',
         'moderation_notes', 'lock_visibility', 'hide_body',
     ];
     protected              $hidden       = ['user_id', 'business'];
     protected              $appends      = ['favorited', 'statusInvisibleToMe', 'description'];
     protected              $casts        = [
         'id'               => 'integer',
+        'uuid'             => 'string',
         'user_id'          => 'integer',
         'business'         => Business::class,
         'visibility'       => StatusVisibility::class,
@@ -66,15 +73,15 @@ class Status extends Model
     protected static array $recordEvents = ['updated'];
 
     public function user(): BelongsTo {
-        return $this->belongsTo(User::class);
+        return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
     public function likes(): HasMany {
-        return $this->hasMany(Like::class);
+        return $this->hasMany(Like::class, 'status_id', 'id');
     }
 
     public function checkin(): HasOne {
-        return $this->hasOne(Checkin::class);
+        return $this->hasOne(Checkin::class, 'status_id', 'id');
     }
 
     public function client(): BelongsTo {

database/migrations/2025_01_18_000000_add_uuid_to_statuses.php

@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+
+    public function up(): void {
+        Schema::table('statuses', function(Blueprint $table) {
+            $table->uuid()->after('id')
+                  ->nullable() // for migration reasons
+                  ->unique();
+        });
+    }
+
+    public function down(): void {
+        Schema::table('statuses', function(Blueprint $table) {
+            $table->dropColumn('uuid');
+        });
+    }
+};

routes/api.php

@@ -62,8 +62,6 @@
             Route::get('dashboard/future', [StatusController::class, 'getFutureCheckins']);
         });
         Route::group(['middleware' => ['scope:write-statuses']], static function() {
-            Route::delete('status/{id}', [StatusController::class, 'destroy'])->whereNumber('id');
-            Route::put('status/{id}', [StatusController::class, 'update']);
             Route::post('status/{statusId}/tags', [StatusTagController::class, 'store']);
             Route::put('status/{statusId}/tags/{tagKey}', [StatusTagController::class, 'update']);
             Route::delete('status/{statusId}/tags/{tagKey}', [StatusTagController::class, 'destroy']);
@@ -156,10 +154,14 @@
             });
         });
 
-        Route::apiResource('webhooks', WebhookController::class)->only(['index', 'show', 'destroy']);
+        Route::apiResources([
+                                'webhooks' => WebhookController::class,
+                                'stations' => StationController::class,
+                                'status'   => StatusController::class,
+                            ]);
+
+        Route::apiResource('station', StationController::class); // TODO: remove, when all endpoints are migrated to the new resource (stations)
 
-        Route::apiResource('station', StationController::class); // TODO: rename to "stations" when stable
-        Route::apiResource('stations', StationController::class);
         Route::put('station/{oldStationId}/merge/{newStationId}', [StationController::class, 'merge']); // currently admin/backend only
 
         Route::group(['prefix' => 'user/self'], static function() {