Refactor stripe component modules

crates/component_subsystem/billing/src/default_routes.rs

@@ -4,10 +4,10 @@ use actix_web::body::MessageBody;
 use actix_web::dev::{ServiceRequest, ServiceResponse, ServiceFactory};
 use actix_web::error::Error;
 use actix_web::{App, web, HttpResponse};
+use crate::stripe::http_endpoints::checkout::create::stripe_create_checkout_session_json_handler::stripe_create_checkout_session_json_handler;
+use crate::stripe::http_endpoints::checkout::create::stripe_create_checkout_session_redirect_handler::stripe_create_checkout_session_redirect_handler;
 use crate::stripe::http_endpoints::checkout::stripe_checkout_success_handler::stripe_checkout_success_handler;
-use crate::stripe::http_endpoints::checkout::stripe_create_checkout_session_json_handler::stripe_create_checkout_session_json_handler;
-use crate::stripe::http_endpoints::checkout::stripe_create_checkout_session_redirect_handler::stripe_create_checkout_session_redirect_handler;
-use crate::stripe::http_endpoints::stripe_webhook_handler::stripe_webhook_handler;
+use crate::stripe::http_endpoints::webhook::stripe_webhook_handler::stripe_webhook_handler;
 
 pub fn add_suggested_stripe_billing_routes<T, B> (app: App<T, B>) -> App<T, B>
   where

crates/component_subsystem/billing/src/stripe/http_endpoints/checkout/create/mod.rs

@@ -0,0 +1,4 @@
+pub mod stripe_create_checkout_session_error;
+pub mod stripe_create_checkout_session_json_handler;
+pub mod stripe_create_checkout_session_redirect_handler;
+pub mod stripe_create_checkout_session_shared;

crates/component_subsystem/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_json_handler.rs

@@ -4,8 +4,8 @@ use actix_web::http::{header, StatusCode};
 use actix_web::web::{Path, Query};
 use actix_web::{web, HttpResponse, HttpRequest};
 use chrono::{DateTime, Utc};
-use crate::stripe::http_endpoints::checkout::stripe_create_checkout_session_error::CreateCheckoutSessionError;
-use crate::stripe::http_endpoints::checkout::stripe_create_checkout_session_shared::stripe_create_checkout_session_shared;
+use crate::stripe::http_endpoints::checkout::create::stripe_create_checkout_session_error::CreateCheckoutSessionError;
+use crate::stripe::http_endpoints::checkout::create::stripe_create_checkout_session_shared::stripe_create_checkout_session_shared;
 use crate::stripe::stripe_config::StripeConfig;
 use crate::stripe::traits::internal_product_to_stripe_lookup::InternalProductToStripeLookup;
 use crate::stripe::traits::internal_user_lookup::{InternalUserLookup, UserMetadata};

crates/component_subsystem/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_redirect_handler.rs

@@ -4,8 +4,8 @@ use actix_web::http::{header, StatusCode};
 use actix_web::web::{Path, Query};
 use actix_web::{web, HttpResponse, HttpRequest};
 use chrono::{DateTime, Utc};
-use crate::stripe::http_endpoints::checkout::stripe_create_checkout_session_error::CreateCheckoutSessionError;
-use crate::stripe::http_endpoints::checkout::stripe_create_checkout_session_shared::stripe_create_checkout_session_shared;
+use crate::stripe::http_endpoints::checkout::create::stripe_create_checkout_session_error::CreateCheckoutSessionError;
+use crate::stripe::http_endpoints::checkout::create::stripe_create_checkout_session_shared::stripe_create_checkout_session_shared;
 use crate::stripe::stripe_config::StripeConfig;
 use crate::stripe::traits::internal_product_to_stripe_lookup::InternalProductToStripeLookup;
 use crate::stripe::traits::internal_user_lookup::InternalUserLookup;

crates/component_subsystem/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_shared.rs

@@ -2,7 +2,7 @@ use actix_web::{HttpRequest, web};
 use anyhow::anyhow;
 use container_common::anyhow_result::AnyhowResult;
 use crate::stripe::helpers::common_metadata_keys::{METADATA_EMAIL, METADATA_USER_TOKEN, METADATA_USERNAME};
-use crate::stripe::http_endpoints::checkout::stripe_create_checkout_session_error::CreateCheckoutSessionError;
+use crate::stripe::http_endpoints::checkout::create::stripe_create_checkout_session_error::CreateCheckoutSessionError;
 use crate::stripe::stripe_config::StripeConfig;
 use crate::stripe::traits::internal_product_to_stripe_lookup::{InternalProductToStripeLookup, StripeProduct};
 use crate::stripe::traits::internal_user_lookup::{InternalUserLookup, UserMetadata};

crates/component_subsystem/billing/src/stripe/http_endpoints/checkout/mod.rs

@@ -1,5 +1,2 @@
-pub mod stripe_checkout_success_handler;
-pub mod stripe_create_checkout_session_error;
-pub mod stripe_create_checkout_session_json_handler;
-pub mod stripe_create_checkout_session_redirect_handler;
-pub mod stripe_create_checkout_session_shared;
+pub mod create;
+pub mod stripe_checkout_success_handler;

crates/component_subsystem/billing/src/stripe/http_endpoints/mod.rs

@@ -1,2 +1,2 @@
 pub mod checkout;
-pub mod stripe_webhook_handler;
+pub mod webhook;

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/mod.rs

@@ -0,0 +1,2 @@
+pub mod stripe_webhook_handler;
+pub(crate) mod webhook_event_handlers;

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/stripe_webhook_handler.rs

@@ -5,23 +5,23 @@ use actix_web::web::{Bytes, Path};
 use actix_web::{web, HttpResponse, HttpRequest};
 use chrono::{DateTime, NaiveDateTime, Utc};
 use crate::stripe::helpers::verify_stripe_webhook_ip_address::verify_stripe_webhook_ip_address;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::charge::charge_succeeded_handler::charge_succeeded_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::checkout_session::checkout_session_completed_handler::checkout_session_completed_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer::customer_created_handler::customer_created_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer::customer_deleted_handler::customer_deleted_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer::customer_updated_handler::customer_updated_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::customer_subscription_created_handler::customer_subscription_created_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::customer_subscription_deleted_handler::customer_subscription_deleted_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::customer_subscription_updated_handler::customer_subscription_updated_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::invoice::invoice_paid_handler::invoice_paid_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::invoice::invoice_payment_failed::invoice_payment_failed_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::invoice::invoice_payment_succeeded_handler::invoice_payment_succeeded_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::invoice::invoice_updated_handler::invoice_updated_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::payment_intent::payment_intent_succeeded_handler::payment_intent_succeeded_handler;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use crate::stripe::stripe_config::StripeConfig;
 use crate::stripe::traits::internal_subscription_product_lookup::InternalSubscriptionProductLookup;
-use crate::stripe::webhook_event_handlers::charge::charge_succeeded_handler::charge_succeeded_handler;
-use crate::stripe::webhook_event_handlers::checkout_session::checkout_session_completed_handler::checkout_session_completed_handler;
-use crate::stripe::webhook_event_handlers::customer::customer_created_handler::customer_created_handler;
-use crate::stripe::webhook_event_handlers::customer::customer_deleted_handler::customer_deleted_handler;
-use crate::stripe::webhook_event_handlers::customer::customer_updated_handler::customer_updated_handler;
-use crate::stripe::webhook_event_handlers::customer_subscription::customer_subscription_created_handler::customer_subscription_created_handler;
-use crate::stripe::webhook_event_handlers::customer_subscription::customer_subscription_deleted_handler::customer_subscription_deleted_handler;
-use crate::stripe::webhook_event_handlers::customer_subscription::customer_subscription_updated_handler::customer_subscription_updated_handler;
-use crate::stripe::webhook_event_handlers::invoice::invoice_paid_handler::invoice_paid_handler;
-use crate::stripe::webhook_event_handlers::invoice::invoice_payment_failed::invoice_payment_failed_handler;
-use crate::stripe::webhook_event_handlers::invoice::invoice_payment_succeeded_handler::invoice_payment_succeeded_handler;
-use crate::stripe::webhook_event_handlers::invoice::invoice_updated_handler::invoice_updated_handler;
-use crate::stripe::webhook_event_handlers::payment_intent::payment_intent_succeeded_handler::payment_intent_succeeded_handler;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use database_queries::queries::billing::stripe::get_stripe_webhook_event_log_by_id::get_stripe_webhook_event_log_by_id;
 use database_queries::queries::billing::stripe::insert_stripe_webhook_event_log::InsertStripeWebhookEventLog;
 use http_server_common::request::get_request_header_optional::get_request_header_optional;

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/charge/charge_succeeded_handler.rs

@@ -1,8 +1,8 @@
 use container_common::anyhow_result::AnyhowResult;
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
 use crate::stripe::helpers::expand_customer_id::expand_customer_id;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use log::error;
 use stripe::{Charge, Invoice, PaymentIntent};
 

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/charge/mod.rs

@@ -0,0 +1 @@
+pub(crate) mod charge_succeeded_handler;

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/checkout_session/checkout_session_completed_handler.rs

@@ -1,10 +1,10 @@
-use log::{error, warn};
 use container_common::anyhow_result::AnyhowResult;
-use crate::stripe::helpers::expand_customer_id::expand_customer_id;
-use stripe::CheckoutSession;
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
+use crate::stripe::helpers::expand_customer_id::expand_customer_id;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
+use log::{error, warn};
+use stripe::CheckoutSession;
 
 // After the subscription signup succeeds, the customer returns to your website at the success_url,
 // which initiates a checkout.session.completed webhooks. When you receive a checkout.session.completed

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/checkout_session/mod.rs

@@ -0,0 +1 @@
+pub(crate) mod checkout_session_completed_handler;

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_created_handler.rs

@@ -1,7 +1,7 @@
 use container_common::anyhow_result::AnyhowResult;
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use log::error;
 use stripe::Customer;
 

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_deleted_handler.rs

@@ -1,7 +1,7 @@
 use container_common::anyhow_result::AnyhowResult;
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use log::warn;
 use stripe::Customer;
 

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_updated_handler.rs

@@ -1,7 +1,7 @@
 use container_common::anyhow_result::AnyhowResult;
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use log::warn;
 use stripe::Customer;
 

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/mod.rs

@@ -0,0 +1,3 @@
+pub(crate) mod customer_created_handler;
+pub(crate) mod customer_deleted_handler;
+pub(crate) mod customer_updated_handler;

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/calculate_subscription_end_date.rs

@@ -1,5 +1,5 @@
 use chrono::{Duration, NaiveDateTime, Utc};
-use crate::stripe::webhook_event_handlers::customer_subscription::subscription_event_extractor::SubscriptionSummary;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::subscription_event_extractor::SubscriptionSummary;
 use once_cell::sync::Lazy;
 use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus;
 use std::ops::{Add, Sub};

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_created_handler.rs

@@ -1,9 +1,9 @@
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::calculate_subscription_end_date::calculate_subscription_end_date;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::common::{UNKNOWN_SUBSCRIPTION_CATEGORY, UNKNOWN_SUBSCRIPTION_PRODUCT_KEY};
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::subscription_event_extractor::subscription_summary_extractor;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use crate::stripe::traits::internal_subscription_product_lookup::InternalSubscriptionProductLookup;
-use crate::stripe::webhook_event_handlers::customer_subscription::calculate_subscription_end_date::calculate_subscription_end_date;
-use crate::stripe::webhook_event_handlers::customer_subscription::common::{UNKNOWN_SUBSCRIPTION_CATEGORY, UNKNOWN_SUBSCRIPTION_PRODUCT_KEY};
-use crate::stripe::webhook_event_handlers::customer_subscription::subscription_event_extractor::subscription_summary_extractor;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use database_queries::queries::billing::subscriptions::get_subscription_by_stripe_id::get_subscription_by_stripe_id;
 use database_queries::queries::billing::subscriptions::upsert_subscription_by_stripe_id::UpsertSubscriptionByStripeId;
 use log::{error, warn};

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_deleted_handler.rs

@@ -1,9 +1,9 @@
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::calculate_subscription_end_date::calculate_subscription_end_date;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::common::{UNKNOWN_SUBSCRIPTION_CATEGORY, UNKNOWN_SUBSCRIPTION_PRODUCT_KEY};
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::subscription_event_extractor::subscription_summary_extractor;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use crate::stripe::traits::internal_subscription_product_lookup::InternalSubscriptionProductLookup;
-use crate::stripe::webhook_event_handlers::customer_subscription::calculate_subscription_end_date::calculate_subscription_end_date;
-use crate::stripe::webhook_event_handlers::customer_subscription::common::{UNKNOWN_SUBSCRIPTION_CATEGORY, UNKNOWN_SUBSCRIPTION_PRODUCT_KEY};
-use crate::stripe::webhook_event_handlers::customer_subscription::subscription_event_extractor::subscription_summary_extractor;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use database_queries::queries::billing::subscriptions::get_subscription_by_stripe_id::get_subscription_by_stripe_id;
 use database_queries::queries::billing::subscriptions::upsert_subscription_by_stripe_id::UpsertSubscriptionByStripeId;
 use log::{error, warn};

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_updated_handler.rs

@@ -1,9 +1,9 @@
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::calculate_subscription_end_date::calculate_subscription_end_date;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::common::{UNKNOWN_SUBSCRIPTION_CATEGORY, UNKNOWN_SUBSCRIPTION_PRODUCT_KEY};
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::customer_subscription::subscription_event_extractor::subscription_summary_extractor;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use crate::stripe::traits::internal_subscription_product_lookup::InternalSubscriptionProductLookup;
-use crate::stripe::webhook_event_handlers::customer_subscription::calculate_subscription_end_date::calculate_subscription_end_date;
-use crate::stripe::webhook_event_handlers::customer_subscription::common::{UNKNOWN_SUBSCRIPTION_CATEGORY, UNKNOWN_SUBSCRIPTION_PRODUCT_KEY};
-use crate::stripe::webhook_event_handlers::customer_subscription::subscription_event_extractor::subscription_summary_extractor;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use database_queries::queries::billing::subscriptions::get_subscription_by_stripe_id::get_subscription_by_stripe_id;
 use database_queries::queries::billing::subscriptions::upsert_subscription_by_stripe_id::UpsertSubscriptionByStripeId;
 use log::{error, warn};

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/subscription_event_extractor.rs

@@ -2,13 +2,13 @@ use anyhow::anyhow;
 use chrono::{DateTime, NaiveDateTime, Utc};
 use container_common::anyhow_result::AnyhowResult;
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
+use crate::stripe::helpers::enums::recurring_interval_to_reusable_type::recurring_interval_to_reusable_type;
 use crate::stripe::helpers::enums::subscription_status_to_reusable_type::subscription_status_to_reusable_type;
 use crate::stripe::helpers::expand_customer_id::expand_customer_id;
 use crate::stripe::helpers::expand_product_id::expand_product_id;
 use reusable_types::stripe::stripe_recurring_interval::StripeRecurringInterval;
 use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus;
 use stripe::{Price, RecurringInterval, Subscription, SubscriptionInterval, SubscriptionStatus};
-use crate::stripe::helpers::enums::recurring_interval_to_reusable_type::recurring_interval_to_reusable_type;
 
 #[derive(Clone, Debug)]
 pub struct SubscriptionSummary {

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_paid_handler.rs

@@ -4,10 +4,10 @@ use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
 use crate::stripe::helpers::expand_customer_id::expand_customer_id;
 use crate::stripe::helpers::expand_product_id::expand_product_id;
 use crate::stripe::helpers::expand_subscription_id::expand_subscription_id;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use log::error;
 use stripe::{Invoice, InvoiceLineItemType, InvoiceStatus, SubscriptionInterval};
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 
 /// If we determine a subscription needs update, this is the struct we produce.
 /// This should be easily unit testable.

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_payment_failed.rs

@@ -1,8 +1,8 @@
 use container_common::anyhow_result::AnyhowResult;
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
 use crate::stripe::helpers::expand_customer_id::expand_customer_id;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use log::warn;
 use stripe::Invoice;
 

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_payment_succeeded_handler.rs

@@ -1,8 +1,8 @@
 use container_common::anyhow_result::AnyhowResult;
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
 use crate::stripe::helpers::expand_customer_id::expand_customer_id;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use log::warn;
 use stripe::Invoice;
 

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_updated_handler.rs

@@ -1,10 +1,10 @@
 use container_common::anyhow_result::AnyhowResult;
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
 use crate::stripe::helpers::expand_customer_id::expand_customer_id;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use log::warn;
 use stripe::Invoice;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 
 // Handle event type: 'invoice.updated'
 // Sent when a payment succeeds or fails.

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/mod.rs

@@ -0,0 +1,4 @@
+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;

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/mod.rs

@@ -0,0 +1,9 @@
+pub mod stripe_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;
+pub(crate) mod stripe_webhook_summary;

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/payment_intent/mod.rs

@@ -0,0 +1 @@
+pub(crate) mod payment_intent_succeeded_handler;

crates/component_subsystem/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/payment_intent/payment_intent_succeeded_handler.rs

@@ -1,8 +1,8 @@
 use container_common::anyhow_result::AnyhowResult;
 use crate::stripe::helpers::common_metadata_keys::METADATA_USER_TOKEN;
 use crate::stripe::helpers::expand_customer_id::expand_customer_id;
-use crate::stripe::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
-use crate::stripe::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_error::StripeWebhookError;
+use crate::stripe::http_endpoints::webhook::webhook_event_handlers::stripe_webhook_summary::StripeWebhookSummary;
 use log::warn;
 use stripe::{Invoice, PaymentIntent};
 

crates/component_subsystem/billing/src/stripe/mod.rs

@@ -3,4 +3,3 @@ pub mod http_endpoints;
 pub mod stripe_config;
 pub mod traits;
 
-pub (crate) mod webhook_event_handlers;

crates/component_subsystem/billing/src/stripe/webhook_event_handlers/charge/mod.rs

@@ -1 +0,0 @@
-pub (crate) mod charge_succeeded_handler;

crates/component_subsystem/billing/src/stripe/webhook_event_handlers/checkout_session/mod.rs

@@ -1 +0,0 @@
-pub (crate) mod checkout_session_completed_handler;

crates/component_subsystem/billing/src/stripe/webhook_event_handlers/customer/mod.rs

@@ -1,3 +0,0 @@
-pub (crate) mod customer_created_handler;
-pub (crate) mod customer_deleted_handler;
-pub (crate) mod customer_updated_handler;

crates/component_subsystem/billing/src/stripe/webhook_event_handlers/invoice/mod.rs

@@ -1,4 +0,0 @@
-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;

crates/component_subsystem/billing/src/stripe/webhook_event_handlers/mod.rs

@@ -1,9 +0,0 @@
-pub mod stripe_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;
-pub (crate) mod stripe_webhook_summary;

crates/component_subsystem/billing/src/stripe/webhook_event_handlers/payment_intent/mod.rs

@@ -1 +0,0 @@
-pub (crate) mod payment_intent_succeeded_handler;