send officer invitations when MO completes TO form

tests/routes/portfolios/test_invitations.py

@@ -212,27 +212,20 @@ def test_existing_member_invite_resent_to_email_submitted_in_form(
 
 def test_contracting_officer_accepts_invite(monkeypatch, client, user_session):
     portfolio = PortfolioFactory.create()
-    task_order = TaskOrderFactory.create(portfolio=portfolio)
     user_info = UserFactory.dictionary()
+    task_order = TaskOrderFactory.create(
+        portfolio=portfolio,
+        ko_first_name=user_info["first_name"],
+        ko_last_name=user_info["last_name"],
+        ko_email=user_info["email"],
+        ko_phone_number=user_info["phone_number"],
+        ko_dod_id=user_info["dod_id"],
+        ko_invite=True,
+    )
 
     # create contracting officer
     user_session(portfolio.owner)
-    client.post(
-        url_for("task_orders.new", screen=3, task_order_id=task_order.id),
-        data={
-            "portfolio_role": "contracting_officer",
-            "ko_first_name": user_info["first_name"],
-            "ko_last_name": user_info["last_name"],
-            "ko_email": user_info["email"],
-            "ko_phone_number": user_info["phone_number"],
-            "ko_dod_id": user_info["dod_id"],
-            "cor_phone_number": user_info["phone_number"],
-            "so_phone_number": user_info["phone_number"],
-            "so_dod_id": task_order.so_dod_id,
-            "cor_dod_id": task_order.cor_dod_id,
-            "ko_invite": True,
-        },
-    )
+    client.post(url_for("task_orders.invite", task_order_id=task_order.id))
 
     # contracting officer accepts invitation
     user = Users.get_by_dod_id(user_info["dod_id"])

tests/routes/task_orders/test_invite.py

@@ -1,7 +1,7 @@
 import pytest
 from flask import url_for
 
-from tests.factories import PortfolioFactory, TaskOrderFactory
+from tests.factories import PortfolioFactory, TaskOrderFactory, UserFactory
 
 
 def test_invite(client, user_session):
@@ -15,3 +15,60 @@ def test_invite(client, user_session):
         "portfolios.view_task_order", portfolio_id=to.portfolio_id, task_order_id=to.id
     )
     assert redirect in response.headers["Location"]
+
+
+def test_invite_officers_to_task_order(client, user_session, queue):
+    task_order = TaskOrderFactory.create(
+        ko_invite=True, cor_invite=True, so_invite=True
+    )
+    portfolio = task_order.portfolio
+
+    user_session(portfolio.owner)
+    client.post(url_for("task_orders.invite", task_order_id=task_order.id))
+
+    # owner and three officers are portfolio members
+    assert len(portfolio.members) == 4
+    roles = [member.role.name for member in portfolio.members]
+    # officers exist in roles
+    assert roles.count("officer") == 3
+    # email invitations are enqueued
+    assert len(queue.get_queue()) == 3
+    # task order has relationship to user for each officer role
+    assert task_order.contracting_officer.dod_id == task_order.ko_dod_id
+    assert task_order.contracting_officer_representative.dod_id == task_order.cor_dod_id
+    assert task_order.security_officer.dod_id == task_order.so_dod_id
+
+
+def test_add_officer_but_do_not_invite(client, user_session, queue):
+    task_order = TaskOrderFactory.create(
+        ko_invite=False, cor_invite=False, so_invite=False
+    )
+    portfolio = task_order.portfolio
+
+    user_session(portfolio.owner)
+    client.post(url_for("task_orders.invite", task_order_id=task_order.id))
+
+    portfolio = task_order.portfolio
+    # owner is only portfolio member
+    assert len(portfolio.members) == 1
+    # no invitations are enqueued
+    assert len(queue.get_queue()) == 0
+
+
+def test_does_not_resend_officer_invitation(client, user_session):
+    user = UserFactory.create()
+    contracting_officer = UserFactory.create()
+    portfolio = PortfolioFactory.create(owner=user)
+    task_order = TaskOrderFactory.create(
+        creator=user,
+        portfolio=portfolio,
+        ko_first_name=contracting_officer.first_name,
+        ko_last_name=contracting_officer.last_name,
+        ko_dod_id=contracting_officer.dod_id,
+        ko_invite=True,
+    )
+
+    user_session(user)
+    for i in range(2):
+        client.post(url_for("task_orders.invite", task_order_id=task_order.id))
+    assert len(contracting_officer.invitations) == 1

tests/routes/task_orders/test_new_task_order.py

@@ -235,69 +235,6 @@ def test_cor_data_set_to_user_data_if_am_cor_is_checked(task_order):
     assert task_order.cor_dod_id == task_order.creator.dod_id
 
 
-def test_invite_officers_to_task_order(task_order, queue):
-    to_data = {
-        **TaskOrderFactory.dictionary(),
-        "ko_invite": True,
-        "cor_invite": True,
-        "so_invite": True,
-    }
-    workflow = UpdateTaskOrderWorkflow(
-        task_order.creator, to_data, screen=3, task_order_id=task_order.id
-    )
-    workflow.update()
-    portfolio = task_order.portfolio
-    # owner and three officers are portfolio members
-    assert len(portfolio.members) == 4
-    roles = [member.role.name for member in portfolio.members]
-    # officers exist in roles
-    assert roles.count("officer") == 3
-    # email invitations are enqueued
-    assert len(queue.get_queue()) == 3
-    # task order has relationship to user for each officer role
-    assert task_order.contracting_officer.dod_id == to_data["ko_dod_id"]
-    assert task_order.contracting_officer_representative.dod_id == to_data["cor_dod_id"]
-    assert task_order.security_officer.dod_id == to_data["so_dod_id"]
-
-
-def test_add_officer_but_do_not_invite(task_order, queue):
-    to_data = {
-        **TaskOrderFactory.dictionary(),
-        "ko_invite": False,
-        "cor_invite": False,
-        "so_invite": False,
-    }
-    workflow = UpdateTaskOrderWorkflow(
-        task_order.creator, to_data, screen=3, task_order_id=task_order.id
-    )
-    workflow.update()
-    portfolio = task_order.portfolio
-    # owner is only portfolio member
-    assert len(portfolio.members) == 1
-    # no invitations are enqueued
-    assert len(queue.get_queue()) == 0
-
-
-def test_update_does_not_resend_invitation():
-    user = UserFactory.create()
-    contracting_officer = UserFactory.create()
-    portfolio = PortfolioFactory.create(owner=user)
-    task_order = TaskOrderFactory.create(
-        creator=user,
-        portfolio=portfolio,
-        ko_first_name=contracting_officer.first_name,
-        ko_last_name=contracting_officer.last_name,
-        ko_dod_id=contracting_officer.dod_id,
-    )
-    to_data = {**task_order.to_dictionary(), "ko_invite": True}
-    workflow = UpdateTaskOrderWorkflow(
-        user, to_data, screen=3, task_order_id=task_order.id
-    )
-    for i in range(2):
-        workflow.update()
-    assert len(contracting_officer.invitations) == 1
-
-
 def test_review_task_order_form(client, user_session, task_order):
     user_session(task_order.creator)