Skip to content
Draft
5 changes: 4 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions crates/graphql/src/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@ pub const DATETIME_FORMAT: &str = "%Y-%m-%dT%H:%M:%SZ";
pub const DEFAULT_LIMIT: u64 = 10;
pub const BOOLEAN_TRUE: i64 = 1;

pub const ENTITY_TABLE: &str = "entities";
pub const EVENT_TABLE: &str = "events";
pub const EVENT_MESSAGE_TABLE: &str = "event_messages";
pub const MODEL_TABLE: &str = "models";
pub const TRANSACTION_TABLE: &str = "transactions";
pub const TRANSACTION_CALLS_TABLE: &str = "transaction_calls";
pub const TOKEN_TRANSFER_TABLE: &str = "token_transfers";
pub const METADATA_TABLE: &str = "metadata";
pub const CONTROLLER_TABLE: &str = "controllers";

pub const ID_COLUMN: &str = "id";
pub const EVENT_ID_COLUMN: &str = "event_id";
pub const ENTITY_ID_COLUMN: &str = "internal_entity_id";
Expand Down
7 changes: 4 additions & 3 deletions crates/graphql/src/object/controller.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use async_graphql::dynamic::Field;
use torii_sqlite::types::Table;

use super::{BasicObject, ResolvableObject, TypeMapping};
use crate::constants::{CONTROLLER_NAMES, CONTROLLER_TABLE, CONTROLLER_TYPE_NAME, ID_COLUMN};
use crate::constants::{CONTROLLER_NAMES, CONTROLLER_TYPE_NAME, ID_COLUMN};
use crate::mapping::CONTROLLER_MAPPING;
use crate::object::{resolve_many, resolve_one};

Expand All @@ -25,15 +26,15 @@ impl BasicObject for ControllerObject {
impl ResolvableObject for ControllerObject {
fn resolvers(&self) -> Vec<Field> {
let resolve_one = resolve_one(
CONTROLLER_TABLE,
Table::Controllers,
ID_COLUMN,
self.name().0,
self.type_name(),
self.type_mapping(),
);

let resolve_many = resolve_many(
CONTROLLER_TABLE,
Table::Controllers,
ID_COLUMN,
self.name().1,
self.type_name(),
Expand Down
8 changes: 4 additions & 4 deletions crates/graphql/src/object/entity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ use dojo_types::schema::Ty;
use sqlx::{Pool, Sqlite};
use tokio_stream::StreamExt;
use torii_sqlite::simple_broker::SimpleBroker;
use torii_sqlite::types::Entity;
use torii_sqlite::types::{Entity, Table};

use super::inputs::keys_input::keys_argument;
use super::{BasicObject, ResolvableObject, TypeMapping, ValueMapping};
use crate::constants::{
DATETIME_FORMAT, ENTITY_NAMES, ENTITY_TABLE, ENTITY_TYPE_NAME, EVENT_ID_COLUMN, ID_COLUMN,
DATETIME_FORMAT, ENTITY_NAMES, ENTITY_TYPE_NAME, EVENT_ID_COLUMN, ID_COLUMN,
};
use crate::mapping::ENTITY_TYPE_MAPPING;
use crate::object::{resolve_many, resolve_one};
Expand Down Expand Up @@ -43,15 +43,15 @@ impl BasicObject for EntityObject {
impl ResolvableObject for EntityObject {
fn resolvers(&self) -> Vec<Field> {
let resolve_one = resolve_one(
ENTITY_TABLE,
Table::Entities,
ID_COLUMN,
self.name().0,
self.type_name(),
self.type_mapping(),
);

let mut resolve_many = resolve_many(
ENTITY_TABLE,
Table::Entities,
EVENT_ID_COLUMN,
self.name().1,
self.type_name(),
Expand Down
4 changes: 2 additions & 2 deletions crates/graphql/src/object/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use async_graphql::{Name, Result, Value};
use tokio_stream::{Stream, StreamExt};
use torii_sqlite::constants::SQL_FELT_DELIMITER;
use torii_sqlite::simple_broker::SimpleBroker;
use torii_sqlite::types::Event;
use torii_sqlite::types::{Event, Table};

use super::inputs::keys_input::{keys_argument, parse_keys_argument};
use super::{resolve_many, BasicObject, ResolvableObject, TypeMapping};
Expand Down Expand Up @@ -33,7 +33,7 @@ impl BasicObject for EventObject {
impl ResolvableObject for EventObject {
fn resolvers(&self) -> Vec<Field> {
let mut resolve_many = resolve_many(
EVENT_TABLE,
Table::Events,
ID_COLUMN,
self.name().1,
self.type_name(),
Expand Down
8 changes: 4 additions & 4 deletions crates/graphql/src/object/event_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ use dojo_types::schema::Ty;
use sqlx::{Pool, Sqlite};
use tokio_stream::StreamExt;
use torii_sqlite::simple_broker::SimpleBroker;
use torii_sqlite::types::EventMessage;
use torii_sqlite::types::{EventMessage, Table};

use super::inputs::keys_input::keys_argument;
use super::{BasicObject, ResolvableObject, TypeMapping, ValueMapping};
use crate::constants::{
DATETIME_FORMAT, EVENT_ID_COLUMN, EVENT_MESSAGE_NAMES, EVENT_MESSAGE_TABLE,
DATETIME_FORMAT, EVENT_ID_COLUMN, EVENT_MESSAGE_NAMES,
EVENT_MESSAGE_TYPE_NAME, ID_COLUMN,
};
use crate::mapping::ENTITY_TYPE_MAPPING;
Expand Down Expand Up @@ -45,15 +45,15 @@ impl BasicObject for EventMessageObject {
impl ResolvableObject for EventMessageObject {
fn resolvers(&self) -> Vec<Field> {
let resolve_one = resolve_one(
EVENT_MESSAGE_TABLE,
Table::EventMessages,
ID_COLUMN,
self.name().0,
self.type_name(),
self.type_mapping(),
);

let mut resolve_many = resolve_many(
EVENT_MESSAGE_TABLE,
Table::EventMessages,
EVENT_ID_COLUMN,
self.name().1,
self.type_name(),
Expand Down
Loading
Loading