borked graphql on user schema with nested json

api/controller/get.js

@@ -74,7 +74,7 @@ module.exports = ({ schema, logging, destination, name }) => {
  ` try {`,
  ` const { ${extraKeys.join(', ')}} = req.query;`,
  ` const { ${schemaKeys.join(', ')}} = req.query;`,
- ` console.log('req query ', req.query);`,
+ // ` console.log('req query ', req.query);`,
  ` // The model query`,
  ` const find = {};`,
  ` // pagination object (search, sort, filter, etc)`,
@@ -104,8 +104,8 @@ module.exports = ({ schema, logging, destination, name }) => {
  ];
  const save = [
  `// save`,
- `console.log('find ', find);`,
- `console.log('where', where);`,
+ // `console.log('find ', find);`,
+ // `console.log('where', where);`,
  `const ${name} = await ${uppercase(name)}.paginate(find, where); // @TODO populate: '<model name>'`,
  `return res.json({ ${name}s: ${name} });`
  ];

api/graphql/createIndex.js

@@ -17,7 +17,6 @@ module.exports = ({ destination, flavor }) => {
  // if (logging) console.log('creating user-can');
  fs.mkdirSync(modelFolder);
  }
- console.log('create index');
  const pretty = beautify(code, { indent_size: 2, space_in_empty_paren: true });
  fs.writeFileSync(indexFile, pretty);
 };

api/graphql/createPrepare.js

@@ -17,7 +17,6 @@ module.exports = ({ destination, flavor }) => {
  // if (logging) console.log('creating user-can');
  fs.mkdirSync(modelFolder);
  }
- console.log('create index');
  const pretty = beautify(code, { indent_size: 2, space_in_empty_paren: true });
  fs.writeFileSync(indexFile, pretty);
 };

api/graphql/createResolvers.js

@@ -14,7 +14,6 @@ module.exports = ({ destination, flavor, name }) => {
  Query: {
  ${name}: async (root, {_id}) => {
  // // @TODO Permissions,
- // const permission = userCan('getOne', '${name}', req.user, args);,
  // if (!permission) throw new Error('Permission denied for userCan getOne ${name}');,
  return await ${uppercase(name)}.findOne({ _id });
  },
@@ -30,15 +29,13 @@ module.exports = ({ destination, flavor, name }) => {
  // // @TODO Permissions,
  // const permission = userCan('create', '${name}', req.user, args);,
  // if (!permission) throw new Error('Permission denied for userCan create ${name}');,
-
  const new${uppercase(name)} = await ${uppercase(name)}.create(args);
- console.log('RES', new${uppercase(name)})
  return new${uppercase(name)};
  },
  update${uppercase(name)}: async (root, args, context, info) => {
  const argscopy = Object.assign({}, args);
- delete argscopy.${name}ID;
- let getOne = await ${uppercase(name)}.findOne({ _id: args.${name}ID });
+ delete argscopy._id;
+ let getOne = await ${uppercase(name)}.findOne({ _id: args._id });
 
  Object.keys(args).forEach(key => getOne[key] = args[key]);
  // // @TODO Permissions,
@@ -48,7 +45,7 @@ module.exports = ({ destination, flavor, name }) => {
  return getOne;
  },
  delete${uppercase(name)}: async (root, args, context, info) => {
- const getOne = await ${uppercase(name)}.findOne({ _id: args.${name}ID });
+ const getOne = await ${uppercase(name)}.findOne({ _id: args._id });
  // // @TODO Permissions,
  // const permission = userCan('delete', '${name}', req.user, args);,
  // if (!permission) throw new Error('Permission denied for userCan delete ${name}');,
@@ -67,7 +64,6 @@ module.exports = ({ destination, flavor, name }) => {
  // if (logging) console.log('creating user-can');
  fs.mkdirSync(modelFolder);
  }
- console.log('create index');
  const pretty = beautify(code, { indent_size: 2, space_in_empty_paren: true });
  fs.writeFileSync(indexFile, pretty);
 };

api/graphql/createTypeDefs.js

@@ -20,8 +20,8 @@ module.exports = ({ schema, destination, flavor, name }) => {
  }
  type Mutation {
  create${uppercase(name)}(${getGraphqlSchema(schema, 'csv')}): ${uppercase(name)}
- update${uppercase(name)}(${name}ID: String, ${getGraphqlSchema(schema, 'csv')}): ${uppercase(name)}
- delete${uppercase(name)}(${name}ID: String): ${uppercase(name)}
+ update${uppercase(name)}(_id: String, ${getGraphqlSchema(schema, 'csv')}): ${uppercase(name)}
+ delete${uppercase(name)}(_id: String): ${uppercase(name)}
  }
  schema {
  query: Query
@@ -30,14 +30,13 @@ module.exports = ({ schema, destination, flavor, name }) => {
  \`
  ];
 
- `
+ `;
 
  // if (logging) console.log('checking user-can');
  if (!fs.existsSync(modelFolder)) {
  // if (logging) console.log('creating user-can');
  fs.mkdirSync(modelFolder);
  }
- console.log('create index');
  const pretty = beautify(code, { indent_size: 2, space_in_empty_paren: true });
  fs.writeFileSync(indexFile, pretty);
 };

api/tests/fakeObject.js

@@ -1,9 +1,18 @@
-module.exports = (schema) => {
+module.exports = (schema, asString = false) => {
  const genData = require('./genData');
  schema = require(schema).schema; // eslint-disable-line
  const fakeObject = {};
  Object.keys(schema).forEach((key) => {
- fakeObject[key] = genData(schema[key].type);
+ fakeObject[key] = genData(schema[key].type, schema[key], schema[key].enum);
  });
- return fakeObject;
+
+ if (!asString) return fakeObject;
+
+ // into string
+ let str = [];
+ Object.keys(fakeObject).forEach(key => {
+ const value = schema[key].type === 'String' ? `"${fakeObject[key]}"` : fakeObject[key];
+ str.push(`${key}: ${value}`);
+ });
+ return { obj: fakeObject, str };
 };

api/tests/genData.js

@@ -1,4 +1,11 @@
-module.exports = (type) => {
+
+module.exports = (type, value, isEnum = false) => {
+ const subDocHelper = require('./subDocHelper');
+
+ if (isEnum) return value[0];
+ if (!type) {
+ return subDocHelper(value);
+ }
  switch (type.toLowerCase()) {
  case 'string':
  return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
@@ -8,6 +15,7 @@ module.exports = (type) => {
  return { hi: true, cool: "okay", bean: 123 };
  case 'boolean':
  return Math.floor(Math.random() * 1000) > 500 ? true : false;
+ case 'enum':
  default:
 
  }

api/tests/graphqlSafe.js

@@ -0,0 +1,9 @@
+module.exports = (prop) => {
+ console.log('PROP', typeof prop)
+ switch (typeof prop) {
+ case "string":
+ return `"${prop}"`;
+ default:
+ return `${prop}`;
+ }
+};