From 042d46bd35877674e95acf9b30e77515e485e8da Mon Sep 17 00:00:00 2001
From: Junichi Sugiura <jun.sugiura.jp@gmail.com>
Date: Wed, 10 Jan 2024 03:37:55 +0100
Subject: [PATCH] Change model query field to camel case (#1410)

---
 Cargo.lock                                      |  2 +-
 crates/torii/graphql/src/schema.rs              |  3 ++-
 .../graphql/src/tests/models_ordering_test.rs   |  2 +-
 crates/torii/graphql/src/tests/models_test.rs   | 17 +++++++++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9403e074b1..468168b43e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2827,7 +2827,7 @@ dependencies = [
 
 [[package]]
 name = "dojo-world-abigen"
-version = "0.1.0"
+version = "0.4.4"
 dependencies = [
  "cairo-lang-starknet",
  "camino",
diff --git a/crates/torii/graphql/src/schema.rs b/crates/torii/graphql/src/schema.rs
index 32db9f090a..1d08bfe0f2 100644
--- a/crates/torii/graphql/src/schema.rs
+++ b/crates/torii/graphql/src/schema.rs
@@ -2,6 +2,7 @@ use anyhow::Result;
 use async_graphql::dynamic::{
     Field, Object, Scalar, Schema, Subscription, SubscriptionField, Union,
 };
+use convert_case::{Case, Casing};
 use sqlx::SqlitePool;
 use torii_core::types::Model;
 
@@ -126,7 +127,7 @@ async fn build_objects(pool: &SqlitePool) -> Result<(Vec<Box<dyn ObjectTrait>>,
         let type_mapping = type_mapping_query(&mut conn, &model.id).await?;
 
         if !type_mapping.is_empty() {
-            let field_name = model.name.to_lowercase();
+            let field_name = model.name.to_case(Case::Camel);
             let type_name = model.name;
 
             union = union.possible_type(&type_name);
diff --git a/crates/torii/graphql/src/tests/models_ordering_test.rs b/crates/torii/graphql/src/tests/models_ordering_test.rs
index 3ac52d1ff9..9a93ab39c7 100644
--- a/crates/torii/graphql/src/tests/models_ordering_test.rs
+++ b/crates/torii/graphql/src/tests/models_ordering_test.rs
@@ -23,7 +23,7 @@ mod tests {
                     createdAt
                 }}
               }}
-              pageInfo{{
+              pageInfo {{
                 startCursor
                 hasPreviousPage
                 hasNextPage
diff --git a/crates/torii/graphql/src/tests/models_test.rs b/crates/torii/graphql/src/tests/models_test.rs
index 75e2b7c07b..cc04ded6d2 100644
--- a/crates/torii/graphql/src/tests/models_test.rs
+++ b/crates/torii/graphql/src/tests/models_test.rs
@@ -318,6 +318,23 @@ mod tests {
         let connection: Connection<Record> = serde_json::from_value(records).unwrap();
         assert_eq!(connection.edges.len(), 0);
 
+        let result = run_graphql_query(
+            &schema,
+            r#"
+            {
+                recordSiblingModels {
+                    edges {
+                        node {
+                            __typename
+                        }
+                    }
+                }
+            }
+            "#,
+        )
+        .await;
+        assert!(result.get("recordSiblingModels").is_some());
+
         Ok(())
     }
 }