Skip to content

Commit

Permalink
add user db connection
Browse files Browse the repository at this point in the history
  • Loading branch information
LimpidCrypto committed Feb 28, 2024
1 parent 1caa3d6 commit 3cb4b34
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ POSTGRES_PASSWORD=limpid
DATABASE_URL=postgres://limpid:limpid@db:5432/lc_api
REDIS_URL=redis://redis:6379
MAILER_HOST=mailer
USER_DATABASE_URL=postgres://limpid:limpid@491994aaca7e:5432/lc_users
USER_DATABASE_URL=postgres://limpid:limpid@491994aaca7e:5432/lc_user
32 changes: 18 additions & 14 deletions src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,24 @@ impl Hooks for App {
}

async fn after_routes(router: axum::Router, _ctx: &AppContext) -> Result<axum::Router> {
let uri: &str = env!("DATABASE_URL");
let user_db_config = Database {
uri: uri.to_string(),
enable_logging: false,
min_connections: 2,
max_connections: 10,
connect_timeout: 500,
idle_timeout: 500,
auto_migrate: false,
dangerously_truncate: false,
dangerously_recreate: false,
};
let user_db = db::connect(&user_db_config).await?;
let user_db_uri: Option<&str> = option_env!("USER_DATABASE_URL");
if let Some(uri) = user_db_uri {
let user_db_config = Database {
uri: uri.to_string(),
enable_logging: false,
min_connections: 2,
max_connections: 10,
connect_timeout: 500,
idle_timeout: 500,
auto_migrate: false,
dangerously_truncate: false,
dangerously_recreate: false,
};
let user_db = db::connect(&user_db_config).await?;

Ok(router.layer(Extension(user_db)))
Ok(router.layer(Extension(user_db)))
} else {
Ok(router)
}
}
}
2 changes: 1 addition & 1 deletion src/bin/main.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use loco_rs::cli;
use lc_api_template::app::App;
use loco_rs::cli;
use migration::Migrator;

#[tokio::main]
Expand Down
5 changes: 0 additions & 5 deletions src/controllers/notes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,7 @@ pub async fn list(
auth: auth::JWT,
Extension(user_db): Extension<DatabaseConnection>,
) -> Result<Json<Vec<Model>>> {
dbg!(auth.claims.pid.clone());
dbg!(user_db.clone());
let u = users::Model::find_by_email(&user_db, "[email protected]").await?;
dbg!(u);
let user = users::Model::find_by_pid(&user_db, &auth.claims.pid).await?;

Check warning on line 35 in src/controllers/notes.rs

View workflow job for this annotation

GitHub Actions / Run Tests

unused variable: `user`

Check failure on line 35 in src/controllers/notes.rs

View workflow job for this annotation

GitHub Actions / Run Clippy

unused variable: `user`
dbg!(user);
format::json(Entity::find().all(&ctx.db).await?)
}

Expand Down

0 comments on commit 3cb4b34

Please sign in to comment.