fixing bug in pidgtm compile (#55)

* fixing bug in pidgtm compile

Signed-off-by: danbugs <[email protected]>

* fix && fmt

Signed-off-by: danbugs <[email protected]>

---------

Signed-off-by: danbugs <[email protected]>

lib/Cargo.toml

@@ -11,11 +11,11 @@ test = false
 [dependencies]
 anyhow = "1"
 tracing = "0.1"
+tracing-subscriber = "0.3"
 diesel = { version = "1.4", features = ["postgres"] }
 smithe_database = { path = "../database" }
 startgg = { path = "../startgg_api" }
 ctrlc = "3.2"
 as-any = "0.3"
 tokio = { version = "1.1", features = [ "rt", "macros" ] }
-tracing-test = "0.2"
 chrono = "0.4"

lib/src/common.rs

@@ -1,6 +1,8 @@
 #![allow(unused)]
 
 use anyhow::Result;
+use tracing::Level;
+use tracing_subscriber::FmtSubscriber;
 
 use std::{
     future::Future,
@@ -13,6 +15,16 @@ use std::{
     time::{Duration, Instant},
 };
 
+pub fn init_logger() -> Result<()> {
+    let subscriber = FmtSubscriber::builder()
+        .with_max_level(Level::INFO)
+        .finish();
+
+    tracing::subscriber::set_global_default(subscriber)?;
+
+    Ok(())
+}
+
 use startgg::{GQLData, GQLVars};
 
 #[allow(clippy::too_many_arguments)]

lib/src/player.rs

@@ -343,17 +343,31 @@ where
             // we want to panic regardless
         }
 
-        insert_into(player_games)
-            .values(curated_games)
-            .execute(&db_connection)?;
+        for g in curated_games {
+            let res = insert_into(player_games).values(g).execute(&db_connection);
 
-        insert_into(player_sets)
-            .values(curated_sets)
-            .execute(&db_connection)?;
+            if let Err(e) = res {
+                tracing::error!("🚨 error inserting game into db: {}", e);
+            }
+        }
+
+        for s in curated_sets {
+            let res = insert_into(player_sets).values(s).execute(&db_connection);
 
-        insert_into(player_tournaments)
-            .values(curated_tournaments)
-            .execute(&db_connection)?;
+            if let Err(e) = res {
+                tracing::error!("🚨 error inserting set into db: {}", e);
+            }
+        }
+
+        for t in curated_tournaments {
+            let res = insert_into(player_tournaments)
+                .values(t)
+                .execute(&db_connection);
+
+            if let Err(e) = res {
+                tracing::error!("🚨 error inserting tournament into db: {}", e);
+            }
+        }
 
         Ok(false)
     }

lib/src/tournament.rs

@@ -128,14 +128,15 @@ pub fn is_tournament_cached(player_id: i32, s: &SGGSet) -> Result<bool> {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use tracing_test::traced_test;
 
-    const DANTOTTO_PLAYER_ID: i32 = 1178271;
+    use crate::common::init_logger;
+
+    const HUNGRYBOX_PLAYER_ID: i32 = 1004;
 
-    #[traced_test]
     #[tokio::test]
     async fn get_tournaments_from_requester_id_test() -> Result<()> {
-        let _ = super::get_tournaments_from_requester_id(DANTOTTO_PLAYER_ID).await?;
+        init_logger()?;
+        let _ = super::get_tournaments_from_requester_id(HUNGRYBOX_PLAYER_ID).await?;
         Ok(())
     }
 }

src/bin/pidgtm.rs

@@ -2,11 +2,10 @@ use std::env;
 
 use anyhow::Result;
 use clap::{Parser, Subcommand};
+use smithe_lib::common::init_logger;
 use smithereens::pidgtm::{
     compile::handle_compile, inspect::handle_inspect, map::handle_map, update::handle_update,
 };
-use tracing::Level;
-use tracing_subscriber::FmtSubscriber;
 
 /// pidgtm stands for "player id to gamer tag mapper". This is a CLI that allows
 /// direct user access to the engine that powers searching players by name.
@@ -43,11 +42,7 @@ enum Commands {
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
-
-    tracing::subscriber::set_global_default(subscriber)?;
+    init_logger()?;
 
     let cli = Cli::parse();
 

src/bin/smithe.rs

@@ -1,7 +1,6 @@
 use anyhow::Result;
+use smithe_lib::common::init_logger;
 use std::str::FromStr;
-use tracing::Level;
-use tracing_subscriber::FmtSubscriber;
 
 use clap::{Parser, Subcommand};
 use smithereens::smithe::{event::handle_event, player::handle_player};
@@ -32,11 +31,8 @@ enum Commands {
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    let subscriber = FmtSubscriber::builder()
-        .with_max_level(Level::INFO)
-        .finish();
+    init_logger()?;
 
-    tracing::subscriber::set_global_default(subscriber)?;
     let cli = Cli::parse();
 
     match &cli.command {