TT-98 fix: refactor feature toggle manager

Author: PaulRC-ioet

commons/feature_flags/__init__.py commons/feature_toggles/__init__.pycommons/feature_flags/__init__.py renamed to commons/feature_toggles/__init__.py

@@ -4,17 +4,17 @@
 import os
 
 
-class FeatureFlags:
+class FeatureToggleManager:
     AZURE_CONNECTION_STRING = os.environ.get(
         'AZURE_APP_CONFIGURATION_CONNECTION_STRING'
     )
 
     def __init__(self, key: str, label: str = None):
         self.key = key
         self.label = label
-        self.configuration = self.get_configuration(self.key, self.label)
+        self.configuration = {}
 
-    def get_configuration(self, key: str, label: str):
+    def _get_configuration(self, key: str, label: str):
         connection_str = self.AZURE_CONNECTION_STRING
         client = AzureAppConfigurationClient.from_connection_string(
             connection_str
@@ -25,21 +25,27 @@ def get_configuration(self, key: str, label: str):
 
         return configuration
 
-    def is_toggle_enabled(self):
-        self.configuration = self.get_configuration(self.key, self.label)
-        data = json.loads(self.configuration.value)
+    def _get_data_configuration(self):
+        self.configuration = self._get_configuration(self.key, self.label)
+        result = json.loads(self.configuration.value)
+
+        return result
+
+    def _is_toggle_enabled(self):
+        data = self._get_data_configuration()
         result = data["enabled"]
 
         return result
 
     def is_toggle_enabled_for_user(self):
-        self.configuration = self.get_configuration(self.key, self.label)
-        data = json.loads(self.configuration.value)
-        list_data = data["conditions"]["client_filters"]
-        data2 = list_data[0]
-        list_users = data2["parameters"]["Audience"]["Users"]
-        user = current_user_email()
+        data = self._get_data_configuration()
+        client_filters = data["conditions"]["client_filters"]
+        first_client = client_filters[0]
+        list_users = first_client["parameters"]["Audience"]["Users"]
+        current_user = current_user_email()
 
         return (
-            True if user in list_users and self.is_toggle_enabled() else False
+            True
+            if current_user in list_users and self._is_toggle_enabled()
+            else False
         )

commons/feature_flags/features_flags.py …eature_toggles/feature_toggle_manager.pycommons/feature_flags/features_flags.py renamed to commons/feature_toggles/feature_toggle_manager.py commons/feature_flags/features_flags.py renamed to commons/feature_toggles/feature_toggle_manager.py

@@ -17,7 +17,7 @@
     remove_required_constraint,
 )
 from time_tracker_api.time_entries.time_entries_dao import create_dao
-from commons.feature_flags.features_flags import FeatureFlags
+from commons.feature_toggles.feature_toggle_manager import FeatureToggleManager
 
 faker = Faker()
 
@@ -268,14 +268,14 @@ def get(self):
         return time_entries_dao.get_lastest_entries_by_project(conditions={})
 
 
-@ns.route('/featureFlags')
-class featuresFlags(Resource):
-    @ns.doc('flags')
+@ns.route('/feature-toggles')
+class FeaturesToggles(Resource):
+    @ns.doc('feature_toggle_tests')
     @ns.marshal_list_with(time_entry)
     @ns.response(HTTPStatus.NOT_FOUND, 'No time entries found')
     def get(self):
-        """List the latest time entries"""
-        featureTest = FeatureFlags("ui-list-test-users")
+        """Test Feature Toggles"""
+        featureTest = FeatureToggleManager("ui-list-test-users")
         test = featureTest.is_toggle_enabled_for_user()
         if test:
             return time_entries_dao.get_lastest_entries_by_project(