fix: ticker format

This commit is contained in:
Elijah McMorris 2024-10-03 11:23:12 -07:00
parent 43da542d10
commit d7e708eaca
Signed by: NexVeridian
SSH key fingerprint: SHA256:bsA1SKZxuEcEVHAy3gY1HUeM5ykRJl0U0kQHQn0hMg8

View file

@ -85,7 +85,7 @@ impl Ticker {
if let Ok(x) = df if let Ok(x) = df
.clone() .clone()
.lazy() .lazy()
.with_columns(vec![when(col("ticker").eq(lit("MARKFORGEDG"))) .with_columns(vec![when(col("company").eq(lit("MARKFORGEDG")))
.then(lit("MKFG")) .then(lit("MKFG"))
.otherwise(col("ticker")) .otherwise(col("ticker"))
.alias("ticker")]) .alias("ticker")])
@ -106,14 +106,19 @@ impl Ticker {
.with_columns(Self::get_expr( .with_columns(Self::get_expr(
"company", "company",
"Cash & Cash Equivalents", "Cash & Cash Equivalents",
"CASH USD", "CASH_USD",
))
.with_columns(Self::get_expr(
"company",
"CASH & CASH EQUIVALENTS",
"CASH_USD",
)) ))
.with_columns(Self::get_expr( .with_columns(Self::get_expr(
"company", "company",
"GOLDMAN FS TRSY OBLIG INST 468", "GOLDMAN FS TRSY OBLIG INST 468",
"CASH USD", "CASH_USD",
)) ))
.with_columns(Self::get_expr("company", "Cash & Other", "CASH USD")) .with_columns(Self::get_expr("company", "Cash & Other", "CASH_USD"))
.collect() .collect()
{ {
df = x; df = x;
@ -134,7 +139,7 @@ mod tests {
#[case::mkfg( #[case::mkfg(
Ticker::MKFG, Ticker::MKFG,
defualt_df( defualt_df(
&[Some("MKFG"), Some("MARKFORGEDG")], &[Some("MKFG"), None::<&str>],
&[Some("MARKFORGEDG"), Some("MARKFORGEDG")], &[Some("MARKFORGEDG"), Some("MARKFORGEDG")],
)?, )?,
defualt_df( defualt_df(
@ -161,12 +166,12 @@ mod tests {
#[case::cash_usd( #[case::cash_usd(
Ticker::CASH_USD, Ticker::CASH_USD,
defualt_df( defualt_df(
&[None::<&str>, None::<&str>, Some("CASH&Other")], &[None::<&str>, None::<&str>, None::<&str>, Some("CASH&Other")],
&[Some("Cash & Cash Equivalents"), Some("GOLDMAN FS TRSY OBLIG INST 468"), Some("Cash & Other")], &[Some("Cash & Cash Equivalents"), Some("CASH & CASH EQUIVALENTS"), Some("GOLDMAN FS TRSY OBLIG INST 468"), Some("Cash & Other")],
)?, )?,
defualt_df( defualt_df(
&[Some("CASH USD"), Some("CASH USD"), Some("CASH USD")], &[Some("CASH_USD"), Some("CASH_USD"), Some("CASH_USD"), Some("CASH_USD")],
&[Some("CASH USD"), Some("CASH USD"), Some("CASH USD")], &[Some("CASH_USD"), Some("CASH_USD"), Some("CASH_USD"), Some("CASH_USD")],
)?, )?,
)] )]
fn matrix( fn matrix(