From 0cabfa729639424e033b5f951071b0806974c7fc Mon Sep 17 00:00:00 2001 From: Nate Clark Date: Thu, 31 Jan 2013 17:51:27 -0800 Subject: [PATCH] Consider time zones when querying for billing events [fixes #43617383] Change-Id: Icd8e9a6b14b182ad37fd8222efcb918f16881cf5 --- lib/cloud_controller/api/billing_event.rb | 2 +- spec/api/billing_event_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/cloud_controller/api/billing_event.rb b/lib/cloud_controller/api/billing_event.rb index b36105f9174..4045904a457 100644 --- a/lib/cloud_controller/api/billing_event.rb +++ b/lib/cloud_controller/api/billing_event.rb @@ -35,7 +35,7 @@ def end_time def parse_date_param(param) str = @params[param] - Time.parse(str) if str + Time.parse(str).localtime if str rescue raise Errors::BillingEventQueryInvalid end diff --git a/spec/api/billing_event_spec.rb b/spec/api/billing_event_spec.rb index 11c0e9a61f1..7337127f3f8 100644 --- a/spec/api/billing_event_spec.rb +++ b/spec/api/billing_event_spec.rb @@ -82,8 +82,8 @@ module VCAP::CloudController describe 'GET /v2/billing_events?start_date=#{start_date}&end_date=#{end_date}' do let(:path) do "/v2/billing_events?" + - "start_date=#{@start_time.iso8601}" + - "&end_date=#{@end_time.iso8601}" + "start_date=#{@start_time.utc.iso8601}" + + "&end_date=#{@end_time.utc.iso8601}" end context "as a cf admin" do