Merge branch 'publisher-query' into dev-2.x

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

@@ -141,7 +141,6 @@ protected static GraphQLSchema buildSchema() {
         .type(typeWiring.build(DepartureRowImpl.class))
         .type(typeWiring.build(elevationProfileComponentImpl.class))
         .type(typeWiring.build(FeedImpl.class))
-        .type(typeWiring.build(FeedImpl.class))
         .type(typeWiring.build(GeometryImpl.class))
         .type(typeWiring.build(ItineraryImpl.class))
         .type(typeWiring.build(LegImpl.class))

src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java

@@ -64,6 +64,22 @@ public DataFetcher<String> feedId() {
     return this::getSource;
   }
 
+  @Override
+  public DataFetcher<String> publisherName() {
+    return environment -> {
+      String id = getSource(environment);
+      return getTransitService(environment).getFeedInfo(id).getPublisherName();
+    };
+  }
+
+  @Override
+  public DataFetcher<String> publisherUrl() {
+    return environment -> {
+      String id = getSource(environment);
+      return getTransitService(environment).getFeedInfo(id).getPublisherUrl();
+    };
+  }
+
   private List<Agency> getAgencies(DataFetchingEnvironment environment) {
     String id = getSource(environment);
     return getTransitService(environment)

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

@@ -392,6 +392,10 @@ public interface GraphQLFeed {
     public DataFetcher<Iterable<TransitAlert>> alerts();
 
     public DataFetcher<String> feedId();
+
+    public DataFetcher<String> publisherName();
+
+    public DataFetcher<String> publisherUrl();
   }
 
   public interface GraphQLGeometry {

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

@@ -1174,6 +1174,12 @@ type Feed {
     """List of agencies which provide data to this feed"""
     agencies: [Agency]
 
+    """Name of feed publisher"""
+    publisherName: String!
+
+    """Web address of feed publisher"""
+    publisherUrl: String!
+
     """
     Alerts relevant for the feed.
     """

src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java

@@ -43,6 +43,7 @@
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
 import org.opentripplanner.framework.model.Grams;
+import org.opentripplanner.model.FeedInfo;
 import org.opentripplanner.model.fare.FareMedium;
 import org.opentripplanner.model.fare.FareProduct;
 import org.opentripplanner.model.fare.ItineraryFares;
@@ -84,6 +85,7 @@
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.BikeAccess;
 import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.organization.Agency;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.StopLocation;
 import org.opentripplanner.transit.model.timetable.RealTimeTripTimes;
@@ -151,6 +153,18 @@ static void setup() {
 
     transitModel.addTripPattern(id("pattern-1"), pattern);
 
+    var feedId = "testfeed";
+    var feedInfo = FeedInfo.dummyForTest(feedId);
+    transitModel.addFeedInfo(feedInfo);
+
+    var agency = Agency
+      .of(new FeedScopedId(feedId, "agency-xx"))
+      .withName("speedtransit")
+      .withUrl("www.otp-foo.bar")
+      .withTimezone("Europe/Berlin")
+      .build();
+    transitModel.addAgency(agency);
+
     transitModel.initTimeZone(ZoneIds.BERLIN);
     transitModel.index();
     var routes = Arrays

src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json

@@ -0,0 +1,16 @@
+{
+  "data" : {
+    "feeds" : [
+      {
+        "agencies" : [
+          {
+            "name" : "speedtransit",
+            "url" : "www.otp-foo.bar"
+          }
+        ],
+        "publisherUrl" : "www.z.org",
+        "publisherName" : "publisher"
+      }
+    ]
+  }
+}

src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql

@@ -0,0 +1,10 @@
+{
+    feeds {
+        agencies {
+	    name
+	    url
+	}
+	publisherUrl
+	publisherName
+    }
+}