From ad1f47ef733f4755d963232ba651a3f5b3c4a7c3 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Wed, 6 Jun 2018 11:39:04 +0900
Subject: [PATCH] Make debug email routes work with new APIs

---
 .../vulcan-core/lib/modules/default_resolvers.js     |  2 +-
 packages/vulcan-email/lib/server/routes.js           |  5 ++++-
 packages/vulcan-users/lib/modules/resolvers.js       | 12 +-----------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/vulcan-core/lib/modules/default_resolvers.js b/packages/vulcan-core/lib/modules/default_resolvers.js
index 752a8d7fe..fabb3e003 100644
--- a/packages/vulcan-core/lib/modules/default_resolvers.js
+++ b/packages/vulcan-core/lib/modules/default_resolvers.js
@@ -79,7 +79,7 @@ export const getDefaultResolvers = (collectionName, resolverOptions = defaultOpt
       description: `A single ${typeName} document fetched by ID or slug`,
 
       async resolver(root, { input = {} }, context, { cacheControl }) {
-        const { selector, enableCache = false } = input;
+        const { selector = {}, enableCache = false } = input;
         const { documentId, slug } = selector;
 
         debug('');
diff --git a/packages/vulcan-email/lib/server/routes.js b/packages/vulcan-email/lib/server/routes.js
index a219e28dd..8205c7f81 100644
--- a/packages/vulcan-email/lib/server/routes.js
+++ b/packages/vulcan-email/lib/server/routes.js
@@ -21,8 +21,11 @@ Meteor.startup(function () {
         
         // else get test object (sample post, comment, user, etc.)
         const testVariables = (typeof email.testVariables === 'function' ? email.testVariables() : email.testVariables) || {};
+        // delete params.query so we don't pass it to GraphQL query
+        delete params.query;
         // merge test variables with params from URL
-        const variables = {...testVariables, ...params};
+        // TODO: this is currently hardcoded to work with the SingleXYZInput type, maybe bad idea?      
+        const variables = { input: { selector: { ...testVariables, ...params } } };
 
         const result = email.query ? await runQuery(email.query, variables, { locale }) : {data: {}};
 
diff --git a/packages/vulcan-users/lib/modules/resolvers.js b/packages/vulcan-users/lib/modules/resolvers.js
index aeb4952f9..80d49bcb3 100644
--- a/packages/vulcan-users/lib/modules/resolvers.js
+++ b/packages/vulcan-users/lib/modules/resolvers.js
@@ -72,17 +72,7 @@ const resolvers = {
     },
 
   },
-
-  // total: {
-
-  //   name: 'UsersTotal',
-
-  //   async resolver(root, { terms = {} }, { Users }) {
-  //     const {selector} = await Users.getParameters(terms);
-  //     return await Connectors.count(Users, selector);
-  //   },
-
-  // }
+  
 };
 
 export default resolvers;