move common code into utils module

enmeshed-analytics · Feb 6, 2025 · 591bca4 · 591bca4
1 parent 701c287
commit 591bca4
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 11 deletions.
diff --git a/gridwalk-backend/src/core/mod.rs b/gridwalk-backend/src/core/mod.rs
diff --git a/gridwalk-backend/src/layer/layer.rs b/gridwalk-backend/src/layer/layer.rs
@@ -1,5 +1,5 @@
-use crate::core::get_unix_timestamp;
 use crate::data::Database;
+use crate::utils::get_unix_timestamp;
 use crate::{User, Workspace, WorkspaceRole};
 use anyhow::{anyhow, Result};
 use duckdb_postgis;

diff --git a/gridwalk-backend/src/main.rs b/gridwalk-backend/src/main.rs
@@ -1,13 +1,13 @@
 mod app_state;
 mod auth;
 mod connector;
-mod core;
 mod data;
 mod layer;
 mod project;
 mod server;
 mod session;
 mod user;
+mod utils;
 mod workspace;
 
 use crate::app_state::AppState;

diff --git a/gridwalk-backend/src/project/project.rs b/gridwalk-backend/src/project/project.rs
@@ -1,5 +1,5 @@
-use crate::core::get_unix_timestamp;
 use crate::data::Database;
+use crate::utils::get_unix_timestamp;
 use crate::{User, Workspace, WorkspaceRole};
 use anyhow::{anyhow, Result};
 use serde::{Deserialize, Serialize};

diff --git a/gridwalk-backend/src/session/session.rs b/gridwalk-backend/src/session/session.rs
@@ -1,6 +1,6 @@
 use crate::app_state::AppState;
-use crate::core::create_id;
 use crate::data::Database;
+use crate::utils::create_id;
 use crate::User;
 use anyhow::Result;
 use async_trait::async_trait;

diff --git a/gridwalk-backend/src/user/endpoints.rs b/gridwalk-backend/src/user/endpoints.rs
@@ -1,6 +1,6 @@
 use crate::app_state::AppState;
 use crate::auth::AuthUser;
-use crate::core::{create_id, verify_password};
+use crate::utils::{create_id, verify_password};
 use crate::{CreateUser, Profile, Session, User};
 use axum::{
     extract::{Extension, State},

diff --git a/gridwalk-backend/src/user/user.rs b/gridwalk-backend/src/user/user.rs
@@ -1,5 +1,5 @@
-use crate::core::{create_id, get_unix_timestamp, hash_password};
 use crate::data::Database;
+use crate::utils::{create_id, get_unix_timestamp, hash_password};
 use anyhow::{anyhow, Result};
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;

diff --git a/gridwalk-backend/src/core/common.rs → gridwalk-backend/src/utils.rs b/gridwalk-backend/src/core/common.rs → gridwalk-backend/src/utils.rs
diff --git a/gridwalk-backend/src/workspace/endpoints.rs b/gridwalk-backend/src/workspace/endpoints.rs
@@ -1,5 +1,5 @@
 use crate::auth::AuthUser;
-use crate::{app_state::AppState, core::get_unix_timestamp};
+use crate::{app_state::AppState, utils::get_unix_timestamp};
 use crate::{User, Workspace, WorkspaceRole};
 use axum::{
     extract::{Extension, Path, State},

diff --git a/gridwalk-backend/src/workspace/workspace.rs b/gridwalk-backend/src/workspace/workspace.rs
@@ -1,5 +1,5 @@
-use crate::core::get_unix_timestamp;
 use crate::data::Database;
+use crate::utils::get_unix_timestamp;
 use crate::User;
 use anyhow::{anyhow, Result};
 use serde::{Deserialize, Serialize};