fix pipeline

.env

@@ -0,0 +1 @@
+DATABASE_URL=postgres://emarconi:supa_password@localhost/todo

.github/workflows/general.yml

@@ -46,7 +46,7 @@ jobs:
           SKIP_DOCKER=true ./scripts/init_db.sh
       - name: Check sqlx-data.json is up-to-date
         run: |
-          cargo sqlx prepare --check -- --bin zero2prod
+          cargo sqlx prepare --database-url postgres://emarconi:supa_password@localhost/todo --check -- --all-targets
       - name: Run tests
         run: cargo test
 

.gitignore

@@ -1,4 +1,3 @@
 /target
 
-.env
 .session_secret

src/lib.rs

@@ -1,7 +1,7 @@
+pub mod routes;
+pub mod session;
 pub mod settings;
 pub mod startup;
 pub mod state;
 pub mod telemetry;
-pub mod routes;
-pub mod session;
-pub mod user;
+pub mod user;

src/main.rs

@@ -1,5 +1,5 @@
 use anyhow::Context;
-use coodo_be::{startup::Application, settings::get_settings, telemetry};
+use coodo_be::{settings::get_settings, startup::Application, telemetry};
 
 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> anyhow::Result<()> {

src/routes/mod.rs

@@ -5,6 +5,5 @@ use crate::state::AppState;
 mod session;
 
 pub fn router() -> Router<AppState> {
-    Router::new()
-        .merge(session::routes())
-}
+    Router::new().merge(session::routes())
+}

src/routes/session.rs

@@ -1,14 +1,13 @@
-use axum::{Router, Json};
+use axum::{Json, Router};
 use axum_sessions::extractors::WritableSession;
 use chrono::Duration;
 
-use crate::{user::User, state::AppState};
+use crate::{state::AppState, user::User};
 
 pub fn routes() -> Router<AppState> {
     use axum::routing::get;
 
-    Router::new()
-        .route("/session", get(get_session))
+    Router::new().route("/session", get(get_session))
 }
 
 #[tracing::instrument(skip_all, ret, name = "Get session")]

src/session.rs

@@ -1,9 +1,12 @@
 use axum::async_trait;
-use axum_sessions::{async_session::{self, Session, SessionStore}, SessionLayer};
+use axum_sessions::{
+    async_session::{self, Session, SessionStore},
+    SessionLayer,
+};
 use sqlx::{pool::PoolConnection, PgPool, Postgres};
 
 pub fn get_session_layer(db_pool: PgPool) -> SessionLayer<UserSessionStore> {
-    use axum_sessions::PersistencePolicy;    
+    use axum_sessions::PersistencePolicy;
 
     let (session_store, secret) = UserSessionStore::new(db_pool);
     SessionLayer::new(session_store, &secret)

src/startup.rs

@@ -3,7 +3,11 @@ use std::net::TcpListener;
 use axum::Router;
 use sqlx::PgPool;
 
-use crate::{settings::{Settings, DbSettings}, state::AppState, session::get_session_layer};
+use crate::{
+    session::get_session_layer,
+    settings::{DbSettings, Settings},
+    state::AppState,
+};
 
 pub type Server =
     hyper::Server<hyper::server::conn::AddrIncoming, axum::routing::IntoMakeService<Router>>;
@@ -22,7 +26,7 @@ impl Application {
             let address = format!("{}:{}", &settings.app.host, settings.app.port);
             TcpListener::bind(address)?
         };
-        
+
         let server = make_server(listener, db_pool.clone())?;
 
         Ok(Self {
@@ -38,13 +42,13 @@ impl Application {
     }
 }
 
-pub fn make_server(
-    listener: TcpListener,
-    db_pool: PgPool,
-) -> anyhow::Result<Server> {
-    use tower_http::{catch_panic::CatchPanicLayer, trace::{TraceLayer, self}};
-    use tracing::Level;
+pub fn make_server(listener: TcpListener, db_pool: PgPool) -> anyhow::Result<Server> {
     use anyhow::Context;
+    use tower_http::{
+        catch_panic::CatchPanicLayer,
+        trace::{self, TraceLayer},
+    };
+    use tracing::Level;
 
     let state = AppState::new(db_pool.clone());
     let router = Router::new()
@@ -53,7 +57,7 @@ pub fn make_server(
         .layer(
             TraceLayer::new_for_http()
                 .make_span_with(trace::DefaultMakeSpan::new().level(Level::INFO))
-                .on_response(trace::DefaultOnResponse::new().level(Level::INFO))
+                .on_response(trace::DefaultOnResponse::new().level(Level::INFO)),
         )
         .layer(get_session_layer(db_pool))
         .with_state(state);
@@ -71,4 +75,4 @@ pub fn get_db_pool(settings: &DbSettings) -> PgPool {
     PgPoolOptions::new()
         .acquire_timeout(Duration::from_secs(1))
         .connect_lazy_with(settings.with_db())
-}
+}

src/state.rs

@@ -1,4 +1,4 @@
-use sqlx::{PgPool, Postgres, pool::PoolConnection};
+use sqlx::{pool::PoolConnection, PgPool, Postgres};
 
 #[derive(Debug, Clone)]
 pub struct AppState {
@@ -13,4 +13,4 @@ impl AppState {
     pub async fn db_connection(&self) -> sqlx::Result<PoolConnection<Postgres>> {
         self.db_pool.acquire().await
     }
-} 
+}

src/user.rs

@@ -34,6 +34,12 @@ impl UserHandleGenerator {
     }
 }
 
+impl Default for UserHandleGenerator {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct UserHandle(String);
 

tests/api/helpers.rs

@@ -30,10 +30,10 @@ impl TestApp {
         let listener = TcpListener::bind("127.0.0.1:0").expect("Failed to bind random port");
         let port = listener.local_addr().unwrap().port();
         let address = format!("http://127.0.0.1:{}", port);
-        let server =
-            coodo_be::startup::make_server(listener, pool.clone()).expect("Failed to create server");
+        let server = coodo_be::startup::make_server(listener, pool.clone())
+            .expect("Failed to create server");
         let server_handle = tokio::spawn(server);
-        
+
         Self {
             address,
             port,
@@ -43,7 +43,8 @@ impl TestApp {
     }
 
     pub async fn get_user(&self, client: &mut Client) -> anyhow::Result<User> {
-        client.get(format!("{}/session", &self.address))
+        client
+            .get(format!("{}/session", &self.address))
             .send()
             .await
             .context("Failed to send GET /session")?
@@ -52,4 +53,3 @@ impl TestApp {
             .context("Failed to parse response body")
     }
 }
-