fix: TT-131 remove feature toggle from users endpoint

Author: Angeluz-07

tests/time_tracker_api/users/users_namespace_test.py

@@ -11,70 +11,23 @@
 @patch(
     'utils.azure_users.AzureConnection.is_test_user', Mock(return_value=True)
 )
-@patch(
-    'commons.feature_toggles.feature_toggle_manager.FeatureToggleManager.get_azure_app_configuration_client'
-)
-@patch(
-    'commons.feature_toggles.feature_toggle_manager.FeatureToggleManager.is_toggle_enabled_for_user'
-)
-@patch('utils.azure_users.AzureConnection.users')
 @patch('utils.azure_users.AzureConnection.users_v2')
-def test_feature_toggle_is_on_then_role_field_is_list(
-    users_v2_mock,
-    users_mock,
-    is_toggle_enabled_for_user_mock,
-    get_azure_app_configuration_client_mock,
-    client: FlaskClient,
-    valid_header: dict,
+def test_users_response_contains_expected_props(
+    users_v2_mock, client: FlaskClient, valid_header: dict,
 ):
-
-    is_toggle_enabled_for_user_mock.return_value = True
     users_v2_mock.return_value = [
         {'name': 'dummy', 'email': 'dummy', 'roles': ['dummy-role']}
     ]
     response = client.get('/users', headers=valid_header)
 
     users_v2_mock.assert_called()
-    users_mock.assert_not_called()
     assert HTTPStatus.OK == response.status_code
     assert 'name' in json.loads(response.data)[0]
     assert 'email' in json.loads(response.data)[0]
     assert 'roles' in json.loads(response.data)[0]
     assert ['dummy-role'] == json.loads(response.data)[0]['roles']
 
 
-@patch(
-    'commons.feature_toggles.feature_toggle_manager.FeatureToggleManager.get_azure_app_configuration_client'
-)
-@patch(
-    'commons.feature_toggles.feature_toggle_manager.FeatureToggleManager.is_toggle_enabled_for_user'
-)
-@patch('utils.azure_users.AzureConnection.users')
-@patch('utils.azure_users.AzureConnection.users_v2')
-def test_feature_toggle_is_off_then_role_field_is_string(
-    users_v2_mock,
-    users_mock,
-    is_toggle_enabled_for_user_mock,
-    get_azure_app_configuration_client_mock,
-    client: FlaskClient,
-    valid_header: dict,
-):
-    is_toggle_enabled_for_user_mock.return_value = False
-    users_mock.return_value = [
-        {'name': 'dummy', 'email': 'dummy', 'role': 'dummy-role'}
-    ]
-
-    response = client.get('/users', headers=valid_header)
-
-    users_mock.assert_called()
-    users_v2_mock.assert_not_called()
-    assert HTTPStatus.OK == response.status_code
-    assert 'name' in json.loads(response.data)[0]
-    assert 'email' in json.loads(response.data)[0]
-    assert 'role' in json.loads(response.data)[0]
-    assert 'dummy-role' == json.loads(response.data)[0]['role']
-
-
 def test_update_user_role_response_contains_expected_props(
     client: FlaskClient, valid_header: dict, user_id: str,
 ):

time_tracker_api/users/users_namespace.py

@@ -6,7 +6,6 @@
 from time_tracker_api.security import current_user_id
 
 from utils.azure_users import AzureConnection
-from commons.feature_toggles.feature_toggle_manager import FeatureToggleManager
 
 ns = api.namespace('users', description='Namespace of the API for users')
 
@@ -67,18 +66,15 @@ class Users(Resource):
     @ns.marshal_list_with(user_response_fields)
     def get(self):
         """List all users"""
-        user_role_field_toggle = FeatureToggleManager('bk-user-role-field')
-        if user_role_field_toggle.is_toggle_enabled_for_user():
-            azure_connection = AzureConnection()
-            is_current_user_a_tester = azure_connection.is_test_user(
-                current_user_id()
-            )
-            return (
-                azure_connection.users_v2()
-                if is_current_user_a_tester
-                else azure_connection.get_non_test_users()
-            )
-        return AzureConnection().users()
+        azure_connection = AzureConnection()
+        is_current_user_a_tester = azure_connection.is_test_user(
+            current_user_id()
+        )
+        return (
+            azure_connection.users_v2()
+            if is_current_user_a_tester
+            else azure_connection.get_non_test_users()
+        )
 
 
 @ns.route('/<string:id>/roles')