renamed some stuff, added correct time crate

main
Mathias Rothenhaeusler 2023-04-18 19:21:37 +02:00
parent 448ecbc0c0
commit 40c4757a07
8 changed files with 13 additions and 9 deletions

2
Cargo.lock generated
View File

@ -1241,6 +1241,7 @@ dependencies = [
"log", "log",
"mysql", "mysql",
"sprintf", "sprintf",
"time",
] ]
[[package]] [[package]]
@ -1584,6 +1585,7 @@ version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
dependencies = [ dependencies = [
"serde",
"time-core", "time-core",
"time-macros", "time-macros",
] ]

View File

@ -12,3 +12,4 @@ dotenv = "0.15.0"
log = "0.4.17" log = "0.4.17"
mysql = "23.0.1" mysql = "23.0.1"
sprintf = "0.1.3" sprintf = "0.1.3"
time = "0.3.20"

View File

@ -48,7 +48,7 @@ impl Db {
let pool = match Pool::new(Opts::from_url(&url).unwrap()) { let pool = match Pool::new(Opts::from_url(&url).unwrap()) {
Ok(p) => p, Ok(p) => p,
Err(e) => panic!("Cannot initialiaz pool: {e}"), Err(e) => panic!("Cannot initialize pool: {e}"),
}; };
let conn: PooledConn = match pool.get_conn() { let conn: PooledConn = match pool.get_conn() {
Ok(db) => db, Ok(db) => db,

View File

@ -1 +1 @@
pub mod database; pub mod db;

View File

@ -1,9 +1,10 @@
use time::PrimitiveDateTime;
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub struct FilterConfig { pub struct FilterConfig {
pub attribute: String, pub attribute: String,
pub value1: String, pub value1: String,
pub value2: Option<String>, pub value2: Option<String>,
pub name: String, pub name: String,
pub upd_ts: mysql::Value, pub upd_ts: PrimitiveDateTime,
} }

View File

@ -1,6 +1,6 @@
use clap::Parser; use clap::Parser;
use cli::cli::{Cli, Commands}; use cli::cli::{Cli, Commands};
use database::database::Db; use database::db::Db;
use mysql::PooledConn; use mysql::PooledConn;
use service::{merchant_service, schema_service, filter_service}; 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 } => { Commands::Filter { filter_id, config, all } => {
if config { if config {
filter_service::get_filter_configs(filter_id, &mut conn) filter_service::get_filter_configs(&filter_id, &mut conn)
} else { } else {
filter_service::get_filter(&filter_id, all, &mut conn) filter_service::get_filter(&filter_id, all, &mut conn)
} }

View File

@ -26,7 +26,7 @@ pub fn find_by_id(filter_id: &usize, conn: &mut PooledConn) -> Result<Vec<Filter
} }
pub fn find_filter_configs( pub fn find_filter_configs(
filter_id: usize, filter_id: &usize,
conn: &mut PooledConn, conn: &mut PooledConn,
) -> Result<Vec<FilterConfig>, mysql::Error> { ) -> Result<Vec<FilterConfig>, mysql::Error> {
let stat = conn let stat = conn

View File

@ -22,7 +22,7 @@ pub fn get_filter(filter_id: &usize, all: bool, conn: &mut PooledConn) {
}); });
if all { if all {
get_filter_configs(*filter_id, conn) get_filter_configs(&*filter_id, conn)
} else { } else {
println!("{}", "-".repeat(150)); 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); let result = filter_repo::find_filter_configs(filter_id, conn);
match result { match result {
@ -49,7 +49,7 @@ pub fn get_filter_configs(filter_id: usize, conn: &mut PooledConn) {
filter_config.attribute, filter_config.attribute,
filter_config.value1, filter_config.value1,
filter_config.value2.unwrap_or("n/a".to_string()), filter_config.value2.unwrap_or("n/a".to_string()),
filter_config.upd_ts.as_sql(true), filter_config.upd_ts,
filter_config.name filter_config.name
); );
}); });