feat(storage): moves average price of offers to monthly basis (#389)

rsksmart · Nov 16, 2020 · ee15b43 · ee15b43
1 parent 1e0a42a
commit ee15b43
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ It has following schema:
     "utilizedCapacity": "number",
     "acceptedCurrencies": "string[]", // ['rbtc', 'rif']
     "availableCapacity": "number",
-    "avgBillingPrice": "number",
+    "avgBillingPrice": "number", // on a monthly basis
     "totalStakedUSD": "number",
     "createdAt": "Date",
     "updatedAt": "Date",
@@ -182,7 +182,7 @@ It has following schema:
 GET: /storage/v0/avgBillingPrice
 ```
 
-Return min/max average billing price converted to USD.
+Returns min/max average billing price per month converted to USD.
 
 
 ```json5

diff --git a/src/services/storage/models/offer.model.ts b/src/services/storage/models/offer.model.ts
@@ -99,7 +99,7 @@ export function getBillingPriceAvgQuery (
     SELECT
       CAST(
         SUM(
-          (cast(price as REAL) / ${WEI}) * coalesce("rates".${sequelize.escape(currency)}, 0) * 1024 / period * (3600 * 24)
+          (cast(price as REAL) / ${WEI}) * coalesce("rates".${sequelize.escape(currency)}, 0) * 1024 / period * (3600 * 24 * 30)
         ) / COUNT("storage_billing-plan"."id")
         as INTEGER
       )

diff --git a/src/services/storage/utils.ts b/src/services/storage/utils.ts
@@ -26,7 +26,7 @@ export function getAvgMinMaxBillingPriceQuery (minMax: MinMax): string {
         SELECT
             CAST(
               SUM(
-                CAST(price as REAL) / ${WEI} * COALESCE("rates"."usd", 0) * 1024 / period * (3600 * 24)
+                CAST(price as REAL) / ${WEI} * COALESCE("rates"."usd", 0) * 1024 / period * (3600 * 24 * 30)
               ) / COUNT(*)
               as INTEGER
             ) as avgPrice

diff --git a/test/integration/services/storage/storage-manger.spec.ts b/test/integration/services/storage/storage-manger.spec.ts
@@ -353,8 +353,8 @@ describe('Storage service', function () {
         const avgBillingPlanService = client.service(ServiceAddresses.AVG_BILLING_PRICE)
         const { min, max } = await avgBillingPlanService.get(1)
         const rate = await Rate.findOne({ where: { token: 'rbtc' }, raw: true })
-        expect(min).to.be.eql(Math.floor(rate?.usd as number))
-        expect(max).to.be.eql(Math.floor(rate?.usd as number))
+        expect(min).to.be.eql(Math.floor(rate?.usd as number * 30))
+        expect(max).to.be.eql(Math.floor(rate?.usd as number * 30))
       })
     })
     describe('Notification', () => {

diff --git a/test/unit/services/storage/models.spec.ts b/test/unit/services/storage/models.spec.ts
@@ -326,9 +326,9 @@ describe('Models', () => {
         order: [literal('avgBillingPrice')]
       })
       const expectedRes = [
-        { provider: 'abc', avgBillingPrice: 1 },
-        { provider: 'abc2', avgBillingPrice: 2 },
-        { provider: 'abc3', avgBillingPrice: 3 }
+        { provider: 'abc', avgBillingPrice: 30 },
+        { provider: 'abc2', avgBillingPrice: 60 },
+        { provider: 'abc3', avgBillingPrice: 90 }
       ]
       expect(offers).to.be.deep.equal(expectedRes)
     })