add label to journey transport

common/src/main/java/tools/simrail/backend/common/journey/JourneyEventEntity.java

@@ -154,6 +154,7 @@ public final class JourneyEventEntity {
   @AttributeOverrides({
     @AttributeOverride(name = "line", column = @Column(name = "transport_line")),
     @AttributeOverride(name = "type", column = @Column(name = "transport_type")),
+    @AttributeOverride(name = "label", column = @Column(name = "transport_label")),
     @AttributeOverride(name = "number", column = @Column(name = "transport_number")),
     @AttributeOverride(name = "category", column = @Column(name = "transport_category")),
     @AttributeOverride(name = "maxSpeed", column = @Column(name = "transport_max_speed")),

common/src/main/java/tools/simrail/backend/common/journey/JourneyTransport.java

@@ -59,6 +59,11 @@ public final class JourneyTransport {
    */
   @Column
   private String line;
+  /**
+   * Marketing name or product name of the transport.
+   */
+  @Column
+  private String label;
   /**
    * The maximum speed that this transport is allowed to drive at the associated point.
    */

info-collector/src/main/java/tools/simrail/backend/collector/journey/JourneyEventRealtimeUpdater.java

@@ -353,6 +353,7 @@ private void updateSubsequentJourneyEventTimes(@Nonnull JourneyEventEntity event
       previousTransport.getNumber(),
       previousTransport.getType(),
       previousTransport.getLine(),
+      previousTransport.getLabel(),
       maxSpeedAtCurrentPoint);
 
     // create the jit arrival and departure event

info-collector/src/main/java/tools/simrail/backend/collector/journey/SimRailServerTimetableCollector.java

@@ -154,8 +154,16 @@ private void collectJourney(
 
     // extract the line information from the display name of the train
     var cleanedTrainName = WHITESPACE_PATTERN.matcher(run.getTrainDisplayName()).replaceAll("");
-    var trainNameParts = cleanedTrainName.split("-");
-    var trainLine = trainNameParts.length > 1 ? trainNameParts[1] : null;
+    var trainNameParts = List.of(cleanedTrainName.split("-"));
+    var trainLine = trainNameParts.stream()
+      .filter(part -> !part.startsWith("\""))
+      .findFirst()
+      .orElse(null);
+    var trainLabel = trainNameParts.stream()
+      .filter(part -> part.startsWith("\"") && part.endsWith("\""))
+      .findFirst()
+      .map(label -> label.substring(1, label.length() - 1))
+      .orElse(null);
 
     // create events for all timetable entries
     var inBorder = false; // keeps track if the journey is within the playable border
@@ -183,6 +191,7 @@ private void collectJourney(
         previousEvent = this.registerJourneyEvent(
           journeyId,
           trainLine,
+          trainLabel,
           server,
           JourneyEventType.ARRIVAL,
           previousEvent,
@@ -196,6 +205,7 @@ private void collectJourney(
         previousEvent = this.registerJourneyEvent(
           journeyId,
           trainLine,
+          trainLabel,
           server,
           JourneyEventType.DEPARTURE,
           previousEvent,
@@ -215,6 +225,7 @@ private void collectJourney(
   private @Nullable JourneyEventEntity registerJourneyEvent(
     @Nonnull UUID journeyId,
     @Nullable String trainLine,
+    @Nullable String trainLabel,
     @Nonnull SimRailServerDescriptor server,
     @Nonnull JourneyEventType eventType,
     @Nullable JourneyEventEntity previousEvent,
@@ -226,6 +237,7 @@ private void collectJourney(
     var event = this.createJourneyEvent(
       journeyId,
       trainLine,
+      trainLabel,
       server,
       eventType,
       previousTime,
@@ -243,6 +255,7 @@ private void collectJourney(
   private @Nullable JourneyEventEntity createJourneyEvent(
     @Nonnull UUID journeyId,
     @Nullable String trainLine,
+    @Nullable String trainLabel,
     @Nonnull SimRailServerDescriptor server,
     @Nonnull JourneyEventType eventType,
     @Nullable OffsetDateTime previousEventTime,
@@ -327,6 +340,7 @@ private void collectJourney(
     transportEntity.setCategory(category);
     transportEntity.setNumber(number);
     transportEntity.setType(transportType);
+    transportEntity.setLabel(trainLabel);
     transportEntity.setMaxSpeed(maxSpeed);
     if (transportType == JourneyTransportType.REGIONAL_TRAIN
       || transportType == JourneyTransportType.REGIONAL_FAST_TRAIN) {

rest-api/src/main/java/tools/simrail/backend/api/journey/converter/JourneyTransportDtoConverter.java

@@ -42,6 +42,7 @@ public final class JourneyTransportDtoConverter implements Function<JourneyTrans
       transport.getCategory(),
       transport.getNumber(),
       transport.getLine(),
+      transport.getLabel(),
       transport.getType(),
       transport.getMaxSpeed());
   }

rest-api/src/main/java/tools/simrail/backend/api/journey/converter/JourneyTransportSummaryDtoConverter.java

@@ -43,6 +43,7 @@ public final class JourneyTransportSummaryDtoConverter
       transport.getCategory(),
       transport.getNumber(),
       transport.getLine(),
+      transport.getLabel(),
       transport.getType());
   }
 }

rest-api/src/main/java/tools/simrail/backend/api/journey/dto/JourneyTransportDto.java

@@ -39,6 +39,8 @@ public record JourneyTransportDto(
   @Nonnull String number,
   @Schema(description = "The line of the transport, null in case no line is associated with the transport")
   @Nullable String line,
+  @Schema(description = "The label of the transport, for example the marketing name or product name of the transport")
+  @Nullable String label,
   @Schema(description = "The higher-level category of the transport")
   @Nonnull JourneyTransportType type,
   @Schema(description = "The maximum speed (in km/h) of the journey is allowed to drive at the associated point")

rest-api/src/main/java/tools/simrail/backend/api/journey/dto/JourneyTransportSummaryDto.java

@@ -39,6 +39,8 @@ public record JourneyTransportSummaryDto(
   @Nonnull String number,
   @Schema(description = "The line of the transport, null in case no line is associated with the transport")
   @Nullable String line,
+  @Schema(description = "The label of the transport, for example the marketing name or product name of the transport")
+  @Nullable String label,
   @Schema(description = "The higher-level category of the transport")
   @Nonnull JourneyTransportType type
 ) {