Add trader filter to various endpoints

Author: cbovis

src/app/middleware/index.js

@@ -11,6 +11,7 @@ const pagination = require('./pagination');
 const relayer = require('./relayer');
 const timePeriod = require('./time-period');
 const token = require('./token');
+const trader = require('./trader');
 
 module.exports = {
   cacheControl,
@@ -26,4 +27,5 @@ module.exports = {
   relayer,
   timePeriod,
   token,
+  trader,
 };

src/app/middleware/trader.js

@@ -0,0 +1,24 @@
+const _ = require('lodash');
+
+const normalizeStringParam = param => {
+  if (param === undefined || param === null) {
+    return undefined;
+  }
+
+  if (param.trim().length === 0) {
+    return undefined;
+  }
+
+  return param;
+};
+
+const createMiddleware = (paramName, defaultValue) => async (context, next) => {
+  const { request } = context;
+  const address = normalizeStringParam(request.query[paramName]);
+
+  _.set(context, ['params', paramName], address || defaultValue);
+
+  await next();
+};
+
+module.exports = createMiddleware;

src/app/routes/v1/fills.js

@@ -62,6 +62,7 @@ const createRouter = () => {
     middleware.relayer('relayer'),
     middleware.token('token'),
     middleware.fillStatus('status'),
+    middleware.trader('trader'),
     async ({ pagination, params, request, response }, next) => {
       const { query } = request;
       const { limit, page } = pagination;
@@ -71,6 +72,7 @@ const createRouter = () => {
         relayer,
         status,
         token,
+        trader,
         valueFrom,
         valueTo,
       } = params;
@@ -118,6 +120,7 @@ const createRouter = () => {
             relayerId: relayer,
             status,
             token,
+            trader,
             valueFrom,
             valueTo,
           },

src/app/routes/v1/metrics.js

@@ -33,6 +33,7 @@ const createRouter = () => {
     middleware.relayer('relayer'),
     middleware.token('token'),
     middleware.fillStatus('status'),
+    middleware.trader('trader'),
     async ({ params, response }, next) => {
       const {
         granularity,
@@ -41,6 +42,7 @@ const createRouter = () => {
         relayer,
         status,
         token,
+        trader,
         valueFrom,
         valueTo,
       } = params;
@@ -50,6 +52,7 @@ const createRouter = () => {
         relayerId: relayer,
         status,
         token,
+        trader,
         valueFrom,
         valueTo,
       });

src/app/routes/v1/stats.js

@@ -19,6 +19,7 @@ const createRouter = () => {
     middleware.relayer('relayer'),
     middleware.token('token'),
     middleware.fillStatus('status'),
+    middleware.trader('trader'),
     async ({ params, response }, next) => {
       const { dateFrom, dateTo } = getDatesForTimePeriod(params.period);
 
@@ -27,6 +28,7 @@ const createRouter = () => {
         relayerId: params.relayer,
         status: params.status,
         token: params.token,
+        trader: params.trader,
         valueFrom: params.valueFrom,
         valueTo: params.valueTo,
       });
@@ -46,6 +48,7 @@ const createRouter = () => {
     middleware.relayer('relayer'),
     middleware.token('token'),
     middleware.fillStatus('status'),
+    middleware.trader('trader'),
     async ({ params, response }, next) => {
       const { dateFrom, dateTo } = getDatesForTimePeriod(params.period);
 
@@ -54,6 +57,7 @@ const createRouter = () => {
         relayerId: params.relayer,
         status: params.status,
         token: params.token,
+        trader: params.trader,
         valueFrom: params.valueFrom,
         valueTo: params.valueTo,
       });

src/fills/build-fills-query.js

@@ -20,6 +20,7 @@ const buildFillsQuery = params => {
     relayerId,
     status,
     token,
+    trader,
     valueFrom,
     valueTo,
   } = params;
@@ -79,6 +80,16 @@ const buildFillsQuery = params => {
     });
   }
 
+  if (_.isString(trader)) {
+    filters.push({
+      multi_match: {
+        fields: ['maker', 'taker'],
+        query: trader,
+        type: 'phrase',
+      },
+    });
+  }
+
   if (_.isString(query)) {
     filters.push({
       multi_match: {