payment-kit 1.22.31 → 1.22.32

package/api/src/routes/meter-events.ts

@@ -97,7 +97,7 @@ router.get('/', authMine, async (req, res) => {
     if (query.customer_id) {
       where[Op.and] = where[Op.and] || [];
       where[Op.and].push(
-        Sequelize.where(Sequelize.fn('json_extract', Sequelize.col('payload'), '$.customer_id'), query.customer_id)
+        Sequelize.where(Sequelize.literal("json_extract(payload, '$.customer_id')"), query.customer_id)
       );
     }
 

package/api/src/store/models/credit-grant.ts

@@ -427,9 +427,18 @@ export class CreditGrant extends Model<InferAttributes<CreditGrant>, InferCreati
       targetCurrencyIds = grantsWithCurrency.map((grant: any) => grant.currency_id);
     }
 
+    const currencies = await PaymentCurrency.scope('withRechargeConfig').findAll({
+      where: {
+        id: {
+          [Op.in]: Array.from(new Set(targetCurrencyIds)),
+        },
+      },
+    });
+    const currencyMap = new Map(currencies.map((c) => [c.id, c]));
+
     await Promise.all(
       targetCurrencyIds.map(async (currencyId: string) => {
-        const paymentCurrency = await PaymentCurrency.scope('withRechargeConfig').findByPk(currencyId);
+        const paymentCurrency = currencyMap.get(currencyId);
         if (!paymentCurrency) {
           return null;
         }

package/api/src/store/models/meter-event.ts

@@ -373,27 +373,52 @@ export class MeterEvent extends Model<InferAttributes<MeterEvent>, InferCreation
     const summary: GroupedBN = {};
     const detail: GroupedStrList = {};
 
-    await Promise.all(
-      events.map(async (event) => {
-        const meter = await Meter.getMeterByEventName(event.event_name);
-        if (!meter) {
-          return;
-        }
-        const paymentCurrency = await PaymentCurrency.findByPk(meter.currency_id);
-        if (!paymentCurrency) {
-          return;
-        }
-        const currencyId = meter.currency_id as string;
-        if (searchCurrencyId && searchCurrencyId !== currencyId) {
-          return;
-        }
-        if (!detail[currencyId]) {
-          detail[currencyId] = [];
-        }
-        summary[currencyId] = new BN(summary[currencyId] || '0').add(new BN(event.credit_pending)).toString();
-        detail[currencyId]!.push(event.id);
-      })
-    );
+    if (events.length === 0) {
+      return [summary, detail, events];
+    }
+
+    const eventNames = [...new Set(events.map((e) => e.event_name))];
+    const meters = await Meter.findAll({
+      where: {
+        event_name: {
+          [Op.in]: eventNames,
+        },
+      },
+    });
+    const meterMap = new Map(meters.map((m) => [m.event_name, m]));
+
+    const currencyIds = [...new Set(meters.map((m) => m.currency_id).filter((id): id is string => Boolean(id)))];
+    const currencies =
+      currencyIds.length > 0
+        ? await PaymentCurrency.findAll({
+            where: {
+              id: {
+                [Op.in]: currencyIds,
+              },
+            },
+          })
+        : [];
+    const currencyMap = new Map(currencies.map((c) => [c.id, c]));
+
+    events.forEach((event) => {
+      const meter = meterMap.get(event.event_name);
+      if (!meter || !meter.currency_id) {
+        return;
+      }
+      const paymentCurrency = currencyMap.get(meter.currency_id);
+      if (!paymentCurrency) {
+        return;
+      }
+      const currencyId = meter.currency_id as string;
+      if (searchCurrencyId && searchCurrencyId !== currencyId) {
+        return;
+      }
+      if (!detail[currencyId]) {
+        detail[currencyId] = [];
+      }
+      summary[currencyId] = new BN(summary[currencyId] || '0').add(new BN(event.credit_pending)).toString();
+      detail[currencyId]!.push(event.id);
+    });
 
     return [summary, detail, events];
   }
@@ -424,14 +449,12 @@ export class MeterEvent extends Model<InferAttributes<MeterEvent>, InferCreation
     if (subscriptionId) {
       where[Op.and] = where[Op.and] || [];
       where[Op.and].push(
-        Sequelize.where(Sequelize.fn('json_extract', Sequelize.col('payload'), '$.subscription_id'), subscriptionId)
+        Sequelize.where(Sequelize.literal("json_extract(payload, '$.subscription_id')"), subscriptionId)
       );
     }
     if (customerId) {
       where[Op.and] = where[Op.and] || [];
-      where[Op.and].push(
-        Sequelize.where(Sequelize.fn('json_extract', Sequelize.col('payload'), '$.customer_id'), customerId)
-      );
+      where[Op.and].push(Sequelize.where(Sequelize.literal("json_extract(payload, '$.customer_id')"), customerId));
     }
 
     return this._getPendingAmounts(where, currencyId);

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.22.31",
+  "version": "1.22.32",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -57,9 +57,9 @@
     "@blocklet/error": "^0.3.4",
     "@blocklet/js-sdk": "^1.17.4",
     "@blocklet/logger": "^1.17.4",
-    "@blocklet/payment-broker-client": "1.22.31",
-    "@blocklet/payment-react": "1.22.31",
-    "@blocklet/payment-vendor": "1.22.31",
+    "@blocklet/payment-broker-client": "1.22.32",
+    "@blocklet/payment-react": "1.22.32",
+    "@blocklet/payment-vendor": "1.22.32",
     "@blocklet/sdk": "^1.17.4",
     "@blocklet/ui-react": "^3.2.11",
     "@blocklet/uploader": "^0.3.14",
@@ -129,7 +129,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.4",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.22.31",
+    "@blocklet/payment-types": "1.22.32",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -176,5 +176,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "fc03087134d309474256b122eba125e4a01dd6c0"
+  "gitHead": "4b5eac2af9a6a10a4f971f7dcbe220e8049d0cc7"
 }