hasura · hallettj · Jun 4, 2024 · May 29, 2024 · May 29, 2024 · May 29, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 This changelog documents the changes between release versions.
 
 ## [Unreleased]
+- Support filtering and sorting by fields of related collections ([#72](https://github.com/hasura/ndc-mongodb/pull/72))
 
 ## [0.0.6] - 2024-05-01
 - Enables logging events from the MongoDB driver by setting the `RUST_LOG` variable ([#67](https://github.com/hasura/ndc-mongodb/pull/67))

diff --git a/arion-compose/services/dev-auth-webhook.nix b/arion-compose/services/dev-auth-webhook.nix
@@ -7,7 +7,7 @@ in
   service = {
     useHostStore = true;
     command = [
-      "${dev-auth-webhook}/bin/hasura-dev-auth-webhook"
+      "${dev-auth-webhook}/bin/dev-auth-webhook"
     ];
   };
 }
diff --git a/crates/configuration/src/native_mutation.rs b/crates/configuration/src/native_mutation.rs
@@ -39,7 +39,7 @@ impl NativeMutation {
                         &object_field.r#type.into(),
                         MongoScalarType::lookup_scalar_type,
                     )?,
-                ))
+                )) as Result<_, QueryPlanError>
             })
             .try_collect()?;
 

diff --git a/crates/configuration/src/native_query.rs b/crates/configuration/src/native_query.rs
@@ -42,7 +42,7 @@ impl NativeQuery {
                         &object_field.r#type.into(),
                         MongoScalarType::lookup_scalar_type,
                     )?,
-                ))
+                )) as Result<_, QueryPlanError>
             })
             .try_collect()?;
 

diff --git a/crates/integration-tests/src/tests/local_relationship.rs b/crates/integration-tests/src/tests/local_relationship.rs
@@ -1,6 +1,5 @@
 use crate::graphql_query;
 use insta::assert_yaml_snapshot;
-use serde_json::json;
 
 #[tokio::test]
 async fn joins_local_relationships() -> anyhow::Result<()> {
@@ -37,30 +36,100 @@ async fn joins_local_relationships() -> anyhow::Result<()> {
                 }
             "#
         )
-        .variables(json!({ "limit": 11, "movies_limit": 2 }))
         .run()
         .await?
     );
     Ok(())
 }
 
-// TODO: Tests an upcoming change in MBD-14
-#[ignore]
 #[tokio::test]
 async fn filters_by_field_of_related_collection() -> anyhow::Result<()> {
     assert_yaml_snapshot!(
         graphql_query(
             r#"
             query {
-              comments(limit: 10, where: {movie: {title: {_is_null: false}}}) {
+              comments(where: {movie: {rated: {_eq: "G"}}}, limit: 10, order_by: {id: Asc}) {
                 movie {
                   title
+                  year
                 }
               }
             }
             "#
         )
-        .variables(json!({ "limit": 11, "movies_limit": 2 }))
+        .run()
+        .await?
+    );
+    Ok(())
+}
+
+#[tokio::test]
+async fn filters_by_non_null_field_of_related_collection() -> anyhow::Result<()> {
+    assert_yaml_snapshot!(
+        graphql_query(
+            r#"
+            query {
+              comments(
+                limit: 10
+                where: {movie: {title: {_is_null: false}}}
+                order_by: {id: Asc}
+              ) {
+                movie {
+                  title
+                  year
+                }
+              }
+            }
+            "#
+        )
+        .run()
+        .await?
+    );
+    Ok(())
+}
+
+#[tokio::test]
+async fn filters_by_field_of_relationship_of_relationship() -> anyhow::Result<()> {
+    assert_yaml_snapshot!(
+        graphql_query(
+            r#"
+            query {
+              artist(where: {albums: {tracks: {name: {_eq: "Princess of the Dawn"}}}}) {
+                name
+                albums(order_by: {title: Asc}) {
+                  title
+                }
+              }
+            }
+            "#
+        )
+        .run()
+        .await?
+    );
+    Ok(())
+}
+
+#[tokio::test]
+async fn sorts_by_field_of_related_collection() -> anyhow::Result<()> {
+    // Filter by rating to filter out comments whose movie relation is null.
+    assert_yaml_snapshot!(
+        graphql_query(
+            r#"
+            query {
+              comments(
+                limit: 10
+                order_by: [{movie: {title: Asc}}, {date: Asc}]
+                where: {movie: {rated: {_eq: "G"}}}
+              ) {
+                movie {
+                  title
+                  year
+                }
+                text
+              }
+            }
+            "#
+        )
         .run()
         .await?
     );

diff --git a/...integration_tests__tests__local_relationship__filters_by_field_of_related_collection.snap b/...integration_tests__tests__local_relationship__filters_by_field_of_related_collection.snap
@@ -0,0 +1,37 @@
+---
+source: crates/integration-tests/src/tests/local_relationship.rs
+expression: "graphql_query(r#\"\n            query {\n              comments(where: {movie: {rated: {_eq: \"G\"}}}, limit: 10, order_by: {id: Asc}) {\n                movie {\n                  title\n                  year\n                }\n              }\n            }\n            \"#).variables(json!({\n                        \"limit\": 11, \"movies_limit\": 2\n                    })).run().await?"
+---
+data:
+  comments:
+    - movie:
+        title: A Corner in Wheat
+        year: 1909
+    - movie:
+        title: Naughty Marietta
+        year: 1935
+    - movie:
+        title: Modern Times
+        year: 1936
+    - movie:
+        title: The Man Who Came to Dinner
+        year: 1942
+    - movie:
+        title: National Velvet
+        year: 1944
+    - movie:
+        title: National Velvet
+        year: 1944
+    - movie:
+        title: Alice in Wonderland
+        year: 1951
+    - movie:
+        title: The King and I
+        year: 1956
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+errors: ~
diff --git a/...n_tests__tests__local_relationship__filters_by_field_of_relationship_of_relationship.snap b/...n_tests__tests__local_relationship__filters_by_field_of_relationship_of_relationship.snap
@@ -0,0 +1,11 @@
+---
+source: crates/integration-tests/src/tests/local_relationship.rs
+expression: "graphql_query(r#\"\n            query {\n              artist(where: {albums: {tracks: {name: {_eq: \"Princess of the Dawn\"}}}}) {\n                name\n                albums(order_by: {title: Asc}) {\n                  title\n                }\n              }\n            }\n            \"#).run().await?"
+---
+data:
+  artist:
+    - name: Accept
+      albums:
+        - title: Balls to the Wall
+        - title: Restless and Wild
+errors: ~
diff --git a/...on_tests__tests__local_relationship__filters_by_non_null_field_of_related_collection.snap b/...on_tests__tests__local_relationship__filters_by_non_null_field_of_related_collection.snap
@@ -0,0 +1,37 @@
+---
+source: crates/integration-tests/src/tests/local_relationship.rs
+expression: "graphql_query(r#\"\n            query {\n              comments(\n                limit: 10\n                where: {movie: {title: {_is_null: false}}}\n                order_by: {id: Asc}\n              ) {\n                movie {\n                  title\n                  year\n                }\n              }\n            }\n            \"#).run().await?"
+---
+data:
+  comments:
+    - movie:
+        title: The Land Beyond the Sunset
+        year: 1912
+    - movie:
+        title: A Corner in Wheat
+        year: 1909
+    - movie:
+        title: In the Land of the Head Hunters
+        year: 1914
+    - movie:
+        title: Traffic in Souls
+        year: 1913
+    - movie:
+        title: Regeneration
+        year: 1915
+    - movie:
+        title: "Hell's Hinges"
+        year: 1916
+    - movie:
+        title: Broken Blossoms or The Yellow Man and the Girl
+        year: 1919
+    - movie:
+        title: High and Dizzy
+        year: 1920
+    - movie:
+        title: The Ace of Hearts
+        year: 1921
+    - movie:
+        title: The Four Horsemen of the Apocalypse
+        year: 1921
+errors: ~
diff --git a/...s/integration_tests__tests__local_relationship__sorts_by_field_of_related_collection.snap b/...s/integration_tests__tests__local_relationship__sorts_by_field_of_related_collection.snap
@@ -0,0 +1,47 @@
+---
+source: crates/integration-tests/src/tests/local_relationship.rs
+expression: "graphql_query(r#\"\n            query {\n              comments(\n                limit: 10\n                order_by: [{movie: {title: Asc}}, {date: Asc}]\n                where: {movie: {rated: {_eq: \"G\"}}}\n              ) {\n                movie {\n                  title\n                  year\n                }\n                text\n              }\n            }\n            \"#).run().await?"
+---
+data:
+  comments:
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+      text: Ipsam cumque facilis officiis ipsam molestiae veniam rerum. Voluptatibus totam eius repellendus sint. Dignissimos distinctio accusantium ad voluptas laboriosam.
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+      text: Consequatur aliquam commodi quod ad. Id autem rerum reiciendis. Delectus suscipit optio ratione.
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+      text: Sequi minima veritatis nobis impedit saepe. Quia consequatur sunt commodi laboriosam ducimus illum nostrum facilis. Fugit nam in ipsum incidunt.
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+      text: Cumque maiores dignissimos nostrum aut autem iusto voluptatum. Voluptatum maiores excepturi ea. Quasi expedita dolorum similique aperiam.
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+      text: Quo rem tempore repudiandae assumenda. Totam quas fugiat impedit soluta doloremque repellat error. Nesciunt aspernatur quis veritatis dignissimos commodi a. Ullam neque fugiat culpa distinctio.
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+      text: Similique unde est dolore amet cum. Molestias debitis laudantium quae animi. Ipsa veniam quos beatae sed facilis omnis est. Aliquid ipsum temporibus dignissimos nostrum.
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+      text: Quisquam iusto numquam perferendis. Labore dolorem corporis aperiam dolor officia natus. Officiis debitis cumque pariatur alias. Mollitia commodi aliquid fugiat excepturi veritatis.
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+      text: Atque nemo pariatur ipsam magnam sit impedit. Fuga earum laudantium iste laboriosam debitis. Possimus eaque vero consequuntur voluptates.
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+      text: Sapiente facilis fugiat labore quo mollitia. Omnis dolor perferendis at et. Maiores voluptates eaque iste quidem praesentium saepe temporibus. Unde occaecati magnam aspernatur repudiandae occaecati.
+    - movie:
+        title: 101 Dalmatians
+        year: 1961
+      text: A porro temporibus quisquam dolore atque itaque nobis debitis. Dolorum voluptatem qui odit itaque quas quis quidem. Culpa doloribus ut non aut illum quae in. Vero aspernatur excepturi pariatur.
+errors: ~
diff --git a/crates/mongodb-agent-common/src/comparison_function.rs b/crates/mongodb-agent-common/src/comparison_function.rs
@@ -58,7 +58,11 @@ impl ComparisonFunction {
     }
 
     /// Produce a MongoDB expression that applies this function to the given operands.
-    pub fn mongodb_expression(self, column_ref: String, comparison_value: Bson) -> Document {
+    pub fn mongodb_expression(
+        self,
+        column_ref: impl Into<String>,
+        comparison_value: Bson,
+    ) -> Document {
         match self {
             C::IRegex => {
                 doc! { column_ref: { self.mongodb_name(): comparison_value, "$options": "i" } }

diff --git a/crates/mongodb-agent-common/src/mongodb/selection.rs b/crates/mongodb-agent-common/src/mongodb/selection.rs
@@ -89,12 +89,65 @@ fn selection_for_field(parent_columns: &[&str], field: &Field) -> Result<Bson, M
         Field::Relationship {
             relationship,
             aggregates,
+            fields,
             ..
         } => {
-            if aggregates.is_some() {
-                Ok(doc! { "$first": get_field(relationship) }.into())
+            // The pipeline for the relationship has already selected the requested fields with the
+            // appropriate aliases. At this point all we need to do is to prune the selection down
+            // to requested fields, omitting fields of the relationship that were selected for
+            // filtering and sorting.
+            let field_selection: Option<Document> = fields.as_ref().map(|fields| {
+                fields
+                    .iter()
+                    .map(|(field_name, _)| {
+                        (field_name.to_owned(), format!("$$this.{field_name}").into())
+                    })
+                    .collect()
+            });
+
+            if let Some(aggregates) = aggregates {
+                let aggregate_selecion: Document = aggregates
+                    .iter()
+                    .map(|(aggregate_name, _)| {
+                        (
+                            aggregate_name.to_owned(),
+                            format!("$$row_set.aggregates.{aggregate_name}").into(),
+                        )
+                    })
+                    .collect();
+                let mut new_row_set = doc! { "aggregates": aggregate_selecion };
+
+                if let Some(field_selection) = field_selection {
+                    new_row_set.insert(
+                        "rows",
+                        doc! {
+                            "$map": {
+                                "input": "$$row_set.rows",
+                                "in": field_selection,
+                            }
+                        },
+                    );
+                }
+
+                Ok(doc! {
+                    "$let": {
+                        "vars": { "row_set": { "$first": get_field(relationship) } },
+                        "in": new_row_set,
+                    }
+                }
+                .into())
+            } else if let Some(field_selection) = field_selection {
+                Ok(doc! {
+                    "rows": {
+                        "$map": {
+                            "input": get_field(relationship),
+                            "in": field_selection,
+                        }
+                    }
+                }
+                .into())
             } else {
-                Ok(doc! { "rows": get_field(relationship) }.into())
+                Ok(doc! { "rows": [] }.into())
             }
         }
     }
@@ -276,12 +329,22 @@ mod tests {
             doc! {
                 "class_students": {
                     "rows": {
-                        "$getField": { "$literal": "class_students" }
+                        "$map": {
+                            "input": { "$getField": { "$literal": "class_students" } },
+                            "in": {
+                                "name": "$$this.name"
+                            },
+                        },
                     },
                 },
                 "students": {
                     "rows": {
-                        "$getField": { "$literal": "class_students" }
+                        "$map": {
+                            "input": { "$getField": { "$literal": "class_students" } },
+                            "in": {
+                                "student_name": "$$this.student_name"
+                            },
+                        },
                     },
                 },
             }