Handle formdata processing in a property

atst/models/task_order.py

@@ -52,11 +52,6 @@ class TaskOrder(Base, mixins.TimestampsMixin):
             filter(None, [self.clin_01, self.clin_02, self.clin_03, self.clin_04])
         )
 
-    def __repr__(self):
-        return "<TaskOrder(number='{}', budget='{}', end_date='{}', id='{}')>".format(
-            self.number, self.budget, self.end_date, self.id
-        )
-
     @property
     def portfolio_name(self):
         return self.workspace.name
@@ -70,3 +65,8 @@ class TaskOrder(Base, mixins.TimestampsMixin):
                 if c.name not in ["id"]
             },
         }
+
+    def __repr__(self):
+        return "<TaskOrder(number='{}', budget='{}', end_date='{}', id='{}')>".format(
+            self.number, self.budget, self.end_date, self.id
+        )

atst/routes/task_orders/new.py

@@ -49,14 +49,20 @@ class ShowTaskOrderWorkflow:
 
         return self._task_order
 
+    @property
+    def task_order_formdata(self):
+        task_order_dict = self.task_order.to_dictionary()
+        for field in task_order_dict:
+            if task_order_dict[field] is None:
+                task_order_dict[field] = ""
+        return task_order_dict
+
     @property
     def form(self):
         if self._form:
             pass
         elif self.task_order:
-            # None causes issues with formdata, so coerce None to ''
-            formdata = self.process_none_types(task_order=self.task_order)
-            self._form = self._section["form"](formdata=formdata)
+            self._form = self._section["form"](formdata=self.task_order_formdata)
         else:
             self._form = self._section["form"]()
 
@@ -77,13 +83,6 @@ class ShowTaskOrderWorkflow:
 
         return screen_info
 
-    def process_none_types(self, task_order):
-        task_order_dict = task_order.to_dictionary()
-        for field in task_order_dict:
-            if task_order_dict[field] is None:
-                task_order_dict[field] = ""
-        return task_order_dict
-
 
 class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
     def __init__(self, form_data, user, screen=1, task_order_id=None):