Skip to content

GraphQL classConfig query alias #6257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 98 additions & 0 deletions spec/ParseGraphQLSchema.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -564,4 +564,102 @@ describe('ParseGraphQLSchema', () => {
).toEqual(Object.keys(mutations2).sort());
});
});

describe('query alias', () => {
it('Should be able to define alias for find query', async () => {
const parseGraphQLSchema = new ParseGraphQLSchema({
databaseController,
parseGraphQLController,
log: defaultLogger,
appId,
});

await parseGraphQLSchema.parseGraphQLController.updateGraphQLConfig({
classConfigs: [
{
className: 'Data',
query: {
get: true,
getAlias: 'precious_data',
find: true,
findAlias: 'data_results',
},
},
],
});

const data = new Parse.Object('Data');

await data.save();

await parseGraphQLSchema.databaseController.schemaCache.clear();
await parseGraphQLSchema.load();

const queries1 = parseGraphQLSchema.graphQLQueries;

expect(Object.keys(queries1)).toContain('data_results');
expect(Object.keys(queries1)).toContain('precious_data');
});

it('should fail if query alias is not a string', async () => {
const parseGraphQLSchema = new ParseGraphQLSchema({
databaseController,
parseGraphQLController,
log: defaultLogger,
appId,
});

const classConfigsBoolFindAlias = {
classConfigs: [
{
className: 'Data',
query: {
get: true,
getAlias: 'valid',
find: true,
findAlias: true,
},
},
],
};

const classConfigsNumberGetAlias = {
classConfigs: [
{
className: 'Pants',
query: {
get: true,
getAlias: 1,
find: true,
findAlias: 'valid',
},
},
],
};

let className;

className = classConfigsBoolFindAlias.classConfigs[0].className;
try {
await parseGraphQLSchema.parseGraphQLController.updateGraphQLConfig(
classConfigsBoolFindAlias
);
} catch (e) {
expect(e).toMatch(
`Invalid graphQLConfig: classConfig:${className} is invalid because "query.findAlias" must be a string`
);
}

className = classConfigsNumberGetAlias.classConfigs[0].className;
try {
await parseGraphQLSchema.parseGraphQLController.updateGraphQLConfig(
classConfigsNumberGetAlias
);
} catch (e) {
expect(e).toMatch(
`Invalid graphQLConfig: classConfig:${className} is invalid because "query.getAlias" must be a string`
);
}
});
});
});
14 changes: 13 additions & 1 deletion src/Controllers/ParseGraphQLController.js
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,13 @@ class ParseGraphQLController {
}
if (query !== null) {
if (isValidSimpleObject(query)) {
const { find = null, get = null, ...invalidKeys } = query;
const {
find = null,
get = null,
findAlias = null,
getAlias = null,
...invalidKeys
} = query;
if (Object.keys(invalidKeys).length) {
return `"query" contains invalid keys, [${Object.keys(
invalidKeys
Expand All @@ -275,6 +281,10 @@ class ParseGraphQLController {
return `"query.find" must be a boolean`;
} else if (get !== null && typeof get !== 'boolean') {
return `"query.get" must be a boolean`;
} else if (findAlias !== null && typeof findAlias !== 'string') {
return `"query.findAlias" must be a string`;
} else if (getAlias !== null && typeof getAlias !== 'string') {
return `"query.getAlias" must be a string`;
}
} else {
return `"query" must be a valid object`;
Expand Down Expand Up @@ -361,6 +371,8 @@ export interface ParseGraphQLClassConfig {
query: ?{
get: ?boolean,
find: ?boolean,
findAlias: ?String,
getAlias: ?String,
};
/* The `mutation` object contains options for which class mutations are generated */
mutation: ?{
Expand Down
15 changes: 11 additions & 4 deletions src/GraphQL/loaders/parseClassQueries.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ const load = function(
const {
get: isGetEnabled = true,
find: isFindEnabled = true,
getAlias: getAlias = '',
findAlias: findAlias = '',
} = getParseClassQueryConfig(parseClassConfig);

const {
Expand All @@ -53,8 +55,11 @@ const load = function(
} = parseGraphQLSchema.parseClassTypes[className];

if (isGetEnabled) {
const getGraphQLQueryName =
const lowerCaseClassName =
graphQLClassName.charAt(0).toLowerCase() + graphQLClassName.slice(1);

const getGraphQLQueryName = getAlias || lowerCaseClassName;

parseGraphQLSchema.addGraphQLQuery(getGraphQLQueryName, {
description: `The ${getGraphQLQueryName} query can be used to get an object of the ${graphQLClassName} class by its id.`,
args: {
Expand All @@ -75,9 +80,11 @@ const load = function(
}

if (isFindEnabled) {
const findGraphQLQueryName = pluralize(
graphQLClassName.charAt(0).toLowerCase() + graphQLClassName.slice(1)
);
const lowerCaseClassName =
graphQLClassName.charAt(0).toLowerCase() + graphQLClassName.slice(1);

const findGraphQLQueryName = findAlias || pluralize(lowerCaseClassName);

parseGraphQLSchema.addGraphQLQuery(findGraphQLQueryName, {
description: `The ${findGraphQLQueryName} query can be used to find objects of the ${graphQLClassName} class.`,
args: classGraphQLFindArgs,
Expand Down