Revert "refactor: avoid creating a new context object when adding opt…

…ions" This reverts commit c85634a.
aerogear · Jun 29, 2020 · 071c274 · 071c274
1 parent 8451a79
commit 071c274
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 20 deletions.
diff --git a/packages/graphback-codegen-schema/src/SchemaCRUDPlugin.ts b/packages/graphback-codegen-schema/src/SchemaCRUDPlugin.ts
@@ -441,9 +441,12 @@ export class SchemaCRUDPlugin extends GraphbackPlugin {
       }
 
       const selectedFields = getSelectedFieldsFromResolverInfo(info, model);
-      context.graphback.options = { selectedFields };
+      const graphback = {
+        services: context.graphback.services,
+        options: { selectedFields }
+      };
 
-      return context.graphback.services[modelName].create(args.input, context);
+      return context.graphback.services[modelName].create(args.input, {...context, graphback});
     }
   }
 
@@ -463,9 +466,12 @@ export class SchemaCRUDPlugin extends GraphbackPlugin {
       }
 
       const selectedFields = getSelectedFieldsFromResolverInfo(info, model);
-      context.graphback.options = { selectedFields };
+      const graphback = {
+        services: context.graphback.services,
+        options: { selectedFields }
+      };
 
-      return context.graphback.services[modelName].update(args.input, context)
+      return context.graphback.services[modelName].update(args.input, {...context, graphback})
     }
   }
 
@@ -485,9 +491,12 @@ export class SchemaCRUDPlugin extends GraphbackPlugin {
       }
 
       const selectedFields = getSelectedFieldsFromResolverInfo(info, model);
-      context.graphback.options = { selectedFields };
+      const graphback = {
+        services: context.graphback.services,
+        options: { selectedFields }
+      };
 
-      return context.graphback.services[modelName].delete(args.input, context)
+      return context.graphback.services[modelName].delete(args.input, {...context, graphback})
     }
   }
 
@@ -502,15 +511,15 @@ export class SchemaCRUDPlugin extends GraphbackPlugin {
     const modelName = modelType.name;
     const findField = getFieldName(modelName, GraphbackOperationType.FIND);
 
-    queryObj[findField] = (_: any, args: any, context: GraphbackContext, info: GraphQLResolveInfo ) => {
-      if (!context.graphback || !context.graphback.services || !context.graphback.services[modelName]) {
-        throw new Error(`Missing service for ${modelName}`);
-      }
+    queryObj[findField] = async (_: any, args: any, context: GraphbackContext, info: GraphQLResolveInfo ) => {
       const selectedFields = getSelectedFieldsFromResolverInfo(info, model, "items");
       const count = getSelectedFieldsFromResolverInfo(info, model).some((field: string ) =>  field === "count");
-      context.graphback.options = { selectedFields, aggregations: { count } };
+      const graphback = {
+        services: context.graphback.services,
+        options: { selectedFields, aggregations: { count } }
+      };
 
-      return context.graphback.services[modelName].findBy(args.filter, context, args.orderBy, args.page)
+      return context.graphback.services[modelName].findBy(args.filter, {...context, graphback}, args.orderBy, args.page)
     }
   }
 
@@ -533,9 +542,12 @@ export class SchemaCRUDPlugin extends GraphbackPlugin {
       }
 
       const selectedFields = getSelectedFieldsFromResolverInfo(info, model);
-      context.graphback.options = { selectedFields };
+      const graphback = {
+        services: context.graphback.services,
+        options: { selectedFields }
+      };
 
-      return context.graphback.services[modelName].findOne({ [primaryKeyLabel]: args.id }, context)
+      return context.graphback.services[modelName].findOne({ [primaryKeyLabel]: args.id }, {...context, graphback})
     }
   }
 
@@ -622,13 +634,16 @@ export class SchemaCRUDPlugin extends GraphbackPlugin {
 
       const selectedFields = getSelectedFieldsFromResolverInfo(info, model);
       selectedFields.push(relationship.relationForeignKey);
-      context.graphback.options = { selectedFields };
+      const graphback = {
+        services: context.graphback.services,
+        options: { selectedFields }
+      };
 
       return context.graphback.services[modelName].batchLoadData(
         relationship.relationForeignKey,
         parent[relationIdField.name],
         args.filter,
-        context
+        {...context, graphback}
       );
     }
   }
@@ -652,9 +667,12 @@ export class SchemaCRUDPlugin extends GraphbackPlugin {
       }
 
       const selectedFields = getSelectedFieldsFromResolverInfo(info, model);
-      context.graphback.options = { selectedFields };
+      const graphback = {
+        services: context.graphback.services,
+        options: { selectedFields }
+      };
 
-      return context.graphback.services[modelName].findOne({ [relationIdField.name]: parent[relationship.relationForeignKey] }, context);
+      return context.graphback.services[modelName].findOne({ [relationIdField.name]: parent[relationship.relationForeignKey] }, {...context, graphback});
     }
   }
 

diff --git a/packages/graphback-datasync/src/DataSyncPlugin.ts b/packages/graphback-datasync/src/DataSyncPlugin.ts
@@ -140,9 +140,12 @@ export class DataSyncPlugin extends GraphbackPlugin {
       }
 
       const selectedFields = getSelectedFieldsFromResolverInfo(info, model, "items");
-      context.graphback.options = { selectedFields };
+      const graphback = {
+        services: context.graphback.services,
+        options: { selectedFields }
+      };
 
-      return dataSyncService.sync(args.lastSync, context, args.filter);
+      return dataSyncService.sync(args.lastSync, {...context, graphback }, args.filter);
     }
   }