Merge pull request #109 from cfpb/fix-load-job

Bring ratechecker data load job code up to date

manage.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import os
 import sys
 

ratechecker/tests/test_load_daily_data_command.py

@@ -1,19 +1,21 @@
 import os
 import shutil
 import zipfile
-from mock import patch
-
 
-from decimal import Decimal
 from datetime import datetime
-from django.utils import timezone
-from django.test import TestCase
-from django.db import connection, OperationalError, IntegrityError
+from decimal import Decimal
 from django.core.management import call_command
 from django.core.management.base import CommandError
+from django.db import connection, OperationalError, IntegrityError
+from django.test import TestCase
+from django.utils import timezone
+from mock import patch
 
-from ratechecker.management.commands.load_daily_data import Command, OaHException
-from ratechecker.models import Product, Adjustment, Rate, Region, Fee
+from ratechecker.management.commands.load_daily_data import (
+    Command, OaHException
+)
+from ratechecker.management.commands.test_scenarios import test_scenarios
+from ratechecker.models import Adjustment, Fee, Product, Rate, Region
 
 
 class LoadDailyTestCase(TestCase):
@@ -126,32 +128,40 @@ def test_get_precalculated_results(self):
         self.assertEqual(result['1'][0], '3.750')
         self.assertEqual(result['1'][1], '0.125')
 
-    # Read http://alexmarandon.com/articles/python_mock_gotchas/
-    @patch('ratechecker.management.commands.load_daily_data.get_rates')
+    @patch(
+        'ratechecker.management.commands.load_daily_data.get_rates',
+        return_value={'data': {'3.750': '0.125'}}
+    )
     def test_compare_scenarios_output(self, mock_get_rates):
-        """ .. the function."""
-        mock_get_rates.return_value = {'data': {'3.750': '0.125'}}
-
-        data = {
-            '1': ['3.750', '0.125'],
-            '2': ['11', '12'],
-        }
-
-        cut_down = {}
-        cut_down['1'] = self.c.test_scenarios['1']
-        cut_down['2'] = self.c.test_scenarios['2']
-        cut_down['16'] = self.c.test_scenarios['16']
-        self.c.test_scenarios = cut_down
-
         row = ['11', 'VA']
         r = Region()
         r.region_id = int(row[0])
         r.state_id = row[1]
         r.data_timestamp = timezone.now()
         r.save()
 
-        result = self.c.compare_scenarios_output(data)
-        self.assertTrue("The following scenarios don't match: <br>[\" scenario_no: 2 Expected: ['11', '12'] Actual: {'3.750': '0.125'}<br>\"]" in self.c.messages)
+        data = {
+            '1': ['3.750', '0.125'],
+            '2': ['11', '12'],
+        }
+
+        with patch.dict(
+            'ratechecker.management.commands.test_scenarios.test_scenarios',
+        ):
+            for k in test_scenarios.keys():
+                if k not in ('1', '2', '16'):
+                    del test_scenarios[k]
+
+            self.c.compare_scenarios_output(data)
+
+        self.assertIn(
+            (
+                'The following scenarios don\'t match: <br>[\" scenario_no:'
+                ' 2 Expected: [\'11\', \'12\'] Actual: {\'3.750\': '
+                '\'0.125\'}<br>\"]'
+            ),
+            self.c.messages
+        )
 
     def test_delete_temp_tables(self):
         """ ...  some exist, others - not."""

ratechecker/tests/test_views_rate_query.py

@@ -133,6 +133,7 @@ def initialize_params(self, values={}):
         self.params.price = values.get('price', 320000)
         self.params.maxfico = values.get('maxfico', 700)
         self.params.minfico = values.get('minfico', 700)
+        self.params.lock = values.get('lock', 60)
         self.params.max_lock = values.get('max_lock', 60)
         self.params.min_lock = values.get('min_lock', 45)
         self.params.property_type = values.get('property_type', 'CONDO')

ratechecker/tests/test_views_ratecheckerparameters.py

@@ -1,7 +1,7 @@
-from django.test import TestCase
-
 from decimal import Decimal
+from django.test import TestCase
 
+from ratechecker.management.commands.test_scenarios import test_scenarios
 from ratechecker.models import Product
 from ratechecker.ratechecker_parameters import ParamsSerializer, scrub_error
 
@@ -204,7 +204,7 @@ def test_is_valid__rate_structure_arm_no_arm_type(self):
         self.data['rate_structure'] = 'ARM'
         serializer = ParamsSerializer(data=self.data)
         self.assertFalse(serializer.is_valid())
-        self.assertEqual(serializer.errors.get('non_field_errors'), 
+        self.assertEqual(serializer.errors.get('non_field_errors'),
             [u'arm_type is required if rate_structure is ARM.'])
 
     def test_is_valid__loan_term_not_choice(self):
@@ -243,3 +243,8 @@ def test_error_scrubber(self):
         for char in ['<', '>', r'%3C', r'%3E']:
             self.assertNotIn(char, scrub_error(bad_value1))
             self.assertNotIn(char, scrub_error(bad_value2))
+
+    def test_test_scenarios(self):
+        for scenario in test_scenarios.values():
+            serializer = ParamsSerializer(data=scenario)
+            serializer.is_valid(raise_exception=True)

ratechecker/views.py

@@ -43,7 +43,7 @@ def get_rates(params_data, data_load_testing=False, return_fees=False):
     if data_load_testing:
         rates = rates.filter(
             product__institution=params_data.get('institution'),
-            lock=params_data.get('max_lock'))
+            lock=params_data.get('lock'))
     else:
         rates = rates.filter(
             lock__lte=params_data.get('max_lock', 0),