Removed hardcoded Fulfillment type in createProduct & applied allowedValues (Jira MCOSS-51)

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: node:12.14.1
+      - image: node:14.18.1
 
     dependencies:
       pre:
@@ -20,7 +20,7 @@ jobs:
 
   deploy:
     docker:
-      - image: node:12.14.1
+      - image: node:14.18.1
 
     steps:
       - checkout
@@ -35,7 +35,7 @@ jobs:
 
   lint:
     docker:
-      - image: node:12.14.1
+      - image: node:14.18.1
 
     steps:
       - checkout
@@ -50,7 +50,7 @@ jobs:
 
   test:
     docker:
-      - image: node:12.14.1
+      - image: node:14.18.1
 
     steps:
       - checkout

.nvmrc

@@ -1 +1 @@
-12.14.1
+14.18.1

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "type": "module",
   "engines": {
-    "node": ">=12.14.1"
+    "node": ">=14.18.1"
   },
   "homepage": "https://github.com/reactioncommerce/api-plugin-products",
   "url": "https://github.com/reactioncommerce/api-plugin-products",

src/index.js

@@ -10,6 +10,7 @@ import {
   ProductVariantInputSchema,
   VariantMedia
 } from "./simpleSchemas.js";
+import startup from "./startup.js";
 
 /**
  * @summary Import and call this function to add this plugin to your API.
@@ -38,6 +39,9 @@ export default async function register(app) {
         ]
       }
     },
+    functionsByType: {
+      startup: [startup]
+    },
     graphQL: {
       resolvers,
       schemas

src/mutations/createProduct.js

@@ -59,7 +59,7 @@ export default async function createProduct(context, input) {
     isVisible: false,
     shopId,
     shouldAppearInSitemap: true,
-    supportedFulfillmentTypes: ["shipping"],
+    supportedFulfillmentTypes: initialProductData.supportedFulfillmentTypes || [],
     title: "",
     type: "simple",
     updatedAt: createdAt,

src/simpleSchemas.js

@@ -278,7 +278,7 @@ export const ProductVariant = new SimpleSchema({
  * @property {String} publishedProductHash optional
  * @property {String} shopId Product ShopID
  * @property {Boolean} shouldAppearInSitemap optional, whether this product should appear in auto-generated sitemap.xml
- * @property {String[]} supportedFulfillmentTypes Types of fulfillment ("shipping", "pickup", etc) allowed for this product
+//  * @property {String[]} supportedFulfillmentTypes Types of fulfillment ("shipping", "pickup", etc) allowed for this product
  * @property {String} template optional
  * @property {String} title Product Title
  * @property {String} twitterMsg optional
@@ -382,10 +382,11 @@ export const Product = new SimpleSchema({
     type: Boolean,
     optional: true
   },
-  "supportedFulfillmentTypes": {
-    type: Array
-  },
-  "supportedFulfillmentTypes.$": String,
+  // This is extended in startup with dynamic values for allowedValues
+  // "supportedFulfillmentTypes": {
+  //   type: Array
+  // },
+  // "supportedFulfillmentTypes.$": String,
   "template": {
     type: String,
     optional: true

src/startup.js

@@ -0,0 +1,37 @@
+import Logger from "@reactioncommerce/logger";
+
+/**
+ * @summary Extend the schema with updated allowedValues
+ * @param {Object} context Startup context
+ * @returns {undefined}
+ */
+async function extendSchemas(context) {
+  let allFulfillmentTypesArray = context.allRegisteredFulfillmentTypes?.registeredFulfillmentTypes;
+
+  if (!allFulfillmentTypesArray || allFulfillmentTypesArray.length === 0) {
+    Logger.warn("No fulfillment types available, setting 'shipping' as default");
+    allFulfillmentTypesArray = ["shipping"];
+  }
+
+  const { simpleSchemas: { Product } } = context;
+
+  const schemaProductExtension = {
+    "supportedFulfillmentTypes": {
+      type: Array
+    },
+    "supportedFulfillmentTypes.$": {
+      type: String,
+      allowedValues: allFulfillmentTypesArray
+    }
+  };
+  Product.extend(schemaProductExtension);
+}
+
+/**
+ * @summary Called on startup
+ * @param {Object} context Startup context
+ * @returns {undefined}
+ */
+export default async function productStartup(context) {
+  await extendSchemas(context);
+}