Add extra Weighted Averages fields

test/1-api.spec.js

@@ -1805,7 +1805,9 @@ describe('API', () => {
         'sellingWeightedPrice',
         'sellingAmount',
         'cumulativeWeightedPrice',
-        'cumulativeAmount'
+        'cumulativeAmount',
+        'firstTradeMts',
+        'lastTradeMts'
       ])
     }
   })

test/helpers/mock-data.js

@@ -770,7 +770,10 @@ module.exports = new Map([
       -33.16213227,
       null,
       21185.36542503,
-      17990.3814539
+      17990.3814539,
+      null,
+      1590969600000,
+      1654041600000
     ]
   ]
 ])

workers/loc.api/errors/index.js

@@ -164,6 +164,14 @@ class GrcSlackAvailabilityError extends BaseError {
   }
 }
 
+class WeightedAveragesTimeframeError extends UnprocessableEntityError {
+  constructor (message = 'ERR_TIME_FRAME_MORE_THAN_TWO_YEARS') {
+    super(message)
+
+    this.statusMessage = 'For Weighted Averages please select a time frame smaller than a two years'
+  }
+}
+
 module.exports = {
   BaseError,
   BadRequestError,
@@ -185,5 +193,6 @@ module.exports = {
   ArgsParamsFilterError,
   LedgerPaymentFilteringParamsError,
   GrcSlackAvailabilityError,
-  ImplementationError
+  ImplementationError,
+  WeightedAveragesTimeframeError
 }

workers/loc.api/generate-csv/csv.job.data.js

@@ -1064,10 +1064,14 @@ class CsvJobData {
         sellingWeightedPrice: 'WEIGHTED PRICE',
         sellingAmount: 'AMOUNT',
         cumulativeWeightedPrice: 'WEIGHTED PRICE',
-        cumulativeAmount: 'AMOUNT'
+        cumulativeAmount: 'AMOUNT',
+        firstTradeMts: 'First Trade',
+        lastTradeMts: 'Last Trade'
       },
       formatSettings: {
-        symbol: 'symbol'
+        symbol: 'symbol',
+        firstTradeMts: 'date',
+        lastTradeMts: 'date'
       },
       csvCustomWriter: this.weightedAveragesReportCsvWriter
     }

workers/loc.api/weighted.averages.report/index.js

@@ -1,5 +1,11 @@
 'use strict'
 
+const moment = require('moment')
+
+const {
+  WeightedAveragesTimeframeError
+} = require('../errors')
+
 const { decorateInjectable } = require('../di/utils')
 
 const depsTypes = (TYPES) => [
@@ -65,7 +71,22 @@ class WeightedAveragesReport {
 
   async _getWeightedAveragesReportFromApi (args) {
     const limit = 100_000
-    const symbols = args?.params?.symbol ?? []
+
+    const {
+      start,
+      end,
+      symbol: symbols = []
+    } = args?.params ?? {}
+
+    const startDate = moment(start)
+    const endDate = moment(end)
+    const isTimeframeMoreThan2Y1h = endDate.isAfter(
+      startDate.add(2, 'year').add(1, 'hour')
+    )
+
+    if (isTimeframeMoreThan2Y1h) {
+      throw new WeightedAveragesTimeframeError()
+    }
 
     const weightedAverages = []
 
@@ -97,7 +118,9 @@ class WeightedAveragesReport {
         sumSellingSpent = 0,
         sumSellingAmount = 0,
         buyingWeightedPrice = 0,
-        sellingWeightedPrice = 0
+        sellingWeightedPrice = 0,
+        firstTradeMts,
+        lastTradeMts
       } = res ?? {}
 
       if (tradeCount >= limit) {
@@ -116,7 +139,9 @@ class WeightedAveragesReport {
         sellingWeightedPrice,
         sellingAmount: sumSellingAmount,
         cumulativeWeightedPrice,
-        cumulativeAmount
+        cumulativeAmount,
+        firstTradeMts,
+        lastTradeMts
       })
     }