Skip to content
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.

Sign up for GitHub

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

Retain numeric parameter value type when creating open cypher query #63

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Retain numeric parameter value type when creating open cypher query #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions templates/JSResolverOCHTTPSTemplate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const schemaDataModel = JSON.parse(schemaDataModelJSON);
const schema = buildASTSchema(schemaDataModel, { assumeValidSDL: true });


function resolveGraphDBQueryFromAppSyncEvent(event) {
function resolveGraphDBQueryFromAppSyncEvent(event) {
const fieldDef = getFieldDef(event.field);

const args = [];
Expand Down Expand Up @@ -67,8 +67,8 @@ function resolveGraphDBQueryFromAppSyncEvent(event) {
const graphQuery = resolveGraphDBQuery(obj);
return graphQuery;
}


function resolveGraphDBQueryFromApolloQueryEvent(event) {
// TODO
}
Expand Down Expand Up @@ -749,6 +749,9 @@ function transformFunctionInputParameters(fields, schemaInfo) {
fields.forEach(field => {
if (field.name.value === arg.name) {
let value = field.value.value;
if (field.value.kind === 'IntValue' || field.value.kind === 'FloatValue') {
value = Number(value);
}
if (arg.name === schemaInfo.graphDBIdArgName) {
r.graphIdValue = value
} else if (arg.alias != null) {
Expand Down
16 changes: 16 additions & 0 deletions test/TestCases/Case01/Case01.05.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,22 @@ describe('AppSync resolver', () => {
});
});

test('should resolve queries with a filter that contains numeric and string values', () => {
const result = resolve({
field: 'getNodeAirports',
arguments: { filter: { country: 'US', runways: 3 } },
selectionSetGraphQL: '{ city }'
});

expect(result).toEqual({
query: 'MATCH (getNodeAirports_Airport:`airport`{country: $getNodeAirports_Airport_country, runways: $getNodeAirports_Airport_runways})\n' +
'RETURN collect({city: getNodeAirports_Airport.`city`})',
parameters: { getNodeAirports_Airport_country: 'US', getNodeAirports_Airport_runways: 3},
language: 'opencypher',
refactorOutput: null
});
});

function resolve(event) {
return resolverModule.resolveGraphDBQueryFromAppSyncEvent(event);
}
Expand Down
11 changes: 7 additions & 4 deletions test/TestCases/Case01/outputReference/output.resolver.graphql.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const gql = require('graphql-tag'); // GraphQL library to parse the GraphQL quer

const useCallSubquery = false;

// 2025-01-31T06:40:58.761Z
// 2025-02-04T20:17:38.303Z

const schemaDataModelJSON = `{
"kind": "Document",
Expand Down Expand Up @@ -3475,7 +3475,7 @@ const schemaDataModel = JSON.parse(schemaDataModelJSON);
const schema = buildASTSchema(schemaDataModel, { assumeValidSDL: true });


function resolveGraphDBQueryFromAppSyncEvent(event) {
function resolveGraphDBQueryFromAppSyncEvent(event) {
const fieldDef = getFieldDef(event.field);

const args = [];
Expand Down Expand Up @@ -3518,8 +3518,8 @@ function resolveGraphDBQueryFromAppSyncEvent(event) {
const graphQuery = resolveGraphDBQuery(obj);
return graphQuery;
}


function resolveGraphDBQueryFromApolloQueryEvent(event) {
// TODO
}
Expand Down Expand Up @@ -4200,6 +4200,9 @@ function transformFunctionInputParameters(fields, schemaInfo) {
fields.forEach(field => {
if (field.name.value === arg.name) {
let value = field.value.value;
if (field.value.kind === 'IntValue' || field.value.kind === 'FloatValue') {
value = Number(value);
}
if (arg.name === schemaInfo.graphDBIdArgName) {
r.graphIdValue = value
} else if (arg.alias != null) {
Expand Down
11 changes: 7 additions & 4 deletions test/TestCases/Case01/outputReference/output.resolver.graphql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const gql = require('graphql-tag'); // GraphQL library to parse the GraphQL quer

const useCallSubquery = false;

// 2025-01-31T06:40:58.760Z
// 2025-02-04T20:17:38.302Z

const schemaDataModelJSON = `{
"kind": "Document",
Expand Down Expand Up @@ -3475,7 +3475,7 @@ const schemaDataModel = JSON.parse(schemaDataModelJSON);
const schema = buildASTSchema(schemaDataModel, { assumeValidSDL: true });


function resolveGraphDBQueryFromAppSyncEvent(event) {
function resolveGraphDBQueryFromAppSyncEvent(event) {
const fieldDef = getFieldDef(event.field);

const args = [];
Expand Down Expand Up @@ -3518,8 +3518,8 @@ function resolveGraphDBQueryFromAppSyncEvent(event) {
const graphQuery = resolveGraphDBQuery(obj);
return graphQuery;
}


function resolveGraphDBQueryFromApolloQueryEvent(event) {
// TODO
}
Expand Down Expand Up @@ -4200,6 +4200,9 @@ function transformFunctionInputParameters(fields, schemaInfo) {
fields.forEach(field => {
if (field.name.value === arg.name) {
let value = field.value.value;
if (field.value.kind === 'IntValue' || field.value.kind === 'FloatValue') {
value = Number(value);
}
if (arg.name === schemaInfo.graphDBIdArgName) {
r.graphIdValue = value
} else if (arg.alias != null) {
Expand Down
18 changes: 18 additions & 0 deletions test/TestCases/Case01/queries/Query0020.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "Filter by parameter with numeric value and return mix of numeric value types",
"description": "",
"graphql": "query MyQuery {\n getNodeAirports(filter: { city: \"Seattle\", runways: 3 }) {\n code\n lat\n lon\n elev\n}\n }",
"parameters": {
"getNodeAirports_Airport_city": "Seattle",
"getNodeAirports_Airport_runways": 3
},
"resolved": "MATCH (getNodeAirports_Airport:`airport`{city: $getNodeAirports_Airport_city, runways: $getNodeAirports_Airport_runways})\nRETURN collect({code: getNodeAirports_Airport.`code`, lat: getNodeAirports_Airport.`lat`, lon: getNodeAirports_Airport.`lon`, elev: getNodeAirports_Airport.`elev`})",
"result": [
{
"code": "SEA",
"elev": 432,
"lon": -122.30899810791,
"lat": 47.4490013122559
}
]
}
11 changes: 7 additions & 4 deletions test/TestCases/Case07/outputReference/output.resolver.graphql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const gql = require('graphql-tag'); // GraphQL library to parse the GraphQL quer

const useCallSubquery = false;

// 2025-01-31T06:47:04.494Z
// 2025-02-04T20:38:45.966Z

const schemaDataModelJSON = `{
"kind": "Document",
Expand Down Expand Up @@ -3507,7 +3507,7 @@ const schemaDataModel = JSON.parse(schemaDataModelJSON);
const schema = buildASTSchema(schemaDataModel, { assumeValidSDL: true });


function resolveGraphDBQueryFromAppSyncEvent(event) {
function resolveGraphDBQueryFromAppSyncEvent(event) {
const fieldDef = getFieldDef(event.field);

const args = [];
Expand Down Expand Up @@ -3550,8 +3550,8 @@ function resolveGraphDBQueryFromAppSyncEvent(event) {
const graphQuery = resolveGraphDBQuery(obj);
return graphQuery;
}


function resolveGraphDBQueryFromApolloQueryEvent(event) {
// TODO
}
Expand Down Expand Up @@ -4232,6 +4232,9 @@ function transformFunctionInputParameters(fields, schemaInfo) {
fields.forEach(field => {
if (field.name.value === arg.name) {
let value = field.value.value;
if (field.value.kind === 'IntValue' || field.value.kind === 'FloatValue') {
value = Number(value);
}
if (arg.name === schemaInfo.graphDBIdArgName) {
r.graphIdValue = value
} else if (arg.alias != null) {
Expand Down