payment-kit 1.13.40 → 1.13.41

package/api/src/store/migrate.ts

@@ -1,3 +1,5 @@
+/* eslint-disable no-await-in-loop */
+import type { QueryInterface } from 'sequelize';
 import { SequelizeStorage, Umzug } from 'umzug';
 
 import { sequelize } from './sequelize';
@@ -13,4 +15,19 @@ export default function migrate() {
   return umzug.up();
 }
 
+type ColumnChanges = Record<string, { name: string; field: any }[]>;
+export async function safeApplyColumnChanges(context: QueryInterface, changes: ColumnChanges) {
+  for (const [table, columns] of Object.entries(changes)) {
+    const schema = await context.describeTable(table);
+    for (const { name, field } of columns) {
+      if (!schema[name]) {
+        await context.addColumn(table, name, field);
+        if (field.defaultValue) {
+          await context.bulkUpdate(table, { [name]: field.defaultValue }, {});
+        }
+      }
+    }
+  }
+}
+
 export type Migration = typeof umzug._types.migration;

package/api/src/store/migrations/20231021-nft.ts

@@ -1,16 +1,25 @@
+/* eslint-disable no-await-in-loop */
 import { DataTypes } from 'sequelize';
 
-import type { Migration } from '../migrate';
+import { Migration, safeApplyColumnChanges } from '../migrate';
 
 export const up: Migration = async ({ context }) => {
-  await context.addColumn('payment_links', 'nft_mint_settings', { type: DataTypes.JSON, allowNull: true });
-  await context.addColumn('checkout_sessions', 'payment_intent_data', { type: DataTypes.JSON, allowNull: true });
-  await context.addColumn('checkout_sessions', 'nft_mint_settings', { type: DataTypes.JSON, allowNull: true });
-  await context.addColumn('checkout_sessions', 'nft_mint_details', { type: DataTypes.JSON, allowNull: true });
-  await context.addColumn('checkout_sessions', 'nft_mint_status', {
-    type: DataTypes.ENUM('disabled', 'pending', 'minted', 'sent', 'error'),
-    defaultValue: 'disabled',
-    allowNull: false,
+  await safeApplyColumnChanges(context, {
+    payment_links: [{ name: 'nft_mint_settings', field: { type: DataTypes.JSON, allowNull: true } }],
+    checkout_sessions: [
+      { name: 'nft_mint_settings', field: { type: DataTypes.JSON, allowNull: true } },
+      { name: 'payment_intent_data', field: { type: DataTypes.JSON, allowNull: true } },
+      { name: 'nft_mint_settings', field: { type: DataTypes.JSON, allowNull: true } },
+      { name: 'nft_mint_details', field: { type: DataTypes.JSON, allowNull: true } },
+      {
+        name: 'nft_mint_status',
+        field: {
+          type: DataTypes.ENUM('disabled', 'pending', 'minted', 'sent', 'error'),
+          defaultValue: 'disabled',
+          allowNull: false,
+        },
+      },
+    ],
   });
 };
 

package/api/src/store/migrations/20231023-upsell.ts

@@ -1,9 +1,12 @@
+/* eslint-disable no-await-in-loop */
 import { DataTypes } from 'sequelize';
 
-import type { Migration } from '../migrate';
+import { Migration, safeApplyColumnChanges } from '../migrate';
 
 export const up: Migration = async ({ context }) => {
-  await context.addColumn('prices', 'upsell', { type: DataTypes.JSON, allowNull: true });
+  await safeApplyColumnChanges(context, {
+    prices: [{ name: 'upsell', field: { type: DataTypes.JSON, allowNull: true } }],
+  });
 };
 
 export const down: Migration = async ({ context }) => {

package/api/src/store/migrations/20231030-crosssell.ts

@@ -1,19 +1,18 @@
+/* eslint-disable no-await-in-loop */
 import { DataTypes } from 'sequelize';
 
-import type { Migration } from '../migrate';
+import { Migration, safeApplyColumnChanges } from '../migrate';
 
 export const up: Migration = async ({ context }) => {
-  await context.addColumn('products', 'cross_sell', { type: DataTypes.JSON, allowNull: true });
-  await context.addColumn('checkout_sessions', 'cross_sell_behavior', {
-    type: DataTypes.ENUM('auto', 'required'),
-    defaultValue: 'auto',
+  await safeApplyColumnChanges(context, {
+    products: [{ name: 'cross_sell', field: { type: DataTypes.JSON, allowNull: true } }],
+    checkout_sessions: [
+      { name: 'cross_sell_behavior', field: { type: DataTypes.ENUM('auto', 'required'), defaultValue: 'auto' } },
+    ],
+    payment_links: [
+      { name: 'cross_sell_behavior', field: { type: DataTypes.ENUM('auto', 'required'), defaultValue: 'auto' } },
+    ],
   });
-  await context.addColumn('payment_links', 'cross_sell_behavior', {
-    type: DataTypes.ENUM('auto', 'required'),
-    defaultValue: 'auto',
-  });
-  await context.bulkUpdate('checkout_sessions', { cross_sell_behavior: 'auto' }, {});
-  await context.bulkUpdate('payment_links', { cross_sell_behavior: 'auto' }, {});
 };
 
 export const down: Migration = async ({ context }) => {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.40",
+  "version": "1.13.41",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -103,7 +103,7 @@
     "@abtnode/types": "1.16.17",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.40",
+    "@did-pay/types": "1.13.41",
     "@types/cookie-parser": "^1.4.5",
     "@types/cors": "^2.8.15",
     "@types/dotenv-flow": "^3.3.2",
@@ -140,5 +140,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "e5059a405064e32980119b2656ec952d95b7723c"
+  "gitHead": "5f150269dbc497d19cc4d8422b03c67d29793cf2"
 }