test unmarshal with ignored field and fix error message

Author: wwwdata

jsonapi/fixtures_test.go

@@ -68,6 +68,7 @@ func (u *User) SetID(stringID string) error {
 type SimplePost struct {
 	ID          string `jsonapi:"-"`
 	Title, Text string
+	Internal    string `jsonapi:"-"`
 	Size        int
 	Created     time.Time `jsonapi:"name=create-date"`
 }

jsonapi/unmarshal.go

@@ -256,19 +256,20 @@ func UnmarshalInto(input map[string]interface{}, targetStructType reflect.Type,
 					fieldName := Dejsonify(key)
 					field := val.FieldByName(fieldName)
 					fieldType, found := val.Type().FieldByName(fieldName)
-					if !found || found && fieldType.Tag.Get("jsonapi") == "-" {
+					if !found {
 						//check if there is any field tag with the given name available
 						for x := 0; x < val.NumField(); x++ {
 							tfield := val.Type().Field(x)
 							name := GetTagValueByName(tfield, "name")
 							if tfield.Tag.Get("jsonapi") != "-" && strings.ToLower(name) == strings.ToLower(fieldName) {
 								field = val.Field(x)
+								found = true
 							}
 						}
 
-						if !field.IsValid() {
-							return errors.New("expected struct " + targetStructType.Name() + " to have field " + fieldName)
-						}
+					}
+					if !found || fieldType.Tag.Get("jsonapi") == "-" {
+						return fmt.Errorf("invalid key \"%s\" in json. Cannot be assigned to target struct \"%s\"", key, targetStructType.Name())
 					}
 
 					value := reflect.ValueOf(attributeValue)

jsonapi/unmarshal_test.go

@@ -125,6 +125,21 @@ var _ = Describe("Unmarshal", func() {
 			Expect(err).To(HaveOccurred())
 		})
 
+		It("errors if a field is in the json that is ignored by the struct", func() {
+			var post SimplePost
+			err := Unmarshal(map[string]interface{}{
+				"data": map[string]interface{}{
+					"id": "1234",
+					"attributes": map[string]interface{}{
+						"title":    "something",
+						"text":     "blubb",
+						"internal": "1337",
+					},
+				},
+			}, &post)
+			Expect(err.Error()).To(Equal("invalid key \"internal\" in json. Cannot be assigned to target struct \"SimplePost\""))
+		})
+
 		It("errors with wrong type, expected int, got a string", func() {
 			var posts []SimplePost
 			err := Unmarshal(map[string]interface{}{