feat: add filter by lineName in bus stops query

schema.graphql

@@ -5,7 +5,7 @@ schema {
 """Root Query"""
 type RootQuery {
   """Information about the metro stations of the city of Barcelona"""
-  metroStations(after: String, first: Int, before: String, last: Int, filterBy: FilterByInputMetro): MetroStationConnection
+  metroStations(after: String, first: Int, before: String, last: Int, filterBy: FilterByInputTmb): MetroStationConnection
 
   """Returns the information about a metro station"""
   metroStation(findBy: FindByInput!): MetroStationQueryResponse
@@ -28,7 +28,7 @@ type RootQuery {
   busStop(findBy: FindByInput!): BusStopQueryResponse
 
   """Information about the bus stops of the city of Barcelona"""
-  busStops(after: String, first: Int, before: String, last: Int, filterBy: FilterByInputBus): BusStopConnection
+  busStops(after: String, first: Int, before: String, last: Int, filterBy: FilterByInputTmb): BusStopConnection
 }
 
 """A connection to a list of items."""
@@ -87,9 +87,9 @@ type CoordinatesOutput {
 }
 
 """
-Input for the filterBy argument of the metro queries, which allows filtering a connection by some parameters (e.g. lineName or lineId)
+Input for the filterBy argument of the metro and bus queries, which allows filtering a connection by some parameters (e.g. lineName or lineId)
 """
-input FilterByInputMetro {
+input FilterByInputTmb {
   lineId: Int
   lineName: String
 }
@@ -290,10 +290,3 @@ type BusStopEdge {
   """A cursor for use in pagination"""
   cursor: String!
 }
-
-"""
-Input for the filterBy argument of the bus queries, which allows filtering a connection by some parameters (e.g. lineId)
-"""
-input FilterByInputBus {
-  lineId: Int
-}

src/datasources/BusDataSource.ts

@@ -102,9 +102,11 @@ export default class BusDataSource extends TmbApiDataSource {
     return this.busStopReducer(stop);
   }
 
-  async getLineStops({ id }: FindByInputType): Promise<BusStopType[]> {
+  async getLineStops({ id, name }: FindByInputType): Promise<BusStopType[]> {
     const path = ["linies/bus", id, "parades"].filter(Boolean).join("/");
-    const response = await this.get(path);
+    const nameFilterParameter = name ? { filter: `DESC_LINIA='${name}'` } : {};
+
+    const response = await this.get(path, nameFilterParameter);
 
     const stops =
       response?.features?.map((stop) => this.busStopReducer(stop)) ?? [];

src/inputs/FilterByInput.ts

@@ -5,10 +5,10 @@ import {
   GraphQLBoolean,
 } from "graphql";
 
-export const FilterByInputMetro = new GraphQLInputObjectType({
-  name: "FilterByInputMetro",
+export const FilterByInputTmb = new GraphQLInputObjectType({
+  name: "FilterByInputTmb",
   description:
-    "Input for the filterBy argument of the metro queries, which allows filtering a connection by some parameters (e.g. lineName or lineId)",
+    "Input for the filterBy argument of the metro and bus queries, which allows filtering a connection by some parameters (e.g. lineName or lineId)",
   fields: {
     lineId: {
       type: GraphQLInt,
@@ -19,17 +19,6 @@ export const FilterByInputMetro = new GraphQLInputObjectType({
   },
 });
 
-export const FilterByInputBus = new GraphQLInputObjectType({
-  name: "FilterByInputBus",
-  description:
-    "Input for the filterBy argument of the bus queries, which allows filtering a connection by some parameters (e.g. lineId)",
-  fields: {
-    lineId: {
-      type: GraphQLInt,
-    },
-  },
-});
-
 export const FilterByInputBike = new GraphQLInputObjectType({
   name: "FilterByInputBike",
   description:

src/queries/BusStopsQuery.ts

@@ -1,26 +1,27 @@
 import { connectionArgs, connectionFromArray } from "graphql-relay";
 import type { BusStopConnectionType } from "../../types";
 import { BusStopConnection } from "../outputs/BusStop";
-import { FilterByInputBus } from "../inputs/FilterByInput";
+import { FilterByInputTmb } from "../inputs/FilterByInput";
 
 export default {
   type: BusStopConnection,
   description: "Information about the bus stops of the city of Barcelona",
   args: {
     ...connectionArgs,
     filterBy: {
-      type: FilterByInputBus,
+      type: FilterByInputTmb,
     },
   },
   resolve: async (_, args, { dataSources }): Promise<BusStopConnectionType> => {
     const { filterBy } = args;
 
     const stops = await (async () => {
-      if (!filterBy?.lineId) {
+      if (!filterBy?.lineId && !filterBy?.lineName) {
         return await dataSources.bus.getAllStops();
       }
       return await dataSources.bus.getLineStops({
         id: filterBy?.lineId ?? null,
+        name: filterBy?.lineName ?? null,
       });
     })();
 

src/queries/MetroStationsQuery.ts

@@ -1,6 +1,6 @@
 import { connectionArgs, connectionFromArray } from "graphql-relay";
 import type { MetroStationConnectionType } from "../../types";
-import { FilterByInputMetro } from "../inputs/FilterByInput";
+import { FilterByInputTmb } from "../inputs/FilterByInput";
 import { MetroStationConnection } from "../outputs/MetroStation";
 
 export default {
@@ -9,7 +9,7 @@ export default {
   args: {
     ...connectionArgs,
     filterBy: {
-      type: FilterByInputMetro,
+      type: FilterByInputTmb,
     },
   },
   resolve: async (

src/queries/__tests__/BusStopsQuery.test.ts

@@ -8,7 +8,7 @@ import {
 } from "../../datasources/__fixtures__/BusStopsFixtures";
 
 const GET_BUS_STOPS = gql`
-  query getBusStops($first: Int, $filterBy: FilterByInputBus) {
+  query getBusStops($first: Int, $filterBy: FilterByInputTmb) {
     busStops(first: $first, filterBy: $filterBy) {
       edges {
         node {
@@ -49,6 +49,7 @@ describe("busStops Query", () => {
 
     expect(mockGetLineStops).toHaveBeenCalledWith({
       id: 3,
+      name: null,
     });
   });
 });

src/queries/__tests__/MetroStationsQuery.test.ts

@@ -5,7 +5,7 @@ import createTestServer from "../../utils/createTestServer";
 import { mockMetroStationsAPIResponse } from "../../datasources/__fixtures__/MetroStationsFixtures";
 
 const GET_METRO_STATIONS = gql`
-  query getMetroStations($first: Int, $filterBy: FilterByInputMetro) {
+  query getMetroStations($first: Int, $filterBy: FilterByInputTmb) {
     metroStations(first: $first, filterBy: $filterBy) {
       edges {
         node {

types/index.d.ts

@@ -39,7 +39,7 @@ export interface RootQueryMetroStationsArgsType {
   first: Maybe<Scalars['Int']>;
   before: Maybe<Scalars['String']>;
   last: Maybe<Scalars['Int']>;
-  filterBy: Maybe<FilterByInputMetroType>;
+  filterBy: Maybe<FilterByInputTmbType>;
 }
 
 
@@ -92,7 +92,7 @@ export interface RootQueryBusStopsArgsType {
   first: Maybe<Scalars['Int']>;
   before: Maybe<Scalars['String']>;
   last: Maybe<Scalars['Int']>;
-  filterBy: Maybe<FilterByInputBusType>;
+  filterBy: Maybe<FilterByInputTmbType>;
 }
 
 /** A connection to a list of items. */
@@ -147,8 +147,8 @@ export interface CoordinatesOutputType {
   altitude: Maybe<Scalars['Float']>;
 }
 
-/** Input for the filterBy argument of the metro queries, which allows filtering a connection by some parameters (e.g. lineName or lineId) */
-export interface FilterByInputMetroType {
+/** Input for the filterBy argument of the metro and bus queries, which allows filtering a connection by some parameters (e.g. lineName or lineId) */
+export interface FilterByInputTmbType {
   lineId: Maybe<Scalars['Int']>;
   lineName: Maybe<Scalars['String']>;
 }
@@ -340,8 +340,3 @@ export interface BusStopEdgeType {
   /** A cursor for use in pagination */
   cursor: Scalars['String'];
 }
-
-/** Input for the filterBy argument of the bus queries, which allows filtering a connection by some parameters (e.g. lineId) */
-export interface FilterByInputBusType {
-  lineId: Maybe<Scalars['Int']>;
-}