Skip to content

Commit

Permalink
crated utils function for creating elastic client
Browse files Browse the repository at this point in the history
  • Loading branch information
0x6e66 committed Feb 15, 2024
1 parent 0170d84 commit 5cd6628
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pangaea"
version = "0.2.0"
version = "0.2.1"
edition = "2021"
authors = ["Niklas Frondorf <[email protected]>"]
readme = "README.md"
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ pub mod download_data;
mod error;
pub mod metadata;
mod prelude;
pub mod utils;
7 changes: 7 additions & 0 deletions src/utils/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
use elasticsearch::{http::transport::Transport, Elasticsearch};
use crate::prelude::*;

pub fn get_elastic_client() -> Result<Elasticsearch> {
let transport = Transport::single_node("https://ws.pangaea.de/es/pangaea")?;
Ok(Elasticsearch::new(transport))
}
12 changes: 3 additions & 9 deletions tests/dataset.rs
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
use elasticsearch::{http::transport::Transport, Elasticsearch};
use pangaea::dataset::datasettype::Dataset;

fn get_client() -> Elasticsearch {
let transport = Transport::single_node("https://ws.pangaea.de/es/pangaea").unwrap();
Elasticsearch::new(transport)
}
use pangaea::{dataset::datasettype::Dataset, utils::get_elastic_client};

#[tokio::test]
async fn dataset_new() {
let dataset_id = 82037;

let _ = Dataset::new(dataset_id, &get_client()).await.unwrap();
let _ = Dataset::new(dataset_id, &get_elastic_client().unwrap()).await.unwrap();
}

#[tokio::test]
async fn dataset_search() {
let _ = Dataset::search(0, 10, None, &["sp-lastModified:desc"], &get_client())
let _ = Dataset::search(0, 10, None, &["sp-lastModified:desc"], &get_elastic_client().unwrap())
.await
.unwrap();
}
12 changes: 3 additions & 9 deletions tests/metadata.rs
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
use elasticsearch::{http::transport::Transport, Elasticsearch};
use pangaea::metadata::metadatatype::MetaDataType;

fn get_client() -> Elasticsearch {
let transport = Transport::single_node("https://ws.pangaea.de/es/pangaea").unwrap();
Elasticsearch::new(transport)
}
use pangaea::{metadata::metadatatype::MetaDataType, utils::get_elastic_client};

#[tokio::test]
async fn metadata_new() {
let dataset_id = 82037;

let _ = MetaDataType::new(dataset_id, &get_client()).await.unwrap();
let _ = MetaDataType::new(dataset_id, &get_elastic_client().unwrap()).await.unwrap();
}

#[tokio::test]
async fn metadata_search() {
let _ = MetaDataType::search(0, 10, None, &["sp-lastModified:desc"], &get_client())
let _ = MetaDataType::search(0, 10, None, &["sp-lastModified:desc"], &get_elastic_client().unwrap())
.await
.unwrap();
}

0 comments on commit 5cd6628

Please sign in to comment.