API: Add org users with pagination #33788

idafurjes · 2021-05-06T15:20:25Z

What this PR does / why we need it:
Adds org users with pagination endpoint.

Which issue(s) this PR fixes:

Special notes for your reviewer:

aknuds1

Looks pretty good, but there are some stylistic matters and I think mainly the PR should be refactored to not use the bus as we are trying to migrate away from it (it ties us to global state etc, which is bad). I've described what to do instead of going via the bus.

pkg/api/org_users.go

aknuds1 · 2021-05-07T08:53:53Z

pkg/api/org_users_test.go

+		assert.Equal(t, 1000, sentLimit)
+		assert.Equal(t, 1, sendPage)
+
+		require.Equal(t, http.StatusOK, sc.resp.Code)


Nit, but it's better to move this to line 66, because the current verifications on line 66 and 67 don't make sense unless the response is non-erroneous.

pkg/api/org_users_test.go

aknuds1 · 2021-05-07T08:55:25Z

pkg/api/org_users_test.go

+		assert.Equal(t, 10, sentLimit)
+		assert.Equal(t, 2, sendPage)
+
+		require.Equal(t, http.StatusOK, sc.resp.Code)


As mentioned before, it's better to move this to line 100.

pkg/api/org_users_test.go

pkg/models/org_user.go

pkg/services/sqlstore/org_users.go

Co-authored-by: Arve Knudsen <[email protected]>

ying-jeanne · 2021-05-10T09:17:06Z

pkg/api/org_users.go

+	}
+
+	result, err := hs.searchOrgUsersHelper(&models.SearchOrgUsersQuery{
+		OrgId: c.OrgId,


Looks good, just instead of recreate searchOrgUsersHelper, should be better to reuse getOrgUsersHelper

…ad of bus

Co-authored-by: Arve Knudsen <[email protected]>

…ad of bus

aknuds1

Looks really good now! There are some remaining nits/issues though (mostly missing test cleanup).

pkg/api/org_users.go

pkg/api/org_users_test.go

pkg/services/sqlstore/org_test.go

pkg/services/sqlstore/org_users.go

Co-authored-by: Arve Knudsen <[email protected]>

aknuds1

LGTM! Thanks for applying my suggestions!

* Add model for search org user and add handler for dispatch * 32540_org_users_with_pagination: Add endpoint for search org users * 32540_org_users_with_pagination: Add test for org user search handler * 32540_org_users_with_pagination: fix indentation * 32540_org_users_with_pagination: Remove newline * 32540_org_users_with_pagination: Remove empty line * 32540_org_users_with_pagination: Fix indentation * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/models/org_user.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <[email protected]> * 32540_org_users_with_pagination: Use hs.SQLStore.SearchOrgUsers instead of bus * Add model for search org user and add handler for dispatch * 32540_org_users_with_pagination: Add endpoint for search org users * 32540_org_users_with_pagination: Add test for org user search handler * 32540_org_users_with_pagination: fix indentation * 32540_org_users_with_pagination: Remove newline * 32540_org_users_with_pagination: Remove empty line * 32540_org_users_with_pagination: Fix indentation * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/models/org_user.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <[email protected]> * 32540_org_users_with_pagination: Use hs.SQLStore.SearchOrgUsers instead of bus * 32540_org_users_with_pagination: Add test for the sqlstore * 32540_org_users_with_pagination: Fix sqlstore test * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/services/sqlstore/org_users.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/services/sqlstore/org_users.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/services/sqlstore/org_test.go Co-authored-by: Arve Knudsen <[email protected]> * Update pkg/services/sqlstore/org_test.go Co-authored-by: Arve Knudsen <[email protected]> * 32540: Fix search org users method * 32540: Fix sqlstore test * 32540: Fix go-lint Co-authored-by: Arve Knudsen <[email protected]>

idafurjes added 3 commits May 6, 2021 13:56

Add model for search org user and add handler for dispatch

87a89a8

32540_org_users_with_pagination: Add endpoint for search org users

1554377

32540_org_users_with_pagination: Add test for org user search handler

0020407

idafurjes requested a review from a team as a code owner May 6, 2021 15:20

idafurjes requested review from aknuds1 and dsotirakis and removed request for a team May 6, 2021 15:20

grafanabot added the area/backend label May 6, 2021

idafurjes added 4 commits May 6, 2021 17:51

32540_org_users_with_pagination: fix indentation

e668c6e

32540_org_users_with_pagination: Remove newline

b3dcf1e

32540_org_users_with_pagination: Remove empty line

c8db61c

32540_org_users_with_pagination: Fix indentation

b417462

aknuds1 added this to the 8.0.0 milestone May 7, 2021

aknuds1 added add to changelog type/feature-request labels May 7, 2021

aknuds1 requested changes May 7, 2021

View reviewed changes

idafurjes and others added 5 commits May 10, 2021 09:37

Update pkg/api/org_users.go

83b12ec

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/api/org_users.go

07d048a

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/models/org_user.go

b12d8c9

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/api/org_users_test.go

b4daba0

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/api/org_users_test.go

1f6cd54

Co-authored-by: Arve Knudsen <[email protected]>

ying-jeanne reviewed May 10, 2021

View reviewed changes

idafurjes added 8 commits May 10, 2021 11:51

32540_org_users_with_pagination: Use hs.SQLStore.SearchOrgUsers inste…

dc16f82

…ad of bus

Add model for search org user and add handler for dispatch

2945e45

32540_org_users_with_pagination: Add endpoint for search org users

2adf243

32540_org_users_with_pagination: Add test for org user search handler

5f24591

32540_org_users_with_pagination: fix indentation

ac9cb79

32540_org_users_with_pagination: Remove newline

4565dce

32540_org_users_with_pagination: Remove empty line

179907d

32540_org_users_with_pagination: Fix indentation

9434004

idafurjes and others added 7 commits May 10, 2021 17:43

Update pkg/api/org_users.go

90778aa

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/api/org_users.go

de9a9de

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/models/org_user.go

6e68035

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/api/org_users_test.go

0cab1ef

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/api/org_users_test.go

f1f07c4

Co-authored-by: Arve Knudsen <[email protected]>

32540_org_users_with_pagination: Use hs.SQLStore.SearchOrgUsers inste…

141f11c

…ad of bus

32540_org_users_with_pagination: Add test for the sqlstore

a579069

idafurjes force-pushed the 32540_org_users_with_pagination branch from dc16f82 to a579069 Compare May 10, 2021 15:45

idafurjes added 2 commits May 11, 2021 10:17

32540_org_users_with_pagination: Adjust test for sqlstore

3ddd389

32540_org_users_with_pagination: Fix sqlstore test

801322e

aknuds1 requested changes May 11, 2021

View reviewed changes

idafurjes and others added 7 commits May 11, 2021 17:53

Update pkg/api/org_users.go

be52852

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/api/org_users_test.go

e66a446

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/api/org_users_test.go

ec9fb3f

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/services/sqlstore/org_users.go

ede1390

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/services/sqlstore/org_users.go

77e4569

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/services/sqlstore/org_test.go

e35c1b0

Co-authored-by: Arve Knudsen <[email protected]>

Update pkg/services/sqlstore/org_test.go

beb6fbd

Co-authored-by: Arve Knudsen <[email protected]>

aknuds1 approved these changes May 11, 2021

View reviewed changes

idafurjes added 3 commits May 12, 2021 09:28

32540: Fix search org users method

37f694e

32540: Fix sqlstore test

68e2b24

32540: Fix go-lint

8f8b70a

idafurjes merged commit f2fcf72 into main May 12, 2021

idafurjes deleted the 32540_org_users_with_pagination branch May 12, 2021 12:10

dprokop changed the title ~~32540: Add org users with pagination~~ API: Add org users with pagination May 13, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

API: Add org users with pagination #33788

API: Add org users with pagination #33788

idafurjes commented May 6, 2021

aknuds1 left a comment

aknuds1 May 7, 2021

aknuds1 May 7, 2021

ying-jeanne May 10, 2021

aknuds1 left a comment •

edited

Loading

aknuds1 left a comment

API: Add org users with pagination #33788

API: Add org users with pagination #33788

Conversation

idafurjes commented May 6, 2021

aknuds1 left a comment

Choose a reason for hiding this comment

aknuds1 May 7, 2021

Choose a reason for hiding this comment

aknuds1 May 7, 2021

Choose a reason for hiding this comment

ying-jeanne May 10, 2021

Choose a reason for hiding this comment

aknuds1 left a comment • edited Loading

Choose a reason for hiding this comment

aknuds1 left a comment

Choose a reason for hiding this comment

aknuds1 left a comment •

edited

Loading