feat: sorts plans + removes rounding of planPrice

rsksmart · Sep 7, 2020 · 1764a70 · 1764a70
1 parent 02590d3
commit 1764a70
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 26 deletions.
diff --git a/src/services/storage/handlers/offer.ts b/src/services/storage/handlers/offer.ts
@@ -30,7 +30,9 @@ function updatePrices (offer: Offer, period: BigNumber, price: BigNumber): Promi
 }
 
 export function weightedCumulativeAverage (newValue: number, currentCt: number, currentAvg: number): number {
-  if (!currentAvg) { return newValue }
+  if (!currentAvg) {
+    return newValue
+  }
 
   const values = [currentAvg, newValue]
   const newValueWeight = 1 / (currentCt + 1)
@@ -77,7 +79,7 @@ const handlers: { [key: string]: Function } = {
     const plan = await updatePrices(offer, period, price)
 
     const { plans, averagePrice } = offer
-    const planPrice = Math.round(plan.price.div(1024 ** 3).toNumber())
+    const planPrice = plan.price.div(1024 ** 3).toNumber()
 
     const newAvgPrice = plans && weightedCumulativeAverage(planPrice, plans.length, averagePrice)
     offer.averagePrice = newAvgPrice || planPrice

diff --git a/src/services/storage/hooks/offers.hooks.ts b/src/services/storage/hooks/offers.hooks.ts
@@ -26,35 +26,38 @@ export default {
     find: [
       (context: HookContext) => {
         if (context.params.query) {
-          const { averagePrice, totalCapacity, periods } = context.params.query
+          const { averagePrice, totalCapacity, periods, $limit } = context.params.query
 
-          context.params.sequelize = {
-            raw: false,
-            nest: true,
-            include: [
-              {
-                model: BillingPlan,
-                as: 'plans'
-              },
-              {
-                model: Agreement
-              }
-            ]
-          }
+          if (!$limit) {
+            context.params.sequelize = {
+              raw: false,
+              nest: true,
+              include: [
+                {
+                  model: BillingPlan,
+                  as: 'plans'
+                },
+                {
+                  model: Agreement
+                }
+              ],
+              order: [['plans', 'period', 'ASC']]
+            }
 
-          if ((averagePrice || totalCapacity)) {
-            context.params.sequelize.where = {
-              averagePrice: averagePrice && {
-                [Op.between]: [averagePrice.min, averagePrice.max]
-              },
-              totalCapacity: totalCapacity && {
-                [Op.between]: [totalCapacity.min, totalCapacity.max]
+            if ((averagePrice || totalCapacity)) {
+              context.params.sequelize.where = {
+                averagePrice: averagePrice && {
+                  [Op.between]: [averagePrice.min, averagePrice.max]
+                },
+                totalCapacity: totalCapacity && {
+                  [Op.between]: [totalCapacity.min, totalCapacity.max]
+                }
               }
             }
-          }
 
-          if (periods?.length) {
-            context.params.sequelize.where['$plans.period$'] = { [Op.in]: periods }
+            if (periods?.length) {
+              context.params.sequelize.where['$plans.period$'] = { [Op.in]: periods }
+            }
           }
         }
       }