payment-kit 1.13.97 → 1.13.99

package/api/src/queues/invoice.ts

@@ -1,5 +1,6 @@
 import { Op } from 'sequelize';
 
+import { createEvent } from '../libs/audit';
 import dayjs from '../libs/dayjs';
 import logger from '../libs/logger';
 import createQueue from '../libs/queue';
@@ -57,9 +58,18 @@ export const handleInvoice = async (job: InvoiceJob) => {
 
     if (invoice.subscription_id) {
       const subscription = await Subscription.findByPk(invoice.subscription_id);
-      if (subscription && subscription.status === 'incomplete') {
-        await subscription.start();
-        logger.info('invoice subscription updated', subscription.id);
+      if (subscription) {
+        if (subscription.status === 'incomplete') {
+          await subscription.start();
+          logger.info('invoice subscription updated', subscription.id);
+        } else {
+          if (invoice.billing_reason === 'subscription_cycle') {
+            createEvent('Subscription', 'customer.subscription.renewed', subscription).catch(console.error);
+          }
+          if (invoice.billing_reason === 'subscription_update') {
+            createEvent('Subscription', 'customer.subscription.upgraded', subscription).catch(console.error);
+          }
+        }
       }
     }
 

package/api/src/queues/payment.ts

@@ -78,6 +78,9 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent, invoice
     if (invoice.billing_reason === 'subscription_cycle') {
       createEvent('Subscription', 'customer.subscription.renewed', subscription).catch(console.error);
     }
+    if (invoice.billing_reason === 'subscription_update') {
+      createEvent('Subscription', 'customer.subscription.upgraded', subscription).catch(console.error);
+    }
   }
 
   if (invoice.checkout_session_id) {

package/api/src/routes/connect/shared.ts

@@ -469,9 +469,8 @@ export async function ensureInvoiceForCollect(invoiceId: string) {
   if (paymentIntent.status === 'succeeded') {
     throw new Error(`Payment intent already succeeded for invoice ${invoiceId}`);
   }
-  if (paymentIntent.status === 'processing') {
-    throw new Error(`Payment intent processing for invoice ${invoiceId}`);
-  }
+
+  await paymentIntent.update({ status: 'requires_capture' });
 
   const paymentCurrency = await PaymentCurrency.findByPk(paymentIntent.currency_id);
   const paymentMethod = await PaymentMethod.findByPk(paymentIntent.payment_method_id);

package/api/src/routes/subscriptions.ts

@@ -405,35 +405,18 @@ const validateSubscriptionUpdateRequest = async (subscription: Subscription, ite
     throw new Error('Subscription item should not have duplicate price_id');
   }
 
-  const addedItems = await Price.expand(items.filter((x: any) => x.price_id && !x.id) as LineItem[]);
-  if (addedItems.some((x) => !x.price)) {
-    throw new Error('Subscription item should not use non-exist price');
-  }
-  if (addedItems.some((x) => !x.price.active)) {
-    throw new Error('Subscription item should not use archived price');
-  }
-  for (let i = 0; i < addedItems.length; i++) {
-    const result = isLineItemAligned(addedItems, i);
-    if (result.currency === false) {
-      throw new Error('New subscription items should have same currency');
-    }
-    if (result.recurring === false) {
-      throw new Error('New subscription items should have same recurring');
-    }
-  }
-
+  // split items into added, deleted
+  const addedItems = items.filter((x: any) => x.price_id && !x.id);
+  const deletedItems = items.filter((x: any) => x.deleted && x.id);
+  const updatedItems = items.filter((x: any) => !x.deleted && x.id);
   const existingItems = await SubscriptionItem.findAll({ where: { subscription_id: subscription.id } });
-  const deletedItems = items.filter((x: any) => x.deleted && x.id).map((x: any) => x.id);
-  if (existingItems.length - deletedItems.length + addedItems.length === 0) {
-    throw new Error('Subscription should have at least one subscription item');
-  }
-
-  const existingExpanded = await Price.expand(
-    existingItems.filter((x) => deletedItems.includes(x.id) === false).map((x) => x.toJSON())
-  );
 
   // try handle cross-sell with different interval, just replace with new price that have same interval
-  const newRecurring = addedItems.find((x) => x.price.type === 'recurring')?.price.recurring;
+  let addedExpanded = await Price.expand(addedItems as LineItem[]);
+  let existingExpanded = await Price.expand(
+    existingItems.filter((x) => deletedItems.some((y) => y.id === x.id) === false).map((x) => x.toJSON())
+  );
+  const newRecurring = addedExpanded.find((x) => x.price.type === 'recurring')?.price.recurring;
   await Promise.all(
     existingExpanded.map(async (x: TLineItemExpanded) => {
       const oldRecurring = x.price.recurring;
@@ -453,14 +436,23 @@ const validateSubscriptionUpdateRequest = async (subscription: Subscription, ite
         );
 
         if (newPrice) {
+          deletedItems.push({
+            id: x.id,
+            deleted: true,
+            clear_usage: false,
+          });
+          addedItems.push({
+            price_id: newPrice.id,
+            quantity: x.quantity,
+          });
+
           logger.info('Replace subscription item on update', {
             subscription: subscription.id,
             item: x.id,
             oldPrice: x.price.id,
             newPrice: newPrice.id,
           });
-          x.price_id = newPrice.id;
-          x.price = newPrice.toJSON();
+
           return x;
         }
 
@@ -471,8 +463,22 @@ const validateSubscriptionUpdateRequest = async (subscription: Subscription, ite
     })
   );
 
-  // FIXME: following logic should be extracted
-  const newItems: any[] = [...existingExpanded, ...addedItems];
+  addedExpanded = await Price.expand(addedItems as LineItem[]);
+  existingExpanded = await Price.expand(
+    existingItems.filter((x) => deletedItems.some((y) => y.id === x.id) === false).map((x) => x.toJSON())
+  );
+  if (addedExpanded.some((x) => !x.price)) {
+    throw new Error('Subscription item should not use non-exist price');
+  }
+  if (addedExpanded.some((x) => !x.price.active)) {
+    throw new Error('Subscription item should not use archived price');
+  }
+
+  const updatedExpanded = await Price.expand(updatedItems as LineItem[]);
+  const newItems: any[] = [...existingExpanded, ...addedExpanded, ...updatedExpanded];
+  if (newItems.length === 0) {
+    throw new Error('Subscription should have at least one subscription item');
+  }
   if (newItems.length > MAX_SUBSCRIPTION_ITEM_COUNT) {
     throw new Error(`Subscription should not have more than ${MAX_SUBSCRIPTION_ITEM_COUNT} items`);
   }
@@ -489,6 +495,9 @@ const validateSubscriptionUpdateRequest = async (subscription: Subscription, ite
   return {
     existingItems,
     addedItems,
+    updatedItems,
+    deletedItems,
+    addedExpanded,
     newItems,
   };
 };
@@ -684,40 +693,40 @@ router.put('/:id', authPortal, async (req, res) => {
       // handle subscription item changes
       if (Array.isArray(req.body.items) && req.body.items.length > 0) {
         // validate the request
-        const { existingItems, addedItems, newItems } = await validateSubscriptionUpdateRequest(
-          subscription,
-          req.body.items
-        );
+        const { existingItems, addedItems, updatedItems, deletedItems, newItems } =
+          await validateSubscriptionUpdateRequest(subscription, req.body.items);
 
         // update subscription items
-        for (const item of req.body.items) {
-          if (item.deleted) {
-            if (item.clear_usage) {
-              await UsageRecord.destroy({ where: { subscription_item_id: item.id } });
-              logger.info('subscription item usage cleared', { subscription: req.params.id, item: item.id });
-            }
-            await SubscriptionItem.destroy({ where: { id: item.id } });
-            logger.info('subscription item deleted', { subscription: req.params.id, item: item.id });
-          } else {
-            const exist = existingItems.find((x) => x.id === item.id);
-            if (exist) {
-              await exist.update(pick(item, ['quantity', 'metadata', 'billing_thresholds']));
-              logger.info('subscription item updated', { subscription: req.params.id, item: item.id });
-            } else {
-              await SubscriptionItem.create({
-                ...item,
-                livemode: subscription.livemode,
-                subscription_id: subscription.id,
-              });
-              logger.info('subscription item added', { subscription: req.params.id, item: item.id });
-            }
+        for (const item of addedItems) {
+          await SubscriptionItem.create({
+            price_id: item.price_id as string,
+            quantity: item.quantity as number,
+            livemode: subscription.livemode,
+            subscription_id: subscription.id,
+            metadata: {},
+          });
+          logger.info('subscription item added', { subscription: req.params.id, item: item.id });
+        }
+        for (const item of updatedItems) {
+          const exist = existingItems.find((x) => x.id === item.id);
+          if (exist) {
+            await exist.update(pick(item, ['quantity', 'metadata', 'billing_thresholds']));
+            logger.info('subscription item updated', { subscription: req.params.id, item: item.id });
+          }
+        }
+        for (const item of deletedItems) {
+          if (item.clear_usage) {
+            await UsageRecord.destroy({ where: { subscription_item_id: item.id } });
+            logger.info('subscription item usage cleared', { subscription: req.params.id, item: item.id });
           }
+          await SubscriptionItem.destroy({ where: { id: item.id } });
+          logger.info('subscription item deleted', { subscription: req.params.id, item: item.id });
         }
 
         // update subscription period settings
         // HINT: if we are adding new items, we need to reset the anchor to now
         const setup = getSubscriptionCreateSetup(newItems, paymentCurrency.id, 0);
-        if (addedItems.some((x) => x.price.type === 'recurring')) {
+        if (newItems.some((x) => x.price.type === 'recurring' && addedItems.find((y) => y.price_id === x.price_id))) {
           updates.pending_invoice_item_interval = setup.recurring;
           updates.current_period_start = setup.period.start;
           updates.current_period_end = setup.period.end;
@@ -980,7 +989,10 @@ router.post('/:id/update', authPortal, async (req, res) => {
     }
 
     // validate the request
-    const { newItems } = await validateSubscriptionUpdateRequest(subscription, req.body.items);
+    const { newItems, addedItems, deletedItems, updatedItems } = await validateSubscriptionUpdateRequest(
+      subscription,
+      req.body.items
+    );
 
     // do the simulation
     const setup = getSubscriptionCreateSetup(newItems, subscription.currency_id, 0);
@@ -992,6 +1004,9 @@ router.post('/:id/update', authPortal, async (req, res) => {
       credit: result.credit,
       prorations: result.prorations,
       items: newItems,
+      addedItems,
+      deletedItems,
+      updatedItems,
     });
   } catch (err) {
     console.error(err);

package/api/src/store/models/types.ts

@@ -413,6 +413,7 @@ export type EventType = LiteralUnion<
   | 'customer.subscription.pending_update_expired'
   | 'customer.subscription.resumed'
   | 'customer.subscription.renewed'
+  | 'customer.subscription.upgraded'
   | 'customer.subscription.renew_failed'
   | 'customer.subscription.trial_start'
   | 'customer.subscription.trial_will_end'

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.13.97
+version: 1.13.99
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.97",
+  "version": "1.13.99",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -110,7 +110,7 @@
     "@abtnode/types": "1.16.21",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.97",
+    "@did-pay/types": "1.13.99",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "f9ca9bf2030d0a2552b71c66470cbaf3964df0f8"
+  "gitHead": "abb8f6d451350b07f5755fe4d599e8a438b3cfe1"
 }