TT-98 fix: refactor Config class

Author: Angeluz-07

commons/feature_toggles/feature_toggle_manager.py

@@ -1,20 +1,14 @@
 import os
 import json
 from time_tracker_api.security import current_user_email
+from time_tracker_api.config import check_if_env_variables_are_defined
 from azure.appconfiguration import AzureAppConfigurationClient
 
 
 class FeatureToggleConfig:
-    def check_variables_are_defined():
-        azure_app_variable = 'AZURE_APP_CONFIGURATION_CONNECTION_STRING'
-        if azure_app_variable not in os.environ:
-            raise EnvironmentError(
-                "{} is not defined in the environment".format(
-                    azure_app_variable
-                )
-            )
-
-    check_variables_are_defined()
+    check_if_env_variables_are_defined(
+        env_vars=['AZURE_APP_CONFIGURATION_CONNECTION_STRING']
+    )
     AZURE_APP_CONFIGURATION_CONNECTION_STRING = os.environ.get(
         'AZURE_APP_CONFIGURATION_CONNECTION_STRING'
     )

time_tracker_api/config.py

@@ -5,6 +5,14 @@
 DISABLE_STR_VALUES = ("false", "0", "disabled")
 
 
+def check_if_env_variables_are_defined(env_vars):
+    for var in env_vars:
+        if var not in os.environ:
+            raise EnvironmentError(
+                "{} is not defined in the environment".format(var)
+            )
+
+
 class Config:
     SECRET_KEY = get_or_generate_dev_secret_key()
     SQL_DATABASE_URI = os.environ.get('SQL_DATABASE_URI')

utils/azure_users.py

@@ -3,24 +3,19 @@
 import requests
 import json
 from typing import List
+from time_tracker_api.config import check_if_env_variables_are_defined
 
 
 class MSConfig:
-    def check_variables_are_defined():
-        auth_variables = [
+    check_if_env_variables_are_defined(
+        env_vars=[
             'MS_CLIENT_ID',
             'MS_AUTHORITY',
             'MS_SECRET',
             'MS_SCOPE',
             'MS_ENDPOINT',
         ]
-        for var in auth_variables:
-            if var not in os.environ:
-                raise EnvironmentError(
-                    "{} is not defined in the environment".format(var)
-                )
-
-    check_variables_are_defined()
+    )
     CLIENT_ID = os.environ.get('MS_CLIENT_ID')
     AUTHORITY = os.environ.get('MS_AUTHORITY')
     SECRET = os.environ.get('MS_SECRET')