fix: update location target population field name

Author: patriciagarcia

src/thresholds.service.js

@@ -48,12 +48,12 @@ const getFactors = (stockCount, location, options) => {
     return {}
   }
 
-  if (!(location.targetPopulation && location.targetPopulation.length)) {
+  if (!(location.targetPopulations && location.targetPopulations.length)) {
     return {}
   }
   const allocationsVersion = getFactorVersion(stockCount, 'allocations', options)
   const plansVersion = getFactorVersion(stockCount, 'plans', options)
-  const targetPopulationVersion = getFactorVersion(stockCount, 'targetPopulation', options)
+  const targetPopulationVersion = getFactorVersion(stockCount, 'targetPopulations', options)
 
   if (typeof allocationsVersion === 'undefined' ||
     typeof plansVersion === 'undefined' ||
@@ -62,18 +62,18 @@ const getFactors = (stockCount, location, options) => {
     return {}
   }
 
-  const allocation = getFactor(location, location.allocations, allocationsVersion)
-  const targetPopulation = getFactor(location, location.targetPopulation, targetPopulationVersion)
+  const allocations = getFactor(location, location.allocations, allocationsVersion)
+  const targetPopulations = getFactor(location, location.targetPopulations, targetPopulationVersion)
 
   let plans = zonePlans
   if (location.level !== 'zone') {
     plans = getFactor(location, location.plans, plansVersion)
   }
 
   return {
-    weeklyLevels: allocation && allocation.weeklyLevels,
+    weeklyLevels: allocations && allocations.weeklyLevels,
     weeksOfStock: plans && plans.weeksOfStock,
-    targetPopulation: targetPopulation && targetPopulation.targetPopulation
+    targetPopulations: targetPopulations && targetPopulations.monthlyTargetPopulations
   }
 }
 
@@ -101,9 +101,9 @@ class ThresholdsService {
       return
     }
 
-    const { weeklyLevels, weeksOfStock, targetPopulation } = getFactors(stockCount, location, options)
+    const { weeklyLevels, weeksOfStock, targetPopulations } = getFactors(stockCount, location, options)
 
-    if (!(weeklyLevels && weeksOfStock && targetPopulation)) {
+    if (!(weeklyLevels && weeksOfStock && targetPopulations)) {
       return
     }
 
@@ -130,7 +130,7 @@ class ThresholdsService {
         return productThresholds
       }, {})
 
-      index[productId].targetPopulation = targetPopulation[productId]
+      index[productId].targetPopulation = targetPopulations[productId]
 
       return index
     }, {})
@@ -155,8 +155,12 @@ class ThresholdsService {
       const id = this.smartId.idify(scLocation, locationIdPattern)
       const allocations = stockCount.allocations || { version: 1 }
       const plans = stockCount.plans || { version: 1 }
-      const targetPopulation = stockCount.targetPopulation || { version: 1 }
-      index[id] = angular.merge({}, { allocations: allocations, plans: plans, targetPopulation: targetPopulation })
+      const targetPopulations = stockCount.targetPopulations || { version: 1 }
+      index[id] = angular.merge({}, {
+        allocations,
+        plans,
+        targetPopulations
+      })
 
       if (scLocation.lga) {
         if (!promises.lga) {

test/thresholds.service.spec.js

@@ -47,17 +47,17 @@ describe('thresholds service', function () {
         }
       }
     ],
-    targetPopulation: [
+    targetPopulations: [
       {
         version: 1,
-        targetPopulation: {
+        monthlyTargetPopulations: {
           'product:a': 500,
           'product:b': 1000
         }
       },
       {
         version: 2,
-        targetPopulation: {
+        monthlyTargetPopulations: {
           'product:a': 1000,
           'product:b': 2000
         }
@@ -86,7 +86,7 @@ describe('thresholds service', function () {
   var stockCount = {
     allocations: { version: 2 },
     plans: { version: 1 },
-    targetPopulation: { version: 2 }
+    targetPopulations: { version: 2 }
   }
 
   var products = [
@@ -228,7 +228,7 @@ describe('thresholds service', function () {
     it('takes an array of objects with location, allocations and plans fields and returns an object of location thresholds', function (done) {
       var stockCounts = [
         // { location: { zone: 'nc' }, allocations: { version: 2 }, plans: { version: 1 } },
-        { location: { zone: 'nc', state: 'kogi' }, allocations: { version: 2 }, plans: { version: 1 }, targetPopulation: { version: 2 } },
+        { location: { zone: 'nc', state: 'kogi' }, allocations: { version: 2 }, plans: { version: 1 }, targetPopulations: { version: 2 } },
         { location: { zone: 'nc', state: 'kogi', lga: 'adavi' } }
       ]
       var expected = {
@@ -241,7 +241,7 @@ describe('thresholds service', function () {
         'zone:nc:state:kogi': {
           allocations: { version: 2 },
           plans: { version: 1 },
-          targetPopulation: { version: 2 },
+          targetPopulations: { version: 2 },
           thresholds: {
             'product:a': { min: 100, reOrder: 200, max: 500, targetPopulation: 1000 },
             'product:b': { min: 200, reOrder: 400, max: 1000, targetPopulation: 2000 }
@@ -250,7 +250,7 @@ describe('thresholds service', function () {
         'zone:nc:state:kogi:lga:adavi': {
           allocations: { version: 1 },
           plans: { version: 1 },
-          targetPopulation: { version: 1 },
+          targetPopulations: { version: 1 },
           thresholds: {
             'product:a': { min: 50, reOrder: 100, max: 250, targetPopulation: 500 },
             'product:b': { min: 100, reOrder: 200, max: 500, targetPopulation: 1000 }