Multiple fixes and optimizations

Author: phortx

src/queryBuilder.ts

@@ -155,12 +155,15 @@ export default class QueryBuilder {
     return relationQueries;
   }
 
-  public buildQuery (type: string, name?: string, args?: Arguments, model?: (Model | null | string), fields?: string, addModelToArgs: boolean = false, multiple?: boolean) {
+  public buildQuery (type: string, name?: string, args?: Arguments, model?: (Model | null | string), fields?: string, multiple?: boolean) {
     model = model ? this.getModel(model) : null;
 
     args = args ? JSON.parse(JSON.stringify(args)) : {};
     if (!args) throw new Error("args is undefined");
-    if (addModelToArgs && model) args[model.singularName] = { __type: upcaseFirstLetter(model.singularName) };
+
+    if (model && args[model.singularName] && typeof args[model.singularName] === 'object') {
+      args[model.singularName] = { __type: upcaseFirstLetter(model.singularName) };
+    }
 
     multiple = multiple === undefined ? !args['id'] : multiple;
 

src/vuex-orm-apollo.ts

@@ -130,8 +130,12 @@ export default class VuexORMApollo {
       const model = this.getModel(state.$name);
       const data = model.baseModel.getters('find')(id);
 
+      const variables: Data = {
+        [model.singularName]: this.queryBuilder.transformOutgoingData(data)
+      };
+
       const mutationName = `create${upcaseFirstLetter(model.singularName)}`;
-      await this.mutate(mutationName, data, dispatch, model, true, false);
+      await this.mutate(mutationName, variables, dispatch, model, false);
 
       // TODO is this really necessary?
       return model.baseModel.getters('find')(id);
@@ -170,9 +174,13 @@ export default class VuexORMApollo {
     if (data) {
       const model = this.getModel(state.$name);
 
+      const variables: Data = {
+        id: data.id,
+        [model.singularName]: this.queryBuilder.transformOutgoingData(data)
+      };
+
       const mutationName = `update${upcaseFirstLetter(model.singularName)}`;
-      // TODO whats in data? can we determine addModelToArgs from that?
-      await this.mutate(mutationName, data, dispatch, model, true, false);
+      await this.mutate(mutationName, variables, dispatch, model, false);
 
       // TODO is this really necessary?
       return model.baseModel.getters('find')(data.id);
@@ -187,16 +195,16 @@ export default class VuexORMApollo {
    * @param {Data} id
    * @returns {Promise<void>}
    */
-  private async destroy ({ state, dispatch }: ActionParams, { id }: ActionParams): Promise<void> {
+  private async destroy ({ state, dispatch }: ActionParams, { id }: ActionParams): Promise<any> {
 
     if (id) {
       const model = this.getModel(state.$name);
       // TODO use mutate here too
       const mutationName = `delete${upcaseFirstLetter(model.singularName)}`;
-      const query = this.queryBuilder.buildQuery('mutation', mutationName, { id }, model);
+      await this.mutate(mutationName, { id }, dispatch, model, false)
 
-      // Send GraphQL Mutation
-      await this.apolloRequest(query, { where: id }, true);
+      // TODO what would make sense here?
+      return true;
     }
   }
 
@@ -209,22 +217,19 @@ export default class VuexORMApollo {
    * @param {Model} model
    * @returns {Promise<any>}
    */
-  private async mutate (action: string, data: Data | undefined, dispatch: DispatchFunction, model: Model, addModelToArgs: boolean = false, multiple?: boolean): Promise<any> {
-    if (data) {
-      const id = data.id ? data.id : undefined;
-      const variables: Data = {
-        [model.singularName]: this.queryBuilder.transformOutgoingData(data)
-      };
+  private async mutate (action: string, variables: Data | undefined, dispatch: DispatchFunction, model: Model, multiple?: boolean): Promise<any> {
+    if (variables) {
+      const id = variables.id ? variables.id : undefined;
 
       // TODO what about the query fields?
-      const query = this.queryBuilder.buildQuery('mutation', action, variables, model, undefined, addModelToArgs, multiple);
+      const query = this.queryBuilder.buildQuery('mutation', action, variables, model, undefined, multiple);
 
-      // TODO don't add id for persist
-      if (id) variables['id'] = id;
 
       // Send GraphQL Mutation
       const newData = await this.apolloRequest(query, variables, true);
-      return this.updateData(newData, dispatch, data.id);
+
+      // TODO: What if there is no id?
+      return this.updateData(newData, dispatch, id);
     }
   }
 

test/integration/VuexORMApollo.spec.js

@@ -184,7 +184,7 @@ query Users {
         await store.dispatch('entities/users/persist', { id: 1 });
       });
 
-      expect(request.variables).toEqual({ id: 1, user: { name: 'Johnny Imba' } });
+      expect(request.variables).toEqual({ user: { name: 'Johnny Imba' } });
       expect(request.query).toEqual(`
 mutation CreateUser($user: UserInput!) {
   createUser(user: $user) {
@@ -232,8 +232,8 @@ mutation CreateUser($user: UserInput!) {
 
       expect(request.variables).toEqual({ id: 1, user: { name: 'Charlie Brown' } });
       expect(request.query).toEqual(`
-mutation UpdateUser($user: UserInput!) {
-  updateUser(user: $user) {
+mutation UpdateUser($id: ID!, $user: UserInput!) {
+  updateUser(id: $id, user: $user) {
     id
     name
     posts {
@@ -273,7 +273,7 @@ mutation UpdateUser($user: UserInput!) {
         await store.dispatch('entities/users/destroy', { id: 1 });
       });
 
-      expect(request.variables).toEqual({ where: 1 });
+      expect(request.variables).toEqual({ id: 1 });
       expect(request.query).toEqual(`
 mutation DeleteUser($id: ID!) {
   deleteUser(id: $id) {
@@ -294,4 +294,47 @@ mutation DeleteUser($id: ID!) {
       `.trim() + "\n");
     });
   });
+
+
+  describe('customMutation', () => {
+    it('sends the correct query to the API', async () => {
+      const response = {
+        data: {
+          activateUser: {
+            __typename: 'user',
+            id: 1,
+            name: 'Johnny Imba',
+            posts: {
+              __typename: 'post',
+              nodes: []
+            }
+          }
+        }
+      };
+
+      const request = await sendWithMockFetch(response, async () => {
+        await store.dispatch('entities/users/mutate', { mutation: 'activateUser', id: 1 });
+      });
+
+      expect(request.variables).toEqual({ id: 1 });
+      expect(request.query).toEqual(`
+mutation ActivateUser($id: ID!) {
+  activateUser(id: $id) {
+    id
+    name
+    posts {
+      nodes {
+        id
+        title
+        content
+        __typename
+      }
+      __typename
+    }
+    __typename
+  }
+}
+      `.trim() + "\n");
+    });
+  });
 });

test/support/Helpers.js

@@ -34,11 +34,11 @@ export function createStore (entities) {
 
 
 export async function sendWithMockFetch(response, callback) {
+  fetchMock.config.overwriteRoutes = true;
   fetchMock.post('/graphql', response);
 
   try {
     await callback();
-
   } catch (error) {
     console.error("An error occured:");
     console.error(error);

test/unit/QueryBuilder.spec.js

@@ -317,7 +317,7 @@ query Users {
     });
 
     it('generates a complete create mutation query for a model', () => {
-      let query = queryBuilder.buildQuery('mutation', 'createUser', { user: { id: 15, name: 'test' } }, new Model(User), undefined, true, false);
+      let query = queryBuilder.buildQuery('mutation', 'createUser', { user: { id: 15, name: 'test' } }, new Model(User), undefined, false);
       query = QueryBuilder.prettify(query.loc.source.body);
 
       expect(query).toEqual(`
@@ -338,7 +338,7 @@ mutation CreateUser($user: UserInput!) {
     });
 
     it('generates a complete update mutation query for a model', () => {
-      let query = queryBuilder.buildQuery('mutation', 'updateUser', { id: 15, user: { name: 'test' } }, new Model(User), undefined, true);
+      let query = queryBuilder.buildQuery('mutation', 'updateUser', { id: 15, user: { name: 'test' } }, new Model(User), undefined, false);
       query = QueryBuilder.prettify(query.loc.source.body);
 
       expect(query).toEqual(`