Merge pull request #5630 from neo4j/remove-deprecated-update-input

Remove deprecated update input
neo4j · Oct 10, 2024 · b13c19e · b13c19e
2 parents 8206edd + 31d83dc
commit b13c19e
Show file tree

Hide file tree

Showing 136 changed files with 2,259 additions and 6,458 deletions.
diff --git a/.changeset/mighty-cameras-poke.md b/.changeset/mighty-cameras-poke.md
@@ -0,0 +1,37 @@
+---
+"@neo4j/graphql": major
+---
+
+Remove deprecated top level arguments for nested operations in mutations:
+
+-   create
+-   delete
+-   connect
+-   disconnect
+-   connectOrCreate
+
+For example, the following is no longer valid:
+
+_invalid_
+
+```graphql
+mutation UpdatePeople {
+    updatePeople(create: { movies: { node: { title: "The Good" } } }) {
+        people {
+            name
+        }
+    }
+}
+```
+
+_valid_
+
+```graphql
+mutation UpdatePeople {
+    updatePeople(update: { movies: { create: { node: { title: "The Good" } } } }) {
+        people {
+            name
+        }
+    }
+}
+```
diff --git a/packages/graphql/src/schema/constants.ts b/packages/graphql/src/schema/constants.ts
@@ -32,38 +32,3 @@ export const DEPRECATE_OPTIONS_ARGUMENT = {
         reason: "Query options argument is deprecated, please use pagination arguments like limit, offset and sort instead.",
     },
 };
-
-export const DEPRECATE_UPDATE_CREATE_INPUT_FIELD = {
-    name: DEPRECATED,
-    args: {
-        reason: "Top level create input argument in update is deprecated. Use the nested create field in the relationship within the update argument",
-    },
-};
-
-export const DEPRECATE_UPDATE_DELETE_INPUT_FIELD = {
-    name: DEPRECATED,
-    args: {
-        reason: "Top level delete input argument in update is deprecated. Use the nested delete field in the relationship within the update argument",
-    },
-};
-
-export const DEPRECATE_UPDATE_CONNECT_INPUT_FIELD = {
-    name: DEPRECATED,
-    args: {
-        reason: "Top level connect input argument in update is deprecated. Use the nested connect field in the relationship within the update argument",
-    },
-};
-
-export const DEPRECATE_UPDATE_DISCONNECT_INPUT_FIELD = {
-    name: DEPRECATED,
-    args: {
-        reason: "Top level disconnect input argument in update is deprecated. Use the nested disconnect field in the relationship within the update argument",
-    },
-};
-
-export const DEPRECATE_UPDATE_CONNECT_OR_CREATE_INPUT_FIELD = {
-    name: DEPRECATED,
-    args: {
-        reason: "Top level connectOrCreate input argument in update is deprecated. Use the nested connectOrCreate field in the relationship within the update argument",
-    },
-};
diff --git a/packages/graphql/src/schema/resolvers/mutation/update.test.ts b/packages/graphql/src/schema/resolvers/mutation/update.test.ts
@@ -54,61 +54,6 @@ describe("Update resolver", () => {
         expect(result.args).toMatchObject({
             where: "MovieWhere",
             update: "MovieUpdateInput",
-            connect: {
-                directives: [
-                    {
-                        args: {
-                            reason: "Top level connect input argument in update is deprecated. Use the nested connect field in the relationship within the update argument",
-                        },
-                        name: "deprecated",
-                    },
-                ],
-                type: "MovieConnectInput",
-            },
-            connectOrCreate: {
-                directives: [
-                    {
-                        args: {
-                            reason: "Top level connectOrCreate input argument in update is deprecated. Use the nested connectOrCreate field in the relationship within the update argument",
-                        },
-                        name: "deprecated",
-                    },
-                ],
-                type: "MovieConnectOrCreateInput",
-            },
-            create: {
-                directives: [
-                    {
-                        args: {
-                            reason: "Top level create input argument in update is deprecated. Use the nested create field in the relationship within the update argument",
-                        },
-                        name: "deprecated",
-                    },
-                ],
-                type: "MovieRelationInput",
-            },
-            delete: {
-                directives: [
-                    {
-                        args: {
-                            reason: "Top level delete input argument in update is deprecated. Use the nested delete field in the relationship within the update argument",
-                        },
-                        name: "deprecated",
-                    },
-                ],
-                type: "MovieDeleteInput",
-            },
-            disconnect: {
-                directives: [
-                    {
-                        args: {
-                            reason: "Top level disconnect input argument in update is deprecated. Use the nested disconnect field in the relationship within the update argument",
-                        },
-                        name: "deprecated",
-                    },
-                ],
-                type: "MovieDisconnectInput",
-            },
         });
     });
     test("should return fewer fields based on number of InputTCs created", () => {
@@ -139,57 +84,14 @@ describe("Update resolver", () => {
         expect(result.args).not.toMatchObject({
             where: "MovieWhere",
             update: "MovieUpdateInput",
-            connect: {
-                directives: [
-                    {
-                        args: {
-                            reason: "Top level connect input argument in update is deprecated. Use the nested connect field in the relationship within the update argument",
-                        },
-                        name: "deprecated",
-                    },
-                ],
-                type: "MovieConnectInput",
-            },
-            disconnect: {
-                directives: [
-                    {
-                        args: {
-                            reason: "Top level disconnect input argument in update is deprecated. Use the nested disconnect field in the relationship within the update argument",
-                        },
-                        name: "deprecated",
-                    },
-                ],
-                type: "MovieDisconnectInput",
-            },
+
             create: "MovieRelationInput",
             delete: "MovieDeleteInput",
             connectOrCreate: "MovieConnectOrCreateInput",
         });
         expect(result.args).toMatchObject({
             where: "MovieWhere",
             update: "MovieUpdateInput",
-            connect: {
-                directives: [
-                    {
-                        args: {
-                            reason: "Top level connect input argument in update is deprecated. Use the nested connect field in the relationship within the update argument",
-                        },
-                        name: "deprecated",
-                    },
-                ],
-                type: "MovieConnectInput",
-            },
-            disconnect: {
-                directives: [
-                    {
-                        args: {
-                            reason: "Top level disconnect input argument in update is deprecated. Use the nested disconnect field in the relationship within the update argument",
-                        },
-                        name: "deprecated",
-                    },
-                ],
-                type: "MovieDisconnectInput",
-            },
         });
     });
 });
diff --git a/packages/graphql/src/schema/resolvers/mutation/update.ts b/packages/graphql/src/schema/resolvers/mutation/update.ts
@@ -30,14 +30,6 @@ import type { Neo4jFeaturesSettings } from "../../../types";
 import type { Neo4jGraphQLTranslationContext } from "../../../types/neo4j-graphql-translation-context";
 import { execute } from "../../../utils";
 import getNeo4jResolveTree from "../../../utils/get-neo4j-resolve-tree";
-import {
-    DEPRECATE_UPDATE_CONNECT_INPUT_FIELD,
-    DEPRECATE_UPDATE_CONNECT_OR_CREATE_INPUT_FIELD,
-    DEPRECATE_UPDATE_CREATE_INPUT_FIELD,
-    DEPRECATE_UPDATE_DELETE_INPUT_FIELD,
-    DEPRECATE_UPDATE_DISCONNECT_INPUT_FIELD,
-} from "../../constants";
-import { shouldAddDeprecatedFields } from "../../generation/utils";
 import { publishEventsToSubscriptionMechanism } from "../../subscriptions/publish-events-to-subscription-mechanism";
 import type { Neo4jGraphQLComposedContext } from "../composition/wrap-query-and-mutation";
 
@@ -89,39 +81,6 @@ export function updateResolver({
 
     const relationFields: Record<string, string | ObjectTypeComposerArgumentConfigAsObjectDefinition> = {};
 
-    if (shouldAddDeprecatedFields(features, "nestedUpdateOperationsFields")) {
-        if (composer.has(concreteEntityAdapter.operations.updateMutationArgumentNames.connect)) {
-            relationFields.connect = {
-                type: concreteEntityAdapter.operations.updateMutationArgumentNames.connect,
-                directives: [DEPRECATE_UPDATE_CONNECT_INPUT_FIELD],
-            };
-        }
-        if (composer.has(concreteEntityAdapter.operations.updateMutationArgumentNames.disconnect)) {
-            relationFields.disconnect = {
-                type: concreteEntityAdapter.operations.updateMutationArgumentNames.disconnect,
-                directives: [DEPRECATE_UPDATE_DISCONNECT_INPUT_FIELD],
-            };
-        }
-        if (composer.has(concreteEntityAdapter.operations.updateMutationArgumentNames.create)) {
-            relationFields.create = {
-                type: concreteEntityAdapter.operations.updateMutationArgumentNames.create,
-                directives: [DEPRECATE_UPDATE_CREATE_INPUT_FIELD],
-            };
-        }
-        if (composer.has(concreteEntityAdapter.operations.updateMutationArgumentNames.delete)) {
-            relationFields.delete = {
-                type: concreteEntityAdapter.operations.updateMutationArgumentNames.delete,
-                directives: [DEPRECATE_UPDATE_DELETE_INPUT_FIELD],
-            };
-        }
-        if (composer.has(concreteEntityAdapter.operations.updateMutationArgumentNames.connectOrCreate)) {
-            relationFields.connectOrCreate = {
-                type: concreteEntityAdapter.operations.updateMutationArgumentNames.connectOrCreate,
-                directives: [DEPRECATE_UPDATE_CONNECT_OR_CREATE_INPUT_FIELD],
-            };
-        }
-    }
-
     return {
         type: `${concreteEntityAdapter.operations.mutationResponseTypeNames.update}!`,
         resolve,

diff --git a/packages/graphql/src/types/index.ts b/packages/graphql/src/types/index.ts
@@ -478,7 +478,6 @@ export type Neo4jFeaturesSettings = {
     excludeDeprecatedFields?: {
         implicitEqualFilters?: boolean;
         deprecatedOptionsArgument?: boolean;
-        nestedUpdateOperationsFields?: boolean;
     };
     vector?: Neo4jVectorSettings;
 };

diff --git a/...rization/authentication-roles.int.test.ts → ...rization/authentication-roles.e2e.test.ts b/...rization/authentication-roles.int.test.ts → ...rization/authentication-roles.e2e.test.ts