From d8a956d09c8cc5811bda0b396b4da90c2eb6a42d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 7 Sep 2017 16:04:01 +0700
Subject: [PATCH] Remove dependency on wrapResponse

---
 client/coral-framework/utils/index.js       |  2 +-
 plugin-api/beta/server/getReactionConfig.js | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/client/coral-framework/utils/index.js b/client/coral-framework/utils/index.js
index 4424e62c5..037c1b99f 100644
--- a/client/coral-framework/utils/index.js
+++ b/client/coral-framework/utils/index.js
@@ -109,7 +109,7 @@ export function mergeDocuments(documents) {
 export function getResponseErrors(mutationResult) {
   const result = [];
   Object.keys(mutationResult.data).forEach((response) => {
-    const errors = mutationResult.data[response].errors;
+    const errors = mutationResult.data[response] && mutationResult.data[response].errors;
     if (errors && errors.length) {
       result.push(...errors);
     }
diff --git a/plugin-api/beta/server/getReactionConfig.js b/plugin-api/beta/server/getReactionConfig.js
index 02878e010..481990c16 100644
--- a/plugin-api/beta/server/getReactionConfig.js
+++ b/plugin-api/beta/server/getReactionConfig.js
@@ -1,4 +1,3 @@
-const wrapResponse = require('../../../graph/helpers/response');
 const {SEARCH_OTHER_USERS} = require('../../../perms/constants');
 const errors = require('../../../errors');
 const pluralize = require('pluralize');
@@ -90,10 +89,6 @@ function getReactionConfig(reaction) {
     }
 
     type Delete${Reaction}ActionResponse implements Response {
-
-      # The ${reaction} that was created.
-      ${reaction}: ${Reaction}Action
-
       # An array of errors relating to the mutation that occurred.
       errors: [UserError!]
     }
@@ -101,7 +96,7 @@ function getReactionConfig(reaction) {
     type RootMutation {
 
       # Creates a ${reaction} on an entity.
-      create${Reaction}Action(input: Create${Reaction}ActionInput!): Create${Reaction}ActionResponse
+      create${Reaction}Action(input: Create${Reaction}ActionInput!): Create${Reaction}ActionResponse!
       delete${Reaction}Action(input: Delete${Reaction}ActionInput!): Delete${Reaction}ActionResponse
     }
 
@@ -160,7 +155,7 @@ function getReactionConfig(reaction) {
         }
       },
       RootMutation: {
-        [`create${Reaction}Action`]: (_, {input: {item_id}}, {mutators: {Action}, pubsub, loaders: {Comments}}) => wrapResponse(reaction)(async () => {
+        [`create${Reaction}Action`]: async (_, {input: {item_id}}, {mutators: {Action}, pubsub, loaders: {Comments}}) => {
           const comment = await Comments.get.load(item_id);
 
           let action;
@@ -180,9 +175,11 @@ function getReactionConfig(reaction) {
             pubsub.publish(`${reaction}ActionCreated`, {action, comment});
           }
 
-          return action;
-        }),
-        [`delete${Reaction}Action`]: (_, {input: {id}}, {mutators: {Action}, pubsub, loaders: {Comments}}) => wrapResponse(reaction)(async () => {
+          return {
+            [reaction]: action,
+          };
+        },
+        [`delete${Reaction}Action`]: async (_, {input: {id}}, {mutators: {Action}, pubsub, loaders: {Comments}})  => {
           const action = await Action.delete({id});
           if (!action) {
             return null;
@@ -194,9 +191,7 @@ function getReactionConfig(reaction) {
             // The comment is needed to allow better filtering e.g. by asset_id.
             pubsub.publish(`${reaction}ActionDeleted`, {action, comment});
           }
-
-          return action;
-        })
+        },
       },
     },
     hooks: {