added secondsOfDay option for time format

Author: adranwit

data/map.go

@@ -76,12 +76,18 @@ func (s *Map) Replace(key, val string) {
 
 // Has returns true if the provided key is present
 func (s *Map) Has(key string) bool {
+	if index := strings.LastIndex(key, "("); index != -1 {
+		key = key[:index]
+	}
 	_, found := (*s)[key]
 	return found
 }
 
 // Get returns a value for provided key
 func (s *Map) Get(key string) interface{} {
+	if index := strings.LastIndex(key, "("); index != -1 {
+		key = key[:index]
+	}
 	if result, found := (*s)[key]; found {
 		return result
 	}
@@ -145,19 +151,15 @@ func (s *Map) GetValue(expr string) (interface{}, bool) {
 				}
 			}
 			isLast := i+1 == len(fragments)
-
 			hasKey := state.Has(fragment)
 			if !hasKey {
 				return nil, false
 			}
-
 			var candidate = state.Get(fragment)
 			if !isLast && candidate == nil {
 				return nil, false
 			}
-
 			if index != nil {
-
 				if intIndex, err := toolbox.ToInt(index); err == nil {
 					if !toolbox.IsSlice(candidate) {
 						return nil, false

data/udf/time.go

@@ -4,10 +4,11 @@ import (
 	"fmt"
 	"github.com/viant/toolbox"
 	"github.com/viant/toolbox/data"
+	"strings"
 	"time"
 )
 
-//FormatTime return formatted time, it takes an array of arguments, the first is  time express, or now followed by java style time format, optional timezone and truncate format .
+// FormatTime return formatted time, it takes an array of arguments, the first is  time express, or now followed by java style time format, optional timezone and truncate format .
 func FormatTime(source interface{}, state data.Map) (interface{}, error) {
 	if !toolbox.IsSlice(source) {
 		return nil, fmt.Errorf("unable to run FormatTime: expected %T, but had: %T", []interface{}{}, source)
@@ -18,16 +19,18 @@ func FormatTime(source interface{}, state data.Map) (interface{}, error) {
 	}
 	var err error
 	var timeText = toolbox.AsString(aSlice[0])
-	var timeFormat = toolbox.AsString(aSlice[1])
-	var timeLayout = toolbox.DateFormatToLayout(timeFormat)
 	var timeValue *time.Time
 	timeValue, err = toolbox.TimeAt(timeText)
+	var timeLayout string
 	if err != nil {
+		timeFormat := toolbox.AsString(aSlice[1])
+		timeLayout = toolbox.DateFormatToLayout(timeFormat)
 		timeValue, err = toolbox.ToTime(aSlice[0], timeLayout)
 	}
 	if err != nil {
 		return nil, err
 	}
+
 	if len(aSlice) > 2 && aSlice[2] != "" {
 		timeLocation, err := time.LoadLocation(toolbox.AsString(aSlice[2]))
 		if err != nil {
@@ -37,13 +40,25 @@ func FormatTime(source interface{}, state data.Map) (interface{}, error) {
 		timeValue = &timeInLocation
 	}
 
+	if len(aSlice) > 1 {
+		formatArg := toolbox.AsString(aSlice[1])
+		switch strings.Trim(formatArg, `" ,`) {
+		case "secondsOfDay":
+			return timeValue.Hour()*60 + timeValue.Second(), nil
+		}
+		if timeLayout == "" {
+			timeFormat := toolbox.AsString(aSlice[1])
+			timeLayout = toolbox.DateFormatToLayout(timeFormat)
+		}
+	}
+
 	if len(aSlice) > 3 {
 		switch aSlice[3] {
 		case "weekday":
 			return timeValue.Weekday(), nil
 		default:
 			truncFromat := toolbox.DateFormatToLayout(toolbox.AsString(aSlice[3]))
-			if ts, err := time.Parse(truncFromat, timeValue.Format(truncFromat));err == nil {
+			if ts, err := time.Parse(truncFromat, timeValue.Format(truncFromat)); err == nil {
 				timeValue = &ts
 			}
 		}
@@ -52,7 +67,7 @@ func FormatTime(source interface{}, state data.Map) (interface{}, error) {
 	return timeValue.Format(timeLayout), nil
 }
 
-//Elapsed returns elapsed time
+// Elapsed returns elapsed time
 func Elapsed(source interface{}, state data.Map) (interface{}, error) {
 	inThePast, err := toolbox.ToTime(source, time.RFC3339)
 	if err != nil {

data/udf/time_test.go

@@ -41,6 +41,7 @@ func Test_FormatTime(t *testing.T) {
 		now := time.Now()
 		assert.Equal(t, now.Year(), toolbox.AsInt(value))
 	}
+
 	{
 		aMap := data.NewMap()
 		aMap.Put("ts", "2015-02-11")

time_format.go

@@ -5,13 +5,13 @@ import (
 	"time"
 )
 
-//DateFormatKeyword constant 'dateFormat' key
+// DateFormatKeyword constant 'dateFormat' key
 var DateFormatKeyword = "dateFormat"
 
-//DateLayoutKeyword constant 'dateLayout' key
+// DateLayoutKeyword constant 'dateLayout' key
 var DateLayoutKeyword = "dateLayout"
 
-//DateFormatToLayout converts java date format https://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html#rfc822timezone into go date layout
+// DateFormatToLayout converts java date format https://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html#rfc822timezone into go date layout
 func DateFormatToLayout(dateFormat string) string {
 
 	dateFormat = strings.Replace(dateFormat, "ddd", "_2", 1)
@@ -53,12 +53,11 @@ func DateFormatToLayout(dateFormat string) string {
 
 	dateFormat = strings.Replace(dateFormat, "EEEE", "Monday", 1)
 	dateFormat = strings.Replace(dateFormat, "E", "Mon", 1)
-
 	return dateFormat
 }
 
-//GetTimeLayout returns time laout from passed in map, first it check if DateLayoutKeyword is defined is so it returns it, otherwise it check DateFormatKeyword and if exists converts it to  dateLayout
-//If neithers keys exists it panics, please use HasTimeLayout to avoid panic
+// GetTimeLayout returns time laout from passed in map, first it check if DateLayoutKeyword is defined is so it returns it, otherwise it check DateFormatKeyword and if exists converts it to  dateLayout
+// If neithers keys exists it panics, please use HasTimeLayout to avoid panic
 func GetTimeLayout(input interface{}) string {
 	switch settings := input.(type) {
 	case map[string]string:
@@ -83,7 +82,7 @@ func GetTimeLayout(input interface{}) string {
 	return ""
 }
 
-//HasTimeLayout checks if dateLayout can be taken from the passed in setting map
+// HasTimeLayout checks if dateLayout can be taken from the passed in setting map
 func HasTimeLayout(input interface{}) bool {
 	switch settings := input.(type) {
 	case map[string]string:
@@ -106,7 +105,7 @@ func HasTimeLayout(input interface{}) bool {
 	return false
 }
 
-//TimestampToString formats timestamp to passed in java style date format
+// TimestampToString formats timestamp to passed in java style date format
 func TimestampToString(dateFormat string, unixTimestamp, unixNanoTimestamp int64) string {
 	t := time.Unix(unixTimestamp, unixNanoTimestamp)
 	dateLayout := DateFormatToLayout(dateFormat)