From 40c4757a07496333334a2348e440eaeb022d9e30 Mon Sep 17 00:00:00 2001
From: mace <safemind@posteo.net>
Date: Tue, 18 Apr 2023 19:21:37 +0200
Subject: [PATCH] renamed some stuff, added correct time crate

---
 Cargo.lock                          | 2 ++
 Cargo.toml                          | 1 +
 src/database/{database.rs => db.rs} | 2 +-
 src/database/mod.rs                 | 2 +-
 src/entity/filter_config.rs         | 3 ++-
 src/main.rs                         | 4 ++--
 src/repository/filter_repo.rs       | 2 +-
 src/service/filter_service.rs       | 6 +++---
 8 files changed, 13 insertions(+), 9 deletions(-)
 rename src/database/{database.rs => db.rs} (96%)

diff --git a/Cargo.lock b/Cargo.lock
index baabbdd..5256a94 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1241,6 +1241,7 @@ dependencies = [
  "log",
  "mysql",
  "sprintf",
+ "time",
 ]
 
 [[package]]
@@ -1584,6 +1585,7 @@ version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
 dependencies = [
+ "serde",
  "time-core",
  "time-macros",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 1a266e2..dbbb2fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,3 +12,4 @@ dotenv = "0.15.0"
 log = "0.4.17"
 mysql = "23.0.1"
 sprintf = "0.1.3"
+time = "0.3.20"
diff --git a/src/database/database.rs b/src/database/db.rs
similarity index 96%
rename from src/database/database.rs
rename to src/database/db.rs
index df3c75f..6f082a2 100644
--- a/src/database/database.rs
+++ b/src/database/db.rs
@@ -48,7 +48,7 @@ impl Db {
 
         let pool = match Pool::new(Opts::from_url(&url).unwrap()) {
             Ok(p) => p,
-            Err(e) => panic!("Cannot initialiaz pool: {e}"),
+            Err(e) => panic!("Cannot initialize pool: {e}"),
         };
         let conn: PooledConn = match pool.get_conn() {
             Ok(db) => db,
diff --git a/src/database/mod.rs b/src/database/mod.rs
index 8fd0a6b..dec1023 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -1 +1 @@
-pub mod database;
+pub mod db;
diff --git a/src/entity/filter_config.rs b/src/entity/filter_config.rs
index a5a7f4a..c849dc5 100644
--- a/src/entity/filter_config.rs
+++ b/src/entity/filter_config.rs
@@ -1,9 +1,10 @@
+use time::PrimitiveDateTime;
 #[derive(Debug, PartialEq)]
 pub struct FilterConfig {
     pub attribute: String,
     pub value1: String,
     pub value2: Option<String>,
     pub name: String,
-    pub upd_ts: mysql::Value,
+    pub upd_ts: PrimitiveDateTime,
 }
 
diff --git a/src/main.rs b/src/main.rs
index 42b723c..367946d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,6 @@
 use clap::Parser;
 use cli::cli::{Cli, Commands};
-use database::database::Db;
+use database::db::Db;
 use mysql::PooledConn;
 use service::{merchant_service, schema_service, filter_service};
 
@@ -24,7 +24,7 @@ fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
         },
         Commands::Filter { filter_id, config, all } => {
             if config {
-                filter_service::get_filter_configs(filter_id, &mut conn)
+                filter_service::get_filter_configs(&filter_id, &mut conn)
             } else {
                 filter_service::get_filter(&filter_id, all, &mut conn)
             }
diff --git a/src/repository/filter_repo.rs b/src/repository/filter_repo.rs
index 5e1fe4c..4261a58 100644
--- a/src/repository/filter_repo.rs
+++ b/src/repository/filter_repo.rs
@@ -26,7 +26,7 @@ pub fn find_by_id(filter_id: &usize, conn: &mut PooledConn) -> Result<Vec<Filter
 }
 
 pub fn find_filter_configs(
-    filter_id: usize,
+    filter_id: &usize,
     conn: &mut PooledConn,
 ) -> Result<Vec<FilterConfig>, mysql::Error> {
     let stat = conn
diff --git a/src/service/filter_service.rs b/src/service/filter_service.rs
index 1bcd937..8b9c774 100644
--- a/src/service/filter_service.rs
+++ b/src/service/filter_service.rs
@@ -22,7 +22,7 @@ pub fn get_filter(filter_id: &usize, all: bool, conn: &mut PooledConn) {
                 });
 
                 if all {
-                    get_filter_configs(*filter_id, conn)
+                    get_filter_configs(&*filter_id, conn)
                 } else {
                     println!("{}", "-".repeat(150));
                 }
@@ -32,7 +32,7 @@ pub fn get_filter(filter_id: &usize, all: bool, conn: &mut PooledConn) {
     };
 }
 
-pub fn get_filter_configs(filter_id: usize, conn: &mut PooledConn) {
+pub fn get_filter_configs(filter_id: &usize, conn: &mut PooledConn) {
     let result = filter_repo::find_filter_configs(filter_id, conn);
 
     match result {
@@ -49,7 +49,7 @@ pub fn get_filter_configs(filter_id: usize, conn: &mut PooledConn) {
                             filter_config.attribute,
                             filter_config.value1,
                             filter_config.value2.unwrap_or("n/a".to_string()),
-                            filter_config.upd_ts.as_sql(true),
+                            filter_config.upd_ts,
                             filter_config.name
                         );
                     });