Merge pull request #42 from fhvkqtdh/master

支持根据时间查询 session; 优化多 Context 查询 dsl

Author: HRX980829

replayer-agent/logic/search/dsl.go

@@ -3,7 +3,6 @@ package search
 import (
 	"encoding/json"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 
@@ -51,7 +50,8 @@ func toDSL(req *idl.SearchReq) ([]byte, error) {
 		}
 		must = append(must, map[string]interface{}{
 			"bool": map[string]interface{}{
-				"should": conds,
+				"should":               conds,
+				"minimum_should_match": 1,
 			},
 		})
 	}
@@ -109,23 +109,46 @@ func unionMulti(must []interface{}, mustNot []interface{}, field string, words s
 }
 
 func unionTime(must []interface{}, start, end string) []interface{} {
-	dates := strings.Split(start, "T")
-	st, err := time.ParseInLocation("2006-01-02", dates[0], time.Local)
-	if err == nil {
-		must = append(must, map[string]interface{}{
-			"range": newCond("CallFromInbound.OccurredAt", "gte", strconv.FormatInt(st.UnixNano(), 10)),
-		})
+	if start == "" && end == "" {
+		return must
 	}
-	dates = strings.Split(end, "T")
-	ed, err := time.ParseInLocation("2006-01-02", dates[0], time.Local)
-	if err == nil {
-		must = append(must, map[string]interface{}{
-			"range": newCond("CallFromInbound.OccurredAt", "lte", strconv.FormatInt(ed.UnixNano()+86400*1e9, 10)),
-		})
+
+	timeRange := map[string]int64{}
+	if start != "" {
+		st, _ := parseTime(start)
+		timeRange["gte"] = st.UnixNano()
+	}
+	if end != "" {
+		ed, hasTime := parseTime(end)
+		if !hasTime {
+			ed = ed.Add(24 * time.Hour)
+		}
+		timeRange["lt"] = ed.UnixNano()
 	}
+
+	must = append(must, map[string]interface{}{
+		"range": map[string]interface{}{
+			"CallFromInbound.OccurredAt": timeRange,
+		},
+	})
 	return must
 }
 
+func parseTime(str string) (time.Time, bool) {
+	hasTime := true
+	if strings.Index(str, "T") < 0 {
+		str += "T00:00:00"
+		hasTime = false
+	}
+
+	layout := "2006-01-02T15:04:05"
+	t, err := time.ParseInLocation(layout, str, time.Local)
+	if err != nil {
+		return time.Now(), hasTime
+	}
+	return t, hasTime
+}
+
 func parseCond(field string, word string) map[string]interface{} {
 	if strings.ContainsAny(word, "?*") {
 		return newCond("wildcard", field, word)