Fix examples

SeaQL · Aug 12, 2024 · eb671d8 · eb671d8
1 parent d1ad4a8
commit eb671d8
Show file tree

Hide file tree

Showing 12 changed files with 156 additions and 75 deletions.
diff --git a/examples/loco_example/src/bin/main.rs b/examples/loco_example/src/bin/main.rs
@@ -4,5 +4,6 @@ use todolist::app::App;
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
- cli::main::<App, Migrator>().await
+ cli::main::<App, Migrator>().await?;
+ Ok(())
 }
diff --git a/examples/loco_example/tests/tasks/seed.rs b/examples/loco_example/tests/tasks/seed.rs
@@ -13,7 +13,6 @@
 //! ```sh
 //! cargo run task seed_data refresh:true
 //! ```
-use std::collections::BTreeMap;
 
 use loco_rs::{db, prelude::*};
 use migration::Migrator;
@@ -29,8 +28,10 @@ impl Task for SeedData {
  detail: "Task for seeding data".to_string(),
  }
  }
- async fn run(&self, app_context: &AppContext, vars: &BTreeMap<String, String>) -> Result<()> {
- let refresh = vars.get("refresh").is_some_and(|refresh| refresh == "true");
+ async fn run(&self, app_context: &AppContext, vars: &task::Vars) -> Result<()> {
+ let refresh = vars
+ .cli_arg("refresh")
+ .is_ok_and(|refresh| refresh == "true");
 
  if refresh {
  db::reset::<Migrator>(&app_context.db).await?;

diff --git a/examples/loco_seaography/src/bin/main.rs b/examples/loco_seaography/src/bin/main.rs
@@ -4,5 +4,6 @@ use migration::Migrator;
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
- cli::main::<App, Migrator>().await
+ cli::main::<App, Migrator>().await?;
+ Ok(())
 }
diff --git a/examples/loco_seaography/src/models/users.rs b/examples/loco_seaography/src/models/users.rs
@@ -192,7 +192,7 @@ impl super::_entities::users::Model {
  ///
  /// when could not convert user claims to jwt token
  pub fn generate_jwt(&self, secret: &str, expiration: &u64) -> ModelResult<String> {
- Ok(jwt::JWT::new(secret).generate_token(expiration, self.pid.to_string())?)
+ Ok(jwt::JWT::new(secret).generate_token(expiration, self.pid.to_string(), None)?)
  }
 }
 

diff --git a/examples/loco_seaography/src/tasks/seed.rs b/examples/loco_seaography/src/tasks/seed.rs
@@ -13,7 +13,6 @@
 //! ```sh
 //! cargo run task seed_data refresh:true
 //! ```
-use std::collections::BTreeMap;
 
 use loco_rs::{db, prelude::*};
 use migration::Migrator;
@@ -31,8 +30,10 @@ impl Task for SeedData {
  }
  }
 
- async fn run(&self, app_context: &AppContext, vars: &BTreeMap<String, String>) -> Result<()> {
- let refresh = vars.get("refresh").is_some_and(|refresh| refresh == "true");
+ async fn run(&self, app_context: &AppContext, vars: &task::Vars) -> Result<()> {
+ let refresh = vars
+ .cli_arg("refresh")
+ .is_ok_and(|refresh| refresh == "true");
 
  if refresh {
  db::reset::<Migrator>(&app_context.db).await?;