(feat): 4246 nnnnat new mocks factory

imports/collections/schemas/helpers.js

@@ -1,7 +1,5 @@
 import Random from "@reactioncommerce/random";
 import { Meteor } from "meteor/meteor";
-import { Reaction } from "/lib/api";
-import { Shops } from "/lib/collections";
 
 /**
  * @name createdAtAutoValue
@@ -37,48 +35,6 @@ export function updatedAtAutoValue() {
   return new Date();
 }
 
-/**
- * @name shopIdAutoValue
- * @memberof Schemas
- * @method
- * @summary Helper method used for schema injection autoValue
- * @example autoValue: shopIdAutoValue
- * @return {String} current shopId
- */
-export function shopIdAutoValue() {
-  // we should always have a shopId
-  if (this.isSet && Meteor.isServer) {
-    return this.value;
-  } else if ((Meteor.isServer && !this.isUpdate) || (Meteor.isClient && this.isInsert)) {
-    return Reaction.getShopId();
-  }
-  return this.unset();
-}
-
-/**
- * @name shopIdAutoValueForCart
- * @memberof Schemas
- * @method
- * @summary Helper method copy of shopIdAutoValue with modification for Cart
- * @example autoValue: shopIdAutoValue
- * @return {String} shopId
- */
-export function shopIdAutoValueForCart() {
-  // we should always have a shopId
-  if (this.isSet && Meteor.isServer) {
-    return this.value;
-  } else if ((Meteor.isServer && !this.isUpdate) || (Meteor.isClient && this.isInsert)) {
-    let shopId = Reaction.getPrimaryShopId();
-    const marketplaceSettings = Reaction.getMarketplaceSettings();
-
-    if (marketplaceSettings && marketplaceSettings.public && marketplaceSettings.public.merchantCart === true) {
-      shopId = Reaction.getShopId();
-    }
-    return shopId;
-  }
-  return this.unset();
-}
-
 /**
  * @name schemaIdAutoValue
  * @memberof Schemas
@@ -90,44 +46,8 @@ export function shopIdAutoValueForCart() {
 export function schemaIdAutoValue() {
   if (this.isSet && Meteor.isServer) {
     return this.value;
-  } else if ((Meteor.isServer && this.operator !== "$pull") ||
-    (Meteor.isClient && this.isInsert)) {
+  } else if ((Meteor.isServer && this.operator !== "$pull") || (Meteor.isClient && this.isInsert)) {
     return Random.id();
   }
   return this.unset();
 }
-
-/**
- * @name shopDefaultCountry
- * @memberof Schemas
- * @method
- * @summary Helper method used for schema injection autoValue
- * @example autoValue: shopDefaultCountry
- * @return {String} country value from default shop
- */
-export function shopDefaultCountry() {
-  try {
-    // Check to see if this is client or server, and the type of update being performed
-    if (this.isSet && Meteor.isServer) {
-      return this.value;
-    } else if ((Meteor.isServer && !this.isUpdate) || (Meteor.isClient && this.isInsert)) {
-      // Find the current shop
-      const shop = Shops.findOne({
-        _id: Reaction.getShopId()
-      });
-
-      // Find the current shops primary shipping address
-      if (shop && shop.addressBook) {
-        const defaultShippingAddress = shop.addressBook.find((address) => address.isShippingDefault === true);
-
-        // return the shops country to auto-populate the Country of Origin field in the scheme
-        return defaultShippingAddress.country;
-      }
-
-      return this.value;
-    }
-    return this.unset();
-  } catch (e) {
-    return this.value;
-  }
-}

imports/collections/schemas/index.js

@@ -12,6 +12,8 @@
  * @namespace Schemas
  */
 
+import "./schemaIndex";
+
 export * from "./accounts";
 export * from "./address";
 export * from "./assets";

imports/collections/schemas/products.js

@@ -1,7 +1,6 @@
 import SimpleSchema from "simpl-schema";
 import { Meteor } from "meteor/meteor";
 import { registerSchema } from "@reactioncommerce/schemas";
-import { ReactionProduct } from "/lib/api";
 import { createdAtAutoValue, updatedAtAutoValue } from "./helpers";
 import { Event } from "./event";
 import { Metafield } from "./metafield";
@@ -243,16 +242,7 @@ export const ProductVariant = new SimpleSchema({
     type: SimpleSchema.Integer,
     label: "Quantity",
     optional: true,
-    defaultValue: 0,
-    custom() {
-      if (Meteor.isClient) {
-        if (this.siblingField("type").value !== "inventory") {
-          if (ReactionProduct.checkChildVariants(this.docId) === 0 && !this.value) {
-            return SimpleSchema.ErrorTypes.REQUIRED;
-          }
-        }
-      }
-    }
+    defaultValue: 0
   },
   "minOrderQuantity": {
     label: "Minimum order quantity",

imports/collections/schemas/schemaIndex.js

@@ -0,0 +1,9 @@
+import SimpleSchema from "simpl-schema";
+
+// These options are added by the `aldeed:schema-index` Meteor package, but because that
+// is a Meteor package and we also load the schemas in a non-Meteor Node app, we need to do it here.
+SimpleSchema.extendOptions([
+  "index", // one of Number, String, Boolean
+  "unique", // Boolean
+  "sparse" // Boolean
+]);

imports/plugins/core/catalog/server/methods/catalog.js

@@ -10,6 +10,7 @@ import { Media } from "/imports/plugins/core/files/server";
 import rawCollections from "/imports/collections/rawCollections";
 import getProductPriceRange from "../no-meteor/utils/getProductPriceRange";
 import getVariants from "../no-meteor/utils/getVariants";
+import hasChildVariant from "../no-meteor/utils/hasChildVariant";
 import isSoldOut from "../no-meteor/utils/isSoldOut";
 import isLowQuantity from "../no-meteor/utils/isLowQuantity";
 import isBackorder from "../no-meteor/utils/isBackorder";
@@ -314,11 +315,20 @@ function flushQuantity(id) {
  * @return {Object} product - new product
  */
 function createProduct(props = null) {
+  const finalProps = props || {};
+  if (finalProps.type !== "variant" && !finalProps.handle) {
+    if (typeof finalProps.title === "string" && finalProps.title.length) {
+      finalProps.handle = Reaction.getSlug(finalProps.title);
+    } else {
+      finalProps.handle = Random.id();
+    }
+  }
+
   const _id = Products.insert(
     {
       shopId: Reaction.getShopId(),
       type: "simple",
-      ...props
+      ...finalProps
     },
     {
       validate: false
@@ -963,6 +973,12 @@ Meteor.methods({
       throw new Meteor.Error("access-denied", "Access Denied");
     }
 
+    if (field === "inventoryQuantity" && value === "") {
+      if (!Promise.await(hasChildVariant(_id, rawCollections))) {
+        throw new Meteor.Error("invalid", "Inventory Quantity is required when no child variants");
+      }
+    }
+
     const { type } = doc;
     let update;
     // handle booleans with correct typing
@@ -973,7 +989,7 @@ Meteor.methods({
       update = {
         // TODO: write function to ensure new handle is unique.
         // Should be a call similar to the line below.
-        [field]: createHandle(value, _id) // handle should be unique
+        [field]: createHandle(Reaction.getSlug(value), _id) // handle should be unique
       };
     } else if (field === "title" && doc.handle === doc._id) {
       // update handle once title is set
@@ -989,7 +1005,6 @@ Meteor.methods({
 
     // we need to use sync mode here, to return correct error and result to UI
     let result;
-
     try {
       result = updateCatalogProduct(
         this.userId,

imports/plugins/core/catalog/server/no-meteor/utils/hasChildVariant.js

@@ -0,0 +1,18 @@
+/**
+ *
+ * @method hasChildVariant
+ * @summary Return true if a Product or Variant has at least 1 child Product that is visible and not deleted.
+ * @param {string} productOrVariantId - A Product or Product Variant ID.
+ * @param {Object} collections - Raw mongo collections.
+ * @return {Promise<boolean>} True if Product has a child.
+ */
+export default async function hasChildVariant(productOrVariantId, collections) {
+  const { Products } = collections;
+  const child = await Products.findOne({
+    ancestors: productOrVariantId,
+    type: "variant",
+    isVisible: true,
+    isDeleted: { $ne: true }
+  });
+  return !!child;
+}

imports/plugins/core/catalog/server/no-meteor/utils/hasChildVariant.test.js

@@ -0,0 +1,105 @@
+import mockContext from "/imports/test-utils/helpers/mockContext";
+import hasChildVariant from "./hasChildVariant";
+
+const mockCollections = { ...mockContext.collections };
+
+const internalShopId = "123";
+const internalCatalogProductId = "999";
+const internalProductId = "999";
+const internalVariantIds = ["875", "874"];
+
+const createdAt = new Date("2018-04-16T15:34:28.043Z");
+const updatedAt = new Date("2018-04-17T15:34:28.043Z");
+
+const mockVariants = [
+  {
+    _id: internalVariantIds[0],
+    ancestors: [internalCatalogProductId],
+    barcode: "barcode",
+    createdAt,
+    height: 0,
+    index: 0,
+    inventoryManagement: true,
+    inventoryPolicy: false,
+    isLowQuantity: true,
+    isSoldOut: false,
+    isDeleted: false,
+    isVisible: true,
+    length: 0,
+    lowInventoryWarningThreshold: 0,
+    metafields: [
+      {
+        value: "value",
+        namespace: "namespace",
+        description: "description",
+        valueType: "valueType",
+        scope: "scope",
+        key: "key"
+      }
+    ],
+    minOrderQuantity: 0,
+    optionTitle: "Untitled Option",
+    originCountry: "US",
+    price: 0,
+    shopId: internalShopId,
+    sku: "sku",
+    taxable: true,
+    taxCode: "0000",
+    taxDescription: "taxDescription",
+    title: "Small Concrete Pizza",
+    updatedAt,
+    variantId: internalVariantIds[0],
+    weight: 0,
+    width: 0
+  },
+  {
+    _id: internalVariantIds[1],
+    ancestors: [internalCatalogProductId, internalVariantIds[0]],
+    barcode: "barcode",
+    height: 2,
+    index: 0,
+    inventoryManagement: true,
+    inventoryPolicy: true,
+    isLowQuantity: true,
+    isSoldOut: false,
+    isDeleted: false,
+    isVisible: true,
+    length: 2,
+    lowInventoryWarningThreshold: 0,
+    metafields: [
+      {
+        value: "value",
+        namespace: "namespace",
+        description: "description",
+        valueType: "valueType",
+        scope: "scope",
+        key: "key"
+      }
+    ],
+    minOrderQuantity: 0,
+    optionTitle: "Awesome Soft Bike",
+    originCountry: "US",
+    price: 992.0,
+    shopId: internalShopId,
+    sku: "sku",
+    taxable: true,
+    taxCode: "0000",
+    taxDescription: "taxDescription",
+    title: "One pound bag",
+    variantId: internalVariantIds[1],
+    weight: 2,
+    width: 2
+  }
+];
+
+test("expect true when product has a child", async () => {
+  mockCollections.Products.findOne.mockReturnValueOnce(Promise.resolve(mockVariants[0]));
+  const spec = await hasChildVariant(internalProductId, mockCollections);
+  expect(spec).toBe(true);
+});
+
+test("expect false when product does not a child", async () => {
+  mockCollections.Products.findOne.mockReturnValueOnce(Promise.resolve(null));
+  const spec = await hasChildVariant(internalVariantIds[1], mockCollections);
+  expect(spec).toBe(false);
+});

imports/plugins/core/graphql/server/resolvers/tag/Query/tags.test.js

@@ -1,30 +1,32 @@
 import tagsResolver from "./tags";
 import getFakeMongoCursor from "/imports/test-utils/helpers/getFakeMongoCursor";
+import Factory from "/imports/test-utils/helpers/factory";
 
 const base64ID = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
-
-const mockTags = [
-  { _id: "a1", name: "Men" },
-  { _id: "b2", name: "Women" },
-  { _id: "c3", name: "Children" }
-];
-
+const mockTags = Factory.Tag.makeMany(3, { _id: (i) => (i + 100).toString() });
 const mockTagsQuery = getFakeMongoCursor("Tags", mockTags);
 
 test("calls queries.tags and returns a partial connection", async () => {
-  const tags = jest.fn().mockName("queries.tags").mockReturnValueOnce(Promise.resolve(mockTagsQuery));
+  const tags = jest
+    .fn()
+    .mockName("queries.tags")
+    .mockReturnValueOnce(Promise.resolve(mockTagsQuery));
 
-  const result = await tagsResolver({}, { shopId: base64ID }, {
-    queries: { tags }
-  });
+  const result = await tagsResolver(
+    {},
+    { shopId: base64ID },
+    {
+      queries: { tags }
+    }
+  );
 
   expect(result).toEqual({
     nodes: mockTags,
     pageInfo: {
-      endCursor: "c3",
+      endCursor: "102",
       hasNextPage: false,
       hasPreviousPage: false,
-      startCursor: "a1"
+      startCursor: "100"
     },
     totalCount: 3
   });

imports/plugins/included/product-admin/client/containers/productAdmin.js

@@ -37,12 +37,7 @@ const wrapComponent = (Comp) => (
     }
 
     handleProductFieldSave = (productId, fieldName, value) => {
-      let updateValue = value;
-      // special case, slugify handles.
-      if (fieldName === "handle") {
-        updateValue = Reaction.getSlug(value);
-      }
-      Meteor.call("products/updateProductField", productId, fieldName, updateValue, (error) => {
+      Meteor.call("products/updateProductField", productId, fieldName, value, (error) => {
         if (error) {
           Alerts.toast(error.message, "error");
           this.forceUpdate();