Add support to global id in other operations

Author: davimacedo

src/GraphQL/loaders/parseClassMutations.js

@@ -92,7 +92,7 @@ const load = function(
             fields,
             keys,
             include,
-            ['id', 'createdAt', 'updatedAt']
+            ['id', 'objectId', 'createdAt', 'updatedAt']
           );
           let optimizedObject = {};
           if (needGet) {
@@ -168,7 +168,7 @@ const load = function(
             fields,
             keys,
             include,
-            ['id', 'updatedAt']
+            ['id', 'objectId', 'updatedAt']
           );
           let optimizedObject = {};
           if (needGet) {
@@ -185,7 +185,7 @@ const load = function(
             );
           }
           return {
-            id,
+            objectId: id,
             ...updatedObject,
             ...fields,
             ...optimizedObject,
@@ -222,7 +222,10 @@ const load = function(
 
           let optimizedObject = {};
           const splitedKeys = keys.split(',');
-          if (splitedKeys.length > 1 || splitedKeys[0] !== 'id') {
+          if (
+            splitedKeys.filter(key => !['id', 'objectId'].includes(key))
+              .length > 0
+          ) {
             optimizedObject = await objectsQueries.getObject(
               className,
               id,
@@ -242,7 +245,7 @@ const load = function(
             auth,
             info
           );
-          return { id, ...optimizedObject };
+          return { objectId: id, ...optimizedObject };
         } catch (e) {
           parseGraphQLSchema.handleError(e);
         }

src/GraphQL/loaders/parseClassTypes.js

@@ -209,7 +209,7 @@ const load = (
     fields: () => {
       const fields = {
         link: {
-          description: `Link an existing object from ${graphQLClassName} class.`,
+          description: `Link an existing object from ${graphQLClassName} class. You can use either the global or the object id.`,
           type: GraphQLID,
         },
       };
@@ -233,17 +233,17 @@ const load = (
     fields: () => {
       const fields = {
         add: {
-          description: `Add an existing object from the ${graphQLClassName} class into the relation.`,
+          description: `Add existing objects from the ${graphQLClassName} class into the relation. You can use either the global or the object ids.`,
           type: new GraphQLList(defaultGraphQLTypes.OBJECT_ID),
         },
         remove: {
-          description: `Remove an existing object from the ${graphQLClassName} class out of the relation.`,
+          description: `Remove existing objects from the ${graphQLClassName} class out of the relation. You can use either the global or the object ids.`,
           type: new GraphQLList(defaultGraphQLTypes.OBJECT_ID),
         },
       };
       if (isCreateEnabled) {
         fields['createAndAdd'] = {
-          description: `Create and add an object of the ${graphQLClassName} class into the relation.`,
+          description: `Create and add objects of the ${graphQLClassName} class into the relation.`,
           type: new GraphQLList(new GraphQLNonNull(classGraphQLCreateType)),
         };
       }
@@ -268,12 +268,12 @@ const load = (
       notInQueryKey: defaultGraphQLTypes.notInQueryKey,
       inQuery: {
         description:
-          'This is the inQuery operator to specify a constraint to select the objects where a field equals to any of the ids in the result of a different query.',
+          'This is the inQuery operator to specify a constraint to select the objects where a field equals to any of the object ids in the result of a different query.',
         type: defaultGraphQLTypes.SUBQUERY_INPUT,
       },
       notInQuery: {
         description:
-          'This is the notInQuery operator to specify a constraint to select the objects where a field do not equal to any of the ids in the result of a different query.',
+          'This is the notInQuery operator to specify a constraint to select the objects where a field do not equal to any of the object ids in the result of a different query.',
         type: defaultGraphQLTypes.SUBQUERY_INPUT,
       },
     },

src/GraphQL/transformers/mutation.js

@@ -1,3 +1,4 @@
+import { fromGlobalId } from 'graphql-relay';
 import * as defaultGraphQLTypes from '../loaders/defaultGraphQLTypes';
 import * as objectsMutations from '../helpers/objectsMutations';
 
@@ -116,11 +117,17 @@ const transformers = {
 
     if (value.add || nestedObjectsToAdd.length > 0) {
       if (!value.add) value.add = [];
-      value.add = value.add.map(input => ({
-        __type: 'Pointer',
-        className: targetClass,
-        objectId: input,
-      }));
+      value.add = value.add.map(input => {
+        const globalIdObject = fromGlobalId(input);
+        if (globalIdObject.type === targetClass) {
+          input = globalIdObject.id;
+        }
+        return {
+          __type: 'Pointer',
+          className: targetClass,
+          objectId: input,
+        };
+      });
       op.ops.push({
         __op: 'AddRelation',
         objects: [...value.add, ...nestedObjectsToAdd],
@@ -130,11 +137,17 @@ const transformers = {
     if (value.remove) {
       op.ops.push({
         __op: 'RemoveRelation',
-        objects: value.remove.map(input => ({
-          __type: 'Pointer',
-          className: targetClass,
-          objectId: input,
-        })),
+        objects: value.remove.map(input => {
+          const globalIdObject = fromGlobalId(input);
+          if (globalIdObject.type === targetClass) {
+            input = globalIdObject.id;
+          }
+          return {
+            __type: 'Pointer',
+            className: targetClass,
+            objectId: input,
+          };
+        }),
       });
     }
     return op;
@@ -172,10 +185,15 @@ const transformers = {
       };
     }
     if (value.link) {
+      let objectId = value.link;
+      const globalIdObject = fromGlobalId(objectId);
+      if (globalIdObject.type === targetClass) {
+        objectId = globalIdObject.id;
+      }
       return {
         __type: 'Pointer',
         className: targetClass,
-        objectId: value.link,
+        objectId,
       };
     }
   },

src/GraphQL/transformers/query.js

@@ -1,3 +1,5 @@
+import { fromGlobalId } from 'graphql-relay';
+
 const parseQueryMap = {
   id: 'objectId',
   OR: '$or',
@@ -102,10 +104,15 @@ const transformQueryConstraintInputToParse = (
         typeof fieldValue === 'string'
       ) {
         const { targetClass } = fields[parentFieldName];
+        let objectId = fieldValue;
+        const globalIdObject = fromGlobalId(objectId);
+        if (globalIdObject.type === targetClass) {
+          objectId = globalIdObject.id;
+        }
         constraints[fieldName] = {
           __type: 'Pointer',
           className: targetClass,
-          objectId: fieldValue,
+          objectId,
         };
       }
     }
@@ -198,7 +205,12 @@ const transformQueryInputToParse = (constraints, fields) => {
     }
 
     if (typeof fieldValue === 'object') {
-      transformQueryConstraintInputToParse(fieldValue, fields, fieldName, constraints);
+      transformQueryConstraintInputToParse(
+        fieldValue,
+        fields,
+        fieldName,
+        constraints
+      );
     }
   });
 };