Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Incorrect DiffInMonths calculation #59 #60

Closed
wants to merge 4 commits into from
Closed

fix Incorrect DiffInMonths calculation #59 #60

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73a53d7
fix bugs issue #59, added condition check if diffInMonths > 0, so dif…
rendyreivaldy25 Dec 31, 2020
e4cd616
Merge branch 'master' into incorrect-diffinmonths-calculation-issue-59
Feb 19, 2021
4a9f35e
solve issue #59, just reverse the carbon instance when the second car…
rendyreivaldy25 Jun 18, 2021
7185764
Merge branch 'master' into incorrect-diffinmonths-calculation-issue-59
rntdrts Nov 4, 2021
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
14 changes: 11 additions & 3 deletions carbon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,9 +1202,17 @@ func calculateDiffInMonths(c, carb *Carbon, abs bool) int64 {

if c.Month() != carb.Month() && c.Year() == carb.Year() {
diffInMonths := int64(carb.Month() - c.Month())
remainingTime := int(carb.DiffInHours(c, true))
remainingTime := 0
totalHours := 0
if carb.Timestamp() < c.Timestamp() {
remainingTime = int(c.DiffInHours(carb, true))
totalHours = carb.DaysInMonth() * hoursPerDay
} else {
remainingTime = int(carb.DiffInHours(c, true))
totalHours = c.DaysInMonth() * hoursPerDay
}
Comment on lines +1207 to +1213
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you isolate this in a function? and return instead of using if-else statement?

Suggested change
if carb.Timestamp() < c.Timestamp() {
remainingTime = int(c.DiffInHours(carb, true))
totalHours = carb.DaysInMonth() * hoursPerDay
} else {
remainingTime = int(carb.DiffInHours(c, true))
totalHours = c.DaysInMonth() * hoursPerDay
}
remainingTime, totalHours = calculateDiffInTimeAndHours(c, carb)
// ...
func calculateDiffInTimeAndHours(c, carb * Carbon) (int64, int64) {
if carb.Timestamp() < c.Timestamp() {
return int(c.DiffInHours(carb, true)), carb.DaysInMonth() * hoursPerDay
}
return int(carb.DiffInHours(c, true)), c.DaysInMonth() * hoursPerDay
}
}


if remainingTime < c.DaysInMonth()*hoursPerDay {
if remainingTime < totalHours {
return 0
}

Expand Down Expand Up @@ -1603,7 +1611,7 @@ func (c *Carbon) StartOfWeek() *Carbon {
// EndOfWeek returns the date of the last day of the week at 23:59:59
func (c *Carbon) EndOfWeek() *Carbon {
if c.Weekday() == c.WeekEndsAt() {
return c.EndOfDay();
return c.EndOfDay()
}

return c.Next(c.WeekEndsAt()).EndOfDay()
Expand Down
9 changes: 9 additions & 0 deletions carbon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2767,3 +2767,12 @@ func TestSetUnix(t *testing.T) {
require.Nil(t, err)
assert.Equal(t, unix, utcTime.Unix())
}

func TestIncorrectDiffInMonthsCalculationIssue59(t *testing.T) {
d1, _ := Create(2020, time.November, 1, 0, 0, 0, 0, time.UTC.String())
d2, _ := Create(2020, time.December, 1, 0, 0, 0, 0, time.UTC.String())
months := d1.DiffInMonths(d2, true)
assert.EqualValues(t, 1, months)
monthsReverse := d2.DiffInMonths(d1, true)
assert.EqualValues(t, 1, monthsReverse)
}