payment-kit 1.19.3 → 1.19.4

package/api/src/routes/credit-transactions.ts

@@ -23,6 +23,7 @@ const listSchema = createListParamSchema<{
   customer_id?: string;
   subscription_id?: string;
   credit_grant_id?: string;
+  meter_id?: string;
   start?: number;
   end?: number;
   source?: string;
@@ -30,6 +31,7 @@ const listSchema = createListParamSchema<{
   customer_id: Joi.string().empty(''),
   subscription_id: Joi.string().empty(''),
   credit_grant_id: Joi.string().empty(''),
+  meter_id: Joi.string().empty(''),
   start: Joi.number().integer().optional(),
   end: Joi.number().integer().optional(),
   source: Joi.string().empty(''),
@@ -40,6 +42,9 @@ router.get('/', authMine, async (req, res) => {
     const { page, pageSize, ...query } = await listSchema.validateAsync(req.query, { stripUnknown: true });
     const where = getWhereFromKvQuery(query.q);
 
+    if (query.meter_id) {
+      where.meter_id = query.meter_id;
+    }
     if (query.customer_id) {
       where.customer_id = query.customer_id;
     }
@@ -123,6 +128,7 @@ const summarySchema = Joi.object({
   customer_id: Joi.string().optional(),
   subscription_id: Joi.string().optional(),
   currency_id: Joi.string().optional(),
+  meter_id: Joi.string().optional(),
   start: Joi.number().integer().optional(),
   end: Joi.number().integer().optional(),
 }).unknown(true);
@@ -134,6 +140,7 @@ router.get('/summary', authMine, async (req, res) => {
       customer_id: customerId,
       subscription_id: subscriptionId,
       currency_id: currencyId,
+      meter_id: meterId,
       start,
       end,
     } = await summarySchema.validateAsync(req.query, { stripUnknown: true });
@@ -142,6 +149,7 @@ router.get('/summary', authMine, async (req, res) => {
       customerId,
       subscriptionId,
       currencyId,
+      meterId,
       startTime: start ? new Date(start * 1000) : undefined,
       endTime: end ? new Date(end * 1000) : undefined,
     });

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

@@ -142,6 +142,7 @@ export class CreditTransaction extends Model<
     subscriptionId,
     meterEventName,
     currencyId,
+    meterId,
     startTime,
     endTime,
   }: {
@@ -149,6 +150,7 @@ export class CreditTransaction extends Model<
     subscriptionId?: string;
     meterEventName?: string;
     currencyId?: string;
+    meterId?: string;
     startTime?: Date;
     endTime?: Date;
   }) {
@@ -169,6 +171,10 @@ export class CreditTransaction extends Model<
       whereClause['$creditGrant.currency_id$'] = currencyId;
     }
 
+    if (meterId) {
+      whereClause.meter_id = meterId;
+    }
+
     if (startTime || endTime) {
       whereClause.created_at = {};
       if (startTime) {
@@ -212,6 +218,7 @@ export class CreditTransaction extends Model<
         customer_id: customerId,
         subscription_id: subscriptionId,
         meter_event_name: meterEventName,
+        meter_id: meterId,
         currency_id: currencyId,
         start_time: startTime?.toISOString(),
         end_time: endTime?.toISOString(),

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.19.3",
+  "version": "1.19.4",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -43,20 +43,20 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.45",
+    "@abtnode/cron": "^1.16.46",
     "@arcblock/did": "^1.20.15",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^3.0.22",
+    "@arcblock/did-connect": "^3.0.24",
     "@arcblock/did-util": "^1.20.15",
     "@arcblock/jwt": "^1.20.15",
-    "@arcblock/ux": "^3.0.22",
+    "@arcblock/ux": "^3.0.24",
     "@arcblock/validator": "^1.20.15",
     "@blocklet/did-space-js": "^1.1.5",
-    "@blocklet/js-sdk": "^1.16.45",
-    "@blocklet/logger": "^1.16.45",
-    "@blocklet/payment-react": "1.19.3",
-    "@blocklet/sdk": "^1.16.45",
-    "@blocklet/ui-react": "^3.0.22",
+    "@blocklet/js-sdk": "^1.16.46",
+    "@blocklet/logger": "^1.16.46",
+    "@blocklet/payment-react": "1.19.4",
+    "@blocklet/sdk": "^1.16.46",
+    "@blocklet/ui-react": "^3.0.24",
     "@blocklet/uploader": "^0.2.4",
     "@blocklet/xss": "^0.2.2",
     "@mui/icons-material": "^7.1.2",
@@ -120,9 +120,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.16.45",
+    "@abtnode/types": "^1.16.46",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.19.3",
+    "@blocklet/payment-types": "1.19.4",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -168,5 +168,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "f274edb338c8f5a23ae46d9f7fea8458a6001cf7"
+  "gitHead": "ced79cc9e205a344b6fdce2f43ac8d27bb37f5f4"
 }