Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: added subscription plan cancellation information

Browse Source
This commit is contained in:
Zack Fu Zi Xiang 2024-06-05 12:25:09 +08:00
parent f11f407564
commit 054dc771d4
No known key found for this signature in database
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/rust-lib/Cargo.lock generated
View File

@ -197,7 +197,7 @@ dependencies = [
[[package]] [[package]]
name = "appflowy-cloud-billing-client" name = "appflowy-cloud-billing-client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud-Billing-Client?rev=5a9b151bbb22e9789867b3ca810f7b35f0f7ebb4#5a9b151bbb22e9789867b3ca810f7b35f0f7ebb4" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud-Billing-Client?rev=48ab2cc33302caf3bb158636817a4010b1fa711e#48ab2cc33302caf3bb158636817a4010b1fa711e"
dependencies = [ dependencies = [
"client-api", "client-api",
"reqwest", "reqwest",

2
frontend/rust-lib/Cargo.toml
View File

@ -94,7 +94,7 @@ yrs = "0.18.8"
# scripts/tool/update_client_api_rev.sh new_rev_id # scripts/tool/update_client_api_rev.sh new_rev_id
# ⚠️⚠️⚠️️ # ⚠️⚠️⚠️️
client-api = { version = "0.2" } client-api = { version = "0.2" }
appflowy-cloud-billing-client = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud-Billing-Client", rev = "5a9b151bbb22e9789867b3ca810f7b35f0f7ebb4" } appflowy-cloud-billing-client = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud-Billing-Client", rev = "48ab2cc33302caf3bb158636817a4010b1fa711e" }
[profile.dev] [profile.dev]
opt-level = 1 opt-level = 1

1
frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs
View File

@ -686,5 +686,6 @@ fn to_workspace_subscription(s: WorkspaceSubscriptionStatus) -> WorkspaceSubscri
s.subscription_status, s.subscription_status,
appflowy_cloud_billing_client::entities::SubscriptionStatus::Active appflowy_cloud_billing_client::entities::SubscriptionStatus::Active
), ),
canceled_at: s.canceled_at,
} }
} }

12
frontend/rust-lib/flowy-sqlite/src/schema.rs
View File

@ -68,10 +68,10 @@ diesel::table! {
} }
diesel::allow_tables_to_appear_in_same_query!( diesel::allow_tables_to_appear_in_same_query!(
chat_message_table, chat_message_table,
chat_table, chat_table,
collab_snapshot, collab_snapshot,
user_data_migration_records, user_data_migration_records,
user_table, user_table,
user_workspace_table, user_workspace_table,
); );

1
frontend/rust-lib/flowy-user-pub/src/entities.rs
View File

@ -439,6 +439,7 @@ pub struct WorkspaceSubscription {
pub subscription_plan: SubscriptionPlan, pub subscription_plan: SubscriptionPlan,
pub recurring_interval: RecurringInterval, pub recurring_interval: RecurringInterval,
pub is_active: bool, pub is_active: bool,
pub canceled_at: Option<i64>,
} }
pub struct WorkspaceUsage { pub struct WorkspaceUsage {

8
frontend/rust-lib/flowy-user/src/entities/workspace.rs
View File

@ -299,6 +299,12 @@ pub struct WorkspaceSubscriptionPB {
#[pb(index = 4)] #[pb(index = 4)]
pub is_active: bool, pub is_active: bool,
#[pb(index = 5)]
pub has_canceled: bool,
#[pb(index = 6)]
pub canceled_at: i64, // value is valid only if has_canceled is true
} }
impl From<WorkspaceSubscription> for WorkspaceSubscriptionPB { impl From<WorkspaceSubscription> for WorkspaceSubscriptionPB {
@ -308,6 +314,8 @@ impl From<WorkspaceSubscription> for WorkspaceSubscriptionPB {
subscription_plan: s.subscription_plan.into(), subscription_plan: s.subscription_plan.into(),
recurring_interval: s.recurring_interval.into(), recurring_interval: s.recurring_interval.into(),
is_active: s.is_active, is_active: s.is_active,
has_canceled: s.canceled_at.is_some(),
canceled_at: s.canceled_at.unwrap_or_default(),
} }
} }
} }