diff --git a/migrations/1641394367865-testing-customer-toggle.js b/migrations/1641394367865-testing-customer-toggle.js index 174aaa58..a8b8d522 100644 --- a/migrations/1641394367865-testing-customer-toggle.js +++ b/migrations/1641394367865-testing-customer-toggle.js @@ -2,7 +2,7 @@ var db = require('./db') exports.up = function (next) { var sql = [ - `ALTER TABLE customers ADD COLUMN is_test_customer BOOLEAN DEFAULT false`, + `ALTER TABLE customers ADD COLUMN is_test_customer BOOLEAN NOT NULL DEFAULT false`, ] db.multi(sql, next) diff --git a/new-lamassu-admin/src/pages/Analytics/Analytics.js b/new-lamassu-admin/src/pages/Analytics/Analytics.js index 4d1d6114..936db2ba 100644 --- a/new-lamassu-admin/src/pages/Analytics/Analytics.js +++ b/new-lamassu-admin/src/pages/Analytics/Analytics.js @@ -2,6 +2,8 @@ import { useQuery } from '@apollo/react-hooks' import { Box } from '@material-ui/core' import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' +import { endOfToday } from 'date-fns' +import { subDays } from 'date-fns/fp' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' @@ -42,8 +44,16 @@ const TIME_OPTIONS = { } const GET_TRANSACTIONS = gql` - query transactions($excludeTestingCustomers: Boolean) { - transactions(excludeTestingCustomers: $excludeTestingCustomers) { + query transactions( + $from: Date + $until: Date + $excludeTestingCustomers: Boolean + ) { + transactions( + from: $from + until: $until + excludeTestingCustomers: $excludeTestingCustomers + ) { id txClass txHash @@ -117,7 +127,11 @@ const Analytics = () => { const classes = useStyles() const { data: txResponse, loading: txLoading } = useQuery(GET_TRANSACTIONS, { - variables: { excludeTestingCustomers: true } + variables: { + from: subDays(65, endOfToday()), + until: endOfToday(), + excludeTestingCustomers: true + } }) const { data: configResponse, loading: configLoading } = useQuery(GET_DATA)