Fetch only necessary columns when checking subscription status

0rzech · Mar 20, 2024 · 5d08d19 · 5d08d19
1 parent 9342236
commit 5d08d19
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 67 deletions.
diff --git a/.sqlx/query-1069f360d74064043999fc569238737cc843ef22e810716875c29905e3268d25.json b/.sqlx/query-1069f360d74064043999fc569238737cc843ef22e810716875c29905e3268d25.json
diff --git a/.sqlx/query-9fa97d6ae7ce2c0a2a5ad18cf0a60123d6432c81b8e29cae0b7ed862adfffe8a.json b/.sqlx/query-9fa97d6ae7ce2c0a2a5ad18cf0a60123d6432c81b8e29cae0b7ed862adfffe8a.json
diff --git a/src/domain/mod.rs b/src/domain/mod.rs
@@ -1,13 +1,11 @@
 mod new_subscriber;
 mod subscriber_email;
 mod subscriber_name;
-mod subscription;
 mod subscription_status;
 mod subscription_token;
 
 pub use new_subscriber::NewSubscriber;
 pub use subscriber_email::SubscriberEmail;
 pub use subscriber_name::SubscriberName;
-pub use subscription::Subscription;
 pub use subscription_status::SubscriptionStatus;
 pub use subscription_token::{token_regex, SubscriptionToken};
diff --git a/src/domain/subscription.rs b/src/domain/subscription.rs
diff --git a/src/routes/subscriptions.rs b/src/routes/subscriptions.rs
@@ -1,8 +1,7 @@
 use crate::{
     app_state::AppState,
     domain::{
-        NewSubscriber, SubscriberEmail, SubscriberName, Subscription, SubscriptionStatus,
-        SubscriptionToken,
+        NewSubscriber, SubscriberEmail, SubscriberName, SubscriptionStatus, SubscriptionToken,
     },
     email_client::EmailClient,
 };
@@ -86,7 +85,8 @@ async fn get_subscription(
 ) -> Result<Option<Subscription>, anyhow::Error> {
     let query = sqlx::query!(
         r#"
-        SELECT * FROM subscriptions
+        SELECT id, status
+        FROM subscriptions
         WHERE email = $1
         "#,
         email.as_ref()
@@ -210,6 +210,13 @@ impl TryFrom<FormData> for NewSubscriber {
     }
 }
 
+#[derive(FromRow)]
+struct Subscription {
+    id: Uuid,
+    #[sqlx(try_from = "String")]
+    status: SubscriptionStatus,
+}
+
 #[derive(Template)]
 #[template(path = "welcome.html")]
 struct HtmlBodyTemplate<'a> {