refactor: don't use plural in module name

azzamsa · Jul 28, 2023 · d5a0b77 · d5a0b77
1 parent 3135e36
commit d5a0b77
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 18 deletions.
diff --git a/src/errors/app.rs → src/error/app.rs b/src/errors/app.rs → src/error/app.rs
diff --git a/src/errors/mod.rs → src/error/mod.rs b/src/errors/mod.rs → src/error/mod.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -3,11 +3,11 @@ pub mod context;
 pub mod db;
 pub mod domain;
 pub mod driver;
-mod errors;
+mod error;
 pub mod logger;
 pub mod relay;
-pub mod routes;
+pub mod route;
 pub mod scalar;
 pub mod schema;
 
-pub use errors::Error;
+pub use error::Error;
diff --git a/src/main.rs b/src/main.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use axum::Server;
-use tin::{config::Config, logger, routes::app};
+use tin::{config::Config, logger, route::app};
 
 #[tokio::main]
 async fn main() -> Result<(), tin::Error> {

diff --git a/src/relay/validation.rs b/src/relay/validation.rs
@@ -1,7 +1,7 @@
 use uuid::Uuid;
 
 use crate::{
-    errors::{
+    error::{
         app::Error::{
             MissingFirstAndLastPaginationArguments, PassedFirstAndLastPaginationArguments,
         },

diff --git a/src/routes.rs → src/route.rs b/src/routes.rs → src/route.rs
@@ -21,7 +21,7 @@ use crate::{
     db,
     domain::{health, meta, user},
     driver::mailer::Mailer,
-    routes,
+    route,
     schema::{AppSchema, Mutation, Query},
     Error,
 };
@@ -77,11 +77,11 @@ pub async fn app() -> Result<Router, Error> {
     struct ApiDoc;
 
     let mut app = Router::new()
-        .route("/graphql", post(routes::graphql_handler))
+        .route("/graphql", post(route::graphql_handler))
         .route("/health", get(health::resolver::health));
     if config.env != config::Env::Production {
         app = app
-            .route("/playground", get(routes::graphql_playground))
+            .route("/playground", get(route::graphql_playground))
             .merge(SwaggerUi::new("/swagger").url("/api-doc/openapi.json", ApiDoc::openapi()));
     }
     let app = app.layer(Extension(schema));

diff --git a/tests/health/tests.rs b/tests/health/tests.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use cynic::QueryBuilder;
 use serde_json::{from_slice, json, to_string, Value};
-use tin::routes::app;
+use tin::route::app;
 use tower::util::ServiceExt;
 
 use super::{graphql::queries::HealthQuery, schema::HealthResponse};

diff --git a/tests/meta/tests.rs b/tests/meta/tests.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use cynic::QueryBuilder;
 use serde_json::{from_slice, to_string};
-use tin::routes::app;
+use tin::route::app;
 use tower::util::ServiceExt;
 
 use super::{graphql::queries::MetaQuery, schema::MetaResponse};

diff --git a/tests/user/create_user.rs b/tests/user/create_user.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use cynic::MutationBuilder;
 use serde_json::{from_slice, to_string};
-use tin::routes::app;
+use tin::route::app;
 use tower::util::ServiceExt;
 
 use super::{fake_user, teardown};

diff --git a/tests/user/create_user_without_full_name.rs b/tests/user/create_user_without_full_name.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use cynic::MutationBuilder;
 use serde_json::{from_slice, to_string};
-use tin::routes::app;
+use tin::route::app;
 use tower::util::ServiceExt;
 
 use super::teardown;

diff --git a/tests/user/delete_user.rs b/tests/user/delete_user.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use cynic::{MutationBuilder, QueryBuilder};
 use serde_json::{from_slice, to_string, Value};
-use tin::routes::app;
+use tin::route::app;
 use tower::{util::ServiceExt, Service};
 
 use super::{fake_user, teardown};

diff --git a/tests/user/duplicate_username.rs b/tests/user/duplicate_username.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use cynic::MutationBuilder;
 use serde_json::{from_slice, to_string, Value};
-use tin::routes::app;
+use tin::route::app;
 use tower::{util::ServiceExt, Service};
 
 use super::{fake_user, graphql::update, teardown};

diff --git a/tests/user/find_user.rs b/tests/user/find_user.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use cynic::QueryBuilder;
 use serde_json::{from_slice, to_string, Value};
-use tin::routes::app;
+use tin::route::app;
 use tower::util::ServiceExt;
 
 use super::graphql::queries::{ReadUserArguments, UserQuery, Uuid};

diff --git a/tests/user/keep_existing_full_name.rs b/tests/user/keep_existing_full_name.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use cynic::MutationBuilder;
 use serde_json::{from_slice, to_string};
-use tin::routes::app;
+use tin::route::app;
 use tower::{util::ServiceExt, Service};
 
 use crate::fake_user;

diff --git a/tests/user/relay.rs b/tests/user/relay.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use cynic::{MutationBuilder, QueryBuilder};
 use serde_json::{from_slice, to_string, Value};
-use tin::routes::app;
+use tin::route::app;
 use tower::{util::ServiceExt, Service};
 
 use super::teardown;

diff --git a/tests/user/update_user.rs b/tests/user/update_user.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use cynic::MutationBuilder;
 use serde_json::{from_slice, to_string};
-use tin::routes::app;
+use tin::route::app;
 use tower::{util::ServiceExt, Service};
 
 use super::{fake_user, graphql::update::Uuid, teardown};