Merge pull request #18 from fielded/17-version-last

Pass { version: 'last' } to use last version of plans and allocations

Author: patriciagarcia

src/thresholds.service.js

@@ -30,30 +30,49 @@ class ThresholdsService {
   // For zones the thresholds are based on the state store required allocation for
   // the week, that information is passed as an optional param (`requiredStateStoresAllocation`).
   // That param is only used for zones.
-  calculateThresholds (location, stockCount, products, requiredStateStoresAllocation = {}) {
-    if (!location || !location.allocations || !location.plans || !location.level) {
+  calculateThresholds (location, stockCount, products, requiredStateStoresAllocation = {}, options = {}) {
+    if (!location || !location.allocations || !location.allocations.length ||
+      !location.plans || !location.plans.length || !location.level) {
       return
     }
 
-    if (!stockCount || !stockCount.allocations || !stockCount.allocations.version ||
-        !stockCount.plans || !stockCount.plans.version) {
+    if (!stockCount) {
+      return
+    }
+
+    if (options.version !== 'last' &&
+        !(stockCount.allocations && typeof stockCount.allocations.version !== undefined &&
+          stockCount.plans && typeof stockCount.plans.version !== undefined)) {
       return
     }
 
     if (!products || !products.length) {
       return
     }
 
-    const allocation = find(location.allocations, isVersion.bind(null, stockCount.allocations.version))
+    let allocation
+    if (options.version === 'last') {
+      allocation = location.allocations[location.allocations.length - 1]
+    } else {
+      allocation = find(location.allocations, isVersion.bind(null, stockCount.allocations.version))
+    }
+
     if (!(allocation && allocation.weeklyLevels)) {
       return
     }
 
     const weeklyLevels = allocation.weeklyLevels
+
     let weeksOfStock = zonesPlan
 
     if (location.level !== 'zone') {
-      const plan = find(location.plans, isVersion.bind(null, stockCount.plans.version))
+      let plan
+      if (options.version === 'last') {
+        plan = location.plans[location.plans.length - 1]
+      } else {
+        plan = find(location.plans, isVersion.bind(null, stockCount.plans.version))
+      }
+
       if (!(plan && plan.weeksOfStock)) {
         return
       }

test/thresholds.service.spec.js

@@ -59,6 +59,14 @@ describe('thresholds service', function () {
           reOrder: 2,
           min: 1
         }
+      },
+      {
+        version: 2,
+        weeksOfStock: {
+          max: 10,
+          reOrder: 4,
+          min: 2
+        }
       }
     ]
   }
@@ -171,6 +179,24 @@ describe('thresholds service', function () {
       var actual = thresholdsService.calculateThresholds(unroundedLocation, stockCount, products)
       expect(actual).toEqual(expected)
     })
+    it('uses the last version of plans and allocations if { version: "last"} is passed as option', function () {
+      var expected = {
+        'product:a': {
+          min: 200,
+          reOrder: 400,
+          max: 1000,
+          targetPopulation: 1000
+        },
+        'product:b': {
+          min: 400,
+          reOrder: 800,
+          max: 2000,
+          targetPopulation: 2000
+        }
+      }
+      var actual = thresholdsService.calculateThresholds(location, stockCount, products, null, { version: 'last' })
+      expect(actual).toEqual(expected)
+    })
   })
 
   describe('getThresholdsFor', function () {