Merge pull request #801 from xzzy/master

Oracle Finance tables Change and Ledger Cleanup

.travis.yml

@@ -29,15 +29,11 @@ install:
 before_script:
     - psql -c 'create database travis_ci_test;' -U postgres
     - python manage_wl.py migrate --noinput
-    - python manage_ps.py migrate --noinput
-    - python manage_mo.py migrate --noinput
     - python manage_wl.py load_ledger_fixtures
     - python manage_wl.py load_fixtures
 script:
     - COVERAGE_FILE=.coverage_ledger coverage run --source="." manage_wl.py test --noinput ledger
     - COVERAGE_FILE=.coverage_wl coverage run --source="." manage_wl.py test --noinput wildlifelicensing
-    - COVERAGE_FILE=.coverage_ps coverage run --source="." manage_ps.py test --noinput parkstay
-    - COVERAGE_FILE=.coverage_mo coverage run --source="." manage_mo.py test --noinput mooring
     - coverage combine .coverage_ledger .coverage_wl .coverage_ps .coverage_mo
 after_success:
     - coveralls

ledger/payments/models.py

@@ -85,14 +85,34 @@ class Meta:
         managed = False
         db_table = 'payments_account_codes'
 
+
 class OracleOpenPeriod(models.Model):
+    _DATABASE = "oracle_finance"
     period_name = models.CharField(max_length=240,primary_key=True)
     closing_status = models.CharField(max_length=1)
 
     class Meta:
         managed = False
         db_table = 'payments_open_periods'
 
+
+class OracleFinanceDBRouter(object):
+
+    def db_for_read(self, model, **hints):
+       if model._meta.db_table == 'payments_open_periods' or model._meta.db_table == 'payments_account_codes':
+           return 'oracle_finance'
+       return 'default'
+#     def db_for_read(self, model, **hints):
+#         if model._meta.app_label == 'oracle_finance':
+#             return 'oracle_finance'
+#         return 'default'
+#     
+#     def db_for_write(self, model, **hints):
+#         if model._meta.app_label == 'oracle_finance':
+#             return 'oracle_finance'
+#         return 'default'
+
+
 # Refund Tracking
 class TrackRefund(models.Model):
     REFUND_TYPES = (

ledger/settings_base.py

@@ -2,7 +2,7 @@
 from confy import env, database
 from oscar.defaults import *
 from oscar import get_core_apps, OSCAR_MAIN_TEMPLATE_DIR
-
+import dj_database_url
 import os
 
 # Project paths
@@ -173,10 +173,13 @@
 }
 
 
+DATABASE_ROUTERS = ['ledger.payments.models.OracleFinanceDBRouter']
+DATABASE_APPS_MAPPING = {'oracle_finance': 'oracle_finance', }
 # Database
 DATABASES = {
     # Defined in the DATABASE_URL env variable.
     'default': database.config(),
+    'oracle_finance':  dj_database_url.config(env='ORACLE_FINANCE_DB') 
 }