Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/jobs/reports/month_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ module MonthHelper
# @param [Range<Date>] date_range
# @return [Array<Range<Date>>]
def months(date_range)
return [date_range] if start_end_same_month?(date_range)

results = []

results << (date_range.begin..date_range.begin.end_of_month)
Expand All @@ -33,5 +35,13 @@ def months(date_range)

results
end

# @api private
def start_end_same_month?(date_range)
start_date = date_range.begin
end_date = date_range.end

start_date.year == end_date.year && start_date.month == end_date.month
end
end
end
8 changes: 8 additions & 0 deletions spec/jobs/reports/month_helper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,13 @@
],
)
end

it 'correctly returns a partial month when the first month is a partial month' do
expect(months(Date.new(2022, 1, 1)..Date.new(2022, 1, 28))).to eq(
[
Date.new(2022, 1, 1)..Date.new(2022, 1, 28),
],
)
end
end
end