Merge pull request #6846 from reactioncommerce/pending-fixes

sujithvn · web-flow · commit c97ac63b90d4 · 2023-06-12T15:28:31.000+05:30
Pending fixes for Release5
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -12,7 +12,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-focal
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -14,7 +14,7 @@ jobs:
     permissions:
       contents: write # to create release (changesets/action)
       pull-requests: write # to create pull request (changesets/action)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-focal
     steps:
       - uses: actions/checkout@v2
         with:
@@ -29,10 +29,10 @@ jobs:
           key: reaction-v6-node-modules-${{ hashFiles('package.json') }}-${{ hashFiles('pnpm-lock.yaml') }}
           path: "**/node_modules"
 
-      - name: Use Node.js 14.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 18.10
 
       - name: Install pnpm
         run: npm i -g pnpm@latest
@@ -84,16 +84,16 @@ jobs:
     permissions:
       contents: write # to create release (changesets/action)
       pull-requests: write # to create pull request (changesets/action)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-focal
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Use Node.js 14.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 18.10
 
       - name: Install pnpm
         run: npm i -g pnpm@latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Use Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: 18.10
 
       - name: Install pnpm
         run: npm i -g pnpm@latest
diff --git a/.github/workflows/tagging-and-release.yml b/.github/workflows/tagging-and-release.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Use Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: 18.10
 
       - name: Install dependencies
         run: |
diff --git a/apps/reaction/package.json b/apps/reaction/package.json
@@ -103,8 +103,8 @@
     "test:integration:watch": "node node_modules/jest/bin/jest --runInBand --watch --testPathIgnorePatterns '<rootDir>/src/'",
     "test:integration:file": "jest --runInBand",
     "test:integration:file:watch": "jest --runInBand --watch",
-    "test:integration:query": "node --max-old-space-size=6144  --expose-gc ../../node_modules/jest/bin/jest.js --forceExit --runInBand --logHeapUsage --testPathIgnorePatterns '<rootDir>/src/' '<rootDir>/tests/integration/api/mutations/'",
-    "test:integration:mutation": "node --max_old_space_size=6144 --expose-gc ../../node_modules/jest/bin/jest.js  --forceExit --runInBand --logHeapUsage --testPathIgnorePatterns '<rootDir>/src/' '<rootDir>/tests/integration/api/queries/'",
+    "test:integration:query": "node --max-old-space-size=7168  --expose-gc ../../node_modules/jest/bin/jest.js --forceExit --runInBand --logHeapUsage --testPathIgnorePatterns '<rootDir>/src/' '<rootDir>/tests/integration/api/mutations/'",
+    "test:integration:mutation": "node --max_old_space_size=7168 --expose-gc ../../node_modules/jest/bin/jest.js  --forceExit --runInBand --logHeapUsage --testPathIgnorePatterns '<rootDir>/src/' '<rootDir>/tests/integration/api/queries/'",
     "lint": "eslint .",
     "lint:gql": "graphql-schema-linter ./src/**/*.graphql",
     "version": "echo $npm_package_version",
diff --git a/packages/api-plugin-fulfillment-method-pickup-store/package.json b/packages/api-plugin-fulfillment-method-pickup-store/package.json
@@ -2,7 +2,7 @@
   "name": "@reactioncommerce/api-plugin-fulfillment-method-pickup-store",
   "description": "Implements Store-pickup as a fulfillment method under the type pickup",
   "label": "Fulfillment Method Store Pickup",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "main": "index.js",
   "type": "module",
   "engines": {
diff --git a/packages/api-plugin-fulfillment-method-pickup-store/src/index.js b/packages/api-plugin-fulfillment-method-pickup-store/src/index.js
@@ -28,8 +28,8 @@ export default async function register(app) {
     functionsByType: {
       preStartup: [fulfillmentMethodPickupStorePreStartup],
       startup: [fulfillmentMethodPickupStoreStartup],
-      validateOrderMethods: [{ key: "store", handler: validateOrderMethodsStore }],
-      fulfillmentMethodsWithQuotes: [{ key: "pickup", handler: fulfillmentMethodsWithQuotesPickupStore }]
+      validateOrderMethods: [{ key: "store", handler: validateOrderMethodsStore, name: "validateOrderMethodsStore" }],
+      fulfillmentMethodsWithQuotes: [{ key: "pickup", handler: fulfillmentMethodsWithQuotesPickupStore, name: "fulfillmentMethodsWithQuotesPickupStore" }]
     }
   });
 }
diff --git a/packages/api-plugin-fulfillment-method-pickup-store/src/startup.js b/packages/api-plugin-fulfillment-method-pickup-store/src/startup.js
@@ -6,6 +6,29 @@ import checkAndCreateFulfillmentMethod from "./util/checkAndCreateFulfillmentMet
  * @returns {undefined}
  */
 export default async function fulfillmentMethodPickupStoreStartup(context) {
+  const { collections: { Shops } } = context;
+  const session = context.app.mongoClient.startSession();
+
+  const allShops = await Shops.find().toArray();
+  for (const shop of allShops) {
+    const { _id: shopId } = shop;
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      await session.withTransaction(async () => {
+        const insertedMethod = await checkAndCreateFulfillmentMethod(context, shopId);
+        if (!insertedMethod) {
+          throw new ReactionError("server-error", "Error in creating fulfillment method");
+        }
+      });
+    } catch (error) {
+      // eslint-disable-next-line no-await-in-loop
+      await session.endSession();
+      throw error;
+    }
+    // eslint-disable-next-line no-await-in-loop
+    await session.endSession();
+  }
+
   context.appEvents.on("afterShopCreate", async (payload) => {
     const { shop } = payload;
     const shopId = shop._id;
diff --git a/packages/api-plugin-fulfillment-method-shipping-dynamic-rate/package.json b/packages/api-plugin-fulfillment-method-shipping-dynamic-rate/package.json
@@ -2,7 +2,7 @@
   "name": "@reactioncommerce/api-plugin-fulfillment-method-shipping-dynamic-rate",
   "description": "Implements Shipping-Dynamic Rate as a fulfillment method under the type shipping",
   "label": "Fulfillment Method Shipping Dynamic Rate",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "main": "index.js",
   "type": "module",
   "engines": {
diff --git a/packages/api-plugin-fulfillment-method-shipping-dynamic-rate/src/index.js b/packages/api-plugin-fulfillment-method-shipping-dynamic-rate/src/index.js
@@ -28,8 +28,10 @@ export default async function register(app) {
     functionsByType: {
       preStartup: [preStartup],
       startup: [startup],
-      validateOrderMethods: [{ key: "dynamicRate", handler: validateOrderMethodsDynamicRate }],
-      fulfillmentMethodsWithQuotes: [{ key: "shipping", handler: fulfillmentMethodsWithQuotesShippingDynamicRate }]
+      validateOrderMethods: [{ key: "dynamicRate", handler: validateOrderMethodsDynamicRate, name: "validateOrderMethodsDynamicRate" }],
+      fulfillmentMethodsWithQuotes: [
+        { key: "shipping", handler: fulfillmentMethodsWithQuotesShippingDynamicRate, name: "fulfillmentMethodsWithQuotesShippingDynamicRate" }
+      ]
     }
   });
 }
diff --git a/packages/api-plugin-fulfillment-method-shipping-dynamic-rate/src/startup.js b/packages/api-plugin-fulfillment-method-shipping-dynamic-rate/src/startup.js
@@ -8,6 +8,30 @@ import checkAndCreateFulfillmentMethod from "./util/checkAndCreateFulfillmentMet
  * @returns {undefined}
  */
 export default async function fulfillmentMethodShippingDynamicRateStartup(context) {
+  const { collections: { Shops } } = context;
+  const session = context.app.mongoClient.startSession();
+
+  const allShops = await Shops.find().toArray();
+  for (const shop of allShops) {
+    const { _id: shopId } = shop;
+    try {
+    // eslint-disable-next-line no-await-in-loop
+      await session.withTransaction(async () => {
+        const insertedMethod = await checkAndCreateFulfillmentMethod(context, shopId);
+        if (!insertedMethod) {
+          throw new ReactionError("server-error", "Error in creating fulfillment method");
+        }
+      });
+    } catch (error) {
+      // eslint-disable-next-line no-await-in-loop
+      await session.endSession();
+      throw error;
+    }
+    // eslint-disable-next-line no-await-in-loop
+    await session.endSession();
+  }
+
+
   context.appEvents.on("afterShopCreate", async (payload) => {
     const { shop } = payload;
     const shopId = shop._id;
diff --git a/packages/api-plugin-fulfillment-method-shipping-flat-rate/package.json b/packages/api-plugin-fulfillment-method-shipping-flat-rate/package.json
@@ -2,7 +2,7 @@
   "name": "@reactioncommerce/api-plugin-fulfillment-method-shipping-flat-rate",
   "description": "Plugin for Fulfillment method flat-rate under the type shipping",
   "label": "Fulfillment Method Shipping Flat Rate Plugin",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "main": "index.js",
   "type": "module",
   "engines": {
diff --git a/packages/api-plugin-fulfillment-method-shipping-flat-rate/src/index.js b/packages/api-plugin-fulfillment-method-shipping-flat-rate/src/index.js
@@ -41,8 +41,10 @@ export default async function register(app) {
     },
     functionsByType: {
       preStartup: [fulfillmentMethodShippingFlatRatePreStartup],
-      validateOrderMethods: [{ key: "flatRate", handler: validateOrderMethodsFlatRate }],
-      fulfillmentMethodsWithQuotes: [{ key: "shipping", handler: fulfillmentMethodsWithQuotesShippingFlatRate }]
+      validateOrderMethods: [{ key: "flatRate", handler: validateOrderMethodsFlatRate, name: "validateOrderMethodsFlatRate" }],
+      fulfillmentMethodsWithQuotes: [
+        { key: "shipping", handler: fulfillmentMethodsWithQuotesShippingFlatRate, name: "fulfillmentMethodsWithQuotesShippingFlatRate" }
+      ]
     },
     shopSettingsConfig: {
       isShippingRatesFulfillmentEnabled: {
diff --git a/packages/api-plugin-fulfillment-type-pickup/package.json b/packages/api-plugin-fulfillment-type-pickup/package.json
@@ -2,7 +2,7 @@
   "name": "@reactioncommerce/api-plugin-fulfillment-type-pickup",
   "description": "Plugin which implements Pickup as one of the Fulfillment type",
   "label": "Fulfillment type Pickup Plugin",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "main": "index.js",
   "type": "module",
   "engines": {
diff --git a/packages/api-plugin-fulfillment-type-pickup/src/startup.js b/packages/api-plugin-fulfillment-type-pickup/src/startup.js
@@ -7,6 +7,29 @@ import checkAndCreateFulfillmentType from "./checkAndCreateFulfillmentType.js";
  * @returns {undefined}
  */
 export default async function fulfillmentTypePickupStartup(context) {
+  const { collections: { Shops } } = context;
+  const session = context.app.mongoClient.startSession();
+
+  const allShops = await Shops.find().toArray();
+  for (const shop of allShops) {
+    const { _id: shopId } = shop;
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      await session.withTransaction(async () => {
+        const insertedFulfillmentType = await checkAndCreateFulfillmentType(context, shopId);
+        if (!insertedFulfillmentType) {
+          throw new ReactionError("server-error", "Error in creating fulfillment method");
+        }
+      });
+    } catch (error) {
+      // eslint-disable-next-line no-await-in-loop
+      await session.endSession();
+      throw error;
+    }
+    // eslint-disable-next-line no-await-in-loop
+    await session.endSession();
+  }
+
   context.appEvents.on("afterShopCreate", async (payload) => {
     const { shop } = payload;
     const shopId = shop._id;
diff --git a/packages/api-plugin-fulfillment-type-shipping/package.json b/packages/api-plugin-fulfillment-type-shipping/package.json
@@ -2,7 +2,7 @@
   "name": "@reactioncommerce/api-plugin-fulfillment-type-shipping",
   "description": "Plugin which implements shipping as one of the Fulfillment type",
   "label": "Fulfillment type Shipping Plugin",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "main": "index.js",
   "type": "module",
   "engines": {
diff --git a/packages/api-plugin-fulfillment-type-shipping/src/startup.js b/packages/api-plugin-fulfillment-type-shipping/src/startup.js
@@ -8,6 +8,29 @@ import checkAndCreateFulfillmentType from "./checkAndCreateFulfillmentType.js";
  * @returns {undefined}
  */
 export default async function fulfillmentTypeShippingStartup(context) {
+  const { collections: { Shops } } = context;
+  const session = context.app.mongoClient.startSession();
+
+  const allShops = await Shops.find().toArray();
+  for (const shop of allShops) {
+    const { _id: shopId } = shop;
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      await session.withTransaction(async () => {
+        const insertedFulfillmentType = await checkAndCreateFulfillmentType(context, shopId);
+        if (!insertedFulfillmentType) {
+          throw new ReactionError("server-error", "Error in creating fulfillment method");
+        }
+      });
+    } catch (error) {
+      // eslint-disable-next-line no-await-in-loop
+      await session.endSession();
+      throw error;
+    }
+    // eslint-disable-next-line no-await-in-loop
+    await session.endSession();
+  }
+
   context.appEvents.on("afterShopCreate", async (payload) => {
     const { shop } = payload;
     const shopId = shop._id;
diff --git a/packages/api-plugin-fulfillment/package.json b/packages/api-plugin-fulfillment/package.json
@@ -2,7 +2,7 @@
   "name": "@reactioncommerce/api-plugin-fulfillment",
   "description": "Base Fulfillment plugin for implementing other fulfillment type plugins and their corresponding fulfillment method plugins",
   "label": "Fulfillment Plugin",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "main": "index.js",
   "type": "module",
   "engines": {
diff --git a/packages/api-plugin-fulfillment/src/mutations/createFulfillmentMethod.js b/packages/api-plugin-fulfillment/src/mutations/createFulfillmentMethod.js
@@ -1,8 +1,10 @@
+import Logger from "@reactioncommerce/logger";
 import SimpleSchema from "simpl-schema";
 import Random from "@reactioncommerce/random";
 import ReactionError from "@reactioncommerce/reaction-error";
 import { FulfillmentMethodSchema } from "../simpleSchemas.js";
 
+const logCtx = { name: "fulfillment", file: "createFulfillmentMethod" };
 const inputSchema = new SimpleSchema({
   method: FulfillmentMethodSchema,
   fulfillmentTypeId: String,
@@ -39,7 +41,10 @@ export default async function createFulfillmentMethodMutation(context, input) {
   if (!fulfillmentType) throw new ReactionError("server-error", "Unable to create fulfillment method without defined type");
 
   const fulfillmentMethod = fulfillmentType.methods?.find((currMethod) => currMethod.fulfillmentMethod === method.fulfillmentMethod);
-  if (fulfillmentMethod) throw new ReactionError("server-error", "Fulfillment Method already exists");
+  if (fulfillmentMethod) {
+    Logger.warn(logCtx, "Fulfillment Method already exists");
+    return { fulfillmentMethod };
+  }
 
   method._id = Random.id();
   method.fulfillmentTypes = [fulfillmentType.fulfillmentType];
diff --git a/packages/api-plugin-fulfillment/src/mutations/createFulfillmentType.js b/packages/api-plugin-fulfillment/src/mutations/createFulfillmentType.js
@@ -1,7 +1,9 @@
+import Logger from "@reactioncommerce/logger";
 import Random from "@reactioncommerce/random";
 import ReactionError from "@reactioncommerce/reaction-error";
 import { FulfillmentTypeSchema } from "../simpleSchemas.js";
 
+const logCtx = { name: "fulfillment", file: "createFulfillmentType" };
 /**
  * @method createFulfillmentType
  * @summary Creates a new fulfillment type
@@ -33,7 +35,10 @@ export default async function createFulfillmentType(context, input) {
   const { shopId, fulfillmentType } = cleanedInput;
 
   const existingFulfillmentType = await Fulfillment.findOne({ shopId, fulfillmentType });
-  if (existingFulfillmentType) throw new ReactionError("invalid-parameter", "Fulfillment Type already exists");
+  if (existingFulfillmentType) {
+    Logger.warn(logCtx, "Fulfillment Type already exists");
+    return { fulfillmentType: { name: cleanedInput.name, fulfillmentType: cleanedInput.fulfillmentType } };
+  }
 
   await context.validatePermissions("reaction:legacy:fulfillmentTypes", "create", { shopId });
 
diff --git a/packages/api-plugin-fulfillment/src/mutations/createFulfillmentType.test.js b/packages/api-plugin-fulfillment/src/mutations/createFulfillmentType.test.js
@@ -1,4 +1,3 @@
-import ReactionError from "@reactioncommerce/reaction-error";
 import mockCollection from "@reactioncommerce/api-utils/tests/mockCollection.js";
 import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
 import createFulfillmentTypeMutation from "./createFulfillmentType.js";
@@ -17,7 +16,7 @@ test("throws if required fields are not supplied", async () => {
   await expect(createFulfillmentTypeMutation(mockContext, fulfillmentTypeInput)).rejects.toThrow(expectedError);
 });
 
-test("throws if the fulfillmentType added already exists", async () => {
+test("returns if the fulfillmentType added already exists", async () => {
   mockContext.collections.Fulfillment.findOne.mockReturnValueOnce(Promise.resolve({
     _id: "fulfillment123",
     name: "Default Shipping Provider",
@@ -40,8 +39,16 @@ test("throws if the fulfillmentType added already exists", async () => {
       name: "shipping"
     }
   };
-  const expectedError = new ReactionError("invalid-parameter", "Fulfillment Type already exists");
-  await expect(createFulfillmentTypeMutation(mockContext, fulfillmentTypeInput)).rejects.toThrow(expectedError);
+
+  const result = await createFulfillmentTypeMutation(mockContext, fulfillmentTypeInput);
+  expect(result).toEqual({
+    fulfillmentType: {
+      name: "fulfillmentType123",
+      fulfillmentType: "shipping"
+    }
+  });
+
+  expect(mockContext.validatePermissions).toHaveBeenCalledTimes(0);
 });
 
 test("add a new fulfillment type", async () => {
diff --git a/packages/api-plugin-fulfillment/src/preStartup.js b/packages/api-plugin-fulfillment/src/preStartup.js
@@ -2,7 +2,7 @@ import doesDatabaseVersionMatch from "@reactioncommerce/db-version-check";
 import { migrationsNamespace } from "../migrations/migrationsNamespace.js";
 import { extendFulfillmentSchemas } from "./simpleSchemas.js";
 
-const expectedVersion = 4;
+const expectedVersion = 2;
 
 /**
  * @summary Checks if the version of the database matches requirement
diff --git a/packages/api-plugin-promotions-coupons/migrations/2.js b/packages/api-plugin-promotions-coupons/migrations/2.js
diff --git a/packages/api-plugin-promotions-coupons/package.json b/packages/api-plugin-promotions-coupons/package.json
diff --git a/packages/api-plugin-promotions-coupons/src/config.js b/packages/api-plugin-promotions-coupons/src/config.js
diff --git a/packages/api-plugin-promotions-offers/package.json b/packages/api-plugin-promotions-offers/package.json
diff --git a/packages/api-plugin-promotions/package.json b/packages/api-plugin-promotions/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ export default async function register(app) {`
`28`	`28`	`functionsByType: {`
`29`	`29`	`preStartup: [fulfillmentMethodPickupStorePreStartup],`
`30`	`30`	`startup: [fulfillmentMethodPickupStoreStartup],`
`31`		`- validateOrderMethods: [{ key: "store", handler: validateOrderMethodsStore }],`
`32`		`- fulfillmentMethodsWithQuotes: [{ key: "pickup", handler: fulfillmentMethodsWithQuotesPickupStore }]`
	`31`	`+ validateOrderMethods: [{ key: "store", handler: validateOrderMethodsStore, name: "validateOrderMethodsStore" }],`
	`32`	`+ fulfillmentMethodsWithQuotes: [{ key: "pickup", handler: fulfillmentMethodsWithQuotesPickupStore, name: "fulfillmentMethodsWithQuotesPickupStore" }]`
`33`	`33`	`}`
`34`	`34`	`});`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,10 @@ export default async function register(app) {`
`28`	`28`	`functionsByType: {`
`29`	`29`	`preStartup: [preStartup],`
`30`	`30`	`startup: [startup],`
`31`		`- validateOrderMethods: [{ key: "dynamicRate", handler: validateOrderMethodsDynamicRate }],`
`32`		`- fulfillmentMethodsWithQuotes: [{ key: "shipping", handler: fulfillmentMethodsWithQuotesShippingDynamicRate }]`
	`31`	`+ validateOrderMethods: [{ key: "dynamicRate", handler: validateOrderMethodsDynamicRate, name: "validateOrderMethodsDynamicRate" }],`
	`32`	`+ fulfillmentMethodsWithQuotes: [`
	`33`	`+ { key: "shipping", handler: fulfillmentMethodsWithQuotesShippingDynamicRate, name: "fulfillmentMethodsWithQuotesShippingDynamicRate" }`
	`34`	`+ ]`
`33`	`35`	`}`
`34`	`36`	`});`
`35`	`37`	`}`