Merge pull request #28 from hellohaptik/bug_fixes

Bug fixes, Directory Structure and Refactor the code

Author: parvez301

FeatureToggle/__init__.py

@@ -9,81 +9,6 @@
 from UnleashClient.utils import LOGGER
 
 
-class FeatureTogglesFromConst:
-    def __init__(self):
-        self.feature_toggles_dict = consts.FEATURE_TOGGLES_API_RESPONSE
-
-    def is_enabled(self, feature_name,
-                   app_context: Optional[Dict] = {}) -> bool:
-        """
-        Check if certain feature is enabled in const
-        Args:
-            feature_name(str): Name of the feature
-            app_context(dict): App context to check when certain feature is enabled for given entity
-                eg: {
-                    "partner_names": "<partner_names>"
-                }
-        Returns(bool): True if feature is enabled else False
-        """
-        is_feature_enabled = feature_name in self.feature_toggles_dict
-
-        # If Feature is not enabled then return is_feature_enabled Value
-        if not is_feature_enabled:
-            return is_feature_enabled
-
-        if not app_context:  # If there's not any app_context then return is_feature_enabled value
-            return is_feature_enabled
-
-        app_context_parameter_key = list(app_context.keys())[0]
-        app_context_parameter_value = list(app_context.values())[0]
-
-        feature_data = self.feature_toggles_dict[feature_name]
-        return app_context_parameter_value in feature_data.get(app_context_parameter_key, [])
-
-    @staticmethod
-    def fetch_feature_toggles() -> Dict[str, Any]:
-        """
-        Return Feature toggles from const
-        """
-        return consts.FEATURE_TOGGLES_API_RESPONSE
-
-    @staticmethod
-    def is_enabled_for_partner(feature_name: str,
-                               partner_name: Optional[str] = ''):
-        context = {}
-        if partner_name:
-            context['partner_names'] = partner_name
-
-        return FeatureTogglesFromConst().is_enabled(feature_name, context)
-
-    @staticmethod
-    def is_enabled_for_expert(feature_name: str,
-                              expert_email: Optional[str] = ''):
-        context = {}
-        if expert_email:
-            context['expert_emails'] = expert_email
-
-        return FeatureTogglesFromConst().is_enabled(feature_name, context)
-
-    @staticmethod
-    def is_enabled_for_business(feature_name: str,
-                                business_via_name: Optional[str] = ''):
-        context = {}
-        if business_via_name:
-            context['business_via_names'] = business_via_name
-
-        return FeatureTogglesFromConst().is_enabled(feature_name, context)
-
-    @staticmethod
-    def is_enabled_for_domain(feature_name: str,
-                              domain_name: Optional[str] = ''):
-        context = {}
-        if domain_name:
-            context['domain_names'] = domain_name
-
-        return FeatureTogglesFromConst().is_enabled(feature_name, context)
-
-
 class FeatureToggles:
     __client = None
     __url = None
@@ -167,20 +92,17 @@ def __get_unleash_client():
         Initialize the client if client is None Else Return the established client
         """
         if FeatureToggles.__enable_toggle_service:
-            if FeatureToggles.__client is None:
-                FeatureToggles.__client = UnleashClient(
-                    url=FeatureToggles.__url,
-                    app_name=FeatureToggles.__app_name,
-                    instance_id=FeatureToggles.__instance_id,
-                    cas_name=FeatureToggles.__cas_name,
-                    environment=FeatureToggles.__environment,
-                    redis_host=FeatureToggles.__redis_host,
-                    redis_port=FeatureToggles.__redis_port,
-                    redis_db=FeatureToggles.__redis_db
-                )
-                FeatureToggles.__client.initialize_client()
-        else:
-            FeatureToggles.__client = FeatureTogglesFromConst()
+            FeatureToggles.__client = UnleashClient(
+                url=FeatureToggles.__url,
+                app_name=FeatureToggles.__app_name,
+                instance_id=FeatureToggles.__instance_id,
+                cas_name=FeatureToggles.__cas_name,
+                environment=FeatureToggles.__environment,
+                redis_host=FeatureToggles.__redis_host,
+                redis_port=FeatureToggles.__redis_port,
+                redis_db=FeatureToggles.__redis_db
+            )
+            FeatureToggles.__client.initialize_client()
 
         return FeatureToggles.__client
 
@@ -300,6 +222,12 @@ def fetch_feature_toggles():
             }
         """
         # TODO: Remove the cas and environment name from the feature toggles while returning the response
+
+        if FeatureToggles.__cache is None:
+            raise Exception(
+                'To update cache Feature Toggles class needs to be initialised'
+            )
+
         feature_toggles = pickle.loads(
             FeatureToggles.__cache.get(consts.FEATURES_URL)
         )
@@ -321,7 +249,8 @@ def fetch_feature_toggles():
 
                     if cas_name == FeatureToggles.__cas_name and environment == FeatureToggles.__environment:
                         # Strip CAS and ENV name from feature name
-                        active_cas_env_name = f'{cas_name}.{environment}.'
+                        active_cas_env_name = f'{FeatureToggles.__cas_name}.'
+                        f'{FeatureToggles.__environment}.'
                         full_feature_name = full_feature_name.replace(active_cas_env_name, '')
                         if full_feature_name not in response:
                             response[full_feature_name] = {}
@@ -350,4 +279,4 @@ def fetch_feature_toggles():
             # Handle this exception from where this util gets called
             raise Exception(f'Error occured while parsing the response: {str(err)}')
 
-        return response
+        return response