handle conflicts on add identity

aultron · aultron · commit e7ddb3f57721 · 2021-06-14T17:17:57.000+03:00
diff --git a/affiliation/identity.go b/affiliation/identity.go
@@ -95,7 +95,10 @@ func (a *Affiliation) AddIdentity(identity *Identity) bool {
 
 	endpoint := a.AffBaseURL + "/affiliation/" + url.PathEscape(a.ProjectSlug) + "/add_identity/" + url.PathEscape(identity.Source)
 	statusCode, res, err := a.httpClientProvider.Request(strings.TrimSpace(endpoint), "POST", headers, nil, queryParams)
-	if statusCode != http.StatusOK {
+	switch statusCode {
+	case http.StatusOK, http.StatusConflict:
+		return true
+	default:
 		if err != nil {
 			log.Println("AddIdentity: Could not insert the identity: ", err)
 		}
@@ -109,7 +112,7 @@ func (a *Affiliation) AddIdentity(identity *Identity) bool {
 		time.Sleep(5 * time.Minute)
 		return a.AddIdentity(identity)
 	}
-	return true
+	return false
 }
 
 // GetIdentity ...

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,10 @@ func (a Affiliation) AddIdentity(identity Identity) bool {`
`95`	`95`
`96`	`96`	`endpoint := a.AffBaseURL + "/affiliation/" + url.PathEscape(a.ProjectSlug) + "/add_identity/" + url.PathEscape(identity.Source)`
`97`	`97`	`statusCode, res, err := a.httpClientProvider.Request(strings.TrimSpace(endpoint), "POST", headers, nil, queryParams)`
`98`		`- if statusCode != http.StatusOK {`
	`98`	`+ switch statusCode {`
	`99`	`+ case http.StatusOK, http.StatusConflict:`
	`100`	`+ return true`
	`101`	`+ default:`
`99`	`102`	`if err != nil {`
`100`	`103`	`log.Println("AddIdentity: Could not insert the identity: ", err)`
`101`	`104`	`}`
`@@ -109,7 +112,7 @@ func (a Affiliation) AddIdentity(identity Identity) bool {`
`109`	`112`	`time.Sleep(5 * time.Minute)`
`110`	`113`	`return a.AddIdentity(identity)`
`111`	`114`	`}`
`112`		`- return true`
	`115`	`+ return false`
`113`	`116`	`}`
`114`	`117`
`115`	`118`	`// GetIdentity ...`