From 591bca4d4d94fcfb02e335d1b396cd84117020ee Mon Sep 17 00:00:00 2001
From: zerj9 <96551236+zerj9@users.noreply.github.com>
Date: Thu, 6 Feb 2025 21:32:00 +0000
Subject: [PATCH] move common code into utils module

---
 gridwalk-backend/src/core/mod.rs                  | 3 ---
 gridwalk-backend/src/layer/layer.rs               | 2 +-
 gridwalk-backend/src/main.rs                      | 2 +-
 gridwalk-backend/src/project/project.rs           | 2 +-
 gridwalk-backend/src/session/session.rs           | 2 +-
 gridwalk-backend/src/user/endpoints.rs            | 2 +-
 gridwalk-backend/src/user/user.rs                 | 2 +-
 gridwalk-backend/src/{core/common.rs => utils.rs} | 0
 gridwalk-backend/src/workspace/endpoints.rs       | 2 +-
 gridwalk-backend/src/workspace/workspace.rs       | 2 +-
 10 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 gridwalk-backend/src/core/mod.rs
 rename gridwalk-backend/src/{core/common.rs => utils.rs} (100%)

diff --git a/gridwalk-backend/src/core/mod.rs b/gridwalk-backend/src/core/mod.rs
deleted file mode 100644
index 4598711..0000000
--- a/gridwalk-backend/src/core/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod common;
-
-pub use common::*;
diff --git a/gridwalk-backend/src/layer/layer.rs b/gridwalk-backend/src/layer/layer.rs
index faa01b9..fb76d34 100644
--- 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
index 3262538..c7f97b0 100644
--- 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
index 6c1c810..c442407 100644
--- 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
index cb18613..cf14f7d 100644
--- 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
index 7d23183..5629394 100644
--- 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
index 14002b8..5c68f83 100644
--- 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 b/gridwalk-backend/src/utils.rs
similarity index 100%
rename from gridwalk-backend/src/core/common.rs
rename to gridwalk-backend/src/utils.rs
diff --git a/gridwalk-backend/src/workspace/endpoints.rs b/gridwalk-backend/src/workspace/endpoints.rs
index 8ae3c32..691ab12 100644
--- 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
index c4ec7e1..8840f18 100644
--- 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};