-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
19 changed files
with
510 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| use crate::core::GeospatialConfig; | ||
| use crate::data::Database; | ||
| use martin::Source; | ||
| use std::collections::HashMap; | ||
| use std::sync::Arc; | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub struct AppState<D: Database> { | ||
| pub app_data: D, | ||
| pub sources: HashMap<String, Box<dyn Source>>, | ||
| #[derive(Clone)] | ||
| pub struct AppState { | ||
| pub app_data: Arc<dyn Database>, | ||
| pub geospatial_config: GeospatialConfig, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| use anyhow::{anyhow, Result}; | ||
| use async_trait::async_trait; | ||
| use deadpool_postgres::{Config, Pool, Runtime}; | ||
| use serde::{Deserialize, Serialize}; | ||
| use std::collections::HashMap; | ||
| use std::sync::Arc; | ||
| use tokio::sync::RwLock; | ||
| use tokio_postgres::NoTls; | ||
|
|
||
| use crate::data::Database; | ||
|
|
||
| // TODO: Switch connector_type/postgis_uri to enum to support other connectors | ||
| #[derive(Debug, Clone, Deserialize)] | ||
| pub struct Connection { | ||
| pub id: String, | ||
| pub workspace_id: String, | ||
| pub name: String, | ||
| pub created_by: String, | ||
| pub connector_type: String, | ||
| pub config: PostgresConnection, | ||
| } | ||
|
|
||
| impl Connection { | ||
| pub async fn create_record(self, database: &Arc<dyn Database>) -> Result<()> { | ||
| database.create_connection(&self).await?; | ||
| Ok(()) | ||
| } | ||
|
|
||
| pub async fn from_id( | ||
| database: &Arc<dyn Database>, | ||
| workspace_id: &str, | ||
| connection_id: &str, | ||
| ) -> Result<Self> { | ||
| let con = database | ||
| .get_workspace_connection(workspace_id, connection_id) | ||
| .await?; | ||
| Ok(con) | ||
| } | ||
| } | ||
|
|
||
| // Trait for all geospatial data sources | ||
| #[async_trait] | ||
| pub trait GeoConnector: Send + Sync { | ||
| async fn connect(&mut self) -> Result<()>; | ||
| async fn disconnect(&mut self) -> Result<()>; | ||
| async fn list_sources(&self) -> Result<Vec<String>>; | ||
| } | ||
|
|
||
| #[derive(Clone, Debug, Serialize, Deserialize)] | ||
| pub struct PostgresConnection { | ||
| pub host: String, | ||
| pub port: u16, | ||
| pub database: String, | ||
| pub username: String, | ||
| pub password: String, | ||
| } | ||
|
|
||
| #[derive(Clone, Debug)] | ||
| pub struct PostgisConfig { | ||
| pool: Arc<Pool>, | ||
| } | ||
|
|
||
| impl PostgisConfig { | ||
| pub fn new(connection: PostgresConnection) -> Result<Self> { | ||
| println!("Creating new PostgisConfig with connection parameters"); | ||
| let mut config = Config::new(); | ||
| config.host = Some(connection.host.to_string()); | ||
| config.port = Some(connection.port); | ||
| config.dbname = Some(connection.database.to_string()); | ||
| config.user = Some(connection.username.to_string()); | ||
| config.password = Some(connection.password.to_string()); | ||
|
|
||
| let pool = config | ||
| .create_pool(Some(Runtime::Tokio1), NoTls) | ||
| .map_err(|e| anyhow!("Failed to create connection pool: {}", e))?; | ||
|
|
||
| Ok(PostgisConfig { | ||
| pool: Arc::new(pool), | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| #[async_trait] | ||
| impl GeoConnector for PostgisConfig { | ||
| async fn connect(&mut self) -> Result<()> { | ||
| println!("Testing connection to PostGIS database"); | ||
| let client = self | ||
| .pool | ||
| .get() | ||
| .await | ||
| .map_err(|e| anyhow!("Failed to get client from pool: {}", e))?; | ||
| client | ||
| .query("SELECT 1", &[]) | ||
| .await | ||
| .map_err(|e| anyhow!("Failed to execute test query: {}", e))?; | ||
| println!("Connection test successful"); | ||
| Ok(()) | ||
| } | ||
|
|
||
| async fn disconnect(&mut self) -> Result<()> { | ||
| println!("Disconnect called, but pool remains active for potential future use"); | ||
| Ok(()) | ||
| } | ||
|
|
||
| async fn list_sources(&self) -> Result<Vec<String>> { | ||
| println!("Listing sources from PostGIS database"); | ||
| let client = self | ||
| .pool | ||
| .get() | ||
| .await | ||
| .map_err(|e| anyhow!("Failed to get client from pool: {}", e))?; | ||
|
|
||
| let rows = client | ||
| .query( | ||
| "SELECT DISTINCT f.table_name | ||
| FROM information_schema.columns f | ||
| JOIN pg_type t ON f.udt_name = t.typname | ||
| WHERE t.typtype = 'b' | ||
| AND t.typname IN ('geometry', 'geography') | ||
| AND f.table_schema = 'public'", | ||
| &[], | ||
| ) | ||
| .await | ||
| .map_err(|e| anyhow!("Failed to execute query to list sources: {}", e))?; | ||
|
|
||
| let sources: Vec<String> = rows.iter().map(|row| row.get(0)).collect(); | ||
| println!("Found {} sources", sources.len()); | ||
| Ok(sources) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct GeospatialConfig { | ||
| sources: Arc<RwLock<HashMap<String, Arc<dyn GeoConnector>>>>, | ||
| } | ||
|
|
||
| impl GeospatialConfig { | ||
| pub fn new() -> Self { | ||
| GeospatialConfig { | ||
| sources: Arc::new(RwLock::new(HashMap::new())), | ||
| } | ||
| } | ||
|
|
||
| pub async fn add_connection<T: GeoConnector + 'static>(&self, name: String, source: T) { | ||
| let mut sources = self.sources.write().await; | ||
| sources.insert(name, Arc::new(source)); | ||
| } | ||
|
|
||
| pub async fn get_connection(&self, connection_id: &str) -> Result<Arc<dyn GeoConnector>> { | ||
| let sources = self.sources.read().await; | ||
| sources | ||
| .get(connection_id) | ||
| .cloned() | ||
| .ok_or_else(|| anyhow!("Source not found")) | ||
| } | ||
|
|
||
| pub async fn remove_connection(&self, name: &str) -> Option<Arc<dyn GeoConnector>> { | ||
| let mut sources = self.sources.write().await; | ||
| sources.remove(name) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| pub mod common; | ||
| pub mod layer; | ||
| pub mod connector; | ||
| pub mod session; | ||
| pub mod user; | ||
| pub mod workspace; | ||
|
|
||
| pub use common::*; | ||
| pub use layer::*; | ||
| pub use connector::*; | ||
| pub use session::*; | ||
| pub use user::*; | ||
| pub use workspace::*; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.