reactioncommerce · brent-hoover · Oct 20, 2022 · Oct 19, 2022 · Oct 20, 2022
diff --git a/.changeset/modern-poems-smash.md b/.changeset/modern-poems-smash.md
@@ -0,0 +1,5 @@
+---
+"@reactioncommerce/api-plugin-shipments-flat-rate": patch
+---
+
+allow nested properties to be accessible for shipment restrictions.
diff --git a/packages/api-plugin-shipments-flat-rate/package.json b/packages/api-plugin-shipments-flat-rate/package.json
@@ -30,7 +30,8 @@
     "@reactioncommerce/logger": "^1.1.3",
     "@reactioncommerce/random": "^1.0.2",
     "@reactioncommerce/reaction-error": "^1.0.1",
-    "simpl-schema": "^1.12.0"
+    "simpl-schema": "^1.12.0",
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@babel/core": "^7.7.7",

diff --git a/packages/api-plugin-shipments-flat-rate/src/util/attributeDenyCheck.js b/packages/api-plugin-shipments-flat-rate/src/util/attributeDenyCheck.js
@@ -1,3 +1,4 @@
+import _ from "lodash";
 import operators from "@reactioncommerce/api-utils/operators.js";
 import propertyTypes from "@reactioncommerce/api-utils/propertyTypes.js";
 import isDestinationRestricted from "./isDestinationRestricted.js";
@@ -25,12 +26,13 @@ export async function attributeDenyCheck(methodRestrictions, method, hydratedOrd
 
       // Item must meet all attributes to be restricted
       return attributes.every((attribute) => {
-        let attributeFound = operators[attribute.operator](item[attribute.property], propertyTypes[attribute.propertyType](attribute.value));
+        const attributePropertyValue = _.get(item, attribute.property);
+        let attributeFound = operators[attribute.operator](attributePropertyValue, propertyTypes[attribute.propertyType](attribute.value));
 
         // If attribute is an array on the item, use `includes` instead of checking for ===
         // This works for tags, tagIds, and any future attribute that might be an array
-        if (Array.isArray(item[attribute.property])) {
-          attributeFound = item[attribute.property].includes(attribute.value);
+        if (Array.isArray(attributePropertyValue)) {
+          attributeFound = attributePropertyValue.includes(attribute.value);
         }
 
         if (attributeFound) {

diff --git a/packages/api-plugin-shipments-flat-rate/src/util/filterShippingMethods.test.js b/packages/api-plugin-shipments-flat-rate/src/util/filterShippingMethods.test.js
@@ -52,7 +52,17 @@ const mockHydratedOrderItems = {
   variantId: "tMkp5QwZog5ihYTfG",
   weight: 50,
   width: 10,
-  tags: [Array]
+  tags: [Array],
+  subtotal: {
+    amount: 12.99,
+    currencyCode: "USD"
+  },
+  parcel: {
+    height: 10,
+    weight: 50,
+    width: 10,
+    length: 10
+  }
 };
 
 const mockHydratedOrder = {
@@ -814,3 +824,82 @@ test("deny method - multiple attributes - item value is less than $100 AND item
 
   expect(allowedMethods).toEqual([]);
 });
+
+/*
+* Tests with nested item/attribute restrictions
+*/
+test("deny method - nested attribute - subtotal.amount is less than $100, item restricted", async () => {
+  const mockMethodRestrictions = [
+    {
+      _id: "allow001",
+      methodIds: [
+        "stviZaLdqRvTKW6J5"
+      ],
+      type: "allow",
+      destination: {
+        country: [
+          "US"
+        ]
+      }
+    },
+    {
+      _id: "deny001",
+      methodIds: [
+        "stviZaLdqRvTKW6J5"
+      ],
+      type: "deny",
+      attributes: [
+        {
+          property: "subtotal.amount",
+          value: 100,
+          propertyType: "int",
+          operator: "lt"
+        }
+      ]
+    }
+  ];
+
+  mockContext.collections.FlatRateFulfillmentRestrictions.toArray.mockReturnValue(Promise.resolve(mockMethodRestrictions));
+
+  const allowedMethods = await filterShippingMethods(mockContext, mockShippingMethod, mockHydratedOrder);
+
+  expect(allowedMethods).toEqual([]);
+});
+
+test("deny method - nested attributes - parcel.weight is greater than 50, no item restrictions", async () => {
+  const mockMethodRestrictions = [
+    {
+      _id: "allow001",
+      methodIds: [
+        "stviZaLdqRvTKW6J5"
+      ],
+      type: "allow",
+      destination: {
+        country: [
+          "US"
+        ]
+      }
+    },
+    {
+      _id: "deny001",
+      methodIds: [
+        "stviZaLdqRvTKW6J5"
+      ],
+      type: "deny",
+      attributes: [
+        {
+          property: "parcel.weight",
+          value: 50,
+          propertyType: "int",
+          operator: "gt"
+        }
+      ]
+    }
+  ];
+
+  mockContext.collections.FlatRateFulfillmentRestrictions.toArray.mockReturnValue(Promise.resolve(mockMethodRestrictions));
+
+  const allowedMethods = await filterShippingMethods(mockContext, mockShippingMethod, mockHydratedOrder);
+
+  expect(allowedMethods).toEqual(mockShippingMethod);
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml