From 69e10651c97c7d7b30aa69a0155c8d3293e2b9bd Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Fri, 5 Oct 2018 22:25:34 +0800 Subject: [MM-12484] Fix return search posts on date filters (#9568) * fix return search posts on date filters * add name to test cases --- model/utils.go | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'model/utils.go') diff --git a/model/utils.go b/model/utils.go index 137da28bc..172b78242 100644 --- a/model/utils.go +++ b/model/utils.go @@ -141,26 +141,17 @@ func NewRandomString(length int) string { return b.String() } -// GetMillis is a convience method to get milliseconds since epoch. +// GetMillis is a convenience method to get milliseconds since epoch. func GetMillis() int64 { return time.Now().UnixNano() / int64(time.Millisecond) } -// GetMillisForTime is a convience method to get milliseconds since epoch for provided Time. +// GetMillisForTime is a convenience method to get milliseconds since epoch for provided Time. func GetMillisForTime(thisTime time.Time) int64 { return thisTime.UnixNano() / int64(time.Millisecond) } -// ParseDateFilterToTime is a convience method to get Time from string -func ParseDateFilterToTime(filterString string) time.Time { - resultTime, err := time.Parse("2006-01-02", PadDateStringZeros(filterString)) - if err != nil { - return time.Now() - } - return resultTime -} - -// PadDateStringZeros is a convience method to pad 2 digit date parts with zeros to meet ISO 8601 format +// PadDateStringZeros is a convenience method to pad 2 digit date parts with zeros to meet ISO 8601 format func PadDateStringZeros(dateString string) string { parts := strings.Split(dateString, "-") for index, part := range parts { @@ -172,14 +163,14 @@ func PadDateStringZeros(dateString string) string { return dateString } -// GetStartOfDayMillis is a convience method to get milliseconds since epoch for provided date's start of day +// GetStartOfDayMillis is a convenience method to get milliseconds since epoch for provided date's start of day func GetStartOfDayMillis(thisTime time.Time, timeZoneOffset int) int64 { localSearchTimeZone := time.FixedZone("Local Search Time Zone", timeZoneOffset) resultTime := time.Date(thisTime.Year(), thisTime.Month(), thisTime.Day(), 0, 0, 0, 0, localSearchTimeZone) return GetMillisForTime(resultTime) } -// GetEndOfDayMillis is a convience method to get milliseconds since epoch for provided date's end of day +// GetEndOfDayMillis is a convenience method to get milliseconds since epoch for provided date's end of day func GetEndOfDayMillis(thisTime time.Time, timeZoneOffset int) int64 { localSearchTimeZone := time.FixedZone("Local Search Time Zone", timeZoneOffset) resultTime := time.Date(thisTime.Year(), thisTime.Month(), thisTime.Day(), 23, 59, 59, 999999999, localSearchTimeZone) -- cgit v1.2.3-1-g7c22