moved validity times to transitInfo

Ivan Aladjoff · Ivan Aladjoff · commit 5469209f111d · 2025-10-28T08:27:48.000+01:00
diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java
@@ -66,6 +66,7 @@
 import org.opentripplanner.apis.transmodel.model.framework.ServerInfoType;
 import org.opentripplanner.apis.transmodel.model.framework.StreetModeDurationInputType;
 import org.opentripplanner.apis.transmodel.model.framework.SystemNoticeType;
+import org.opentripplanner.apis.transmodel.model.framework.TransitInfoType;
 import org.opentripplanner.apis.transmodel.model.framework.TransmodelDirectives;
 import org.opentripplanner.apis.transmodel.model.framework.TransmodelScalars;
 import org.opentripplanner.apis.transmodel.model.framework.ValidityPeriodType;
@@ -219,6 +220,7 @@ private GraphQLSchema createDefault() {
     GraphQLOutputType systemNoticeType = SystemNoticeType.create();
     GraphQLOutputType linkGeometryType = PointsOnLinkType.create();
     GraphQLOutputType serverInfoType = ServerInfoType.create();
+    GraphQLOutputType transitInfoType = TransitInfoType.create(validityPeriodType);
     GraphQLOutputType authorityType = authorityTypeFactory.create(
       LineType.REF,
       PtSituationElementType.REF
@@ -1533,6 +1535,14 @@ private GraphQLSchema createDefault() {
           .dataFetcher(e -> projectInfo())
           .build()
       )
+      .field(
+        GraphQLFieldDefinition.newFieldDefinition()
+          .name("transitInfo")
+          .description("Get information about the transit data available in the system.")
+          .type(new GraphQLNonNull(transitInfoType))
+          .dataFetcher(e -> new Object())
+          .build()
+      )
       .field(datedServiceJourneyQueryFactory.createGetById(datedServiceJourneyType))
       .field(datedServiceJourneyQueryFactory.createQuery(datedServiceJourneyType))
       .build();
diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/ServerInfoType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/ServerInfoType.java
@@ -119,28 +119,6 @@ public static GraphQLOutputType create() {
           .dataFetcher(e -> Runtime.getRuntime().availableProcessors())
           .build()
       )
-      .field(
-        GraphQLFieldDefinition.newFieldDefinition()
-          .name("transitServiceValidityEnd")
-          .description("End date of the transit data validity period")
-          .type(TransmodelScalars.DATE_SCALAR)
-          .dataFetcher(e -> {
-            var zonedDateTime = GqlUtil.getTransitService(e).getTransitServiceEnds();
-            return zonedDateTime != null ? zonedDateTime.toLocalDate() : null;
-          })
-          .build()
-      )
-      .field(
-        GraphQLFieldDefinition.newFieldDefinition()
-          .name("transitServiceValidityStart")
-          .description("Start date of the transit data validity period")
-          .type(TransmodelScalars.DATE_SCALAR)
-          .dataFetcher(e -> {
-            var zonedDateTime = GqlUtil.getTransitService(e).getTransitServiceStarts();
-            return zonedDateTime != null ? zonedDateTime.toLocalDate() : null;
-          })
-          .build()
-      )
       .build();
   }
 }
diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransitInfoType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransitInfoType.java
@@ -0,0 +1,34 @@
+package org.opentripplanner.apis.transmodel.model.framework;
+
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLOutputType;
+import org.opentripplanner.apis.transmodel.model.siri.sx.ValidityPeriod;
+import org.opentripplanner.apis.transmodel.support.GqlUtil;
+
+public class TransitInfoType {
+
+  public static GraphQLOutputType create(GraphQLObjectType validityPeriodType) {
+    return GraphQLObjectType.newObject()
+      .name("TransitInfo")
+      .description("Information about the transit data available in the system.")
+      .field(
+        GraphQLFieldDefinition.newFieldDefinition()
+          .name("validityPeriod")
+          .description("The validity period for the transit data currently loaded in the system.")
+          .type(validityPeriodType)
+          .dataFetcher(environment -> {
+            var transitService = GqlUtil.getTransitService(environment);
+            var startTime = transitService.getTransitServiceStarts();
+            var endTime = transitService.getTransitServiceEnds();
+
+            Long startMillis = startTime != null ? startTime.toInstant().toEpochMilli() : null;
+            Long endMillis = endTime != null ? endTime.toInstant().toEpochMilli() : null;
+
+            return new ValidityPeriod(startMillis, endMillis);
+          })
+          .build()
+      )
+      .build();
+  }
+}
diff --git a/application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
@@ -808,6 +808,8 @@ type QueryType {
     "MultiModalMode for query. To control whether multi modal parent stop places, their mono modal children or both are included in the response. Does not affect mono modal stop places that do not belong to a multi modal stop place."
     multiModalMode: MultiModalMode = parent
   ): [StopPlace]! @timingData
+  "Get information about the transit data available in the system."
+  transitInfo: TransitInfo!
   "Input type for executing a travel search for a trip between two locations. Returns trip patterns describing suggested alternatives for the trip."
   trip(
     "Time and cost penalty on access/egress modes."
@@ -1186,10 +1188,6 @@ type ServerInfo {
   otpSerializationVersionId: String
   "The 'configVersion' of the router-config.json file."
   routerConfigVersion: String
-  "End date of the transit data validity period"
-  transitServiceValidityEnd: Date
-  "Start date of the transit data validity period"
-  transitServiceValidityStart: Date
   "Maven version"
   version: String
 }
@@ -1382,6 +1380,12 @@ type TimetabledPassingTime {
   timingPoint: Boolean!
 }
 
+"Information about the transit data available in the system."
+type TransitInfo {
+  "The validity period for the transit data currently loaded in the system."
+  validityPeriod: ValidityPeriod
+}
+
 "Used to specify board and alight slack for a given modes."
 type TransportModeSlackType {
   modes: [TransportMode!]!
