Duplicate query argument fix

src/augment/input-values.js

@@ -97,7 +97,7 @@ export const buildQueryFieldArguments = ({
   Object.values(argumentMap).forEach(name => {
     if (isListTypeField({ wrappers: outputTypeWrappers })) {
       if (name === PagingArgument.FIRST) {
-        // Result Arguments
+        // Does not overwrite
         if (
           !getFieldDefinition({
             fields: fieldArguments,
@@ -111,7 +111,7 @@ export const buildQueryFieldArguments = ({
           );
         }
       } else if (name === PagingArgument.OFFSET) {
-        // Result Arguments
+        // Does not overwrite
         if (
           !getFieldDefinition({
             fields: fieldArguments,
@@ -125,22 +125,48 @@ export const buildQueryFieldArguments = ({
           );
         }
       } else if (name === OrderingArgument.ORDER_BY) {
-        // Overwrite
-        fieldArguments.push(
-          buildQueryOrderingArgument({
-            typeName: outputType
-          })
+        const argumentIndex = fieldArguments.findIndex(
+          arg => arg.name.value === OrderingArgument.ORDER_BY
         );
+        // Does overwrite
+        if (argumentIndex === -1) {
+          fieldArguments.push(
+            buildQueryOrderingArgument({
+              typeName: outputType
+            })
+          );
+        } else {
+          fieldArguments.splice(
+            argumentIndex,
+            1,
+            buildQueryOrderingArgument({
+              typeName: outputType
+            })
+          );
+        }
       }
     }
-    // Overwrite
     if (name === FilteringArgument.FILTER) {
       if (!isCypherField({ directives: fieldDirectives })) {
-        fieldArguments.push(
-          buildQueryFilteringArgument({
-            typeName: outputType
-          })
+        const argumentIndex = fieldArguments.findIndex(
+          arg => arg.name.value === FilteringArgument.FILTER
         );
+        // Does overwrite
+        if (argumentIndex === -1) {
+          fieldArguments.push(
+            buildQueryFilteringArgument({
+              typeName: outputType
+            })
+          );
+        } else {
+          fieldArguments.splice(
+            argumentIndex,
+            1,
+            buildQueryFilteringArgument({
+              typeName: outputType
+            })
+          );
+        }
       }
     }
   });

test/unit/augmentSchemaTest.test.js

@@ -51,7 +51,6 @@ test.cb('Test augmented schema', t => {
         imdbRating: Float
         first: Int
         offset: Int
-        orderBy: _MovieOrdering
         orderBy: [_MovieOrdering]
         filter: _MovieFilter
       ): [Movie]
@@ -135,8 +134,6 @@ test.cb('Test augmented schema', t => {
         offset: Int
         orderBy: [_GenreOrdering]
         filter: _GenreFilter
-        orderBy: [_GenreOrdering]
-        filter: _GenreFilter
       ): [Genre] @hasScope(scopes: ["Genre: Read"])
       Actor(
         userId: ID
@@ -146,8 +143,6 @@ test.cb('Test augmented schema', t => {
         offset: Int
         orderBy: [_ActorOrdering]
         filter: _ActorFilter
-        orderBy: [_ActorOrdering]
-        filter: _ActorFilter
       ): [Actor] @hasScope(scopes: ["Actor: Read"])
       Book(
         genre: BookGenre
@@ -156,8 +151,6 @@ test.cb('Test augmented schema', t => {
         offset: Int
         orderBy: [_BookOrdering]
         filter: _BookFilter
-        orderBy: [_BookOrdering]
-        filter: _BookFilter
       ): [Book] @hasScope(scopes: ["Book: Read"])
       TemporalNode(
         datetime: _Neo4jDateTimeInput
@@ -173,8 +166,6 @@ test.cb('Test augmented schema', t => {
         offset: Int
         orderBy: [_TemporalNodeOrdering]
         filter: _TemporalNodeFilter
-        orderBy: [_TemporalNodeOrdering]
-        filter: _TemporalNodeFilter
       ): [TemporalNode] @hasScope(scopes: ["TemporalNode: Read"])
     }