Merge pull request #128 from opsgenie/fix-incident-responders

fix incident responder api call if the type is user

Author: frknyldz

incident/incident_test.go

@@ -475,13 +475,12 @@ func TestResponders_Validate(t *testing.T) {
 		{Type: User},
 	}
 	err = validateResponders(Responders)
-	assert.Equal(t, err.Error(), errors.New("For responder either name"+
-		" or id must be provided.").Error())
+	assert.Equal(t, err.Error(), errors.New("For responder type user either username or id must be provided.").Error())
 
 	Responders = []Responder{
 		{
-			Type: User,
-			Name: "cem",
+			Type:     User,
+			Username: "cem@example.com",
 		},
 	}
 	err = validateResponders(Responders)
@@ -492,8 +491,7 @@ func TestResponders_Validate(t *testing.T) {
 			Type: Team},
 	}
 	err = validateResponders(Responders)
-	assert.Equal(t, err.Error(), errors.New("For responder either name"+
-		" or id must be provided.").Error())
+	assert.Equal(t, err.Error(), errors.New("For responder type team either team name or id must be provided.").Error())
 
 	Responders = []Responder{
 		{

incident/request.go

@@ -806,6 +806,7 @@ type Responder struct {
 	Type ResponderType `json:"type,omitempty"`
 	Name string        `json:"name,omitempty"`
 	Id   string        `json:"id,omitempty"`
+	Username string    `json:"username,omitempty"`
 }
 
 func validateResponders(responders []Responder) error {
@@ -816,8 +817,11 @@ func validateResponders(responders []Responder) error {
 		if !(responder.Type == User || responder.Type == Team) {
 			return errors.New("Responder type should be one of these: 'User', 'Team'.")
 		}
-		if responder.Name == "" && responder.Id == "" {
-			return errors.New("For responder either name or id must be provided.")
+		if responder.Type == User && responder.Username == "" && responder.Id == "" {
+			return errors.New("For responder type user either username or id must be provided.")
+		}
+		if responder.Type == Team && responder.Name == "" && responder.Id == "" {
+			return errors.New("For responder type team either team name or id must be provided.")
 		}
 	}
 	return nil