Support public&private non-tagged fields in choice struct

Author: brandonc

request.go

@@ -193,11 +193,18 @@ func choiceStructMapping(choice reflect.Type) (result map[string]structFieldInde
 	for i := 0; i < choice.NumField(); i++ {
 		fieldType := choice.Field(i)
 
+		// Must be a pointer
 		if fieldType.Type.Kind() != reflect.Ptr {
 			continue
 		}
 
 		subtype := fieldType.Type.Elem()
+
+		// Must be a pointer to struct
+		if subtype.Kind() != reflect.Struct {
+			continue
+		}
+
 		if t, err := jsonapiTypeOfModel(subtype); err == nil {
 			result[t] = structFieldIndex{
 				Type:     subtype,

request_test.go

@@ -618,8 +618,10 @@ type Video struct {
 }
 
 type OneOfMedia struct {
-	Image *Image
-	Video *Video
+	Image       *Image
+	random      int
+	Video       *Video
+	RandomStuff *string
 }
 
 func Test_UnmarshalPayload_polymorphicRelations(t *testing.T) {
@@ -774,8 +776,8 @@ func Test_choiceStructMapping(t *testing.T) {
 			t.Errorf("expected \"images\" to be the first field, but got %d", imageField.FieldNum)
 		}
 		videoField, ok := result["videos"]
-		if !ok || videoField.FieldNum != 1 {
-			t.Errorf("expected \"videos\" to be the second field, but got %d", videoField.FieldNum)
+		if !ok || videoField.FieldNum != 2 {
+			t.Errorf("expected \"videos\" to be the third field, but got %d", videoField.FieldNum)
 		}
 	}
 }