Skip to content
This repository was archived by the owner on Sep 30, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 116 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ license = "MIT"

[dependencies]
axum = { version = "0.8.4", features = ["tracing"] }
claims = "0.8.0"
config = "0.15.14"
dotenvy = "0.15.7"
secrecy = { version = "0.10.3", features = ["serde"] }
Expand All @@ -20,8 +21,12 @@ tower = "0.5.2"
tower-http = { version = "0.6.6", features = ["trace", "request-id"] }
tracing = "0.1.41"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
unicode-segmentation = "1.12.0"
url = { version = "2.5.7", features = ["serde"] }
validator = "0.20.0"

[dev-dependencies]
http-body-util = "0.1.3"
mime = "0.3.17"
fake = "4.4.0"
proptest = "1.7.0"
3 changes: 3 additions & 0 deletions src/domain/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
mod subscriber;

pub use subscriber::Subscriber;
65 changes: 65 additions & 0 deletions src/domain/subscriber/email.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
use validator::{ValidateEmail, ValidationError};

#[derive(Debug)]
pub struct SubscriberEmail(String);

impl AsRef<str> for SubscriberEmail {
fn as_ref(&self) -> &str {
&self.0
}
}

impl TryFrom<String> for SubscriberEmail {
type Error = validator::ValidationError;

fn try_from(value: String) -> Result<Self, Self::Error> {
match value.validate_email() {
true => Ok(Self(value)),
false => Err(ValidationError::new("INVALID_SUBSCRIBER_EMAIL")
.with_message(format!("Invalid subscriber email `{value}`").into())),
}
}
}

#[cfg(test)]
mod tests {
use super::SubscriberEmail;
use claims::assert_err;
use claims::assert_ok;
use fake::Fake;
use fake::faker::internet::en::SafeEmail;
use proptest::prelude::*;

#[test]
fn empty_string_is_rejected() {
let email = "".to_string();
assert_err!(SubscriberEmail::try_from(email));
}

#[test]
fn email_missing_at_symbol_is_rejected() {
let email = "ursuladomain.com".to_string();
assert_err!(SubscriberEmail::try_from(email));
}

#[test]
fn email_missing_subject_is_rejected() {
let email = "@domain.com".to_string();
assert_err!(SubscriberEmail::try_from(email));
}

prop_compose! {
fn valid_email_strategy()(email in any::<()>().prop_map(|_| SafeEmail().fake::<String>())) -> String {
email.to_string()
}
}

proptest! {
#[test]
fn test_valid_emails_are_accepted(email in valid_email_strategy()) {
dbg!(&email);

assert_ok!(SubscriberEmail::try_from(email));
}
}
}
46 changes: 46 additions & 0 deletions src/domain/subscriber/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
mod email;
mod name;

use crate::handlers::FormData;
use email::SubscriberEmail;
use name::SubscriberName;
use validator::ValidationErrors;

#[derive(Debug)]
pub struct Subscriber {
pub email: SubscriberEmail,
pub name: SubscriberName,
}

impl TryFrom<FormData> for Subscriber {
type Error = validator::ValidationErrors;

fn try_from(value: FormData) -> Result<Self, Self::Error> {
let mut errors = ValidationErrors::new();

let email: Option<SubscriberEmail> = match value.email.try_into() {
Ok(email) => Some(email),
Err(error) => {
errors.add("email", error);
None
}
};

let name: Option<SubscriberName> = match value.name.try_into() {
Ok(name) => Some(name),
Err(error) => {
errors.add("name", error);
None
}
};

if let Some(email) = email
&& let Some(name) = name
&& errors.is_empty()
{
Ok(Self { email, name })
} else {
Err(errors)
}
}
}
Loading
Loading