File tree Expand file tree Collapse file tree 5 files changed +7
-6
lines changed Expand file tree Collapse file tree 5 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ class ApiController < ApplicationController
2
2
before_action :set_params
3
3
4
4
def hours
5
- dates = @dates . blank? ? [ Date . today . strftime ( "%Y-%m-%d" ) , Date . today . strftime ( "%Y-%m-%d" ) ] : @dates . sort
5
+ dates = @dates . blank? ? [ Time . zone . today . strftime ( "%Y-%m-%d" ) , Time . zone . today . strftime ( "%Y-%m-%d" ) ] : @dates . sort
6
6
alma = AlmaSpecialHours . new
7
7
@hours = API ::OpenAndSpecialHoursXmlToJsonParser . call ( alma . xml_document , dates )
8
8
Original file line number Diff line number Diff line change @@ -41,13 +41,13 @@ def html_content
41
41
end
42
42
43
43
def alma_request
44
- dates = [ Date . today . strftime ( "%Y-%m-%d" ) , ( Date . today +6 . days ) . strftime ( "%Y-%m-%d" ) ]
44
+ dates = [ Time . zone . today . strftime ( "%Y-%m-%d" ) , ( Time . zone . today +6 . days ) . strftime ( "%Y-%m-%d" ) ]
45
45
alma = AlmaSpecialHours . new
46
46
API ::OpenAndSpecialHoursXmlToJsonParser . call ( alma . xml_document , dates )
47
47
end
48
48
49
49
def alma_todays_hours_request
50
- dates = [ Date . today . strftime ( "%Y-%m-%d" ) , Date . today . strftime ( "%Y-%m-%d" ) ]
50
+ dates = [ Time . zone . today . strftime ( "%Y-%m-%d" ) , Time . zone . today . strftime ( "%Y-%m-%d" ) ]
51
51
alma = AlmaSpecialHours . new
52
52
API ::OpenAndSpecialHoursXmlToJsonParser . call ( alma . xml_document , dates )
53
53
end
Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ def self.closed_all_day?(record)
48
48
# - current date is within range [from_date, to_date]
49
49
def self . upcoming_date? ( from_date , to_date )
50
50
date_range = DateTime . parse ( from_date ) ..DateTime . parse ( to_date )
51
- date_range === Date . today . beginning_of_day || date_range . first . future?
51
+ date_range === Time . zone . today . beginning_of_day || date_range . first . future?
52
52
end
53
53
54
54
def self . get_formatted_dates ( day )
Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ module API
21
21
class Application < Rails ::Application
22
22
# Initialize configuration defaults for originally generated Rails version.
23
23
config . load_defaults 5.2
24
+ config . time_zone = 'Pacific Time (US & Canada)'
24
25
25
26
# Settings in config/environments/* take precedence over those specified here.
26
27
# Application configuration can go into files in config/initializers
Original file line number Diff line number Diff line change 11
11
let ( :url ) { "#{ ENV [ 'ALMA_OPEN_HOURS_URL' ] } ?apikey=#{ ENV [ 'ALMA_API_KEY' ] } &from=#{ date_from } &to=#{ date_to } " }
12
12
let ( :open_and_special_hours_url ) { "#{ ENV [ 'ALMA_SPECIAL_HOURS_URL' ] } ?apikey=#{ ENV [ 'ALMA_API_KEY' ] } &scope=#{ ENV [ 'ALMA_SPECIAL_HOURS_SCOPE' ] } " }
13
13
let ( :xml ) { File . read ( "spec/fixtures/alma_open_hours.xml" ) }
14
- let ( :date_from ) { Date . today . strftime ( "%Y-%m-%d" ) }
15
- let ( :date_to ) { Date . today . strftime ( "%Y-%m-%d" ) }
14
+ let ( :date_from ) { Time . zone . today . strftime ( "%Y-%m-%d" ) }
15
+ let ( :date_to ) { Time . zone . today . strftime ( "%Y-%m-%d" ) }
16
16
let ( :dates ) { [ date_from , date_to ] }
17
17
let ( :cached_minutes ) { "1" }
18
18
You can’t perform that action at this time.
0 commit comments