insert subscription, db test isolation

This commit is contained in:
Andre Heber
2024-02-15 20:14:27 +01:00
parent bb94bde843
commit a0aa12872d
7 changed files with 90 additions and 41 deletions

View File

@ -22,17 +22,19 @@ impl DatabaseSettings {
self.username, self.password, self.host, self.port, self.database_name
)
}
pub fn connection_string_without_db(&self) -> String {
format!(
"postgres://{}:{}@{}:{}",
self.username, self.password, self.host, self.port
)
}
}
pub fn get_configuration() -> Result<Settings, config::ConfigError> {
// let mut settings = config::Config::default();
// settings.merge(config::File::with_name("configuration"))?;
// settings.try_into()
let settings = Config::builder()
.add_source(config::File::with_name("configuration"))
.build()?;
Ok(settings.try_deserialize()?)
settings.try_deserialize()
}

View File

@ -6,10 +6,10 @@ use zero2prod::startup::run;
#[tokio::main]
async fn main() -> std::io::Result<()> {
let config = get_configuration().expect("Failed to read configuration");
let connection = PgPoolOptions::new()
let connection_pool = PgPoolOptions::new()
.max_connections(10).connect(&config.database.connection_string()).await.expect("Failed to connect to Postgres.");
let address = format!("127.0.0.1:{}", config.application_port);
let listener = TcpListener::bind(address).expect("Failed to bind random port");
run(listener, connection)?.await
run(listener, connection_pool)?.await
}

View File

@ -1,5 +1,8 @@
use actix_web::{web, HttpResponse};
use serde::Deserialize;
use chrono::Utc;
use uuid::Uuid;
use sqlx::{query, Pool, Postgres};
#[derive(Deserialize)]
pub struct FormData {
@ -7,6 +10,23 @@ pub struct FormData {
pub name: String,
}
pub async fn subscribe(_form: web::Form<FormData>) -> HttpResponse {
HttpResponse::Ok().finish()
pub async fn subscribe(form: web::Form<FormData>, connection_pool: web::Data<Pool<Postgres>>) -> HttpResponse {
match query!(
r#"
INSERT INTO subscriptions (id, email, name, subscribed_at)
VALUES ($1, $2, $3, $4)
"#,
Uuid::new_v4(),
form.email,
form.name,
Utc::now()
)
.execute(connection_pool.get_ref())
.await {
Ok(_) => HttpResponse::Ok().finish(),
Err(e) => {
println!("Failed to execute query: {:?}", e);
HttpResponse::InternalServerError().finish()
}
}
}

View File

@ -5,13 +5,13 @@ use std::net::TcpListener;
use crate::routes::{health_check, subscribe};
pub fn run(listener: TcpListener, connection: Pool<Postgres>) -> Result<Server, std::io::Error> {
let connection = web::Data::new(connection);
pub fn run(listener: TcpListener, connection_pool: Pool<Postgres>) -> Result<Server, std::io::Error> {
let connection_pool = web::Data::new(connection_pool);
let server = HttpServer::new(move || {
App::new()
.route("/health_check", web::get().to(health_check))
.route("/subscriptions", web::post().to(subscribe))
.app_data(connection.clone())
.app_data(connection_pool.clone())
})
.listen(listener)?
.run();