[#190] add logic in accept_recipient_identifiers_enabled() to check i…

…f the env variable is equal to the string True, since env var is always a string, not a boolean

move the feature flag out of config, directly referencing environment variables from accept_recipient_idenifiers_enabled()

app/config.py

@@ -396,7 +396,6 @@ class Config(object):
     API_RATE_LIMIT_ENABLED = False
     API_MESSAGE_LIMIT_ENABLED = False
     SWITCH_SLOW_SMS_PROVIDER_ENABLED = False
-    ACCEPT_RECIPIENT_IDENTIFIERS_ENABLED = os.getenv('ACCEPT_RECIPIENT_IDENTIFIERS_ENABLED', False)
 
 
 ######################

app/feature_flags.py

@@ -1,3 +1,5 @@
+import os
+
 PROVIDER_FEATURE_FLAGS = {
     'govdelivery': 'GOVDELIVERY_EMAIL_CLIENT_ENABLED'
 }
@@ -10,5 +12,8 @@ def is_provider_enabled(current_app, provider_identifier):
         return True
 
 
-def accept_recipient_identifiers_enabled(current_app):
-    return current_app.config.get('ACCEPT_RECIPIENT_IDENTIFIERS_ENABLED', False)
+def accept_recipient_identifiers_enabled():
+    if os.getenv('ACCEPT_RECIPIENT_IDENTIFIERS_ENABLED', 'False') == 'True':
+        return True
+    else:
+        return False

app/notifications/process_notifications.py

@@ -98,7 +98,7 @@ def persist_notification(
         reply_to_text=reply_to_text,
         billable_units=billable_units
     )
-    if accept_recipient_identifiers_enabled(current_app) and recipient_identifier:
+    if accept_recipient_identifiers_enabled() and recipient_identifier:
         _recipient_identifier = RecipientIdentifier(
             notification_id=notification_id,
             id_type=recipient_identifier['id_type'],

app/v2/notifications/post_notifications.py

@@ -149,7 +149,7 @@ def post_notification(notification_type):
                 reply_to_text=reply_to
             )
         else:
-            if accept_recipient_identifiers_enabled(current_app):
+            if accept_recipient_identifiers_enabled():
                 notification = process_notification_with_recipient_identifier(
                     form=form,
                     notification_type=notification_type,

tests/app/test_feature_flags.py

@@ -1,3 +1,7 @@
+import os
+
+import pytest
+
 from app.feature_flags import is_provider_enabled, accept_recipient_identifiers_enabled
 
 
@@ -13,15 +17,10 @@ def test_is_provider_without_a_flag_enabled(mocker):
     assert is_provider_enabled(current_app, 'some-provider-without-a-flag')
 
 
-def test_accept_recipient_identifiers_enabled(mocker):
-    current_app = mocker.Mock(config={
-        'ACCEPT_RECIPIENT_IDENTIFIERS_ENABLED': True
-    })
-    assert accept_recipient_identifiers_enabled(current_app)
-
-
-def test_accept_recipient_identifiers_not_enabled(mocker):
-    current_app = mocker.Mock(config={
-        'ACCEPT_RECIPIENT_IDENTIFIERS_ENABLED': False
-    })
-    assert not accept_recipient_identifiers_enabled(current_app)
+@pytest.mark.parametrize('enabled_string, enabled_boolean', [
+    ('True', True),
+    ('False', False)
+])
+def test_accept_recipient_identifiers_flag(mocker, enabled_string, enabled_boolean):
+    mocker.patch.dict(os.environ, {'ACCEPT_RECIPIENT_IDENTIFIERS_ENABLED': enabled_string})
+    assert accept_recipient_identifiers_enabled() == enabled_boolean