Create appendTimestamp() utils function (https://github.com/woocommerce/woocommerce-admin/pull/542)

* appendTimestamp() utils function

* Make appendTimestamp() to throw and error if timeOfDay is not a valid value

plugins/woocommerce-admin/client/analytics/report/orders/index.js

@@ -15,7 +15,7 @@ import { get } from 'lodash';
 import { EmptyContent, ReportFilters } from '@woocommerce/components';
 import { filters, advancedFilterConfig } from './config';
 import { getAdminLink } from 'lib/nav-utils';
-import { getCurrentDates, getIntervalForQuery } from 'lib/date';
+import { appendTimestamp, getCurrentDates, getIntervalForQuery } from 'lib/date';
 import { getReportChartData } from 'store/reports/utils';
 import { MAX_PER_PAGE } from 'store/constants';
 import OrdersReportChart from './chart';
@@ -122,8 +122,8 @@ export default compose(
 			order: query.order || 'asc',
 			page: query.page || 1,
 			per_page: query.per_page || 25,
-			after: datesFromQuery.primary.after + 'T00:00:00+00:00',
-			before: datesFromQuery.primary.before + 'T23:59:59+00:00',
+			after: appendTimestamp( datesFromQuery.primary.after, 'start' ),
+			before: appendTimestamp( datesFromQuery.primary.before, 'end' ),
 			status: [ 'processing', 'on-hold', 'completed' ],
 		};
 		const orders = getOrders( tableQuery );

plugins/woocommerce-admin/client/analytics/report/revenue/index.js

@@ -17,7 +17,7 @@ import { Card, ReportFilters, TableCard, TablePlaceholder } from '@woocommerce/c
 import { downloadCSVFile, generateCSVDataFromTable, generateCSVFileName } from 'lib/csv';
 import { formatCurrency, getCurrencyFormatDecimal } from 'lib/currency';
 import { getAdminLink, onQueryChange } from 'lib/nav-utils';
-import { getCurrentDates, getDateFormatsForInterval, getIntervalForQuery } from 'lib/date';
+import { appendTimestamp, getCurrentDates, getDateFormatsForInterval, getIntervalForQuery } from 'lib/date';
 import OrdersReportChart from './chart';
 
 export class RevenueReport extends Component {
@@ -236,8 +236,8 @@ export default compose(
 			order: query.order || 'asc',
 			page: query.page || 1,
 			per_page: query.per_page || 25,
-			after: datesFromQuery.primary.after + 'T00:00:00+00:00',
-			before: datesFromQuery.primary.before + 'T23:59:59+00:00',
+			after: appendTimestamp( datesFromQuery.primary.after, 'start' ),
+			before: appendTimestamp( datesFromQuery.primary.before, 'end' ),
 		};
 		const tableData = getReportStats( 'revenue', tableQuery );
 		const isTableDataError = isReportStatsError( 'revenue', tableQuery );

plugins/woocommerce-admin/client/lib/date/index.js

@@ -48,6 +48,23 @@ export const periods = [
 	{ value: 'previous_year', label: __( 'Previous Year', 'wc-admin' ) },
 ];
 
+/**
+ * Adds timestamp to a string date.
+ *
+ * @param {string} date - Date as a string.
+ * @param {string} timeOfDay - Either `start` or `end` of the day.
+ * @return {string} - String date with timestamp attached.
+ */
+export const appendTimestamp = ( date, timeOfDay ) => {
+	if ( timeOfDay === 'start' ) {
+		return date + 'T00:00:00+00:00';
+	}
+	if ( timeOfDay === 'end' ) {
+		return date + 'T23:59:59+00:00';
+	}
+	throw new Error( 'appendTimestamp requires second parameter to be either `start` or `end`' );
+};
+
 /**
  * Convert a string to Moment object
  *

plugins/woocommerce-admin/client/lib/date/test/index.js

@@ -10,6 +10,7 @@ import { setLocaleData } from '@wordpress/i18n';
  * Internal dependencies
  */
 import {
+	appendTimestamp,
 	toMoment,
 	getLastPeriod,
 	getCurrentPeriod,
@@ -23,6 +24,20 @@ import {
 	getPreviousDate,
 } from 'lib/date';
 
+describe( 'appendTimestamp', () => {
+	it( 'should append `start` timestamp', () => {
+		expect( appendTimestamp( '2018-01-01', 'start' ) ).toEqual( '2018-01-01T00:00:00+00:00' );
+	} );
+
+	it( 'should append `end` timestamp', () => {
+		expect( appendTimestamp( '2018-01-01', 'end' ) ).toEqual( '2018-01-01T23:59:59+00:00' );
+	} );
+
+	it( 'should throw and error if `timeOfDay` is not valid', () => {
+		expect( () => appendTimestamp( '2018-01-01' ) ).toThrow( Error );
+	} );
+} );
+
 describe( 'toMoment', () => {
 	it( 'should pass through a valid Moment object as an argument', () => {
 		const now = moment();

plugins/woocommerce-admin/client/store/reports/utils.js

@@ -9,6 +9,7 @@ import { forEach, isNull } from 'lodash';
  * Internal dependencies
  */
 import { MAX_PER_PAGE } from 'store/constants';
+import { appendTimestamp } from 'lib/date';
 
 /**
  * Returns true if a report object is empty.
@@ -58,8 +59,8 @@ export function getSummaryNumbers( endpoint, dates, select ) {
 
 	const primaryQuery = {
 		...baseQuery,
-		after: dates.primary.after + 'T00:00:00+00:00',
-		before: dates.primary.before + 'T23:59:59+00:00',
+		after: appendTimestamp( dates.primary.after, 'start' ),
+		before: appendTimestamp( dates.primary.before, 'end' ),
 	};
 	const primary = getReportStats( endpoint, primaryQuery );
 	if ( isReportStatsRequesting( endpoint, primaryQuery ) ) {
@@ -73,8 +74,8 @@ export function getSummaryNumbers( endpoint, dates, select ) {
 	const secondaryQuery = {
 		...baseQuery,
 		per_page: 1,
-		after: dates.secondary.after + 'T00:00:00+00:00',
-		before: dates.secondary.before + 'T23:59:59+00:00',
+		after: appendTimestamp( dates.secondary.after, 'start' ),
+		before: appendTimestamp( dates.secondary.before, 'end' ),
 	};
 	const secondary = getReportStats( endpoint, secondaryQuery );
 	if ( isReportStatsRequesting( endpoint, secondaryQuery ) ) {
@@ -109,8 +110,8 @@ export function getReportChartData( endpoint, query, select ) {
 		},
 	};
 
-	query.after += 'T00:00:00+00:00';
-	query.before += 'T23:59:59+00:00';
+	query.after = appendTimestamp( query.after, 'start' );
+	query.before = appendTimestamp( query.before, 'end' );
 
 	const stats = getReportStats( endpoint, query );