summaryrefslogtreecommitdiffstats
path: root/model/search_params.go
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2018-10-05 22:25:34 +0800
committerGitHub <noreply@github.com>2018-10-05 22:25:34 +0800
commit69e10651c97c7d7b30aa69a0155c8d3293e2b9bd (patch)
tree5f430cdb9c9226d622ad393f6fdbf8c7d30ae9fe /model/search_params.go
parentcba33137d25336cd5a5bcfd1d68695b584714f56 (diff)
downloadchat-69e10651c97c7d7b30aa69a0155c8d3293e2b9bd.tar.gz
chat-69e10651c97c7d7b30aa69a0155c8d3293e2b9bd.tar.bz2
chat-69e10651c97c7d7b30aa69a0155c8d3293e2b9bd.zip
[MM-12484] Fix return search posts on date filters (#9568)
* fix return search posts on date filters * add name to test cases
Diffstat (limited to 'model/search_params.go')
-rw-r--r--model/search_params.go18
1 files changed, 15 insertions, 3 deletions
diff --git a/model/search_params.go b/model/search_params.go
index b5600ee5a..65358066d 100644
--- a/model/search_params.go
+++ b/model/search_params.go
@@ -27,7 +27,11 @@ type SearchParams struct {
// Returns the epoch timestamp of the start of the day specified by SearchParams.AfterDate
func (p *SearchParams) GetAfterDateMillis() int64 {
- date := ParseDateFilterToTime(p.AfterDate)
+ date, err := time.Parse("2006-01-02", PadDateStringZeros(p.AfterDate))
+ if err != nil {
+ date = time.Now()
+ }
+
// travel forward 1 day
oneDay := time.Hour * 24
afterDate := date.Add(oneDay)
@@ -36,7 +40,11 @@ func (p *SearchParams) GetAfterDateMillis() int64 {
// Returns the epoch timestamp of the end of the day specified by SearchParams.BeforeDate
func (p *SearchParams) GetBeforeDateMillis() int64 {
- date := ParseDateFilterToTime(p.BeforeDate)
+ date, err := time.Parse("2006-01-02", PadDateStringZeros(p.BeforeDate))
+ if err != nil {
+ return 0
+ }
+
// travel back 1 day
oneDay := time.Hour * -24
beforeDate := date.Add(oneDay)
@@ -45,7 +53,11 @@ func (p *SearchParams) GetBeforeDateMillis() int64 {
// Returns the epoch timestamps of the start and end of the day specified by SearchParams.OnDate
func (p *SearchParams) GetOnDateMillis() (int64, int64) {
- date := ParseDateFilterToTime(p.OnDate)
+ date, err := time.Parse("2006-01-02", PadDateStringZeros(p.OnDate))
+ if err != nil {
+ return 0, 0
+ }
+
return GetStartOfDayMillis(date, p.TimeZoneOffset), GetEndOfDayMillis(date, p.TimeZoneOffset)
}