payment-kit 1.13.107 → 1.13.108

package/api/src/queues/checkout-session.ts

@@ -151,7 +151,12 @@ export async function startCheckoutSessionQueue() {
     for (const item of checkoutSession.line_items) {
       const price = await Price.findByPk(item.price_id);
       if (price?.locked) {
-        const used = await price.isUsed();
+        const used = await price.isUsed(false);
+        logger.info('Price used status recheck on expire', {
+          checkoutSession: checkoutSession.id,
+          priceId: item.price_id,
+          used,
+        });
         if (!used) {
           await price.update({ locked: false });
           logger.info('Price for checkout session unlocked on expire', {

package/api/src/routes/prices.ts

@@ -5,6 +5,7 @@ import pick from 'lodash/pick';
 import type { WhereOptions } from 'sequelize';
 
 import { getWhereFromQuery } from '../libs/api';
+import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
 import { canUpsell } from '../libs/session';
 import { PaymentCurrency } from '../store/models/payment-currency';
@@ -202,6 +203,21 @@ router.get('/:id', auth, async (req, res) => {
   res.json(await getExpandedPrice(req.params.id as string));
 });
 
+// get price used status
+router.get('/:id/used', auth, async (req, res) => {
+  const price = await Price.findByPkOrLookupKey(req.params.id as string);
+  if (!price) {
+    return res.status(404).json({ error: 'Price not found' });
+  }
+
+  const used = await price.isUsed(true);
+  if (!used) {
+    await price.update({ locked: false });
+  }
+
+  return res.json({ used });
+});
+
 router.get('/:id/upsell', auth, async (req, res) => {
   const price = await Price.findByPkOrLookupKey(req.params.id as string, {
     include: [{ model: PaymentCurrency, as: 'currency' }],
@@ -305,22 +321,27 @@ router.put('/:id/archive', auth, async (req, res) => {
 
 // delete price
 router.delete('/:id', auth, async (req, res) => {
-  const price = await Price.findByPkOrLookupKey(req.params.id as string);
+  try {
+    const price = await Price.findByPkOrLookupKey(req.params.id as string);
 
-  if (!price) {
-    return res.status(404).json({ error: 'Can not delete none existing price' });
-  }
+    if (!price) {
+      return res.status(404).json({ error: 'Can not delete none existing price' });
+    }
 
-  if (price.locked) {
-    return res.status(403).json({ error: 'Can not delete locked price' });
-  }
+    if (price.locked) {
+      return res.status(403).json({ error: 'Can not delete locked price' });
+    }
 
-  if (await price.isUsed()) {
-    return res.status(403).json({ error: 'Can not delete price used by other resources' });
-  }
+    if (await price.isUsed(true)) {
+      return res.status(403).json({ error: 'Can not delete price used by other resources' });
+    }
 
-  await price.destroy();
-  return res.json(price);
+    await price.destroy();
+    return res.json(price);
+  } catch (err) {
+    logger.error('delete price error', err);
+    return res.status(400).json({ error: err.message });
+  }
 });
 
 export default router;

package/api/src/routes/products.ts

@@ -266,7 +266,7 @@ router.delete('/:id', auth, async (req, res) => {
         return res.status(403).json({ error: 'product have prices that is locked' });
       }
       // eslint-disable-next-line no-await-in-loop
-      if (await price.isUsed(true)) {
+      if (await price.isUsed(false)) {
         return res.status(403).json({ error: 'product have prices that is used by other resources' });
       }
     }

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

@@ -14,6 +14,7 @@ import {
 import type { LiteralUnion } from 'type-fest';
 
 import { createEvent } from '../../libs/audit';
+import logger from '../../libs/logger';
 import { createIdGenerator, formatMetadata } from '../../libs/util';
 import { sequelize } from '../sequelize';
 import type { TPaymentCurrency } from './payment-currency';
@@ -373,45 +374,63 @@ export class Price extends Model<InferAttributes<Price>, InferCreationAttributes
     });
   }
 
-  public async isUsed(skipProduct: boolean = false) {
+  public async isUsed(checkProduct: boolean = false) {
     const { SubscriptionItem, InvoiceItem, Product } = this.sequelize.models;
 
-    let used = skipProduct ? false : (await Product!.count({ where: { default_price_id: this.id } })) > 0;
+    let used = checkProduct ? (await Product!.count({ where: { default_price_id: this.id } })) > 0 : false;
+    if (used) {
+      logger.info('Price is used as default product price', { priceId: this.id });
+      return true;
+    }
 
-    if (!used) {
-      // @ts-ignore
-      used = await InvoiceItem!.isPriceUsed(this.id);
+    // @ts-ignore
+    used = await InvoiceItem!.isPriceUsed(this.id);
+    if (used) {
+      logger.info('Price is used by invoice item', { priceId: this.id });
+      return true;
     }
-    if (!used) {
-      // @ts-ignore
-      used = await SubscriptionItem!.isPriceUsed(this.id);
+
+    // @ts-ignore
+    used = await SubscriptionItem!.isPriceUsed(this.id);
+    if (used) {
+      logger.info('Price is used by subscription item', { priceId: this.id });
+      return true;
     }
-    if (!used) {
-      // @ts-ignore
-      const [{ count }] = await this.sequelize.query(
-        `SELECT count(*) AS count FROM pricing_tables JOIN json_each(items) AS item ON json_extract(item.value, '$.price_id') = '${this.id}'`,
-        { type: QueryTypes.SELECT }
-      );
-      used = count > 0;
+
+    // @ts-ignore
+    let [{ count }] = await this.sequelize.query(
+      `SELECT count(*) AS count FROM pricing_tables JOIN json_each(items) AS item ON json_extract(item.value, '$.price_id') = '${this.id}'`,
+      { type: QueryTypes.SELECT }
+    );
+    used = count > 0;
+    if (used) {
+      logger.info('Price is used by pricing table', { priceId: this.id });
+      return true;
     }
-    if (!used) {
-      // @ts-ignore
-      const [{ count }] = await this.sequelize.query(
-        `SELECT count(*) AS count FROM payment_links JOIN json_each(line_items) AS item ON json_extract(item.value, '$.price_id') = '${this.id}'`,
-        { type: QueryTypes.SELECT }
-      );
-      used = count > 0;
+
+    // @ts-ignore
+    [{ count }] = await this.sequelize.query(
+      `SELECT count(*) AS count FROM payment_links JOIN json_each(line_items) AS item ON json_extract(item.value, '$.price_id') = '${this.id}'`,
+      { type: QueryTypes.SELECT }
+    );
+    used = count > 0;
+    if (used) {
+      logger.info('Price is used by payment link', { priceId: this.id });
+      return true;
     }
-    if (!used) {
-      // @ts-ignore
-      const [{ count }] = await this.sequelize.query(
-        `SELECT count(cs.id) AS count FROM checkout_sessions AS cs JOIN json_each(line_items) AS item ON json_extract(item.value, '$.price_id') = '${this.id}' WHERE cs.status != 'expired'`,
-        { type: QueryTypes.SELECT }
-      );
-      used = count > 0;
+
+    // @ts-ignore
+    [{ count }] = await this.sequelize.query(
+      `SELECT count(cs.id) AS count FROM checkout_sessions AS cs JOIN json_each(line_items) AS item ON json_extract(item.value, '$.price_id') = '${this.id}' WHERE cs.status != 'expired'`,
+      { type: QueryTypes.SELECT }
+    );
+    used = count > 0;
+    if (used) {
+      logger.info('Price is used by active checkout session', { priceId: this.id });
+      return true;
     }
 
-    return used;
+    return false;
   }
 }
 

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.107
+version: 1.13.108
 logo: logo.png
 files:
   - dist

package/package.json

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