Commit2ef2f97

authored

chore: improve error message on adding existing org_member (#13621)

1 parent889daf2 commit2ef2f97Copy full SHA for 2ef2f97

File tree

+33

-0

lines changed

+33

-0

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6197,6 +6197,20 @@ func (q *FakeQuerier) InsertOrganizationMember(_ context.Context, arg database.I`
`6197`	`6197`	`q.mutex.Lock()`
`6198`	`6198`	`deferq.mutex.Unlock()`
`6199`	`6199`
	`6200`	`+ifslices.IndexFunc(q.data.organizationMembers,func(member database.OrganizationMember)bool {`
	`6201`	`+returnmember.OrganizationID==arg.OrganizationID&&member.UserID==arg.UserID`
	`6202`	`+})>=0 {`
	`6203`	`+// Error pulled from a live db error`
	`6204`	`+return database.OrganizationMember{},&pq.Error{`
	`6205`	`+Severity:"ERROR",`
	`6206`	`+Code:"23505",`
	`6207`	`+Message:"duplicate key value violates unique constraint\"organization_members_pkey\"",`
	`6208`	`+Detail:"Key (organization_id, user_id)=(f7de1f4e-5833-4410-a28d-0a105f96003f, 36052a80-4a7f-4998-a7ca-44cefa608d3e) already exists.",`
	`6209`	`+Table:"organization_members",`
	`6210`	`+Constraint:"organization_members_pkey",`
	`6211`	`+}`
	`6212`	`+}`
	`6213`	`+`
`6200`	`6214`	`//nolint:gosimple`
`6201`	`6215`	`organizationMember:= database.OrganizationMember{`
`6202`	`6216`	`OrganizationID:arg.OrganizationID,`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,12 @@ func (api API) postOrganizationMember(rw http.ResponseWriter, r http.Request)`
`43`	`43`	`httpapi.ResourceNotFound(rw)`
`44`	`44`	`return`
`45`	`45`	`}`
	`46`	`+ifdatabase.IsUniqueViolation(err,database.UniqueOrganizationMembersPkey) {`
	`47`	`+httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{`
	`48`	`+Message:"Organization member already exists in this organization",`
	`49`	`+})`
	`50`	`+return`
	`51`	`+}`
`46`	`52`	`iferr!=nil {`
`47`	`53`	`httpapi.InternalServerError(rw,err)`
`48`	`54`	`return`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,19 @@ func TestAddMember(t *testing.T) {`
`50`	`50`	`db2sdk.List(members,onlyIDs))`
`51`	`51`	`})`
`52`	`52`
	`53`	`+t.Run("AlreadyMember",func(t*testing.T) {`
	`54`	`+t.Parallel()`
	`55`	`+owner:=coderdtest.New(t,nil)`
	`56`	`+first:=coderdtest.CreateFirstUser(t,owner)`
	`57`	`+_,user:=coderdtest.CreateAnotherUser(t,owner,first.OrganizationID)`
	`58`	`+`
	`59`	`+ctx:=testutil.Context(t,testutil.WaitMedium)`
	`60`	`+// Add user to org, even though they already exist`
	`61`	`+// nolint:gocritic // must be an owner to see the user`
	`62`	`+_,err:=owner.PostOrganizationMember(ctx,first.OrganizationID,user.Username)`
	`63`	`+require.ErrorContains(t,err,"already exists")`
	`64`	`+})`
	`65`	`+`
`53`	`66`	`t.Run("UserNotExists",func(t*testing.T) {`
`54`	`67`	`t.Parallel()`
`55`	`68`	`owner:=coderdtest.New(t,nil)`

Comments

(0)