util/reflect: fix time.Time StructFields parsing

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

client/noop.go

@@ -221,5 +221,8 @@ func (n *noopClient) Publish(ctx context.Context, p Message, opts ...PublishOpti
 	return n.opts.Broker.Publish(ctx, topic, &broker.Message{
 		Header: md,
 		Body:   body,
-	}, broker.PublishContext(options.Context))
+	},
+		broker.PublishContext(options.Context),
+		broker.PublishBodyOnly(options.BodyOnly),
+	)
 }

util/reflect/struct.go

@@ -7,6 +7,7 @@ import (
 	"reflect"
 	"regexp"
 	"strings"
+	"time"
 )
 
 // ErrInvalidParam specifies invalid url query params
@@ -14,6 +15,13 @@ var ErrInvalidParam = errors.New("invalid url query param provided")
 
 var bracketSplitter = regexp.MustCompile(`\[|\]`)
 
+var timeKind = reflect.TypeOf(time.Time{}).Kind()
+
+type StructField struct {
+	Field reflect.StructField
+	Value reflect.Value
+}
+
 func StructFieldByTag(src interface{}, tkey string, tval string) (interface{}, error) {
 	sv := reflect.ValueOf(src)
 	if sv.Kind() == reflect.Ptr {
@@ -98,8 +106,8 @@ func StructFieldByName(src interface{}, tkey string) (interface{}, error) {
 }
 
 // StructFields returns slice of struct fields
-func StructFields(src interface{}) ([]reflect.StructField, error) {
-	var fields []reflect.StructField
+func StructFields(src interface{}) ([]StructField, error) {
+	var fields []StructField
 
 	sv := reflect.ValueOf(src)
 	if sv.Kind() == reflect.Ptr {
@@ -116,14 +124,17 @@ func StructFields(src interface{}) ([]reflect.StructField, error) {
 		if !val.CanSet() || len(fld.PkgPath) != 0 {
 			continue
 		}
-		if val.Kind() == reflect.Struct {
+		switch val.Kind() {
+		case timeKind:
+			fields = append(fields, StructField{Field: fld, Value: val})
+		case reflect.Struct:
 			infields, err := StructFields(val.Interface())
 			if err != nil {
 				return nil, err
 			}
 			fields = append(fields, infields...)
-		} else {
-			fields = append(fields, fld)
+		default:
+			fields = append(fields, StructField{Field: fld, Value: val})
 		}
 	}