ledger.settings_base: add VALID_SYSTEMS parameter

dbca-wa · Feb 27, 2018 · 0c5bf47 · 0c5bf47
1 parent d22e37a
commit 0c5bf47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ledger/payments/utils.py b/ledger/payments/utils.py
@@ -60,7 +60,9 @@ def validSystem(system_id):
     ''' Check if the system is in the itsystems register.
     :return: Boolean
     '''
-    if settings.CMS_URL:
+    if settings.VALID_SYSTEMS:
+        return system_id in settings.VALID_SYSTEMS
+    elif settings.CMS_URL:
         # TODO: prefetch whole systems register list, store in django cache, use that instead of doing a GET request every time
         res = requests.get('{}?system_id={}'.format(settings.CMS_URL,system_id), auth=(settings.LEDGER_USER,settings.LEDGER_PASS))
         try:
@@ -72,7 +74,7 @@ def validSystem(system_id):
         except:
             raise
     else:
-        logger.warn('CMS_URL not set, ledger.payments.utils.validSystem will always return true')
+        logger.warn('VALID_SYSTEMS or CMS_URL not set, ledger.payments.utils.validSystem will always return true')
         return True
 
 def calculate_excl_gst(amount):

diff --git a/ledger/settings_base.py b/ledger/settings_base.py
@@ -274,6 +274,8 @@
 
 # Ledger settings
 CMS_URL=env('CMS_URL',None)
+VALID_SYSTEMS=env('VALID_SYSTEMS', '')
+VALID_SYSTEMS=VALID_SYSTEMS.split(',') if VALID_SYSTEMS else []
 LEDGER_USER=env('LEDGER_USER',None)
 LEDGER_PASS=env('LEDGER_PASS')
 NOTIFICATION_EMAIL=env('NOTIFICATION_EMAIL')