payment-kit 1.13.161 → 1.13.162

package/.eslintrc.js

@@ -11,6 +11,7 @@ module.exports = {
     '@typescript-eslint/no-use-before-define': 'off',
     '@typescript-eslint/lines-between-class-members': 'off',
     'import/prefer-default-export': 'off',
-    "react-hooks/exhaustive-deps": "off"
+    "react-hooks/exhaustive-deps": "off",
+    'jsx-a11y/no-noninteractive-element-interactions': "off"
   },
 };

package/api/src/libs/api.ts

@@ -71,44 +71,33 @@ export function getWhereFromQuery(query: string) {
   return handleCondition(parsed);
 }
 
-export const getWhereFromKvQuery = (query: string, isSubWhere?: boolean) => {
+export const getWhereFromKvQuery = (query?: string) => {
+  if (!query) {
+    return {};
+  }
   const out: any = {};
   const likes: any = [];
-  const subLikes: any = [];
-  query.split(' ').forEach((kv: string) => {
+  const fn = (kv: string) => {
     const [k, v] = kv.split(':');
-
     if (v) {
       let value = decodeURIComponent(v).replace('+', ' ');
-      if ((k as any).indexOf('like') > -1) {
-        let kk = k?.slice(5);
-
-        if (kk === 'did' || kk === 'name' || kk === 'email') {
-          kk = isSubWhere ? kk : `$customer.${kk}$`;
-          value = { [kk as any]: { [Op.like]: `%${v}%` } } as any;
-          subLikes.push(value);
-        } else {
-          value = { [kk as any]: { [Op.like]: `%${v}%` } } as any;
-          likes.push(value);
-        }
+      if (value.includes(',')) {
+        value = {
+          [Op.in]: v.split(','),
+        } as any;
+        out[k as string] = value;
+      } else if ((k as any).includes('like')) {
+        const kk = k?.slice(5);
+        value = { [kk as any]: { [Op.like]: `%${v}%` } } as any;
+        likes.push(value);
       } else {
         out[k as string] = value;
       }
     }
-  });
-
-  if (isSubWhere) {
-    return [
-      {
-        [Op.or]: likes,
-      },
-      {
-        [Op.or]: subLikes,
-      },
-    ];
-  }
-  if (likes.length || subLikes.length) {
-    out[Op.or] = subLikes.concat(likes);
+  };
+  query.split(' ').forEach(fn);
+  if (likes.length) {
+    out[Op.or] = likes;
   }
   return out;
 };

package/api/src/routes/customers.ts

@@ -2,7 +2,6 @@ import { user } from '@blocklet/sdk/lib/middlewares';
 import { Router } from 'express';
 import Joi from 'joi';
 import pick from 'lodash/pick';
-import type { WhereOptions } from 'sequelize';
 
 import { getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
 import { authenticate } from '../libs/security';
@@ -26,15 +25,19 @@ const schema = Joi.object<{
   pageSize: number;
   did?: string;
   livemode?: boolean;
+  q?: string;
+  o?: string;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
   did: Joi.string().empty(''),
   livemode: Joi.boolean().empty(''),
+  q: Joi.string().empty(''), // query
+  o: Joi.string().empty(''), // order
 });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, ...query } = await schema.validateAsync(req.query, { stripUnknown: true });
-  const where: WhereOptions<Customer> = {};
+  const where = getWhereFromKvQuery(query.q);
 
   if (typeof query.livemode === 'boolean') {
     where.livemode = query.livemode;
@@ -46,7 +49,7 @@ router.get('/', auth, async (req, res) => {
   try {
     const { rows: list, count } = await Customer.findAndCountAll({
       where,
-      order: [['created_at', 'DESC']],
+      order: [['created_at', query.o === 'asc' ? 'ASC' : 'DESC']],
       offset: (page - 1) * pageSize,
       limit: pageSize,
       include: [],
@@ -66,26 +69,28 @@ const searchSchema = Joi.object<{
   query: string;
   livemode?: boolean;
   q?: string;
+  o?: string;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
   query: Joi.string(),
   livemode: Joi.boolean().empty(''),
-  q: Joi.string(),
+  q: Joi.string().empty(''), // query
+  o: Joi.string().empty(''), // order
 });
 router.get('/search', auth, async (req, res) => {
-  const { page, pageSize, query, livemode, q } = await searchSchema.validateAsync(req.query, {
+  const { page, pageSize, query, livemode, q, o } = await searchSchema.validateAsync(req.query, {
     stripUnknown: false,
     allowUnknown: true,
   });
 
-  const where = q ? getWhereFromKvQuery(q) : getWhereFromQuery(query);
+  const where = q != null ? getWhereFromKvQuery(q) : getWhereFromQuery(query);
   if (typeof livemode === 'boolean') {
     where.livemode = livemode;
   }
   const { rows: list, count } = await Customer.findAndCountAll({
     where,
-    order: [['created_at', 'DESC']],
+    order: [['created_at', o === 'asc' ? 'ASC' : 'DESC']],
     offset: (page - 1) * pageSize,
     limit: pageSize,
     include: [],

package/api/src/routes/invoices.ts

@@ -2,7 +2,6 @@ import { isValid } from '@arcblock/did';
 import { Router } from 'express';
 import Joi from 'joi';
 import pick from 'lodash/pick';
-import type { WhereOptions } from 'sequelize';
 
 import { syncStripeInvoice } from '../integrations/stripe/handlers/invoice';
 import { getWhereFromKvQuery } from '../libs/api';
@@ -40,6 +39,9 @@ const schema = Joi.object<{
   customer_id?: string;
   customer_did?: string;
   subscription_id?: string;
+  currency_id?: string;
+  q?: string;
+  o?: string;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
@@ -48,13 +50,16 @@ const schema = Joi.object<{
   customer_id: Joi.string().empty(''),
   customer_did: Joi.string().empty(''),
   subscription_id: Joi.string().empty(''),
+  currency_id: Joi.string().empty(''),
+  q: Joi.string().empty(''), // query
+  o: Joi.string().empty(''), // order
 });
 router.get('/', authMine, async (req, res) => {
   const { page, pageSize, livemode, status, ...query } = await schema.validateAsync(req.query, {
     stripUnknown: false,
     allowUnknown: true,
   });
-  const where: WhereOptions<Invoice> = {};
+  const where = getWhereFromKvQuery(query.q);
 
   if (status) {
     where.status = status
@@ -65,6 +70,9 @@ router.get('/', authMine, async (req, res) => {
   if (query.customer_id) {
     where.customer_id = query.customer_id;
   }
+  if (query.currency_id) {
+    where.currency_id = query.currency_id;
+  }
   if (query.customer_did && isValid(query.customer_did)) {
     const customer = await Customer.findOne({ where: { did: query.customer_did } });
     if (customer) {
@@ -91,7 +99,7 @@ router.get('/', authMine, async (req, res) => {
   try {
     const { rows: list, count } = await Invoice.findAndCountAll({
       where,
-      order: [['created_at', 'DESC']],
+      order: [['created_at', query.o === 'asc' ? 'ASC' : 'DESC']],
       offset: (page - 1) * pageSize,
       limit: pageSize,
       include: [
@@ -115,14 +123,16 @@ const searchSchema = Joi.object<{
   pageSize: number;
   livemode?: boolean;
   q: string;
+  o?: string;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
   livemode: Joi.boolean().empty(''),
-  q: Joi.string(),
+  q: Joi.string().empty(''), // query
+  o: Joi.string().empty(''), // order
 });
 router.get('/search', authMine, async (req, res) => {
-  const { page, pageSize, livemode, q } = await searchSchema.validateAsync(req.query, {
+  const { page, pageSize, livemode, q, o } = await searchSchema.validateAsync(req.query, {
     stripUnknown: false,
     allowUnknown: true,
   });
@@ -134,9 +144,10 @@ router.get('/search', authMine, async (req, res) => {
 
   const { rows: list, count } = await Invoice.findAndCountAll({
     where,
-    order: [['created_at', 'DESC']],
+    order: [['created_at', o === 'asc' ? 'ASC' : 'DESC']],
     offset: (page - 1) * pageSize,
     limit: pageSize,
+    distinct: true,
     include: [
       { model: PaymentCurrency, as: 'paymentCurrency' },
       { model: Customer, as: 'customer' },

package/api/src/routes/payment-intents.ts

@@ -2,7 +2,6 @@ import { isValid } from '@arcblock/did';
 import { Router } from 'express';
 import Joi from 'joi';
 import pick from 'lodash/pick';
-import type { WhereOptions } from 'sequelize';
 
 import { syncStripPayment } from '../integrations/stripe/handlers/payment-intent';
 import { getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
@@ -38,6 +37,9 @@ const paginationSchema = Joi.object<{
   invoice_id?: string;
   customer_id?: string;
   customer_did?: string;
+  currency_id?: string;
+  q?: string;
+  o?: string;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
@@ -46,13 +48,16 @@ const paginationSchema = Joi.object<{
   invoice_id: Joi.string().empty(''),
   customer_id: Joi.string().empty(''),
   customer_did: Joi.string().empty(''),
+  currency_id: Joi.string().empty(''),
+  q: Joi.string().empty(''), // query
+  o: Joi.string().empty(''), // order
 });
 router.get('/', authMine, async (req, res) => {
   const { page, pageSize, status, livemode, ...query } = await paginationSchema.validateAsync(req.query, {
     stripUnknown: false,
     allowUnknown: true,
   });
-  const where: WhereOptions<PaymentIntent> = {};
+  const where = getWhereFromKvQuery(query.q);
 
   if (status) {
     where.status = status
@@ -75,6 +80,11 @@ router.get('/', authMine, async (req, res) => {
   if (query.invoice_id) {
     where.invoice_id = query.invoice_id;
   }
+
+  if (query.currency_id) {
+    where.currency_id = query.currency_id;
+  }
+
   if (typeof livemode === 'boolean') {
     where.livemode = livemode;
   }
@@ -89,7 +99,7 @@ router.get('/', authMine, async (req, res) => {
   try {
     const { rows: list, count } = await PaymentIntent.findAndCountAll({
       where,
-      order: [['created_at', 'DESC']],
+      order: [['created_at', query.o === 'asc' ? 'ASC' : 'DESC']],
       offset: (page - 1) * pageSize,
       limit: pageSize,
       include: [
@@ -113,27 +123,29 @@ const searchSchema = Joi.object<{
   query: string;
   livemode?: boolean;
   q?: string;
+  o?: string;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
   query: Joi.string(),
   livemode: Joi.boolean().empty(''),
-  q: Joi.string(),
+  q: Joi.string().empty(''), // query
+  o: Joi.string().empty(''), // order
 });
 router.get('/search', authMine, async (req, res) => {
-  const { page, pageSize, query, livemode, q } = await searchSchema.validateAsync(req.query, {
+  const { page, pageSize, query, livemode, q, o } = await searchSchema.validateAsync(req.query, {
     stripUnknown: false,
     allowUnknown: true,
   });
 
-  const where = q ? getWhereFromKvQuery(q) : getWhereFromQuery(query);
+  const where = q != null ? getWhereFromKvQuery(q) : getWhereFromQuery(query);
   if (typeof livemode === 'boolean') {
     where.livemode = livemode;
   }
 
   const { rows: list, count } = await PaymentIntent.findAndCountAll({
     where,
-    order: [['created_at', 'DESC']],
+    order: [['created_at', o === 'asc' ? 'ASC' : 'DESC']],
     offset: (page - 1) * pageSize,
     limit: pageSize,
     include: [

package/api/src/routes/products.ts

@@ -173,7 +173,7 @@ const searchSchema = Joi.object<{
   pageSize: Joi.number().integer().min(1).max(100).default(20),
   query: Joi.string(),
   livemode: Joi.boolean().empty(''),
-  q: Joi.string(),
+  q: Joi.string().empty(''), // query
 });
 router.get('/search', auth, async (req, res) => {
   const { page, pageSize, query, livemode, q } = await searchSchema.validateAsync(req.query, {
@@ -181,7 +181,7 @@ router.get('/search', auth, async (req, res) => {
     allowUnknown: true,
   });
 
-  const where = q ? getWhereFromKvQuery(q) : getWhereFromQuery(query);
+  const where = q != null ? getWhereFromKvQuery(q) : getWhereFromQuery(query);
   if (typeof livemode === 'boolean') {
     where.livemode = livemode;
   }

package/api/src/routes/refunds.ts

@@ -2,8 +2,8 @@
 import { Router } from 'express';
 import Joi from 'joi';
 import pick from 'lodash/pick';
-import type { WhereOptions } from 'sequelize';
 
+import { getWhereFromKvQuery } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { formatMetadata } from '../libs/util';
 import {
@@ -36,22 +36,28 @@ const paginationSchema = Joi.object<{
   status?: string;
   invoice_id: string;
   subscription_id: string;
+  currency_id: string;
   customer_id: string;
+  q?: string;
+  o?: string;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
   livemode: Joi.boolean().empty(''),
   status: Joi.string().empty(''),
   invoice_id: Joi.string().empty(''),
+  currency_id: Joi.string().empty(''),
   subscription_id: Joi.string().empty(''),
   customer_id: Joi.string().empty(''),
+  q: Joi.string().empty(''), // query
+  o: Joi.string().empty(''), // order
 });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, livemode, status, ...query } = await paginationSchema.validateAsync(req.query, {
     stripUnknown: false,
     allowUnknown: true,
   });
-  const where: WhereOptions<Refund> = {};
+  const where = getWhereFromKvQuery(query.q);
 
   if (typeof livemode === 'boolean') {
     where.livemode = livemode;
@@ -61,6 +67,10 @@ router.get('/', auth, async (req, res) => {
     where.invoice_id = query.invoice_id;
   }
 
+  if (query.currency_id) {
+    where.currency_id = query.currency_id;
+  }
+
   if (query.customer_id) {
     where.customer_id = query.customer_id;
   }
@@ -68,6 +78,7 @@ router.get('/', auth, async (req, res) => {
   if (query.subscription_id) {
     where.subscription_id = query.subscription_id;
   }
+
   if (status) {
     where.status = status
       .split(',')
@@ -84,7 +95,7 @@ router.get('/', auth, async (req, res) => {
 
   const { rows: list, count } = await Refund.findAndCountAll({
     where,
-    order: [['created_at', 'DESC']],
+    order: [['created_at', query.o === 'asc' ? 'ASC' : 'DESC']],
     offset: (page - 1) * pageSize,
     limit: pageSize,
     include: [
@@ -101,6 +112,45 @@ router.get('/', auth, async (req, res) => {
   res.json({ count, list });
 });
 
+const searchSchema = Joi.object<{
+  page: number;
+  pageSize: number;
+  livemode?: boolean;
+  q: string;
+  o?: string;
+}>({
+  page: Joi.number().integer().min(1).default(1),
+  pageSize: Joi.number().integer().min(1).max(100).default(20),
+  livemode: Joi.boolean().empty(''),
+  q: Joi.string().empty(''), // query
+  o: Joi.string().empty(''), // order
+});
+
+router.get('/search', auth, async (req, res) => {
+  const { page, pageSize, livemode, q, o } = await searchSchema.validateAsync(req.query, {
+    stripUnknown: false,
+    allowUnknown: true,
+  });
+
+  const where = getWhereFromKvQuery(q);
+  if (typeof livemode === 'boolean') {
+    where.livemode = livemode;
+  }
+
+  const { rows: list, count } = await Refund.findAndCountAll({
+    where,
+    order: [['created_at', o === 'asc' ? 'ASC' : 'DESC']],
+    offset: (page - 1) * pageSize,
+    limit: pageSize,
+    include: [
+      { model: PaymentCurrency, as: 'paymentCurrency' },
+      { model: Customer, as: 'customer' },
+    ],
+  });
+
+  res.json({ count, list });
+});
+
 router.get('/:id', auth, async (req, res) => {
   const doc = await Refund.findByPk(req.params.id as string, {
     include: [

package/api/src/routes/subscription-items.ts

@@ -42,16 +42,26 @@ const schema = Joi.object<{
   page: number;
   pageSize: number;
   subscription_id: string;
+  price_id: string;
   livemode?: boolean;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
-  subscription_id: Joi.string().required(),
+  subscription_id: Joi.string(),
+  price_id: Joi.string(),
   livemode: Joi.boolean().empty(''),
 });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, ...query } = await schema.validateAsync(req.query, { stripUnknown: true });
-  const where: WhereOptions<SubscriptionItem> = { subscription_id: query.subscription_id };
+  const where: WhereOptions<SubscriptionItem> = {};
+
+  if (query.subscription_id) {
+    where.subscription_id = query.subscription_id;
+  }
+
+  if (query.price_id) {
+    where.price_id = query.price_id;
+  }
 
   if (typeof query.livemode === 'boolean') {
     where.livemode = query.livemode;
@@ -65,14 +75,13 @@ router.get('/', auth, async (req, res) => {
       limit: pageSize,
       include: [],
     });
-
     const list = rows.map((x) => x.toJSON());
-    const products = (await Product.findAll()).map((x) => x.toJSON());
-    const prices = (await Price.findAll()).map((x) => x.toJSON());
-
-    // @ts-ignore
-    expandLineItems(list, products, prices);
-
+    if (where.subscription_id) {
+      const products = (await Product.findAll()).map((x) => x.toJSON());
+      const prices = (await Price.findAll()).map((x) => x.toJSON());
+      // @ts-ignore
+      expandLineItems(list, products, prices);
+    }
     res.json({ count, list });
   } catch (err) {
     console.error(err);

package/api/src/routes/subscriptions.ts

@@ -4,7 +4,6 @@ import { Router } from 'express';
 import Joi from 'joi';
 import pick from 'lodash/pick';
 import uniq from 'lodash/uniq';
-import type { WhereOptions } from 'sequelize';
 
 import { ensureStripeSubscription } from '../integrations/stripe/resource';
 import { getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
@@ -66,6 +65,8 @@ const schema = Joi.object<{
   customer_id?: string;
   customer_did?: string;
   livemode?: boolean;
+  q?: string;
+  o?: string;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
@@ -73,13 +74,15 @@ const schema = Joi.object<{
   customer_id: Joi.string().empty(''),
   customer_did: Joi.string().empty(''),
   livemode: Joi.boolean().empty(''),
+  q: Joi.string().empty(''), // query
+  o: Joi.string().empty(''), // order
 });
 router.get('/', authMine, async (req, res) => {
   const { page, pageSize, status, livemode, ...query } = await schema.validateAsync(req.query, {
     stripUnknown: false,
     allowUnknown: true,
   });
-  const where: WhereOptions<Subscription> = {};
+  const where = getWhereFromKvQuery(query.q);
 
   if (status) {
     where.status = status
@@ -113,7 +116,7 @@ router.get('/', authMine, async (req, res) => {
   try {
     const { rows: list, count } = await Subscription.findAndCountAll({
       where,
-      order: [['created_at', 'DESC']],
+      order: [['created_at', query.o === 'asc' ? 'ASC' : 'DESC']],
       offset: (page - 1) * pageSize,
       limit: pageSize,
       include: [
@@ -146,27 +149,29 @@ const searchSchema = Joi.object<{
   query: string;
   livemode?: boolean;
   q?: string;
+  o?: string;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
   query: Joi.string(),
   livemode: Joi.boolean().empty(''),
-  q: Joi.string(),
+  q: Joi.string().empty(''), // query
+  o: Joi.string().empty(''), // order
 });
 router.get('/search', auth, async (req, res) => {
-  const { page, pageSize, query, livemode, q } = await searchSchema.validateAsync(req.query, {
+  const { page, pageSize, query, livemode, q, o } = await searchSchema.validateAsync(req.query, {
     stripUnknown: false,
     allowUnknown: true,
   });
 
-  const where = q ? getWhereFromKvQuery(q, true) : getWhereFromQuery(query);
+  const where = q != null ? getWhereFromKvQuery(q) : getWhereFromQuery(query);
   if (typeof livemode === 'boolean') {
     where.livemode = livemode;
   }
   // fix here https://github.com/blocklet/payment-kit/issues/394
-  const { rows: list1, count: count1 } = await Subscription.findAndCountAll({
-    where: q ? where[0] : where,
-    order: [['created_at', 'DESC']],
+  const { rows: list, count } = await Subscription.findAndCountAll({
+    where,
+    order: [['created_at', o === 'asc' ? 'ASC' : 'DESC']],
     offset: (page - 1) * pageSize,
     limit: pageSize,
     distinct: true,
@@ -178,28 +183,12 @@ router.get('/search', auth, async (req, res) => {
     ],
   });
 
-  let count = count1;
-  let list = list1;
-
-  if (q) {
-    const { rows: list2, count: count2 } = await Subscription.findAndCountAll({
-      order: [['created_at', 'DESC']],
-      offset: (page - 1) * pageSize,
-      limit: pageSize,
-      distinct: true,
-      include: [
-        { model: Customer, as: 'customer', where: where[1] },
-        { model: PaymentCurrency, as: 'paymentCurrency' },
-        { model: PaymentMethod, as: 'paymentMethod' },
-        { model: SubscriptionItem, as: 'items' },
-      ],
-    });
-
-    count = count1 + count2;
-    list = list1.concat(list2 || []);
-  }
-
-  res.json({ count, list });
+  const products = (await Product.findAll()).map((x) => x.toJSON());
+  const prices = (await Price.findAll()).map((x) => x.toJSON());
+  const docs = list.map((x) => x.toJSON());
+  // @ts-ignore
+  docs.forEach((x) => expandLineItems(x.items, products, prices));
+  res.json({ count, list: docs });
 });
 
 // FIXME: exclude some sensitive fields from PaymentMethod

package/api/tests/libs/util.spec.ts

@@ -206,30 +206,4 @@ describe('getWhereFromKvQuery', () => {
     });
   });
 
-  it('should return a customer likes object when the q string with like', () => {
-    const q = 'like-did:123 like-number:1533';
-    const result = getWhereFromKvQuery(q);
-    expect(result).toEqual({
-      [Op.or]: [
-        { '$customer.did$': { [Op.like]: `%123%` } },
-        { number: { [Op.like]: `%1533%` } }
-      ],
-    });
-  });
-
-  it('should return a customer likes object when the subWhere is true', () => {
-    const q = 'like-did:123 like-number:1533';
-    const result = getWhereFromKvQuery(q, true);
-    expect(result).toEqual([
-      {
-        [Op.or]: [
-          { number: { [Op.like]: `%1533%` } }
-        ],
-      }, {
-        [Op.or]: [
-          { did: { [Op.like]: `%123%` } }
-        ],
-      }
-    ]);
-  });
 });

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