🔥 drop deprecated things (#2281)

API_CHANGELOG.md

@@ -4,6 +4,11 @@ In this we try to keep track of changes to the API.
 Primarily this should document changes that are not backwards compatible or belongs to already documented endpoints.
 This is to help you keep track of the changes and to help you update your code accordingly.
 
+## 2024-01-21
+
+The attribute `twitter` in the `User` Model is already always `null` and will be removed after 2024-03.
+Please prepare your code accordingly.
+
 ## 2023-11-23
 
 The attribute `type` in the `Status` Model is marked as deprecated and now returns a blank string for all statuses as it

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

@@ -15,9 +15,9 @@
 use App\Http\Controllers\Backend\Transport\TrainCheckinController;
 use App\Http\Controllers\HafasController;
 use App\Http\Controllers\TransportController as TransportBackend;
-use App\Http\Resources\TripResource;
 use App\Http\Resources\StationResource;
 use App\Http\Resources\StatusResource;
+use App\Http\Resources\TripResource;
 use App\Models\Event;
 use App\Models\Station;
 use Carbon\Carbon;
@@ -240,15 +240,14 @@ public function departures(Request $request, string $name): JsonResponse {
      */
     public function getTrip(Request $request): JsonResponse {
         $validated = $request->validate([
-                                            'tripId'      => ['required_without:hafasTripId', 'string'], //ToDo deprecated: remove after 2023-02-28
-                                            'hafasTripId' => ['required_without:tripId', 'string'],
+                                            'hafasTripId' => ['required', 'string'],
                                             'lineName'    => ['required', 'string'],
                                             'start'       => ['required', 'numeric', 'gt:0'],
                                         ]);
 
         try {
             $trip = TrainCheckinController::getHafasTrip(
-                $validated['hafasTripId'] ?? $validated['tripId'], //ToDo deprecated: change to hafasTripId after 2023-02-28
+                $validated['hafasTripId'],
                 $validated['lineName'],
                 (int) $validated['start']
             );

app/Http/Controllers/Controller.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Carbon\Carbon;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
@@ -11,37 +10,4 @@
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-
-    /**
-     * @param int         $stationId
-     * @param array       $array
-     * @param Carbon|null $departure
-     * @param Carbon|null $arrival
-     *
-     * @return int|null
-     * @deprecated This function is only used in TransportController::TrainTrip which is
-     *             deprecated and replaced with other functions
-     */
-    public static function searchForId(
-        int    $stationId,
-        array  $array,
-        Carbon $departure = null,
-        Carbon $arrival = null
-    ): ?int {
-        foreach ($array as $key => $val) {
-            if ($val['stop']['id'] != $stationId) {
-                continue;
-            }
-            $stopDeparture        = Carbon::parse($val['plannedDeparture'] ?? $val['departure']);
-            $stopArrival          = Carbon::parse($val['plannedArrival'] ?? $val['arrival']);
-            $departureTimeMatches = $departure == null || $departure == $stopDeparture;
-            $arrivalTimeMatches   = $arrival == null || $arrival == $stopArrival;
-
-            if ($departureTimeMatches && $arrivalTimeMatches) {
-                return $key;
-            }
-        }
-
-        return null;
-    }
 }

app/Http/Middleware/PrivacyInterceptionMiddleware.php

@@ -9,7 +9,7 @@
 use Illuminate\Support\Facades\Log;
 
 /**
- * @deprecated used in api v0 and frontend
+ * used in frontend
  */
 class PrivacyInterceptionMiddleware
 {

app/Http/Resources/LeaderboardUserResource.php

@@ -20,7 +20,6 @@ public function toArray($request): array {
             'profilePicture'=> ProfilePictureController::getUrl($this->user),
             'trainDuration' => (int) $this->duration,
             'trainDistance' => (float) $this->distance,
-            'trainSpeed'    => 0.0, //deprecated: TODO: remove after 2023-12-31
             'points'        => (int) $this->points
         ];
     }

app/Http/Resources/StatusResource.php

@@ -41,7 +41,6 @@ public function toArray($request): array {
                 'distance'            => (int) $this->checkin->distance,
                 'points'              => (int) $this->checkin->points,
                 'duration'            => (int) $this->checkin->duration,
-                'speed'               => 0.0, //deprecated: TODO: remove after 2023-12-31
                 'manualDeparture'     => $this->checkin->manual_departure?->toIso8601String(),
                 'manualArrival'       => $this->checkin->manual_arrival?->toIso8601String(),
                 'origin'              => new StopoverResource($this->checkin->originStopover),

app/Http/Resources/UserBaseResource.php

@@ -24,7 +24,6 @@ public function toArray($request): array {
             'profilePicture' => ProfilePictureController::getUrlForUserId($this->id),
             'trainDistance'  => (float) $this->train_distance,
             'trainDuration'  => (int) $this->train_duration,
-            'trainSpeed'     => 0.0, //deprecated: TODO: remove after 2023-12-31
             'points'         => (int) $this->points,
             'twitterUrl'     => null, //deprecated: TODO: can be removed after 2024-02-29
             'mastodonUrl'    => $this->mastodonUrl ?? null,

app/Http/Resources/UserProfileSettingsResource.php

@@ -30,7 +30,7 @@ public function toArray($request): array {
             'email'                   => $this->email,
             'emailVerified'           => !empty($this->email_verified_at),
             'profilePictureSet'       => !empty($this->avatar),
-            'twitter'                 => null, //deprecated
+            'twitter'                 => null, //@deprecated remove after 2024-03
             'mastodon'                => $this->mastodon_url,
             'mastodonVisibility'      => $this->socialProfile->mastodon_visibility->value,
         ];

app/Models/User.php

@@ -66,7 +66,7 @@ class User extends Authenticatable implements MustVerifyEmail
         'home_id', 'avatar', 'social_profile', 'created_at', 'updated_at', 'userInvisibleToMe'
     ];
     protected $appends  = [
-        'averageSpeed', 'points', 'userInvisibleToMe', 'mastodonUrl', 'train_distance', 'train_duration',
+        'points', 'userInvisibleToMe', 'mastodonUrl', 'train_distance', 'train_duration',
         'following', 'followPending', 'muted', 'isAuthUserBlocked', 'isBlockedByAuthUser',
     ];
     protected $casts    = [
@@ -103,14 +103,6 @@ public function getTrainDurationAttribute(): float {
         return Checkin::where('user_id', $this->id)->sum('duration');
     }
 
-    /**
-     * @return float
-     * @deprecated Use speed variable at train_checkins instead
-     */
-    public function getAverageSpeedAttribute(): float {
-        return $this->train_duration == 0 ? 0 : $this->train_distance / ($this->train_duration / 60);
-    }
-
     public function socialProfile(): HasOne {
         if ($this->hasOne(SocialLoginProfile::class)->count() == 0) {
             SocialLoginProfile::create(['user_id' => $this->id]);

app/Virtual/Models/CheckinRequestBody.php

@@ -57,17 +57,6 @@ class CheckinRequestBody
      */
     private $eventId;
 
-    /**
-     * @OA\Property (
-     *     title="tweet",
-     *     nullable=true,
-     *     description="The tweet flag is deprecated and will be removed in a future version. For now, it is ignored and check-ins are not tweeted.",
-     *     type="boolean",
-     *     example="false"
-     * )
-     */
-    private $tweet;
-
     /**
      * @OA\Property (
      *     title="toot",

app/Virtual/Models/UserProfileSettings.php

@@ -141,18 +141,6 @@ class UserProfileSettings
      */
     private $profilePictureSet;
 
-    /**
-     * @OA\Property (
-     *     title="twitter",
-     *     description="Deprecated. Always null, since Träwelling doesn't support twitter anymore.",
-     *     nullable=true,
-     *     example="null"
-     * )
-     *
-     * @var string
-     */
-    private $twitter;
-
     /**
      * @OA\Property (
      *     title="mastodon",

resources/views/admin/layout.blade.php

@@ -62,10 +62,6 @@ class="brand-image me-3" style="width: 30px; opacity: 0.8">
                                 <i class="fa-solid fa-plus"></i>
                                 Trips
                             </a>
-                            <a class="nav-link" href="{{ route('admin.stats') }}">
-                                <i class="fa-solid fa-chart-line"></i>
-                                Stats
-                            </a>
                         @endif
                     </div>
                     <ul class="navbar-nav ms-auto">

routes/web/admin.php

@@ -15,9 +15,6 @@
     Route::middleware('role:admin')->group(static function() {
         // these routes are only accessible for admins
 
-        Route::get('/stats', [DashboardController::class, 'renderStats'])
-             ->name('admin.stats');
-
         Route::prefix('checkin')->group(function() {
             Route::get('/', [CheckinController::class, 'renderStationboard'])
                  ->name('admin.stationboard');

tests/Feature/APIv1/TransportTest.php

@@ -72,7 +72,7 @@ public function testGetDeparturesFetchTripAndCheckin(): void {
         // Fetch correct trip
         $response = $this->get(
             uri:     '/api/v1/trains/trip'
-                     . '?tripId=' . $departure['tripId']
+                     . '?hafasTripId=' . $departure['tripId']
                      . '&lineName=' . $departure['line']['name']
                      . '&start=' . $departure['stop']['id'],
         );