Skip to content

feat: export roles when exporting users #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

feat: export roles when exporting users #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/preset_cli/api/clients/preset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class Role(int, Enum):


class PresetClient: # pylint: disable=too-few-public-methods

"""
A client for the Preset API.
"""
Expand Down Expand Up @@ -157,13 +156,13 @@ def export_users(self, workspace_url: URL) -> Iterator[UserType]:
team_members: List[UserType] = [
{
"id": 0,
"username": payload["user"]["username"],
"role": [], # TODO (betodealmeida)
"first_name": payload["user"]["first_name"],
"last_name": payload["user"]["last_name"],
"email": payload["user"]["email"].lower(),
"username": element["user"]["username"],
"role": [element["workspace_role"]["role_identifier"]],
"first_name": element["user"]["first_name"],
"last_name": element["user"]["last_name"],
"email": element["user"]["email"].lower(),
}
for payload in payload["payload"]
for element in payload["payload"]
]
workspace_membership.extend(team_members)

Expand Down
16 changes: 14 additions & 2 deletions tests/api/clients/preset_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ def test_preset_client_export_users(requests_mock: Mocker) -> None:
"last_name": "Doe",
"email": "[email protected]",
},
"workspace_role": {
"name": "Limited Contributor",
"role_identifier": "PresetGamma",
},
},
{
"user": {
Expand All @@ -109,6 +113,10 @@ def test_preset_client_export_users(requests_mock: Mocker) -> None:
"last_name": "Doe",
"email": "[email protected]",
},
"workspace_role": {
"name": "Limited Contributor",
"role_identifier": "PresetGamma",
},
},
],
"meta": {
Expand All @@ -127,6 +135,10 @@ def test_preset_client_export_users(requests_mock: Mocker) -> None:
"last_name": "Doe",
"email": "[email protected]",
},
"workspace_role": {
"name": "Limited Contributor",
"role_identifier": "PresetGamma",
},
},
],
"meta": {
Expand Down Expand Up @@ -167,15 +179,15 @@ def test_preset_client_export_users(requests_mock: Mocker) -> None:
"last_name": "Doe",
"username": "adoe",
"email": "[email protected]",
"role": [],
"role": ["PresetGamma"],
},
{
"id": 2,
"first_name": "Bob",
"last_name": "Doe",
"username": "bdoe",
"email": "[email protected]",
"role": [],
"role": ["PresetGamma"],
},
]

Expand Down
20 changes: 16 additions & 4 deletions tests/api/clients/superset_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Tests for ``preset_cli.api.clients.superset``.
"""

# pylint: disable=too-many-lines, trailing-whitespace, line-too-long, use-implicit-booleaness-not-comparison

import json
Expand All @@ -16,7 +17,6 @@
from requests_mock.mocker import Mocker
from yarl import URL

from preset_cli import __version__
from preset_cli.api.clients.superset import (
RoleType,
RuleType,
Expand Down Expand Up @@ -1891,6 +1891,10 @@ def test_export_users_preset(requests_mock: Mocker) -> None:
"last_name": "Doe",
"email": "[email protected]",
},
"workspace_role": {
"name": "Limited Contributor",
"role_identifier": "PresetGamma",
},
},
{
"user": {
Expand All @@ -1899,6 +1903,10 @@ def test_export_users_preset(requests_mock: Mocker) -> None:
"last_name": "Doe",
"email": "[email protected]",
},
"workspace_role": {
"name": "Limited Contributor",
"role_identifier": "PresetGamma",
},
},
],
"meta": {
Expand All @@ -1918,6 +1926,10 @@ def test_export_users_preset(requests_mock: Mocker) -> None:
"last_name": "Doe",
"email": "[email protected]",
},
"workspace_role": {
"name": "Limited Contributor",
"role_identifier": "PresetGamma",
},
},
],
"meta": {
Expand Down Expand Up @@ -1972,23 +1984,23 @@ def test_export_users_preset(requests_mock: Mocker) -> None:
"last_name": "Doe",
"username": "adoe",
"email": "[email protected]",
"role": [],
"role": ["PresetGamma"],
},
{
"id": 2,
"first_name": "Bob",
"last_name": "Doe",
"username": "bdoe",
"email": "[email protected]",
"role": [],
"role": ["PresetGamma"],
},
{
"id": 3,
"first_name": "Clarisse",
"last_name": "Doe",
"username": "cdoe",
"email": "[email protected]",
"role": [],
"role": ["PresetGamma"],
},
]

Expand Down