refactor: time/timeutil: use Day and Week in place of `Duration…

…Day` and `DurationWeek`
grokify · Nov 12, 2023 · ff6d7a3 · ff6d7a3
1 parent 60af921
commit ff6d7a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/time/timeutil/constants.go b/time/timeutil/constants.go
@@ -3,28 +3,15 @@ package timeutil
 import "time"
 
 const (
+	Day  = 24 * time.Hour
+	Week = 7 * Day
+
 	DaysPerWeek = float32(7)
 	HoursPerDay = float32(24)
 
 	SecondsPerYear = (365 * 24 * 60 * 60) + (6 * 60 * 60)
 	SecondsPerWeek = 7 * 24 * 60 * 60
 	SecondsPerDay  = 24 * 60 * 60
 
-	// NanosPerSecond      = int64(1000000000)
-	// NanosPerMicrosecond = NanosPerSecond / 1000000
-	// NanosPerMillisecond = NanosPerSecond / 1000
-	// NanosPerMinute      = NanosPerSecond * 60
-	// NanosPerHour        = NanosPerMinute * 60
-	// NanosPerDay         = NanosPerHour * 24
-	// NanosPerWeek        = NanosPerDay * 7
-	// NanosPerSecondSub1 = NanosPerSecond - 1
-	// NanosPerSecondSub1 = time.Second - 1
-
-	Day  = 24 * time.Hour
-	Week = 7 * Day
-
-	DurationDay  = 24 * time.Hour
-	DurationWeek = 7 * DurationDay
-
 	MonthsEN = `["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]`
 )
diff --git a/time/timeutil/duration_info.go b/time/timeutil/duration_info.go
@@ -91,7 +91,7 @@ func (di DurationInfo) Duration(hoursPerDay, daysPerWeek float32) time.Duration
 		if hoursPerDay != 0 {
 			dur += time.Duration(di.Days) * time.Duration(hoursPerDay) * time.Hour
 		} else {
-			dur += time.Duration(di.Days) * DurationDay
+			dur += time.Duration(di.Days) * Day
 		}
 	}
 	if di.Weeks != 0 {
@@ -105,10 +105,10 @@ func (di DurationInfo) Duration(hoursPerDay, daysPerWeek float32) time.Duration
 			} else {
 				dur += time.Duration(di.Weeks) *
 					daysPerWeek *
-					DurationDay
+					Day
 			}
 		} else {
-			dur += time.Duration(di.Weeks) * DurationWeek
+			dur += time.Duration(di.Weeks) * Week
 		}
 	}
 	return dur