Add new directive to test casing

apollosolutions · Nov 16, 2023 · e3da656 · e3da656
1 parent 9d5c0cb
commit e3da656
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "npm run dev:subgraphs & npm run dev:router",
     "dev:subgraphs": "NODE_ENV=dev nodemon index.js",
-    "dev:router": "rover dev --supergraph-config supergraph-config-dev.yaml --router-config router-config-dev.yaml",
+    "dev:router": "rover dev --supergraph-config supergraph-config-dev.yaml --router-config router-config-dev.yaml --log error",
     "start": "node index.js",
     "test": "npm run test:compile && npm run test:compose",
     "test:compose": "APOLLO_ELV2_LICENSE=accept rover supergraph compose --config supergraph-config-dev.yaml --output supergraph.graphql",

diff --git a/router-config-dev.yaml b/router-config-dev.yaml
@@ -6,3 +6,13 @@ headers:
     request:
       - propagate:
           matching: .*
+
+include_subgraph_errors:
+  all: true
+telemetry:
+  apollo:
+    errors:
+      subgraph:
+        all:
+          send: true
+          redact: false
diff --git a/subgraphs/flights/schema.graphql b/subgraphs/flights/schema.graphql
@@ -1,13 +1,16 @@
 extend schema
-  @link(url: "https://specs.apollo.dev/federation/v2.5", import:["@key", "@shareable"])
+  @link(url: "https://specs.apollo.dev/federation/v2.5", import:["@key", "@shareable", "@composeDirective"])
+  @composeDirective(name: "myAPI")
+
+directive @myAPI on FIELD_DEFINITION
 
 input MyDirectiveInput {
   foo: String
   bar: [String]
 }
 
 type Query {
-  allFlights: [Flight]
+  allFlights: [Flight] @myAPI
 }
 
 type Flight @key(fields: "id") {

diff --git a/subgraphs/trips/resolvers.js b/subgraphs/trips/resolvers.js
@@ -1,4 +1,5 @@
 import { TRIPS } from "./data.js";
+import {GraphQLError} from "graphql";
 
 export const getTripById = (id) => TRIPS.find((it) => it.id === id);
 export const getCurrentTripByUserId = (userId) => TRIPS.find((it) => it.user.id === userId);
@@ -11,7 +12,12 @@ export const resolvers = {
   },
   Query: {
     currentTrip(_, args) {
-      return getCurrentTripByUserId(args.userId)
+      const trip = getCurrentTripByUserId(args.userId);
+      if (trip) {
+        return trip;
+      } else {
+        throw new GraphQLError(`No trip found for user id ${args.userId}`)
+      }
     }
   }
 };
diff --git a/subgraphs/trips/schema.graphql b/subgraphs/trips/schema.graphql
@@ -2,7 +2,7 @@ extend schema
   @link(url: "https://specs.apollo.dev/federation/v2.3", import: ["@key"])
 
 type Query {
-  currentTrip(userId: ID!): Trip
+  currentTrip(userId: ID!): Trip!
 }
 
 type Trip @key(fields: "id") {