Skip to content
This repository was archived by the owner on Sep 3, 2021. It is now read-only.

Merge operation support #355

Merged
merged 12 commits into from
Dec 5, 2019
Merged

Merge operation support #355

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
489d407
Upstream merge
michaeldgraham Nov 26, 2019
3f293bc
removed Point primary key
michaeldgraham Dec 4, 2019
9bca89a
Added merge node mutation
michaeldgraham Dec 4, 2019
cc487e4
Added merge relationship mutation
michaeldgraham Dec 4, 2019
e20de8f
Merge operation support
michaeldgraham Dec 4, 2019
a8b944f
Merge helpers, Point input serialization fix
michaeldgraham Dec 4, 2019
65b56d9
Merge mutation test resolvers
michaeldgraham Dec 4, 2019
5b30a2d
Removal of Point type primary key
michaeldgraham Dec 4, 2019
cf0f133
Merge mutation tests
michaeldgraham Dec 4, 2019
3e9cd59
Merge mutation fields
michaeldgraham Dec 4, 2019
dde8352
Merge mutation translation tests
michaeldgraham Dec 4, 2019
e1ac087
Create and Merge node should use test.serial
michaeldgraham Dec 4, 2019
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
Prev Previous commit
Next Next commit
Merge mutation tests 
Also changes the use of the pointKey Point type primary key on SpatialNode to use the non-pk 'point' field, since SpatialNode now has an 'id: ID' primary key.
  • Loading branch information
@michaeldgraham
michaeldgraham committed Dec 4, 2019
commit cf0f133391ddf5ea7663e8342c3d4d7f3b39e9b8
261 changes: 250 additions & 11 deletions test/integration/integration.test.js
View file
Original file line number Diff line number Diff line change
@@ -223,7 +223,13 @@ test('Create node mutation (not-isolated)', async t => {
year: 2018,
plot: 'An unending saga',
poster: 'www.movieposter.com/img.png',
imdbRating: 1
imdbRating: 1,
location: {
__typename: '_Neo4jPoint',
longitude: 46.870035,
latitude: -113.990976,
height: 12.3
}
}
}
};
@@ -239,12 +245,83 @@ test('Create node mutation (not-isolated)', async t => {
plot: "An unending saga"
poster: "www.movieposter.com/img.png"
imdbRating: 1.0
location: {
longitude: 46.870035
latitude: -113.990976
height: 12.3
}
) {
title
year
plot
poster
imdbRating
location {
longitude
latitude
height
}
}
}
`
})
.then(data => {
t.deepEqual(data.data, expected.data);
})
.catch(error => {
t.fail(error.message);
});
});

test('Merge node mutation (not-isolated)', async t => {
t.plan(1);

let expected = {
data: {
MergeMovie: {
__typename: 'Movie',
title: 'My Super Awesome Movie',
year: 2018,
plot: 'An unending saga',
poster: 'www.movieposter.com/img.png',
imdbRating: 1,
location: {
__typename: '_Neo4jPoint',
longitude: 46.870035,
latitude: -113.990976,
height: 12.3
}
}
}
};

await client
.mutate({
mutation: gql`
mutation someMutation {
MergeMovie(
movieId: "12dd334d5zaaaa"
title: "My Super Awesome Movie"
year: 2018
plot: "An unending saga"
poster: "www.movieposter.com/img.png"
imdbRating: 1.0
location: {
longitude: 46.870035
latitude: -113.990976
height: 12.3
}
) {
title
year
plot
poster
imdbRating
location {
longitude
latitude
height
}
}
}
`
@@ -358,6 +435,75 @@ test.serial('Add relationship mutation (not-isolated)', async t => {
});
});

test.serial('Merge relationship mutation (not-isolated)', async t => {
t.plan(1);

let expected = {
data: {
MergeMovieGenre: {
__typename: 'Movie',
title: 'Chungking Express (Chung Hing sam lam)',
genres: [
{
name: 'Mystery',
__typename: 'Genre'
},
{
name: 'Drama',
__typename: 'Genre'
},
{
name: 'Romance',
__typename: 'Genre'
},
{
name: 'Action',
__typename: 'Genre'
}
]
}
}
};

await client
.mutate({
mutation: gql`
mutation mergeGenreRelationToMovie(
$from: _MovieInput!
$to: _GenreInput!
) {
MergeMovieGenres(from: $from, to: $to) {
from {
title
genres {
name
}
}
to {
name
}
}
}
`,
variables: {
from: {
movieId: '123'
},
to: {
name: 'Action'
}
}
})
.then(data => {
t.is(data.data.MergeMovieGenres.from.genres.length, 4);
// FIXME: Check length of genres array instead of exact response until ordering is implemented
//t.deepEqual(data.data, expected.data);
})
.catch(error => {
t.fail(error.message);
});
});

test.serial('Remove relationship mutation (not-isolated)', async t => {
t.plan(1);

@@ -1334,6 +1480,94 @@ test.serial(
}
);

test.serial(
'Merge relationship with temporal property (not-isolated)',
async t => {
t.plan(1);

let expected = {
data: {
MergeMovieRatings: {
__typename: '_MergeMovieRatingsPayload',
date: {
__typename: '_Neo4jDate',
formatted: '2018-12-18'
},
rating: 9
}
}
};

await client
.mutate({
mutation: gql`
mutation {
MergeMovieRatings(
from: { userId: 18 }
to: { movieId: 6683 }
data: { rating: 9, date: { year: 2018, month: 12, day: 18 } }
) {
date {
formatted
}
rating
}
}
`
})
.then(data => {
t.deepEqual(data, expected);
})
.catch(error => {
t.fail(error.message);
});
}
);

test.serial(
'Update relationship with temporal property (not-isolated)',
async t => {
t.plan(1);

let expected = {
data: {
UpdateMovieRatings: {
__typename: '_UpdateMovieRatingsPayload',
date: {
__typename: '_Neo4jDate',
formatted: '2018-12-18'
},
rating: 7
}
}
};

await client
.mutate({
mutation: gql`
mutation {
UpdateMovieRatings(
from: { userId: 18 }
to: { movieId: 6683 }
data: { rating: 7, date: { year: 2018, month: 12, day: 18 } }
) {
date {
formatted
}
rating
}
}
`
})
.then(data => {
t.deepEqual(data, expected);
})
.catch(error => {
t.fail(error.message);
});
}
);

test.serial(
'Query for temporal property on relationship (not-isolated)',
async t => {
@@ -1352,7 +1586,7 @@ test.serial(
__typename: '_Neo4jDate',
formatted: '2018-12-18'
},
rating: 5
rating: 7
}
]
}
@@ -1547,7 +1781,8 @@ test.serial(
data: {
CreateSpatialNode: {
__typename: 'SpatialNode',
pointKey: {
id: 'xyz',
point: {
__typename: '_Neo4jPoint',
crs: 'wgs-84-3d',
latitude: 20,
@@ -1563,9 +1798,11 @@ test.serial(
mutation: gql`
mutation {
CreateSpatialNode(
pointKey: { longitude: 10, latitude: 20, height: 30 }
id: "xyz"
point: { longitude: 10, latitude: 20, height: 30 }
) {
pointKey {
id
point {
longitude
latitude
height
@@ -1594,7 +1831,8 @@ test.serial(
SpatialNode: [
{
__typename: 'SpatialNode',
pointKey: {
id: 'xyz',
point: {
__typename: '_Neo4jPoint',
crs: 'wgs-84-3d',
latitude: 20,
@@ -1610,8 +1848,9 @@ test.serial(
.query({
query: gql`
{
SpatialNode(pointKey: { longitude: 10, latitude: 20, height: 30 }) {
pointKey {
SpatialNode(point: { longitude: 10, latitude: 20, height: 30 }) {
id
point {
longitude
latitude
height
@@ -1637,7 +1876,7 @@ test.serial('Spatial - filtering - field equal to given value', async t => {
SpatialNode: [
{
__typename: 'SpatialNode',
pointKey: {
point: {
__typename: '_Neo4jPoint',
crs: 'wgs-84-3d',
latitude: 20,
@@ -1653,9 +1892,9 @@ test.serial('Spatial - filtering - field equal to given value', async t => {
query: gql`
{
SpatialNode(
filter: { pointKey: { longitude: 10, latitude: 20, height: 30 } }
filter: { point: { longitude: 10, latitude: 20, height: 30 } }
) {
pointKey {
point {
longitude
latitude
height