Merge branch 'develop' into dev-ks/dbperf

.env.docker

@@ -56,10 +56,6 @@ MIX_LEGAL_TEL="01234 / 56789"
 TELEGRAM_ADMIN_ID=123456789
 TELEGRAM_TOKEN=12345678:abcdefghijklmnop
 
-# ORTS Backend for support tickets
-TICKET_HOST=https://example.org
-TICKET_APIKEY=xxx
-
 # Should the year in review be visible to the users?
 YEAR_IN_REVIEW_ACTIVE=false
 

.env.example

@@ -59,21 +59,14 @@ MIX_LEGAL_ADDRESS2="12345 Musterstadt"
 MIX_LEGAL_EMAIL="[email protected]"
 MIX_LEGAL_TEL="01234 / 56789"
 
-# Telegram Bot credentials. Currently only used for the admin backend
-TELEGRAM_ADMIN_ID=123456789
-TELEGRAM_TOKEN=12345678:abcdefghijklmnop
-
-# ORTS Backend for support tickets
-TICKET_HOST=https://example.org
-TICKET_APIKEY=xxx
-
 # Should the year in review be visible to the users?
 YEAR_IN_REVIEW_BACKEND=false
 YEAR_IN_REVIEW_ALERT=false
 
-# Webhook urls which will be called when a new event is suggested
-ADMIN_NOTIFICATION_URL=https://api.telegram.org/bot.../sendMessage
-ADMIN_NOTIFICATION_CHAT_ID=123456789
+# Telegram Bot credentials - used for admin notifications
+TELEGRAM_ADMIN_ACTIVE=false # Set to true to enable Telegram notifications
+TELEGRAM_ADMIN_TOKEN=0000000000:0000000000000000000000000000
+TELEGRAM_ADMIN_CHAT_ID=123456789
 
 # Shall webhooks actually call other servers? Default is off to work privacy-preserving.
 WEBHOOKS_ACTIVE=true

API_CHANGELOG.md

@@ -4,10 +4,17 @@ 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-07-17
+
+The Endpoint `/report` now correctly uses camelCase for the `subjectType` and `subjectId` field.
+Since the current usage of this endpoint is very low, the old snake_case fields will be removed after 2024-08-17.
+
 # 2024-06-28
 
-The `LeaderboardUserResource` is now returning the whole `LightUserResource` for the user who created it in the `user` field.
-Thus the following fields of the `LeaderboardUserResource` are now **marked as deprecated and will be removed after August 2024**.
+The `LeaderboardUserResource` is now returning the whole `LightUserResource` for the user who created it in the `user`
+field.
+Thus the following fields of the `LeaderboardUserResource` are now **marked as deprecated and will be removed after
+August 2024**.
 
 - `id`
 - `displayName`
@@ -22,8 +29,10 @@ Changed `/operator` to `/operators`
 
 ## 2024-05-31
 
-The `StatusResource` is now returning the whole `LightUserResource` for the user who created it in the `userDetails` field.
-Thus the following fields of the `StatusResource` are now **marked as deprecated and will be removed after August 2024**.
+The `StatusResource` is now returning the whole `LightUserResource` for the user who created it in the `userDetails`
+field.
+Thus the following fields of the `StatusResource` are now **marked as deprecated and will be removed after August 2024
+**.
 
 - `user`
 - `username`

Dockerfile

@@ -9,7 +9,7 @@ WORKDIR /usr/src/trwl
 RUN composer install --ignore-platform-reqs --no-interaction --no-progress --no-suggest --optimize-autoloader
 RUN php artisan optimize
 
-FROM php:8.3.8-apache
+FROM php:8.3.9-apache
 ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
 
 RUN apt update && \

app/Enum/HafasTravelType.php

@@ -29,16 +29,17 @@ enum HafasTravelType: string
 
     public function getEmoji(): string {
         return match ($this->value) {
-            'nationalExpress', 'national' => '🚄',
-            'regionalExp', 'regional'     => '🚆',
-            'suburban'                    => '🚋',
-            'bus'                         => '🚌',
-            'ferry'                       => '⛴',
-            'subway'                      => '🚇',
-            'tram'                        => '🚊',
-            'taxi'                        => '🚖',
-            'plane'                       => '✈️',
-            default                       => '',
+            'nationalExpress'         => '🚄',
+            'regionalExp', 'national' => '🚆',
+            'regional'                => '🚞',
+            'suburban'                => '🚋',
+            'bus'                     => '🚌',
+            'ferry'                   => '⛴',
+            'subway'                  => '🚇',
+            'tram'                    => '🚊',
+            'taxi'                    => '🚖',
+            'plane'                   => '✈️',
+            default                   => '',
         };
     }
 

app/Enum/PointReason.php

@@ -6,9 +6,9 @@
 /**
  * @OA\Schema(
  *     title="PointsReason",
- *     description="What is the reason for the points calculation factor? (0=in time => 100%, 1=good enough => 25%, 2=not sufficient (1 point), 3=forced => no points)",
+ *     description="What is the reason for the points calculation factor? (0=in time => 100%, 1=good enough => 25%, 2=not sufficient (1 point), 3=forced => no points, 4=manual trip => no points, 5=points disabled)",
  *     type="integer",
- *     enum={0,1,2,3},
+ *     enum={0,1,2,3,4,5},
  *     example=1
  * )
  */
@@ -23,4 +23,6 @@ enum PointReason: int
      * Trip was manually created by the user => no points.
      */
     case MANUAL_TRIP = 4;
+
+    case POINTS_DISABLED = 5;
 }

app/Enum/Report/ReportableSubject.php

@@ -7,4 +7,5 @@ enum ReportableSubject: string
     case EVENT  = 'Event';
     case STATUS = 'Status';
     case USER   = 'User';
+    case TRIP   = 'Trip';
 }

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

@@ -87,6 +87,10 @@
  *     name="Webhooks",
  *     description="Manage Webhooks for third party applications"
  * )
+ * @OA\Tag(
+ *     name="Report",
+ *     description="Report a Status, Event or User to the admins"
+ * )
  */
 class Controller extends \App\Http\Controllers\Controller
 {