feat: TT-123 make single methods in azure class.

tests/utils/azure_users_test.py

@@ -1,44 +1,43 @@
 from unittest.mock import Mock, patch
-from utils.azure_users import AzureConnection, ROLE_FIELD_VALUES, AzureUser_v2
+from utils.azure_users import AzureConnection, ROLE_FIELD_VALUES
 from pytest import mark
 
 
-@patch('msal.ConfidentialClientApplication')
-@patch('utils.azure_users.AzureConnection.get_token')
-@patch('utils.azure_users.AzureConnection._get_user')
+@patch('msal.ConfidentialClientApplication', Mock())
+@patch('utils.azure_users.AzureConnection.get_token', Mock())
+@patch('requests.get')
 @mark.parametrize(
-    'field_name,field_value,expected',
+    'field_name,field_value,is_test_user_expected_value',
     [
         (ROLE_FIELD_VALUES['test'][0], ROLE_FIELD_VALUES['test'][1], True),
         (ROLE_FIELD_VALUES['test'][0], None, False),
     ],
 )
 def test_azure_connection_is_test_user(
-    _get_user_mock,
-    get_token_mock,
-    msal_client_mock,
-    field_name,
-    field_value,
-    expected,
+    get_mock, field_name, field_value, is_test_user_expected_value,
 ):
-    _get_user_mock.return_value = {field_name: field_value}
+    response_mock = Mock()
+    response_mock.status_code = 200
+    response_mock.json = Mock(return_value={field_name: field_value})
+    get_mock.return_value = response_mock
+
     test_user_id = 'test-user-id'
     az_conn = AzureConnection()
-    assert az_conn.is_test_user(test_user_id) == expected
+    assert az_conn.is_test_user(test_user_id) == is_test_user_expected_value
 
 
-@patch('msal.ConfidentialClientApplication')
-@patch('utils.azure_users.AzureConnection.get_token')
-@patch('utils.azure_users.AzureConnection._get_test_user_ids')
-def test_azure_connection_get_test_user_ids(
-    _get_test_user_ids_mock,
-    get_token_mock,
-    msal_client_mock,
-):
-    _get_test_user_ids_mock.return_value = [
-        {'objectId': 'ID1'},
-        {'objectId': 'ID2'},
-    ]
+@patch('msal.ConfidentialClientApplication', Mock())
+@patch('utils.azure_users.AzureConnection.get_token', Mock())
+@patch('requests.get')
+def test_azure_connection_get_test_user_ids(get_mock,):
+
+    response_mock = Mock()
+    response_mock.status_code = 200
+    response_mock.json = Mock(
+        return_value={'value': [{'objectId': 'ID1'}, {'objectId': 'ID2'},]}
+    )
+    get_mock.return_value = response_mock
+
     ids = ['ID1', 'ID2']
     az_conn = AzureConnection()
     assert az_conn.get_test_user_ids() == ids

utils/azure_users.py

@@ -94,8 +94,7 @@ def get_token(self):
 
     def users(self) -> List[AzureUser]:
         endpoint = "{endpoint}/users?api-version=1.6&$select=displayName,otherMails,objectId,{role_field}".format(
-            endpoint=self.config.ENDPOINT,
-            role_field=self.role_field,
+            endpoint=self.config.ENDPOINT, role_field=self.role_field,
         )
         response = requests.get(endpoint, auth=BearerAuth(self.access_token))
 
@@ -187,20 +186,17 @@ def get_role_data(self, role_id, is_grant=True):
         else:
             return {field_name: None}
 
-    def _get_user(self, user_id):
+    def is_test_user(self, user_id):
         endpoint = "{endpoint}/users/{user_id}?api-version=1.6".format(
             endpoint=self.config.ENDPOINT, user_id=user_id
         )
         response = requests.get(endpoint, auth=BearerAuth(self.access_token))
         assert 200 == response.status_code
-        return response.json()
-
-    def is_test_user(self, user_id):
-        response = self._get_user(user_id)
+        item = response.json()
         field_name, field_value = ROLE_FIELD_VALUES['test']
-        return field_name in response and field_value == response[field_name]
+        return field_name in item and field_value == item[field_name]
 
-    def _get_test_user_ids(self):
+    def get_test_user_ids(self):
         field_name, field_value = ROLE_FIELD_VALUES['test']
         endpoint = "{endpoint}/users?api-version=1.6&$select=objectId,{field_name}&$filter={field_name} eq '{field_value}'".format(
             endpoint=self.config.ENDPOINT,
@@ -210,8 +206,4 @@ def _get_test_user_ids(self):
         response = requests.get(endpoint, auth=BearerAuth(self.access_token))
         assert 200 == response.status_code
         assert 'value' in response.json()
-        return response.json()['value']
-
-    def get_test_user_ids(self):
-        response = self._get_test_user_ids()
-        return [item['objectId'] for item in response]
+        return [item['objectId'] for item in response.json()['value']]