refactor for namespace

next-hat · May 26, 2024 · 603df02 · 603df02
1 parent e69d0ac
commit 603df02
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 23 deletions.
diff --git a/bin/nanocld/src/repositories/event.rs b/bin/nanocld/src/repositories/event.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use diesel::prelude::*;
 
 use nanocl_error::io::IoResult;
@@ -12,10 +14,8 @@ use crate::{
 use super::generic::*;
 
 impl RepositoryBase for EventDb {
-  fn get_columns<'a>(
-  ) -> std::collections::HashMap<&'a str, (crate::models::ColumnType, &'a str)>
-  {
-    std::collections::HashMap::from([
+  fn get_columns<'a>() -> HashMap<&'a str, (ColumnType, &'a str)> {
+    HashMap::from([
       ("key", (ColumnType::Uuid, "events.key")),
       (
         "reporting_node",

diff --git a/bin/nanocld/src/repositories/job.rs b/bin/nanocld/src/repositories/job.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use diesel::prelude::*;
 
 use futures_util::StreamExt;
@@ -24,9 +26,8 @@ use super::generic::*;
 
 impl RepositoryBase for JobDb {
   fn get_columns<'a>(
-  ) -> std::collections::HashMap<&'a str, (crate::models::ColumnType, &'a str)>
-  {
-    std::collections::HashMap::from([
+  ) -> std::collections::HashMap<&'a str, (ColumnType, &'a str)> {
+    HashMap::from([
       ("key", (ColumnType::Text, "jobs.key")),
       ("data", (ColumnType::Json, "jobs.data")),
       ("metadata", (ColumnType::Json, "jobs.metadata")),

diff --git a/bin/nanocld/src/repositories/metric.rs b/bin/nanocld/src/repositories/metric.rs
@@ -2,13 +2,26 @@ use diesel::prelude::*;
 use nanocl_stubs::generic::GenericFilter;
 
 use crate::{
-  gen_sql_multiple, gen_sql_where4json, gen_sql_where4uuid,
-  gen_sql_where4string, models::MetricDb, schema::metrics,
+  gen_sql_multiple, gen_sql_where4json, gen_sql_where4string,
+  gen_sql_where4uuid,
+  models::{ColumnType, MetricDb},
+  schema::metrics,
 };
 
 use super::generic::*;
 
-impl RepositoryBase for MetricDb {}
+impl RepositoryBase for MetricDb {
+  fn get_columns<'a>(
+  ) -> std::collections::HashMap<&'a str, (ColumnType, &'a str)> {
+    std::collections::HashMap::from([
+      ("key", (ColumnType::Uuid, "metrics.key")),
+      ("node_name", (ColumnType::Text, "metrics.node_name")),
+      ("kind", (ColumnType::Text, "metrics.kind")),
+      ("data", (ColumnType::Json, "metrics.data")),
+      // ("created_at", (ColumnType::Timestamp, "metrics.created_at")),
+    ])
+  }
+}
 
 impl RepositoryCreate for MetricDb {}
 

diff --git a/bin/nanocld/src/repositories/namespace.rs b/bin/nanocld/src/repositories/namespace.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use diesel::prelude::*;
 
 use bollard_next::network::InspectNetworkOptions;
@@ -6,14 +8,21 @@ use nanocl_error::http::{HttpError, HttpResult};
 use nanocl_stubs::{generic::GenericFilter, namespace::NamespaceSummary};
 
 use crate::{
+  gen_sql_multiple, gen_sql_order_by, gen_sql_query,
   schema::namespaces,
-  gen_sql_multiple, gen_sql_where4string,
-  models::{CargoDb, NamespaceDb, ProcessDb, SystemState},
+  models::{CargoDb, ColumnType, NamespaceDb, ProcessDb, SystemState},
 };
 
 use super::generic::*;
 
-impl RepositoryBase for NamespaceDb {}
+impl RepositoryBase for NamespaceDb {
+  fn get_columns<'a>() -> HashMap<&'a str, (ColumnType, &'a str)> {
+    HashMap::from([
+      ("name", (ColumnType::Text, "namespaces.name")),
+      // ("created_at", (crate::models::ColumnType::Timestamp, "namespaces.created_at")),
+    ])
+  }
+}
 
 impl RepositoryCreate for NamespaceDb {}
 
@@ -34,11 +43,11 @@ impl RepositoryReadBy for NamespaceDb {
     diesel::pg::PgConnection,
     Self::Output,
   > {
-    let condition = filter.r#where.to_owned().unwrap_or_default();
-    let r#where = condition.conditions;
     let mut query = namespaces::table.into_boxed();
-    if let Some(name) = r#where.get("name") {
-      gen_sql_where4string!(query, namespaces::name, name);
+    let columns = Self::get_columns();
+    query = gen_sql_query!(query, filter, columns);
+    if let Some(orders) = &filter.order_by {
+      query = gen_sql_order_by!(query, orders, columns);
     }
     if is_multiple {
       gen_sql_multiple!(query, namespaces::created_at, filter);
@@ -51,13 +60,9 @@ impl RepositoryCountBy for NamespaceDb {
   fn gen_count_query(
     filter: &GenericFilter,
   ) -> impl diesel::query_dsl::LoadQuery<'static, diesel::PgConnection, i64> {
-    let condition = filter.r#where.to_owned().unwrap_or_default();
-    let r#where = condition.conditions;
     let mut query = namespaces::table.into_boxed();
-    if let Some(name) = r#where.get("name") {
-      gen_sql_where4string!(query, namespaces::name, name);
-    }
-    query.count()
+    let columns = Self::get_columns();
+    gen_sql_query!(query, filter, columns).count()
   }
 }