mirrors/zero-to-production
1
0
Fork 0
mirror of https://github.com/LukeMathWalker/zero-to-production.git synced 2024-12-18 14:06:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure consistency of variable naming.

Browse source
This commit is contained in:
LukeMathWalker 2020-10-18 14:35:08 +01:00
parent 1a4ead9b74
commit d21c36f74f
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chapter03-1/src/routes/subscriptions.rs
View file

@ -10,7 +10,7 @@ pub struct FormData {
} }
pub async fn subscribe( pub async fn subscribe(
payload: web::Form<FormData>, form: web::Form<FormData>,
pool: web::Data<PgPool>, pool: web::Data<PgPool>,
) -> Result<HttpResponse, HttpResponse> { ) -> Result<HttpResponse, HttpResponse> {
sqlx::query!( sqlx::query!(
@ -19,8 +19,8 @@ pub async fn subscribe(
VALUES ($1, $2, $3, $4) VALUES ($1, $2, $3, $4)
"#, "#,
Uuid::new_v4(), Uuid::new_v4(),
payload.email, form.email,
payload.name, form.name,
Utc::now() Utc::now()
) )
.execute(pool.as_ref()) .execute(pool.as_ref())

18
chapter04/src/routes/subscriptions.rs
View file

@ -11,17 +11,17 @@ pub struct FormData {
#[tracing::instrument( #[tracing::instrument(
name = "Adding a new subscriber", name = "Adding a new subscriber",
skip(payload, pool), skip(form, pool),
fields( fields(
email = %payload.email, email = %form.email,
name = %payload.name name = %form.name
) )
)] )]
pub async fn subscribe( pub async fn subscribe(
payload: web::Form<FormData>, form: web::Form<FormData>,
pool: web::Data<PgPool>, pool: web::Data<PgPool>,
) -> Result<HttpResponse, HttpResponse> { ) -> Result<HttpResponse, HttpResponse> {
insert_subscriber(&pool, &payload) insert_subscriber(&pool, &form)
.await .await
.map_err(|_| HttpResponse::InternalServerError().finish())?; .map_err(|_| HttpResponse::InternalServerError().finish())?;
Ok(HttpResponse::Ok().finish()) Ok(HttpResponse::Ok().finish())
@ -29,17 +29,17 @@ pub async fn subscribe(
#[tracing::instrument( #[tracing::instrument(
name = "Saving new subscriber details in the database", name = "Saving new subscriber details in the database",
skip(payload, pool) skip(form, pool)
)] )]
pub async fn insert_subscriber(pool: &PgPool, payload: &FormData) -> Result<(), sqlx::Error> { pub async fn insert_subscriber(pool: &PgPool, form: &FormData) -> Result<(), sqlx::Error> {
sqlx::query!( sqlx::query!(
r#" r#"
INSERT INTO subscriptions (id, email, name, subscribed_at) INSERT INTO subscriptions (id, email, name, subscribed_at)
VALUES ($1, $2, $3, $4) VALUES ($1, $2, $3, $4)
"#, "#,
Uuid::new_v4(), Uuid::new_v4(),
payload.email, form.email,
payload.name, form.name,
Utc::now() Utc::now()
) )
.execute(pool) .execute(pool)