mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-04 09:28:11 +00:00
cleanup
This commit is contained in:
Brandon Thomas committed
1 parent
2467d6f2c7
commit
5f3399db62
15 files changed
+30
-398
No files matched your search
-6
@@ -1,16 +1,10 @@
|
||||
use actix_web::web::{Bytes, Data, Json};
|
||||
use actix_web::{web, HttpRequest, HttpResponse};
|
||||
|
||||
use crate::endpoints::webhook::webhook_event_handlers::charge::charge_succeeded_handler::charge_succeeded_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::checkout_session::checkout_session_completed_handler::checkout_session_completed_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::customer::customer_created_handler::customer_created_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::customer::customer_deleted_handler::customer_deleted_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::customer::customer_updated_handler::customer_updated_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::customer_subscription::customer_subscription_created_handler::customer_subscription_created_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::invoice::invoice_paid_handler::invoice_paid_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::invoice::invoice_payment_failed::invoice_payment_failed_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::invoice::invoice_payment_succeeded_handler::invoice_payment_succeeded_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::invoice::invoice_updated_handler::invoice_updated_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::payment_intent::payment_intent_succeeded_handler::payment_intent_succeeded_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_error::StripeArtcraftWebhookError;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_summary::StripeArtcraftWebhookSummary;
|
||||
|
||||
-30
@@ -1,30 +0,0 @@
|
||||
use crate::configs::stripe_artcraft_metadata_keys::STRIPE_ARTCRAFT_METADATA_USER_TOKEN;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_error::StripeArtcraftWebhookError;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_summary::StripeArtcraftWebhookSummary;
|
||||
use crate::utils::expand_ids::expand_customer_id::expand_customer_id;
|
||||
use stripe_shared::Charge;
|
||||
|
||||
// Handle event type: 'charge.succeeded'
|
||||
pub fn charge_succeeded_handler(charge: &Charge) -> Result<StripeArtcraftWebhookSummary, StripeArtcraftWebhookError> {
|
||||
let charge_id = charge.id.to_string();
|
||||
|
||||
let charge_status = charge.status;
|
||||
|
||||
// NB: We'll need this to send them to the "customer portal", which is how they can modify
|
||||
// or cancel their subscriptions.
|
||||
let maybe_stripe_customer_id = charge.customer
|
||||
.as_ref()
|
||||
.map(|c| expand_customer_id(c));
|
||||
|
||||
// NB: Our internal user token.
|
||||
let maybe_user_token = charge.metadata.get(STRIPE_ARTCRAFT_METADATA_USER_TOKEN)
|
||||
.map(|t| t.to_string());
|
||||
|
||||
Ok(StripeArtcraftWebhookSummary {
|
||||
maybe_user_token,
|
||||
maybe_event_entity_id: Some(charge_id),
|
||||
maybe_stripe_customer_id,
|
||||
action_was_taken: false,
|
||||
should_ignore_retry: false,
|
||||
})
|
||||
}
|
||||
-1
@@ -1 +0,0 @@
|
||||
pub(crate) mod charge_succeeded_handler;
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
use crate::configs::stripe_artcraft_metadata_keys::STRIPE_ARTCRAFT_METADATA_USER_TOKEN;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_error::StripeArtcraftWebhookError;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_summary::StripeArtcraftWebhookSummary;
|
||||
use stripe_core::Customer;
|
||||
|
||||
// Handle event type: 'customer.created'
|
||||
pub fn customer_created_handler(customer: &Customer) -> Result<StripeArtcraftWebhookSummary, StripeArtcraftWebhookError> {
|
||||
|
||||
// NB: We'll need this to send them to the "customer portal", which is how they can modify
|
||||
// or cancel their subscriptions.
|
||||
let customer_id = customer.id.to_string();
|
||||
|
||||
// NB: Our internal user token.
|
||||
let maybe_user_token = customer.metadata
|
||||
.as_ref()
|
||||
.and_then(|m| m.get(STRIPE_ARTCRAFT_METADATA_USER_TOKEN).map(|t| t.to_string()));
|
||||
|
||||
Ok(StripeArtcraftWebhookSummary {
|
||||
maybe_user_token,
|
||||
maybe_event_entity_id: Some(customer_id.clone()),
|
||||
maybe_stripe_customer_id: Some(customer_id.clone()),
|
||||
action_was_taken: false,
|
||||
should_ignore_retry: false,
|
||||
})
|
||||
}
|
||||
-24
@@ -1,24 +0,0 @@
|
||||
use crate::configs::stripe_artcraft_metadata_keys::STRIPE_ARTCRAFT_METADATA_USER_TOKEN;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_error::StripeArtcraftWebhookError;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_summary::StripeArtcraftWebhookSummary;
|
||||
use stripe_core::Customer;
|
||||
|
||||
// Handle event type: 'customer.deleted'
|
||||
pub fn customer_deleted_handler(customer: &Customer) -> Result<StripeArtcraftWebhookSummary, StripeArtcraftWebhookError> {
|
||||
// NB: We'll need this to send them to the "customer portal", which is how they can modify
|
||||
// or cancel their subscriptions.
|
||||
let customer_id = customer.id.to_string();
|
||||
|
||||
// NB: Our internal user token.
|
||||
let maybe_user_token = customer.metadata
|
||||
.as_ref()
|
||||
.and_then(|m| m.get(STRIPE_ARTCRAFT_METADATA_USER_TOKEN).map(|t| t.to_string()));
|
||||
|
||||
Ok(StripeArtcraftWebhookSummary {
|
||||
maybe_user_token,
|
||||
maybe_event_entity_id: Some(customer_id.clone()),
|
||||
maybe_stripe_customer_id: Some(customer_id.clone()),
|
||||
action_was_taken: false,
|
||||
should_ignore_retry: false,
|
||||
})
|
||||
}
|
||||
-24
@@ -1,24 +0,0 @@
|
||||
use crate::configs::stripe_artcraft_metadata_keys::STRIPE_ARTCRAFT_METADATA_USER_TOKEN;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_error::StripeArtcraftWebhookError;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_summary::StripeArtcraftWebhookSummary;
|
||||
use stripe_core::Customer;
|
||||
|
||||
// Handle event type: 'customer.updated'
|
||||
pub fn customer_updated_handler(customer: &Customer) -> Result<StripeArtcraftWebhookSummary, StripeArtcraftWebhookError> {
|
||||
// NB: We'll need this to send them to the "customer portal", which is how they can modify
|
||||
// or cancel their subscriptions.
|
||||
let customer_id = customer.id.to_string();
|
||||
|
||||
// NB: Our internal user token.
|
||||
let maybe_user_token = customer.metadata
|
||||
.as_ref()
|
||||
.and_then(|m| m.get(STRIPE_ARTCRAFT_METADATA_USER_TOKEN).map(|t| t.to_string()));
|
||||
|
||||
Ok(StripeArtcraftWebhookSummary {
|
||||
maybe_user_token,
|
||||
maybe_event_entity_id: Some(customer_id.clone()),
|
||||
maybe_stripe_customer_id: Some(customer_id.clone()),
|
||||
action_was_taken: false,
|
||||
should_ignore_retry: false,
|
||||
})
|
||||
}
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
pub(crate) mod customer_created_handler;
|
||||
pub(crate) mod customer_deleted_handler;
|
||||
pub(crate) mod customer_updated_handler;
|
||||
-6
@@ -1,16 +1,10 @@
|
||||
use crate::endpoints::webhook::webhook_event_handlers::charge::charge_succeeded_handler::charge_succeeded_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::checkout_session::checkout_session_completed_handler::checkout_session_completed_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::customer::customer_created_handler::customer_created_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::customer::customer_deleted_handler::customer_deleted_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::customer::customer_updated_handler::customer_updated_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::customer_subscription::customer_subscription_created_handler::customer_subscription_created_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::customer_subscription::customer_subscription_deleted_handler::customer_subscription_deleted_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::customer_subscription::customer_subscription_updated_handler::customer_subscription_updated_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::ignore_known_unwanted_events::ignore_known_unwanted_events;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::invoice::invoice_paid_handler::invoice_paid_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::invoice::invoice_payment_failed::invoice_payment_failed_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::invoice::invoice_payment_succeeded_handler::invoice_payment_succeeded_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::invoice::invoice_updated_handler::invoice_updated_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::payment_intent::payment_intent_succeeded_handler::payment_intent_succeeded_handler;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_error::StripeArtcraftWebhookError;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_summary::StripeArtcraftWebhookSummary;
|
||||
|
||||
-1
@@ -1,7 +1,6 @@
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_summary::StripeArtcraftWebhookSummary;
|
||||
use log::info;
|
||||
use stripe_webhook::{Event, EventObject};
|
||||
use crate::endpoints::webhook::webhook_event_handlers::invoice::invoice_payment_succeeded_handler::invoice_payment_succeeded_handler;
|
||||
|
||||
// Returns a response if we know we want to ignore this event type.
|
||||
// This serves primarily as documentation for why we're ignoring certain events.
|
||||
|
||||
+24
-204
@@ -1,9 +1,14 @@
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_error::StripeArtcraftWebhookError;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_summary::StripeArtcraftWebhookSummary;
|
||||
use stripe_shared::Invoice;
|
||||
use crate::utils::expand_ids::expand_customer_id::expand_customer_id;
|
||||
use crate::utils::expand_ids::expand_subscription_id::expand_subscription_id;
|
||||
use stripe_shared::{Invoice, InvoiceStatus};
|
||||
|
||||
// Handle event type: 'invoice.paid'
|
||||
// // https://stripe.com/docs/billing/subscriptions/webhooks :
|
||||
//
|
||||
// Invoices are generated for subscriptions, not one-off charges and purchases.
|
||||
//
|
||||
// https://stripe.com/docs/billing/subscriptions/webhooks :
|
||||
//
|
||||
// Sent when the invoice is successfully paid. You can provision access to your product when you
|
||||
// receive this event and the subscription `status` is `active`.
|
||||
@@ -18,17 +23,24 @@ use stripe_shared::Invoice;
|
||||
// appropriate date in the future (plus a day or two for leeway).
|
||||
//
|
||||
pub fn invoice_paid_handler(invoice: &Invoice) -> Result<StripeArtcraftWebhookSummary, StripeArtcraftWebhookError> {
|
||||
|
||||
// NB: The original FakeYou code had a lot of logic, but apepars to have been a no-op
|
||||
|
||||
// let maybe_invoice_details = invoice_paid_extractor(invoice)
|
||||
// .map_err(|err| {
|
||||
// let reason = format!("Error extracting invoice details from 'invoice.paid' payload: {:?}", err);
|
||||
// error!("{}", reason);
|
||||
// StripeArtcraftWebhookError::ServerError(reason)
|
||||
// })?;
|
||||
|
||||
// // TODO
|
||||
let is_paid = match invoice.status {
|
||||
Some(InvoiceStatus::Paid) => true,
|
||||
_ => false,
|
||||
};
|
||||
|
||||
let is_production= invoice.livemode;
|
||||
|
||||
let paid_status = invoice.status;
|
||||
|
||||
let maybe_stripe_customer_id = invoice.customer
|
||||
.as_ref()
|
||||
.map(|c| expand_customer_id(c));
|
||||
|
||||
let maybe_stripe_subscription_id = invoice.subscription
|
||||
.as_ref()
|
||||
.map(|s| expand_subscription_id(s));
|
||||
|
||||
Ok(StripeArtcraftWebhookSummary {
|
||||
maybe_user_token: None,
|
||||
maybe_event_entity_id: None,
|
||||
@@ -37,195 +49,3 @@ pub fn invoice_paid_handler(invoice: &Invoice) -> Result<StripeArtcraftWebhookSu
|
||||
should_ignore_retry: false,
|
||||
})
|
||||
}
|
||||
|
||||
// /// If we determine a subscription needs update, this is the struct we produce.
|
||||
// /// This should be easily unit testable.
|
||||
// pub struct SubscriptionDetails {
|
||||
// // Internal user token (not Stripe)
|
||||
// pub user_token: Option<String>,
|
||||
//
|
||||
// pub stripe_is_production: bool,
|
||||
//
|
||||
// pub stripe_invoice_id: String,
|
||||
//
|
||||
// pub stripe_customer_id: Option<String>,
|
||||
// pub stripe_subscription_id: Option<String>,
|
||||
// pub stripe_product_id: Option<String>,
|
||||
// pub stripe_price_id: Option<String>,
|
||||
//
|
||||
// pub subscription_is_active: bool,
|
||||
//
|
||||
// pub billed_at: DateTime<Utc>,
|
||||
//
|
||||
// /// Tell the update handler how many days in the future to set the plan.
|
||||
// pub subscription_interval: SubscriptionInterval,
|
||||
//
|
||||
// /// Calculated from interval
|
||||
// pub subscription_expires_at: DateTime<Utc>,
|
||||
// }
|
||||
//
|
||||
// /// If we determine a product was paid for, this is the struct we produce.
|
||||
// /// This should be easily unit testable.
|
||||
// pub struct ProductDetails {
|
||||
// pub user_token: Option<String>,
|
||||
//
|
||||
// pub stripe_customer_id: Option<String>,
|
||||
// pub stripe_product_id: Option<String>,
|
||||
// }
|
||||
//
|
||||
// /// For now we only handle one singular item at a time.
|
||||
// /// (Technically this can handle many products and subscriptions at once.)
|
||||
// pub enum InvoicePaidDetails {
|
||||
// Subscription(SubscriptionDetails),
|
||||
// Product(ProductDetails),
|
||||
// }
|
||||
|
||||
// fn invoice_paid_extractor(invoice: &Invoice) -> AnyhowResult<Option<InvoicePaidDetails>> {
|
||||
// match invoice.status {
|
||||
// Some(InvoiceStatus::Paid) => {}
|
||||
// _ => {
|
||||
// return Ok(None);
|
||||
// },
|
||||
// }
|
||||
//
|
||||
// let invoice_id = invoice.id.to_string();
|
||||
// let is_production= invoice.livemode;
|
||||
//
|
||||
// let paid_status = invoice.status;
|
||||
//
|
||||
// let maybe_stripe_customer_id = invoice.customer
|
||||
// .as_ref()
|
||||
// .map(|c| expand_customer_id(c));
|
||||
//
|
||||
// let maybe_stripe_subscription_id = invoice.subscription
|
||||
// .as_ref()
|
||||
// .map(|s| expand_subscription_id(s));
|
||||
//
|
||||
// // TODO: We only handle a single line item for now.
|
||||
// let line_item = match invoice.lines.data.first() {
|
||||
// None => return Ok(None),
|
||||
// Some(line_item) => line_item,
|
||||
// };
|
||||
//
|
||||
// //let paid_details = match line_item.type_ {
|
||||
// // InvoiceLineItemType::InvoiceItem => {
|
||||
// // return Ok(None); // TODO: Handle one-time payments.
|
||||
// // }
|
||||
// // InvoiceLineItemType::Subscription => {
|
||||
// // let maybe_subscription_id = line_item.subscription
|
||||
// // .as_ref().map(|s| expand_subscription_id(s));
|
||||
// // let maybe_product_id = line_item.price
|
||||
// // .as_ref()
|
||||
// // .and_then(|price| price.product.as_ref())
|
||||
// // .map(|product| expand_product_id(product));
|
||||
// // let maybe_price_id = line_item.price
|
||||
// // .as_ref()
|
||||
// // .map(|price| price.id.to_string());
|
||||
// // // NB: Internal user token (non-stripe)
|
||||
// // let maybe_user_token = line_item.metadata.get(STRIPE_ARTCRAFT_METADATA_USER_TOKEN)
|
||||
// // .map(|d| d.to_string());
|
||||
// // InvoicePaidDetails::Subscription(SubscriptionDetails {
|
||||
// // user_token: maybe_user_token,
|
||||
// // stripe_is_production: is_production,
|
||||
// // stripe_invoice_id: invoice_id,
|
||||
// // stripe_customer_id: maybe_stripe_customer_id,
|
||||
// // stripe_subscription_id: maybe_subscription_id,
|
||||
// // stripe_product_id: maybe_product_id,
|
||||
// // stripe_price_id: maybe_price_id,
|
||||
// // subscription_is_active: false,
|
||||
// // billed_at: Utc::now(),
|
||||
// // subscription_interval: Default::default(),
|
||||
// // subscription_expires_at: Utc::now(),
|
||||
// // })
|
||||
// // }
|
||||
// //};
|
||||
//
|
||||
//
|
||||
// /*
|
||||
// let maybe_subscription_id = line_item.subscription
|
||||
// .as_ref().map(|s| expand_subscription_id(s));
|
||||
//
|
||||
// let maybe_product_id = line_item.price
|
||||
// .as_ref()
|
||||
// .and_then(|price| price.product.as_ref())
|
||||
// .map(|product| expand_product_id(product));
|
||||
//
|
||||
// let maybe_price_id = line_item.price
|
||||
// .as_ref()
|
||||
// .map(|price| price.id.to_string());
|
||||
//
|
||||
// // NB: Internal user token (non-stripe)
|
||||
// let maybe_user_token = line_item.metadata.get(STRIPE_ARTCRAFT_METADATA_USER_TOKEN)
|
||||
// .map(|d| d.to_string());
|
||||
//
|
||||
// let paid_details = InvoicePaidDetails::Subscription(SubscriptionDetails {
|
||||
// user_token: maybe_user_token,
|
||||
// stripe_is_production: is_production,
|
||||
// stripe_invoice_id: invoice_id,
|
||||
// stripe_customer_id: maybe_stripe_customer_id,
|
||||
// stripe_subscription_id: maybe_subscription_id,
|
||||
// stripe_product_id: maybe_product_id,
|
||||
// stripe_price_id: maybe_price_id,
|
||||
// subscription_is_active: false,
|
||||
// billed_at: Utc::now(),
|
||||
// subscription_interval: Default::default(),
|
||||
// subscription_expires_at: Utc::now(),
|
||||
// });
|
||||
//
|
||||
// Ok(Some(paid_details))
|
||||
// */
|
||||
//
|
||||
// Ok(None) // TODO
|
||||
// }
|
||||
|
||||
|
||||
/*#[cfg(test)]
|
||||
mod tests {
|
||||
use anyhow::bail;
|
||||
use stripe::Invoice;
|
||||
use errors::AnyhowResult;
|
||||
|
||||
use crate::stripe::http_endpoints::webhook::webhook_event_handlers::invoice::invoice_paid_handler::invoice_paid_extractor;
|
||||
use crate::stripe::http_endpoints::webhook::webhook_event_handlers::invoice::invoice_paid_handler::InvoicePaidDetails;
|
||||
|
||||
#[test]
|
||||
fn test_invoice_paid_extractor() -> AnyhowResult<()> {
|
||||
// NB: Not the prettiest, but this is a dev mode capture of a subscription "invoice.paid" event:
|
||||
let invoice = r#"
|
||||
{"id":"in_1Lh1R6EU5se17Mekksuvq20H","account_country":"US","account_name":"Storyteller","amount_due":700,"amount_paid":700,"amount_remaining":0,
|
||||
"attempt_count":1,"attempted":true,"auto_advance":false,"automatic_tax":{"enabled":false},"billing_reason":"subscription_create","charge":"ch_3Lh1R7EU5se17Mek1StoPTgz",
|
||||
"collection_method":"charge_automatically","created":1662946064,"currency":"usd","customer":"cus_MPr9UxT6b4SR5v","customer_address":{"country":"US",
|
||||
"postal_code":"44444"},"customer_email":"foo@bar.com","customer_name":"Name","customer_tax_exempt":"none","customer_tax_ids":[],
|
||||
"default_tax_rates":[],"deleted":false,"discounts":[],"ending_balance":0,
|
||||
"hosted_invoice_url":"https://invoice.stripe.com/i/acct_1KZvWXEU5se17Mek/test_YWNjdF8xS1p2V1hFVTVzZTE3TWVrLF9NUHI5YjVkM0FrWExVQTVUQ1J1bFNaRWhqcHFlTU9VLDUzNDg2ODY402005IZTB0v6?s=ap",
|
||||
"invoice_pdf":"https://pay.stripe.com/invoice/acct_1KZvWXEU5se17Mek/test_YWNjdF8xS1p2V1hFVTVzZTE3TWVrLF9NUHI5YjVkM0FrWExVQTVUQ1J1bFNaRWhqcHFlTU9VLDUzNDg2ODY402005IZTB0v6/pdf?s=ap",
|
||||
"lines":{"data":[{"id":"il_1Lh1R6EU5se17MekXq9iJCZi",
|
||||
"amount":700,"currency":"usd","description":"1 × FakeYou basic (at $7.00 / month)","discount_amounts":[],"discountable":true,"discounts":[],"livemode":false,
|
||||
"metadata":{"username":"_username_","user_token":"U:TOKEN","email":"user@name.com"},"period":{"end":1665538064,"start":1662946064},"price":{"id":"price_1LeDnKEU5se17MekVr1iYYNf",
|
||||
"active":true,"billing_scheme":"per_unit","created":1662278586,"currency":"usd","deleted":false,"livemode":false,"metadata":{},"product":"prod_MMxi2J5y69VPbO",
|
||||
"recurring":{"interval":"month","interval_count":1,"usage_type":"licensed"},"tax_behavior":"exclusive","type":"recurring","unit_amount":700,"unit_amount_decimal":"700"},
|
||||
"proration":false,"proration_details":{},"quantity":1,"subscription":"sub_1Lh1R6EU5se17Mekq9Ahj0gi",
|
||||
"subscription_item":"si_MPr9vVB80UAGwp","tax_amounts":[],"tax_rates":[],"type":"subscription"}],"has_more":false,"total_count":1,
|
||||
"url":"/v1/invoices/in_1Lh1R6EU5se17Mekksuvq20H/lines"},
|
||||
"livemode":false,"metadata":{},"number":"4F52B2F7-0001","paid":true,"paid_out_of_band":false,"payment_intent":"pi_3Lh1R7EU5se17Mek1Bby1wL8",
|
||||
"payment_settings":{},"period_end":1662946064,"period_start":1662946064,"post_payment_credit_notes_amount":0,
|
||||
"pre_payment_credit_notes_amount":0,"starting_balance":0,"status":"paid",
|
||||
"status_transitions":{"finalized_at":1662946064,"paid_at":1662946066},"subscription":"sub_1Lh1R6EU5se17Mekq9Ahj0gi",
|
||||
"subtotal":700,"total":700,"total_discount_amounts":[],"total_tax_amounts":[]}
|
||||
"#;
|
||||
|
||||
let invoice = serde_json::from_str::<Invoice>(invoice).unwrap();
|
||||
|
||||
let details = invoice_paid_extractor(&invoice).unwrap().unwrap();
|
||||
|
||||
match details {
|
||||
InvoicePaidDetails::Product(_) => { bail!("This is supposed to be a subscription!"); }
|
||||
InvoicePaidDetails::Subscription(subscription) => {
|
||||
assert_eq!(subscription.stripe_invoice_id, "in_1Lh1R6EU5se17Mekksuvq20H".to_string());
|
||||
assert_eq!(subscription.user_token, Some("U:TOKEN".to_string()));
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}*/
|
||||
-32
@@ -1,32 +0,0 @@
|
||||
use crate::configs::stripe_artcraft_metadata_keys::STRIPE_ARTCRAFT_METADATA_USER_TOKEN;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_error::StripeArtcraftWebhookError;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_summary::StripeArtcraftWebhookSummary;
|
||||
use crate::utils::expand_ids::expand_customer_id::expand_customer_id;
|
||||
use stripe_shared::Invoice;
|
||||
|
||||
// Handle event type: 'invoice.payment_succeeded'
|
||||
pub fn invoice_payment_succeeded_handler(invoice: &Invoice) -> Result<StripeArtcraftWebhookSummary, StripeArtcraftWebhookError> {
|
||||
let maybe_invoice_id = invoice.id.as_ref().map(|id| id.to_string());
|
||||
|
||||
// NB: Not read in previous FakeYou code.
|
||||
// let paid_status = invoice.status;
|
||||
|
||||
// NB: We'll need this to send them to the "customer portal", which is how they can modify
|
||||
// or cancel their subscriptions.
|
||||
let maybe_stripe_customer_id = invoice.customer
|
||||
.as_ref()
|
||||
.map(|c| expand_customer_id(c));
|
||||
|
||||
// NB: Our internal user token.
|
||||
let maybe_user_token = invoice.metadata
|
||||
.as_ref()
|
||||
.and_then(|m| m.get(STRIPE_ARTCRAFT_METADATA_USER_TOKEN).map(|t| t.to_string()));
|
||||
|
||||
Ok(StripeArtcraftWebhookSummary {
|
||||
maybe_user_token,
|
||||
maybe_event_entity_id: maybe_invoice_id,
|
||||
maybe_stripe_customer_id,
|
||||
action_was_taken: false,
|
||||
should_ignore_retry: false,
|
||||
})
|
||||
}
|
||||
-38
@@ -1,38 +0,0 @@
|
||||
use crate::configs::stripe_artcraft_metadata_keys::STRIPE_ARTCRAFT_METADATA_USER_TOKEN;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_error::StripeArtcraftWebhookError;
|
||||
use crate::endpoints::webhook::webhook_event_handlers::stripe_artcraft_webhook_summary::StripeArtcraftWebhookSummary;
|
||||
use crate::utils::expand_ids::expand_customer_id::expand_customer_id;
|
||||
use stripe_shared::Invoice;
|
||||
|
||||
// Handle event type: 'invoice.updated'
|
||||
// Sent when a payment succeeds or fails.
|
||||
// If payment is successful the `paid` attribute is set to true and the `status` is `paid`.
|
||||
// If payment fails, `paid` is set to false and the `status` remains `open`.
|
||||
// Payment failures also trigger a invoice.payment_failed event.
|
||||
pub fn invoice_updated_handler(invoice: &Invoice) -> Result<StripeArtcraftWebhookSummary, StripeArtcraftWebhookError> {
|
||||
let maybe_invoice_id = invoice.id.as_ref().map(|id| id.to_string());
|
||||
|
||||
// NB: (1) stripe changed their API and these no longer work.
|
||||
// NB: (2) The original code appeared to be a no-op anyway.
|
||||
//let is_paid = invoice.status
|
||||
//let invoice_status = invoice.status;
|
||||
|
||||
// NB: We'll need this to send them to the "customer portal", which is how they can modify
|
||||
// or cancel their subscriptions.
|
||||
let maybe_stripe_customer_id = invoice.customer
|
||||
.as_ref()
|
||||
.map(|c| expand_customer_id(c));
|
||||
|
||||
// NB: Our internal user token.
|
||||
let maybe_user_token = invoice.metadata
|
||||
.as_ref()
|
||||
.and_then(|m| m.get(STRIPE_ARTCRAFT_METADATA_USER_TOKEN).map(|t| t.to_string()));
|
||||
|
||||
Ok(StripeArtcraftWebhookSummary {
|
||||
maybe_user_token,
|
||||
maybe_event_entity_id: maybe_invoice_id,
|
||||
maybe_stripe_customer_id,
|
||||
action_was_taken: false,
|
||||
should_ignore_retry: false,
|
||||
})
|
||||
}
|
||||
-2
@@ -1,4 +1,2 @@
|
||||
pub(crate) mod invoice_paid_handler;
|
||||
pub(crate) mod invoice_payment_failed;
|
||||
pub(crate) mod invoice_payment_succeeded_handler;
|
||||
pub(crate) mod invoice_updated_handler;
|
||||
-2
@@ -1,8 +1,6 @@
|
||||
pub mod stripe_artcraft_webhook_error;
|
||||
|
||||
pub(crate) mod charge;
|
||||
pub(crate) mod checkout_session;
|
||||
pub(crate) mod customer;
|
||||
pub(crate) mod customer_subscription;
|
||||
pub(crate) mod invoice;
|
||||
pub(crate) mod payment_intent;
|
||||
|
||||
+6
@@ -54,6 +54,12 @@ pub async fn payment_intent_succeeded_handler(
|
||||
} else {
|
||||
// TODO: Add credits.
|
||||
|
||||
info!(">>> ONE OFF PURCHASE : {:?}", &purchase);
|
||||
info!(">>> ONE OFF PURCHASE : {:?}", &purchase);
|
||||
info!(">>> ONE OFF PURCHASE : {:?}", &purchase);
|
||||
info!(">>> ONE OFF PURCHASE : {:?}", &purchase);
|
||||
info!(">>> ONE OFF PURCHASE : {:?}", &purchase);
|
||||
|
||||
should_ignore_retry = true;
|
||||
action_was_taken = true;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user