Skip to content

fix: TT-393 userid convert to list #339

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

Merged
merged 7 commits into from
Nov 12, 2021
Merged

fix: TT-393 userid convert to list #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
003376d
feat: TT-365 Method POST activity and create function serverless
scastillo-jp Oct 28, 2021
bcea65a
solve merge conflicts
dsgarcia8 Nov 3, 2021
1590b14
Merge branch 'master' of github.com:ioet/time-tracker-backend
dsgarcia8 Nov 5, 2021
ee50bfd
fix: TT-393 change user id variable to list
dsgarcia8 Nov 8, 2021
4b071a1
TT-393 added list to userid
mandres2015 Nov 9, 2021
9c0e8e0
TT-393 added list to userid
mandres2015 Nov 10, 2021
2c04731
TT-393 resolve comment
mandres2015 Nov 11, 2021
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
6 changes: 6 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/utils/azure_users_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def test_get_groups_and_users(get_mock):
get_mock.return_value = response_mock

expected_result = [
('test-group-1', ['user-id1', 'user-id2', MSConfig.USERID]),
('test-group-1', ['user-id1', 'user-id2', *MSConfig.USERID.split(",")]),
('test-group-2', ['user-id3', 'user-id1']),
('test-group-3', []),
]
Expand Down
Empty file modified time-tracker.sh
100644 → 100755
View file
Open in desktop
Empty file.
3 changes: 2 additions & 1 deletion utils/azure_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ def get_groups_and_users(self):
[member['objectId'] for member in item['members']],
)
result = list(map(parse_item, response.json()['value']))
result[0][1].append(self.config.USERID)
users_id = self.config.USERID.split(",")
result[0][1].extend(users_id)

return result

Expand Down