diff --git a/src/clients.rs b/src/clients.rs index d95daef..1930479 100644 --- a/src/clients.rs +++ b/src/clients.rs @@ -1,6 +1,6 @@ use std::fmt; -use crate::schemas::tiled_metadata::Metadata; +use crate::model::metadata::Metadata; #[cfg(test)] pub(crate) mod mock_tiled_client; diff --git a/src/clients/mock_tiled_client.rs b/src/clients/mock_tiled_client.rs index 949eef8..4827139 100644 --- a/src/clients/mock_tiled_client.rs +++ b/src/clients/mock_tiled_client.rs @@ -4,7 +4,7 @@ use std::path::PathBuf; use serde::de::DeserializeOwned; use crate::clients::{Client, ClientResult}; -use crate::schemas::tiled_metadata::Metadata; +use crate::model::metadata::Metadata; pub struct MockTiledClient { pub dir_path: PathBuf, } diff --git a/src/clients/tiled_client.rs b/src/clients/tiled_client.rs index 46564ee..d7743e4 100644 --- a/src/clients/tiled_client.rs +++ b/src/clients/tiled_client.rs @@ -2,7 +2,7 @@ use reqwest::Url; use serde::de::DeserializeOwned; use crate::clients::{Client, ClientResult}; -use crate::schemas::tiled_metadata::Metadata; +use crate::model::metadata::Metadata; pub struct TiledClient { pub address: Url, diff --git a/src/handlers/graphql.rs b/src/handlers/graphql.rs index 4fde46d..9a077de 100644 --- a/src/handlers/graphql.rs +++ b/src/handlers/graphql.rs @@ -5,7 +5,7 @@ use axum::Extension; use axum::response::{Html, IntoResponse}; use crate::clients::Client; -use crate::schemas::TiledQuery; +use crate::model::TiledQuery; pub async fn graphql_handler( schema: Extension, EmptyMutation, EmptySubscription>>, diff --git a/src/main.rs b/src/main.rs index 22ddd4e..c4a665c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,14 +8,14 @@ mod cli; mod clients; mod config; mod handlers; -mod schemas; +mod model; use cli::{Cli, Commands}; use crate::clients::tiled_client::TiledClient; use crate::config::GlazedConfig; use crate::handlers::graphql::{graphiql_handler, graphql_handler}; -use crate::schemas::TiledQuery; +use crate::model::TiledQuery; #[tokio::main] async fn main() -> Result<(), Box> { diff --git a/src/schemas.rs b/src/model.rs similarity index 63% rename from src/schemas.rs rename to src/model.rs index 8b0ec3f..b44a16d 100644 --- a/src/schemas.rs +++ b/src/model.rs @@ -1,4 +1,4 @@ -pub(crate) mod tiled_metadata; +pub(crate) mod metadata; use async_graphql::Object; @@ -8,7 +8,7 @@ pub(crate) struct TiledQuery(pub T); #[Object] impl TiledQuery { - async fn metadata(&self) -> async_graphql::Result { + async fn metadata(&self) -> async_graphql::Result { self.0.metadata().await } } diff --git a/src/schemas/tiled_metadata.rs b/src/model/metadata.rs similarity index 100% rename from src/schemas/tiled_metadata.rs rename to src/model/metadata.rs