Merge pull request #92 from cbusbey/group_comp_fix

fix for #91

Author: cbusbey

marshal.go

@@ -31,6 +31,7 @@ func (e encoder) encodeField(f reflect.StructField, t reflect.Type, v reflect.Va
 }
 
 func (e encoder) encodeValue(fixTag Tag, v reflect.Value, omitEmpty bool, defaultVal *string) {
+
 	if defaultVal != nil {
 		e.FieldMap.SetField(fixTag, FIXString(*defaultVal))
 		return
@@ -72,10 +73,18 @@ func (e encoder) encodeValue(fixTag Tag, v reflect.Value, omitEmpty bool, defaul
 		walkFunc = func(t reflect.Type) {
 			for i := 0; i < t.NumField(); i++ {
 				sf := t.Field(i)
-				if sf.Anonymous {
-					walkFunc(sf.Type)
+
+				//recurse if item is a component, optional or not
+				elementType := sf.Type
+				if elementType.Kind() == reflect.Ptr {
+					elementType = elementType.Elem()
+				}
+
+				if elementType.Kind() == reflect.Struct {
+					walkFunc(elementType)
 					continue
 				}
+
 				afixTag, err := strconv.Atoi(strings.Split(sf.Tag.Get("fix"), ",")[0])
 
 				if err != nil {

marshal_test.go

@@ -2,10 +2,11 @@ package quickfix_test
 
 import (
 	"bytes"
-	"github.com/quickfixgo/quickfix"
-	"github.com/quickfixgo/quickfix/field"
 	"testing"
 	"time"
+
+	"github.com/quickfixgo/quickfix"
+	"github.com/quickfixgo/quickfix/field"
 )
 
 func TestMarshal_FIXMsgType(t *testing.T) {
@@ -183,10 +184,18 @@ func TestMarshal_RepeatingGroups(t *testing.T) {
 		IntField3 int `fix:"3"`
 	}
 
+	type GroupComponent1 struct {
+	}
+
+	type GroupComponent2 struct {
+	}
+
 	type Group2 struct {
 		IntField1 int `fix:"1"`
 		IntField2 int `fix:"2, omitempty"`
 		AnonymousGroup
+		GroupComponent1
+		OptionalComponent *GroupComponent2
 	}
 
 	type Message struct {