Only store model param fields specified by the user

ospc-org · Feb 22, 2018 · dabbf14 · dabbf14
1 parent 5f7be9a
commit dabbf14
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/webapp/apps/dynamic/models.py b/webapp/apps/dynamic/models.py
@@ -116,7 +116,8 @@ def get_tax_result(self):
 
     NONPARAM_FIELDS = set(["job_ids", "jobs_not_ready", "first_year",
                            "tax_result", "raw_input_fields", "input_fields",
-                           "creation_date", "id"])
+                           "creation_date", "id", "raw_input_fields",
+                           "input_fields"])
 
     def set_fields(self):
         """

diff --git a/webapp/apps/taxbrain/behaviors.py b/webapp/apps/taxbrain/behaviors.py
@@ -72,7 +72,7 @@ def set_fields(self, upstream_obj, nonparam_fields=None):
             self.raw_input_fields = {}
             for field in self._meta.fields:
                 if (getattr(self, field.attname, None) and
-                    field not in nonparam_fields):
+                    field.name not in nonparam_fields):
                     self.raw_input_fields[field.name] = getattr(self, field.attname)
 
         param_formatters.amt_fixup(self.raw_input_fields)

diff --git a/webapp/apps/taxbrain/models.py b/webapp/apps/taxbrain/models.py
@@ -760,7 +760,8 @@ def get_tax_result(self):
 
     NONPARAM_FIELDS = set(["job_ids", "jobs_not_ready", "first_year", "quick_calc",
                            "tax_result", "raw_input_fields", "input_fields",
-                           "json_text", "error_text", "creation_date", "id"])
+                           "json_text", "error_text", "creation_date", "id",
+                           "raw_input_fields", "input_fields"])
 
     def set_fields(self):
         """

diff --git a/webapp/apps/taxbrain/param_formatters.py b/webapp/apps/taxbrain/param_formatters.py
@@ -128,8 +128,10 @@ def parse_fields(param_dict, default_params):
             #     '3': False
             # value_from_datadict unpacks this data:
             # https://github.com/django/django/blob/1.9/django/forms/widgets.py#L582-L589
-            if prepped == 1:
-                values = meta_param.param_meta["cpi_inflated"]
+            if prepped is 1:
+                # no need to pass this to upstream model since they will be
+                # filled in
+                continue
             else:
                 values = CPI_WIDGET.value_from_datadict(
                     {meta_param.param_name: str(prepped)},

diff --git a/webapp/apps/test_assets/test_param_formatters.py b/webapp/apps/test_assets/test_param_formatters.py
@@ -122,7 +122,6 @@ def test_parse_fields(default_params_Policy):
         "_STD_joint": [15000.0,"<"],
         "_ID_BenefitCap_Switch_statelocal": [True, False, "<", True, True],
         "_ID_Charity_c_cpi": True,
-        "_ID_Medical_c_cpi": True,
         "_SS_Earnings_c_cpi": True
     }
     assert act == exp