From 476627996e2e7bb0f6a1ce759dedfb5a73173dd2 Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Wed, 9 Jan 2019 16:16:18 -0500
Subject: [PATCH] update arg order for task order update utility class

---
 atst/routes/task_orders/new.py                  |  6 +++---
 tests/routes/task_orders/test_new_task_order.py | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py
index 96c1eb77..266bcf57 100644
--- a/atst/routes/task_orders/new.py
+++ b/atst/routes/task_orders/new.py
@@ -100,9 +100,9 @@ class ShowTaskOrderWorkflow:
 
 
 class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
-    def __init__(self, form_data, user, screen=1, task_order_id=None):
-        self.form_data = form_data
+    def __init__(self, user, form_data, screen=1, task_order_id=None):
         self.user = user
+        self.form_data = form_data
         self.screen = screen
         self.task_order_id = task_order_id
         self._task_order = None
@@ -205,7 +205,7 @@ def new(screen, task_order_id=None):
 @task_orders_bp.route("/task_orders/new/<int:screen>/<task_order_id>", methods=["POST"])
 def update(screen, task_order_id=None):
     workflow = UpdateTaskOrderWorkflow(
-        http_request.form, g.current_user, screen, task_order_id
+        g.current_user, http_request.form, screen, task_order_id
     )
 
     if workflow.validate():
diff --git a/tests/routes/task_orders/test_new_task_order.py b/tests/routes/task_orders/test_new_task_order.py
index 2287566f..d3d39554 100644
--- a/tests/routes/task_orders/test_new_task_order.py
+++ b/tests/routes/task_orders/test_new_task_order.py
@@ -141,7 +141,7 @@ def test_show_task_order_display_screen(task_order):
 def test_update_task_order_with_no_task_order():
     user = UserFactory.create()
     to_data = TaskOrderFactory.dictionary()
-    workflow = UpdateTaskOrderWorkflow(to_data, user)
+    workflow = UpdateTaskOrderWorkflow(user, to_data)
     assert workflow.task_order is None
     workflow.update()
     assert workflow.task_order
@@ -151,7 +151,7 @@ def test_update_task_order_with_no_task_order():
 def test_update_task_order_with_existing_task_order(task_order):
     to_data = serialize_dates(TaskOrderFactory.dictionary())
     workflow = UpdateTaskOrderWorkflow(
-        to_data, task_order.creator, screen=2, task_order_id=task_order.id
+        task_order.creator, to_data, screen=2, task_order_id=task_order.id
     )
     assert workflow.task_order.start_date != to_data["start_date"]
     workflow.update()
@@ -166,7 +166,7 @@ def test_invite_officers_to_task_order(task_order, queue):
         "so_invite": True,
     }
     workflow = UpdateTaskOrderWorkflow(
-        to_data, task_order.creator, screen=3, task_order_id=task_order.id
+        task_order.creator, to_data, screen=3, task_order_id=task_order.id
     )
     workflow.update()
     workspace = task_order.workspace
@@ -191,7 +191,7 @@ def test_add_officer_but_do_not_invite(task_order, queue):
         "so_invite": False,
     }
     workflow = UpdateTaskOrderWorkflow(
-        to_data, task_order.creator, screen=3, task_order_id=task_order.id
+        task_order.creator, to_data, screen=3, task_order_id=task_order.id
     )
     workflow.update()
     workspace = task_order.workspace
@@ -214,7 +214,7 @@ def test_update_does_not_resend_invitation():
     )
     to_data = {**task_order.to_dictionary(), "ko_invite": True}
     workflow = UpdateTaskOrderWorkflow(
-        to_data, user, screen=3, task_order_id=task_order.id
+        user, to_data, screen=3, task_order_id=task_order.id
     )
     for i in range(2):
         workflow.update()