Skip to content

Commit

Permalink
graphql: do not sort an interface by child-level entity
Browse files Browse the repository at this point in the history
  • Loading branch information
@kamilkisiela
kamilkisiela committed Oct 5, 2022
1 parent 14ed1d4 commit 1d9d19d
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 34 deletions.
40 changes: 16 additions & 24 deletions graphql/src/schema/api.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1053,15 +1053,7 @@ mod tests {
.map(|value| value.name.as_str())
.collect();

assert_eq!(
values,
[
"id",
"name",
"mostHatedBy",
"mostLovedBy",
]
);
assert_eq!(values, ["id", "name", "mostHatedBy", "mostLovedBy",]);

let recipe_order_by = schema
.get_named_type("Recipe_orderBy")
Expand All @@ -1079,21 +1071,21 @@ mod tests {
.map(|value| value.name.as_str())
.collect();

assert_eq!(
values,
[
"id",
"name",
"author",
"author__id",
"author__name",
"author__favoriteFurType",
"author__favoritePet",
"author__leastFavoritePet",
"lovedBy",
"ingredients"
]
);
assert_eq!(
values,
[
"id",
"name",
"author",
"author__id",
"author__name",
"author__favoriteFurType",
"author__favoritePet",
"author__leastFavoritePet",
"lovedBy",
"ingredients"
]
);
}

#[test]
Expand Down
7 changes: 7 additions & 0 deletions graphql/src/store/query.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,13 @@ fn build_order_by(
})
}
OrderByValue::Child(parent_field_name, child_field_name) => {
if entity.is_interface() {
return Err(QueryExecutionError::OrderByNotSupportedError(
entity.name().to_owned(),
parent_field_name.clone(),
));
}

let field =
sast::get_field(entity, parent_field_name.as_str()).ok_or_else(|| {
QueryExecutionError::EntityFieldError(
Expand Down
62 changes: 52 additions & 10 deletions graphql/tests/query.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,18 +213,21 @@ fn test_schema(id: DeploymentHash, id_type: IdType) -> Schema {
id: ID!
title: String!
song: Song!
author: User!
}
type Photo implements Media @entity {
id: ID!
title: String!
song: Song! @derivedFrom(field: \"media\")
author: User!
}
type Video implements Media @entity {
id: ID!
title: String!
song: Song! @derivedFrom(field: \"media\")
author: User!
}
interface Release {
Expand Down Expand Up @@ -261,6 +264,7 @@ fn test_schema(id: DeploymentHash, id_type: IdType) -> Schema {
latestSongReview: SongReview!
latestBandReview: BandReview!
latestReview: Review!
medias: [Media!]! @derivedFrom(field: \"author\")
}
type AnonymousUser implements Author @entity {
Expand Down Expand Up @@ -315,12 +319,12 @@ async fn insert_test_entities(
entity! { __typename: "User", id: "u1", name: "Baden", latestSongReview: "r3", latestBandReview: "r1", latestReview: "r1" },
entity! { __typename: "User", id: "u2", name: "Goodwill", latestSongReview: "r4", latestBandReview: "r2", latestReview: "r2" },
entity! { __typename: "AnonymousUser", id: "u3", name: "Anonymous 3", latestSongReview: "r6", latestBandReview: "r5", latestReview: "r5" },
entity! { __typename: "Photo", id: md[1], title: "Cheesy Tune Single Cover" },
entity! { __typename: "Video", id: md[2], title: "Cheesy Tune Music Video" },
entity! { __typename: "Photo", id: md[3], title: "Rock Tune Single Cover" },
entity! { __typename: "Video", id: md[4], title: "Rock Tune Music Video" },
entity! { __typename: "Photo", id: md[5], title: "Pop Tune Single Cover" },
entity! { __typename: "Video", id: md[6], title: "Folk Tune Music Video" },
entity! { __typename: "Photo", id: md[1], title: "Cheesy Tune Single Cover", author: "u1" },
entity! { __typename: "Video", id: md[2], title: "Cheesy Tune Music Video", author: "u2" },
entity! { __typename: "Photo", id: md[3], title: "Rock Tune Single Cover", author: "u1" },
entity! { __typename: "Video", id: md[4], title: "Rock Tune Music Video", author: "u2" },
entity! { __typename: "Photo", id: md[5], title: "Pop Tune Single Cover", author: "u1" },
entity! { __typename: "Video", id: md[6], title: "Folk Tune Music Video", author: "u2" },
entity! { __typename: "Album", id: "rl1", title: "Pop and Folk", songs: vec![s[3], s[4]] },
entity! { __typename: "Single", id: "rl2", title: "Rock", songs: vec![s[2]] },
entity! { __typename: "Single", id: "rl3", title: "Cheesy", songs: vec![s[1]] },
Expand Down Expand Up @@ -806,13 +810,51 @@ fn can_query_with_sorting_by_child_interface() {
}

#[test]
fn can_query_interface_with_sorting_by_child_entity() {
// TODO
fn can_not_query_interface_with_sorting_by_child_entity() {
const QUERY: &str = "
query {
desc: medias(first: 100, orderBy: author__name, orderDirection: desc) {
title
author {
name
}
}
asc: medias(first: 100, orderBy: author__name, orderDirection: asc) {
title
author {
name
}
}
}";

run_query(QUERY, |result, _| {
// Sorting an interface by child-level entity (derived) is not supported
assert!(result.has_errors());
});
}

#[test]
fn can_query_interface_with_sorting_by_derived_child_entity() {
// TODO
fn can_not_query_interface_with_sorting_by_derived_child_entity() {
const QUERY: &str = "
query {
desc: medias(first: 100, orderBy: song__title, orderDirection: desc) {
title
song {
title
}
}
asc: medias(first: 100, orderBy: song__title, orderDirection: asc) {
title
song {
title
}
}
}";

run_query(QUERY, |result, _| {
// Sorting an interface by child-level entity is not supported
assert!(result.has_errors());
});
}

#[test]
Expand Down

0 comments on commit 1d9d19d

Please sign in to comment.