From 9b7e2c8713a7019251214e9579836044c75815f9 Mon Sep 17 00:00:00 2001 From: Jai A Date: Thu, 15 Aug 2024 01:49:10 -0700 Subject: [PATCH] prep --- ...45b8a8a100c639a9174f196a50cd74c9243ddd57d6f4f3d0b062.json} | 4 ++-- src/database/models/user_subscription_item.rs | 2 +- src/routes/internal/billing.rs | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) rename .sqlx/{query-0e7a1aaa7999dcae156e1b1194232a12742a24740e48dd0d99582a79da873383.json => query-e82ba8bafb4e45b8a8a100c639a9174f196a50cd74c9243ddd57d6f4f3d0b062.json} (78%) diff --git a/.sqlx/query-0e7a1aaa7999dcae156e1b1194232a12742a24740e48dd0d99582a79da873383.json b/.sqlx/query-e82ba8bafb4e45b8a8a100c639a9174f196a50cd74c9243ddd57d6f4f3d0b062.json similarity index 78% rename from .sqlx/query-0e7a1aaa7999dcae156e1b1194232a12742a24740e48dd0d99582a79da873383.json rename to .sqlx/query-e82ba8bafb4e45b8a8a100c639a9174f196a50cd74c9243ddd57d6f4f3d0b062.json index 32c0cdcb..6546eb3d 100644 --- a/.sqlx/query-0e7a1aaa7999dcae156e1b1194232a12742a24740e48dd0d99582a79da873383.json +++ b/.sqlx/query-e82ba8bafb4e45b8a8a100c639a9174f196a50cd74c9243ddd57d6f4f3d0b062.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n INSERT INTO users_subscriptions (\n id, user_id, price_id, interval, created, expires, last_charge, status\n )\n VALUES (\n $1, $2, $3, $4, $5, $6, $7, $8\n )\n ON CONFLICT (id)\n DO UPDATE\n SET interval = EXCLUDED.interval,\n expires = EXCLUDED.expires,\n last_charge = EXCLUDED.last_charge,\n status = EXCLUDED.status\n ", + "query": "\n INSERT INTO users_subscriptions (\n id, user_id, price_id, interval, created, expires, last_charge, status\n )\n VALUES (\n $1, $2, $3, $4, $5, $6, $7, $8\n )\n ON CONFLICT (id)\n DO UPDATE\n SET interval = EXCLUDED.interval,\n expires = EXCLUDED.expires,\n last_charge = EXCLUDED.last_charge,\n status = EXCLUDED.status,\n price_id = EXCLUDED.price_id\n ", "describe": { "columns": [], "parameters": { @@ -17,5 +17,5 @@ }, "nullable": [] }, - "hash": "0e7a1aaa7999dcae156e1b1194232a12742a24740e48dd0d99582a79da873383" + "hash": "e82ba8bafb4e45b8a8a100c639a9174f196a50cd74c9243ddd57d6f4f3d0b062" } diff --git a/src/database/models/user_subscription_item.rs b/src/database/models/user_subscription_item.rs index 655f5d90..b13d319f 100644 --- a/src/database/models/user_subscription_item.rs +++ b/src/database/models/user_subscription_item.rs @@ -117,7 +117,7 @@ impl UserSubscriptionItem { SET interval = EXCLUDED.interval, expires = EXCLUDED.expires, last_charge = EXCLUDED.last_charge, - status = EXCLUDED.status + status = EXCLUDED.status, price_id = EXCLUDED.price_id ", self.id.0, diff --git a/src/routes/internal/billing.rs b/src/routes/internal/billing.rs index 55227754..cdb8533f 100644 --- a/src/routes/internal/billing.rs +++ b/src/routes/internal/billing.rs @@ -682,7 +682,6 @@ pub async fn initiate_payment( interval.as_str().to_string(), ); } - update_payment_intent.metadata = Some(metadata); if let PaymentRequestType::PaymentMethod { .. } = payment_request.type_ {