add StopInPattern in GTFS GraphQL schema

application/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java

@@ -61,6 +61,7 @@
 import org.opentripplanner.apis.gtfs.datafetchers.RoutingErrorImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopGeometriesImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.StopInPatternImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopOnRouteImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopOnTripImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopRelationshipImpl;
@@ -166,6 +167,7 @@ protected static GraphQLSchema buildSchema() {
         .type(typeWiring.build(VehicleRentalNetworkImpl.class))
         .type(typeWiring.build(RentalVehicleImpl.class))
         .type(typeWiring.build(RentalVehicleTypeImpl.class))
+        .type(typeWiring.build(StopInPatternImpl.class))
         .type(typeWiring.build(StopOnRouteImpl.class))
         .type(typeWiring.build(StopOnTripImpl.class))
         .type(typeWiring.build(UnknownImpl.class))

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java

@@ -16,6 +16,7 @@
 import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
 import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.apis.gtfs.model.StopInPatternModel;
 import org.opentripplanner.apis.support.SemanticHash;
 import org.opentripplanner.framework.graphql.GraphQLUtils;
 import org.opentripplanner.routing.alertpatch.EntitySelector;
@@ -197,6 +198,19 @@ public DataFetcher<Iterable<Object>> stops() {
     return this::getStops;
   }
 
+  @Override
+  public DataFetcher<Iterable<Object>> stopsInPattern() {
+    return environment -> {
+      var pattern = getSource(environment);
+      var numberOfStops = pattern.numberOfStops();
+      var result = new StopInPatternModel[numberOfStops];
+      for (var i = 0; i < numberOfStops; i++) {
+        result[i] = StopInPatternModel.fromPatternAndIndex(pattern, i);
+      }
+      return List.of(result);
+    };
+  }
+
   @Override
   public DataFetcher<Iterable<Trip>> trips() {
     return this::getTrips;

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopInPatternImpl.java

@@ -0,0 +1,39 @@
+package org.opentripplanner.apis.gtfs.datafetchers;
+
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
+import org.opentripplanner.apis.gtfs.model.StopInPatternModel;
+import org.opentripplanner.transit.model.network.TripPattern;
+
+public class StopInPatternImpl implements GraphQLDataFetchers.GraphQLStopInPattern {
+
+  @Override
+  public DataFetcher<String> dropoffType() {
+    return environment -> StoptimeImpl.getGraphqlPickDrop(getSource(environment).dropoffType());
+  }
+
+  @Override
+  public DataFetcher<Integer> indexInPattern() {
+    return environment -> getSource(environment).indexInPattern();
+  }
+
+  @Override
+  public DataFetcher<TripPattern> pattern() {
+    return environment -> getSource(environment).pattern();
+  }
+
+  @Override
+  public DataFetcher<String> pickupType() {
+    return environment -> StoptimeImpl.getGraphqlPickDrop(getSource(environment).pickupType());
+  }
+
+  @Override
+  public DataFetcher<Object> stop() {
+    return environment -> getSource(environment).stop();
+  }
+
+  private StopInPatternModel getSource(DataFetchingEnvironment environment) {
+    return environment.getSource();
+  }
+}

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java

@@ -2,10 +2,12 @@
 
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import javax.annotation.Nullable;
 import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.apis.gtfs.mapping.RealtimeStateMapper;
 import org.opentripplanner.framework.graphql.GraphQLUtils;
+import org.opentripplanner.model.PickDrop;
 import org.opentripplanner.model.StopTime;
 import org.opentripplanner.model.TripTimeOnDate;
 import org.opentripplanner.transit.model.timetable.Trip;
@@ -24,14 +26,7 @@ public DataFetcher<Integer> departureDelay() {
 
   @Override
   public DataFetcher<String> dropoffType() {
-    return environment ->
-      switch (getSource(environment).getDropoffType()) {
-        case SCHEDULED -> "SCHEDULED";
-        case NONE -> "NONE";
-        case CALL_AGENCY -> "CALL_AGENCY";
-        case COORDINATE_WITH_DRIVER -> "COORDINATE_WITH_DRIVER";
-        case CANCELLED -> null;
-      };
+    return environment -> getGraphqlPickDrop(getSource(environment).getDropoffType());
   }
 
   @Override
@@ -42,14 +37,7 @@ public DataFetcher<String> headsign() {
 
   @Override
   public DataFetcher<String> pickupType() {
-    return environment ->
-      switch (getSource(environment).getPickupType()) {
-        case SCHEDULED -> "SCHEDULED";
-        case NONE -> "NONE";
-        case CALL_AGENCY -> "CALL_AGENCY";
-        case COORDINATE_WITH_DRIVER -> "COORDINATE_WITH_DRIVER";
-        case CANCELLED -> null;
-      };
+    return environment -> getGraphqlPickDrop(getSource(environment).getPickupType());
   }
 
   @Override
@@ -115,6 +103,17 @@ public DataFetcher<Trip> trip() {
     return environment -> getSource(environment).getTrip();
   }
 
+  @Nullable
+  static String getGraphqlPickDrop(PickDrop pickDrop) {
+    return switch (pickDrop) {
+      case SCHEDULED -> "SCHEDULED";
+      case NONE -> "NONE";
+      case CALL_AGENCY -> "CALL_AGENCY";
+      case COORDINATE_WITH_DRIVER -> "COORDINATE_WITH_DRIVER";
+      case CANCELLED -> null;
+    };
+  }
+
   private TripTimeOnDate getSource(DataFetchingEnvironment environment) {
     return environment.getSource();
   }

application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java

@@ -617,6 +617,8 @@ public interface GraphQLPattern {
 
     public DataFetcher<Iterable<Object>> stops();
 
+    public DataFetcher<Iterable<Object>> stopsInPattern();
+
     public DataFetcher<Iterable<Trip>> trips();
 
     public DataFetcher<Iterable<Trip>> tripsForDate();
@@ -1049,6 +1051,18 @@ public interface GraphQLStopGeometries {
     public DataFetcher<Iterable<Geometry>> googleEncoded();
   }
 
+  public interface GraphQLStopInPattern {
+    public DataFetcher<String> dropoffType();
+
+    public DataFetcher<Integer> indexInPattern();
+
+    public DataFetcher<TripPattern> pattern();
+
+    public DataFetcher<String> pickupType();
+
+    public DataFetcher<Object> stop();
+  }
+
   /** Stop that should (but not guaranteed) to exist on a route. */
   public interface GraphQLStopOnRoute {
     public DataFetcher<Route> route();

application/src/main/java/org/opentripplanner/apis/gtfs/model/StopInPatternModel.java

@@ -0,0 +1,23 @@
+package org.opentripplanner.apis.gtfs.model;
+
+import org.opentripplanner.model.PickDrop;
+import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.site.StopLocation;
+
+public record StopInPatternModel(
+  StopLocation stop,
+  TripPattern pattern,
+  int indexInPattern,
+  PickDrop pickupType,
+  PickDrop dropoffType
+) {
+  public static StopInPatternModel fromPatternAndIndex(TripPattern pattern, int indexInPattern) {
+    return new StopInPatternModel(
+      pattern.getStop(indexInPattern),
+      pattern,
+      indexInPattern,
+      pattern.getBoardType(indexInPattern),
+      pattern.getAlightType(indexInPattern)
+    );
+  }
+}

application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls

@@ -901,6 +901,8 @@ type Pattern implements Node {
   semanticHash: String
   "List of stops served by this pattern"
   stops: [Stop!]
+  "List of stops with pickup / dropoff type served by this pattern"
+  stopsInPattern: [StopInPattern!]!
   "Trips which run on this pattern"
   trips: [Trip!]
   "Trips which run on this pattern on the specified date"
@@ -2172,6 +2174,16 @@ type StopGeometries {
   googleEncoded: [Geometry]
 }
 
+type StopInPattern {
+  "NULL means that the stop is cancelled from the pattern."
+  dropoffType: PickupDropoffType
+  indexInPattern: Int!
+  pattern: Pattern!
+  "NULL means that the stop is cancelled from the pattern."
+  pickupType: PickupDropoffType
+  stop: Stop!
+}
+
 "Stop that should (but not guaranteed) to exist on a route."
 type StopOnRoute {
   "Route which contains the stop."

application/src/test/java/org/opentripplanner/apis/gtfs/model/StopInPatternModelTest.java

@@ -0,0 +1,69 @@
+package org.opentripplanner.apis.gtfs.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
+
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.model.PickDrop;
+import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
+import org.opentripplanner.transit.model.network.Route;
+import org.opentripplanner.transit.model.network.StopPattern;
+import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.site.RegularStop;
+
+public class StopInPatternModelTest {
+
+  private static final String ID = "1";
+  private static final String NAME = "short name";
+  private static final TimetableRepositoryForTest TEST_MODEL = TimetableRepositoryForTest.of();
+
+  private static final Route ROUTE = TimetableRepositoryForTest.route("routeId").build();
+  public static final RegularStop STOP_A = TEST_MODEL.stop("A").build();
+  public static final RegularStop STOP_B = TEST_MODEL.stop("B").build();
+  public static final RegularStop STOP_C = TEST_MODEL.stop("C").build();
+  private static final StopPattern STOP_PATTERN = getStopPattern();
+
+  private static StopPattern getStopPattern() {
+    var builder = StopPattern.create(3);
+
+    builder.stops.with(0, STOP_A);
+    builder.stops.with(1, STOP_B);
+    builder.stops.with(2, STOP_C);
+    builder.pickups.with(0, PickDrop.SCHEDULED);
+    builder.pickups.with(1, PickDrop.CALL_AGENCY);
+    builder.pickups.with(2, PickDrop.NONE);
+    builder.dropoffs.with(0, PickDrop.NONE);
+    builder.dropoffs.with(1, PickDrop.COORDINATE_WITH_DRIVER);
+    builder.dropoffs.with(2, PickDrop.SCHEDULED);
+    return builder.build();
+  }
+
+  public static final TripPattern PATTERN = TripPattern
+    .of(id(ID))
+    .withName(NAME)
+    .withRoute(ROUTE)
+    .withStopPattern(STOP_PATTERN)
+    .build();
+
+  @Test
+  public void fromPatternAndIndex() {
+    assertEquals(
+      new StopInPatternModel(STOP_A, PATTERN, 0, PickDrop.SCHEDULED, PickDrop.NONE),
+      StopInPatternModel.fromPatternAndIndex(PATTERN, 0)
+    );
+    assertEquals(
+      new StopInPatternModel(
+        STOP_B,
+        PATTERN,
+        1,
+        PickDrop.CALL_AGENCY,
+        PickDrop.COORDINATE_WITH_DRIVER
+      ),
+      StopInPatternModel.fromPatternAndIndex(PATTERN, 1)
+    );
+    assertEquals(
+      new StopInPatternModel(STOP_C, PATTERN, 2, PickDrop.NONE, PickDrop.SCHEDULED),
+      StopInPatternModel.fromPatternAndIndex(PATTERN, 2)
+    );
+  }
+}