fix(torii): query models (#1752)

* fix: query models * fix: model for event message * test: handle edge case * fix: use correct type * fmt
dojoengine · Apr 2, 2024 · f9b8c02 · f9b8c02
1 parent df5c3ea
commit f9b8c02
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/crates/torii/graphql/src/object/entity.rs b/crates/torii/graphql/src/object/entity.rs
@@ -123,7 +123,7 @@ fn model_union_field() -> Field {
                     let model_ids: Vec<(String, String)> = sqlx::query_as(
                         "SELECT id, name
                         FROM models
-                        WHERE id = (
+                        WHERE id IN (    
                             SELECT model_id
                             FROM entity_model
                             WHERE entity_id = ?

diff --git a/crates/torii/graphql/src/object/event_message.rs b/crates/torii/graphql/src/object/event_message.rs
@@ -123,7 +123,7 @@ fn model_union_field() -> Field {
                     let model_ids: Vec<(String, String)> = sqlx::query_as(
                         "SELECT id, name
                         FROM models
-                        WHERE id = (
+                        WHERE id IN (
                             SELECT model_id
                             FROM event_model
                             WHERE entity_id = ?

diff --git a/crates/torii/graphql/src/tests/entities_test.rs b/crates/torii/graphql/src/tests/entities_test.rs
@@ -7,7 +7,7 @@ mod tests {
 
     use crate::schema::build_schema;
     use crate::tests::{
-        run_graphql_query, spinup_types_test, Connection, Entity, Record, Subrecord,
+        run_graphql_query, spinup_types_test, Connection, Entity, Record, RecordSibling, Subrecord,
     };
 
     async fn entities_query(schema: &Schema, arg: &str) -> Value {
@@ -62,6 +62,11 @@ mod tests {
                   random_u8
                   random_u128
                 }}
+                ... on RecordSibling {{
+                  __typename
+                  record_id
+                  random_u8
+                }}
                 ... on Subrecord {{
                   __typename
                   record_id
@@ -224,10 +229,16 @@ mod tests {
         let id = poseidon_hash_many(&[FieldElement::ZERO]);
         let entity = entity_model_query(&schema, &id).await;
         let models = entity.get("models").ok_or("no models found").unwrap();
+
+        // models should contain record & recordsibling
         let record: Record = serde_json::from_value(models[0].clone()).unwrap();
         assert_eq!(&record.__typename, "Record");
         assert_eq!(record.record_id, 0);
 
+        let record_sibling: RecordSibling = serde_json::from_value(models[1].clone()).unwrap();
+        assert_eq!(&record_sibling.__typename, "RecordSibling");
+        assert_eq!(record_sibling.record_id, 0);
+
         let id = poseidon_hash_many(&[FieldElement::ZERO, FieldElement::ONE]);
         let entity = entity_model_query(&schema, &id).await;
         let models = entity.get("models").ok_or("no models found").unwrap();