Make some tweaks to pricing aggregations (#371)

Author: cbovis

src/app/routes/v1/util/transform-token.js

@@ -37,9 +37,9 @@ const transformToken = (token, tokenPrice, stats, statsPeriod) => {
       : {
           change: null,
           close: null,
-          high: null,
+          high: _.get(tokenPrice, 'maxPriceUSD', null),
           last: null,
-          low: null,
+          low: _.get(tokenPrice, 'minPriceUSD', null),
           open: null,
         };
 

src/metrics/get-token-price-metrics.js

@@ -23,13 +23,13 @@ const getPriceForPreviousPeriod = async (tokenAddress, currentPeriodStart) => {
               },
             },
             {
-              exists: {
-                field: 'relayerId',
+              range: {
+                priceUSD: { gt: 0 },
               },
             },
             {
-              exists: {
-                field: 'priceUSD',
+              range: {
+                tradedAmountUSD: { gte: 1 },
               },
             },
           ],
@@ -68,13 +68,13 @@ const getTokenMetrics = async (tokenAddress, period, granularity) => {
               },
             },
             {
-              exists: {
-                field: 'relayerId',
+              range: {
+                priceUSD: { gt: 0 },
               },
             },
             {
-              exists: {
-                field: 'priceUSD',
+              range: {
+                tradedAmountUSD: { gte: 1 },
               },
             },
           ],
@@ -87,7 +87,7 @@ const getTokenMetrics = async (tokenAddress, period, granularity) => {
             field: 'date',
             calendar_interval: granularity,
             extended_bounds: {
-              min: period === 'all' ? undefined : dateFrom,
+              min: dateFrom,
               max: dateTo,
             },
           },

src/metrics/get-token-volume-metrics.js

@@ -13,7 +13,7 @@ const getTokenMetrics = async (tokenAddress, period, granularity) => {
             field: 'date',
             calendar_interval: granularity,
             extended_bounds: {
-              min: period === 'all' ? undefined : dateFrom,
+              min: dateFrom,
               max: dateTo,
             },
           },

src/tokens/get-token-prices.js

@@ -9,16 +9,6 @@ async function getTokenPrices(tokenAddresses, period) {
       query: {
         bool: {
           filter: [
-            {
-              exists: {
-                field: 'relayerId',
-              },
-            },
-            {
-              exists: {
-                field: 'priceUSD',
-              },
-            },
             {
               terms: {
                 tokenAddress: tokenAddresses,
@@ -29,6 +19,11 @@ async function getTokenPrices(tokenAddresses, period) {
                 priceUSD: { gt: 0 },
               },
             },
+            {
+              range: {
+                tradedAmountUSD: { gte: 1 },
+              },
+            },
           ],
         },
       },

src/tokens/get-tokens-with-stats-for-dates.js

@@ -139,9 +139,9 @@ const getTokensWithStatsForDates = async (dateFrom, dateTo, options) => {
             : {
                 change: null,
                 close: null,
-                high: null,
+                high: _.get(price, 'maxPriceUSD', null),
                 last: null,
-                low: null,
+                low: _.get(price, 'minPriceUSD', null),
                 open: null,
               },
         stats: {